3545 files changed, 36552 insertions, 35341 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37a05bf5c..ac1ecf1a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
 OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
+OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )
 OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
@@ -745,7 +745,7 @@ endif( )
 # before altering the LIBR_VERSION check,
 # please ensure that nothing changed in the
 # duplicated data definitions present in
-# kio/kio/kfileitem.cpp
+# tdeio/tdeio/tdefileitem.cpp
 
 if( WITH_ELFICON )
   pkg_search_module( LIBR libr )
@@ -770,6 +770,19 @@ if( WITH_PCRE )
 endif( )
 
 
+##### set DBUS file locations ##################
+
+if( NOT DEFINED DBUS_SYSTEM_CONF_DIRECTORY )
+  set (DBUS_SYSTEM_CONF_DIRECTORY "/etc/dbus-1/system.d/" )
+  message( STATUS "Using " ${DBUS_SYSTEM_CONF_DIRECTORY} " for DBUS configuration files" )
+endif( NOT DEFINED DBUS_SYSTEM_CONF_DIRECTORY )
+
+if( NOT DEFINED DBUS_SERVICE_DIRECTORY )
+  set (DBUS_SERVICE_DIRECTORY "/usr/share/dbus-1/system-services/" )
+  message( STATUS "Using " ${DBUS_SERVICE_DIRECTORY} " for DBUS service files" )
+endif( NOT DEFINED DBUS_SERVICE_DIRECTORY )
+
+
 if( WITH_NETWORK_MANAGER_BACKEND )
   ##### check for dbus-1 ###########################
   pkg_search_module( DBUS dbus-1 )
@@ -873,7 +886,7 @@ configure_file( config.h.cmake config.h )
 configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
 configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
 configure_file( kjs/global.h.in kjs/global.h )
-configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h )
+configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )
 configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
 
 
@@ -882,7 +895,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
 set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl )
 set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp )
 set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc )
-set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler )
+set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/tdeconfig_compiler/tdeconfig_compiler )
 
 
 ##### global compiler settings ##################
@@ -919,12 +932,12 @@ add_subdirectory( tdecore )
 if( WITH_ELFICON )
   add_subdirectory( tdelfeditor )
 endif( WITH_ELFICON )
-add_subdirectory( kunittest )
+add_subdirectory( tdeunittest )
 add_subdirectory( tdeui )
 add_subdirectory( tdesu )
 add_subdirectory( kjs )
-add_subdirectory( kwallet )
-add_subdirectory( kio )
+add_subdirectory( tdewallet )
+add_subdirectory( tdeio )
 add_subdirectory( kded )
 
 # FIXME this directory/target doesn't exists
@@ -932,39 +945,39 @@ add_subdirectory( kded )
 
 add_subdirectory( kdoctools )
 add_subdirectory( doc )
-add_subdirectory( kparts )
-add_subdirectory( kutils )
-add_subdirectory( kspell2 )
-add_subdirectory( kmdi )
+add_subdirectory( tdeparts )
+add_subdirectory( tdeutils )
+add_subdirectory( tdespell2 )
+add_subdirectory( tdemdi )
 add_subdirectory( kinit )
 add_subdirectory( tdeprint )
 add_subdirectory( kab )
-add_subdirectory( kresources )
-add_subdirectory( kabc )
+add_subdirectory( tderesources )
+add_subdirectory( tdeabc )
 add_subdirectory( arts )
 add_subdirectory( interfaces )
 add_subdirectory( kate )
-add_subdirectory( kcert )
+add_subdirectory( tdecert )
 if( XRANDR_FOUND )
-  add_subdirectory( krandr )
+  add_subdirectory( tderandr )
 endif( XRANDR_FOUND )
-add_subdirectory( khtml )
-add_subdirectory( kcmshell )
-add_subdirectory( kconf_update )
+add_subdirectory( tdehtml )
+add_subdirectory( tdecmshell )
+add_subdirectory( tdeconf_update )
 add_subdirectory( kdewidgets )
 add_subdirectory( kimgio )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 add_subdirectory( kstyles )
-add_subdirectory( libkmid )
-add_subdirectory( libkscreensaver )
+add_subdirectory( libtdemid )
+add_subdirectory( libtdescreensaver )
 add_subdirectory( networkstatus )
 add_subdirectory( knewstuff )
-add_subdirectory( krsync )
+add_subdirectory( tdersync )
 add_subdirectory( licenses )
 add_subdirectory( dnssd )
 add_subdirectory( pics )
 add_subdirectory( mimetypes )
-add_subdirectory( kfile-plugins )
+add_subdirectory( tdefile-plugins )
 
 
 ##### install import cmake modules ###############
diff --git a/DEBUG b/DEBUG
index 47a8fe871..cf3dfbc43 100644
--- a/DEBUG
+++ b/DEBUG
@@ -68,7 +68,7 @@ Current language:  auto; currently c++
 (gdb)  
 
 You can now set breakpoints everywhere. For example lets set a breakpoint 
-in the KApplication constructor. Unfortunately gdb is not very good in 
+in the TDEApplication constructor. Unfortunately gdb is not very good in 
 handling C++ names, so it is not really possible to specify the constructor
 directly after the break command. Instead we look up a line of source
 code where we want to place the breakpoint. An external editor is of great 
@@ -79,11 +79,11 @@ are interested in and verify that we have found the correct source line:
 215         parseCommandLine( argc, argv );
 216     }
 217
-218     KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
-219       QApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(),
+218     TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
+219       QApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
 220                     GUIenabled ),
-221       KInstance( KCmdLineArgs::about),
-222       d (new KApplicationPrivate)
+221       TDEInstance( TDECmdLineArgs::about),
+222       d (new TDEApplicationPrivate)
 223     {
 224         if (!GUIenabled)
 (gdb) break 224
@@ -92,14 +92,14 @@ Breakpoint 2 at 0x4048aa7e: file kapp.cpp, line 224.
 
 We can now continue the execution of kedit. Execution will stop when it hits
 a breakpoint of when the program exits. In this case execution will stop
-in the first line of the KApplication constructor:
+in the first line of the TDEApplication constructor:
 
 (gdb) continue
 Continuing.
 Qt: gdb: -nograb added to command-line options.
          Use the -dograb option to enforce grabbing.
  
-Breakpoint 2, KApplication::KApplication (this=0xbffff6a8, allowStyles=true,
+Breakpoint 2, TDEApplication::TDEApplication (this=0xbffff6a8, allowStyles=true,
     GUIenabled=true) at kapp.cpp:224
 224         if (!GUIenabled)
 (gdb) 
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 286c7f30a..322efffb2 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -19,25 +19,25 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 <LI><A HREF="#gettingstarted">Getting Started</A></LI>
 <LI><A HREF="#general">Global changes</A></LI>
 <LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
-<LI><A HREF="#KApplication">KApplication</A></LI>
-<LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI>
-<LI><A HREF="#KLocale">KLocale</A></LI>
-<LI><A HREF="#KGlobal">KGlobal: access to KDE global objects.</A></LI>
-<LI><A HREF="#KIconLoader">KIconLoader</A></LI>
+<LI><A HREF="#TDEApplication">TDEApplication</A></LI>
+<LI><A HREF="#TDECmdLineArgs">TDECmdLineArgs</A></LI>
+<LI><A HREF="#TDELocale">TDELocale</A></LI>
+<LI><A HREF="#TDEGlobal">TDEGlobal: access to KDE global objects.</A></LI>
+<LI><A HREF="#TDEIconLoader">TDEIconLoader</A></LI>
 <LI><A HREF="#KTMainWindow">KTMainWindow</A></LI>
 <LI><A HREF="#KHelpMenu">KHelpMenu</A></LI>
-<LI><A HREF="#KToolBar">KToolBar</A></LI>
+<LI><A HREF="#TDEToolBar">TDEToolBar</A></LI>
 <LI><A HREF="#launching">Starting other programs</A></LI>
-<LI><A HREF="#khtmlw">khtmlw</A></LI>
+<LI><A HREF="#tdehtmlw">tdehtmlw</A></LI>
 <LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
 <LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI>
-<LI><A HREF="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI>
+<LI><A HREF="#TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></LI>
 <LI><A HREF="#libkfm">libkfm</A></LI>
 <LI><A HREF="#KDialog">KDialog</A></LI>
 <LI><A HREF="#kcharsets">kcharsets</A></LI>
 <LI><A HREF="#KWizard">KWizard, KNoteBook</A></LI>
 <LI><A HREF="#KSpinBox">KSpinBox, KNumericSpinBox</A></LI>
-<LI><A HREF="#KClipboard">KClipboard</A></LI>
+<LI><A HREF="#TDEClipboard">TDEClipboard</A></LI>
 <LI><A HREF="#KPanner">KPanner, KNewPanner</A></LI>
 <LI><A HREF="#KTreeList">KTreeList, KTreeListItem</A></LI>
 <LI><A HREF="#KMsgBox">KMsgBox</A></LI>
@@ -45,8 +45,8 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 <LI><A HREF="#KQuickHelp">KQuickHelp</A></LI>
 <LI><A HREF="#KPixmapgradientFill">KPixmap::gradientFill</A></LI>
 <LI><A HREF="#KTabListBox">KTabListBox</A></LI>
-<LI><A HREF="#KToolBarButton">KToolBarButton &amp; KRadioGroup</A></LI>
-<LI><A HREF="#KAccel">KAccel</A></LI>
+<LI><A HREF="#TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></LI>
+<LI><A HREF="#TDEAccel">TDEAccel</A></LI>
 <LI><A HREF="#kstring">kstring.h / KString</A></LI>
 <LI><A HREF="#ktopwidget">ktopwidget.h / KTopWidget</A></LI>
 <LI><A HREF="#kbutton">kbutton.h / KButton</A></LI>
@@ -107,14 +107,14 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KApplication">KApplication</A></H3>
+<H3><A NAME="TDEApplication">TDEApplication</A></H3>
 
-  doesn't hold any longer a KLocale instance. With this getLocale()
-  and isLocaleInstantiated are now replaced by KGlobal::locale()<P>
+  doesn't hold any longer a TDELocale instance. With this getLocale()
+  and isLocaleInstantiated are now replaced by TDEGlobal::locale()<P>
 
   it also doesn't hold a KiconLoader instance. As this also getIconLoader()
   has been removed. Replace kapp-&gt;getIconLoader()-&gt;loadIcon() with
-  BarIcon() or use KGlobal::iconLoader() instead of getIconLoader()<P>
+  BarIcon() or use TDEGlobal::iconLoader() instead of getIconLoader()<P>
 
   kde_*dir() have been removed as they require a unique top level directory
   for all applications (TDEDIR). This concept doesn't exist in KDE 2.0
@@ -125,16 +125,16 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   Replace code that uses kde_*dir() + filename with calls to
   locate(filetype, filename) where filetype is what * used to be
   in kde_*dir(). locate is defined as function in kstddirs.h to call
-  KGlobal::dirs()-&gt;findResource.<P>
+  TDEGlobal::dirs()-&gt;findResource.<P>
 
   Use locateLocal to get the path of a writable file. For instance,
-  KApplication::localconfigdir()+filename is now locateLocal( "config", filename ),
-  but for most cases, simply using KGlobal::config() is enough, if you're happy
+  TDEApplication::localconfigdir()+filename is now locateLocal( "config", filename ),
+  but for most cases, simply using TDEGlobal::config() is enough, if you're happy
   with saving the application's configuration into appnamerc, or
   KSimpleConfig cfg("anothercfgfile") to create a config file with another name.<P>
 
   generalFont() and fixedFont() are deprecated and will be removed soon.
-  Please use KGlobalSettings::generalFont() and KGlobalSettings::fixedFont() instead.<P>
+  Please use TDEGlobalSettings::generalFont() and TDEGlobalSettings::fixedFont() instead.<P>
 
   appName() is deprecated. Please use TQApplication::name() or instanceName
   instead.<P>
@@ -142,20 +142,20 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   The methods tempSaveName() and checkRecoverFile() return QString
   now. The returned values must _not_ be free()d.<P>
 
-  helpMenu() has been moved to KMainWindow. aboutKDE(), aboutApp() and
-  appHelpActivated() have all been removed See section for KMainWindow
+  helpMenu() has been moved to TDEMainWindow. aboutKDE(), aboutApp() and
+  appHelpActivated() have all been removed See section for TDEMainWindow
   for more info.<P>
 
-  The KApplication constructor has changed. Command line arguments and
-  program name should no longer be passed to KApplication but to 
-  KCmdLineArgs. KCmdLineArgs performs command line parsing and a command
+  The TDEApplication constructor has changed. Command line arguments and
+  program name should no longer be passed to TDEApplication but to 
+  TDECmdLineArgs. TDECmdLineArgs performs command line parsing and a command
   line help. See below for more info.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KCmdLineArgs">KCmdLineArgs</A></H3>
+<H3><A NAME="TDECmdLineArgs">TDECmdLineArgs</A></H3>
 
-  KCmdLineArgs is a new class that handles command line parsing and
+  TDECmdLineArgs is a new class that handles command line parsing and
   command line help. It is now required that your application
   specifies at least:<P>
   <UL>
@@ -165,25 +165,25 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 	<LI>All command line options that it supports.
   </UL>
  
-  KCmdLineArgs itself will add the command line options supported by Qt 
-  and KApplication.<P>
+  TDECmdLineArgs itself will add the command line options supported by Qt 
+  and TDEApplication.<P>
 
-  You can also use the KAboutData class to specify name, description and 
+  You can also use the TDEAboutData class to specify name, description and 
   version.<P>
 
-  In return for this information you can query KCmdLineArgs whether an 
+  In return for this information you can query TDECmdLineArgs whether an 
   certain option was specified on the command line and your application 
   now automatically supports --help and --version. It aborts with a
   useful error message when the command line contains a syntax error.
-  See tdelibs/tdecore/kcmdlineargs.h for more info.<P>
+  See tdelibs/tdecore/tdecmdlineargs.h for more info.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KLocale">KLocale</A></H3>
+<H3><A NAME="TDELocale">TDELocale</A></H3>
 
   i18n is no longer a macro<P>
 
-  KApplication::getApplication()-&gt;getLocale()-&gt;translate<P>
+  TDEApplication::getApplication()-&gt;getLocale()-&gt;translate<P>
 
   but a function on its own. klocale is obsolete and replace every call
   to klocale-&gt;translate with i18n.<P>
@@ -193,21 +193,21 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KGlobal">KGlobal: access to KDE global objects.</A></H3>
+<H3><A NAME="TDEGlobal">TDEGlobal: access to KDE global objects.</A></H3>
 
-KGlobal allows centralized access to KDE global objects without including
+TDEGlobal allows centralized access to KDE global objects without including
 extraneous headers. object creation is deferred if possible.<P>
 
 All methods are static and headers for returned types are not included. You
-must have created a KApplication object before the methods can be used.<P>
+must have created a TDEApplication object before the methods can be used.<P>
 <TABLE BORDER="0">
 <TR>
   <TD COLSPAN="2">
     <PRE>
-      #include &lt;kglobal.h&gt;
-      #include &lt;kconfig.h&gt;      // Needed to use KConfig
-      #include &lt;klocale.h&gt;      // Needed to use KLocale
-      #include &lt;kiconloader.h&gt;  // Needed to use KIconLoader
+      #include &lt;tdeglobal.h&gt;
+      #include &lt;tdeconfig.h&gt;      // Needed to use TDEConfig
+      #include &lt;tdelocale.h&gt;      // Needed to use TDELocale
+      #include &lt;kiconloader.h&gt;  // Needed to use TDEIconLoader
     </PRE>
   </TD>
 </TR>
@@ -215,11 +215,11 @@ must have created a KApplication object before the methods can be used.<P>
   <TD>
     <PRE>
     ...
-        	KConfig *appcfg = KGlobal::config();
+        	TDEConfig *appcfg = TDEGlobal::config();
 	        TQString mystr	 = i18n( "This is a string" );
 
 
-		KIconLoader *loader = KGlobal::iconLoader();
+		TDEIconLoader *loader = TDEGlobal::iconLoader();
     </PRE>
   </TD>
 </TR>
@@ -227,9 +227,9 @@ must have created a KApplication object before the methods can be used.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KIconLoader">KIconLoader</A></H3>
+<H3><A NAME="TDEIconLoader">TDEIconLoader</A></H3>
 
-KIconLoader in 1.1 used to mix icons for applications and for toolbars.
+TDEIconLoader in 1.1 used to mix icons for applications and for toolbars.
 This has changed, so you may notice that your application doesn't find
 the right icons. loadIcon (used by BarIcon) returns only toolbar icons.<P>
 If you need icons for applications, use loadApplicationIcon.<P>
@@ -248,9 +248,9 @@ in stripping off the .xpm part<P>
 
 <H3><A NAME="KTMainWindow">KTMainWindow</A></H3>
 
-KTMainWindow has been replaced with KMainWindow.<p>
+KTMainWindow has been replaced with TDEMainWindow.<p>
 
-The KMainWindow constructor needs a parent widget as first argument. 
+The TDEMainWindow constructor needs a parent widget as first argument. 
 You can use 0 for this.<p>
 setView() has been replaced with setCentralWidget().<p>
 view() has been replaced with centralWidget().<p>
@@ -271,26 +271,26 @@ mainViewGeometry() instead.<P>
 
 <H3><A NAME="KHelpMenu">KHelpMenu</A></H3>
 
-helpMenu() has been moved to KMainWindow from KApplication (kapp).<P>
+helpMenu() has been moved to TDEMainWindow from TDEApplication (kapp).<P>
 
 Both the "About KDE" and the "About &lt;Application&gt;" dialog boxes
 are now modeless. "About KDE" is a completely new widget.<P>
 
-If you used in the toplevel window (that is derived from KMainWindow)
+If you used in the toplevel window (that is derived from TDEMainWindow)
 "kapp-&gt;helpMenu( bool, TQString )" to get the help menu
 you must now change this to "helpMenu( TQString )". The TQString defaults
 to TQString::null so it is sufficient to write helpMenu().<P>
 
-The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication
+The old aboutKDE(), aboutApp() and appHelpActivated() of TDEApplication
 have all been removed. If you need direct access to these or need
 access to a help menu in a class that is not derived from
-KMainWindow then allocate an instance of the new class KHelpMenu.
+TDEMainWindow then allocate an instance of the new class KHelpMenu.
 See KDE 2.0 API reference or khelpmenu.h (tdeui) for additional info.<P>
 Espen Sand &lt;<A HREF="mailto:espen@kde.org">espen@kde.org</A>&gt;<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KToolBar">KToolBar</A></H3>
+<H3><A NAME="TDEToolBar">TDEToolBar</A></H3>
 
 enable(...) is depreciated, use show()/hide() instead.<p>
 enableFloating(...) has been removed, use enableMoving() instead.<p>
@@ -309,9 +309,9 @@ you should or should not use them.
 <H4>1. fork + exec</H4>
 <P>
 You never want to use this unless you have a very good reason why it is 
-impossible to use KProcess.
+impossible to use TDEProcess.
 </P>
-<H4>2. KProcess</H4>
+<H4>2. TDEProcess</H4>
 <P>
 You want to use this if you need to start a new process which needs to be a 
 child of your process, e.g. because you want to catch stdout/stderr or need 
@@ -323,7 +323,7 @@ off with KProcIO
 
 <H4>3. KProcIO</H4>
 <P>
-Like KProcess. Unlike KProcess, this class actually makes it easy to 
+Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to 
 send data to and receive data from the process.
 
 </P>
@@ -347,38 +347,38 @@ This makes KRun the recommended way to run another program in KDE 2.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="khtmlw">khtmlw</A></H3>
+<H3><A NAME="tdehtmlw">tdehtmlw</A></H3>
 
-khtmlw has been replaced with khtml.<BR>
+tdehtmlw has been replaced with tdehtml.<BR>
 <UL>
-	<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar
+	<LI>TDEHTMLView has vanished. Just use TDEHTMLWidget, which does scrollbar
   managing for free.
 
 	<LI>A lot of the API has changed. If you just want to open a file/URL,
   you just need to do:<P>
   <PRE>
-	KHTMLWidget *w = new KHTMLWidget();
+	TDEHTMLWidget *w = new TDEHTMLWidget();
 	w-&gt;openURL(myURL);
   </PRE>
 
-	<LI>khtml uses QString's instead of char *'s now. This means, that most
+	<LI>tdehtml uses QString's instead of char *'s now. This means, that most
   of the api has changed. In all functions:<P>
   <PRE>
      const char * -&gt; QString
      TQStrList -&gt; QStringList
   </PRE>
-  The only exception for the moment is KHTMLWidget::write(), which does
+  The only exception for the moment is TDEHTMLWidget::write(), which does
   also exist in a const char * version.<P>
 
 
-<LI>you won't need the getKHTMLWiget function anymore. Just replace
-	getKHTMLWidget-&gt;xxx() with xxx()<P>
+<LI>you won't need the getTDEHTMLWiget function anymore. Just replace
+	getTDEHTMLWidget-&gt;xxx() with xxx()<P>
 <LI>xxx(TQString) -&gt; xxx(const TQString &amp;)<P>
 <LI>consistent naming. All getXyz() functions are renamed to xyz()<P>
 <LI>replaced/changed functions:<P>
 <TABLE BORDER="1">
 <TR>
-<TD>KHTMLWidget::setDefaultFontBase()</TD>
+<TD>TDEHTMLWidget::setDefaultFontBase()</TD>
 <TD>-&gt; setFontSizes()</TD>
 </TR>
 <TR>
@@ -406,7 +406,7 @@ khtmlw has been replaced with khtml.<BR>
 </TR>
 </TABLE><P>
 
-<LI>Don't forget to change the link-flags! (-lkhtml -lkjava instead of -lkhtmlw)
+<LI>Don't forget to change the link-flags! (-ltdehtml -lkjava instead of -ltdehtmlw)
 </UL>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -469,17 +469,17 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></H3>
+<H3><A NAME="TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></H3>
 
   These classes have been largely re-implemented.  The external API
   remains mostly the same, with the single notable change that
   the groupIterator and entryIterator methods have been removed and
   instead replaced by groupList (which returns a TQStringList of groups)
   and entryMap(const TQString &amp;group) (which returns a TQMap of entries
-  in the specified group).  This is due to internal changes in KConfig
+  in the specified group).  This is due to internal changes in TDEConfig
   which would make providing iterators possibly rather difficult.<P>
 
-  Much more extensive documentation on the KConfig and friends API can
+  Much more extensive documentation on the TDEConfig and friends API can
   be found in the kdoc generated documentation from the header files,
   and in tdecore/KCONFIG_DESIGN.<P>
 
@@ -501,20 +501,20 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
 <H3><A NAME="libkfm">libkfm has disappeared</A></H3>
 
   Lots of other functionalities have been taken out of kfm, some being
-  now in libkio, some in libkonq.<P>
+  now in libtdeio, some in libkonq.<P>
  <STRONG> Replacement table :</STRONG><P>
 <TABLE BORDER="1">
 
-<TR><TD>KFM::download         </TD><TD>-&gt; KIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR>
-<TR><TD>KFM::removeTempFile   </TD><TD>-&gt; KIO::NetAccess::removeTempFile</TD></TR>
+<TR><TD>KFM::download         </TD><TD>-&gt; TDEIO::NetAccess::download (tdelibs/tdeio/netaccess.h)</TD></TR>
+<TR><TD>KFM::removeTempFile   </TD><TD>-&gt; TDEIO::NetAccess::removeTempFile</TD></TR>
 <TR><TD COLSPAN="2" ROWSPAN="0">refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it</TD></TR>
 <TR><TD>KFM::configure        </TD><TD>-&gt; see konqueror DCOP interface</TD></TR>
-<TR><TD>KFM::openURL          </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
+<TR><TD>KFM::openURL          </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/tdeio/krun.h)</TD></TR>
 <TR><TD>KFM::refreshDirectory </TD><TD>-&gt; not needed anymore since konqy/kdesktop use KDirWatch</TD></TR>
-<TR><TD>KFM::openProperties   </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)</TD></TR>
-<TR><TD>KFM::exec             </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
-<TR><TD>KFM::copy, KFM::move  </TD><TD>-&gt; KIO::Job (async, see kio/job.h)<BR>
-                            or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
+<TR><TD>KFM::openProperties   </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/tdefile/kpropsdlg.h)</TD></TR>
+<TR><TD>KFM::exec             </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/tdeio/krun.h)</TD></TR>
+<TR><TD>KFM::copy, KFM::move  </TD><TD>-&gt; TDEIO::Job (async, see tdeio/job.h)<BR>
+                            or TDEIO::NetAccess (sync, see tdeio/netaccess.h)</TD></TR>
 <TR><TD>DlgLocation           </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
 </TABLE>
 
@@ -534,7 +534,7 @@ The kcharsets class has been completely rewritten, and most of it has
 vanished, since support for it moved to Qt.<P>
 
 Most applications will only need to replace kapp-&gt;getKCharsets() with
-KGlobal::charsets().<P>
+TDEGlobal::charsets().<P>
 
 For conversion of various input formats to QStrings, please have a
 look at TQTextCodec and classes derived from it.<P>
@@ -570,9 +570,9 @@ HINTS:<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KClipboard">KClipboard</A></H3>
+<H3><A NAME="TDEClipboard">TDEClipboard</A></H3>
 
-KClipboard has been removed. In case you've been using KClipboard,
+TDEClipboard has been removed. In case you've been using TDEClipboard,
 QClipboard is the way to go now, as it has all the functionality the K
 version had, and more.<P>
 
@@ -588,7 +588,7 @@ this:<P>
 <TABLE><TR><TD>
     TQSplitter *split = new TQSplitter( parent );<BR>
     TQListBox *lb = new TQListBox( split );<BR>
-    KListView *lv = new KListView( split );<BR>
+    TDEListView *lv = new TDEListView( split );<BR>
     TQMultiLineEdit *ed = new TQMultiLineEdit( split );
 </TD></TR></TABLE>
 
@@ -600,17 +600,17 @@ possible if you call setOpaqueResize(true).<P>
 
 <H3><A NAME="KTreeList">KTreeList, KTreeListItem</A></H3>
 
-Use KListView, TQListViewItem instead. API is almost the same, you only
-need to add a Column (KListView::addColum) before KListView is useable.<P>
+Use TDEListView, TQListViewItem instead. API is almost the same, you only
+need to add a Column (TDEListView::addColum) before TDEListView is useable.<P>
 
-KListView has no addChild(), insertItem() and removeItem() calls. Inserting
-a root item is done by constructing a TQListViewItem with the KListView
+TDEListView has no addChild(), insertItem() and removeItem() calls. Inserting
+a root item is done by constructing a TQListViewItem with the TDEListView
 passed as the parent widget. adding a child item is done by constructing
 a TQListViewItem with the parent item as parameter. removeItem() should
 be replaced by delete &lt;pointer to item&gt;.<P>
 
 The root items are not shown in a tree fashion by default. to get this,
-use KListView::setDecorativeRoot(true).<P>
+use TDEListView::setDecorativeRoot(true).<P>
 
 Expanding and collapsing can by done by using TQListViewItem::setOpen(bool).<P>
 
@@ -685,24 +685,24 @@ unbalancedGradient(), hash(), desaturate(), pattern(), fade(), blend() etc.<P>
 
 <H3><A NAME="KTabListBox">KTabListBox</A></H3>
 
-This widget has been replaced by the almighty KListView. Everything said
+This widget has been replaced by the almighty TDEListView. Everything said
 about KTreeList could be repeated here. The good thing is, that you now
 can combine TreeView's and normal Tablists without problems.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KToolBarButton">KToolBarButton &amp; KRadioGroup</A></H3>
+<H3><A NAME="TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></H3>
 
-If you need to do anything with KToolBarButton you now need to include 
-&lt;ktoolbarbutton.h&gt; KRadioGroup has been renamed to KToolBarRadioGroup and
-requires you to include &lt;ktoolbarradiogroup.h&gt;<P>
+If you need to do anything with TDEToolBarButton you now need to include 
+&lt;tdetoolbarbutton.h&gt; TDERadioGroup has been renamed to TDEToolBarRadioGroup and
+requires you to include &lt;tdetoolbarradiogroup.h&gt;<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="KAccel">KAccel</A></H3>
+<H3><A NAME="TDEAccel">TDEAccel</A></H3>
 
 The functions keyToString() and stringToKey() which were previously
-declared globally in kaccel.h are now static methods in KAccel.<P>
+declared globally in tdeaccel.h are now static methods in TDEAccel.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
@@ -716,7 +716,7 @@ The file has been removed completely, use TQString instead. (<A HREF="mailto:mir
 
 <H3><A NAME="ktopwidget">ktopwidget.h / KTopWidget</A></H3>
 
-KMainWindow replaces this class completely. ktopwidget.h does not
+TDEMainWindow replaces this class completely. ktopwidget.h does not
 exist in KDE 2. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -754,7 +754,7 @@ Please adjust your code accordingly.<P>
 
 <H3><A NAME="KDockWidget">KDockWidget</A></H3>
 
-KDockWidget inherits form KMainWindow instead of KTMainWindow now.
+KDockWidget inherits form TDEMainWindow instead of KTMainWindow now.
 See <A HREF="KTMainWindow">KTMainWindow</A> for more details.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -792,7 +792,7 @@ Matthias Hoelzer-Kluepfel &lt;<A HREF="mailto:hoelzer@kde.org">hoelzer@kde.org</
 The KWMModuleApplication has been removed. Instead, use the class
 KWinModule in libtdecore. The API is a bit cleaner but very similar,
 so you will feel comfortable immediately. One of the advantages of
-KWinModule is that it doesn't require a special KApplication
+KWinModule is that it doesn't require a special TDEApplication
 subclass. This lead to many problems and misunderstandings in the
 past. KWinModule is now just an object that emits fancy signals (and
 provides some useful lists, like the list of all managed windows).
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index eb17c6fc6..47246adb8 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -20,10 +20,10 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
 <LI><A HREF="#tdecore">Changes in tdecore</A></LI>
 <LI><A HREF="#tdeui">Changes in tdeui</A></LI>
 <LI><A HREF="#kio">Changes in kio</A></LI>
-<LI><A HREF="#kparts">Changes in kparts</A></LI>
-<LI><A HREF="#kspell">Changes in kspell</A></LI>
-<LI><A HREF="#khtmlpart">API-cleanup in KHTML</A></LI>
-<LI><A HREF="#kfile">Changes in kfile</A></LI>
+<LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
+<LI><A HREF="#tdespell">Changes in tdespell</A></LI>
+<LI><A HREF="#tdehtmlpart">API-cleanup in TDEHTML</A></LI>
+<LI><A HREF="#tdefile">Changes in tdefile</A></LI>
 <LI><A HREF="#kcontrol">TDE Control Center</A></LI>
 <LI><A HREF="#kicker">Panel Applets and Extensions</A></LI>
 </UL>
@@ -73,7 +73,7 @@ instead, everything else is source compatible.
 
 <H4>Header file names</H4>
 <UL>
-<LI>kapp.h is now kapplication.h</LI>
+<LI>kapp.h is now tdeapplication.h</LI>
 <LI>kuniqueapp.h is now kuniqueapplication.h</LI>
 <LI>kstddirs.h is now kstandarddirs.h</LI>
 <LI>kcolorbtn.h is now kcolorbutton.h</LI>
@@ -95,7 +95,7 @@ DCOPClient you do not need to change anything.
 <p>
 It is no longer possible to make calls to an application registered as
 "<appid>-<pid>" with "<appid>" only. The full name can be obtained by using
-either KApplication::startServiceBy...() or DCOPClient::findObject() or 
+either TDEApplication::startServiceBy...() or DCOPClient::findObject() or 
 their command line equivalents "dcopstart" and "dcopfind".
 
 <H4>KLibFactory</H4>
@@ -116,11 +116,11 @@ The <i>matchFilename( const TQString& filename, const TQString& pattern )</i> me
 renamed to <br><i>matchFileName( const TQString& filename, const TQString& pattern )</i>.
 The old name will still work unless KDE_NO_COMPAT is defined.
 
-<H4>KStyle</H4>
-Due to the major changes in the TQStyle API in Qt3, KStyle has been completely
-re-written. KStyle is now a thin wrapper around TQCommonStyle with a few extra 
-primitive elements and a simple popupMenu transparency engine. All KStyles can
-now style Qt apps like designer and assistant automatically. KStyle is no longer
+<H4>TDEStyle</H4>
+Due to the major changes in the TQStyle API in Qt3, TDEStyle has been completely
+re-written. TDEStyle is now a thin wrapper around TQCommonStyle with a few extra 
+primitive elements and a simple popupMenu transparency engine. All TDEStyles can
+now style Qt apps like designer and assistant automatically. TDEStyle is no longer
 present in tdecore. It is now in a new library called tdefx to allow Qt apps to
 use KDE's styles without having the styles linked to tdecore/tdeui.
 
@@ -135,7 +135,7 @@ They have been replaced by TQCString and KMD5::Digest. <br>
 The API has been cleaned up, it is no longer necessary to call finalize(). 
 Simply remove any calls to it. 
 
-<H4>KLocale</H4>
+<H4>TDELocale</H4>
 <li>charset() has been removed. You might want to use encoding() instead.
 <li>setCharset(const TQString &amp;) has been removed. You might want to use
 setEncoding(int) instead.
@@ -143,43 +143,43 @@ setEncoding(int) instead.
 <li>formatNumber(const TQString &amp;) has been removed.
 <li>languages() has been removed. Use languageList() instead.
 <li>All references to monthName(), monthNamePossessive(), and weekDayName()
-should be replaced with methods from KLocale::calendar().
+should be replaced with methods from TDELocale::calendar().
 <li>Hard coded date handling or date handling with TQDate should in most
-cases be replaced by methods in KLocale::calendar().
+cases be replaced by methods in TDELocale::calendar().
 
 <H4>Accelerators Keys</H4>
-<h5>KAccel</h5>
+<h5>TDEAccel</h5>
 The following methods of been deprecated, and if KDE_NO_COMPAT is defined they will
 not be available.
 <ul>
-	<li> KAccel::insertItem() and KAccel::connectItem().
+	<li> TDEAccel::insertItem() and TDEAccel::connectItem().
 <pre>
-	- kaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
-	- kaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
-	+ kaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
+	- tdeaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
+	- tdeaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
+	+ tdeaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
 		Key_Up, this, TQT_SLOT(scrollUp()) );
 </pre>
 	Note that a What's This parameter is now a part of the insert function.
 	You might replace the TQString::null parameter with
 	<pre> i18n("Scroll the current document's contents up by one line.") </pre>
 	for example.</li>
-	<li> KAccel::changeMenuAccel() has been deprecated because it was
+	<li> TDEAccel::changeMenuAccel() has been deprecated because it was
 	never used in cvs.  If you've used it in your application, the following
 	can replace it.  Note, however, that this would be handled automatically
-	by using KAction instead.
+	by using TDEAction instead.
 <pre>
-	- kaccel-&gt;changeMenuAccel( menu, id, "file_open" );
-	+ menu-&gt;setAccel( kaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
+	- tdeaccel-&gt;changeMenuAccel( menu, id, "file_open" );
+	+ menu-&gt;setAccel( tdeaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
 </pre>
 	</li>
 </ul>
-The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
+The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>.
 <pre>
-	new KAction( i18n("Scroll Up"), Key_Up,
+	new TDEAction( i18n("Scroll Up"), Key_Up,
 		this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
 </pre>
 
-<h5>KGlobalAccel</h5>
+<h5>TDEGlobalAccel</h5>
 <ul>
 	<li>Call <i>updateConnections()</i> after all <i>insert()</i> or
 	<i>insertItem()</i> (deprecated) calls have been made.  This function then performs the
@@ -189,59 +189,59 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
 	shortcut reassignments, which in turn used to make an expensive ungrab
 	of the old key and second grab of the new key necessary.</li>
 </ul>
-<h5>KStdAccel</h5>
+<h5>TDEStdAccel</h5>
 <ul>
 	<li><i>StdAccel::WhatThis</i> has been renamed to <i>StdAccel::WhatsThis</i>.
 	<li><i>StdAccel::Insert</i> and the corresponding <i>insert()</i>
 	have been removed. (Nobody on the list knew what its function was
 	supposed to be.)  Calls to <i>insert()</i> and the equivalent
-	<i>key(KStdAccel::Insert)</i> can be replaced with the former default
+	<i>key(TDEStdAccel::Insert)</i> can be replaced with the former default
 	of <i>Qt::CTRL+Qt::Key_Insert</i>.</li>
 	<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
 		<table border=1>
 			<tr><th>Old</th><th>New</th></tr>
 			<tr><td>TQString action(StdAccel id)</td><td>TQString name(StdAccel id)</td></tr>
-			<tr><td>int defaultKey(StdAccel accel)</td><td>KShortcut shortcutDefault(StdAccel id)</td></tr>
+			<tr><td>int defaultKey(StdAccel accel)</td><td>TDEShortcut shortcutDefault(StdAccel id)</td></tr>
 			<tr><td>TQString description(StdAccel id)</td><td>TQString label(StdAccel id)</td></tr>
 			<tr><td>bool isEqual(const TQKeyEvent* pEvent, int keyQt)</td>
 				<td>The best method for replacing this varies.  One possibility is to use
 				<i>KKey(const TQKeyEvent*) == KKey(int)</i>.  Another is to use
-				<i>KShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
-			<tr><td>int key(StdAccel)</td><td>const KShortcut& shortcut(StdAccel)</td></tr>
+				<i>TDEShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
+			<tr><td>int key(StdAccel)</td><td>const TDEShortcut& shortcut(StdAccel)</td></tr>
 		</table></li-->
 </ul>
 
-<H4>KIconLoader, KIconTheme</H4>
-Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments.
+<H4>TDEIconLoader, TDEIconTheme</H4>
+Methods now use TDEIcon::Group and TDEIcon::Context instead of int as types for group and context arguments.
 The change should affect only code using hardcoded numeric values instead of using the proper enum constants.
-This applies to classes KIconLoader, KIconTheme and (in kio and kfile) KMimeType, KService, KIconDialog, KIconButton,
+This applies to classes TDEIconLoader, TDEIconTheme and (in kio and tdefile) KMimeType, KService, TDEIconDialog, TDEIconButton,
 KURLBar and KURLBarItem.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
 <H3><A NAME="tdeui">Changes in tdeui</A></H3>
 
-<H4>KAccelMenu</H4>
+<H4>TDEAccelMenu</H4>
 This class has been removed, Qt offers the same functionality.
-Use QPopupMenu/KPopupMenu or the XML-UI method for building menus.
+Use QPopupMenu/TDEPopupMenu or the XML-UI method for building menus.
 
-<H4>KAction</H4>
+<H4>TDEAction</H4>
 <ul>
 	<li>The following methods have been deprecated and will need to be
 	replaced if KDE_NO_COMPAT is defined.
 		<table border=1>
 			<tr><th>Old</th><th>New</th></tr>
-			<tr><td>int accel()</td><td>const KShortcut&amp; shortcut()</td></tr>
+			<tr><td>int accel()</td><td>const TDEShortcut&amp; shortcut()</td></tr>
 			<tr><td>int menuId()</td><td>int itemId()</td></tr>
-			<tr><td>void setAccel(int)</td><td>void setShortcut(const KShortcut&amp;)</td></tr>
+			<tr><td>void setAccel(int)</td><td>void setShortcut(const TDEShortcut&amp;)</td></tr>
 		</table></li>
 </ul>
 
-<h4>KActionCollection</h4>
+<h4>TDEActionCollection</h4>
 <ul>
-	<li>When constructing a KActionCollection object, a pointer to the focus widget should be passed.</li>
+	<li>When constructing a TDEActionCollection object, a pointer to the focus widget should be passed.</li>
 	<li>The insert(), remove(), and take() methods have been deprecated.
-	If you wish to keep a list of actions, use the KActionPtrList container instead.
+	If you wish to keep a list of actions, use the TDEActionPtrList container instead.
 	If you want to configure the shortcuts from multiple actions collections,
 	pass each collection to KKeyChooser or KKeyDialog via their insert() methods.</li>
 </ul>
@@ -318,28 +318,28 @@ The KRootPixmap class has been extended to make it more flexible, and the
 The old name will still work unless KDE_NO_COMPAT is defined.
 
 <H4>KThemeBase, KThemeStyle</H4>
-KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API
+KThemeBase and KThemeStyle have been ported over to the new QStyle/TDEStyle API
 present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle
 as its use is basically limited to KThemeStyle.
 
-<H4>KAction, KToolBar, KToolBarButton and icons</H4>
-The preferred way for specifying icons is passing the icon names (and the icons will be loaded by KIconLoader),
+<H4>TDEAction, TDEToolBar, TDEToolBarButton and icons</H4>
+The preferred way for specifying icons is passing the icon names (and the icons will be loaded by TDEIconLoader),
 instead of using TQIconSet or TQPixmap. This results in always using the correct icon size and allows delayed
 on-demand icon loading.
 <p>
-Method KAction::hasIconSet() has been renamed to KAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
-KAction::iconSet() now has an argument specifying icon group, the old KAction::iconSet() is still available unless KDE_NO_COMPAT
-is defined and returns KIcon::Small iconset, just like in KDE2.
+Method TDEAction::hasIconSet() has been renamed to TDEAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
+TDEAction::iconSet() now has an argument specifying icon group, the old TDEAction::iconSet() is still available unless KDE_NO_COMPAT
+is defined and returns TDEIcon::Small iconset, just like in KDE2.
 <p>
-KToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated.
-Use KToolBarButton::setIcon() (preferred) or KToolBarButton::setIconSet() instead.
+TDEToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated.
+Use TDEToolBarButton::setIcon() (preferred) or TDEToolBarButton::setIconSet() instead.
 
-<H4>KAction and derived classes</H4>
+<H4>TDEAction and derived classes</H4>
 The protected set* methods have been renamed to update* and they now take only one argument (i.e. setText(int, const TQString&)
 is now updateText(int) ). Because the former second argument was always the value of the a corresponding data member, you
 can simply call the accessor method (i.e. in updateText() call text() to get the text).
 
-<H4>KToggleAction</H4>
+<H4>TDEToggleAction</H4>
 exclusiveGroup() is no more virtual. setExclusiveGroup(const
 TQString&) is not a slot anymore.
 
@@ -391,7 +391,7 @@ TQString&) is not a slot anymore.
 <li>setMaxCacheAge( int )
 <li>setUseCache( bool )
 <li>setMaxCacheSize( int )
-<li>setCacheControl( KIO::CacheControl )
+<li>setCacheControl( TDEIO::CacheControl )
 <li>setUseProxy( bool )
 <li>setUseReverseProxy( bool )
 <li>setProxyType( ProxyType )
@@ -406,7 +406,7 @@ TQString&) is not a slot anymore.
   <li>In order to support files &gt; 4Gb, the file size / file-offset argument
       in the signals totalSize, processedSize and canResume, which are used 
       by the io-slaves and passed along to jobs, has been changed from
-      <b>unsigned long</b> to <b>KIO::filesize_t</b>.
+      <b>unsigned long</b> to <b>TDEIO::filesize_t</b>.
       Make sure to check if you use these signals since your compiler
       will typically not generate a compile-time error for these changes,
       instead you might get a run-time error when you try to connect to
@@ -416,11 +416,11 @@ TQString&) is not a slot anymore.
 
 <H4>KOpenWithHandler / KFileOpenWithHandler</H4>
 Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore.
-The merging of libkio, libksycoca, libkfile and libkssl into a single libkio has
+The merging of libtdeio, libtdesycoca, libtdefile and libkssl into a single libtdeio has
 allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.
 
 <H4>KMimeType, KService</H4>
-Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments.
+Methods now use TDEIcon::Group and TDEIcon::Context instead of int as types for group and context arguments.
 The change should affect only code using hardcoded numeric values instead of using the proper enum constants.
 
 <H4>KFilterDev</H4>
@@ -440,7 +440,7 @@ The createFilterDevice method is deprecated. Use deviceForFile instead.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="kparts">Changes in kparts</A></H3>
+<H3><A NAME="tdeparts">Changes in tdeparts</A></H3>
 
 <H4>KParts::Factory</H4>
 The createPart method is no more virtual and the createPartObject method
@@ -468,7 +468,7 @@ setURLArgs does the job.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="kspell">Changes in kspell</A></H3>
+<H3><A NAME="tdespell">Changes in tdespell</A></H3>
 
 <H4>KSpell</H4>
 The API has been cleaned up to be in line with the rest of tdelibs, in particular:
@@ -495,9 +495,9 @@ The API has been cleaned up to be in line with the rest of tdelibs, in particula
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="khtmlpart">API-cleanups in KHTML</A></H3>
+<H3><A NAME="tdehtmlpart">API-cleanups in TDEHTML</A></H3>
 
-There were a few relatively minor API-adjustements in KHTMLPart. In particular:
+There were a few relatively minor API-adjustements in TDEHTMLPart. In particular:
 <ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool)
 <li>enableJava(bool) has been replaced by setJavaEnabled(bool)
 <li>enablePlugins(bool) has been replaced by setPluginsEnabled(bool)
@@ -505,7 +505,7 @@ There were a few relatively minor API-adjustements in KHTMLPart. In particular:
 <li>enableMetaRefresh(bool) has been replaced by setMetaRefreshEnabled(bool)
 <li>setBaseURL and setBaseTarget have been removed. baseURL(), baseTarget() and
 completeURL() are remained for compatibility reasons, but they're deprecated now. use the variants in DOM::HTMLDocument() instead.
-<li>the second parameter of KHTMLPart::completeURL is removed. it didn't have
+<li>the second parameter of TDEHTMLPart::completeURL is removed. it didn't have
    any effect before either.
 </ul>
 Besides that, all methods previously marked as deprecated or were internal
@@ -513,21 +513,21 @@ but accidentally part of the public API are now private or removed.
 As they were marked as becoming private already you should not experience
 any problems. Backward compatibility exists for the common methods, to
 disable this use a #define KDE_NO_COMPAT.
-<p>In KHTMLView, the following changes were done:
+<p>In TDEHTMLView, the following changes were done:
 <ul>
 <li>gotoNextLink has been replaced by gotoLink(true);
 <li>gotoPrevLink has been replaced by gotoLink(false);
 </ul>
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 
-<H3><A NAME="kfile">Changes in kfile</A></H3>
-The kfile-library, as used by the KFileDialog provides classes for directory browsing widgets.
+<H3><A NAME="tdefile">Changes in tdefile</A></H3>
+The tdefile-library, as used by the KFileDialog provides classes for directory browsing widgets.
 Those classes gained some new features, some parts were merged with other existing classes
-and in some cases the API was cleaned up/fixed. The library is now built as part of libkio
-library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -lkfile).
+and in some cases the API was cleaned up/fixed. The library is now built as part of libtdeio
+library (there's no need to modify Makefiles which use $LIB_TDEFILE instead of hardcoding -ltdefile).
 <p>
 Even if the list of changes is long, the affected code base should be relatively small, as most
-parts are rarely used outside of kfile.
+parts are rarely used outside of tdefile.
 <p>
 The changes are:
 <H4>KFileItem</H4>
@@ -563,12 +563,12 @@ flexibility and efficiency.
 <br><br>
 Sorting has changed radically. Previously, KFileView had protected methods QuickSort,
 compareItems() and mergeLists() to sort directory entries for displaying in the views. Now,
-KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, KListView)
+KFileView does not do any sorting anymore. Instead, the view's (i.e. TDEIconView, TDEListView)
 sorting is utilized by letting its view-items provide a TQString key() method. Therefore,
 KFileView offers the two methods
 <ul>
 <li>TQString sortingKey( const TQString&amp; value, bool isDir, int sortSpec )</li>
-<li>TQString sortingKey( KIO::filesize_t value, bool isDir, int sortSpec )</li>
+<li>TQString sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec )</li>
 </ul>
 which the view-classes can use to generate the string for the key() method. The KFile::SortMode
 enum has been removed, as TQDir::SortSpec is used entirely.
@@ -577,8 +577,8 @@ enum has been removed, as TQDir::SortSpec is used entirely.
 Further changes:
 <table>
 <tr><th>Old:</th><th>New:</th></tr>
-<tr><td>not existant</td><td>virtual void readConfig( KConfig *, const TQString&amp; group = TQString::null )</td></tr>
-<tr><td>not existant</td><td>void writeConfig( KConfig *, const TQString&amp; group = TQString::null)</td></tr>
+<tr><td>not existant</td><td>virtual void readConfig( TDEConfig *, const TQString&amp; group = TQString::null )</td></tr>
+<tr><td>not existant</td><td>void writeConfig( TDEConfig *, const TQString&amp; group = TQString::null)</td></tr>
 <tr><td>virtual void setCurrentItem( const TQString&amp; filename, KFileViewItem * )</td><td>Replaced with the two methods below.</td></tr>
 <tr><td>&nbsp;</td><td>void setCurrentItem( const TQString&amp; filename );</td></tr>
 <tr><td>&nbsp;</td><td>virtual void setCurrentItem( const KFileViewItem * ) = 0;</td></tr>
@@ -613,8 +613,8 @@ have been merged into the new method activate( const KFileItem * ).
 <br><br>
 Carsten Pfeiffer <A HREF="mailto:pfeiffer@kde.org">pfeiffer@kde.org</A>
 
-<H4>KIconDialog, KIconButton, KURLBar, KURLBarItem</H4>
-Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments.
+<H4>TDEIconDialog, TDEIconButton, KURLBar, KURLBarItem</H4>
+Methods now use TDEIcon::Group and TDEIcon::Context instead of int as types for group and context arguments.
 The change should affect only code using hardcoded numeric values instead of using the proper enum constants.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
diff --git a/Mainpage.dox b/Mainpage.dox
index f1d31fae9..702510fc5 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -14,18 +14,18 @@
 	* - <a target="_top" href="tdeui/html/index.html"><b>tdeui</b></a>
         *   (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n
 	*   <i>Trinity User interface classes such as widgets.</i>
-	* - <a target="_top" href="khtml/html/index.html"><b>khtml</b></a>
-        *   (<a target="_top" href="khtml/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdehtml/html/index.html"><b>tdehtml</b></a>
+        *   (<a target="_top" href="tdehtml/html/classes.html">classes</a>)\n
 	*   <i>The Trinity HTML component.</i>
 	* - <a target="_top" href="kjs/html/index.html"><b>kjs</b></a>
         *   (<a target="_top" href="kjs/html/classes.html">classes</a>)\n
 	*   <i>Javascript (aka. ECMAScript and JScript) support.</i>
-	* - <a target="_top" href="kio/html/index.html"><b>kio</b></a>
-        *   (<a target="_top" href="kio/kio/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeio/html/index.html"><b>kio</b></a>
+        *   (<a target="_top" href="tdeio/tdeio/html/classes.html">classes</a>)\n
 	*   <i>Low level access to network files. Also provides access to facilities
 	*   such as KDirWatcher which monitors directories for changes.</i>
-	* - <a target="_top" href="kparts/html/index.html"><b>kparts</b></a>
-        *   (<a target="_top" href="kparts/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeparts/html/index.html"><b>tdeparts</b></a>
+        *   (<a target="_top" href="tdeparts/html/classes.html">classes</a>)\n
 	*   <i>Support for re-usable, embeddable, extendable applications.</i>
 	* - <a target="_top" href="dcop/html/index.html"><b>dcop</b></a>
         *   (<a target="_top" href="dcop/html/classes.html">classes</a>)\n
@@ -33,30 +33,30 @@
 	* - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a>
         *   (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n
 	*   <i>A library with pixmap effects.</i>
-	* - <a target="_top" href="kmdi/html/index.html"><b>kmdi</b></a>
-        *   (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdemdi/html/index.html"><b>tdemdi</b></a>
+        *   (<a target="_top" href="tdemdi/html/classes.html">classes</a>)\n
 	*   <i>MultiDocument Interface library.</i>
-	* - <a target="_top" href="libkmid/html/index.html"><b>libkmid</b></a>
-        *   (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="libtdemid/html/index.html"><b>libtdemid</b></a>
+        *   (<a target="_top" href="libtdemid/html/classes.html">classes</a>)\n
 	*   <i>Midi library.</i>
 	* - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a>
         *   (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n
 	*   <i>High level  printer control functionality.</i>
-	* - <a target="_top" href="krandr/html/index.html"><b>krandr</b></a>
-        *   (<a target="_top" href="krandr/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tderandr/html/index.html"><b>tderandr</b></a>
+        *   (<a target="_top" href="tderandr/html/classes.html">classes</a>)\n
 	*   <i>High level Xorg configuration via XRandr.</i>
 	* - <a target="_top" href="interfaces/html/index.html"><b>interfaces</b></a>
         *   (<a target="_top" href="interfaces/html/classes.html">classes</a>)\n
 	*   <i>Defines interfaces for common components so that new implementations
 	*   can be dropped in.</i>
-	* - <a target="_top" href="kabc/html/index.html"><b>kabc</b></a>
-        *   (<a target="_top" href="kabc/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeabc/html/index.html"><b>kabc</b></a>
+        *   (<a target="_top" href="tdeabc/html/classes.html">classes</a>)\n
 	*   <i>Access to the Trinity address book.</i>
-	* - <a target="_top" href="kresources/html/index.html"><b>kresources</b></a>
-        *   (<a target="_top" href="kresources/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tderesources/html/index.html"><b>tderesources</b></a>
+        *   (<a target="_top" href="tderesources/html/classes.html">classes</a>)\n
 	*   <i>The Trinity resources system.</i>
-	* - <a target="_top" href="kutils/html/index.html"><b>kutils</b></a>
-        *   (<a target="_top" href="kutils/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeutils/html/index.html"><b>tdeutils</b></a>
+        *   (<a target="_top" href="tdeutils/html/classes.html">classes</a>)\n
 	*   <i>High-level utils, like search/replace support.</i>
 	* - <a target="_top" href="arts/html/index.html"><b>arts</b></a>
         *   (<a target="_top" href="arts/html/classes.html">classes</a>)\n
@@ -67,8 +67,8 @@
 	* - <a target="_top" href="dnssd/html/index.html"><b>dnssd</b></a>
         *   (<a target="_top" href="dnssd/html/classes.html">classes</a>)\n
 	*   <i>Network sevices publishing and discovery.</i>
-	* - <a target="_top" href="kunittest/html/index.html"><b>kunittest</b></a>
-        *   (<a target="_top" href="kunittest/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdeunittest/html/index.html"><b>tdeunittest</b></a>
+        *   (<a target="_top" href="tdeunittest/html/classes.html">classes</a>)\n
 	*   <i>Unit testing framework in Trinity.</i>
 
 	*
diff --git a/Makefile.am.in b/Makefile.am.in
index 5690f976a..2ebb4f8c6 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -18,17 +18,17 @@
 #    Boston, MA 02110-1301, USA.
 
 
-COMPILE_FIRST = dcop libltdl tdefx tdecore kunittest tdeui tdesu kjs kwallet kio kded kded_post
+COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet kio kded kded_post
 COMPILE_BEFORE_doc = kdoctools
-COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr
-COMPILE_AFTER_tdeprint = kate khtml
-COMPILE_BEFORE_khtml = kutils
-COMPILE_BEFORE_kabc = kab kresources
-COMPILE_BEFORE_kate = interfaces kutils
-COMPILE_BEFORE_kmdi = kutils
-COMPILE_BEFORE_kspell2 = kutils
-COMPILE_BEFORE_kcmshell = kutils
-COMPILE_BEFORE_kdewidgets = kabc khtml
+COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint kinit kate interfaces tdecert tdehtml tderandr
+COMPILE_AFTER_tdeprint = kate tdehtml
+COMPILE_BEFORE_tdehtml = tdeutils
+COMPILE_BEFORE_kabc = kab tderesources
+COMPILE_BEFORE_kate = interfaces tdeutils
+COMPILE_BEFORE_tdemdi = tdeutils
+COMPILE_BEFORE_tdespell2 = tdeutils
+COMPILE_BEFORE_tdecmshell = tdeutils
+COMPILE_BEFORE_kdewidgets = kabc tdehtml
 COMPILE_BEFORE_interfaces = arts kabc
 
 $(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
@@ -39,7 +39,7 @@ potdir = $(kde_includes)
 pot_DATA = kde.pot
 
 messages:
-	cd kabc/scripts && perl ./makeaddressee
+	cd tdeabc/scripts && perl ./makeaddressee
 	find . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
 	mfs=`find . -name Makefile.am | xargs egrep -l '^messages:'` ;\
 	for dir in $$mfs; do \
@@ -54,7 +54,7 @@ messages:
 	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
 	echo ./tdecore/tde-config.cpp.in >> files ;\
-	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
+	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \
 	: > kde.pot ;\
 	$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
 	$(XGETTEXT) common_texts.cpp -o kde.pot
diff --git a/NAMING b/NAMING
index e13e1d0ce..d0d1a8d45 100644
--- a/NAMING
+++ b/NAMING
@@ -43,8 +43,8 @@ LDFLAGS: -module $(KDE_PLUGIN)
 
 KIOSlave
 ========
-Name: kio_<protocol>.la
-Definition: kde_module_LTLIBRARIES = kio_<protocol>.la
+Name: tdeio_<protocol>.la
+Definition: kde_module_LTLIBRARIES = tdeio_<protocol>.la
 LDFLAGS: -module $(KDE_PLUGIN)
 
 
diff --git a/README b/README
index bf87f3d51..c96978eb9 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ Here is an alphabetical list:
     communicate with KDE applications. It's also the base for KParts.
 
 * interfaces
-    kparts interface for text editors, mediaplayer and scripting.
+    tdeparts interface for text editors, mediaplayer and scripting.
 
 * kab
     OBSOLETE, see kabc: Used to be the address book library, but now only
@@ -39,10 +39,10 @@ Here is an alphabetical list:
 * kate
     KPart for 'kate', the KDE advanced text editor.
 
-* kcert
+* tdecert
     Personal certification manager.
 
-* kconf_update
+* tdeconf_update
     Auto-Updater for config files.
 
 * tdecore
@@ -73,7 +73,7 @@ Here is an alphabetical list:
     Contains mostly stuff convert XML docbook files via XSLT into
     human readable stuff.
 
-* khtml
+* tdehtml
     The next generation HTML rendering widget designed for Konqueror.  This
     supports HTML 4, CSS, and a variety of other web related standards.
 
@@ -86,30 +86,30 @@ Here is an alphabetical list:
 
 * kio
     Classes that fetch and decode URLs are contained here. This library also
-    contains "ksycoca", the system configure cache containing services,
+    contains "tdesycoca", the system configure cache containing services,
     applications, servicetypes and mimetypes.
 
-* kioslave
+* tdeioslave
     I/O subprocesses to handle files, ftp, http, gzip and bzip2 streams.
 
 * kjs
     Implementation of ECMAScript (aka JavaScript).
 
-* kparts
+* tdeparts
     KDE component model.
 
 * kstyles
     The theme engine lies within. It handles nearly anything relating to
     customizing the appearance of widgets.
 
-* kwallet
+* tdewallet
     Client and backend to store values in encrypted files.
 
-* libkmid
+* libtdemid
     MIDI file handling and midi mapper (manages output of midi files to
     various devices).
 
-* libkscreensaver
+* libtdescreensaver
     Library for making KDE screensavers.
 
 * libltdl
diff --git a/TODO b/TODO
index 9220d264b..fe2c608a0 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,7 @@ that we would like to make for the next binary incompatible release.
 
 - Check for forked classes in kde pim and other modules
 
-- There is no reason why KConfigBase should inherit from QObject, get rid of that.
+- There is no reason why TDEConfigBase should inherit from QObject, get rid of that.
 
 - Change all FooPrivate *d; -> Private * const d; and place initialization
   in the constructor (for classes that would benefit from this).  To help catch silly
@@ -11,20 +11,20 @@ that we would like to make for the next binary incompatible release.
   help prevent mistakes where developers forget to delete the pointer. Maybe make use of
   Qt4 helper macros? 
 
-- Move all utility functions away from KApplication. TBD: Make KApplication 
-  a very thin wrapper around QApplication. Ideally, KApplication should go 
+- Move all utility functions away from TDEApplication. TBD: Make TDEApplication 
+  a very thin wrapper around QApplication. Ideally, TDEApplication should go 
   away completely. The kapp pointer references everywhere must die. Find a 
   way to make that possible
 
 - Remove all KDE_NO_COMPAT from the KDE2 -> KDE3 port before adding new ones for KDE4.
 
-- Remove the smart-to-dumb-pointer conversion operator from KSharedPtr
+- Remove the smart-to-dumb-pointer conversion operator from TDESharedPtr
   and replace it with a T* Get() member function. An implict conversion is
   far too dangerous.
   See: http://groups.google.com/groups?selm=4ognb0%243cd%40linda.teleport.com&oe=UTF-8&output=gplain
-  Also free the client from the requirement to inherit from KShared.
+  Also free the client from the requirement to inherit from TDEShared.
 
-- Remove all KSocket, KServerSocket, KSocks and KExtendedSocket references
+- Remove all TDESocket, TDEServerSocket, KSocks and KExtendedSocket references
   throughout KDE in favor of KNetwork's socket implementations.
   Also, revise the namespace usage.
 	thiago.macieira@kdemail.net
@@ -33,7 +33,7 @@ that we would like to make for the next binary incompatible release.
 
 - Clean up the uses of virtual_hook, use normal virtuals instead (e.g. KZip/KArchive)
 
-- Make it possible to create a KSystemTray without a KMainWindow and instead lazily
+- Make it possible to create a KSystemTray without a TDEMainWindow and instead lazily
   create the main window on demand.
 
 - Make KSystemTray's Quit option in the context menu call kapp->quit() instead of
@@ -68,7 +68,7 @@ that we would like to make for the next binary incompatible release.
   KGuiItem has one of these dangerous ctors, too. KUser has a whole bunch
   of them.
 
-- Solve need for casting when using bitfield enums (e.g. KProcess::Communication),
+- Solve need for casting when using bitfield enums (e.g. TDEProcess::Communication),
   if Simon's solution works.
 
 - Merge tdelibs/tdecore/kuser.h and tdeadmin/kuser/kuser.h.
@@ -88,18 +88,18 @@ that we would like to make for the next binary incompatible release.
 - Other ideas in this thread: http://lists.kde.org/?l=kde-core-devel&m=107608067302571&w=2
   (Contributors to that thread, please add specific items here.)
 
-- KConfigBase: For all the read*Entry methods that take a QFont *, QPoint *, QSize *, etc.
+- TDEConfigBase: For all the read*Entry methods that take a QFont *, QPoint *, QSize *, etc.
   for the default value, add overloads that use a const reference, so that one can write 
   resize( config->readSizeEntry( "Bleh", size() ); for example. Constructing a null 
   QFont/QPoint/QSize is cheap enough to justify a consistent and usable API (IMHO) .
   Keep source compatibility.
 
-- Sort out reference counting of applications and KMainWindows: Add a setRefCountEnabled()
-  function to KApplication; deref()ing the last reference should only quit the application
+- Sort out reference counting of applications and TDEMainWindows: Add a setRefCountEnabled()
+  function to TDEApplication; deref()ing the last reference should only quit the application
   if reference counts are enabled, and the reference count should be disabled by default
-  so apps that don't use a KMainWindow mostly continue to work. Make the KMainWindow
-  constructor call setRefCountEnabled(true), and make each KMainWindow hold its own
-  reference to the application. The KMainWindow should drop its app reference on hide, and
+  so apps that don't use a TDEMainWindow mostly continue to work. Make the TDEMainWindow
+  constructor call setRefCountEnabled(true), and make each TDEMainWindow hold its own
+  reference to the application. The TDEMainWindow should drop its app reference on hide, and
   regain it on show.
 
   Make KSysTray also hold a reference to the app. Then apps that use more than one main
@@ -110,7 +110,7 @@ that we would like to make for the next binary incompatible release.
   calls (readBoolEntry()).  Although not technicaly a binary incompatiblity... 
   just something to bring up for possible change (for the better)
 
-  Use KConfigXT instead! /FransE
+  Use TDEConfigXT instead! /FransE
 
 - Is it really necessary to bother people using the KCM APIs with withFallback? I have
   never heard of it failing and when would you not like to have that fallback? I think
@@ -118,7 +118,7 @@ that we would like to make for the next binary incompatible release.
 
 - Do we need to have factory arguments in the KCM API? (who would use it anyway?)
 
-- KCModuleInfo should use d-pointer. Perhaps there is more classes.
+- TDECModuleInfo should use d-pointer. Perhaps there is more classes.
 
 - The config options in kdeglobals needs to be cleaned up a little. Perhaps I'm being picky..
 	* They should be named properly, for example "enableIcons" instead of "EnableIcons". Or atleast
@@ -133,7 +133,7 @@ that we would like to make for the next binary incompatible release.
 - kpassdlg.h needs to be renamed to kpassworddialog.h - consistent with other classes(it won't 
   break many apps). The class needs a facelift - see the comments in kpassdlg.{h,cpp}
 
-- KProcess needs a major facelift. Not all of these items need to be BIC, but not needing to
+- TDEProcess needs a major facelift. Not all of these items need to be BIC, but not needing to
   worry about legacy will certainly allow an overall cleaner solution.
   - the internals need to be encapsulated properly. many of the virtuals shouldn't be virtual;
     lots of protected members should be accessible only via accessors. the current model is
@@ -149,17 +149,17 @@ that we would like to make for the next binary incompatible release.
   - do something about the NoRead comm mode
   - add setComm(); remove comm arg from start(). as a side effect, this will allow for using
     writeStdin() in Block mode.
-  - merge KProcIO into KProcess; add setBuffered() for separate channels.
+  - merge KProcIO into TDEProcess; add setBuffered() for separate channels.
   - use QByteArray for writeStdin(). better than the buf+len arg, as it is ref-counted.
 
-- To discuss: Migrate the about dialog to use qhtml or khtml rather then the current
+- To discuss: Migrate the about dialog to use qhtml or tdehtml rather then the current
   setup of all of the widgets and sub widgets.  Might be a lot simpler, require a lot
   less code and be much more flexible for additions/enhancments.  Sidenote: currently
   the about information seems to be duplicated.
 
 - Make API use US English, (eg. KCatalogue -> KCatalog)
 
-- It would be nice if some insan^H^H^H brave soul had a look at the KAccel/KShortcut/KKeyWhatever
+- It would be nice if some insan^H^H^H brave soul had a look at the TDEAccel/TDEShortcut/KKeyWhatever
   classes and cleaned it up.
 
 - KKeyDialog needs to be improved. It should simplify using KKeyChooser by not having to instantiate
@@ -180,9 +180,9 @@ that we would like to make for the next binary incompatible release.
 
 - KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog
 
-- Make libkwalletclient part of libkio and get rid of libkwalletclient.
+- Make libtdewalletclient part of libtdeio and get rid of libtdewalletclient.
 
-- Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*,
+- Get rid of libtdesu dependency in libtdeio, get rid of SessionData::AuthData*,
   get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization
 
 - Make functions in KHelpMenu virtual so they can be overridden (ex: to provide
@@ -209,13 +209,13 @@ an alternative help->contents action)
 - Dump KPixmapIO class. QPixmap with qt-copy patches #0005 and #0007 can perform just as well,
   KPixmapIO can't dither, and it generally doesn't make much sense to have this class.
 
-- KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
+- TDEListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
   "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)
 
-- Move KIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
+- Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
   to merge that code.
 
-- Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore.
+- Refactor the tdeio/bookmarks code so we don't need to use the static d-pointer trick anymore.
 
 - Rename the parameters to KDEDesktopMimeType::pixmap so that they use meaningful names rather than
   just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea
@@ -223,7 +223,7 @@ an alternative help->contents action)
 
 - Move KRichTextLabel into tdeui if still required with Qt 4.
 
-- Add the concept of a session to KIO, in particular for KHTML so that it can
+- Add the concept of a session to KIO, in particular for TDEHTML so that it can
   have all of its jobs associated in some way (a unique key of sorts).  Will
   make SSL much easier to implement and allow removal of many hacks, mostly
   involving metadata.
diff --git a/admin b/admin
-Subproject 24a4b8adb3917095752bd4bee8674006e97e914
+Subproject 4027b878fb556a51ed29affd578e78aa7099748
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
index 3877ddb9d..3b585256d 100644
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -65,6 +65,6 @@ add_custom_command(
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK kio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop
+  LINK tdeio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/arts/kde/artskde.idl b/arts/kde/artskde.idl
index f31b49ed4..f1de50924 100644
--- a/arts/kde/artskde.idl
+++ b/arts/kde/artskde.idl
@@ -12,7 +12,7 @@ interface KFloatWatchProxy {
 /* 
  * used for deliviering MCOP data to the playobjects
  */
-interface KIOInputStream : InputStream {
+interface TDEIOInputStream : InputStream {
 	boolean openURL(string url);
 	
 	attribute long bufferPackets;
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index e030cb411..add7a7595 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -59,8 +59,8 @@ Arts::SoundServerV2 KArtsServer::server(void)
 
 	// aRts seems not to be running, let's try to run it
 	// First, let's read the configuration as in kcmarts
-	KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/);
-	KProcess proc;
+	TDEConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/);
+	TDEProcess proc;
 
 	config.setGroup("Arts");
 
@@ -77,16 +77,16 @@ Arts::SoundServerV2 KArtsServer::server(void)
 
 	X11CommConfig.sync();
 	
-	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data();
+	proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data();
 
 	if(rt)
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
+		proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
 	else
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
+		proc << TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
 
 	proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
 
-	if(proc.start(KProcess::Block) && proc.normalExit())
+	if(proc.start(TDEProcess::Block) && proc.normalExit())
 	{
 		// We could have a race-condition here.
 		// The correct way to do it is to make artsd fork-and-exit
diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cc
index adda3033a..1eb8c20e5 100644
--- a/arts/kde/kaudioconverter.cc
+++ b/arts/kde/kaudioconverter.cc
@@ -37,7 +37,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 using namespace std;
 
@@ -81,12 +81,12 @@ void KAudioConverter::requestPlayObject(const KURL &url)
 {	
 	string queryInterface = "Arts::PlayObject";
 	
-	Arts::KIOInputStream inputStream;
+	Arts::TDEIOInputStream inputStream;
 	
 	if(!url.isLocalFile())
 	{
-		Arts::KIOInputStream_impl *inputStreamImpl = new Arts::KIOInputStream_impl();
-		inputStream = Arts::KIOInputStream::_from_base(inputStreamImpl);
+		Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl();
+		inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl);
 
 		TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &)));
 
diff --git a/arts/kde/kaudioplaystream.cpp b/arts/kde/kaudioplaystream.cpp
index 52743a67e..0ef5b8332 100644
--- a/arts/kde/kaudioplaystream.cpp
+++ b/arts/kde/kaudioplaystream.cpp
@@ -26,7 +26,7 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp
index 0d180d1f1..0c11bcf04 100644
--- a/arts/kde/kaudiorecordstream.cpp
+++ b/arts/kde/kaudiorecordstream.cpp
@@ -29,7 +29,7 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc
index 5382e2095..647c2f320 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cc
@@ -3,10 +3,10 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <flowsystem.h>
 #include <kplayobject.h>
@@ -18,10 +18,10 @@
 using namespace std;
 using namespace Arts;
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+[URL]", I18N_NOOP("URL to open"), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 KConvertTest::KConvertTest()
@@ -55,13 +55,13 @@ void KConvertTest::slotRawStreamFinished()
 
 int main(int argc, char **argv)
 {
-	KAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
+	TDEAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
 							  
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions(options); 	
-	KApplication app;
+	TDECmdLineArgs::init(argc, argv, &aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options); 	
+	TDEApplication app;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	KURL url;
 	
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index 8c131bfd1..d893675cd 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -29,11 +29,11 @@
  * until the buffer is small enough again.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/kmimetype.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/kmimetype.h>
+#include <tdeio/jobclasses.h>
 #include <tqtimer.h>
 #include <tqdatastream.h>
 #include "artsversion.h"
@@ -41,9 +41,9 @@
 
 using namespace Arts;
 
-const unsigned int KIOInputStream_impl::PACKET_COUNT = 10;
+const unsigned int TDEIOInputStream_impl::PACKET_COUNT = 10;
 
-KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048)
+TDEIOInputStream_impl::TDEIOInputStream_impl() : m_packetSize(2048)
 {
 	m_job = 0;
 	m_finished = false;
@@ -55,13 +55,13 @@ KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048)
 	m_size = 0;
 }
 
-KIOInputStream_impl::~KIOInputStream_impl()
+TDEIOInputStream_impl::~TDEIOInputStream_impl()
 {
 	if(m_job != 0)
 	    m_job->kill();
 }
 
-void KIOInputStream_impl::streamStart()
+void TDEIOInputStream_impl::streamStart()
 {
 	// prevent kill/reconnect
 	if (m_streamStarted) {
@@ -75,37 +75,37 @@ void KIOInputStream_impl::streamStart()
 
 	if(m_job != 0)
 		m_job->kill();
-	m_job = KIO::get(m_url, false, false);
+	m_job = TDEIO::get(m_url, false, false);
 
 	m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
 	m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
 
-	TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-			 this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));		     
-	TQObject::connect(m_job, TQT_SIGNAL(result(KIO::Job *)),
-			 this, TQT_SLOT(slotResult(KIO::Job *)));		     
-	TQObject::connect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
-			 this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &)));
-	TQObject::connect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
-			 this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
+	TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+			 this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));		     
+	TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
+			 this, TQT_SLOT(slotResult(TDEIO::Job *)));		     
+	TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+			 this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
+	TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
+			 this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
 
 	m_streamStarted = true;
 }
 
-void KIOInputStream_impl::streamEnd()
+void TDEIOInputStream_impl::streamEnd()
 {
 	kdDebug( 400 ) << "streamEnd()\n";
 
 	if(m_job != 0)
 	{
-		TQObject::disconnect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-	    				this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
-		TQObject::disconnect(m_job, TQT_SIGNAL(result(KIO::Job *)),
-						this, TQT_SLOT(slotResult(KIO::Job *)));		     
-		TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)),
-				 this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &)));
-		TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)),
-				 this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
+		TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	    				this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+		TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
+						this, TQT_SLOT(slotResult(TDEIO::Job *)));		     
+		TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+				 this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
+		TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
+				 this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
 
 		if ( m_streamPulled )
 			outdata.endPull();
@@ -117,14 +117,14 @@ void KIOInputStream_impl::streamEnd()
 	m_streamStarted = false;
 }
 
-bool KIOInputStream_impl::openURL(const std::string& url)
+bool TDEIOInputStream_impl::openURL(const std::string& url)
 {
 	m_url = KURL(url.c_str());
 	m_size = 0;
 	return true;
 }
 
-void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data)
+void TDEIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data)
 {
 	if(m_finished)
 	    m_finished = false;
@@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data)
 	processQueue();
 }
 
-void KIOInputStream_impl::slotResult(KIO::Job *job)
+void TDEIOInputStream_impl::slotResult(TDEIO::Job *job)
 {
 	// jobs delete themselves after emitting their result
 	m_finished = true;
@@ -151,38 +151,38 @@ void KIOInputStream_impl::slotResult(KIO::Job *job)
 	}
 }
 
-void KIOInputStream_impl::slotScanMimeType(KIO::Job *, const TQString &mimetype)
+void TDEIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype)
 {
 	kdDebug( 400 ) << "got mimetype: " << mimetype << endl;
 	emit mimeTypeFound(mimetype);
 }
 
-void KIOInputStream_impl::slotTotalSize(KIO::Job *, KIO::filesize_t size)
+void TDEIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size)
 {
 	m_size = size;
 }
 
-bool KIOInputStream_impl::eof()
+bool TDEIOInputStream_impl::eof()
 {
 	return (m_finished && m_data.size() == 0);
 }
 
-bool KIOInputStream_impl::seekOk()
+bool TDEIOInputStream_impl::seekOk()
 {
 	return false;
 }
 
-long KIOInputStream_impl::size()
+long TDEIOInputStream_impl::size()
 {
 	return m_size ? m_size : m_data.size();
 }
 
-long KIOInputStream_impl::seek(long)
+long TDEIOInputStream_impl::seek(long)
 {
 	return -1;
 }
 
-void KIOInputStream_impl::processQueue()
+void TDEIOInputStream_impl::processQueue()
 {
 	if(m_job != 0)
 	{
@@ -210,7 +210,7 @@ void KIOInputStream_impl::processQueue()
 	}
 }
 
-void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
+void TDEIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
 {
 	processQueue();
 	packet->size = std::min(m_packetSize, (unsigned int)m_data.size());
@@ -233,4 +233,4 @@ void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
 	packet->send();
 }
 
-REGISTER_IMPLEMENTATION(KIOInputStream_impl);
+REGISTER_IMPLEMENTATION(TDEIOInputStream_impl);
diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h
index 5377fc808..1d18f6421 100644
--- a/arts/kde/kioinputstream_impl.h
+++ b/arts/kde/kioinputstream_impl.h
@@ -24,21 +24,21 @@
 
 #include <tqobject.h>
 #include <tqcstring.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include "artskde.h"
 #include "stdsynthmodule.h" 
 
 namespace Arts {
 
-class KIOInputStream_impl : public TQObject, virtual public KIOInputStream_skel, 
+class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_skel, 
 					    virtual public InputStream_skel,
 					    virtual public StdSynthModule
 {
 Q_OBJECT
 public:
-	KIOInputStream_impl();
-	~KIOInputStream_impl();
+	TDEIOInputStream_impl();
+	~TDEIOInputStream_impl();
 	
 	void streamStart();	
 	void streamEnd();
@@ -62,14 +62,14 @@ signals:
 	void mimeTypeFound(const TQString & mimetype);
 	
 private slots:
-	void slotData(KIO::Job *, const TQByteArray &);
-	void slotResult(KIO::Job *);
-	void slotScanMimeType(KIO::Job *, const TQString &mimetype);
-	void slotTotalSize(KIO::Job *, KIO::filesize_t size);
+	void slotData(TDEIO::Job *, const TQByteArray &);
+	void slotResult(TDEIO::Job *);
+	void slotScanMimeType(TDEIO::Job *, const TQString &mimetype);
+	void slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size);
 
 private:
 	KURL m_url;
-	KIO::TransferJob *m_job;
+	TDEIO::TransferJob *m_job;
 	TQByteArray m_data;
 	bool m_finished;
 	bool m_firstBuffer;
@@ -79,7 +79,7 @@ private:
 
 	unsigned int m_packetBuffer;
 	const unsigned int m_packetSize;
-	KIO::filesize_t m_size;
+	TDEIO::filesize_t m_size;
 	
 	static const unsigned int PACKET_COUNT;
 };
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index b5403ce0d..ed9a3fadf 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <kmedia2.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <connect.h>
-#include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include "qiomanager.h"
 #include "artskde.h"
 
@@ -12,25 +12,25 @@ using namespace std;
 using namespace Arts;
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+[URL]", I18N_NOOP("URL to open"), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
 {
-	KAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
+	TDEAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
 							  
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions(options); 	
-	KApplication app;
+	TDECmdLineArgs::init(argc,argv,&aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options); 	
+	TDEApplication app;
 	QIOManager qiomanager;
 	Dispatcher dispatcher(&qiomanager);
-	KIOInputStream stream;
+	TDEIOInputStream stream;
 	StdoutWriter writer;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	if(args->count())
 	{
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index fd5f1e129..93bfac388 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <kmedia2.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <connect.h>
-#include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <stdsynthmodule.h>
 #include "qiomanager.h"
 #include "artskde.h"
@@ -78,31 +78,31 @@ public:
 REGISTER_IMPLEMENTATION(KIOTestSlow_impl);
 };
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+[URL]", I18N_NOOP("URL to open"), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 #undef USE_FILEINPUTSTREAM
 
 int main(int argc, char **argv)
 {
-	KAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, "");
+	TDEAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, "");
 							  
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions(options); 	
-	KApplication app;
+	TDECmdLineArgs::init(argc,argv,&aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options); 	
+	TDEApplication app;
 	QIOManager qiomanager;
 	Dispatcher dispatcher(&qiomanager);
 #ifndef USE_FILEINPUTSTREAM
-	KIOInputStream stream;
+	TDEIOInputStream stream;
 #else
 	FileInputStream stream;
 #endif
 	KIOTestSlow writer;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 	if(args->count())
 	{
diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h
index 4aafe0b58..f5bd849be 100644
--- a/arts/kde/kplayobject.h
+++ b/arts/kde/kplayobject.h
@@ -126,7 +126,7 @@ class PlayObjectFactory;
   * This class acts as a general interface to the KDE multimedia framework.
   * You basically point the Playobject to an URL and say "play", and it will
   * automatically decode and play and / or display the file or stream.
-  * For non-local media, it will make extensive use of KIOInputStream to
+  * For non-local media, it will make extensive use of TDEIOInputStream to
   * directly play the content from the remote location without having to
   * download it to a temporary local file first.
   *
diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc
index b1969718e..039c8a3bc 100644
--- a/arts/kde/kplayobjectcreator.cc
+++ b/arts/kde/kplayobjectcreator.cc
@@ -19,7 +19,7 @@
 
 	*/
 
-#include <kio/kmimetype.h>
+#include <tdeio/kmimetype.h>
 #include "artskde.h"
 #include "kplayobjectcreator.h"
 #include "kplayobjectcreator.moc"
@@ -53,8 +53,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj
 		m_createBUS = createBUS;
 
 		// This is the RightWay(tm) according to stw
-		Arts::KIOInputStream_impl* instream_impl = new Arts::KIOInputStream_impl();
-		m_instream = Arts::KIOInputStream::_from_base(instream_impl);
+		Arts::TDEIOInputStream_impl* instream_impl = new Arts::TDEIOInputStream_impl();
+		m_instream = Arts::TDEIOInputStream::_from_base(instream_impl);
 
 		// signal will be called once the ioslave knows the mime-type of the stream
 		connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)),
diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h
index d52e18a1e..74e571c8e 100644
--- a/arts/kde/kplayobjectcreator.h
+++ b/arts/kde/kplayobjectcreator.h
@@ -46,7 +46,7 @@ private slots:
 
 private:
 	Arts::SoundServerV2 m_server;
-	Arts::KIOInputStream m_instream;
+	Arts::TDEIOInputStream m_instream;
 	Arts::PlayObject playObject;
 	bool m_createBUS;
 };
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index 29ee20e3d..1b6be9860 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -19,7 +19,7 @@
 
 	*/
 
-#include <kio/kmimetype.h>
+#include <tdeio/kmimetype.h>
 #include "kplayobject.h"
 #include "artskde.h"
 #include "kplayobjectfactory.h"
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include "kaudiomanagerplay.h"
 #include <flowsystem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 using namespace std;
 
@@ -68,14 +68,14 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri
 	// I hate it
 	// I hate it
 	// It sucks
-	// kio_media please die
-	KURL url = KIO::NetAccess::mostLocalURL(_url, 0);
+	// tdeio_media please die
+	KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0);
 
 	if(!m_server.isNull())
 	{
 		if(mimetype == "application/octet-stream" && m_allowStreaming)
 		{
-			Arts::KIOInputStream instream;
+			Arts::TDEIOInputStream instream;
 			instream.openURL(url.url().latin1());
 
 			m_stream = true;
@@ -139,8 +139,8 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
 	// I hate it
 	// I hate it
 	// It sucks
-	// kio_media please die
-	KURL url = KIO::NetAccess::mostLocalURL(_url, 0);
+	// tdeio_media please die
+	KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0);
 	
 	// return a NULL playobject if the server is NULL
 	if ( d->server.isNull() || url.isEmpty() )
@@ -154,7 +154,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
 		createBUS = false;
 	}
 
-	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
+	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over tdeio_audiocd
 	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
 	{
 		// we rely on the delivered mimetype if it's a local file
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index bc17f32d8..c03a18c21 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -26,8 +26,8 @@
 #define XEvent void
 #endif
 
-#include <kaction.h>
-#include <klocale.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
 #include "kvideowidget.h"
 
 
@@ -101,22 +101,22 @@ void KVideoWidget::init(void)
     videoHeight	     = 0;
 
     // Setup actions
-    new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
+    new TDEToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
 		       CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
 		       actionCollection(), "fullscreen_mode" );
-    new KRadioAction( i18n("&Half Size"), ALT+Key_0,
+    new TDERadioAction( i18n("&Half Size"), ALT+Key_0,
 		      TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
 		      actionCollection(), "half_size" );
-    new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
+    new TDERadioAction( i18n("&Normal Size"), ALT+Key_1,
 		      TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
 		      actionCollection(), "normal_size" );
-    new KRadioAction( i18n("&Double Size"), ALT+Key_2,
+    new TDERadioAction( i18n("&Double Size"), ALT+Key_2,
 		      TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
 		      actionCollection(), "double_size" );
 
-    ((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
-    ((KToggleAction *)action( "normal_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
-    ((KToggleAction *)action( "double_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
+    ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
+    ((TDEToggleAction *)action( "normal_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
+    ((TDEToggleAction *)action( "double_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
 
     action("double_size")->setEnabled(false);
     action("half_size")->setEnabled(false);
@@ -232,29 +232,29 @@ bool KVideoWidget::isEmbedded()
 
 bool KVideoWidget::isFullscreen()
 {
-    return ((KToggleAction *)action( "fullscreen_mode" ))->isChecked();
+    return ((TDEToggleAction *)action( "fullscreen_mode" ))->isChecked();
 }
 
 bool KVideoWidget::isHalfSize()
 {
-    return ((KToggleAction *)action( "half_size" ))->isChecked();
+    return ((TDEToggleAction *)action( "half_size" ))->isChecked();
 }
 
 bool KVideoWidget::isNormalSize()
 {
-    return ((KToggleAction *)action( "normal_size" ))->isChecked();
+    return ((TDEToggleAction *)action( "normal_size" ))->isChecked();
 }
 
 bool KVideoWidget::isDoubleSize()
 {
-    return ((KToggleAction *)action( "double_size" ))->isChecked();
+    return ((TDEToggleAction *)action( "double_size" ))->isChecked();
 }
 
 void KVideoWidget::setFullscreen()
 {
     if (!isFullscreen())
     {
-	((KToggleAction *)action( "fullscreen_mode" ))->setChecked( true );
+	((TDEToggleAction *)action( "fullscreen_mode" ))->setChecked( true );
 	fullscreenActivated();
     }
 }
@@ -263,26 +263,26 @@ void KVideoWidget::setWindowed()
 {
     if (isFullscreen())
     {
-	((KToggleAction *)action( "fullscreen_mode" ))->setChecked( false );
+	((TDEToggleAction *)action( "fullscreen_mode" ))->setChecked( false );
 	fullscreenActivated();
     }
 }
 
 void KVideoWidget::setHalfSize()
 {
-    ((KToggleAction *)action( "half_size" ))->setChecked( true );
+    ((TDEToggleAction *)action( "half_size" ))->setChecked( true );
     halfSizeActivated();
 }
 
 void KVideoWidget::setNormalSize()
 {
-    ((KToggleAction *)action( "normal_size" ))->setChecked( true );
+    ((TDEToggleAction *)action( "normal_size" ))->setChecked( true );
     normalSizeActivated();
 }
 
 void KVideoWidget::setDoubleSize()
 {
-    ((KToggleAction *)action( "double_size" ))->setChecked( true );
+    ((TDEToggleAction *)action( "double_size" ))->setChecked( true );
     doubleSizeActivated();
 }
 
@@ -323,18 +323,18 @@ void KVideoWidget::resizeEvent( TQResizeEvent *event )
     {
 	if (width() == QMAX( (videoWidth / 2), minimumWidth() ) &&
 	         height() == QMAX( (videoHeight / 2), minimumHeight() ))
-	    ((KToggleAction *)action( "half_size" ))->setChecked( true );
+	    ((TDEToggleAction *)action( "half_size" ))->setChecked( true );
 	else if (width() == QMAX( videoWidth, minimumWidth() ) &&
 		 height() == QMAX( videoHeight, minimumHeight() ))
-	    ((KToggleAction *)action( "normal_size" ))->setChecked( true );
+	    ((TDEToggleAction *)action( "normal_size" ))->setChecked( true );
 	else if (width() == QMAX( (2 * videoWidth), minimumWidth() ) &&
 		 height() == QMAX( (2 * videoHeight), minimumHeight() ))
-	    ((KToggleAction *)action( "double_size" ))->setChecked( true );
+	    ((TDEToggleAction *)action( "double_size" ))->setChecked( true );
 	else
 	{
-	    ((KToggleAction *)action( "half_size" ))->setChecked( false );
-	    ((KToggleAction *)action( "normal_size" ))->setChecked( false );
-	    ((KToggleAction *)action( "double_size" ))->setChecked( false );
+	    ((TDEToggleAction *)action( "half_size" ))->setChecked( false );
+	    ((TDEToggleAction *)action( "normal_size" ))->setChecked( false );
+	    ((TDEToggleAction *)action( "double_size" ))->setChecked( false );
 	}
     }
 }
diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp
index 2ba71b64c..d5e8c8642 100644
--- a/arts/kde/mcop-dcop/kmcop.cpp
+++ b/arts/kde/mcop-dcop/kmcop.cpp
@@ -18,9 +18,9 @@
 
 #include <kdebug.h>
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 #include <tqvaluelist.h>
@@ -48,12 +48,12 @@ public:
 
 int main(int argc, char **argv)
 {
-    KAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
+    TDEAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"),
                          "0.1", I18N_NOOP("TDE MCOP-DCOP Bridge"),
-                         KAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
+                         TDEAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann");
     aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org");
 
-    KCmdLineArgs::init(argc, argv, &aboutdata);
+    TDECmdLineArgs::init(argc, argv, &aboutdata);
     KUniqueApplication::addCmdLineOptions();
 
     if(!KUniqueApplication::start())
diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am
index 115eed4b8..970b75055 100644
--- a/arts/knotify/Makefile.am
+++ b/arts/knotify/Makefile.am
@@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
 check_PROGRAMS		= knotifytest
 knotifytest_SOURCES	= knotifytest.cpp
 knotifytest_LDADD	= $(LIB_TDECORE)
-knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 noinst_HEADERS	=  knotify.h
 
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index c6bba7115..313a7a993 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -44,17 +44,17 @@
 
 // KDE headers
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #ifndef WITHOUT_ARTS
 #include <kartsdispatcher.h>
 #include <kartsserver.h>
 #endif
-#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdecmdlineargs.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <kiconloader.h>
 #include <kmacroexpander.h>
@@ -73,12 +73,12 @@
 class KNotifyPrivate
 {
 public:
-    KConfig* globalEvents;
-    KConfig* globalConfig;
-    TQMap<TQString, KConfig*> events;
-    TQMap<TQString, KConfig*> configs;
+    TDEConfig* globalEvents;
+    TDEConfig* globalConfig;
+    TQMap<TQString, TDEConfig*> events;
+    TQMap<TQString, TDEConfig*> configs;
     TQString externalPlayer;
-    KProcess *externalPlayerProc;
+    TDEProcess *externalPlayerProc;
 
 #ifndef WITHOUT_ARTS
     TQPtrList<KDE::PlayObject> playObjects;
@@ -105,15 +105,15 @@ extern "C"{
 
 KDE_EXPORT int kdemain(int argc, char **argv)
 {
-    KAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
+    TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
                          "3.0", I18N_NOOP("TDE Notification Server"),
-                         KAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
+                         TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers");
     aboutdata.addAuthor("Carsten Pfeiffer",I18N_NOOP("Current Maintainer"),"pfeiffer@kde.org");
     aboutdata.addAuthor("Christian Esken",0,"esken@kde.org");
     aboutdata.addAuthor("Stefan Westerfeld",I18N_NOOP("Sound support"),"stefan@space.twc.de");
     aboutdata.addAuthor("Charles Samuels",I18N_NOOP("Previous Maintainer"),"charles@kde.org");
 
-    KCmdLineArgs::init( argc, argv, &aboutdata );
+    TDECmdLineArgs::init( argc, argv, &aboutdata );
     KUniqueApplication::addCmdLineOptions();
 
 
@@ -136,8 +136,8 @@ KDE_EXPORT int kdemain(int argc, char **argv)
     // abort this.
 
 #ifndef WITHOUT_ARTS
-    KConfigGroup config( KGlobal::config(), "StartProgress" );
-    KConfig artsKCMConfig( "kcmartsrc" );
+    TDEConfigGroup config( TDEGlobal::config(), "StartProgress" );
+    TDEConfig artsKCMConfig( "kcmartsrc" );
     artsKCMConfig.setGroup( "Arts" );
     bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true );
     if (useArts)
@@ -245,8 +245,8 @@ KNotify::KNotify( bool useArts )
     : TQObject(), DCOPObject("Notify")
 {
     d = new KNotifyPrivate;
-    d->globalEvents = new KConfig("knotify/eventsrc", true, false, "data");
-    d->globalConfig = new KConfig("knotify.eventsrc", true, false);
+    d->globalEvents = new TDEConfig("knotify/eventsrc", true, false, "data");
+    d->globalConfig = new TDEConfig("knotify.eventsrc", true, false);
     d->externalPlayerProc = 0;
     d->useArts = useArts;
     d->inStartup = true;
@@ -285,7 +285,7 @@ KNotify::~KNotify()
 
 void KNotify::loadConfig() {
     // load external player settings
-    KConfig *kc = KGlobal::config();
+    TDEConfig *kc = TDEGlobal::config();
     kc->setGroup("Misc");
     d->useExternal = kc->readBoolEntry( "Use external player", false );
     d->externalPlayer = kc->readPathEntry("External player");
@@ -296,7 +296,7 @@ void KNotify::loadConfig() {
         players << "wavplay" << "aplay" << "auplay";
         TQStringList::Iterator it = players.begin();
         while ( d->externalPlayer.isEmpty() && it != players.end() ) {
-            d->externalPlayer = KStandardDirs::findExe( *it );
+            d->externalPlayer = TDEStandardDirs::findExe( *it );
             ++it;
         }
     }
@@ -313,7 +313,7 @@ void KNotify::reconfigure()
 
     // clear loaded config files
     d->globalConfig->reparseConfiguration();
-    for ( TQMapIterator<TQString,KConfig*> it = d->configs.begin(); it != d->configs.end(); ++it )
+    for ( TQMapIterator<TQString,TDEConfig*> it = d->configs.begin(); it != d->configs.end(); ++it )
         delete it.data();
     d->configs.clear();
 }
@@ -344,8 +344,8 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
     }
 
     TQString commandline;
-    KConfig *eventsFile = NULL;
-    KConfig *configFile = NULL;
+    TDEConfig *eventsFile = NULL;
+    TDEConfig *configFile = NULL;
 
     // check for valid events
     if ( !event.isEmpty() ) {
@@ -354,13 +354,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
         if ( d->events.contains( fromApp ) ) {
             eventsFile = d->events[fromApp];
         } else {
-            eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
+            eventsFile=new TDEConfig(locate("data", fromApp+"/eventsrc"),true,false);
             d->events.insert( fromApp, eventsFile );
         }
         if ( d->configs.contains( fromApp) ) {
             configFile = d->configs[fromApp];
         } else {
-            configFile=new KConfig(fromApp+".eventsrc",true,false);
+            configFile=new TDEConfig(fromApp+".eventsrc",true,false);
             d->configs.insert( fromApp, configFile );
         }
 
@@ -452,7 +452,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
     if ( TQFileInfo(sound).isRelative() )
     {
         TQString search = TQString("%1/sounds/%2").arg(appname).arg(sound);
-        soundFile = KGlobal::instance()->dirs()->findResource("data", search);
+        soundFile = TDEGlobal::instance()->dirs()->findResource("data", search);
         if ( soundFile.isEmpty() )
             soundFile = locate( "sound", sound );
     }
@@ -537,12 +537,12 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
 
     } else if(!d->externalPlayer.isEmpty()) {
         // use an external player to play the sound
-        KProcess *proc = d->externalPlayerProc;
+        TDEProcess *proc = d->externalPlayerProc;
         if (!proc)
         {
-           proc = d->externalPlayerProc = new KProcess;
-           connect( proc, TQT_SIGNAL( processExited( KProcess * )),
-                    TQT_SLOT( slotPlayerProcessExited( KProcess * )));
+           proc = d->externalPlayerProc = new TDEProcess;
+           connect( proc, TQT_SIGNAL( processExited( TDEProcess * )),
+                    TQT_SLOT( slotPlayerProcessExited( TDEProcess * )));
         }
         if (proc->isRunning())
         {
@@ -552,7 +552,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
         proc->clearArguments();
         (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data();
         d->externalPlayerEventId = eventId;
-        proc->start(KProcess::NotifyOnExit);
+        proc->start(TDEProcess::NotifyOnExit);
         return true;
     }
 
@@ -588,14 +588,14 @@ bool KNotify::notifyByMessagebox(const TQString &text, int level, WId winId)
 
 bool KNotify::notifyByPassivePopup( const TQString &text,
                                     const TQString &appName,
-                                    KConfig* eventsFile,
+                                    TDEConfig* eventsFile,
                                     WId senderWinId )
 {
-    KIconLoader iconLoader( appName );
+    TDEIconLoader iconLoader( appName );
     if ( eventsFile != NULL ) {
-        KConfigGroup config( eventsFile, "!Global!" );
+        TDEConfigGroup config( eventsFile, "!Global!" );
         TQString iconName = config.readEntry( "IconName", appName );
-        TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small );
+        TQPixmap icon = iconLoader.loadIcon( iconName, TDEIcon::Small );
         TQString title = config.readEntry( "Comment", appName );
         KPassivePopup::message(title, text, icon, senderWinId);
     } else
@@ -619,10 +619,10 @@ bool KNotify::notifyByExecute(const TQString &command, const TQString& event,
         if ( execLine.isEmpty() )
             execLine = command; // fallback
 
-	KProcess p;
+	TDEProcess p;
 	p.setUseShell(true);
 	p << execLine;
-	p.start(KProcess::DontCare);
+	p.start(TDEProcess::DontCare);
 	return true;
     }
     return false;
@@ -721,7 +721,7 @@ bool KNotify::isPlaying( const TQString& soundFile ) const
     return false;
 }
 
-void KNotify::slotPlayerProcessExited( KProcess *proc )
+void KNotify::slotPlayerProcessExited( TDEProcess *proc )
 {
     soundFinished( d->externalPlayerEventId,
                    (proc->normalExit() && proc->exitStatus() == 0) ? PlayedOK : Unknown );
diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h
index 12e699299..410821af8 100644
--- a/arts/knotify/knotify.h
+++ b/arts/knotify/knotify.h
@@ -25,8 +25,8 @@
 #include <dcopobject.h>
 
 class KNotifyPrivate;
-class KProcess;
-class KConfig;
+class TDEProcess;
+class TDEConfig;
 
 class KNotify : public TQObject, public DCOPObject
 {
@@ -75,7 +75,7 @@ private:
 	bool notifyByLogfile(const TQString &text, const TQString &file);
 	bool notifyByStderr(const TQString &text);
 	bool notifyByPassivePopup(const TQString &text, const TQString &appName,
-                                  KConfig* eventsFile, WId winId );
+                                  TDEConfig* eventsFile, WId winId );
 	bool notifyByExecute(const TQString &command, 
                              const TQString& event, 
                              const TQString& fromApp, 
@@ -98,7 +98,7 @@ private:
 
 private slots:
     void playTimeout();
-    void slotPlayerProcessExited( KProcess *proc );
+    void slotPlayerProcessExited( TDEProcess *proc );
     void restartedArtsd();
 
 private:
diff --git a/arts/knotify/knotifytest.cpp b/arts/knotify/knotifytest.cpp
index 9ca10cb9d..0f370d80a 100644
--- a/arts/knotify/knotifytest.cpp
+++ b/arts/knotify/knotifytest.cpp
@@ -1,11 +1,11 @@
 #include <string>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 
 int main(int argc, char **argv)
 {
-  KApplication app(argc, argv, "knotifytest");
+  TDEApplication app(argc, argv, "knotifytest");
 
 //
   while (1) {
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index c82acfa32..eaa5c8e2c 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -31,15 +31,15 @@ Gnome, etc. and used instead.
 
 #include <tqregexp.h>
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdemessagebox.h>
+#include <tdecmdlineargs.h>
 
 // command line options
-static KCmdLineOptions options[] = 
+static TDECmdLineOptions options[] = 
   {
 	  { "e", 0,0 },
 	  { "error", I18N_NOOP("Display error message (default)"), 0 },
@@ -48,21 +48,21 @@ static KCmdLineOptions options[] =
 	  { "i", 0, 0 },
 	  { "info", I18N_NOOP("Display informational message"), 0 },
 	  { "+message", I18N_NOOP("Message string to be displayed"), 0 },
-	  KCmdLineLastOption // End of options.
+	  TDECmdLineLastOption // End of options.
   };
 
-KAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
+TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
 					 I18N_NOOP("Utility to display aRts error messages"),
-					 KAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org");
+					 TDEAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org");
 
 int main(int argc, char **argv) {
 	aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org");
-	KGlobal::locale()->setMainCatalogue("tdelibs");
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions(options);
-	KApplication app;
+	TDEGlobal::locale()->setMainCatalogue("tdelibs");
+	TDECmdLineArgs::init(argc, argv, &aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options);
+	TDEApplication app;
 	
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	TQString msg;
 
 	// must be at least one argument
diff --git a/cmake b/cmake
-Subproject 0953d90e24d84a91d72f741f3f8ea5791d84f41
+Subproject ba27b9f2328dabe778a9e129e96b706797da85f
diff --git a/configure.in.in b/configure.in.in
index 2fe0ee86e..5b7192ffa 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -249,18 +249,18 @@ AC_SUBST(LIBRESOLV)
 AC_SUBST(LIBICE)
 
 AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
-AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
+AC_SUBST(LIB_TDEABC, '$(top_builddir)/tdeabc/libkabc.la')
 AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
 AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
-AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
-AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
-AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
-AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
+AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')
+AC_SUBST(LIB_TDEFILE, '$(top_builddir)/tdeio/libtdeio.la')
+AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la')
+AC_SUBST(LIB_TDEHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
 AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
-AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
+AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
 AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
 AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
-AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/kunittest/libkunittest.la')
+AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/tdeunittest/libtdeunittest.la')
 case $host in 
 	*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;
 	*) lib_kded='' ;;
@@ -307,8 +307,8 @@ AC_SUBST(ICE_RLIB, 'ICE/libkICE.la')
 AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
 AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
 AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
-AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets')
-AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/kconfig_compiler/kconfig_compiler')
+AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/maketdewidgets')
+AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/tdeconfig_compiler/tdeconfig_compiler')
 
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $X_LDFLAGS -lICE"
diff --git a/configure.in.mid b/configure.in.mid
index 669f0d13c..bf0c8d021 100644
--- a/configure.in.mid
+++ b/configure.in.mid
@@ -1,7 +1,7 @@
 dnl put here things which have to be done after all usual autoconf macros
 dnl have been run, but before the Makefiles are created
 
-all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
+all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdeio/tdeio -I$(top_srcdir)/tdeio/tdefile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
 AC_SUBST(all_includes)
 
 CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 071136a4f..4c98b6df2 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -74,18 +74,18 @@ compiler later.
 Establishing the Connection:
 ----------------------------
 
-KApplication has gained a method called "KApplication::dcopClient()"
+TDEApplication has gained a method called "TDEApplication::dcopClient()"
 which returns a pointer to a DCOPClient instance.  The first time this
 method is called, the client class will be created.  DCOPClients have
 unique identifiers attached to them which are based on what
-KApplication::name() returns.  In fact, if there is only a single
+TDEApplication::name() returns.  In fact, if there is only a single
 instance of the program running, the appId will be equal to
-KApplication::name().
+TDEApplication::name().
 
 To actually enable DCOP communication to begin, you must use
 DCOPClient::attach().  This will attempt to attach to the DCOP server.
 If no server is found or there is any other type of error, attach()
-will return false. KApplication will catch a dcop signal and display an
+will return false. TDEApplication will catch a dcop signal and display an
 appropriate error message box in that case.
 
 After connecting with the server via DCOPClient::attach(), you need to
@@ -100,7 +100,7 @@ case:
  */
 appId = client->registerAs(kApp->name());
 
-If you never retrieve the DCOPClient pointer from KApplication, the
+If you never retrieve the DCOPClient pointer from TDEApplication, the
 object will not be created and thus there will be no memory overhead.
 
 You may also detach from the server by calling DCOPClient::detach().
@@ -309,8 +309,8 @@ in that case the signal connection will always be deleted.
 A receiver can create a non-volatile connection while the sender doesn't (yet)
 exist. An anonymous DCOP connection should always be non-volatile.
 
-The following example shows how KLauncher emits a signal whenever it notices
-that an application that was started via KLauncher terminates.
+The following example shows how TDELauncher emits a signal whenever it notices
+that an application that was started via TDELauncher terminates.
 
    QByteArray params;
    QDataStream stream(params, IO_WriteOnly);
@@ -319,7 +319,7 @@ that an application that was started via KLauncher terminates.
 
 The task manager of the TDE panel connects to this signal. It uses an 
 anonymous connection (it doesn't require that the signal is being emitted
-by KLauncher) that is non-volatile:
+by TDELauncher) that is non-volatile:
 
    connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);
 
@@ -491,13 +491,13 @@ A few back-of-the-napkin tests folks:
 
 Code:
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char **argv)
 {
-  KApplication *app;
+  TDEApplication *app;
 
-  app = new KApplication(argc, argv, "testit");
+  app = new TDEApplication(argc, argv, "testit");
   return app->exec();
 }
 
@@ -515,7 +515,7 @@ VmStk:        20 kB
 VmExe:         4 kB
 VmLib:      6588 kB
 
-If I create the KApplication's DCOPClient, and call attach() and
+If I create the TDEApplication's DCOPClient, and call attach() and
 registerAs(), it changes to this:
 
 VmSize:     8080 kB
@@ -531,8 +531,8 @@ resident, but no more data or stack.  So this will be shared between all
 processes, right?  100k to enable DCOP in all apps doesn't seem bad at
 all. :)
 
-OK now for some timings.  Just creating a KApplication and then exiting
-(i.e. removing the call to KApplication::exec) takes this much time:
+OK now for some timings.  Just creating a TDEApplication and then exiting
+(i.e. removing the call to TDEApplication::exec) takes this much time:
 
 0.28user 0.02system 0:00.32elapsed 92%CPU (0avgtext+0avgdata 0maxresident)k
 0inputs+0outputs (1084major+62minor)pagefaults 0swaps
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index a92fb4e50..62fd3cf44 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -38,18 +38,18 @@ The manual method is covered first, followed by the automatic IDL method.
 
 \section establish Establishing the Connection:
 
-KApplication has gained a method called \p KApplication::dcopClient()
+TDEApplication has gained a method called \p TDEApplication::dcopClient()
 which returns a pointer to a DCOPClient instance.  The first time this
 method is called, the client class will be created.  DCOPClients have
 unique identifiers attached to them which are based on what
-KApplication::name() returns.  In fact, if there is only a single
+TDEApplication::name() returns.  In fact, if there is only a single
 instance of the program running, the appId will be equal to
-KApplication::name().
+TDEApplication::name().
 
 To actually enable DCOP communication to begin, you must use
 \p DCOPClient::attach().  This will attempt to attach to the DCOP server.
 If no server is found or there is any other type of error, 
-DCOPClient::attach() will return false. KApplication will catch a dcop 
+DCOPClient::attach() will return false. TDEApplication will catch a dcop 
 signal and display an appropriate error message box in that case.
 
 After connecting with the server via DCOPClient::attach(), you need to
@@ -62,7 +62,7 @@ case:
 appId = client->registerAs(kapp->name());
 \endcode
 
-If you never retrieve the DCOPClient pointer from KApplication, the
+If you never retrieve the DCOPClient pointer from TDEApplication, the
 object will not be created and thus there will be no memory overhead.
 
 You may also detach from the server by calling DCOPClient::detach().
@@ -541,8 +541,8 @@ in that case the signal connection will always be deleted.
 A receiver can create a non-volatile connection while the sender doesn't (yet)
 exist. An anonymous DCOP connection should always be non-volatile.
 
-The following example shows how KLauncher emits a signal whenever it notices
-that an application that was started via KLauncher terminates:
+The following example shows how TDELauncher emits a signal whenever it notices
+that an application that was started via TDELauncher terminates:
 
 \code
 QByteArray params;
@@ -553,7 +553,7 @@ kapp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);
 
 The task manager of the Trinity panel connects to this signal. It uses an 
 anonymous connection (it doesn't require that the signal is being emitted
-by KLauncher) that is non-volatile:
+by TDELauncher) that is non-volatile:
 
 \code
 connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index d59b75cdb..57ce71786 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -50,15 +50,15 @@ dcopserver_la_LIBADD  = libDCOP.la $(LIB_QT)
 
 dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
 
-testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testdcop_SOURCES = testdcop.cpp
 testdcop_LDADD = libDCOP.la
 
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
 dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
 
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testdcopc_SOURCES = testdcopc.c dcopc.c
 testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
 
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index a4bcb67bb..940d62fd6 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -166,16 +166,16 @@ bool launchApp(TQString app)
     TQDataStream arg(data, IO_WriteOnly);
     arg << app << URLs;
 
-    if ( !dcop->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+    if ( !dcop->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/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index 737184385..a3ea04726 100644
--- a/dcop/client/dcopstart.cpp
+++ b/dcop/client/dcopstart.cpp
@@ -49,7 +49,7 @@ void startApp(const char *_app, int argc, const char **args)
     TQDataStream arg(data, IO_WriteOnly);
     arg << app << URLs;
 
-    if ( !dcop->call( "klauncher", "klauncher", function,  data, replyType, replyData) ) {
+    if ( !dcop->call( "tdelauncher", "tdelauncher", function,  data, replyType, replyData) ) {
 	tqWarning( "call failed");
         exit(1);
     } else {
diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp
index 66bd5088a..1ab43f730 100644
--- a/dcop/dcop_deadlock_test.cpp
+++ b/dcop/dcop_deadlock_test.cpp
@@ -71,8 +71,8 @@ tqWarning("%s: Got result '%s' %d:%06d", name(), result.latin1(), tv.tv_sec % 10
 
 int main(int argc, char **argv)
 {
-  TQCString myName = KApplication::dcopClient()->registerAs("testdcop", false);
-  KApplication app(argc, argv, "testdcop");
+  TQCString myName = TDEApplication::dcopClient()->registerAs("testdcop", false);
+  TDEApplication app(argc, argv, "testdcop");
 
   tqWarning("%d:I am '%s'", getpid(), app.dcopClient()->appId().data());
   
diff --git a/dcop/dcop_deadlock_test.h b/dcop/dcop_deadlock_test.h
index 0557e7062..461c53cba 100644
--- a/dcop/dcop_deadlock_test.h
+++ b/dcop/dcop_deadlock_test.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _TESTDCOP_H_
 #define _TESTDCOP_H_
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <dcopobject.h>
 
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 7595cfc2b..8421c7b80 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -41,7 +41,7 @@ typedef TQValueList<TQCString> QCStringList;
  * for KDE applications.
  *
  * This class provides IPC and RPC for KDE applications.  Usually you
- * will not have to instantiate one yourself because KApplication
+ * will not have to instantiate one yourself because TDEApplication
  * contains a method to return a pointer to a DCOPClient object which
  * can be used for your whole application.
  *
@@ -62,7 +62,7 @@ typedef TQValueList<TQCString> QCStringList;
  *   client->send("someApp", "someObject", "someFunction(TQString)", data);
  * \endcode
  *
- * @see KApplication::dcopClient()
+ * @see TDEApplication::dcopClient()
  * @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org>
  */
 class DCOP_EXPORT DCOPClient : public TQObject
@@ -675,7 +675,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * Returns the application's main dcop client. The main client can
    * be used by objects that do not have any specific access to a dcop
    * client. In KDE applications, the main client usually is the same
-   * as KApplication::dcopClient().
+   * as TDEApplication::dcopClient().
    * @return the application's main dcop client
    */
   static DCOPClient* mainClient();
@@ -684,7 +684,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
    * Sets the application's main dcop client. The main client can
    * be used by objects that do not have any specific access to a dcop
    * client. In KDE applications, the main client usually is the same
-   * as KApplication::dcopClient().
+   * as TDEApplication::dcopClient().
    * @param mainClient the new main dcop client
    */
   static void setMainClient( DCOPClient* mainClient);
@@ -772,7 +772,7 @@ signals:
    * synchronous call. In that case, it will enter a local event
    * loop to keep the GUI updated until finally an answer arrives.
    *
-   * In KDE, the KApplication object connects to this signal to be
+   * In KDE, the TDEApplication object connects to this signal to be
    * able to block any user input (i.e. mouse and key events) while
    * we are waiting for an answer. If we did not do this, the
    * application might end up in an illegal state, as a keyboard
diff --git a/dcop/dcopidl/dcopidl_test.h b/dcop/dcopidl/dcopidl_test.h
index 2e896fb52..6f39cab99 100644
--- a/dcop/dcopidl/dcopidl_test.h
+++ b/dcop/dcopidl/dcopidl_test.h
@@ -14,7 +14,7 @@ class Test2;
 // this has to work too
 #include <tqstring.h>
 
-typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
 class Test3;
 
 // Those namespaces are opened and closed, so they should be just ignored
@@ -78,7 +78,7 @@ private:
     Test3 *doc();
 
     struct KIODownload;
-    typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+    typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
 };
 
 class Test2 : public DCOPObject
diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h
index a6c72a888..66f18f92f 100644
--- a/dcop/dcopidl2cpp/dcopidl_test.h
+++ b/dcop/dcopidl2cpp/dcopidl_test.h
@@ -1,4 +1,4 @@
-#include <klistview.h>
+#include <tdelistview.h>
 #include "main.h"
 
 #ifndef TEST_H
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 41f49333d..ec16d8fa8 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -1514,7 +1514,7 @@ sub makeParamList($$$)
 		}
 
 		if (defined $defaultparam && $isEnum) {
-			# Remove any casts in enum values, for example this in kfileitem.h:
+			# Remove any casts in enum values, for example this in tdefileitem.h:
 			#  'enum { Unknown = (mode_t) - 1 };'
 			$defaultparam =~ s/\([^\)]+\)(.*[0-9].*)/$1/;
 		}
diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index 5e4cd00c7..1e70171d2 100644
--- a/dcop/testdcop.cpp
+++ b/dcop/testdcop.cpp
@@ -258,12 +258,12 @@ int main(int argc, char **argv)
 	foundApp.data(), foundObj.data());
 
   // Find an object called "object1" in any application.
-  boolResult = client->findObject( "", "ksycoca", "", data, foundApp, foundObj);
+  boolResult = client->findObject( "", "tdesycoca", "", data, foundApp, foundObj);
   tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 	foundApp.data(), foundObj.data());
 
   // Find ourselves in any application.
-  boolResult = client->findObject( "testdcop", "ksycoca", "", data, foundApp, foundObj);
+  boolResult = client->findObject( "testdcop", "tdesycoca", "", data, foundApp, foundObj);
   tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
 	foundApp.data(), foundObj.data());
 
diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp
index 0c9513305..18b983829 100644
--- a/dcop/tests/driver.cpp
+++ b/dcop/tests/driver.cpp
@@ -1,8 +1,8 @@
 #include "driver.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <iostream>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqtimer.h>
 #include <tqtimer.h>
 
@@ -53,8 +53,8 @@ int main(int argc, char** argv)
 	if ( argc < 2 ) { tqWarning("Usage: driver <appid>"); return 1; }
 	const char* appname = strdup( argv[ 1 ] );
 	argv[ 1 ] = 0; // sue me
-	KCmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
-	KApplication app;
+	TDECmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
+	TDEApplication app;
 	app.dcopClient()->attach(  );
 	app.dcopClient()->registerAs( "TestAppDriver" );
 	Driver * object = new Driver( appname );
diff --git a/dcop/tests/test.cpp b/dcop/tests/test.cpp
index 7f5114071..4a751c358 100644
--- a/dcop/tests/test.cpp
+++ b/dcop/tests/test.cpp
@@ -1,8 +1,8 @@
 #include "test.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <iostream>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 
 
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 		batch();
 		return 0;
 	}
-	KCmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
-	KApplication app;
+	TDECmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
+	TDEApplication app;
 	if(!app.dcopClient()->attach(  ))
 		return 1;
 
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 3df24100b..01be9831c 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -31,9 +31,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd )
 
 
-##### kdnssd ####################################
+##### tdednssd ####################################
 
-set( target kdnssd )
+set( target tdednssd )
 
 set( ${target}_SRCS
   remoteservice.cpp responder.cpp servicebase.cpp
@@ -45,6 +45,6 @@ tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
   LINK tdecore-shared
-  DEPENDENCIES kconfig_compiler
+  DEPENDENCIES tdeconfig_compiler
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am
index c24bdd6ba..25e749d72 100644
--- a/dnssd/Makefile.am
+++ b/dnssd/Makefile.am
@@ -7,16 +7,16 @@ noinst_HEADERS = sdevent.h
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
-lib_LTLIBRARIES =  libkdnssd.la
+lib_LTLIBRARIES =  libtdednssd.la
 
-libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
+libtdednssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
 				settings.kcfgc publicservice.cpp query.cpp domainbrowser.cpp servicebrowser.cpp
 dnssdincludedir = $(includedir)/dnssd
 dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
 	publicservice.h servicebase.h servicebrowser.h settings.h
-libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
-libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
+libtdednssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
 
-#kde_kcfg_DATA = kcm_kdnssd.kcfg
+#kde_kcfg_DATA = kcm_tdednssd.kcfg
 
 include ../admin/Doxyfile.am
diff --git a/dnssd/README b/dnssd/README
index ffceb8ce9..304a7babb 100644
--- a/dnssd/README
+++ b/dnssd/README
@@ -1,7 +1,7 @@
 Checklist to ensure that zeroconf will work:
 
 1) Install Avahi, at least version 0.3
-2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by tdelibs
+2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs
 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
 line starting with 'host:'. It should be something like:
 host: files mdns dns
diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp
index 8a24f11b6..229d56f7f 100644
--- a/dnssd/domainbrowser.cpp
+++ b/dnssd/domainbrowser.cpp
@@ -26,7 +26,7 @@
 #include "remoteservice.h"
 #include "query.h"
 #include "servicebrowser.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #ifdef HAVE_DNSSD
 #ifdef AVAHI_API_0_6
 #include <avahi-client/lookup.h>
@@ -86,7 +86,7 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent)
 		d->m_domains+="local.";
 		d->m_browseLAN=true;
 	}
- 	connect(KApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this,
+ 	connect(TDEApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this,
  	        TQT_SLOT(domainListChanged(int,int)));
 }
 
diff --git a/dnssd/kcm_kdnssd.kcfg b/dnssd/kcm_tdednssd.kcfg
index 207ab608c..19cefaafa 100644
--- a/dnssd/kcm_kdnssd.kcfg
+++ b/dnssd/kcm_tdednssd.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="kdnssdrc" />
+ <kcfgfile name="tdednssdrc" />
  <group name="browsing" >
   <entry key="DomainList" type="StringList" >
    <label>Additional domains for browsing</label>
diff --git a/dnssd/remoteservice.h b/dnssd/remoteservice.h
index 8f529f791..485fd64d2 100644
--- a/dnssd/remoteservice.h
+++ b/dnssd/remoteservice.h
@@ -43,7 +43,7 @@ class KDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase
 {
 	Q_OBJECT
 public:
-	typedef KSharedPtr<RemoteService> Ptr;
+	typedef TDESharedPtr<RemoteService> Ptr;
 	
 	/**
 	Creates unresolved service from given DNS label
diff --git a/dnssd/servicebase.h b/dnssd/servicebase.h
index debb987cf..b3a6cab9d 100644
--- a/dnssd/servicebase.h
+++ b/dnssd/servicebase.h
@@ -37,10 +37,10 @@ services of given type are present in given domain.
 @short Describes any type of service.
 @author Jakub Stachowski
  */
-class KDNSSD_EXPORT ServiceBase : public KShared
+class KDNSSD_EXPORT ServiceBase : public TDEShared
 {
 public:
-	typedef KSharedPtr<ServiceBase> Ptr;
+	typedef TDESharedPtr<ServiceBase> Ptr;
 
 	/**
 	@param name Service name - empty for metaservices
diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc
index df47ad3a5..b8454f94b 100644
--- a/dnssd/settings.kcfgc
+++ b/dnssd/settings.kcfgc
@@ -1,7 +1,7 @@
 ClassName=Configuration
-File=kcm_kdnssd.kcfg
+File=kcm_tdednssd.kcfg
 GlobalEnums=false
-Inherits=KConfigSkeleton
+Inherits=TDEConfigSkeleton
 ItemAccessors=false
 MemberVariables=private
 Mutators=true
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f4dc993cf..88a718243 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -10,4 +10,4 @@
 #################################################
 
 add_subdirectory( common )
-add_subdirectory( kspell )
+add_subdirectory( tdespell )
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0531835d1..dd51718e7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
 
-SUBDIRS = common kspell tdelibs
+SUBDIRS = common tdespell tdelibs
 
diff --git a/doc/api/kfiledialog.png b/doc/api/tdefiledialog.png
index fa54aa3b2..fa54aa3b2 100644
--- a/doc/api/kfiledialog.png
+++ b/doc/api/tdefiledialog.png
diff --git a/doc/api/kfontchooser.png b/doc/api/tdefontchooser.png
index 6357ca289..6357ca289 100644
--- a/doc/api/kfontchooser.png
+++ b/doc/api/tdefontchooser.png
diff --git a/doc/api/kfontdialog.png b/doc/api/tdefontdialog.png
index 12402d2f2..12402d2f2 100644
--- a/doc/api/kfontdialog.png
+++ b/doc/api/tdefontdialog.png
diff --git a/doc/api/kfontrequester.png b/doc/api/tdefontrequester.png
index 3b36ae1d6..3b36ae1d6 100644
--- a/doc/api/kfontrequester.png
+++ b/doc/api/tdefontrequester.png
diff --git a/doc/tdelibs/man-kbuildsycoca.8.docbook b/doc/tdelibs/man-tdebuildsycoca.8.docbook
index 1b34c896f..243e0f9a5 100644
--- a/doc/tdelibs/man-kbuildsycoca.8.docbook
+++ b/doc/tdelibs/man-tdebuildsycoca.8.docbook
@@ -34,7 +34,7 @@
 <title>Synopsis</title>
 
 <cmdsynopsis>
-<command>kbuildsycoca</command>
+<command>tdebuildsycoca</command>
 
 <group>
 <arg choice="opt">--nosignal</arg>
@@ -204,7 +204,7 @@ installations</para>
 <refsect1>
 <title>See Also</title>
 
-<para>ksycoca(3), kblah(4), knogga(6)</para>
+<para>tdesycoca(3), kblah(4), knogga(6)</para>
 
 </refsect1>
 
diff --git a/doc/kspell/CMakeLists.txt b/doc/tdespell/CMakeLists.txt
index 94bc7cff5..6e2539833 100644
--- a/doc/kspell/CMakeLists.txt
+++ b/doc/tdespell/CMakeLists.txt
@@ -9,5 +9,5 @@
 #
 #################################################
 
-tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION kspell )
-add_dependencies( kspell-en-handbook meinproc )
+tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION tdespell )
+add_dependencies( tdespell-en-handbook meinproc )
diff --git a/doc/kspell/Makefile.am b/doc/tdespell/Makefile.am
index ea6c9c3a4..ea6c9c3a4 100644
--- a/doc/kspell/Makefile.am
+++ b/doc/tdespell/Makefile.am
diff --git a/doc/kspell/index.docbook b/doc/tdespell/index.docbook
index e42ba8a73..8942b7ffc 100644
--- a/doc/kspell/index.docbook
+++ b/doc/tdespell/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kspell;">
+  <!ENTITY kappname "&tdespell;">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY % addindex "IGNORE">
 ]>
@@ -8,7 +8,7 @@
 <book lang="&language;">
 
 <bookinfo>
-<title>The &kspell; Handbook</title>
+<title>The &tdespell; Handbook</title>
 
 <authorgroup>
 <author>&David.Sweet; &David.Sweet.mail;</author>
@@ -20,14 +20,14 @@
 <date>2003-02-24</date>
 <releaseinfo>1.00.00</releaseinfo>
 <abstract>
-<para>&kspell; is the spelling checker used by &tde; applications such
+<para>&tdespell; is the spelling checker used by &tde; applications such
 as &kate;, &kmail;, and &kword;. It is a &GUI; frontend to <application>International ISpell</application> and <application>ASpell</application>.</para>
 
 </abstract>
 <keywordset>
 <keyword>spell</keyword>
 <keyword>spelling</keyword>
-<keyword>kspell</keyword>
+<keyword>tdespell</keyword>
 <keyword>ispell</keyword>
 <keyword>aspell</keyword>
 <keyword>check</keyword>
@@ -52,7 +52,7 @@ url="http://aspell.sourceforge.net/">ASpell home page</ulink>.)
 
 <para><anchor id="spelldlg"/>
 The top line in the dialog displays a possibly misspelled word which was found in your
-document. &kspell; attempts to find an appropriate replacement word. One or
+document. &tdespell; attempts to find an appropriate replacement word. One or
 several may be found. The best guess is shown to the right of <guilabel>Replacement:</guilabel>.
 To accept this replacement, click on <guibutton>Replace</guibutton>. You may also select a word
 from the list of <guilabel>Suggestions</guilabel> and then click <guibutton>Replace</guibutton> to replace the
@@ -130,7 +130,7 @@ your dictionary's distribution for more information.</para>
 <title>Spell-checking client</title>
 
 <para>You may choose to use <application>Ispell</application> or <application>Aspell</application> as the spell-checking
-backend for &kspell;. <application>Ispell</application> is more widely available and may
+backend for &tdespell;. <application>Ispell</application> is more widely available and may
 have better international support, but <application>Aspell</application> is gaining
 popularity as it claims to give better suggestions for word replacements.</para>
 </sect1>
@@ -146,8 +146,8 @@ read the International <application>ISpell</application> man page.</para>
 <chapter id="contact-information">
 <title>Contact Information</title>
 
-<para>For more information about &kspell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&kspell; 
-Home Page</ulink>. In particular, you will find information about programming the &kspell; C++ class.</para>
+<para>For more information about &tdespell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&tdespell; 
+Home Page</ulink>. In particular, you will find information about programming the &tdespell; C++ class.</para>
 
 <para>You may email the author/maintainer with questions and/or comments at
 &David.Sweet.mail;.</para>
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 99d359979..533f0153f 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -9,12 +9,12 @@
 #
 #################################################
 
-add_subdirectory( ktexteditor )
-add_subdirectory( kscript )
+add_subdirectory( tdetexteditor )
+add_subdirectory( tdescript )
 add_subdirectory( kregexpeditor )
-add_subdirectory( kmediaplayer )
-add_subdirectory( kio )
+add_subdirectory( tdemediaplayer )
+add_subdirectory( tdeio )
 add_subdirectory( terminal )
 add_subdirectory( khexedit )
-add_subdirectory( kimproxy )
+add_subdirectory( tdeimproxy )
 add_subdirectory( kspeech )
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index 583a7055d..e5eedaf90 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech
+SUBDIRS = tdetexteditor tdescript kregexpeditor tdemediaplayer kio terminal khexedit tdeimproxy kspeech
 
-DOXYGEN_REFERENCES = tdecore tdefx tdeui kparts dcop
+DOXYGEN_REFERENCES = tdecore tdefx tdeui tdeparts dcop
 DOXYGEN_SET_RECURSIVE = YES
 include ../admin/Doxyfile.am
diff --git a/interfaces/khexedit/Makefile.am b/interfaces/khexedit/Makefile.am
index e2eb8a472..f5f3f23d0 100644
--- a/interfaces/khexedit/Makefile.am
+++ b/interfaces/khexedit/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES= -I$(top_srcdir)/kparts $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdeparts $(all_includes)
 
 # the service type
 servicetypedir = $(kde_servicetypesdir)
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index ae23721ae..3bc5749d2 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -19,7 +19,7 @@
 #define BYTESEDITINTERFACE_H
 
 // kde specific
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqwidget.h>
 
diff --git a/interfaces/kimproxy/library/Makefile.am b/interfaces/kimproxy/library/Makefile.am
deleted file mode 100644
index 94f2974ac..000000000
--- a/interfaces/kimproxy/library/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = icons
-
-INCLUDES = $(all_includes)
-
-noinst_HEADERS = kimproxyiface.h
-
-METASOURCES = AUTO
-
-AM_CPPFLAGS = $(all_includes)
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kimproxy.pot
-
-kimproxyincludedir = $(includedir)
-kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
-
-lib_LTLIBRARIES =  libkimproxy.la
-libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
-libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
-libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
-
-kimiface_DIR = $(top_srcdir)/interfaces/kimproxy/interface
-
-include $(top_srcdir)/admin/Doxyfile.am
-DOXYGEN_REFERENCES = kabc dcop
-
diff --git a/interfaces/kio/Makefile.am b/interfaces/kio/Makefile.am
deleted file mode 100644
index 8fad24200..000000000
--- a/interfaces/kio/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-kioincludedir = $(includedir)/kio
-kioinclude_HEADERS = http.h
-
diff --git a/interfaces/kmediaplayer/Makefile.am b/interfaces/kmediaplayer/Makefile.am
deleted file mode 100644
index 5b26d844e..000000000
--- a/interfaces/kmediaplayer/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-if include_ARTS
-kfileaudiopreview_subdir = kfileaudiopreview
-endif
-
-SUBDIRS = . $(kfileaudiopreview_subdir)
-INCLUDES = -I$(srcdir)/.. $(all_includes)
-
-lib_LTLIBRARIES = libkmediaplayer.la
-
-libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
-libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkmediaplayer_la_METASOURCES = AUTO
-
-kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
-kmediaplayerincludedir = $(includedir)/kmediaplayer
-
-kde_servicetypes_DATA = kmediaplayerengine.desktop kmediaplayer.desktop
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am b/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
deleted file mode 100644
index e4232cd78..000000000
--- a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = kfileaudiopreview.la
-
-kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
-kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
-
-noinst_HEADERS = kfileaudiopreview.h
-
-messages:
-	$(XGETTEXT) $(kfileaudiopreview_la_SOURCES) -o $(podir)/kfileaudiopreview.pot
diff --git a/interfaces/kregexpeditor/Makefile.am b/interfaces/kregexpeditor/Makefile.am
index 2007129da..4e8f5af2a 100644
--- a/interfaces/kregexpeditor/Makefile.am
+++ b/interfaces/kregexpeditor/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes)
 
 include_HEADERS = kregexpeditorinterface.h
 
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index 3c96d8d93..4124849d6 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -15,7 +15,7 @@
  * To check if kregexpeditor in tdeutils is installed and available use this line:
  * 
  * \code
- * bool installed=!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
+ * bool installed=!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
  * \endcode
  *
  * The following is a template for what you need to do to create an instance of the
diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am
deleted file mode 100644
index ede5f4fa0..000000000
--- a/interfaces/kscript/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-SUBDIRS = . sample
-
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
-
-#lib_LTLIBRARIES = libkscriptloader.la libkscript.la
-lib_LTLIBRARIES = libkscript.la
-#libkscriptloader_la_SOURCES = scriptloader.cpp
-#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-#libkscriptloader_la_LIBADD = $(LIB_KPARTS)
-
-libkscript_la_SOURCES = scriptmanager.cpp
-libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-
-kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
-kscriptincludedir = $(includedir)
-
-METASOURCES = AUTO
-
-servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = scriptinterface.desktop
diff --git a/interfaces/kspeech/Makefile.am b/interfaces/kspeech/Makefile.am
index f8f2b936d..dc183251d 100644
--- a/interfaces/kspeech/Makefile.am
+++ b/interfaces/kspeech/Makefile.am
@@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h
 # Define DCOP/Text-to-Speech Service Type.
 kde_servicetypes_DATA = dcoptexttospeech.desktop
 
-DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
 include ../../admin/Doxyfile.am
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index 21ad69d89..4fe3e7c9a 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/interfaces/kspeech/kspeech.h
@@ -186,7 +186,7 @@
  *
  * There are two methods of making DCOP calls from your application to %KTTSD.
  *
- *   - Manually code them using dcopClient object.  See tdebase/konqueror/kttsplugin/khtmlkttsd.cpp
+ *   - Manually code them using dcopClient object.  See tdebase/konqueror/kttsplugin/tdehtmlkttsd.cpp
  *     for an example.  This method is recommended if you want to make a few simple calls to KTTSD.
  *   - Use kspeech_stub as described below.  This method generates the marshalling code for you
  *     and is recommended for a more complex speech-enabled applications.  kcmkttsmgr in the
@@ -219,7 +219,7 @@
      client->attach();
      if (!client->isApplicationRegistered("kttsd")) {
          TQString error;
-         if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
+         if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
              cout << "Starting KTTSD failed with message " << error << endl;
      }
    @endverbatim
@@ -227,7 +227,7 @@
  * If you want to detect if KTTSD is installed without starting it, use this code.
  *
    @verbatim
-     KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
+     TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
      if (offers.count() > 0)
      {
        // KTTSD is installed.
diff --git a/interfaces/kimproxy/CMakeLists.txt b/interfaces/tdeimproxy/CMakeLists.txt
index f52118353..f52118353 100644
--- a/interfaces/kimproxy/CMakeLists.txt
+++ b/interfaces/tdeimproxy/CMakeLists.txt
diff --git a/interfaces/kimproxy/Makefile.am b/interfaces/tdeimproxy/Makefile.am
index 105f84291..105f84291 100644
--- a/interfaces/kimproxy/Makefile.am
+++ b/interfaces/tdeimproxy/Makefile.am
diff --git a/interfaces/kimproxy/TODO b/interfaces/tdeimproxy/TODO
index fc66130fe..fc66130fe 100644
--- a/interfaces/kimproxy/TODO
+++ b/interfaces/tdeimproxy/TODO
diff --git a/interfaces/kimproxy/interface/CMakeLists.txt b/interfaces/tdeimproxy/interface/CMakeLists.txt
index d62819ed8..d62819ed8 100644
--- a/interfaces/kimproxy/interface/CMakeLists.txt
+++ b/interfaces/tdeimproxy/interface/CMakeLists.txt
diff --git a/interfaces/kimproxy/interface/Makefile.am b/interfaces/tdeimproxy/interface/Makefile.am
index 348130e46..348130e46 100644
--- a/interfaces/kimproxy/interface/Makefile.am
+++ b/interfaces/tdeimproxy/interface/Makefile.am
diff --git a/interfaces/kimproxy/interface/dcopinstantmessenger.desktop b/interfaces/tdeimproxy/interface/dcopinstantmessenger.desktop
index a69994421..a69994421 100644
--- a/interfaces/kimproxy/interface/dcopinstantmessenger.desktop
+++ b/interfaces/tdeimproxy/interface/dcopinstantmessenger.desktop
diff --git a/interfaces/kimproxy/interface/kcm_instantmessenger.desktop b/interfaces/tdeimproxy/interface/kcm_instantmessenger.desktop
index 860f82944..860f82944 100644
--- a/interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+++ b/interfaces/tdeimproxy/interface/kcm_instantmessenger.desktop
diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/tdeimproxy/interface/kimiface.h
index f3212df6d..a370a91a0 100644
--- a/interfaces/kimproxy/interface/kimiface.h
+++ b/interfaces/tdeimproxy/interface/kimiface.h
@@ -40,7 +40,7 @@
  *
  * Contacts are identified using unique identifier strings (UID) used by
  * KABC, the KDE address book library.
- * The UID generation is handled by KABC::Addressee so the your application
+ * The UID generation is handled by TDEABC::Addressee so the your application
  * will either have to access the address book or provide a possibility
  * for associating a contact of your application with an entry of the address
  * book.
@@ -76,8 +76,8 @@
  * @c SOURCES list in your @c Makefile.am
  *
  * @see KIMProxy
- * @see KABC::AddressBook
- * @see KABC::Addressee
+ * @see TDEABC::AddressBook
+ * @see TDEABC::Addressee
  *
  * @since 3.3
  * @author Will Stephenson <lists@stevello.free-online.co.uk>
@@ -100,7 +100,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see fileTransferContacts()
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList allContacts() = 0;
 
@@ -120,7 +120,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see fileTransferContacts()
 	 * @see messageContact()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList reachableContacts() = 0;
 
@@ -138,7 +138,7 @@ k_dcop:
 	 * @see fileTransferContacts()
 	 * @see messageContact()
 	 * @see chatWithContact()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList onlineContacts() = 0;
 
@@ -163,7 +163,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see canReceiveFiles()
 	 * @see sendFile()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList fileTransferContacts() = 0;
 
@@ -180,7 +180,7 @@ k_dcop:
 	 * @see allContacts()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool isPresent( const TQString & uid ) = 0;
 
@@ -198,7 +198,7 @@ k_dcop:
 	 * @see isPresent()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString displayName( const TQString & uid ) = 0;
 
@@ -215,7 +215,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString presenceString( const TQString & uid ) = 0;
 
@@ -245,7 +245,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceString()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual int presenceStatus( const TQString & uid ) = 0;
 
@@ -256,7 +256,7 @@ k_dcop:
 	 * @return whether the specified contact can receive files
 	 *
 	 * @see fileTransferContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool canReceiveFiles( const TQString & uid ) = 0;
 
@@ -274,7 +274,7 @@ k_dcop:
 	 * @return whether the specified contact can respond
 	 *
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool canRespond( const TQString & uid ) = 0;
 
@@ -291,7 +291,7 @@ k_dcop:
 	 * @see protocols()
 	 * @see addContact()
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString locate( const TQString & contactId, const TQString & protocol ) = 0;
 
@@ -310,7 +310,7 @@ k_dcop:
 	 * @see isPresent()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQPixmap icon( const TQString & uid ) = 0;
 
@@ -325,7 +325,7 @@ k_dcop:
 	 *         supported or if the contact is unknown
 	 *
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString context( const TQString & uid ) = 0;
 
@@ -372,7 +372,7 @@ k_dcop:
 	 * @see sendFile()
 	 * @see isPresent()
 	 * @see reachableContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void messageContact( const TQString &uid, const TQString& message ) = 0;
 
@@ -410,7 +410,7 @@ k_dcop:
 	 * @see sendFile()
 	 * @see isPresent()
 	 * @see reachableContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void chatWithContact( const TQString &uid ) = 0;
 
@@ -436,7 +436,7 @@ k_dcop:
 	 * @see chatWithContact()
 	 * @see isPresent()
 	 * @see fileTransferContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void sendFile(const TQString &uid, const KURL &sourceURL,
 		const TQString &altFileName = TQString::null, uint fileSize = 0) = 0;
@@ -479,7 +479,7 @@ k_dcop_signals:
 	 * @param presence the new presence's numeric value. See presenceStatus()
 	 *
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 * @see DCOPClient::appId()
 	 */
 	void contactPresenceChanged( TQString uid, TQCString appId, int presence );
diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/tdeimproxy/library/CMakeLists.txt
index 347e552a5..40974d722 100644
--- a/interfaces/kimproxy/library/CMakeLists.txt
+++ b/interfaces/tdeimproxy/library/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -29,23 +29,23 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kimproxy.h kimproxyiface.h
+    tdeimproxy.h tdeimproxyiface.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### kimproxy ##################################
+##### tdeimproxy ##################################
 
-set( target kimproxy )
+set( target tdeimproxy )
 
 set( ${target}_SRCS
-  kimproxy.cpp kimproxyiface.skel
-  ${CMAKE_SOURCE_DIR}/interfaces/kimproxy/interface/kimiface.stub
+  tdeimproxy.cpp tdeimproxyiface.skel
+  ${CMAKE_SOURCE_DIR}/interfaces/tdeimproxy/interface/kimiface.stub
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
diff --git a/interfaces/tdeimproxy/library/Makefile.am b/interfaces/tdeimproxy/library/Makefile.am
new file mode 100644
index 000000000..743b76424
--- /dev/null
+++ b/interfaces/tdeimproxy/library/Makefile.am
@@ -0,0 +1,26 @@
+SUBDIRS = icons
+
+INCLUDES = $(all_includes)
+
+noinst_HEADERS = tdeimproxyiface.h
+
+METASOURCES = AUTO
+
+AM_CPPFLAGS = $(all_includes)
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeimproxy.pot
+
+tdeimproxyincludedir = $(includedir)
+tdeimproxyinclude_HEADERS = tdeimproxy.h tdeimproxyiface.h
+
+lib_LTLIBRARIES =  libtdeimproxy.la
+libtdeimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
+libtdeimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
+libtdeimproxy_la_SOURCES = tdeimproxy.cpp kimiface.stub tdeimproxyiface.skel
+
+kimiface_DIR = $(top_srcdir)/interfaces/tdeimproxy/interface
+
+include $(top_srcdir)/admin/Doxyfile.am
+DOXYGEN_REFERENCES = kabc dcop
+
diff --git a/interfaces/kimproxy/library/icons/CMakeLists.txt b/interfaces/tdeimproxy/library/icons/CMakeLists.txt
index ac95aa58c..ac95aa58c 100644
--- a/interfaces/kimproxy/library/icons/CMakeLists.txt
+++ b/interfaces/tdeimproxy/library/icons/CMakeLists.txt
diff --git a/interfaces/kimproxy/library/icons/Makefile.am b/interfaces/tdeimproxy/library/icons/Makefile.am
index a4b97f06a..a4b97f06a 100644
--- a/interfaces/kimproxy/library/icons/Makefile.am
+++ b/interfaces/tdeimproxy/library/icons/Makefile.am
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_away.png
index f96a9c65f..f96a9c65f 100644
--- a/interfaces/kimproxy/library/icons/cr16-action-presence_away.png
+++ b/interfaces/tdeimproxy/library/icons/cr16-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_offline.png
index f5c53d711..f5c53d711 100644
--- a/interfaces/kimproxy/library/icons/cr16-action-presence_offline.png
+++ b/interfaces/tdeimproxy/library/icons/cr16-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_online.png
index 6cb52496b..6cb52496b 100644
--- a/interfaces/kimproxy/library/icons/cr16-action-presence_online.png
+++ b/interfaces/tdeimproxy/library/icons/cr16-action-presence_online.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_unknown.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_unknown.png
index 290bc852a..290bc852a 100644
--- a/interfaces/kimproxy/library/icons/cr16-action-presence_unknown.png
+++ b/interfaces/tdeimproxy/library/icons/cr16-action-presence_unknown.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_away.png
index 086184582..086184582 100644
--- a/interfaces/kimproxy/library/icons/cr32-action-presence_away.png
+++ b/interfaces/tdeimproxy/library/icons/cr32-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_offline.png
index caadb14d4..caadb14d4 100644
--- a/interfaces/kimproxy/library/icons/cr32-action-presence_offline.png
+++ b/interfaces/tdeimproxy/library/icons/cr32-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_online.png
index 41e79ad9d..41e79ad9d 100644
--- a/interfaces/kimproxy/library/icons/cr32-action-presence_online.png
+++ b/interfaces/tdeimproxy/library/icons/cr32-action-presence_online.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_unknown.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_unknown.png
index 52ab79ed5..52ab79ed5 100644
--- a/interfaces/kimproxy/library/icons/cr32-action-presence_unknown.png
+++ b/interfaces/tdeimproxy/library/icons/cr32-action-presence_unknown.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_away.png
index 58e62c1d3..58e62c1d3 100644
--- a/interfaces/kimproxy/library/icons/cr48-action-presence_away.png
+++ b/interfaces/tdeimproxy/library/icons/cr48-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_offline.png
index b69630f33..b69630f33 100644
--- a/interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
+++ b/interfaces/tdeimproxy/library/icons/cr48-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_online.png
index 52fdad8f9..52fdad8f9 100644
--- a/interfaces/kimproxy/library/icons/cr48-action-presence_online.png
+++ b/interfaces/tdeimproxy/library/icons/cr48-action-presence_online.png
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index 9acfe00d6..fb2db0eb4 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -1,5 +1,5 @@
 /*    
-	kimproxy.cpp
+	tdeimproxy.cpp
 	
 	IM service library for KDE
 	
@@ -24,10 +24,10 @@
 #include <tqglobal.h>
 #include <tqpixmapcache.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopservicestarter.h> 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kiconloader.h>
 #include <kservice.h>
@@ -35,7 +35,7 @@
 
 #include "kimiface_stub.h"
 
-#include "kimproxy.h"
+#include "tdeimproxy.h"
 
 static KStaticDeleter<KIMProxy> _staticDeleter;
 
@@ -643,11 +643,11 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
 
 TQString KIMProxy::preferredApp()
 {
-	KConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
+	TDEConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE );
 	store->setGroup( IM_CLIENT_PREFERENCES_SECTION );
 	TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY );
 	//kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl;
 	return preferredApp;
 }	
 
-#include "kimproxy.moc"
+#include "tdeimproxy.moc"
diff --git a/interfaces/kimproxy/library/kimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h
index d4312b341..84b7d37dd 100644
--- a/interfaces/kimproxy/library/kimproxy.h
+++ b/interfaces/tdeimproxy/library/tdeimproxy.h
@@ -1,5 +1,5 @@
 /*
-    kimproxy.h
+    tdeimproxy.h
 
     IM service library for KDE
 
@@ -35,7 +35,7 @@
 #define IM_CLIENT_PREFERENCES_SECTION "InstantMessenger"
 #define IM_CLIENT_PREFERENCES_ENTRY "imClient"
 
-#include "kimproxyiface.h"
+#include "tdeimproxyiface.h"
 
 class DCOPClient;
 class KIMIface_stub;
@@ -98,8 +98,8 @@ typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap;
  * availability, capability and presence (online status) of IM-contacts.
  *
  * @see KIMIface
- * @see KABC::AddressBook
- * @see KABC::Addressee
+ * @see TDEABC::AddressBook
+ * @see TDEABC::Addressee
  *
  * @since 3.3
  * @author Will Stephenson <lists@stevello.free-online.co.uk>
@@ -161,7 +161,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see onlineContacts()
 		 * @see fileTransferContacts()
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList allContacts();
 
@@ -177,7 +177,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see onlineContacts()
 		 * @see fileTransferContacts()
 		 * @see messageContact()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList reachableContacts();
 
@@ -197,7 +197,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see fileTransferContacts()
 		 * @see messageContact()
 		 * @see chatWithContact()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList onlineContacts();
 
@@ -219,7 +219,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see reachableContacts()
 		 * @see onlineContacts()
 		 * @see canReceiveFiles()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList fileTransferContacts();
 
@@ -239,7 +239,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see allContacts()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool isPresent( const TQString& uid );
 
@@ -261,7 +261,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString displayName( const TQString& uid );
 
@@ -302,7 +302,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see presenceString()
 		 * @see presenceIcon()
 		 * @see KIMIface::presenceStatus()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		int presenceNumeric( const TQString& uid );
 
@@ -338,7 +338,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceNumeric()
 		 * @see presenceIcon()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString presenceString( const TQString& uid );
 
@@ -367,7 +367,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQPixmap presenceIcon( const TQString& uid );
 
@@ -384,7 +384,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @return whether the specified contact can receive files
 		 *
 		 * @see fileTransferContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool canReceiveFiles( const TQString & uid );
 
@@ -409,7 +409,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @return whether the specified contact can respond
 		 *
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool canRespond( const TQString & uid );
 
@@ -427,7 +427,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see KIMIface::protocols()
 		 * @see addContact()
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString locate( const TQString & contactId, const TQString & protocol );
 
@@ -449,7 +449,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 *         supported or if the contact is unknown
 		 *
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString context( const TQString & uid );
 
@@ -462,7 +462,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see sendFile()
 		 * @see isPresent()
 		 * @see reachableContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void chatWithContact( const TQString& uid );
 
@@ -479,7 +479,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see sendFile()
 		 * @see isPresent()
 		 * @see reachableContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void messageContact( const TQString& uid, const TQString& message );
 
@@ -498,7 +498,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see chatWithContact()
 		 * @see isPresent()
 		 * @see fileTransferContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void sendFile(const TQString &uid, const KURL &sourceURL,
 			 const TQString &altFileName = TQString::null, uint fileSize = 0);
@@ -586,7 +586,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceNumeric()
 		 * @see presenceIcon()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void sigContactPresenceChanged( const TQString &uid );
 
diff --git a/interfaces/kimproxy/library/kimproxyiface.h b/interfaces/tdeimproxy/library/tdeimproxyiface.h
index fa11183c9..a7d416371 100644
--- a/interfaces/kimproxy/library/kimproxyiface.h
+++ b/interfaces/tdeimproxy/library/tdeimproxyiface.h
@@ -1,5 +1,5 @@
 /*    
-	kimproxyiface.cpp
+	tdeimproxyiface.cpp
 	
 	IM service library for KDE
 	
diff --git a/interfaces/kio/CMakeLists.txt b/interfaces/tdeio/CMakeLists.txt
index efcecf65e..a8d8a2189 100644
--- a/interfaces/kio/CMakeLists.txt
+++ b/interfaces/tdeio/CMakeLists.txt
@@ -13,5 +13,5 @@
 
 install( FILES
     http.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
diff --git a/interfaces/tdeio/Makefile.am b/interfaces/tdeio/Makefile.am
new file mode 100644
index 000000000..daa98db05
--- /dev/null
+++ b/interfaces/tdeio/Makefile.am
@@ -0,0 +1,3 @@
+kioincludedir = $(includedir)/tdeio
+kioinclude_HEADERS = http.h
+
diff --git a/interfaces/kio/http.h b/interfaces/tdeio/http.h
index 15803209c..6a07e9971 100644
--- a/interfaces/kio/http.h
+++ b/interfaces/tdeio/http.h
@@ -21,7 +21,7 @@
 #define KIOSLAVE_HTTP_H_
 
 
-namespace KIO {
+namespace TDEIO {
 
   /** HTTP / DAV method **/
   enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,
diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt
index 98346388c..0c9355560 100644
--- a/interfaces/kmediaplayer/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 if( ARTS_FOUND )
-  add_subdirectory( kfileaudiopreview )
+  add_subdirectory( tdefileaudiopreview )
 endif( ARTS_FOUND )
 
 include_directories(
@@ -33,19 +33,19 @@ link_directories(
 
 install( FILES
     player.h playerdcopobject.h view.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kmediaplayer )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdemediaplayer )
 
 
 ##### other data ################################
 
 install( FILES
-    kmediaplayerengine.desktop kmediaplayer.desktop
+    tdemediaplayerengine.desktop tdemediaplayer.desktop
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kmediaplayer ##############################
+##### tdemediaplayer ##############################
 
-set( target kmediaplayer )
+set( target tdemediaplayer )
 
 set( ${target}_SRCS
   player.cpp view.cpp playerdcopobject.skel
@@ -54,7 +54,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am
new file mode 100644
index 000000000..91ed342bd
--- /dev/null
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -0,0 +1,18 @@
+if include_ARTS
+tdefileaudiopreview_subdir = tdefileaudiopreview
+endif
+
+SUBDIRS = . $(tdefileaudiopreview_subdir)
+INCLUDES = -I$(srcdir)/.. $(all_includes)
+
+lib_LTLIBRARIES = libtdemediaplayer.la
+
+libtdemediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
+libtdemediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+libtdemediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdemediaplayer_la_METASOURCES = AUTO
+
+tdemediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
+tdemediaplayerincludedir = $(includedir)/tdemediaplayer
+
+kde_servicetypes_DATA = tdemediaplayerengine.desktop tdemediaplayer.desktop
diff --git a/interfaces/kmediaplayer/player.cpp b/interfaces/tdemediaplayer/player.cpp
index 681459731..2d97aa1f7 100644
--- a/interfaces/kmediaplayer/player.cpp
+++ b/interfaces/tdemediaplayer/player.cpp
@@ -21,7 +21,7 @@
 // used in advertising or otherwise to promote the sale, use or other dealings
 // in this Software without prior written authorization from the author(s).
 
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 
 KMediaPlayer::PlayerDCOPObject::PlayerDCOPObject(void)
 	: DCOPObject("KMediaPlayer")
diff --git a/interfaces/kmediaplayer/player.h b/interfaces/tdemediaplayer/player.h
index 10e9f4a74..05582ca07 100644
--- a/interfaces/kmediaplayer/player.h
+++ b/interfaces/tdemediaplayer/player.h
@@ -24,9 +24,9 @@
 #ifndef KMEDIAPLAYERPLAYER_H
 #define KMEDIAPLAYERPLAYER_H
 
-#include <kparts/part.h>
-#include <kmediaplayer/playerdcopobject.h>
-#include <kmediaplayer/view.h>
+#include <tdeparts/part.h>
+#include <tdemediaplayer/playerdcopobject.h>
+#include <tdemediaplayer/view.h>
 
 /** KMediaPlayer contains an interface to reusable media player components.
 */
@@ -39,7 +39,7 @@ namespace KMediaPlayer
  *
  * There are two servicetypes for Player:  KMediaPlayer/Player and
  * KMediaPlayer/Engine.  KMediaPlayer/Player provides a widget (accessable
- * through view as well as XML GUI KActions.  KMediaPlayer/Engine omits
+ * through view as well as XML GUI TDEActions.  KMediaPlayer/Engine omits
  * the user interface facets, for those who wish to provide their own
  * interface.
  */
diff --git a/interfaces/kmediaplayer/playerdcopobject.h b/interfaces/tdemediaplayer/playerdcopobject.h
index 73a1cfa1d..73a1cfa1d 100644
--- a/interfaces/kmediaplayer/playerdcopobject.h
+++ b/interfaces/tdemediaplayer/playerdcopobject.h
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
index 03237da87..8e561e1f3 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
@@ -19,9 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/interfaces
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
   ${CMAKE_SOURCE_DIR}/arts/kde
 )
 
@@ -31,16 +31,16 @@ link_directories(
 )
 
 
-##### kfileaudiopreview #########################
+##### tdefileaudiopreview #########################
 
-set( target kfileaudiopreview )
+set( target tdefileaudiopreview )
 
 set( ${target}_SRCS
-  kfileaudiopreview.cpp
+  tdefileaudiopreview.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kmediaplayer-shared artskde-shared
+  LINK tdemediaplayer-shared artskde-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
new file mode 100644
index 000000000..d73cf545f
--- /dev/null
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = tdefileaudiopreview.la
+
+tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp
+tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+
+noinst_HEADERS = tdefileaudiopreview.h
+
+messages:
+	$(XGETTEXT) $(tdefileaudiopreview_la_SOURCES) -o $(podir)/tdefileaudiopreview.pot
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 639be9bf1..370805a74 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -1,21 +1,21 @@
-#include "kfileaudiopreview.h"
+#include "tdefileaudiopreview.h"
 
 #include <tqcheckbox.h>
 #include <tqhbox.h>
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmediaplayer/player.h>
+#include <tdelocale.h>
+#include <tdemediaplayer/player.h>
 #include <kmimetype.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <kplayobjectfactory.h>
 
-#include <config-kfile.h>
+#include <config-tdefile.h>
 
 class KFileAudioPreviewFactory : public KLibFactory
 {
@@ -29,7 +29,7 @@ protected:
     }
 };
 
-K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory )
+K_EXPORT_COMPONENT_FACTORY( tdefileaudiopreview, KFileAudioPreviewFactory )
 
 
 ///////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ public:
 KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     : KPreviewWidgetBase( parent, name )
 {
-    KGlobal::locale()->insertCatalogue("kfileaudiopreview");    
+    TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview");    
 
     TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
     // ###
@@ -91,14 +91,14 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     }
 
     m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
-    KConfigGroup config( KGlobal::config(), ConfigGroup );
+    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
     connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
 }
 
 KFileAudioPreview::~KFileAudioPreview()
 {
-    KConfigGroup config( KGlobal::config(), ConfigGroup );
+    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );
 
     delete d;
@@ -143,4 +143,4 @@ void KFileAudioPreview::toggleAuto( bool on )
 void KFileAudioPreview::virtual_hook( int, void* )
 {}
 
-#include "kfileaudiopreview.moc"
+#include "tdefileaudiopreview.moc"
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index de48e4712..6eae52cf7 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEAUDIOPREVIEW_H
-#define KFILEAUDIOPREVIEW_H
+#ifndef TDEFILEAUDIOPREVIEW_H
+#define TDEFILEAUDIOPREVIEW_H
 
 #include <tqdict.h>
 
@@ -61,4 +61,4 @@ private:
     KFileAudioPreviewPrivate *d;
 };
 
-#endif // KFILEAUDIOPREVIEW_H
+#endif // TDEFILEAUDIOPREVIEW_H
diff --git a/interfaces/kmediaplayer/kmediaplayer.desktop b/interfaces/tdemediaplayer/tdemediaplayer.desktop
index 85c1df65b..85c1df65b 100644
--- a/interfaces/kmediaplayer/kmediaplayer.desktop
+++ b/interfaces/tdemediaplayer/tdemediaplayer.desktop
diff --git a/interfaces/kmediaplayer/kmediaplayerengine.desktop b/interfaces/tdemediaplayer/tdemediaplayerengine.desktop
index ba7bf0403..ba7bf0403 100644
--- a/interfaces/kmediaplayer/kmediaplayerengine.desktop
+++ b/interfaces/tdemediaplayer/tdemediaplayerengine.desktop
diff --git a/interfaces/kmediaplayer/view.cpp b/interfaces/tdemediaplayer/view.cpp
index 64e3bf484..87d1d78a5 100644
--- a/interfaces/kmediaplayer/view.cpp
+++ b/interfaces/tdemediaplayer/view.cpp
@@ -21,7 +21,7 @@
 // used in advertising or otherwise to promote the sale, use or other dealings
 // in this Software without prior written authorization from the author(s).
 
-#include <kmediaplayer/view.h>
+#include <tdemediaplayer/view.h>
 
 struct KMediaPlayer::View::Data
 {
diff --git a/interfaces/kmediaplayer/view.h b/interfaces/tdemediaplayer/view.h
index c1d9dbe41..c1d9dbe41 100644
--- a/interfaces/kmediaplayer/view.h
+++ b/interfaces/tdemediaplayer/view.h
diff --git a/interfaces/kscript/CMakeLists.txt b/interfaces/tdescript/CMakeLists.txt
index 233dc1c49..6b57cdeb9 100644
--- a/interfaces/kscript/CMakeLists.txt
+++ b/interfaces/tdescript/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -40,9 +40,9 @@ install( FILES
 install( FILES scriptinterface.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kscript ###################################
+##### tdescript ###################################
 
-set( target kscript )
+set( target tdescript )
 
 set( ${target}_SRCS
   scriptmanager.cpp
@@ -51,6 +51,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am
new file mode 100644
index 000000000..03c7efc87
--- /dev/null
+++ b/interfaces/tdescript/Makefile.am
@@ -0,0 +1,21 @@
+SUBDIRS = . sample
+
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
+
+#lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
+lib_LTLIBRARIES = libtdescript.la
+#libtdescriptloader_la_SOURCES = scriptloader.cpp
+#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+#libtdescriptloader_la_LIBADD = $(LIB_KPARTS)
+
+libtdescript_la_SOURCES = scriptmanager.cpp
+libtdescript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+libtdescript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+
+tdescriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
+tdescriptincludedir = $(includedir)
+
+METASOURCES = AUTO
+
+servicetypedir = $(kde_servicetypesdir)
+servicetype_DATA = scriptinterface.desktop
diff --git a/interfaces/kscript/README b/interfaces/tdescript/README
index 213a0c277..213a0c277 100644
--- a/interfaces/kscript/README
+++ b/interfaces/tdescript/README
diff --git a/interfaces/kscript/sample/CMakeLists.txt b/interfaces/tdescript/sample/CMakeLists.txt
index cdb2505e9..46d031bff 100644
--- a/interfaces/kscript/sample/CMakeLists.txt
+++ b/interfaces/tdescript/sample/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/interfaces/kscript
+  ${CMAKE_SOURCE_DIR}/interfaces/tdescript
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
 )
@@ -38,6 +38,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kscript-shared
+  LINK tdescript-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/interfaces/kscript/sample/Makefile.am b/interfaces/tdescript/sample/Makefile.am
index 5dae5193f..e20854c70 100644
--- a/interfaces/kscript/sample/Makefile.am
+++ b/interfaces/tdescript/sample/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/kscript $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
 
 kde_module_LTLIBRARIES = libshellscript.la
 
 libshellscript_la_SOURCES = shellscript.cpp
 libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
-libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+libshellscript_la_LIBADD = ../libtdescript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 
 
 METASOURCES = AUTO
diff --git a/interfaces/kscript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp
index 49aee0727..766613551 100644
--- a/interfaces/kscript/sample/shellscript.cpp
+++ b/interfaces/tdescript/sample/shellscript.cpp
@@ -19,7 +19,7 @@
 
 #include "shellscript.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <kgenericfactory.h>
@@ -30,10 +30,10 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" )
 
 ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent)
 {
-	m_script =  new KProcess();
-	connect ( m_script, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(Exit(KProcess *)));
-	connect ( m_script, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(stdOut(KProcess *, char *, int )));
-	connect ( m_script, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(stdErr(KProcess *, char *, int )));
+	m_script =  new TDEProcess();
+	connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *)));
+	connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int )));
+	connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int )));
 	// Connect feedback signals and slots
 	//kdDebug() << "Building new script engine" << endl;
 }
@@ -60,7 +60,7 @@ void ShellScript::setScript( const TQString &, const TQString & )
 
 void ShellScript::run(TQObject *, const TQVariant &)
 {
-	 m_script->start(KProcess::NotifyOnExit,KProcess::All);
+	 m_script->start(TDEProcess::NotifyOnExit,TDEProcess::All);
 }
 void ShellScript::kill()
 {
@@ -68,16 +68,16 @@ void ShellScript::kill()
 		m_script->kill(9);	// Kill it harder
 }
 
-void ShellScript::Exit(KProcess *proc)
+void ShellScript::Exit(TDEProcess *proc)
 {
 	ScriptClientInterface->done((KScriptClientInterface::Result)proc->exitStatus(), "");
 }
 
-void ShellScript::stdErr(KProcess *, char *buffer, int)
+void ShellScript::stdErr(TDEProcess *, char *buffer, int)
 {
 	ScriptClientInterface->error(buffer);
 }
-void ShellScript::stdOut(KProcess *, char *buffer, int)
+void ShellScript::stdOut(TDEProcess *, char *buffer, int)
 {
 	ScriptClientInterface->output(buffer);
 }
diff --git a/interfaces/kscript/sample/shellscript.desktop b/interfaces/tdescript/sample/shellscript.desktop
index e65713a3b..e65713a3b 100644
--- a/interfaces/kscript/sample/shellscript.desktop
+++ b/interfaces/tdescript/sample/shellscript.desktop
diff --git a/interfaces/kscript/sample/shellscript.h b/interfaces/tdescript/sample/shellscript.h
index 853a7bd12..2cdaf7e5a 100644
--- a/interfaces/kscript/sample/shellscript.h
+++ b/interfaces/tdescript/sample/shellscript.h
@@ -36,11 +36,11 @@ public:
 	void run(TQObject *context = 0, const TQVariant &arg = 0);
 	void kill();
 private slots:
-	void Exit(KProcess *proc);
-	void stdErr(KProcess *proc, char *buffer, int buflen);
-	void stdOut(KProcess *proc, char *buffer, int buflen);
+	void Exit(TDEProcess *proc);
+	void stdErr(TDEProcess *proc, char *buffer, int buflen);
+	void stdOut(TDEProcess *proc, char *buffer, int buflen);
 private:
-	KProcess *m_script;
+	TDEProcess *m_script;
 	KScriptClientInterface *ScriptClientInterface;
 	TQString m_scriptName;
 };
diff --git a/interfaces/kscript/scriptclientinterface.h b/interfaces/tdescript/scriptclientinterface.h
index 0f07d34b2..0f07d34b2 100644
--- a/interfaces/kscript/scriptclientinterface.h
+++ b/interfaces/tdescript/scriptclientinterface.h
diff --git a/interfaces/kscript/scriptinterface.desktop b/interfaces/tdescript/scriptinterface.desktop
index 397e650d8..397e650d8 100644
--- a/interfaces/kscript/scriptinterface.desktop
+++ b/interfaces/tdescript/scriptinterface.desktop
diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h
index 1c37b7f71..1c37b7f71 100644
--- a/interfaces/kscript/scriptinterface.h
+++ b/interfaces/tdescript/scriptinterface.h
diff --git a/interfaces/kscript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 621ceb5d1..803feb3a6 100644
--- a/interfaces/kscript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -18,26 +18,26 @@
 */
 #include "scriptloader.h"
 
-#include <kapplication.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kstandarsdirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
 #include <tqfileinfo.h>
 
 
-ScriptLoader::ScriptLoader(KMainWindow *parent) : TQObject (parent)
+ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent)
 {
 	m_parent = parent;
 	m_scripts.clear();
-  	m_theAction = new KSelectAction ( i18n("KDE Scripts"),
+  	m_theAction = new TDESelectAction ( i18n("KDE Scripts"),
 		0,
 		this,
 		TQT_SLOT(runAction()),
@@ -51,7 +51,7 @@ ScriptLoader::~ScriptLoader()
 	m_scripts.clear();
 }
 
-KSelectAction * ScriptLoader::getScripts()
+TDESelectAction * ScriptLoader::getScripts()
 {
 	// Get the available scripts for this application.
 	TQStringList pluginList = "";
diff --git a/interfaces/kscript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index 20b135231..7fa4fa93f 100644
--- a/interfaces/kscript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -19,9 +19,9 @@
 #ifndef _script_loader_h
 #define _script_loader_h
 #include <tqptrlist.h>
-#include <kmainwindow.h>
-#include <kaction.h>
-#include <kscript/scriptinterface.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
+#include <tdescript/scriptinterface.h>
 
 /**
  * Script loader
@@ -33,12 +33,12 @@ class ScriptLoader : virtual public QObject
 		/** 
 		* Default Constructor
 		*/
-		ScriptLoader(KMainWindow *parent=0);
+		ScriptLoader(TDEMainWindow *parent=0);
 		~ScriptLoader();
-		/** Return the a KSelectAction with all of the scripts
-		 * @returns KSelectAction containing access to all of the scripts
+		/** Return the a TDESelectAction with all of the scripts
+		 * @returns TDESelectAction containing access to all of the scripts
 		 */
-		KSelectAction *getScripts();
+		TDESelectAction *getScripts();
 	public slots:
 		/** Run the current action.
 		*/
@@ -52,8 +52,8 @@ class ScriptLoader : virtual public QObject
 		virtual void done(int errorCode);
 	private:
 		TQPtrList<KScriptInterface> m_scripts;
-		KSelectAction *m_theAction;
+		TDESelectAction *m_theAction;
 		int m_currentSelection;
-		KMainWindow *m_parent;
+		TDEMainWindow *m_parent;
 };
 #endif
diff --git a/interfaces/kscript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index 647410b8b..a0dfbe921 100644
--- a/interfaces/kscript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -1,12 +1,12 @@
 #include "scriptmanager.h"
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
-#include <kapplication.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 //using namespace KScriptInterface;
diff --git a/interfaces/kscript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h
index d21219901..d21219901 100644
--- a/interfaces/kscript/scriptmanager.h
+++ b/interfaces/tdescript/scriptmanager.h
diff --git a/interfaces/ktexteditor/.kateconfig b/interfaces/tdetexteditor/.kateconfig
index 5b0885abe..5b0885abe 100644
--- a/interfaces/ktexteditor/.kateconfig
+++ b/interfaces/tdetexteditor/.kateconfig
diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index 3f430b50c..a0fea2f48 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -15,14 +15,14 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_BINARY_DIR}/kabc
+  ${CMAKE_BINARY_DIR}/tdeabc
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kabc
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeabc
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 
@@ -46,28 +46,28 @@ install( FILES
     selectioninterfaceext.h selectionextdcopinterface.h
     texthintinterface.h editinterfaceext.h variableinterface.h
     templateinterface.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/ktexteditor )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdetexteditor )
 
 
 ##### other data ################################
 
 install( FILES
-    ktexteditor.desktop ktexteditoreditor.desktop
-    ktexteditorplugin.desktop
+    tdetexteditor.desktop tdetexteditoreditor.desktop
+    tdetexteditorplugin.desktop
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 install( FILES
-    kcm_ktexteditor.desktop
+    kcm_tdetexteditor.desktop
   DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser )
 
 
 
-##### ktexteditor ###############################
+##### tdetexteditor ###############################
 
-set( target ktexteditor )
+set( target tdetexteditor )
 
 set( ${target}_SRCS
-  ktexteditor.cpp
+  tdetexteditor.cpp
   editinterface.cpp clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp
   codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
   configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp
@@ -90,7 +90,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK tdeui-shared kabc-shared kparts-shared
+  LINK tdeui-shared tdeabc-shared tdeparts-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index cc41c788f..7588019e2 100644
--- a/interfaces/ktexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -1,8 +1,8 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces  -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces  -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
 
-lib_LTLIBRARIES = libktexteditor.la
+lib_LTLIBRARIES = libtdetexteditor.la
 
-libktexteditor_la_SOURCES = ktexteditor.cpp \
+libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
     editinterface.cpp clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp \
     codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
     configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp \
@@ -22,10 +22,10 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
     texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
 
 
-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
+libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI)
 
-ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
+tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
                              selectioninterface.h cursorinterface.h \
                              clipboardinterface.h popupmenuinterface.h \
                              viewcursorinterface.h searchinterface.h highlightinginterface.h \
@@ -36,17 +36,17 @@ ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h
 			     documentinfo.h selectioninterfaceext.h selectionextdcopinterface.h texthintinterface.h \
 			     editinterfaceext.h variableinterface.h templateinterface.h
 
-ktexteditorincludedir = $(includedir)/ktexteditor
+tdetexteditorincludedir = $(includedir)/tdetexteditor
 
 METASOURCES = AUTO
 
 servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = ktexteditor.desktop ktexteditoreditor.desktop ktexteditorplugin.desktop
+servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetexteditorplugin.desktop
 
-kcm_ktexteditor_DATA = kcm_ktexteditor.desktop
-kcm_ktexteditordir = $(kde_datadir)/kcm_componentchooser
+kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
+kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
 
-templateinterface.lo: $(top_builddir)/kabc/addressee.h
+templateinterface.lo: $(top_builddir)/tdeabc/addressee.h
 
 include ../../admin/Doxyfile.am
 
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.cpp b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp
index 34b7294b2..34b7294b2 100644
--- a/interfaces/ktexteditor/blockselectiondcopinterface.cpp
+++ b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.h b/interfaces/tdetexteditor/blockselectiondcopinterface.h
index 4b74fd2a0..4b74fd2a0 100644
--- a/interfaces/ktexteditor/blockselectiondcopinterface.h
+++ b/interfaces/tdetexteditor/blockselectiondcopinterface.h
diff --git a/interfaces/ktexteditor/blockselectioninterface.cpp b/interfaces/tdetexteditor/blockselectioninterface.cpp
index 6d562a43e..6d562a43e 100644
--- a/interfaces/ktexteditor/blockselectioninterface.cpp
+++ b/interfaces/tdetexteditor/blockselectioninterface.cpp
diff --git a/interfaces/ktexteditor/blockselectioninterface.h b/interfaces/tdetexteditor/blockselectioninterface.h
index 3fae34682..b2cd785eb 100644
--- a/interfaces/ktexteditor/blockselectioninterface.h
+++ b/interfaces/tdetexteditor/blockselectioninterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_blockselectioninterface_h__
-#define __ktexteditor_blockselectioninterface_h__
+#ifndef __tdetexteditor_blockselectioninterface_h__
+#define __tdetexteditor_blockselectioninterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.cpp b/interfaces/tdetexteditor/clipboarddcopinterface.cpp
index 334046ee5..334046ee5 100644
--- a/interfaces/ktexteditor/clipboarddcopinterface.cpp
+++ b/interfaces/tdetexteditor/clipboarddcopinterface.cpp
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.h b/interfaces/tdetexteditor/clipboarddcopinterface.h
index 8104e9d4d..8104e9d4d 100644
--- a/interfaces/ktexteditor/clipboarddcopinterface.h
+++ b/interfaces/tdetexteditor/clipboarddcopinterface.h
diff --git a/interfaces/ktexteditor/clipboardinterface.cpp b/interfaces/tdetexteditor/clipboardinterface.cpp
index 89f92d089..89f92d089 100644
--- a/interfaces/ktexteditor/clipboardinterface.cpp
+++ b/interfaces/tdetexteditor/clipboardinterface.cpp
diff --git a/interfaces/ktexteditor/clipboardinterface.h b/interfaces/tdetexteditor/clipboardinterface.h
index 365006b37..8eeeb77ba 100644
--- a/interfaces/ktexteditor/clipboardinterface.h
+++ b/interfaces/tdetexteditor/clipboardinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_clipboardinterface_h__
-#define __ktexteditor_clipboardinterface_h__
+#ifndef __tdetexteditor_clipboardinterface_h__
+#define __tdetexteditor_clipboardinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/codecompletioninterface.cpp b/interfaces/tdetexteditor/codecompletioninterface.cpp
index 416dd593a..416dd593a 100644
--- a/interfaces/ktexteditor/codecompletioninterface.cpp
+++ b/interfaces/tdetexteditor/codecompletioninterface.cpp
diff --git a/interfaces/ktexteditor/codecompletioninterface.h b/interfaces/tdetexteditor/codecompletioninterface.h
index 2fab7231e..4f726578f 100644
--- a/interfaces/ktexteditor/codecompletioninterface.h
+++ b/interfaces/tdetexteditor/codecompletioninterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_codecompletioninterface_h__
-#define __ktexteditor_codecompletioninterface_h__
+#ifndef __tdetexteditor_codecompletioninterface_h__
+#define __tdetexteditor_codecompletioninterface_h__
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/interfaces/ktexteditor/configinterface.cpp b/interfaces/tdetexteditor/configinterface.cpp
index 63bf086e0..63bf086e0 100644
--- a/interfaces/ktexteditor/configinterface.cpp
+++ b/interfaces/tdetexteditor/configinterface.cpp
diff --git a/interfaces/ktexteditor/configinterface.h b/interfaces/tdetexteditor/configinterface.h
index cb8538465..10a6173a0 100644
--- a/interfaces/ktexteditor/configinterface.h
+++ b/interfaces/tdetexteditor/configinterface.h
@@ -16,13 +16,13 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_configinterface_h__
-#define __ktexteditor_configinterface_h__
+#ifndef __tdetexteditor_configinterface_h__
+#define __tdetexteditor_configinterface_h__
 
 #include <tdelibs_export.h>
 
 class TQCString;
-class KConfig;
+class TDEConfig;
 
 namespace KTextEditor
 {
@@ -57,17 +57,17 @@ class KTEXTEDITOR_EXPORT ConfigInterface
     virtual void writeConfig () = 0;           
                                                                          
     /**
-      Read/Write the config of the part to a given kconfig object
+      Read/Write the config of the part to a given tdeconfig object
       to store the settings in a different place than the standard
     */
-    virtual void readConfig (KConfig *) = 0;
-    virtual void writeConfig (KConfig *) = 0;
+    virtual void readConfig (TDEConfig *) = 0;
+    virtual void writeConfig (TDEConfig *) = 0;
     
     /**
       Read/Write session config of only this document/view/plugin 
     */
-    virtual void readSessionConfig (KConfig *) = 0;
-    virtual void writeSessionConfig (KConfig *) = 0;
+    virtual void readSessionConfig (TDEConfig *) = 0;
+    virtual void writeSessionConfig (TDEConfig *) = 0;
     
     /**
       Shows a config dialog for the part, changes will be applied
diff --git a/interfaces/ktexteditor/configinterfaceextension.cpp b/interfaces/tdetexteditor/configinterfaceextension.cpp
index 460d930a4..460d930a4 100644
--- a/interfaces/ktexteditor/configinterfaceextension.cpp
+++ b/interfaces/tdetexteditor/configinterfaceextension.cpp
diff --git a/interfaces/ktexteditor/configinterfaceextension.h b/interfaces/tdetexteditor/configinterfaceextension.h
index e324e2ba2..23fa5bb38 100644
--- a/interfaces/ktexteditor/configinterfaceextension.h
+++ b/interfaces/tdetexteditor/configinterfaceextension.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_configinterfaceextension_h__
-#define __ktexteditor_configinterfaceextension_h__
+#ifndef __tdetexteditor_configinterfaceextension_h__
+#define __tdetexteditor_configinterfaceextension_h__
 
 #include <tqwidget.h>
 #include <tqpixmap.h>
@@ -95,7 +95,7 @@ class KTEXTEDITOR_EXPORT ConfigInterfaceExtension
   
     virtual TQString configPageName (uint number = 0) const = 0;
     virtual TQString configPageFullName (uint number = 0) const = 0;
-    virtual TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0;
+    virtual TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const = 0;
     
     
   private:
diff --git a/interfaces/ktexteditor/cursorinterface.cpp b/interfaces/tdetexteditor/cursorinterface.cpp
index 96d00290e..96d00290e 100644
--- a/interfaces/ktexteditor/cursorinterface.cpp
+++ b/interfaces/tdetexteditor/cursorinterface.cpp
diff --git a/interfaces/ktexteditor/cursorinterface.h b/interfaces/tdetexteditor/cursorinterface.h
index e6e8e848a..e31d33395 100644
--- a/interfaces/ktexteditor/cursorinterface.h
+++ b/interfaces/tdetexteditor/cursorinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_cursorinterface_h__
-#define __ktexteditor_cursorinterface_h__
+#ifndef __tdetexteditor_cursorinterface_h__
+#define __tdetexteditor_cursorinterface_h__
 
 #include <tqptrlist.h>
 #include <tqstring.h>
diff --git a/interfaces/ktexteditor/document.h b/interfaces/tdetexteditor/document.h
index 12823e600..83d8b7cf6 100644
--- a/interfaces/ktexteditor/document.h
+++ b/interfaces/tdetexteditor/document.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_document_h__
-#define __ktexteditor_document_h__
+#ifndef __tdetexteditor_document_h__
+#define __tdetexteditor_document_h__
 
 #include "editor.h"
 
diff --git a/interfaces/ktexteditor/documentdcopinfo.cpp b/interfaces/tdetexteditor/documentdcopinfo.cpp
index b339d01cd..b339d01cd 100644
--- a/interfaces/ktexteditor/documentdcopinfo.cpp
+++ b/interfaces/tdetexteditor/documentdcopinfo.cpp
diff --git a/interfaces/ktexteditor/documentdcopinfo.h b/interfaces/tdetexteditor/documentdcopinfo.h
index ea25284fe..ea25284fe 100644
--- a/interfaces/ktexteditor/documentdcopinfo.h
+++ b/interfaces/tdetexteditor/documentdcopinfo.h
diff --git a/interfaces/ktexteditor/documentinfo.cpp b/interfaces/tdetexteditor/documentinfo.cpp
index c675bfb5f..c675bfb5f 100644
--- a/interfaces/ktexteditor/documentinfo.cpp
+++ b/interfaces/tdetexteditor/documentinfo.cpp
diff --git a/interfaces/ktexteditor/documentinfo.h b/interfaces/tdetexteditor/documentinfo.h
index b6d393eb7..46a19bfd5 100644
--- a/interfaces/ktexteditor/documentinfo.h
+++ b/interfaces/tdetexteditor/documentinfo.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_documentinfointerface_h__
-#define __ktexteditor_documentinfointerface_h__
+#ifndef __tdetexteditor_documentinfointerface_h__
+#define __tdetexteditor_documentinfointerface_h__
 
 class TQString;
 class TQCString;
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.cpp b/interfaces/tdetexteditor/dynwordwrapinterface.cpp
index 9c1da6d4b..9c1da6d4b 100644
--- a/interfaces/ktexteditor/dynwordwrapinterface.cpp
+++ b/interfaces/tdetexteditor/dynwordwrapinterface.cpp
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.h b/interfaces/tdetexteditor/dynwordwrapinterface.h
index 8d796c4ae..9a6ce116b 100644
--- a/interfaces/ktexteditor/dynwordwrapinterface.h
+++ b/interfaces/tdetexteditor/dynwordwrapinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_dynwordwrapinterface_h__
-#define __ktexteditor_dynwordwrapinterface_h__
+#ifndef __tdetexteditor_dynwordwrapinterface_h__
+#define __tdetexteditor_dynwordwrapinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/editdcopinterface.cpp b/interfaces/tdetexteditor/editdcopinterface.cpp
index 6130ccd14..6130ccd14 100644
--- a/interfaces/ktexteditor/editdcopinterface.cpp
+++ b/interfaces/tdetexteditor/editdcopinterface.cpp
diff --git a/interfaces/ktexteditor/editdcopinterface.h b/interfaces/tdetexteditor/editdcopinterface.h
index f169fb15b..f169fb15b 100644
--- a/interfaces/ktexteditor/editdcopinterface.h
+++ b/interfaces/tdetexteditor/editdcopinterface.h
diff --git a/interfaces/ktexteditor/editinterface.cpp b/interfaces/tdetexteditor/editinterface.cpp
index cfa0b67bc..cfa0b67bc 100644
--- a/interfaces/ktexteditor/editinterface.cpp
+++ b/interfaces/tdetexteditor/editinterface.cpp
diff --git a/interfaces/ktexteditor/editinterface.h b/interfaces/tdetexteditor/editinterface.h
index 7844995e8..05e4941f2 100644
--- a/interfaces/ktexteditor/editinterface.h
+++ b/interfaces/tdetexteditor/editinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_editinterface_h__
-#define __ktexteditor_editinterface_h__
+#ifndef __tdetexteditor_editinterface_h__
+#define __tdetexteditor_editinterface_h__
 
 #include <tqstring.h>
 
diff --git a/interfaces/ktexteditor/editinterfaceext.cpp b/interfaces/tdetexteditor/editinterfaceext.cpp
index 008fa488d..008fa488d 100644
--- a/interfaces/ktexteditor/editinterfaceext.cpp
+++ b/interfaces/tdetexteditor/editinterfaceext.cpp
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/tdetexteditor/editinterfaceext.h
index a4fcb414c..25b74201c 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/tdetexteditor/editinterfaceext.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_editinterfaceext_h__
-#define __ktexteditor_editinterfaceext_h__
+#ifndef __tdetexteditor_editinterfaceext_h__
+#define __tdetexteditor_editinterfaceext_h__
 
 #include <tqstring.h>
 
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/tdetexteditor/editor.h
index a9f542043..8b6699f9f 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/tdetexteditor/editor.h
@@ -16,10 +16,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_editor_h__
-#define __ktexteditor_editor_h__
+#ifndef __tdetexteditor_editor_h__
+#define __tdetexteditor_editor_h__
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 /**
  * KTextEditor is KDE's standard text editing KPart interface.
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index 85466f55d..1eddfb8d6 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -3,12 +3,12 @@
 
 #include <tqcombobox.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 
 #include "editorchooser_ui.h"
@@ -46,14 +46,14 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
   grid->addWidget( d->chooser, 0, 0);
 
 
-	KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
-	KConfig *config=new KConfig("default_components");
+	TDETrader::OfferList offers = TDETrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
+	TDEConfig *config=new TDEConfig("default_components");
   	config->setGroup("KTextEditor");
   	TQString editor = config->readPathEntry("embeddedEditor");
 
         if (editor.isEmpty()) editor="katepart";
 
-	for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
+	for (TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
 	{
     		if ((*it)->desktopEntryName().contains(editor))
 		{
@@ -62,7 +62,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
 		}
   	}
 
-  	for (KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
+  	for (TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it)
   	{
     		d->chooser->editorCombo->insertItem((*it)->name());
 		d->elements.append((*it)->desktopEntryName());
@@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){
 }
 
 void EditorChooser::readAppSetting(const TQString& postfix){
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
 	TQString previousGroup=cfg->group();
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	TQString editor=cfg->readPathEntry("editor");
@@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
 }
 
 void EditorChooser::writeAppSetting(const TQString& postfix){
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
 	TQString previousGroup=cfg->group();
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
@@ -105,14 +105,14 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
 
 	KTextEditor::Document *tmpDoc=0;
 
-	KConfig *cfg=kapp->config();
+	TDEConfig *cfg=kapp->config();
         TQString previousGroup=cfg->group();
         cfg->setGroup("KTEXTEDITOR:"+postfix);
         TQString editor=cfg->readPathEntry("editor");
 	cfg->setGroup(previousGroup);
 	if (editor.isEmpty())
 	{
-		KConfig *config=new KConfig("default_components");
+		TDEConfig *config=new TDEConfig("default_components");
   		config->setGroup("KTextEditor");
 	  	editor = config->readPathEntry("embeddedEditor", "katepart");
 		delete config;
@@ -135,14 +135,14 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject
 
         KTextEditor::Editor *tmpEd=0;
 
-        KConfig *cfg=kapp->config();
+        TDEConfig *cfg=kapp->config();
         TQString previousGroup=cfg->group();
         cfg->setGroup("KTEXTEDITOR:"+postfix);
         TQString editor=cfg->readPathEntry("editor");
         cfg->setGroup(previousGroup);
         if (editor.isEmpty())
         {
-                KConfig *config=new KConfig("default_components");
+                TDEConfig *config=new TDEConfig("default_components");
                 config->setGroup("KTextEditor");
                 editor = config->readPathEntry("embeddedEditor", "katepart");
                 delete config;
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/tdetexteditor/editorchooser.h
index 0010dd3a8..251776c10 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/tdetexteditor/editorchooser.h
@@ -1,12 +1,12 @@
 #ifndef _EDITOR_CHOOSER_H_
 #define  _EDITOR_CHOOSER_H_
 
-#include <ktexteditor/editor.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/editor.h>
+#include <tdetexteditor/document.h>
 
 #include <tqwidget.h>
 
-class KConfig;
+class TDEConfig;
 class TQString;
 
 namespace KTextEditor
@@ -45,8 +45,8 @@ public:
 	virtual const TQStringList &choices();
 	virtual void saveSettings();
 
-	void readAppSetting(KConfig *cfg,const TQString& postfix);
-	void writeAppSetting(KConfig *cfg,const TQString& postfix);
+	void readAppSetting(TDEConfig *cfg,const TQString& postfix);
+	void writeAppSetting(TDEConfig *cfg,const TQString& postfix);
 
 public slots:
 	virtual void madeChoice(int pos,const TQString &choice);
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/tdetexteditor/editorchooser_ui.ui
index e2bc82adb..e2bc82adb 100644
--- a/interfaces/ktexteditor/editorchooser_ui.ui
+++ b/interfaces/tdetexteditor/editorchooser_ui.ui
diff --git a/interfaces/ktexteditor/encodingdcopinterface.cpp b/interfaces/tdetexteditor/encodingdcopinterface.cpp
index eb408c16e..eb408c16e 100644
--- a/interfaces/ktexteditor/encodingdcopinterface.cpp
+++ b/interfaces/tdetexteditor/encodingdcopinterface.cpp
diff --git a/interfaces/ktexteditor/encodingdcopinterface.h b/interfaces/tdetexteditor/encodingdcopinterface.h
index 38de4e0aa..38de4e0aa 100644
--- a/interfaces/ktexteditor/encodingdcopinterface.h
+++ b/interfaces/tdetexteditor/encodingdcopinterface.h
diff --git a/interfaces/ktexteditor/encodinginterface.cpp b/interfaces/tdetexteditor/encodinginterface.cpp
index a0ef1ad22..a0ef1ad22 100644
--- a/interfaces/ktexteditor/encodinginterface.cpp
+++ b/interfaces/tdetexteditor/encodinginterface.cpp
diff --git a/interfaces/ktexteditor/encodinginterface.h b/interfaces/tdetexteditor/encodinginterface.h
index 5133d4a6e..42d0186ad 100644
--- a/interfaces/ktexteditor/encodinginterface.h
+++ b/interfaces/tdetexteditor/encodinginterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_encodinginterface_h__
-#define __ktexteditor_encodinginterface_h__
+#ifndef __tdetexteditor_encodinginterface_h__
+#define __tdetexteditor_encodinginterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/highlightinginterface.cpp b/interfaces/tdetexteditor/highlightinginterface.cpp
index 1677ca87c..1677ca87c 100644
--- a/interfaces/ktexteditor/highlightinginterface.cpp
+++ b/interfaces/tdetexteditor/highlightinginterface.cpp
diff --git a/interfaces/ktexteditor/highlightinginterface.h b/interfaces/tdetexteditor/highlightinginterface.h
index 4eb31659f..e7bd811e2 100644
--- a/interfaces/ktexteditor/highlightinginterface.h
+++ b/interfaces/tdetexteditor/highlightinginterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_highlightinginterface_h__
-#define __ktexteditor_highlightinginterface_h__
+#ifndef __tdetexteditor_highlightinginterface_h__
+#define __tdetexteditor_highlightinginterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/kcm_ktexteditor.desktop b/interfaces/tdetexteditor/kcm_tdetexteditor.desktop
index 490fad3ae..490fad3ae 100644
--- a/interfaces/ktexteditor/kcm_ktexteditor.desktop
+++ b/interfaces/tdetexteditor/kcm_tdetexteditor.desktop
diff --git a/interfaces/ktexteditor/markinterface.cpp b/interfaces/tdetexteditor/markinterface.cpp
index 024db35c4..024db35c4 100644
--- a/interfaces/ktexteditor/markinterface.cpp
+++ b/interfaces/tdetexteditor/markinterface.cpp
diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/tdetexteditor/markinterface.h
index 025bcc47c..64e948572 100644
--- a/interfaces/ktexteditor/markinterface.h
+++ b/interfaces/tdetexteditor/markinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_markinterface_h__
-#define __ktexteditor_markinterface_h__
+#ifndef __tdetexteditor_markinterface_h__
+#define __tdetexteditor_markinterface_h__
 
 #include <tqptrlist.h>
 
diff --git a/interfaces/ktexteditor/markinterfaceextension.cpp b/interfaces/tdetexteditor/markinterfaceextension.cpp
index 86538abfc..86538abfc 100644
--- a/interfaces/ktexteditor/markinterfaceextension.cpp
+++ b/interfaces/tdetexteditor/markinterfaceextension.cpp
diff --git a/interfaces/ktexteditor/markinterfaceextension.h b/interfaces/tdetexteditor/markinterfaceextension.h
index efb7356de..7aef736db 100644
--- a/interfaces/ktexteditor/markinterfaceextension.h
+++ b/interfaces/tdetexteditor/markinterfaceextension.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_markinterface_extension_h__
-#define __ktexteditor_markinterface_extension_h__
+#ifndef __tdetexteditor_markinterface_extension_h__
+#define __tdetexteditor_markinterface_extension_h__
 
 #include <tqptrlist.h>
 #include <tqpixmap.h>
diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/tdetexteditor/plugin.h
index f3cf5d4fc..68416bf78 100644
--- a/interfaces/ktexteditor/plugin.h
+++ b/interfaces/tdetexteditor/plugin.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_plugin_h__
-#define __ktexteditor_plugin_h__
+#ifndef __tdetexteditor_plugin_h__
+#define __tdetexteditor_plugin_h__
 
 #include <tqobject.h>
 
diff --git a/interfaces/ktexteditor/popupmenuinterface.cpp b/interfaces/tdetexteditor/popupmenuinterface.cpp
index 350fa138b..350fa138b 100644
--- a/interfaces/ktexteditor/popupmenuinterface.cpp
+++ b/interfaces/tdetexteditor/popupmenuinterface.cpp
diff --git a/interfaces/ktexteditor/popupmenuinterface.h b/interfaces/tdetexteditor/popupmenuinterface.h
index 23c38f707..3ca833709 100644
--- a/interfaces/ktexteditor/popupmenuinterface.h
+++ b/interfaces/tdetexteditor/popupmenuinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_popupmenuinterface_h__
-#define __ktexteditor_popupmenuinterface_h__
+#ifndef __tdetexteditor_popupmenuinterface_h__
+#define __tdetexteditor_popupmenuinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/printdcopinterface.cpp b/interfaces/tdetexteditor/printdcopinterface.cpp
index 3b9eddfe9..3b9eddfe9 100644
--- a/interfaces/ktexteditor/printdcopinterface.cpp
+++ b/interfaces/tdetexteditor/printdcopinterface.cpp
diff --git a/interfaces/ktexteditor/printdcopinterface.h b/interfaces/tdetexteditor/printdcopinterface.h
index e41e6da5d..e41e6da5d 100644
--- a/interfaces/ktexteditor/printdcopinterface.h
+++ b/interfaces/tdetexteditor/printdcopinterface.h
diff --git a/interfaces/ktexteditor/printinterface.cpp b/interfaces/tdetexteditor/printinterface.cpp
index 5a4011eb4..5a4011eb4 100644
--- a/interfaces/ktexteditor/printinterface.cpp
+++ b/interfaces/tdetexteditor/printinterface.cpp
diff --git a/interfaces/ktexteditor/printinterface.h b/interfaces/tdetexteditor/printinterface.h
index 3da6213ac..cca453d6c 100644
--- a/interfaces/ktexteditor/printinterface.h
+++ b/interfaces/tdetexteditor/printinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_printinterface_h__
-#define __ktexteditor_printinterface_h__
+#ifndef __tdetexteditor_printinterface_h__
+#define __tdetexteditor_printinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/searchdcopinterface.cpp b/interfaces/tdetexteditor/searchdcopinterface.cpp
index ce29e4927..ce29e4927 100644
--- a/interfaces/ktexteditor/searchdcopinterface.cpp
+++ b/interfaces/tdetexteditor/searchdcopinterface.cpp
diff --git a/interfaces/ktexteditor/searchdcopinterface.h b/interfaces/tdetexteditor/searchdcopinterface.h
index d4f558a26..d4f558a26 100644
--- a/interfaces/ktexteditor/searchdcopinterface.h
+++ b/interfaces/tdetexteditor/searchdcopinterface.h
diff --git a/interfaces/ktexteditor/searchinterface.cpp b/interfaces/tdetexteditor/searchinterface.cpp
index 6ea021e0d..6ea021e0d 100644
--- a/interfaces/ktexteditor/searchinterface.cpp
+++ b/interfaces/tdetexteditor/searchinterface.cpp
diff --git a/interfaces/ktexteditor/searchinterface.h b/interfaces/tdetexteditor/searchinterface.h
index 69952b785..f16c76dd1 100644
--- a/interfaces/ktexteditor/searchinterface.h
+++ b/interfaces/tdetexteditor/searchinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_searchinterface_h__
-#define __ktexteditor_searchinterface_h__
+#ifndef __tdetexteditor_searchinterface_h__
+#define __tdetexteditor_searchinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/selectiondcopinterface.cpp b/interfaces/tdetexteditor/selectiondcopinterface.cpp
index f341297e0..f341297e0 100644
--- a/interfaces/ktexteditor/selectiondcopinterface.cpp
+++ b/interfaces/tdetexteditor/selectiondcopinterface.cpp
diff --git a/interfaces/ktexteditor/selectiondcopinterface.h b/interfaces/tdetexteditor/selectiondcopinterface.h
index aa2973540..aa2973540 100644
--- a/interfaces/ktexteditor/selectiondcopinterface.h
+++ b/interfaces/tdetexteditor/selectiondcopinterface.h
diff --git a/interfaces/ktexteditor/selectionextdcopinterface.h b/interfaces/tdetexteditor/selectionextdcopinterface.h
index 5c3e32baf..5c3e32baf 100644
--- a/interfaces/ktexteditor/selectionextdcopinterface.h
+++ b/interfaces/tdetexteditor/selectionextdcopinterface.h
diff --git a/interfaces/ktexteditor/selectioninterface.cpp b/interfaces/tdetexteditor/selectioninterface.cpp
index 0a8dc6b00..0a8dc6b00 100644
--- a/interfaces/ktexteditor/selectioninterface.cpp
+++ b/interfaces/tdetexteditor/selectioninterface.cpp
diff --git a/interfaces/ktexteditor/selectioninterface.h b/interfaces/tdetexteditor/selectioninterface.h
index a6ba67bd8..03f50de33 100644
--- a/interfaces/ktexteditor/selectioninterface.h
+++ b/interfaces/tdetexteditor/selectioninterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_selectioninterface_h__
-#define __ktexteditor_selectioninterface_h__
+#ifndef __tdetexteditor_selectioninterface_h__
+#define __tdetexteditor_selectioninterface_h__
 
 #include <tqstring.h>
 
diff --git a/interfaces/ktexteditor/selectioninterfaceext.cpp b/interfaces/tdetexteditor/selectioninterfaceext.cpp
index 3034f33a5..3034f33a5 100644
--- a/interfaces/ktexteditor/selectioninterfaceext.cpp
+++ b/interfaces/tdetexteditor/selectioninterfaceext.cpp
diff --git a/interfaces/ktexteditor/selectioninterfaceext.h b/interfaces/tdetexteditor/selectioninterfaceext.h
index 255d76f64..8f57fb7e9 100644
--- a/interfaces/ktexteditor/selectioninterfaceext.h
+++ b/interfaces/tdetexteditor/selectioninterfaceext.h
@@ -19,8 +19,8 @@
    $Id$
 */
 
-#ifndef __ktexteditor_selectioninterface_ext_h__
-#define __ktexteditor_selectioninterface_ext_h__
+#ifndef __tdetexteditor_selectioninterface_ext_h__
+#define __tdetexteditor_selectioninterface_ext_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/sessionconfiginterface.cpp b/interfaces/tdetexteditor/sessionconfiginterface.cpp
index def7bf0a5..def7bf0a5 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.cpp
+++ b/interfaces/tdetexteditor/sessionconfiginterface.cpp
diff --git a/interfaces/ktexteditor/sessionconfiginterface.h b/interfaces/tdetexteditor/sessionconfiginterface.h
index c79de0011..f92502b36 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.h
+++ b/interfaces/tdetexteditor/sessionconfiginterface.h
@@ -16,13 +16,13 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_sessionconfiginterface_h__
-#define __ktexteditor_sessionconfiginterface_h__
+#ifndef __tdetexteditor_sessionconfiginterface_h__
+#define __tdetexteditor_sessionconfiginterface_h__
 
 #include <tdelibs_export.h>
 
 class TQCString;
-class KConfig;
+class TDEConfig;
 
 namespace KTextEditor
 {
@@ -53,8 +53,8 @@ class KTEXTEDITOR_EXPORT SessionConfigInterface
      * In case of the document, that means for example it should reload the file,
      * restore all marks, ...
     */
-    virtual void readSessionConfig (KConfig *) = 0;
-    virtual void writeSessionConfig (KConfig *) = 0;
+    virtual void readSessionConfig (TDEConfig *) = 0;
+    virtual void writeSessionConfig (TDEConfig *) = 0;
 
   private:
     class PrivateSessionConfigInterface *d;
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/tdetexteditor/tdetexteditor.cpp
index c822dc93c..25726577b 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/tdetexteditor/tdetexteditor.cpp
@@ -24,9 +24,9 @@
 #include "plugin.h"
 #include "editor.h"
 
-#include <kaction.h>
-#include <kparts/factory.h>
-#include <kparts/componentfactory.h>
+#include <tdeaction.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "document.moc"
 #include "view.moc"
diff --git a/interfaces/ktexteditor/ktexteditor.desktop b/interfaces/tdetexteditor/tdetexteditor.desktop
index 17556bdf6..17556bdf6 100644
--- a/interfaces/ktexteditor/ktexteditor.desktop
+++ b/interfaces/tdetexteditor/tdetexteditor.desktop
diff --git a/interfaces/ktexteditor/ktexteditoreditor.desktop b/interfaces/tdetexteditor/tdetexteditoreditor.desktop
index 6048da92b..6048da92b 100644
--- a/interfaces/ktexteditor/ktexteditoreditor.desktop
+++ b/interfaces/tdetexteditor/tdetexteditoreditor.desktop
diff --git a/interfaces/ktexteditor/ktexteditorplugin.desktop b/interfaces/tdetexteditor/tdetexteditorplugin.desktop
index b2e180a93..b2e180a93 100644
--- a/interfaces/ktexteditor/ktexteditorplugin.desktop
+++ b/interfaces/tdetexteditor/tdetexteditorplugin.desktop
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp
index 894d23f6a..25c103196 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/tdetexteditor/templateinterface.cpp
@@ -22,11 +22,11 @@
 #include <addressee.h>
 #include <addresseedialog.h>
 #include <tqstring.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcalendarsystem.h>
 #include <unistd.h>
 
@@ -54,16 +54,16 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix
 
 #define INITKABC do { \
   if (addrBook==0) { \
-    addrBook=KABC::StdAddressBook::self(); \
+    addrBook=TDEABC::StdAddressBook::self(); \
     userAddress=addrBook->whoAmI(); \
     if (userAddress.isEmpty()) { \
       if ( KMessageBox::questionYesNo(parentWindow, \
            i18n( "This template uses personal data that is stored in the TDE addressbook, but you have not selected a personal entry. You can still use the template without one, but you will have to type personal data. Would you like to select one now?" ), \
            "Personal data requested", \
            KStdGuiItem::yes(), KStdGuiItem::no(), "select personal data entry") == KMessageBox::Yes ) { \
-        userAddress = KABC::AddresseeDialog::getAddressee(parentWindow); \
+        userAddress = TDEABC::AddresseeDialog::getAddressee(parentWindow); \
         if ( ! userAddress.isEmpty() ) \
-          KABC::StdAddressBook::self()->setWhoAmI( userAddress ); \
+          TDEABC::StdAddressBook::self()->setWhoAmI( userAddress ); \
       }\
       /*return false;//no, why??*/ \
     } \
@@ -72,8 +72,8 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix
 
 bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *parentWindow )
 {
-  KABC::StdAddressBook *addrBook = 0;
-  KABC::Addressee userAddress;
+  TDEABC::StdAddressBook *addrBook = 0;
+  TDEABC::Addressee userAddress;
   TQDateTime datetime = TQDateTime::currentDateTime();
   TQDate date = TQT_TQDATE_OBJECT(datetime.date());
   TQTime time = TQT_TQTIME_OBJECT(datetime.time());
@@ -113,23 +113,23 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
       }
       else if ( placeholder == "date" )
       {
-        map[ placeholder ] = KGlobal::locale() ->formatDate( date, true );
+        map[ placeholder ] = TDEGlobal::locale() ->formatDate( date, true );
       }
       else if ( placeholder == "time" )
       {
-        map[ placeholder ] = KGlobal::locale() ->formatTime( time, true, false );
+        map[ placeholder ] = TDEGlobal::locale() ->formatTime( time, true, false );
       }
       else if ( placeholder == "year" )
       {
-        map[ placeholder ] = KGlobal::locale() ->calendar() ->yearString( date, false );
+        map[ placeholder ] = TDEGlobal::locale() ->calendar() ->yearString( date, false );
       }
       else if ( placeholder == "month" )
       {
-        map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->month( date ) );
+        map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->month( date ) );
       }
       else if ( placeholder == "day" )
       {
-        map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->day( date ) );
+        map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->day( date ) );
       }
       else if ( placeholder == "hostname" )
       {
diff --git a/interfaces/ktexteditor/templateinterface.h b/interfaces/tdetexteditor/templateinterface.h
index a786bf461..6ffc40e73 100644
--- a/interfaces/ktexteditor/templateinterface.h
+++ b/interfaces/tdetexteditor/templateinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_templateinterface_h__
-#define __ktexteditor_templateinterface_h__
+#ifndef __tdetexteditor_templateinterface_h__
+#define __tdetexteditor_templateinterface_h__
 
 #include <tqstring.h>
 #include <tqmap.h>
diff --git a/interfaces/ktexteditor/texthintinterface.cpp b/interfaces/tdetexteditor/texthintinterface.cpp
index f6aa4f0b3..f6aa4f0b3 100644
--- a/interfaces/ktexteditor/texthintinterface.cpp
+++ b/interfaces/tdetexteditor/texthintinterface.cpp
diff --git a/interfaces/ktexteditor/texthintinterface.h b/interfaces/tdetexteditor/texthintinterface.h
index e124fa369..4e6a5e12c 100644
--- a/interfaces/ktexteditor/texthintinterface.h
+++ b/interfaces/tdetexteditor/texthintinterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_texthintinterface_h__
-#define __ktexteditor_texthintinterface_h__
+#ifndef __tdetexteditor_texthintinterface_h__
+#define __tdetexteditor_texthintinterface_h__
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/interfaces/ktexteditor/undodcopinterface.cpp b/interfaces/tdetexteditor/undodcopinterface.cpp
index 69eb2ebd5..69eb2ebd5 100644
--- a/interfaces/ktexteditor/undodcopinterface.cpp
+++ b/interfaces/tdetexteditor/undodcopinterface.cpp
diff --git a/interfaces/ktexteditor/undodcopinterface.h b/interfaces/tdetexteditor/undodcopinterface.h
index b1a217036..b1a217036 100644
--- a/interfaces/ktexteditor/undodcopinterface.h
+++ b/interfaces/tdetexteditor/undodcopinterface.h
diff --git a/interfaces/ktexteditor/undointerface.cpp b/interfaces/tdetexteditor/undointerface.cpp
index 30a1dd292..30a1dd292 100644
--- a/interfaces/ktexteditor/undointerface.cpp
+++ b/interfaces/tdetexteditor/undointerface.cpp
diff --git a/interfaces/ktexteditor/undointerface.h b/interfaces/tdetexteditor/undointerface.h
index b03e4cb4e..33162e43a 100644
--- a/interfaces/ktexteditor/undointerface.h
+++ b/interfaces/tdetexteditor/undointerface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_undointerface_h__
-#define __ktexteditor_undointerface_h__
+#ifndef __tdetexteditor_undointerface_h__
+#define __tdetexteditor_undointerface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/variableinterface.cpp b/interfaces/tdetexteditor/variableinterface.cpp
index 616e0beab..616e0beab 100644
--- a/interfaces/ktexteditor/variableinterface.cpp
+++ b/interfaces/tdetexteditor/variableinterface.cpp
diff --git a/interfaces/ktexteditor/variableinterface.h b/interfaces/tdetexteditor/variableinterface.h
index 31310a43c..31310a43c 100644
--- a/interfaces/ktexteditor/variableinterface.h
+++ b/interfaces/tdetexteditor/variableinterface.h
diff --git a/interfaces/ktexteditor/view.h b/interfaces/tdetexteditor/view.h
index caa14d021..0a807d6b3 100644
--- a/interfaces/ktexteditor/view.h
+++ b/interfaces/tdetexteditor/view.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_view_h__
-#define __ktexteditor_view_h__
+#ifndef __tdetexteditor_view_h__
+#define __tdetexteditor_view_h__
 
 #include <tqwidget.h>
 #include <kxmlguiclient.h>
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.cpp b/interfaces/tdetexteditor/viewcursordcopinterface.cpp
index f26385414..f26385414 100644
--- a/interfaces/ktexteditor/viewcursordcopinterface.cpp
+++ b/interfaces/tdetexteditor/viewcursordcopinterface.cpp
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.h b/interfaces/tdetexteditor/viewcursordcopinterface.h
index 4bae0b520..4bae0b520 100644
--- a/interfaces/ktexteditor/viewcursordcopinterface.h
+++ b/interfaces/tdetexteditor/viewcursordcopinterface.h
diff --git a/interfaces/ktexteditor/viewcursorinterface.cpp b/interfaces/tdetexteditor/viewcursorinterface.cpp
index 58cea6289..58cea6289 100644
--- a/interfaces/ktexteditor/viewcursorinterface.cpp
+++ b/interfaces/tdetexteditor/viewcursorinterface.cpp
diff --git a/interfaces/ktexteditor/viewcursorinterface.h b/interfaces/tdetexteditor/viewcursorinterface.h
index fd6dae8ff..2fe7241e4 100644
--- a/interfaces/ktexteditor/viewcursorinterface.h
+++ b/interfaces/tdetexteditor/viewcursorinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_viewcursorinterface_h__
-#define __ktexteditor_viewcursorinterface_h__
+#ifndef __tdetexteditor_viewcursorinterface_h__
+#define __tdetexteditor_viewcursorinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.cpp
index d38b9b938..d38b9b938 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
+++ b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.cpp
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
index b4c5cf72e..b4c5cf72e 100644
--- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h
+++ b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/tdetexteditor/viewstatusmsginterface.cpp
index af8870c80..af8870c80 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.cpp
+++ b/interfaces/tdetexteditor/viewstatusmsginterface.cpp
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.h b/interfaces/tdetexteditor/viewstatusmsginterface.h
index 709448124..3516f8758 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.h
+++ b/interfaces/tdetexteditor/viewstatusmsginterface.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_viewstatusmsginterface_h__
-#define __ktexteditor_viewstatusmsginterface_h__
+#ifndef __tdetexteditor_viewstatusmsginterface_h__
+#define __tdetexteditor_viewstatusmsginterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/ktexteditor/wordwrapinterface.cpp b/interfaces/tdetexteditor/wordwrapinterface.cpp
index 6be76120b..6be76120b 100644
--- a/interfaces/ktexteditor/wordwrapinterface.cpp
+++ b/interfaces/tdetexteditor/wordwrapinterface.cpp
diff --git a/interfaces/ktexteditor/wordwrapinterface.h b/interfaces/tdetexteditor/wordwrapinterface.h
index 155e69ae2..55cc2ded9 100644
--- a/interfaces/ktexteditor/wordwrapinterface.h
+++ b/interfaces/tdetexteditor/wordwrapinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ktexteditor_wordwrapinterface_h__
-#define __ktexteditor_wordwrapinterface_h__
+#ifndef __tdetexteditor_wordwrapinterface_h__
+#define __tdetexteditor_wordwrapinterface_h__
 
 #include <tdelibs_export.h>
 
diff --git a/interfaces/terminal/Makefile.am b/interfaces/terminal/Makefile.am
index 70bb091ef..3e2f8e4df 100644
--- a/interfaces/terminal/Makefile.am
+++ b/interfaces/terminal/Makefile.am
@@ -1,2 +1,2 @@
-ktexteditorinclude_HEADERS = kde_terminal_interface.h
-ktexteditorincludedir = $(includedir)
+tdetexteditorinclude_HEADERS = kde_terminal_interface.h
+tdetexteditorincludedir = $(includedir)
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 6a65477c2..0624c0e8d 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -35,7 +35,7 @@ class TQStrList;
  * we can't have signals without having a TQObject, which
  * TerminalInterface is not.
  * These are the signals you can connect to:
- *  void processExited( KProcess *process );
+ *  void processExited( TDEProcess *process );
  *  void receivedData( const TQString& s );
  * See the example code below for how to connect to these..
  * 
diff --git a/interfaces/terminal/test/Makefile.am b/interfaces/terminal/test/Makefile.am
index 1c62aaced..7570f6d2b 100644
--- a/interfaces/terminal/test/Makefile.am
+++ b/interfaces/terminal/test/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES=$(all_includes)
 check_PROGRAMS=test
 test_SOURCES=main.cc
-test_LDADD=$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lkio
+test_LDADD=$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio
 test_LDFLAGS=$(all_libraries)
 METASOURCES=AUTO
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index dbf60616b..8130f85d6 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -1,14 +1,14 @@
 #include <kde_terminal_interface.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <kmainwindow.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdemainwindow.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <tqdir.h>
 #include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cassert>
 #include "main.h"
 #include "main.moc"
@@ -33,9 +33,9 @@ Win::Win()
 
 int main( int argc, char** argv )
 {
-    KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
-    KCmdLineArgs::init( argc, argv, about );
-    KApplication a;
+    TDEAboutData* about = new TDEAboutData( "tetest", "TETest", "0.1" );
+    TDECmdLineArgs::init( argc, argv, about );
+    TDEApplication a;
     Win* win = new Win();
     win->show();
     return a.exec();
diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h
index 098c10d54..256b0840a 100644
--- a/interfaces/terminal/test/main.h
+++ b/interfaces/terminal/test/main.h
@@ -3,7 +3,7 @@
 
 
 class Win
-    : public KMainWindow
+    : public TDEMainWindow
 {
     Q_OBJECT
     KParts::Part* p;
diff --git a/kab/README b/kab/README
index 8ddc6ecec..c8f0306ed 100644
--- a/kab/README
+++ b/kab/README
@@ -1,4 +1,4 @@
-Note: libkab is now obsolete. Please use libkabc in tdelibs/kabc. libkab is
+Note: libkab is now obsolete. Please use libkabc in tdelibs/tdeabc. libkab is
 no longer installed. It's only needed for the conversion tool converting
 libkab data to libkabc data.
 
diff --git a/kab/addressbook.cc b/kab/addressbook.cc
index 0408a4db7..852f56d57 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cc
@@ -21,12 +21,12 @@
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 extern "C" {
 #include <sys/stat.h>
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 622fc708d..7f2159e24 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -17,9 +17,9 @@
 */
 
 #include "kabapi.h"
-#include <klistbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdelistbox.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
@@ -36,7 +36,7 @@ using namespace std;
 KabAPI::KabAPI(TQWidget* parent, const char* name)
   : KDialogBase(parent, name),
     book(0),
-    listbox(new KListBox(this)),
+    listbox(new TDEListBox(this)),
     selection(-1)
 {
   TQ_CHECK_PTR(listbox);
diff --git a/kab/kabapi.h b/kab/kabapi.h
index 6cf46c37e..6204efc39 100644
--- a/kab/kabapi.h
+++ b/kab/kabapi.h
@@ -22,7 +22,7 @@
 
 class TQPushButton;
 class TQFrame;
-class KListBox;
+class TDEListBox;
 
 /**
   * The class KabAPI provides a public interface to access the
@@ -189,7 +189,7 @@ protected:
   /**
    * This displays the overview over the addresses in the dialog.
    */
-  KListBox* listbox;
+  TDEListBox* listbox;
   /**
    * The index of the selected entry. This value is only valid after the
    * KabAPI dialog has been executed and accepted by the user.
diff --git a/kabc/TODO b/kabc/TODO
deleted file mode 100644
index 41644b818..000000000
--- a/kabc/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Factor out KLockFile.
diff --git a/kabc/formats/Makefile.am b/kabc/formats/Makefile.am
deleted file mode 100644
index 57c2caaa3..000000000
--- a/kabc/formats/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
-
-kde_module_LTLIBRARIES = kabcformat_binary.la
-
-kabcformat_binary_la_SOURCES = binaryformat.cpp
-kabcformat_binary_la_LDFLAGS =  -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-                                -no-undefined
-kabcformat_binary_la_LIBADD  = $(LIB_KABC) $(LIB_QT) $(LIB_TDECORE)
-kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
-
-# these are the headers for your project
-noinst_HEADERS = binaryformat.h
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kabcformat_binary.pot
-
-linkdir = $(kde_datadir)/kabc/formats
-link_DATA = binary.desktop
-EXTRA_DIST = $(link_DATA)
diff --git a/kabc/plugins/Makefile.am b/kabc/plugins/Makefile.am
deleted file mode 100644
index 5a5dcb137..000000000
--- a/kabc/plugins/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = file dir net ldapkio
diff --git a/kabc/plugins/dir/Makefile.am b/kabc/plugins/dir/Makefile.am
deleted file mode 100644
index f5c0c2523..000000000
--- a/kabc/plugins/dir/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_builddir) $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS = resourcedirconfig.h
-
-lib_LTLIBRARIES = libkabc_dir.la
-libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
-libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
-libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
-libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
-
-kde_module_LTLIBRARIES = kabc_dir.la
-kabc_dir_la_SOURCES = resourcedirplugin.cpp
-kabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-kabc_dir_la_LIBADD = libkabc_dir.la $(LIB_QT) $(LIB_TDECORE)
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kabc_dir.pot
-
-kabcincludedir = $(includedir)/kabc
-kabcinclude_HEADERS = resourcedir.h
-
-servicedir = $(kde_servicesdir)/kresources/kabc
-service_DATA = dir.desktop
-
-resourcedirplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/evolution/Makefile.am b/kabc/plugins/evolution/Makefile.am
deleted file mode 100644
index 5967b9433..000000000
--- a/kabc/plugins/evolution/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = resourceevo.h dbwrapper.h
-
-kde_module_LTLIBRARIES = kabc_evo.la
-
-kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
-
-kabc_evo_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_evo_la_LIBADD	= ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kabc_evolution.pot
-
-servicedir = $(kde_servicesdir)/kresources/kabc
-service_DATA = evolution.desktop
diff --git a/kabc/plugins/file/Makefile.am b/kabc/plugins/file/Makefile.am
deleted file mode 100644
index 3060bfab5..000000000
--- a/kabc/plugins/file/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = resourcefileconfig.h
-
-lib_LTLIBRARIES = libkabc_file.la
-libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
-libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI)
-libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
-
-
-kde_module_LTLIBRARIES = kabc_file.la
-kabc_file_la_SOURCES = resourcefileplugin.cpp
-kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE)
-kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kabc_file.pot
-
-kabcincludedir = $(includedir)/kabc
-kabcinclude_HEADERS = resourcefile.h
-
-servicedir = $(kde_servicesdir)/kresources/kabc
-service_DATA = file.desktop
diff --git a/kabc/plugins/ldapkio/Makefile.am b/kabc/plugins/ldapkio/Makefile.am
deleted file mode 100644
index 97cd9089c..000000000
--- a/kabc/plugins/ldapkio/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS = resourceldapkioconfig.h
-
-lib_LTLIBRARIES = libkabc_ldapkio.la
-libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
-libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_ldapkio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
-
-kde_module_LTLIBRARIES = kabc_ldapkio.la
-kabc_ldapkio_la_SOURCES = resourceldapkioplugin.cpp
-kabc_ldapkio_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_ldapkio_la_LIBADD	= libkabc_ldapkio.la $(LIB_QT) $(LIB_TDECORE)
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kabc_ldapkio.pot
-
-kabcincludedir = $(includedir)/kabc
-kabcinclude_HEADERS = resourceldapkio.h
-
-servicedir = $(kde_servicesdir)/kresources/kabc
-service_DATA = ldapkio.desktop
-
-resourceldapkioplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am
deleted file mode 100644
index f4183d442..000000000
--- a/kabc/plugins/net/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS = resourcenetconfig.h
-
-lib_LTLIBRARIES = libkabc_net.la
-libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
-libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_net_la_LIBADD	= $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
-libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
-
-kde_module_LTLIBRARIES = kabc_net.la
-kabc_net_la_SOURCES = resourcenetplugin.cpp
-kabc_net_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore
-kabc_net_la_LIBADD	= libkabc_net.la
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kabc_net.pot
-
-kabcincludedir = $(includedir)/kabc
-kabcinclude_HEADERS = resourcenet.h
-
-servicedir = $(kde_servicesdir)/kresources/kabc
-service_DATA = net.desktop
-
-resourcenetplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/sql/Makefile.am b/kabc/plugins/sql/Makefile.am
deleted file mode 100644
index 6d638936f..000000000
--- a/kabc/plugins/sql/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = resourcesql.h resourcesqlconfig.h
-
-kde_module_LTLIBRARIES = kabc_sql.la
-
-kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp
-
-kabc_sql_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_sql_la_LIBADD	= ../../libkabc.la ../../../tdeui/libtdeui.la
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kabc_sql.pot
-
-linkdir		= $(kde_datadir)/kresources/contact
-link_DATA	= sql.desktop
-EXTRA_DIST	= $(link_DATA)
diff --git a/kabc/vcardparser/testutils.h b/kabc/vcardparser/testutils.h
deleted file mode 100644
index 4f2024177..000000000
--- a/kabc/vcardparser/testutils.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef TESTUTILS_H
-#define TESTUTILS_H
-
-#include <kabc/addressee.h>
-#include <tqstring.h>
-
-KABC::Addressee vcard1();
-KABC::Addressee vcard2();
-KABC::Addressee vcard3();
-KABC::Addressee::List vCardsAsAddresseeList();
-TQString   vCardAsText( const TQString& location );
-TQString   vCardsAsText();
-
-#endif
diff --git a/kate/AUTHORS b/kate/AUTHORS
index c12c9810f..8239561ca 100644
--- a/kate/AUTHORS
+++ b/kate/AUTHORS
@@ -33,7 +33,7 @@
   (original author of kwrite in kde 1.x until kde 2.1)
 
 - Glen Parker <glenebob@nwlink.com>
-  (undo history, kspell-integration)
+  (undo history, tdespell-integration)
 
 - Michael Koch <koch@kde.org>
   (port to KParts)
diff --git a/kate/ChangeLog b/kate/ChangeLog
index 3e54e19db..0da6d5cc2 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -33,7 +33,7 @@
   * some folding fixes (hopefully)
   * memleak fix
   * undo stuff changed a bit, 0 means unlimited like before, show
-    that now in the dialog and add a comment to ktexteditor
+    that now in the dialog and add a comment to tdetexteditor
 
 2002-08-26 Christoph Cullmann <cullmann@kde.org>
   * Fixes for folding, cleanup, move folding tree into the buffer,
@@ -265,7 +265,7 @@
   * QPopupMenu for filelist
 
 2001-03-20 Christoph Cullmann <cullmann@kde.org>
-  * kate is now a normal KApplication
+  * kate is now a normal TDEApplication
 
 2001-03-18 Christoph Cullmann <cullmann@kde.org>
   * big location changes of source files
diff --git a/kate/Mainpage.dox b/kate/Mainpage.dox
index 8d8515b52..0fc1d9490 100644
--- a/kate/Mainpage.dox
+++ b/kate/Mainpage.dox
@@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\>
 @lgpl
 
 */
-// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
+// DOXYGEN_REFERENCES = tdecore kio tdeui tdeparts interfaces/kdocument interfaces/tdetexteditor kjs
 // DOXYGEN_SET_PROJECT_NAME = Kate
 // vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kate/Makefile.am b/kate/Makefile.am
index 04666d8cb..e39af3b7f 100644
--- a/kate/Makefile.am
+++ b/kate/Makefile.am
@@ -6,6 +6,6 @@ messages:
 	$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
 	$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot
 
-DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
 include ../admin/Doxyfile.am
 
diff --git a/kate/data/bash.xml b/kate/data/bash.xml
index 84c91596d..e3bc4abdd 100644
--- a/kate/data/bash.xml
+++ b/kate/data/bash.xml
@@ -439,7 +439,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/data/css.xml b/kate/data/css.xml
index 02ab43036..f3e65d267 100644
--- a/kate/data/css.xml
+++ b/kate/data/css.xml
@@ -17,7 +17,7 @@
         - Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset".
         - Added CSS 3 color values: "rgba", "hsl" and "hsla".
         - Added Gecko CSS properties: "-moz-border-*-colors".
-        - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-khtml-".
+        - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-tdehtml-".
 
     - Version 2.01, by Mathieu Bonnet:
         - Added CSS 3 property "border-radius".
@@ -196,7 +196,7 @@
       <item> -o-text-overflow </item>
 
       <!-- konq specific -->
-      <item> -khtml-background-size </item>
+      <item> -tdehtml-background-size </item>
       <item> konq_bgpos_x </item>
       <item> konq_bgpos_y </item>
 
diff --git a/kate/data/gdb.xml b/kate/data/gdb.xml
index 85f9383ff..9826756d7 100644
--- a/kate/data/gdb.xml
+++ b/kate/data/gdb.xml
@@ -21,7 +21,7 @@ v1.0:
       <IncludeRules context="oneliners" />
     </context>
     <context name="oneliners" attribute="Normal" lineEndContext="#pop">
-      <StringDetect attribute="Crash" context="#stay" String="[KCrash Handler]" />
+      <StringDetect attribute="Crash" context="#stay" String="[TDECrash Handler]" />
       <StringDetect String="Thread" firstNonSpace="true" context="thread" />
       <StringDetect String="[Current thread" firstNonSpace="true" context="thread" />
     </context>
diff --git a/kate/data/katepartreadonlyui.rc b/kate/data/katepartreadonlyui.rc
index 5c899dbfb..e1fff590e 100644
--- a/kate/data/katepartreadonlyui.rc
+++ b/kate/data/katepartreadonlyui.rc
@@ -77,7 +77,7 @@
   </Menu>
 </MenuBar>
 
-<Menu name="ktexteditor_popup" noMerge="1">
+<Menu name="tdetexteditor_popup" noMerge="1">
   <Action name="edit_undo" group="popup_operations" />
   <Action name="edit_redo" group="popup_operations" />
   <Separator group="popup_operations" />
diff --git a/kate/data/katepartui.rc b/kate/data/katepartui.rc
index 13908ad14..7a01434e2 100644
--- a/kate/data/katepartui.rc
+++ b/kate/data/katepartui.rc
@@ -92,7 +92,7 @@
   </Menu>
 </MenuBar>
 
-<Menu name="ktexteditor_popup" noMerge="0">
+<Menu name="tdetexteditor_popup" noMerge="0">
   <Action name="edit_undo" group="popup_operations" />
   <Action name="edit_redo" group="popup_operations" />
   <Separator group="popup_operations" />
diff --git a/kate/data/scss.xml b/kate/data/scss.xml
index 918f5c0b3..cfa6224cf 100644
--- a/kate/data/scss.xml
+++ b/kate/data/scss.xml
@@ -189,7 +189,7 @@
             <item> -o-text-overflow </item>
 
             <!-- konq specific -->
-            <item> -khtml-background-size </item>
+            <item> -tdehtml-background-size </item>
             <item> konq_bgpos_x </item>
             <item> konq_bgpos_y </item>
 
diff --git a/kate/data/tcsh.xml b/kate/data/tcsh.xml
index f9dffa2e4..19c94beaa 100644
--- a/kate/data/tcsh.xml
+++ b/kate/data/tcsh.xml
@@ -431,7 +431,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/data/zsh.xml b/kate/data/zsh.xml
index 5d0575ab9..e69c15354 100644
--- a/kate/data/zsh.xml
+++ b/kate/data/zsh.xml
@@ -497,7 +497,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/interfaces/CMakeLists.txt b/kate/interfaces/CMakeLists.txt
index c747f184c..f62bcdb0f 100644
--- a/kate/interfaces/CMakeLists.txt
+++ b/kate/interfaces/CMakeLists.txt
@@ -42,6 +42,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 94065cb3c..d14e58f89 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -3,10 +3,10 @@ METASOURCES = document.moc view.moc
 lib_LTLIBRARIES = libkatepartinterfaces.la
 
 libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
-libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
+libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
 libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 
 kateinclude_HEADERS = document.h view.h
 kateincludedir = $(includedir)/kate
 
-INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdeparts -I$(top_srcdir) $(all_includes)
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index 023840335..381e32fa2 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -19,28 +19,28 @@
 #ifndef _KATE_DOCUMENT_INCLUDE_
 #define _KATE_DOCUMENT_INCLUDE_
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/undointerface.h>
-#include <ktexteditor/cursorinterface.h>
-#include <ktexteditor/documentinfo.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/selectioninterfaceext.h>
-#include <ktexteditor/blockselectioninterface.h>
-#include <ktexteditor/searchinterface.h>
-#include <ktexteditor/highlightinginterface.h>
-#include <ktexteditor/configinterface.h>
-#include <ktexteditor/configinterfaceextension.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/wordwrapinterface.h>
-#include <ktexteditor/printinterface.h>
-#include <ktexteditor/variableinterface.h>
-
-#include <kaction.h>
-
-class KCompletion;
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/undointerface.h>
+#include <tdetexteditor/cursorinterface.h>
+#include <tdetexteditor/documentinfo.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/selectioninterfaceext.h>
+#include <tdetexteditor/blockselectioninterface.h>
+#include <tdetexteditor/searchinterface.h>
+#include <tdetexteditor/highlightinginterface.h>
+#include <tdetexteditor/configinterface.h>
+#include <tdetexteditor/configinterfaceextension.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/wordwrapinterface.h>
+#include <tdetexteditor/printinterface.h>
+#include <tdetexteditor/variableinterface.h>
+
+#include <tdeaction.h>
+
+class TDECompletion;
 
 /**
  * Kate namespace
@@ -77,13 +77,13 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
     void slotChanged();
 };
 
-class KATEPARTINTERFACES_EXPORT ActionMenu : public KActionMenu
+class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu
 {
   Q_OBJECT
 
   public:
     ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 )
-      : KActionMenu(text, parent, name) { ; };
+      : TDEActionMenu(text, parent, name) { ; };
     virtual ~ActionMenu () { ; };
 
   public:
@@ -146,7 +146,7 @@ class CommandExtension
     virtual void flagCompletions( TQStringList& /*list*/ ) {;}
 
     /**
-     * @return a KCompletion object that will substitute the command line default
+     * @return a TDECompletion object that will substitute the command line default
      * one while typing the first argument to the command. The text will be
      * added to the command seperated by one space character.
      *
@@ -154,7 +154,7 @@ class CommandExtension
      *
      * @param cmdname The command name associated with this request.
      */
-    virtual KCompletion *completionObject( const TQString & cmdname, Kate::View * /*view*/ ) { Q_UNUSED(cmdname); return 0L; }
+    virtual TDECompletion *completionObject( const TQString & cmdname, Kate::View * /*view*/ ) { Q_UNUSED(cmdname); return 0L; }
 
     /**
      * @return whether this command wants to process text interactively given the @p cmdname.
diff --git a/kate/interfaces/katecmd.cpp b/kate/interfaces/katecmd.cpp
index 69263b57c..ef356a6bb 100644
--- a/kate/interfaces/katecmd.cpp
+++ b/kate/interfaces/katecmd.cpp
@@ -118,12 +118,12 @@ const TQString KateCmd::fromHistory( uint index ) const
 //BEGIN KateCmdShellCompletion
 /*
    A lot of the code in the below class is copied from
-   tdelibs/kio/kio/kshellcompletion.cpp
+   tdelibs/tdeio/tdeio/kshellcompletion.cpp
    Copyright (C) 2000 David Smith <dsmith@algonet.se>
    Copyright (C) 2004 Anders Lund <anders@alweb.dk>
 */
 KateCmdShellCompletion::KateCmdShellCompletion()
-  : KCompletion()
+  : TDECompletion()
 {
   m_word_break_char = ' ';
   m_quote_char1 = '\"';
@@ -139,7 +139,7 @@ TQString KateCmdShellCompletion::makeCompletion( const TQString &text )
 
   // Make completion on the last part of text
   //
-  return KCompletion::makeCompletion( m_text_compl );
+  return TDECompletion::makeCompletion( m_text_compl );
 }
 
 void KateCmdShellCompletion::postProcessMatch( TQString *match ) const
@@ -158,9 +158,9 @@ void KateCmdShellCompletion::postProcessMatches( TQStringList *matches ) const
       (*it).prepend( m_text_start );
 }
 
-void KateCmdShellCompletion::postProcessMatches( KCompletionMatches *matches ) const
+void KateCmdShellCompletion::postProcessMatches( TDECompletionMatches *matches ) const
 {
-  for ( KCompletionMatches::Iterator it = matches->begin();
+  for ( TDECompletionMatches::Iterator it = matches->begin();
         it != matches->end(); it++ )
     if ( !(*it).value().isNull() )
       (*it).value().prepend( m_text_start );
diff --git a/kate/interfaces/katecmd.h b/kate/interfaces/katecmd.h
index b01f6dafb..262781aa3 100644
--- a/kate/interfaces/katecmd.h
+++ b/kate/interfaces/katecmd.h
@@ -53,12 +53,12 @@ class KATEPARTINTERFACES_EXPORT KateCmd
 };
 
 /**
- * A KCompletion object that completes last ?unquoted? word in the string
+ * A TDECompletion object that completes last ?unquoted? word in the string
  * passed. Dont mistake "shell" for anything related to quoting, this
  * simply mimics shell tab completion by completing the last word in the
  * provided text.
  */
-class KATEPARTINTERFACES_EXPORT KateCmdShellCompletion : public KCompletion
+class KATEPARTINTERFACES_EXPORT KateCmdShellCompletion : public TDECompletion
 {
   public:
     KateCmdShellCompletion();
@@ -72,10 +72,10 @@ class KATEPARTINTERFACES_EXPORT KateCmdShellCompletion : public KCompletion
     TQString makeCompletion(const TQString &text);
 
   protected:
-        // Called by KCompletion
+        // Called by TDECompletion
     void postProcessMatch( TQString *match ) const;
     void postProcessMatches( TQStringList *matches ) const;
-    void postProcessMatches( KCompletionMatches *matches ) const;
+    void postProcessMatches( TDECompletionMatches *matches ) const;
 
   private:
   /**
diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h
index 90c61d5ac..3b2b8a4e1 100644
--- a/kate/interfaces/view.h
+++ b/kate/interfaces/view.h
@@ -19,16 +19,16 @@
 #ifndef _KATE_VIEW_INCLUDE_
 #define _KATE_VIEW_INCLUDE_
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/clipboardinterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/dynwordwrapinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/clipboardinterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/dynwordwrapinterface.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace Kate
 {
@@ -189,14 +189,14 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
 
   public:
     /**
-      Reads session config out of the KConfig object. This also includes
+      Reads session config out of the TDEConfig object. This also includes
       the actual cursor position and the bookmarks.
     */
-    virtual void readSessionConfig(KConfig *) { ; };
+    virtual void readSessionConfig(TDEConfig *) { ; };
     /**
-      Writes session config into the KConfig object.
+      Writes session config into the TDEConfig object.
     */
-    virtual void writeSessionConfig(KConfig *) { ; };
+    virtual void writeSessionConfig(TDEConfig *) { ; };
 
   public slots:
     /**
diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt
index 11e347212..dcbc0eecd 100644
--- a/kate/part/CMakeLists.txt
+++ b/kate/part/CMakeLists.txt
@@ -21,11 +21,11 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
   ${CMAKE_SOURCE_DIR}/kjs
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdeprint
   ${CMAKE_SOURCE_DIR}/interfaces
   ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
@@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
 tde_add_kpart( ${target}
   SOURCES dummy.cpp
   EMBED kate-static
-  LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared
+  LINK kjs-shared tdeprint-shared katepartinterfaces-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am
index 746c35813..71b201485 100644
--- a/kate/part/Makefile.am
+++ b/kate/part/Makefile.am
@@ -16,11 +16,11 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.cpp \
 
 libkatepart_la_SOURCES = dummy.cpp
 
-libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
 
 libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
-INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces  -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
+INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces  -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index ed9a6169b..9bbe317df 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -27,9 +27,9 @@
 #include "katejscript.h"
 #include "kateview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <cctype>
 
@@ -159,7 +159,7 @@ KateAutoIndent::~KateAutoIndent ()
 
 //BEGIN KateViewIndentAction
 KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name)
-       : KActionMenu (text, parent, name), doc(_doc)
+       : TDEActionMenu (text, parent, name), doc(_doc)
 {
   connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
 }
diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h
index 6c0d15d45..abdab7777 100644
--- a/kate/part/kateautoindent.h
+++ b/kate/part/kateautoindent.h
@@ -190,9 +190,9 @@ class KateAutoIndent : public TQObject
 
 /**
  * This action provides a list of available indenters and gets plugged
- * into the KateView's KActionCollection.
+ * into the KateView's TDEActionCollection.
  */
-class KateViewIndentationAction : public KActionMenu
+class KateViewIndentationAction : public TDEActionMenu
 {
   Q_OBJECT
 
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index ac1ee73d9..f29ec9915 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -23,9 +23,9 @@
 #include "katedocument.h"
 #include "kateview.h"
 
-#include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
@@ -71,34 +71,34 @@ KateBookmarks::~KateBookmarks()
 {
 }
 
-void KateBookmarks::createActions( KActionCollection* ac )
+void KateBookmarks::createActions( TDEActionCollection* ac )
 {
-  m_bookmarkToggle = new KToggleAction(
+  m_bookmarkToggle = new TDEToggleAction(
     i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
     this, TQT_SLOT(toggleBookmark()),
     ac, "bookmarks_toggle" );
   m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
   m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );
 
-  m_bookmarkClear = new KAction(
+  m_bookmarkClear = new TDEAction(
     i18n("Clear &All Bookmarks"), 0,
     this, TQT_SLOT(clearBookmarks()),
     ac, "bookmarks_clear");
   m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));
 
-  m_goNext = new KAction(
+  m_goNext = new TDEAction(
     i18n("Next Bookmark"), "next", ALT + Key_PageDown,
     this, TQT_SLOT(goNext()),
     ac, "bookmarks_next");
   m_goNext->setWhatsThis(i18n("Go to the next bookmark."));
 
-  m_goPrevious = new KAction(
+  m_goPrevious = new TDEAction(
     i18n("Previous Bookmark"), "previous", ALT + Key_PageUp,
     this, TQT_SLOT(goPrevious()),
     ac, "bookmarks_previous");
   m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark."));
 
-  m_bookmarksMenu = (new KActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
+  m_bookmarksMenu = (new TDEActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
 
   //connect the aboutToShow() and aboutToHide() signals with
   //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots
diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h
index 63928800e..ae4151812 100644
--- a/kate/part/katebookmarks.h
+++ b/kate/part/katebookmarks.h
@@ -29,9 +29,9 @@ namespace KTextEditor { class Mark; }
 
 namespace Kate { class View; }
 
-class KAction;
-class KToggleAction;
-class KActionCollection;
+class TDEAction;
+class TDEToggleAction;
+class TDEActionCollection;
 class TQPopupMenu;
 class TQMenuData;
 
@@ -44,7 +44,7 @@ class KateBookmarks : public TQObject
     KateBookmarks( KateView* parent, Sorting sort=Position );
     virtual ~KateBookmarks();
 
-    void createActions( KActionCollection* );
+    void createActions( TDEActionCollection* );
 
     KateBookmarks::Sorting sorting() { return m_sorting; };
     void setSorting( Sorting s ) { m_sorting = s; };
@@ -69,10 +69,10 @@ class KateBookmarks : public TQObject
 
   private:
     KateView*                    m_view;
-    KToggleAction*               m_bookmarkToggle;
-    KAction*                     m_bookmarkClear;
-    KAction*                     m_goNext;
-    KAction*                     m_goPrevious;
+    TDEToggleAction*               m_bookmarkToggle;
+    TDEAction*                     m_bookmarkClear;
+    TDEAction*                     m_goNext;
+    TDEAction*                     m_goPrevious;
 
     Sorting                      m_sorting;
     TQPopupMenu*          m_bookmarksMenu;
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 1661c69df..61f81fadf 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -31,7 +31,7 @@
 #include "kateautoindent.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <tqpopupmenu.h>
@@ -118,7 +118,7 @@ class KateFileLoader
 
         if (c > 0)
         {
-          // fix utf16 LE, stolen from khtml ;)
+          // fix utf16 LE, stolen from tdehtml ;)
           if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00))
           {
             // utf16LE, we need to put the decoder in LE mode
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index c5feb5071..09dd46f13 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -32,7 +32,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kshellcompletion.h>
 
@@ -279,7 +279,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view,
   KCC_ERR( i18n("Unknown command '%1'").arg(cmd) );
 }
 
-KCompletion *KateCommands::CoreCommands::completionObject( const TQString &cmd, Kate::View *view )
+TDECompletion *KateCommands::CoreCommands::completionObject( const TQString &cmd, Kate::View *view )
 {
   if ( cmd == "set-highlight" )
   {
diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h
index 55c8d807b..d313be91d 100644
--- a/kate/part/katecmds.h
+++ b/kate/part/katecmds.h
@@ -25,7 +25,7 @@
 #include "../interfaces/view.h"
 
 class KateDocument;
-class KCompletion;
+class TDECompletion;
 
 namespace KateCommands
 {
@@ -59,7 +59,7 @@ class CoreCommands : public Kate::Command, public Kate::CommandExtension
     /**
     * override completionObject from interfaces/document.h .
     */
-    KCompletion *completionObject( const TQString &cmd, Kate::View *view );
+    TDECompletion *completionObject( const TQString &cmd, Kate::View *view );
 };
 
 /**
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index c2bebc841..ce4af0ecf 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -28,7 +28,7 @@
 #ifndef __KateCodeCompletion_H__
 #define __KateCodeCompletion_H__
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 4b3c2f52b..ed4eaacd2 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -27,11 +27,11 @@
 
 #include <math.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kglobalsettings.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdeglobalsettings.h>
 #include <kcharsets.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kfinddialog.h>
 #include <kreplacedialog.h>
 #include <kinstance.h>
@@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig ()
   m_pluginsSet.fill (true);
 
   // init with defaults from config or really hardcoded ones
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("Kate Document Defaults");
   readConfig (config);
 }
@@ -149,7 +149,7 @@ KateDocumentConfig::~KateDocumentConfig ()
 {
 }
 
-void KateDocumentConfig::readConfig (KConfig *config)
+void KateDocumentConfig::readConfig (TDEConfig *config)
 {
   configStart ();
 
@@ -191,7 +191,7 @@ void KateDocumentConfig::readConfig (KConfig *config)
   configEnd ();
 }
 
-void KateDocumentConfig::writeConfig (KConfig *config)
+void KateDocumentConfig::writeConfig (TDEConfig *config)
 {
   config->writeEntry("Tab Width", tabWidth());
 
@@ -422,11 +422,11 @@ TQTextCodec *KateDocumentConfig::codec ()
   if (m_encodingSet || isGlobal())
   {
     if (m_encoding.isEmpty() && isGlobal())
-      return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
+      return TDEGlobal::charsets()->codecForName (TQString::fromLatin1(TDEGlobal::locale()->encoding()));
     else if (m_encoding.isEmpty())
       return s_global->codec ();
     else
-      return KGlobal::charsets()->codecForName (m_encoding);
+      return TDEGlobal::charsets()->codecForName (m_encoding);
   }
 
   return s_global->codec ();
@@ -439,7 +439,7 @@ void KateDocumentConfig::setEncoding (const TQString &encoding)
   if (!enc.isEmpty())
   {
     bool found = false;
-    TQTextCodec *codec = KGlobal::charsets()->codecForName (encoding, found);
+    TQTextCodec *codec = TDEGlobal::charsets()->codecForName (encoding, found);
 
     if (!found || !codec)
       return;
@@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig ()
   s_global = this;
 
   // init with defaults from config or really hardcoded ones
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("Kate View Defaults");
   readConfig (config);
 }
@@ -660,7 +660,7 @@ KateViewConfig::~KateViewConfig ()
 {
 }
 
-void KateViewConfig::readConfig (KConfig *config)
+void KateViewConfig::readConfig (TDEConfig *config)
 {
   configStart ();
 
@@ -693,7 +693,7 @@ void KateViewConfig::readConfig (KConfig *config)
   configEnd ();
 }
 
-void KateViewConfig::writeConfig (KConfig *config)
+void KateViewConfig::writeConfig (TDEConfig *config)
 {
   config->writeEntry( "Dynamic Word Wrap", dynWordWrap() );
   config->writeEntry( "Dynamic Word Wrap Indicators", dynWordWrapIndicators() );
@@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig ()
   s_global = this;
 
   // init with defaults from config or really hardcoded ones
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("Kate Renderer Defaults");
   readConfig (config);
 }
@@ -1054,7 +1054,7 @@ KateRendererConfig::~KateRendererConfig ()
   delete m_font;
 }
 
-void KateRendererConfig::readConfig (KConfig *config)
+void KateRendererConfig::readConfig (TDEConfig *config)
 {
   configStart ();
 
@@ -1067,7 +1067,7 @@ void KateRendererConfig::readConfig (KConfig *config)
   configEnd ();
 }
 
-void KateRendererConfig::writeConfig (KConfig *config)
+void KateRendererConfig::writeConfig (TDEConfig *config)
 {
   config->writeEntry ("Schema", KateFactory::self()->schemaManager()->name(schema()));
 
@@ -1125,14 +1125,14 @@ void KateRendererConfig::setSchemaInternal( int schema )
   m_schemaSet = true;
   m_schema = schema;
 
-  KConfig *config (KateFactory::self()->schemaManager()->schema(schema));
+  TDEConfig *config (KateFactory::self()->schemaManager()->schema(schema));
 
-  TQColor tmp0 (KGlobalSettings::baseColor());
-  TQColor tmp1 (KGlobalSettings::highlightColor());
-  TQColor tmp2 (KGlobalSettings::alternateBackgroundColor());
+  TQColor tmp0 (TDEGlobalSettings::baseColor());
+  TQColor tmp1 (TDEGlobalSettings::highlightColor());
+  TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor());
   TQColor tmp3 ( "#FFFF99" );
   TQColor tmp4 (tmp2.dark());
-  TQColor tmp5 ( KGlobalSettings::textColor() );
+  TQColor tmp5 ( TDEGlobalSettings::textColor() );
   TQColor tmp6 ( "#EAE9E8" );
   TQColor tmp7 ( "#000000" );
 
@@ -1170,7 +1170,7 @@ void KateRendererConfig::setSchemaInternal( int schema )
     m_lineMarkerColor[index] = col;
   }
 
-  TQFont f (KGlobalSettings::fixedFont());
+  TQFont f (TDEGlobalSettings::fixedFont());
 
   if (!m_fontSet)
   {
diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h
index 56d094cd0..a698bc35d 100644
--- a/kate/part/kateconfig.h
+++ b/kate/part/kateconfig.h
@@ -19,7 +19,7 @@
 #ifndef __KATE_CONFIG_H__
 #define __KATE_CONFIG_H__
 
-#include <ktexteditor/markinterface.h>
+#include <tdetexteditor/markinterface.h>
 
 #include <tqbitarray.h>
 #include <tqcolor.h>
@@ -32,7 +32,7 @@ class KateRenderer;
 class KateFontStruct;
 class KateFontMetrics;
 
-class KConfig;
+class TDEConfig;
 
 class TQFont;
 class TQTextCodec;
@@ -115,12 +115,12 @@ class KateDocumentConfig : public KateConfig
     /**
      * Read config from object
      */
-    void readConfig (KConfig *config);
+    void readConfig (TDEConfig *config);
 
     /**
      * Write config to object
      */
-    void writeConfig (KConfig *config);
+    void writeConfig (TDEConfig *config);
 
   protected:
     void updateConfig ();
@@ -304,12 +304,12 @@ class KateViewConfig : public KateConfig
     /**
      * Read config from object
      */
-    void readConfig (KConfig *config);
+    void readConfig (TDEConfig *config);
 
     /**
      * Write config to object
      */
-    void writeConfig (KConfig *config);
+    void writeConfig (TDEConfig *config);
 
   protected:
     void updateConfig ();
@@ -432,12 +432,12 @@ class KateRendererConfig : public KateConfig
     /**
      * Read config from object
      */
-    void readConfig (KConfig *config);
+    void readConfig (TDEConfig *config);
 
     /**
      * Write config to object
      */
-    void writeConfig (KConfig *config);
+    void writeConfig (TDEConfig *config);
 
   protected:
     void updateConfig ();
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 5a5a73b70..1b8ce89eb 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -35,44 +35,44 @@
 #include "kateview.h"
 
 
-#include <ktexteditor/configinterfaceextension.h>
-#include <ktexteditor/plugin.h>
+#include <tdetexteditor/configinterfaceextension.h>
+#include <tdetexteditor/plugin.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 
-#include <kaccel.h>
-#include <kapplication.h>
+#include <tdeaccel.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcharsets.h>
 #include <kcolorbutton.h>
 #include <kcolorcombo.h>
 #include <kcolordialog.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfontdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdefontdialog.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeybutton.h>
 #include <kkeydialog.h>
 #include <klineedit.h>
-#include <klistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetypechooser.h>
 #include <knuminput.h>
-#include <kparts/componentfactory.h>
-#include <kpopupmenu.h>
+#include <tdeparts/componentfactory.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kprocio.h>
 #include <kregexpeditorinterface.h>
 #include <krun.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
@@ -999,7 +999,7 @@ void KateSaveConfigTab::apply()
 
   KateDocumentConfig::global()->setConfigFlags(configFlags);
 
-  KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : KGlobal::charsets()->encodingForName(m_encoding->currentText()));
+  KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : TDEGlobal::charsets()->encodingForName(m_encoding->currentText()));
 
   KateDocumentConfig::global()->setEol(m_eol->currentItem());
   KateDocumentConfig::global()->setAllowEolDetection(allowEolDetection->isChecked());
@@ -1013,12 +1013,12 @@ void KateSaveConfigTab::reload()
   m_encoding->clear ();
   m_encoding->insertItem (i18n("TDE Default"));
   m_encoding->setCurrentItem(0);
-  TQStringList encodings (KGlobal::charsets()->descriptiveEncodingNames());
+  TQStringList encodings (TDEGlobal::charsets()->descriptiveEncodingNames());
   int insert = 1;
   for (uint i=0; i < encodings.count(); i++)
   {
     bool found = false;
-    TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found);
+    TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found);
 
     if (found)
     {
@@ -1095,7 +1095,7 @@ void KatePartPluginListItem::stateChange(bool b)
 
 //BEGIN PluginListView
 KatePartPluginListView::KatePartPluginListView(TQWidget *parent, const char *name)
-  : KListView(parent, name)
+  : TDEListView(parent, name)
 {
 }
 
@@ -1226,7 +1226,7 @@ void KatePartPluginConfigPage::slotConfigure()
       path.clear();
       path << cife->configPageName( i );
       page = kd->addVBoxPage( path, cife->configPageFullName (i),
-                                cife->configPagePixmap(i, KIcon::SizeMedium) );
+                                cife->configPagePixmap(i, TDEIcon::SizeMedium) );
     }
     else
     {
@@ -1369,7 +1369,7 @@ void KateHlConfigPage::apply ()
   for ( TQIntDictIterator<KateHlData> it( hlDataDict ); it.current(); ++it )
     KateHlManager::self()->getHl( it.currentKey() )->setData( it.current() );
 
-  KateHlManager::self()->getKConfig()->sync ();
+  KateHlManager::self()->getTDEConfig()->sync ();
 }
 
 void KateHlConfigPage::reload ()
@@ -1453,20 +1453,20 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b
   new TQLabel(i18n("<b>Note:</b> New versions are selected automatically."), vbox);
   actionButton (User1)->setIconSet(SmallIconSet("ok"));
 
-  transferJob = KIO::get(
+  transferJob = TDEIO::get(
     KURL(TQString(HLDOWNLOADPATH)
        + TQString("update-")
        + TQString(KATEPART_VERSION)
        + TQString(".xml")), true, true );
-  connect(transferJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-    this, TQT_SLOT(listDataReceived(KIO::Job *, const TQByteArray &)));
-//        void data( KIO::Job *, const TQByteArray &data);
+  connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+    this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &)));
+//        void data( TDEIO::Job *, const TQByteArray &data);
   resize(450, 400);
 }
 
 KateHlDownloadDialog::~KateHlDownloadDialog(){}
 
-void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)
+void KateHlDownloadDialog::listDataReceived(TDEIO::Job *, const TQByteArray &data)
 {
   if (!transferJob || transferJob->isErrorPage())
   {
@@ -1529,7 +1529,7 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)
 
 void KateHlDownloadDialog::slotUser1()
 {
-  TQString destdir=KGlobal::dirs()->saveLocation("data","katepart/syntax/");
+  TQString destdir=TDEGlobal::dirs()->saveLocation("data","katepart/syntax/");
   for (TQListViewItem *it=list->firstChild();it;it=it->nextSibling())
   {
     if (list->isSelected(it))
@@ -1538,7 +1538,7 @@ void KateHlDownloadDialog::slotUser1()
       TQString filename=src.fileName(false);
       TQString dest = destdir+filename;
 
-      KIO::NetAccess::download(src,dest, this);
+      TDEIO::NetAccess::download(src,dest, this);
     }
   }
 
@@ -1640,16 +1640,16 @@ KateModOnHdPrompt::~KateModOnHdPrompt()
 
 void KateModOnHdPrompt::slotDiff()
 {
-  // Start a KProcess that creates a diff
+  // Start a TDEProcess that creates a diff
   KProcIO *p = new KProcIO();
-  p->setComm( KProcess::All );
+  p->setComm( TDEProcess::All );
   *p << "diff" << "-u" << "-" <<  m_doc->url().path();
-  connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) );
+  connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
   connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );
 
   setCursor( WaitCursor );
 
-  p->start( KProcess::NotifyOnExit, true );
+  p->start( TDEProcess::NotifyOnExit, true );
 
   uint lastln =  m_doc->numLines();
   for ( uint l = 0; l <  lastln; l++ )
@@ -1678,7 +1678,7 @@ void KateModOnHdPrompt::slotPRead( KProcIO *p)
     p->ackRead();
 }
 
-void KateModOnHdPrompt::slotPDone( KProcess *p )
+void KateModOnHdPrompt::slotPDone( TDEProcess *p )
 {
   setCursor( ArrowCursor );
   if( ! m_tmpfile )
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index aa6f21f6d..0f865fcea 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -29,7 +29,7 @@
 
 #include "../interfaces/document.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kmimetype.h>
 
@@ -46,19 +46,19 @@ struct syntaxContextData;
 class KateDocument;
 class KateView;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
   class TransferJob;
 }
 
-class KAccel;
+class TDEAccel;
 class KColorButton;
 class KComboBox;
 class KIntNumInput;
 class KKeyButton;
 class KKeyChooser;
-class KMainWindow;
+class TDEMainWindow;
 class KPushButton;
 class KRegExpDialog;
 class KIntNumInput;
@@ -235,7 +235,7 @@ class KateEditKeyConfiguration: public KateConfigPage
     bool m_ready;
     class KateDocument *m_doc;
     KKeyChooser* m_keyChooser;
-    class KActionCollection *m_ac;
+    class TDEActionCollection *m_ac;
 };
 
 class KateSaveConfigTab : public KateConfigPage
@@ -263,7 +263,7 @@ class KateSaveConfigTab : public KateConfigPage
 
 class KatePartPluginListItem;
 
-class KatePartPluginListView : public KListView
+class KatePartPluginListView : public TDEListView
 {
   Q_OBJECT
 
@@ -350,17 +350,17 @@ class KateHlDownloadDialog: public KDialogBase
   private:
     class TQListView  *list;
     class TQString listData;
-    KIO::TransferJob *transferJob;
+    TDEIO::TransferJob *transferJob;
 
   private slots:
-    void listDataReceived(KIO::Job *, const TQByteArray &data);
+    void listDataReceived(TDEIO::Job *, const TQByteArray &data);
 
   public slots:
     void slotUser1();
 };
 
 class KProcIO;
-class KProcess;
+class TDEProcess;
 /**
  * This dialog will prompt the user for what do with a file that is
  * modified on disk.
@@ -394,7 +394,7 @@ class KateModOnHdPrompt : public KDialogBase
 
   private slots:
     void slotPRead(KProcIO*); ///< Read from the diff process
-    void slotPDone(KProcess*); ///< Runs the diff file when done
+    void slotPDone(TDEProcess*); ///< Runs the diff file when done
 
   private:
     KateDocument *m_doc;
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 603388479..e42bfb0bd 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -40,33 +40,33 @@
 #include "katefiletype.h"
 #include "kateschema.h"
 #include "katetemplatehandler.h"
-#include <ktexteditor/plugin.h>
+#include <tdetexteditor/plugin.h>
 
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kio/kfileitem.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/tdefileitem.h>
 
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeapplication.h>
+#include <tdepopupmenu.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <kxmlguifactory.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klibloader.h>
 #include <kdirwatch.h>
 #include <twin.h>
 #include <kencodingfiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 
@@ -112,7 +112,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
   // my dcop object
   setObjId ("KateDocument#"+documentDCOPSuffix());
 
-  // ktexteditor interfaces
+  // tdetexteditor interfaces
   setBlockSelectionInterfaceDCOPSuffix (documentDCOPSuffix());
   setConfigInterfaceDCOPSuffix (documentDCOPSuffix());
   setConfigInterfaceExtensionDCOPSuffix (documentDCOPSuffix());
@@ -1879,7 +1879,7 @@ void KateDocument::setDontChangeHlOnSave()
 //END
 
 //BEGIN KTextEditor::ConfigInterface stuff
-void KateDocument::readConfig(KConfig *config)
+void KateDocument::readConfig(TDEConfig *config)
 {
   config->setGroup("Kate Document Defaults");
 
@@ -1895,7 +1895,7 @@ void KateDocument::readConfig(KConfig *config)
   KateRendererConfig::global()->readConfig (config);
 }
 
-void KateDocument::writeConfig(KConfig *config)
+void KateDocument::writeConfig(TDEConfig *config)
 {
   config->setGroup("Kate Document Defaults");
 
@@ -1913,24 +1913,24 @@ void KateDocument::writeConfig(KConfig *config)
 
 void KateDocument::readConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   readConfig (config);
 }
 
 void KateDocument::writeConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   writeConfig (config);
   config->sync();
 }
 
-void KateDocument::readSessionConfig(KConfig *kconfig)
+void KateDocument::readSessionConfig(TDEConfig *tdeconfig)
 {
   // restore the url
-  KURL url (kconfig->readEntry("URL"));
+  KURL url (tdeconfig->readEntry("URL"));
 
   // get the encoding
-  TQString tmpenc=kconfig->readEntry("Encoding");
+  TQString tmpenc=tdeconfig->readEntry("Encoding");
   if (!tmpenc.isEmpty() && (tmpenc != encoding()))
     setEncoding(tmpenc);
 
@@ -1939,34 +1939,34 @@ void KateDocument::readSessionConfig(KConfig *kconfig)
     openURL (url);
 
   // restore the hl stuff
-  m_buffer->setHighlight(KateHlManager::self()->nameFind(kconfig->readEntry("Highlighting")));
+  m_buffer->setHighlight(KateHlManager::self()->nameFind(tdeconfig->readEntry("Highlighting")));
 
   if (hlMode() > 0)
     hlSetByUser = true;
 
   // indent mode
-  config()->setIndentationMode( (uint)kconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) );
+  config()->setIndentationMode( (uint)tdeconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) );
 
   // Restore Bookmarks
-  TQValueList<int> marks = kconfig->readIntListEntry("Bookmarks");
+  TQValueList<int> marks = tdeconfig->readIntListEntry("Bookmarks");
   for( uint i = 0; i < marks.count(); i++ )
     addMark( marks[i], KateDocument::markType01 );
 }
 
-void KateDocument::writeSessionConfig(KConfig *kconfig)
+void KateDocument::writeSessionConfig(TDEConfig *tdeconfig)
 {
-  if ( m_url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
+  if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
        return;
   // save url
-  kconfig->writeEntry("URL", m_url.prettyURL() );
+  tdeconfig->writeEntry("URL", m_url.prettyURL() );
 
   // save encoding
-  kconfig->writeEntry("Encoding",encoding());
+  tdeconfig->writeEntry("Encoding",encoding());
 
   // save hl
-  kconfig->writeEntry("Highlighting", highlight()->name());
+  tdeconfig->writeEntry("Highlighting", highlight()->name());
 
-  kconfig->writeEntry("Indentation Mode", config()->indentationMode() );
+  tdeconfig->writeEntry("Indentation Mode", config()->indentationMode() );
 
   // Save Bookmarks
   TQValueList<int> marks;
@@ -1975,7 +1975,7 @@ void KateDocument::writeSessionConfig(KConfig *kconfig)
        ++it )
      marks << it.current()->line;
 
-  kconfig->writeEntry( "Bookmarks", marks );
+  tdeconfig->writeEntry( "Bookmarks", marks );
 }
 
 void KateDocument::configDialog()
@@ -1998,7 +1998,7 @@ void KateDocument::configDialog()
     path.clear();
     path << KTextEditor::configInterfaceExtension (this)->configPageName (i);
     TQVBox *page = kd->addVBoxPage(path, KTextEditor::configInterfaceExtension (this)->configPageFullName (i),
-                              KTextEditor::configInterfaceExtension (this)->configPagePixmap(i, KIcon::SizeMedium) );
+                              KTextEditor::configInterfaceExtension (this)->configPagePixmap(i, TDEIcon::SizeMedium) );
 
     editorPages.append (KTextEditor::configInterfaceExtension (this)->configPage(i, page));
   }
@@ -2302,14 +2302,14 @@ bool KateDocument::openURL( const KURL &url )
     m_tempFile = new KTempFile ();
     m_file = m_tempFile->name();
 
-    m_job = KIO::get ( url, false, isProgressInfoEnabled() );
+    m_job = TDEIO::get ( url, false, isProgressInfoEnabled() );
 
     // connect to slots
-    connect( m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           TQT_SLOT( slotDataKate( KIO::Job*, const TQByteArray& ) ) );
+    connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) );
 
-    connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ),
-           TQT_SLOT( slotFinishedKate( KIO::Job* ) ) );
+    connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) );
 
     TQWidget *w = widget ();
     if (!w && !m_views.isEmpty ())
@@ -2324,7 +2324,7 @@ bool KateDocument::openURL( const KURL &url )
   }
 }
 
-void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data )
+void KateDocument::slotDataKate ( TDEIO::Job *, const TQByteArray &data )
 {
 //   kdDebug(13020) << "KateDocument::slotData" << endl;
 
@@ -2334,7 +2334,7 @@ void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data )
   m_tempFile->file()->writeBlock (data);
 }
 
-void KateDocument::slotFinishedKate ( KIO::Job * job )
+void KateDocument::slotFinishedKate ( TDEIO::Job * job )
 {
 //   kdDebug(13020) << "KateDocument::slotJobFinished" << endl;
 
@@ -2373,7 +2373,7 @@ bool KateDocument::openFile()
   return openFile (0);
 }
 
-bool KateDocument::openFile(KIO::Job * job)
+bool KateDocument::openFile(TDEIO::Job * job)
 {
   m_loading = true;
   // add new m_file to dirwatch
@@ -2520,8 +2520,8 @@ bool KateDocument::save()
 
     // get the right permissions, start with safe default
     mode_t  perms = 0600;
-    KIO::UDSEntry fentry;
-    if (KIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
+    TDEIO::UDSEntry fentry;
+    if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
     {
       kdDebug () << "stating succesfull: " << url() << endl;
       KFileItem item (fentry, url());
@@ -2530,8 +2530,8 @@ bool KateDocument::save()
 
     // first del existing file if any, than copy over the file we have
     // failure if a: the existing file could not be deleted, b: the file could not be copied
-    if ( (!KIO::NetAccess::exists( u, false, kapp->mainWidget() ) || KIO::NetAccess::del( u, kapp->mainWidget() ))
-          && KIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
+    if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() ))
+          && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
     {
       kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl;
     }
@@ -2761,7 +2761,7 @@ bool KateDocument::closeURL()
   }
 
   //
-  // first call the normal kparts implementation
+  // first call the normal tdeparts implementation
   //
   if (!KParts::ReadWritePart::closeURL ())
     return false;
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index d967a25ab..adc0dc92a 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -29,16 +29,16 @@
 
 #include "../interfaces/document.h"
 
-#include <ktexteditor/configinterfaceextension.h>
-#include <ktexteditor/encodinginterface.h>
-#include <ktexteditor/sessionconfiginterface.h>
-#include <ktexteditor/editinterfaceext.h>
-#include <ktexteditor/templateinterface.h>
+#include <tdetexteditor/configinterfaceextension.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdetexteditor/sessionconfiginterface.h>
+#include <tdetexteditor/editinterfaceext.h>
+#include <tdetexteditor/templateinterface.h>
 
 #include <dcopobject.h>
 
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqintdict.h>
 #include <tqmap.h>
@@ -46,7 +46,7 @@
 
 namespace KTextEditor { class Plugin; }
 
-namespace KIO { class TransferJob; }
+namespace TDEIO { class TransferJob; }
 
 class KateUndoGroup;
 class KateCmd;
@@ -163,7 +163,7 @@ class KateDocument : public Kate::Document,
     KTextEditor::ConfigPage *configPage (uint number = 0, TQWidget *parent = 0, const char *name=0 );
     TQString configPageName (uint number = 0) const;
     TQString configPageFullName (uint number = 0) const;
-    TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const;
+    TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const;
 
   //
   // KTextEditor::EditInterface stuff
@@ -439,10 +439,10 @@ class KateDocument : public Kate::Document,
   public slots:
     void readConfig ();
     void writeConfig ();
-    void readConfig (KConfig *);
-    void writeConfig (KConfig *);
-    void readSessionConfig (KConfig *);
-    void writeSessionConfig (KConfig *);
+    void readConfig (TDEConfig *);
+    void writeConfig (TDEConfig *);
+    void readSessionConfig (TDEConfig *);
+    void writeSessionConfig (TDEConfig *);
     void configDialog ();
 
   //
@@ -555,7 +555,7 @@ class KateDocument : public Kate::Document,
     /* Anders: Reimplemented to do kate specific stuff */
     bool saveAs( const KURL &url );
 
-    bool openFile (KIO::Job * job);
+    bool openFile (TDEIO::Job * job);
     bool openFile ();
 
     bool saveFile ();
@@ -565,8 +565,8 @@ class KateDocument : public Kate::Document,
     void setModified( bool m );
 
   private slots:
-    void slotDataKate ( KIO::Job* kio_job, const TQByteArray &data );
-    void slotFinishedKate ( KIO::Job * job );
+    void slotDataKate ( TDEIO::Job* tdeio_job, const TQByteArray &data );
+    void slotFinishedKate ( TDEIO::Job * job );
 
   private:
     void abortLoadKate();
@@ -955,7 +955,7 @@ class KateDocument : public Kate::Document,
 
   /**
    * Variable Reader
-   * TODO add register functionality/ktexteditor interface
+   * TODO add register functionality/tdetexteditor interface
    */
   private:
     /**
@@ -1004,7 +1004,7 @@ class KateDocument : public Kate::Document,
     static TQRegExp kvLineMime;
     static TQRegExp kvVar;
 
-    KIO::TransferJob *m_job;
+    TDEIO::TransferJob *m_job;
     KTempFile *m_tempFile;
 
   // TemplateInterface
diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp
index 370be7684..b2e43758f 100644
--- a/kate/part/katedocumenthelpers.cpp
+++ b/kate/part/katedocumenthelpers.cpp
@@ -24,8 +24,8 @@
 #include "katedocument.h"
 #include "kateview.h"
 
-#include <kpopupmenu.h>
-#include <klocale.h>
+#include <tdepopupmenu.h>
+#include <tdelocale.h>
 
 KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
 : KParts::BrowserExtension( doc, "katepartbrowserextension" ),
diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h
index 75c6740d0..b604d47ce 100644
--- a/kate/part/katedocumenthelpers.h
+++ b/kate/part/katedocumenthelpers.h
@@ -23,7 +23,7 @@
 
 #include "../interfaces/document.h"
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <tqstringlist.h>
 #include <tqguardedptr.h>
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index 64bde8718..d6a9e0d59 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -34,7 +34,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kvmallocator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdirwatch.h>
 #include <kstaticdeleter.h>
 
@@ -68,10 +68,10 @@ KateFactory *KateFactory::s_self = 0;
 
 KateFactory::KateFactory ()
  : m_aboutData ("katepart", I18N_NOOP("Kate Part"), KATEPART_VERSION,
-             I18N_NOOP( "Embeddable editor component" ), KAboutData::License_LGPL_V2,
+             I18N_NOOP( "Embeddable editor component" ), TDEAboutData::License_LGPL_V2,
              I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org")
  , m_instance (&m_aboutData)
- , m_plugins (KTrader::self()->query("KTextEditor/Plugin"))
+ , m_plugins (TDETrader::self()->query("KTextEditor/Plugin"))
  , m_jscript (0)
 {
   // set s_self
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index 0fd939ce3..72fef8781 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -20,11 +20,11 @@
 #define __KATE_FACTORY_H__
 
 #include "katejscript.h"
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 #include <ktrader.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 // katepart version must be a string in double quotes, format: "x.x"
 #define KATEPART_VERSION "2.5"
@@ -87,7 +87,7 @@ class KateFactory
      * public accessor to the instance
      * @return instance
      */
-    inline KInstance *instance () { return &m_instance; };
+    inline TDEInstance *instance () { return &m_instance; };
 
     /**
      * register document at the factory
@@ -148,9 +148,9 @@ class KateFactory
 
     /**
      * on start detected plugins
-     * @return list of all at launch detected ktexteditor::plugins
+     * @return list of all at launch detected tdetexteditor::plugins
      */
-    inline const KTrader::OfferList &plugins () { return m_plugins; };
+    inline const TDETrader::OfferList &plugins () { return m_plugins; };
 
     /**
      * global dirwatch
@@ -221,12 +221,12 @@ class KateFactory
     /**
      * about data (authors and more)
      */
-    KAboutData m_aboutData;
+    TDEAboutData m_aboutData;
 
     /**
      * our kinstance
      */
-    KInstance m_instance;
+    TDEInstance m_instance;
 
     /**
      * registered docs
@@ -261,7 +261,7 @@ class KateFactory
     /**
      * at start found plugins
      */
-    KTrader::OfferList m_plugins;
+    TDETrader::OfferList m_plugins;
 
     /**
      * fallback document config
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index 11d5e9a46..281bf7e2d 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -25,15 +25,15 @@
 #include "kateview.h"
 #include "katefactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmimemagic.h>
 #include <kmimetype.h>
 #include <kmimetypechooser.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
 
 #include <tqregexp.h>
 #include <tqcheckbox.h>
@@ -72,7 +72,7 @@ KateFileTypeManager::~KateFileTypeManager ()
 //
 void KateFileTypeManager::update ()
 {
-  KConfig config ("katefiletyperc", false, false);
+  TDEConfig config ("katefiletyperc", false, false);
 
   TQStringList g (config.groupList());
   g.sort ();
@@ -101,7 +101,7 @@ void KateFileTypeManager::update ()
 //
 void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
 {
-  KConfig config ("katefiletyperc", false, false);
+  TDEConfig config ("katefiletyperc", false, false);
 
   TQStringList newg;
   for (uint z=0; z < v->count(); z++)
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp
index 89bfd0025..c00953469 100644
--- a/kate/part/katefont.cpp
+++ b/kate/part/katefont.cpp
@@ -21,7 +21,7 @@
 
 #include "katefont.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqfontinfo.h>
 
@@ -68,10 +68,10 @@ int KateFontMetrics::width(TQChar c)
 //
 
 KateFontStruct::KateFontStruct()
-: myFont(KGlobalSettings::fixedFont()),
-  myFontBold(KGlobalSettings::fixedFont()),
-  myFontItalic(KGlobalSettings::fixedFont()),
-  myFontBI(KGlobalSettings::fixedFont()),
+: myFont(TDEGlobalSettings::fixedFont()),
+  myFontBold(TDEGlobalSettings::fixedFont()),
+  myFontItalic(TDEGlobalSettings::fixedFont()),
+  myFontBI(TDEGlobalSettings::fixedFont()),
   myFontMetrics(myFont),
   myFontMetricsBold(myFontBold),
   myFontMetricsItalic(myFontItalic),
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index d5eec4c27..119b718fb 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -32,19 +32,19 @@
 #include "kateschema.h"
 #include "kateconfig.h"
 
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kregexp.h>
-#include <kpopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdepopupmenu.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqstringlist.h>
 #include <tqtextstream.h>
@@ -1599,7 +1599,7 @@ void KateHighlighting::doHighlight ( KateTextLine *prevLine,
 
 void KateHighlighting::loadWildcards()
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   TQString extensionString = config->readEntry("Wildcards", iWildcards);
@@ -1636,7 +1636,7 @@ TQStringList& KateHighlighting::getPlainExtensions()
 
 TQString KateHighlighting::getMimetypes()
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   return config->readEntry("Mimetypes", iMimetypes);
@@ -1644,7 +1644,7 @@ TQString KateHighlighting::getMimetypes()
 
 int KateHighlighting::priority()
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   return config->readNumEntry("Priority", m_priority);
@@ -1652,7 +1652,7 @@ int KateHighlighting::priority()
 
 KateHlData *KateHighlighting::getData()
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   KateHlData *hlData = new KateHlData(
@@ -1666,7 +1666,7 @@ KateHlData *KateHighlighting::getData()
 
 void KateHighlighting::setData(KateHlData *hlData)
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   config->writeEntry("Wildcards",hlData->wildcards);
@@ -1676,7 +1676,7 @@ void KateHighlighting::setData(KateHlData *hlData)
 
 void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &list)
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName + " - Schema " + KateFactory::self()->schemaManager()->name(schema));
 
   list.clear();
@@ -1729,7 +1729,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l
  */
 void KateHighlighting::setKateHlItemDataList(uint schema, KateHlItemDataList &list)
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName + " - Schema "
       + KateFactory::self()->schemaManager()->name(schema));
 
@@ -2094,7 +2094,7 @@ bool KateHighlighting::isInWord( TQChar c, int attrib ) const
 
 bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const
 {
-  static const TQString& sq = KGlobal::staticQString("\"'");
+  static const TQString& sq = TDEGlobal::staticQString("\"'");
   return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1);
 }
 
@@ -3264,7 +3264,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
   error->setSelectedTextColor(Qt::red);
   list.append(error);
 
-  KConfig *config = KateHlManager::self()->self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->self()->getTDEConfig();
   config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema));
 
   for (uint z = 0; z < defaultStyles(); z++)
@@ -3317,7 +3317,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
 
 void KateHlManager::setDefaults(uint schema, KateAttributeList &list)
 {
-  KConfig *config =  KateHlManager::self()->self()->getKConfig();
+  TDEConfig *config =  KateHlManager::self()->self()->getTDEConfig();
   config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema));
 
   for (uint z = 0; z < defaultStyles(); z++)
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index e312e4a01..8ff5e31b2 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -26,7 +26,7 @@
 
 #include "../interfaces/document.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
@@ -350,7 +350,7 @@ class KateHlManager : public TQObject
 
     static KateHlManager *self();
 
-    inline KConfig *getKConfig() { return &m_config; };
+    inline TDEConfig *getTDEConfig() { return &m_config; };
 
     KateHighlighting *getHl(int n);
     int nameFind(const TQString &name);
@@ -396,7 +396,7 @@ class KateHlManager : public TQObject
 
     static KateHlManager *s_self;
 
-    KConfig m_config;
+    TDEConfig m_config;
     TQStringList commonSuffixes;
 
     KateSyntaxDocument *syntax;
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index 58b4dd163..cab335312 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -35,9 +35,9 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeconfig.h>
 
 #include <kjs/function_object.h>
 #include <kjs/interpreter.h>
@@ -52,7 +52,7 @@
 
 namespace KJS {
 
-// taken from khtml
+// taken from tdehtml
 // therefor thx to:
 // Copyright (C) 1999-2003 Harri Porten (porten@kde.org)
 // Copyright (C) 2001-2003 David Faure (faure@kde.org)
@@ -642,7 +642,7 @@ void KateJScriptManager::collectScripts (bool force)
     return;
 
   // We'll store the scripts list in this config
-  KConfig config("katepartjscriptrc", false, false);
+  TDEConfig config("katepartjscriptrc", false, false);
 
   // figure out if the kate install is too new
   config.setGroup ("General");
@@ -653,7 +653,7 @@ void KateJScriptManager::collectScripts (bool force)
   }
 
   // Let's get a list of all the .js files
-  TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true);
+  TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true);
 
   // Let's iterate through the list and build the Mode List
   for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
@@ -685,10 +685,10 @@ void KateJScriptManager::collectScripts (bool force)
 
       if (dfi.exists())
       {
-        KConfig df (desktopFile, true, false);
+        TDEConfig df (desktopFile, true, false);
         df.setDesktopGroup ();
 
-        // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback
+        // get cmdname, fallback to baseName, if it is empty, therefor not use the tdeconfig fallback
         TQString cmdname = df.readEntry ("X-Kate-Command");
         if (cmdname.isEmpty())
         {
@@ -778,7 +778,7 @@ bool KateJScriptManager::help( Kate::View *, const TQString &cmd, TQString &msg
   if (!m_scripts[cmd] || !m_scripts[cmd]->desktopFileExists)
     return false;
 
-  KConfig df (m_scripts[cmd]->desktopFilename(), true, false);
+  TDEConfig df (m_scripts[cmd]->desktopFilename(), true, false);
   df.setDesktopGroup ();
 
   msg = df.readEntry ("X-Kate-Help");
@@ -1016,7 +1016,7 @@ void KateIndentJScriptManager::collectScripts (bool force)
 
 
   // We'll store the scripts list in this config
-  KConfig config("katepartindentjscriptrc", false, false);
+  TDEConfig config("katepartindentjscriptrc", false, false);
 #if 0
   // figure out if the kate install is too new
   config.setGroup ("General");
@@ -1028,7 +1028,7 @@ void KateIndentJScriptManager::collectScripts (bool force)
 #endif
 
   // Let's get a list of all the .js files
-  TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true);
+  TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true);
 
   // Let's iterate through the list and build the Mode List
   for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
diff --git a/kate/part/katekeyinterceptorfunctor.h b/kate/part/katekeyinterceptorfunctor.h
index 0126ff814..2a973026a 100644
--- a/kate/part/katekeyinterceptorfunctor.h
+++ b/kate/part/katekeyinterceptorfunctor.h
@@ -17,7 +17,7 @@
 */
 #ifndef _KATE_KEY_INTERCEPTOR_FUNCTOR_H
 #define _KATE_KEY_INTERCEPTOR_FUNCTOR_H
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 class KateKeyInterceptorFunctor {
   public:
   virtual bool operator()(KKey key)=0;
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index dbc7d1fa4..375b0b7d4 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -31,9 +31,9 @@
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
 
-#include <kconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C" {
 #include <lua.h> 
@@ -371,7 +371,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force)
       <<"================================================="<<endl;
 
   // We'll store the scripts list in this config
-  KConfig config("katepartluaindentscriptrc", false, false);
+  TDEConfig config("katepartluaindentscriptrc", false, false);
 #if 0
   // figure out if the kate install is too new
   config.setGroup ("General");
@@ -383,7 +383,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force)
 #endif
 
   // Let's get a list of all the .js files
-  TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true);
+  TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true);
 
   // Let's iterate through the list and build the Mode List
   for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index e9a74c50e..e66119747 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -30,12 +30,12 @@
 #include <kateschema.h>
 #include <katetextline.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kdialog.h> // for spacingHint()
-#include <kfontdialog.h>
-#include <klocale.h>
+#include <tdefontdialog.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kurl.h>
 #include <kuser.h> // for loginName
@@ -190,11 +190,11 @@ bool KatePrinter::print (KateDocument *doc)
          KUser u (KUser::UseRealUserID);
          tags["u"] = u.loginName();
 
-         tags["d"] = KGlobal::locale()->formatDateTime(dt, true, false);
-         tags["D"] =  KGlobal::locale()->formatDateTime(dt, false, false);
-         tags["h"] =  KGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false);
-         tags["y"] =  KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true);
-         tags["Y"] =  KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false);
+         tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false);
+         tags["D"] =  TDEGlobal::locale()->formatDateTime(dt, false, false);
+         tags["h"] =  TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false);
+         tags["y"] =  TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true);
+         tags["Y"] =  TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false);
          tags["f"] =  doc->url().fileName();
          tags["U"] =  doc->url().prettyURL();
          if ( selectionOnly )
@@ -888,7 +888,7 @@ void KatePrintHeaderFooter::setHFFont()
 {
   TQFont fnt( lFontPreview->font() );
   // display a font dialog
-  if ( KFontDialog::getFont( fnt, false, this ) == KFontDialog::Accepted )
+  if ( TDEFontDialog::getFont( fnt, false, this ) == TDEFontDialog::Accepted )
   {
     // change strFont
     strFont = fnt.toString();
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index a5e295888..5b71c92e8 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -27,20 +27,20 @@
 #include "kateview.h"
 #include "katerenderer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <kinputdialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
 #include <kcolordialog.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdetexteditor/markinterface.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
@@ -155,12 +155,12 @@ class KateStyleListCaption : public TQListViewItem
 //BEGIN KateSchemaManager
 TQString KateSchemaManager::normalSchema ()
 {
-  return KApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
+  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Normal");
 }
 
 TQString KateSchemaManager::printingSchema ()
 {
-  return KApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
+  return TDEApplication::kApplication()->aboutData()->appName () + TQString (" - Printing");
 }
 
 KateSchemaManager::KateSchemaManager ()
@@ -194,7 +194,7 @@ void KateSchemaManager::update (bool readfromfile)
 // get the right group
 // special handling of the default schemas ;)
 //
-KConfig *KateSchemaManager::schema (uint number)
+TDEConfig *KateSchemaManager::schema (uint number)
 {
   if ((number>1) && (number < m_schemas.count()))
     m_config.setGroup (m_schemas[number]);
@@ -209,7 +209,7 @@ KConfig *KateSchemaManager::schema (uint number)
 void KateSchemaManager::addSchema (const TQString &t)
 {
   m_config.setGroup (t);
-  m_config.writeEntry("Color Background", KGlobalSettings::baseColor());
+  m_config.writeEntry("Color Background", TDEGlobalSettings::baseColor());
 
   update (false);
 }
@@ -419,12 +419,12 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
   if ( ! m_schemas.contains( newSchema ) )
   {
     // fallback defaults
-    TQColor tmp0 (KGlobalSettings::baseColor());
-    TQColor tmp1 (KGlobalSettings::highlightColor());
-    TQColor tmp2 (KGlobalSettings::alternateBackgroundColor());
+    TQColor tmp0 (TDEGlobalSettings::baseColor());
+    TQColor tmp1 (TDEGlobalSettings::highlightColor());
+    TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor());
     TQColor tmp3 ( "#FFFF99" );
     TQColor tmp4 (tmp2.dark());
-    TQColor tmp5 ( KGlobalSettings::textColor() );
+    TQColor tmp5 ( TDEGlobalSettings::textColor() );
     TQColor tmp6 ( "#EAE9E8" );
     TQColor tmp7 ( "#000000" );
 
@@ -440,7 +440,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
     mark[6] = Qt::red;
 
     SchemaColors c;
-    KConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
+    TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
 
     c.back= config->readColorEntry("Color Background", &tmp0);
     c.selected = config->readColorEntry("Color Selection", &tmp1);
@@ -493,7 +493,7 @@ void KateSchemaConfigColorTab::apply ()
   for ( it =  m_schemas.begin(); it !=  m_schemas.end(); ++it )
   {
     kdDebug(13030)<<"APPLY scheme = "<<it.key()<<endl;
-    KConfig *config = KateFactory::self()->schemaManager()->schema( it.key() );
+    TDEConfig *config = KateFactory::self()->schemaManager()->schema( it.key() );
     kdDebug(13030)<<"Using config group "<<config->group()<<endl;
     SchemaColors c = it.data();
 
@@ -541,8 +541,8 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
     // sizemanagment
   TQGridLayout *grid = new TQGridLayout( this, 1, 1 );
 
-  m_fontchooser = new KFontChooser ( this, 0L, false, TQStringList(), false );
-  m_fontchooser->enableColumn(KFontChooser::StyleList, false);
+  m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false );
+  m_fontchooser->enableColumn(TDEFontChooser::StyleList, false);
   grid->addWidget( m_fontchooser, 0, 0);
 
   connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
@@ -578,7 +578,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema )
 
   m_schema = newSchema;
 
-  TQFont f (KGlobalSettings::fixedFont());
+  TQFont f (TDEGlobalSettings::fixedFont());
 
   m_fontchooser->disconnect ( this );
   m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) );
@@ -635,11 +635,11 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema)
 
   // set colors
   TQPalette p ( m_defaultStyles->palette() );
-  TQColor _c ( KGlobalSettings::baseColor() );
+  TQColor _c ( TDEGlobalSettings::baseColor() );
   p.setColor( TQColorGroup::Base,
     KateFactory::self()->schemaManager()->schema(schema)->
       readColorEntry( "Color Background", &_c ) );
-  _c = KGlobalSettings::highlightColor();
+  _c = TDEGlobalSettings::highlightColor();
   p.setColor( TQColorGroup::Highlight,
     KateFactory::self()->schemaManager()->schema(schema)->
       readColorEntry( "Color Selection", &_c ) );
@@ -759,14 +759,14 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
 
   // Set listview colors
   // We do that now, because we can now get the "normal text" color.
-  // TODO this reads of the KConfig object, which should be changed when
+  // TODO this reads of the TDEConfig object, which should be changed when
   // the color tab is fixed.
   TQPalette p ( m_styles->palette() );
-  TQColor _c ( KGlobalSettings::baseColor() );
+  TQColor _c ( TDEGlobalSettings::baseColor() );
   p.setColor( TQColorGroup::Base,
     KateFactory::self()->schemaManager()->schema(m_schema)->
       readColorEntry( "Color Background", &_c ) );
-  _c = KGlobalSettings::highlightColor();
+  _c = TDEGlobalSettings::highlightColor();
   p.setColor( TQColorGroup::Highlight,
     KateFactory::self()->schemaManager()->schema(m_schema)->
       readColorEntry( "Color Selection", &_c ) );
@@ -865,7 +865,7 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   hbHl = new TQHBox( this );
   layout->add (hbHl);
   hbHl->setSpacing( KDialog::spacingHint() );
-  lHl = new TQLabel( i18n("&Default schema for %1:").arg(KApplication::kApplication()->aboutData()->programName ()), hbHl );
+  lHl = new TQLabel( i18n("&Default schema for %1:").arg(TDEApplication::kApplication()->aboutData()->programName ()), hbHl );
   defaultSchemaCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( defaultSchemaCombo );
 
@@ -905,7 +905,7 @@ void KateSchemaConfigPage::apply()
   KateRendererConfig::global()->reloadSchema();
 
   // sync the hl config for real
-  KateHlManager::self()->getKConfig()->sync ();
+  KateHlManager::self()->getTDEConfig()->sync ();
 }
 
 void KateSchemaConfigPage::reload()
@@ -1066,7 +1066,7 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults )
   connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)),
            this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) );
   // grap the bg color, selected color and default font
-  normalcol = KGlobalSettings::textColor();
+  normalcol = TDEGlobalSettings::textColor();
   bgcol = KateRendererConfig::global()->backgroundColor();
   selcol = KateRendererConfig::global()->selectionColor();
   docfont = *KateRendererConfig::global()->font();
@@ -1078,7 +1078,7 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
 {
   if ( !dynamic_cast<KateStyleListItem*>(i) ) return;
 
-  KPopupMenu m( this );
+  TDEPopupMenu m( this );
   KateAttribute *is = i->style();
   int id;
   // the title is used, because the menu obscures the context name when
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index 566b6ea27..77cc112a1 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -29,8 +29,8 @@
 #include <tqlistview.h>
 #include <tqfont.h>
 
-#include <kconfig.h>
-#include <kaction.h>
+#include <tdeconfig.h>
+#include <tdeaction.h>
 
 class KateView;
 class KateStyleListItem;
@@ -53,9 +53,9 @@ class KateSchemaManager
     void update (bool readfromfile = true);
 
     /**
-     * return kconfig with right group set or set to Normal if not there
+     * return tdeconfig with right group set or set to Normal if not there
      */
-    KConfig *schema (uint number);
+    TDEConfig *schema (uint number);
 
     void addSchema (const TQString &t);
 
@@ -85,18 +85,18 @@ class KateSchemaManager
     static TQString printingSchema ();
 
   private:
-    KConfig m_config;
+    TDEConfig m_config;
     TQStringList m_schemas;
 };
 
 
-class KateViewSchemaAction : public KActionMenu
+class KateViewSchemaAction : public TDEActionMenu
 {
   Q_OBJECT
 
   public:
     KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
-       : KActionMenu(text, parent, name) { init(); };
+       : TDEActionMenu(text, parent, name) { init(); };
 
     ~KateViewSchemaAction(){;};
 
@@ -216,7 +216,7 @@ class KateSchemaConfigFontTab : public TQWidget
     ~KateSchemaConfigFontTab();
 
   public:
-    void readConfig (KConfig *config);
+    void readConfig (TDEConfig *config);
 
   public slots:
     void apply();
@@ -226,7 +226,7 @@ class KateSchemaConfigFontTab : public TQWidget
     void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
 
   private:
-    class KFontChooser *m_fontchooser;
+    class TDEFontChooser *m_fontchooser;
     FontMap m_fonts;
     int m_schema;
 
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index a7d37ead5..930e4d906 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -31,9 +31,9 @@
 #include "kateconfig.h"
 #include "katehighlight.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
 #include <kfinddialog.h>
@@ -66,7 +66,7 @@ KateSearch::~KateSearch()
   delete m_arbitraryHLList;
 }
 
-void KateSearch::createActions( KActionCollection* ac )
+void KateSearch::createActions( TDEActionCollection* ac )
 {
   KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis(
     i18n("Look up the first occurrence of a piece of text or regular expression."));
diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h
index bec9eb51a..5ae92f568 100644
--- a/kate/part/katesearch.h
+++ b/kate/part/katesearch.h
@@ -37,7 +37,7 @@ class KateView;
 class KateDocument;
 class KateSuperRangeList;
 
-class KActionCollection;
+class TDEActionCollection;
 
 class KateSearch : public TQObject
 {
@@ -87,7 +87,7 @@ class KateSearch : public TQObject
     KateSearch( KateView* );
     ~KateSearch();
 
-    void createActions( KActionCollection* );
+    void createActions( TDEActionCollection* );
 
   public slots:
     void find();
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index 6ce2b2a72..494e52894 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -26,38 +26,38 @@
 
 #include "kateview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <ksconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KateSpell::KateSpell( KateView* view )
   : TQObject( view )
   , m_view (view)
-  , m_kspell (0)
+  , m_tdespell (0)
 {
 }
 
 KateSpell::~KateSpell()
 {
-  // kspell stuff
-  if( m_kspell )
+  // tdespell stuff
+  if( m_tdespell )
   {
-    m_kspell->setAutoDelete(true);
-    m_kspell->cleanUp(); // need a way to wait for this to complete
-    delete m_kspell;
+    m_tdespell->setAutoDelete(true);
+    m_tdespell->cleanUp(); // need a way to wait for this to complete
+    delete m_tdespell;
   }
 }
 
-void KateSpell::createActions( KActionCollection* ac )
+void KateSpell::createActions( TDEActionCollection* ac )
 {
    KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac );
-   KAction *a = new KAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
+   TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
    a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward"));
 
-   m_spellcheckSelection = new KAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
+   m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
    m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text"));
 }
 
@@ -122,27 +122,27 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to
   else
     kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl;
 
-  m_kspell = new KSpell( m_view, i18n("Spellcheck"),
+  m_tdespell = new KSpell( m_view, i18n("Spellcheck"),
                          this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type );
 
-  connect( m_kspell, TQT_SIGNAL(death()),
+  connect( m_tdespell, TQT_SIGNAL(death()),
            this, TQT_SLOT(spellCleanDone()) );
 
-  connect( m_kspell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
+  connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
            this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) );
-  connect( m_kspell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
+  connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
            this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) );
-  connect( m_kspell, TQT_SIGNAL(done(const TQString&)),
+  connect( m_tdespell, TQT_SIGNAL(done(const TQString&)),
            this, TQT_SLOT(spellResult(const TQString&)) );
 }
 
 void KateSpell::ready(KSpell *)
 {
-  m_kspell->setProgressResolution( 1 );
+  m_tdespell->setProgressResolution( 1 );
 
-  m_kspell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) );
+  m_tdespell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) );
 
-  kdDebug (13020) << "SPELLING READY STATUS: " << m_kspell->status () << endl;
+  kdDebug (13020) << "SPELLING READY STATUS: " << m_tdespell->status () << endl;
 }
 
 void KateSpell::locatePosition( uint pos, uint& line, uint& col )
@@ -193,12 +193,12 @@ void KateSpell::corrected( const TQString& originalword, const TQString& newword
 void KateSpell::spellResult( const TQString& )
 {
   m_view->clearSelection();
-  m_kspell->cleanUp();
+  m_tdespell->cleanUp();
 }
 
 void KateSpell::spellCleanDone()
 {
-  KSpell::spellStatus status = m_kspell->status();
+  KSpell::spellStatus status = m_tdespell->status();
 
   if( status == KSpell::Error ) {
     KMessageBox::sorry( 0,
@@ -210,8 +210,8 @@ void KateSpell::spellCleanDone()
       i18n("The spelling program seems to have crashed."));
   }
 
-  delete m_kspell;
-  m_kspell = 0;
+  delete m_tdespell;
+  m_tdespell = 0;
 
   kdDebug (13020) << "SPELLING END" << endl;
 }
diff --git a/kate/part/katespell.h b/kate/part/katespell.h
index 870a88194..9ce41666c 100644
--- a/kate/part/katespell.h
+++ b/kate/part/katespell.h
@@ -27,7 +27,7 @@
 
 class KateView;
 
-class KAction;
+class TDEAction;
 class KSpell;
 
 class KateSpell : public TQObject
@@ -38,7 +38,7 @@ class KateSpell : public TQObject
     KateSpell( KateView* );
     ~KateSpell();
 
-    void createActions( KActionCollection* );
+    void createActions( TDEActionCollection* );
 
     void updateActions ();
 
@@ -69,9 +69,9 @@ class KateSpell : public TQObject
 
   private:
     KateView *m_view;
-    KAction *m_spellcheckSelection;
+    TDEAction *m_spellcheckSelection;
 
-    KSpell *m_kspell;
+    KSpell *m_tdespell;
 
     // define the part of the text to check
     KateTextCursor m_spellStart, m_spellEnd;
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index 8e391b620..700daa9da 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -25,9 +25,9 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeconfig.h>
 
 #include <tqfile.h>
 
@@ -335,7 +335,7 @@ void KateSyntaxDocument::setupModeList (bool force)
     return;
 
   // We'll store the ModeList in katesyntaxhighlightingrc
-  KConfig config("katesyntaxhighlightingrc", false, false);
+  TDEConfig config("katesyntaxhighlightingrc", false, false);
 
   // figure our if the kate install is too new
   config.setGroup ("General");
@@ -346,7 +346,7 @@ void KateSyntaxDocument::setupModeList (bool force)
   }
 
   // Let's get a list of all the xml files for hl
-  TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true);
+  TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true);
 
   // Let's iterate through the list and build the Mode List
   for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp
index 6c701e1ed..005892607 100644
--- a/kate/part/katetextline.cpp
+++ b/kate/part/katetextline.cpp
@@ -23,7 +23,7 @@
 #include "katetextline.h"
 #include "katerenderer.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqregexp.h>
 
diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h
index 3922d04d0..7f14be16c 100644
--- a/kate/part/katetextline.h
+++ b/kate/part/katetextline.h
@@ -38,13 +38,13 @@ class TQTextStream;
  * The attribute stores the index to a table that contains fonts and colors
  * and also if a character is selected.
  */
-class KateTextLine : public KShared
+class KateTextLine : public TDEShared
 {
   public:
     /**
      * Define a Shared-Pointer type
      */
-    typedef KSharedPtr<KateTextLine> Ptr;
+    typedef TDESharedPtr<KateTextLine> Ptr;
 
   public:
     /**
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index ab4c2f54e..821cb0faf 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -46,29 +46,29 @@
 #include "kateautoindent.h"
 #include "katespell.h"
 
-#include <ktexteditor/plugin.h>
+#include <tdetexteditor/plugin.h>
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurldrag.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
-#include <kaction.h>
+#include <tdemessagebox.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kxmlguifactory.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <klibloader.h>
 #include <kencodingfiledialog.h>
-#include <kmultipledrag.h>
-#include <ktempfile.h>
+#include <tdemultipledrag.h>
+#include <tdetempfile.h>
 #include <ksavefile.h>
 
 #include <tqfont.h>
@@ -207,8 +207,8 @@ void KateView::setupConnections()
 
 void KateView::setupActions()
 {
-  KActionCollection *ac = this->actionCollection ();
-  KAction *a;
+  TDEActionCollection *ac = this->actionCollection ();
+  TDEAction *a;
 
   m_toggleWriteLock = 0;
 
@@ -221,7 +221,7 @@ void KateView::setupActions()
   m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac);
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
 
-  m_copyHTML = a = new KAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
+  m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
 
   if (!m_doc->readOnly())
@@ -235,56 +235,56 @@ void KateView::setupActions()
     a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac);
     a->setWhatsThis(i18n("Revert the most recent undo operation"));
 
-    (new KAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
+    (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
   i18n("Use this command to wrap all lines of the current document which are longer than the width of the"
     " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated"
     " when the view is resized."));
 
     // setup Tools menu
-    a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
+    a=new TDEAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
     a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
         "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
-    a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
+    a=new TDEAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
     a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
 
-    a=new KAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
+    a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
     a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
         "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
 
-    a=new KAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
+    a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
     a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
 
-    a=new KAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
+    a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
         ac, "tools_comment");
     a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
         "The characters for single/multiple line comments are defined within the language's highlighting."));
 
-    a=new KAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
+    a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
                                  ac, "tools_uncomment");
     a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
     "The characters for single/multiple line comments are defined within the language's highlighting."));
-    a = m_toggleWriteLock = new KToggleAction(
+    a = m_toggleWriteLock = new TDEToggleAction(
                 i18n("&Read Only Mode"), 0, 0,
                 TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ),
                 ac, "tools_toggle_write_lock" );
     a->setWhatsThis( i18n("Lock/unlock the document for writing") );
 
-    a = new KAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
+    a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
       TQT_SLOT(uppercase()), ac, "tools_uppercase" );
     a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
       "right of the cursor if no text is selected.") );
 
-    a = new KAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
+    a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
       TQT_SLOT(lowercase()), ac, "tools_lowercase" );
     a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
       "right of the cursor if no text is selected.") );
 
-    a = new KAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
+    a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
       TQT_SLOT(capitalize()), ac, "tools_capitalize" );
     a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
       "cursor if no text is selected.") );
 
-    a = new KAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
+    a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
       TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
   }
   else
@@ -298,7 +298,7 @@ void KateView::setupActions()
   a=KStdAction::print( m_doc, TQT_SLOT(print()), ac );
   a->setWhatsThis(i18n("Print the current document."));
 
-  a=new KAction(i18n("Reloa&d"), "reload", KStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
+  a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
   a->setWhatsThis(i18n("Reload the current document from disk."));
 
   a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac);
@@ -307,7 +307,7 @@ void KateView::setupActions()
   a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac);
   a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to."));
 
-  a=new KAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
+  a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
   a->setWhatsThis(i18n("Configure various aspects of this editor."));
 
   KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight");
@@ -324,7 +324,7 @@ void KateView::setupActions()
   new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation");
 
   // html export
-  a = new KAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
+  a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
   a->setWhatsThis(i18n("This command allows you to export the current document"
                       " with all highlighting information into a HTML document."));
 
@@ -334,32 +334,32 @@ void KateView::setupActions()
   m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac);
   a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));
 
-  a=new KAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
+  a=new TDEAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
   a->setWhatsThis(i18n("This increases the display font size."));
 
-  a=new KAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
+  a=new TDEAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
   a->setWhatsThis(i18n("This decreases the display font size."));
 
-  a= m_toggleBlockSelection = new KToggleAction(
+  a= m_toggleBlockSelection = new TDEToggleAction(
     i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B,
     TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()),
     ac, "set_verticalSelect");
   a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode."));
 
-  a= m_toggleInsert = new KToggleAction(
+  a= m_toggleInsert = new TDEToggleAction(
     i18n("Overwr&ite Mode"), Key_Insert,
     TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()),
     ac, "set_insert" );
   a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text."));
 
-  KToggleAction *toggleAction;
-   a= m_toggleDynWrap = toggleAction = new KToggleAction(
+  TDEToggleAction *toggleAction;
+   a= m_toggleDynWrap = toggleAction = new TDEToggleAction(
     i18n("&Dynamic Word Wrap"), Key_F10,
     TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()),
     ac, "view_dynamic_word_wrap" );
   a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen."));
 
-  a= m_setDynWrapIndicators = new KSelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
+  a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
   a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed"));
 
   connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int)));
@@ -369,14 +369,14 @@ void KateView::setupActions()
   list2.append(i18n("&Always On"));
   m_setDynWrapIndicators->setItems(list2);
 
-  a= toggleAction=m_toggleFoldingMarkers = new KToggleAction(
+  a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction(
     i18n("Show Folding &Markers"), Key_F9,
     TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()),
     ac, "view_folding_markers" );
   a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible."));
   toggleAction->setCheckedState(i18n("Hide Folding &Markers"));
 
-   a= m_toggleIconBar = toggleAction = new KToggleAction(
+   a= m_toggleIconBar = toggleAction = new TDEToggleAction(
     i18n("Show &Icon Border"), Key_F6,
     TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()),
     ac, "view_border");
@@ -384,21 +384,21 @@ void KateView::setupActions()
   a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance."));
   toggleAction->setCheckedState(i18n("Hide &Icon Border"));
 
-  a= toggleAction=m_toggleLineNumbers = new KToggleAction(
+  a= toggleAction=m_toggleLineNumbers = new TDEToggleAction(
      i18n("Show &Line Numbers"), Key_F11,
      TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()),
      ac, "view_line_numbers" );
   a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view."));
   toggleAction->setCheckedState(i18n("Hide &Line Numbers"));
 
-  a= m_toggleScrollBarMarks = toggleAction = new KToggleAction(
+  a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction(
      i18n("Show Scroll&bar Marks"), 0,
      TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()),
      ac, "view_scrollbar_marks");
   a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks."));
   toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks"));
 
-  a = toggleAction = m_toggleWWMarker = new KToggleAction(
+  a = toggleAction = m_toggleWWMarker = new TDEToggleAction(
         i18n("Show Static &Word Wrap Marker"), 0,
         TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ),
         ac, "view_word_wrap_marker" );
@@ -407,13 +407,13 @@ void KateView::setupActions()
         "wrap column as defined in the editing properties" ));
   toggleAction->setCheckedState(i18n("Hide Static &Word Wrap Marker"));
 
-  a= m_switchCmdLine = new KAction(
+  a= m_switchCmdLine = new TDEAction(
      i18n("Switch to Command Line"), Key_F7,
      TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()),
      ac, "switch_to_cmd_line" );
   a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view."));
 
-  a=m_setEndOfLine = new KSelectAction(i18n("&End of Line"), 0, ac, "set_eol");
+  a=m_setEndOfLine = new TDESelectAction(i18n("&End of Line"), 0, ac, "set_eol");
   a->setWhatsThis(i18n("Choose which line endings should be used, when you save the document"));
   TQStringList list;
   list.append("&UNIX");
@@ -437,137 +437,137 @@ void KateView::setupActions()
 
 void KateView::setupEditActions()
 {
-  m_editActions = new KActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
-  KActionCollection* ac = m_editActions;
+  m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
+  TDEActionCollection* ac = m_editActions;
 
-  new KAction(
+  new TDEAction(
     i18n("Move Word Left"),                         CTRL + Key_Left,
     TQT_TQOBJECT(this),TQT_SLOT(wordLeft()),
     ac, "word_left" );
-  new KAction(
+  new TDEAction(
     i18n("Select Character Left"),          SHIFT +        Key_Left,
     TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()),
     ac, "select_char_left" );
-  new KAction(
+  new TDEAction(
     i18n("Select Word Left"),               SHIFT + CTRL + Key_Left,
     TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()),
     ac, "select_word_left" );
 
-  new KAction(
+  new TDEAction(
     i18n("Move Word Right"),                        CTRL + Key_Right,
     TQT_TQOBJECT(this), TQT_SLOT(wordRight()),
     ac, "word_right" );
-  new KAction(
+  new TDEAction(
     i18n("Select Character Right"),         SHIFT        + Key_Right,
     TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()),
     ac, "select_char_right" );
-  new KAction(
+  new TDEAction(
     i18n("Select Word Right"),              SHIFT + CTRL + Key_Right,
     TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()),
     ac, "select_word_right" );
 
-  new KAction(
+  new TDEAction(
     i18n("Move to Beginning of Line"),                      Key_Home,
     TQT_TQOBJECT(this), TQT_SLOT(home()),
     ac, "beginning_of_line" );
-  new KAction(
-    i18n("Move to Beginning of Document"),           KStdAccel::home(),
+  new TDEAction(
+    i18n("Move to Beginning of Document"),           TDEStdAccel::home(),
     TQT_TQOBJECT(this), TQT_SLOT(top()),
     ac, "beginning_of_document" );
-  new KAction(
+  new TDEAction(
     i18n("Select to Beginning of Line"),     SHIFT +        Key_Home,
     TQT_TQOBJECT(this), TQT_SLOT(shiftHome()),
     ac, "select_beginning_of_line" );
-  new KAction(
+  new TDEAction(
     i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home,
     TQT_TQOBJECT(this), TQT_SLOT(shiftTop()),
     ac, "select_beginning_of_document" );
 
-  new KAction(
+  new TDEAction(
     i18n("Move to End of Line"),                            Key_End,
     TQT_TQOBJECT(this), TQT_SLOT(end()),
     ac, "end_of_line" );
-  new KAction(
-    i18n("Move to End of Document"),                 KStdAccel::end(),
+  new TDEAction(
+    i18n("Move to End of Document"),                 TDEStdAccel::end(),
     TQT_TQOBJECT(this), TQT_SLOT(bottom()),
     ac, "end_of_document" );
-  new KAction(
+  new TDEAction(
     i18n("Select to End of Line"),           SHIFT +        Key_End,
     TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()),
     ac, "select_end_of_line" );
-  new KAction(
+  new TDEAction(
     i18n("Select to End of Document"),       SHIFT + CTRL + Key_End,
     TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()),
     ac, "select_end_of_document" );
 
-  new KAction(
+  new TDEAction(
     i18n("Select to Previous Line"),                SHIFT + Key_Up,
     TQT_TQOBJECT(this), TQT_SLOT(shiftUp()),
     ac, "select_line_up" );
-  new KAction(
+  new TDEAction(
     i18n("Scroll Line Up"),"",              CTRL +          Key_Up,
     TQT_TQOBJECT(this), TQT_SLOT(scrollUp()),
     ac, "scroll_line_up" );
 
-  new KAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
+  new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
 	      ac, "move_line_down");
 
-  new KAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
+  new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
 	      ac, "move_line_up");
 
-  new KAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
+  new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
 	      TQT_SLOT(cursorRight()), ac, "move_cursor_right");
 
-  new KAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
+  new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
 	      ac, "move_cusor_left");
 
-  new KAction(
+  new TDEAction(
     i18n("Select to Next Line"),                    SHIFT + Key_Down,
     TQT_TQOBJECT(this), TQT_SLOT(shiftDown()),
     ac, "select_line_down" );
-  new KAction(
+  new TDEAction(
     i18n("Scroll Line Down"),               CTRL +          Key_Down,
     TQT_TQOBJECT(this), TQT_SLOT(scrollDown()),
     ac, "scroll_line_down" );
 
-  new KAction(
-    i18n("Scroll Page Up"),                         KStdAccel::prior(),
+  new TDEAction(
+    i18n("Scroll Page Up"),                         TDEStdAccel::prior(),
     TQT_TQOBJECT(this), TQT_SLOT(pageUp()),
     ac, "scroll_page_up" );
-  new KAction(
+  new TDEAction(
     i18n("Select Page Up"),                         SHIFT + Key_PageUp,
     TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()),
     ac, "select_page_up" );
-  new KAction(
+  new TDEAction(
     i18n("Move to Top of View"),             CTRL +         Key_PageUp,
     TQT_TQOBJECT(this), TQT_SLOT(topOfView()),
     ac, "move_top_of_view" );
-  new KAction(
+  new TDEAction(
     i18n("Select to Top of View"),             CTRL + SHIFT +  Key_PageUp,
     TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()),
     ac, "select_top_of_view" );
 
-  new KAction(
-    i18n("Scroll Page Down"),                          KStdAccel::next(),
+  new TDEAction(
+    i18n("Scroll Page Down"),                          TDEStdAccel::next(),
     TQT_TQOBJECT(this), TQT_SLOT(pageDown()),
     ac, "scroll_page_down" );
-  new KAction(
+  new TDEAction(
     i18n("Select Page Down"),                       SHIFT + Key_PageDown,
     TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()),
     ac, "select_page_down" );
-  new KAction(
+  new TDEAction(
     i18n("Move to Bottom of View"),          CTRL +         Key_PageDown,
     TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()),
     ac, "move_bottom_of_view" );
-  new KAction(
+  new TDEAction(
     i18n("Select to Bottom of View"),         CTRL + SHIFT + Key_PageDown,
     TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()),
     ac, "select_bottom_of_view" );
-  new KAction(
+  new TDEAction(
     i18n("Move to Matching Bracket"),               CTRL + Key_6,
     TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()),
     ac, "to_matching_bracket" );
-  new KAction(
+  new TDEAction(
     i18n("Select to Matching Bracket"),      SHIFT + CTRL + Key_6,
     TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()),
     ac, "select_matching_bracket" );
@@ -575,34 +575,34 @@ void KateView::setupEditActions()
   // anders: shortcuts doing any changes should not be created in browserextension
   if ( !m_doc->readOnly() )
   {
-    new KAction(
+    new TDEAction(
       i18n("Transpose Characters"),           CTRL + Key_T,
       TQT_TQOBJECT(this), TQT_SLOT(transpose()),
       ac, "transpose_char" );
 
-    new KAction(
+    new TDEAction(
       i18n("Delete Line"),                    CTRL + Key_K,
       TQT_TQOBJECT(this), TQT_SLOT(killLine()),
       ac, "delete_line" );
 
-    new KAction(
-      i18n("Delete Word Left"),               KStdAccel::deleteWordBack(),
+    new TDEAction(
+      i18n("Delete Word Left"),               TDEStdAccel::deleteWordBack(),
       TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()),
       ac, "delete_word_left" );
 
-    new KAction(
-      i18n("Delete Word Right"),              KStdAccel::deleteWordForward(),
+    new TDEAction(
+      i18n("Delete Word Right"),              TDEStdAccel::deleteWordForward(),
       TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()),
       ac, "delete_word_right" );
 
-    new KAction(i18n("Delete Next Character"), Key_Delete,
+    new TDEAction(i18n("Delete Next Character"), Key_Delete,
                 TQT_TQOBJECT(this), TQT_SLOT(keyDelete()),
                 ac, "delete_next_character");
 
-    KAction *a = new KAction(i18n("Backspace"), Key_Backspace,
+    TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace,
                 TQT_TQOBJECT(this), TQT_SLOT(backspace()),
                 ac, "backspace");
-    KShortcut cut = a->shortcut();
+    TDEShortcut cut = a->shortcut();
     cut.append( KKey( SHIFT + Key_Backspace ) );
     a->setShortcut( cut );
   }
@@ -624,18 +624,18 @@ void KateView::setupEditActions()
 
 void KateView::setupCodeFolding()
 {
-  KActionCollection *ac=this->actionCollection();
-  new KAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
+  TDEActionCollection *ac=this->actionCollection();
+  new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
        m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
-  new KAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
+  new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
        TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
-  new KAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
+  new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
        TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
-  new KAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
+  new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
        TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
 
 #ifdef DEBUGACCELS
-  KAccel* debugAccels = new KAccel(this,TQT_TQOBJECT(this));
+  TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this));
   debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree()));
   debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode()));
   debugAccels->setEnabled(true);
@@ -709,8 +709,8 @@ void KateView::slotStatusMsg ()
   uint r = cursorLine() + 1;
   uint c = cursorColumn() + 1;
 
-  TQString s1 = i18n(" Line: %1").arg(KGlobal::locale()->formatNumber(r, 0));
-  TQString s2 = i18n(" Col: %1").arg(KGlobal::locale()->formatNumber(c, 0));
+  TQString s1 = i18n(" Line: %1").arg(TDEGlobal::locale()->formatNumber(r, 0));
+  TQString s2 = i18n(" Col: %1").arg(TDEGlobal::locale()->formatNumber(c, 0));
 
   TQString modstr = m_doc->isModified() ? TQString (" * ") : TQString ("   ");
   TQString blockstr = blockSelectionMode() ? i18n(" BLK ") : i18n(" NORM ");
@@ -760,7 +760,7 @@ void KateView::slotReadWriteChanged ()
       << "edit_undo" << "edit_redo" << "tools_spelling_from_cursor"
       << "tools_spelling_selection";
 
-  KAction *a = 0;
+  TDEAction *a = 0;
   for (uint z = 0; z < l.size(); z++)
     if ((a = actionCollection()->action( l[z].ascii() )))
       a->setEnabled (m_doc->isReadWrite());
@@ -930,12 +930,12 @@ void KateView::joinLines()
   m_doc->joinLines( first, last );
 }
 
-void KateView::readSessionConfig(KConfig *config)
+void KateView::readSessionConfig(TDEConfig *config)
 {
   setCursorPositionInternal (config->readNumEntry("CursorLine"), config->readNumEntry("CursorColumn"), 1);
 }
 
-void KateView::writeSessionConfig(KConfig *config)
+void KateView::writeSessionConfig(TDEConfig *config)
 {
   config->writeEntry("CursorLine",m_viewInternal->cursor.line());
   config->writeEntry("CursorColumn",m_viewInternal->cursor.col());
@@ -1256,7 +1256,7 @@ void KateView::updateFoldingConfig ()
   l << "folding_toplevel" << "folding_expandtoplevel"
     << "folding_collapselocal" << "folding_expandlocal";
 
-  KAction *a = 0;
+  TDEAction *a = 0;
   for (uint z = 0; z < l.size(); z++)
     if ((a = actionCollection()->action( l[z].ascii() )))
       a->setEnabled (m_doc->highlight() && m_doc->highlight()->allowsFolding());
@@ -1839,7 +1839,7 @@ void KateView::exportAsHTML ()
   if ( url.isLocalFile() )
       return;
 
-  KIO::NetAccess::upload( filename, url, 0 );
+  TDEIO::NetAccess::upload( filename, url, 0 );
 }
 //END
 
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index aa428096d..0a00ab1fc 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -28,9 +28,9 @@
 
 #include "../interfaces/view.h"
 
-#include <ktexteditor/sessionconfiginterface.h>
-#include <ktexteditor/viewstatusmsginterface.h>
-#include <ktexteditor/texthintinterface.h>
+#include <tdetexteditor/sessionconfiginterface.h>
+#include <tdetexteditor/viewstatusmsginterface.h>
+#include <tdetexteditor/texthintinterface.h>
 
 #include <tqguardedptr.h>
 
@@ -44,10 +44,10 @@ class KateViewSchemaAction;
 class KateRenderer;
 class KateSpell;
 
-class KToggleAction;
-class KAction;
-class KRecentFilesAction;
-class KSelectAction;
+class TDEToggleAction;
+class TDEAction;
+class TDERecentFilesAction;
+class TDESelectAction;
 
 class TQGridLayout;
 
@@ -370,8 +370,8 @@ class KateView : public Kate::View,
 
   // config file / session management functions
   public:
-    void readSessionConfig(KConfig *);
-    void writeSessionConfig(KConfig *);
+    void readSessionConfig(TDEConfig *);
+    void writeSessionConfig(TDEConfig *);
 
   public slots:
     int getEol();
@@ -429,7 +429,7 @@ class KateView : public Kate::View,
     // Is it really necessary to have 3 methods for this?! :)
     KateDocument*  doc() const       { return m_doc; }
 
-    KActionCollection* editActionCollection() const { return m_editActions; }
+    TDEActionCollection* editActionCollection() const { return m_editActions; }
 
   public slots:
     void slotNewUndo();
@@ -472,31 +472,31 @@ class KateView : public Kate::View,
     void setupCodeFolding();
     void setupCodeCompletion();
 
-    KActionCollection*     m_editActions;
-    KAction*               m_editUndo;
-    KAction*               m_editRedo;
-    KRecentFilesAction*    m_fileRecent;
-    KToggleAction*         m_toggleFoldingMarkers;
-    KToggleAction*         m_toggleIconBar;
-    KToggleAction*         m_toggleLineNumbers;
-    KToggleAction*         m_toggleScrollBarMarks;
-    KToggleAction*         m_toggleDynWrap;
-    KSelectAction*         m_setDynWrapIndicators;
-    KToggleAction*         m_toggleWWMarker;
-    KAction*               m_switchCmdLine;
-
-    KSelectAction*         m_setEndOfLine;
-
-    KAction *m_cut;
-    KAction *m_copy;
-    KAction *m_copyHTML;
-    KAction *m_paste;
-    KAction *m_selectAll;
-    KAction *m_deSelect;
-
-    KToggleAction *m_toggleBlockSelection;
-    KToggleAction *m_toggleInsert;
-    KToggleAction *m_toggleWriteLock;
+    TDEActionCollection*     m_editActions;
+    TDEAction*               m_editUndo;
+    TDEAction*               m_editRedo;
+    TDERecentFilesAction*    m_fileRecent;
+    TDEToggleAction*         m_toggleFoldingMarkers;
+    TDEToggleAction*         m_toggleIconBar;
+    TDEToggleAction*         m_toggleLineNumbers;
+    TDEToggleAction*         m_toggleScrollBarMarks;
+    TDEToggleAction*         m_toggleDynWrap;
+    TDESelectAction*         m_setDynWrapIndicators;
+    TDEToggleAction*         m_toggleWWMarker;
+    TDEAction*               m_switchCmdLine;
+
+    TDESelectAction*         m_setEndOfLine;
+
+    TDEAction *m_cut;
+    TDEAction *m_copy;
+    TDEAction *m_copyHTML;
+    TDEAction *m_paste;
+    TDEAction *m_selectAll;
+    TDEAction *m_deSelect;
+
+    TDEToggleAction *m_toggleBlockSelection;
+    TDEToggleAction *m_toggleInsert;
+    TDEToggleAction *m_toggleWriteLock;
 
     KateDocument*          m_doc;
     KateViewInternal*      m_viewInternal;
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index f858ae908..dd52451b0 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -32,13 +32,13 @@
 #include "kateview.h"
 #include "kateviewinternal.h"
 
-#include <kapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqcursor.h>
 #include <tqpainter.h>
@@ -272,7 +272,7 @@ class KateCmdLnWhatsThis : public TQWhatsThis
  * This class provide completion of flags. It shows a short description of
  * each flag, and flags are appended.
  */
-class KateCmdLineFlagCompletion : public KCompletion
+class KateCmdLineFlagCompletion : public TDECompletion
 {
   public:
     KateCmdLineFlagCompletion() {;}
@@ -365,7 +365,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text )
   // clean up
   if ( m_oldCompletionObject )
   {
-    KCompletion *c = completionObject();
+    TDECompletion *c = completionObject();
     setCompletionObject( m_oldCompletionObject );
     m_oldCompletionObject = 0;
     delete c;
@@ -465,7 +465,7 @@ void KateCmdLine::keyPressEvent( TQKeyEvent *ev )
         // clean up if needed
         if ( m_oldCompletionObject )
         {
-          KCompletion *c = completionObject();
+          TDECompletion *c = completionObject();
           setCompletionObject( m_oldCompletionObject );
           m_oldCompletionObject = 0;
           delete c;
@@ -483,7 +483,7 @@ void KateCmdLine::keyPressEvent( TQKeyEvent *ev )
       Kate::CommandExtension *ce = dynamic_cast<Kate::CommandExtension*>(m_command);
       if ( ce )
       {
-        KCompletion *cmpl = ce->completionObject( text().left( m_cmdend ).stripWhiteSpace(), m_view );
+        TDECompletion *cmpl = ce->completionObject( text().left( m_cmdend ).stripWhiteSpace(), m_view );
         if ( cmpl )
         {
         // save the old completion object and use what the command provides
@@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
   {
      KateViewConfig::global()->setDefaultMarkType (vec[result-100]);
      // flush config, otherwise it isn't nessecarily done
-     KConfig *config = kapp->config();
+     TDEConfig *config = kapp->config();
      config->setGroup("Kate View Defaults");
      KateViewConfig::global()->writeConfig( config );
   }
@@ -1168,14 +1168,14 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
 //END KateIconBorder
 
 KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name)
-       : KActionMenu (text, parent, name), doc(_doc), view (_view)
+       : TDEActionMenu (text, parent, name), doc(_doc), view (_view)
 {
   connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
 }
 
 void KateViewEncodingAction::slotAboutToShow()
 {
-  TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames());
+  TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames());
 
   popupMenu()->clear ();
   for (uint z=0; z<modes.size(); ++z)
@@ -1183,7 +1183,7 @@ void KateViewEncodingAction::slotAboutToShow()
     popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0,  z);
 
     bool found = false;
-    TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(modes[z]), found);
+    TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found);
 
     if (found && codecForEnc)
     {
@@ -1195,8 +1195,8 @@ void KateViewEncodingAction::slotAboutToShow()
 
 void KateViewEncodingAction::setMode (int mode)
 {
-  TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames());
-  doc->config()->setEncoding( KGlobal::charsets()->encodingForName( modes[mode] ) );
+  TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames());
+  doc->config()->setEncoding( TDEGlobal::charsets()->encodingForName( modes[mode] ) );
   // now we don't want the encoding changed again unless the user does so using the menu.
   doc->setEncodingSticky( true );
   doc->reloadFile();
diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h
index 1205ea99a..980d4d1cd 100644
--- a/kate/part/kateviewhelpers.h
+++ b/kate/part/kateviewhelpers.h
@@ -21,7 +21,7 @@
 #ifndef __KATE_VIEW_HELPERS_H__
 #define __KATE_VIEW_HELPERS_H__
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klineedit.h>
 
 #include <tqwidget.h>
@@ -115,7 +115,7 @@ class KateCmdLine : public KLineEdit
     uint m_histpos; ///< position in the history
     uint m_cmdend; ///< the point where a command ends in the text, if we have a valid one.
     Kate::Command *m_command; ///< For completing flags/args and interactiveness
-    class KCompletion *m_oldCompletionObject; ///< save while completing command args.
+    class TDECompletion *m_oldCompletionObject; ///< save while completing command args.
     class KateCmdLnWhatsThis *m_help;
 };
 
@@ -182,7 +182,7 @@ class KateIconBorder : public TQWidget
     mutable TQColor m_oldBackgroundColor;
 };
 
-class KateViewEncodingAction : public KActionMenu
+class KateViewEncodingAction : public TDEActionMenu
 {
   Q_OBJECT
 
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index d93f81a86..c2b0ca4db 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -37,8 +37,8 @@
 
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kglobalsettings.h>
+#include <tdeapplication.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 
 #include <tqstyle.h>
@@ -2213,8 +2213,8 @@ void KateViewInternal::updateCursor( const KateTextCursor& newCursor, bool force
 
   if (m_cursorTimer.isActive ())
   {
-    if ( KApplication::cursorFlashTime() > 0 )
-      m_cursorTimer.start( KApplication::cursorFlashTime() / 2 );
+    if ( TDEApplication::cursorFlashTime() > 0 )
+      m_cursorTimer.start( TDEApplication::cursorFlashTime() / 2 );
     m_view->renderer()->setDrawCaret(true);
   }
 
@@ -2986,7 +2986,7 @@ void KateViewInternal::mouseMoveEvent( TQMouseEvent* e )
       TQPoint p( e->pos() - dragInfo.start );
 
       // we've left the drag square, we can start a real drag operation now
-      if( p.manhattanLength() > KGlobalSettings::dndEventDelay() )
+      if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
         doDrag();
 
       return;
@@ -3154,8 +3154,8 @@ void KateViewInternal::textHintTimeout ()
 
 void KateViewInternal::focusInEvent (TQFocusEvent *)
 {
-  if (KApplication::cursorFlashTime() > 0)
-    m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 );
+  if (TDEApplication::cursorFlashTime() > 0)
+    m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 );
 
   if (m_textHintEnabled)
     m_textHintTimer.start( m_textHintTimeout );
@@ -3480,8 +3480,8 @@ void KateViewInternal::imEndEvent( TQIMEvent *e )
   if ( e->text().length() > 0 ) {
     m_doc->insertText( cursor.line(), cursor.col(), e->text() );
 
-    if ( !m_cursorTimer.isActive() && KApplication::cursorFlashTime() > 0 )
-      m_cursorTimer.start ( KApplication::cursorFlashTime() / 2 );
+    if ( !m_cursorTimer.isActive() && TDEApplication::cursorFlashTime() > 0 )
+      m_cursorTimer.start ( TDEApplication::cursorFlashTime() / 2 );
 
     updateView( true );
     updateCursor( cursor, true );
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index de89e0996..1b6decfe3 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -31,7 +31,7 @@
 #include <pwd.h>
 #include <signal.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
@@ -39,13 +39,13 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include <kaction.h>
-#include <kcmdlineargs.h>
+#include <tdeaction.h>
+#include <tdecmdlineargs.h>
 #include "katefactory.h"
-#include <kio/job.h>
-#include <kmainwindow.h>
+#include <tdeio/job.h>
+#include <tdemainwindow.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqcolor.h>
 #include <tqcursor.h>
@@ -66,7 +66,7 @@
 
 #include "katedocument.h"
 #include "kateview.h"
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include "katejscript.h"
 #include "katedocumenthelpers.h"
 #include "kateconfig.h"
@@ -371,7 +371,7 @@ static TQString findMostRecentFailureSnapshot() {
     return dir[0].mid(sizeof failureSnapshotPrefix - 1);
 }
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "b", 0, 0 },
     { "base <base_dir>", "Directory containing tests, basedir and output directories.", 0},
@@ -390,7 +390,7 @@ static KCmdLineOptions options[] =
     { "output <directory>", "Put output in <directory> instead of <base_dir>/output", 0 } ,
     { "+[base_dir]", "Directory containing tests,basedir and output directories. Only regarded if -b is not specified.", 0 } ,
     { "+[testcases]", "Relative path to testcase, or directory of testcases to be run (equivalent to -t).", 0 } ,
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main(int argc, char *argv[])
@@ -410,11 +410,11 @@ int main(int argc, char *argv[])
 
 //     signal( SIGALRM, signal_handler );
 
-    KCmdLineArgs::init(argc, argv, "testregression", "TestRegression",
+    TDECmdLineArgs::init(argc, argv, "testregression", "TestRegression",
                        "Regression tester for kate", "1.0");
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs( );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
 
     TQCString baseDir = args->getOption("base");
     TQCString baseDirConfigFile(::getenv("HOME") + TQCString(BASE_DIR_CONFIG));
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
                "\techo \"<root-path>\" > %s\n"
                "You may override the location by specifying the root explicitly on the\n"
                "command line with option -b\n"
-               "", KCmdLineArgs::appName(),
+               "", TDECmdLineArgs::appName(),
                (const char *)baseDirConfigFile,
                (const char *)baseDirConfigFile);
 	::exit( 1 );
@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    KApplication a;
+    TDEApplication a;
     a.disableAutoDcopRegistration();
     a.setStyle("windows");
     KSimpleConfig cfg( "testkateregressionrc" );
@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
 
     // create widgets
     KateFactory *fac = KateFactory::self();
-    KMainWindow *toplevel = new KMainWindow();
+    TDEMainWindow *toplevel = new TDEMainWindow();
     KateDocument *part = new KateDocument(/*bSingleViewMode*/true,
                                           /*bBrowserView*/false,
                                           /*bReadOnly*/false,
@@ -650,7 +650,7 @@ int main(int argc, char *argv[])
 
 RegressionTest *RegressionTest::curr = 0;
 
-RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig,
+RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig,
                                const TQString &baseDir,
                                const TQString &outputDir, bool _genOutput)
   : TQObject(part)
@@ -723,14 +723,14 @@ RegressionTest::~RegressionTest()
     delete m_failureSave;
 }
 
-void RegressionTest::setFailureSnapshotConfig(KConfig *cfg, const TQString &sname)
+void RegressionTest::setFailureSnapshotConfig(TDEConfig *cfg, const TQString &sname)
 {
     Q_ASSERT(cfg);
     m_failureComp = cfg;
     m_failureComp->setGroup(sname);
 }
 
-void RegressionTest::setFailureSnapshotSaver(KConfig *cfg, const TQString &sname)
+void RegressionTest::setFailureSnapshotSaver(TDEConfig *cfg, const TQString &sname)
 {
     Q_ASSERT(cfg);
     m_failureSave = cfg;
@@ -928,7 +928,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
     TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir);
 
-    // are blocking reads possible with KProcess?
+    // are blocking reads possible with TDEProcess?
     char pwd[PATH_MAX];
     (void) getcwd( pwd, PATH_MAX );
     chdir( TQFile::encodeName( m_baseDir ) );
diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h
index 0bc717714..2128ce25d 100644
--- a/kate/part/test_regression.h
+++ b/kate/part/test_regression.h
@@ -165,7 +165,7 @@ class RegressionTest : public TQObject
   Q_OBJECT
 public:
 
-    RegressionTest(KateDocument *part, KConfig *baseConfig,
+    RegressionTest(KateDocument *part, TDEConfig *baseConfig,
                    const TQString &baseDir, const TQString &outputDir,
                    bool _genOutput);
     ~RegressionTest();
@@ -181,21 +181,21 @@ public:
     void rereadConfig();
     static void createMissingDirs(const TQString &path);
 
-    void setFailureSnapshotConfig(KConfig *cfg, const TQString &snapshotname);
-    void setFailureSnapshotSaver(KConfig *cfg, const TQString &snapshotname);
+    void setFailureSnapshotConfig(TDEConfig *cfg, const TQString &snapshotname);
+    void setFailureSnapshotSaver(TDEConfig *cfg, const TQString &snapshotname);
 
     void createLink( const TQString& test, int failures );
     void doFailureReport( const TQString& test, int failures );
 
     KateDocument *m_part;
     KateView *m_view;
-    KConfig *m_baseConfig;
+    TDEConfig *m_baseConfig;
     TQString m_baseDir;
     TQString m_outputDir;
     bool m_genOutput;
     TQString m_currentBase;
-    KConfig *m_failureComp;
-    KConfig *m_failureSave;
+    TDEConfig *m_failureComp;
+    TDEConfig *m_failureSave;
 
     TQString m_currentOutput;
     TQString m_currentCategory;
diff --git a/kate/plugins/autobookmarker/Makefile.am b/kate/plugins/autobookmarker/Makefile.am
index 748dbb2e5..4465a88a7 100644
--- a/kate/plugins/autobookmarker/Makefile.am
+++ b/kate/plugins/autobookmarker/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_autobookmarker.la
+kde_module_LTLIBRARIES = tdetexteditor_autobookmarker.la
 
-ktexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp
-ktexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
-ktexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp
+tdetexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la
+tdetexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-kde_services_DATA = ktexteditor_autobookmarker.desktop
+kde_services_DATA = tdetexteditor_autobookmarker.desktop
 
 confdir=$(kde_confdir)
-conf_DATA = ktexteditor_autobookmarkerrc
+conf_DATA = tdetexteditor_autobookmarkerrc
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_autobookmarker.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_autobookmarker.pot
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index a0e61f3d0..3f87f1580 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -23,18 +23,18 @@
 //BEGIN includes
 #include "autobookmarker.h"
 
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/documentinfo.h>
-#include <ktexteditor/document.h>
-
-#include <kaction.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/documentinfo.h>
+#include <tdetexteditor/document.h>
+
+#include <tdeaction.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <klistview.h>
-#include <klocale.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kmimetypechooser.h>
 #include <kprocess.h>
@@ -57,7 +57,7 @@
 //END includes
 
 //BEGIN AutoBookmarker
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_autobookmarker, KGenericFactory<AutoBookmarker>( "ktexteditor_autobookmarker" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_autobookmarker, KGenericFactory<AutoBookmarker>( "tdetexteditor_autobookmarker" ) )
 
 AutoBookmarker::AutoBookmarker( TQObject *parent,
                             const char* name,
@@ -199,7 +199,7 @@ void ABGlobal::readConfig()
     m_ents = new ABEntityList;
   else
     m_ents->clear();
-  KConfig *config = new KConfig("ktexteditor_autobookmarkerrc");
+  TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc");
 
   uint n( 0 );
   while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) )
@@ -225,7 +225,7 @@ void ABGlobal::readConfig()
 
 void ABGlobal::writeConfig()
 {
-  KConfig *config = new KConfig("ktexteditor_autobookmarkerrc");
+  TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc");
 
   // clean the config object
   TQStringList l = config->groupList();
@@ -253,7 +253,7 @@ void ABGlobal::writeConfig()
 class AutoBookmarkEntItem : public QListViewItem
 {
   public:
-    AutoBookmarkEntItem( KListView *lv, AutoBookmarkEnt *e )
+    AutoBookmarkEntItem( TDEListView *lv, AutoBookmarkEnt *e )
         : TQListViewItem( lv ),
         ent( e )
       {
@@ -383,7 +383,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char
 
   TQLabel *l = new TQLabel( i18n("&Patterns"), this );
   lo->addWidget( l );
-  lvPatterns = new KListView( this );
+  lvPatterns = new TDEListView( this );
   lvPatterns->addColumn( i18n("Pattern") );
   lvPatterns->addColumn( i18n("Mime Types") );
   lvPatterns->addColumn( i18n("File Masks") );
diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h
index bdeb2abcf..9687d8ceb 100644
--- a/kate/plugins/autobookmarker/autobookmarker.h
+++ b/kate/plugins/autobookmarker/autobookmarker.h
@@ -23,8 +23,8 @@
 #ifndef _AUTOBOOKMARKER_H_
 #define _AUTOBOOKMARKER_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/configinterfaceextension.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/configinterfaceextension.h>
 
 #include <kdialogbase.h>
 
@@ -111,7 +111,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage
     void slotEdit();
 
   private:
-    class KListView *lvPatterns;
+    class TDEListView *lvPatterns;
     class TQPushButton *btnNew, *btnDel, *btnEdit;
     ABEntityList *m_ents;
 };
diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
index 632d84628..ea5b08247 100644
--- a/kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
@@ -128,7 +128,7 @@ Comment[uk]=В�тановлює закладки на р�дках, що від
 Comment[vi]=�ặt đánh dấu trên các dòng khớp một mẫu nào đó khi tải tài liệu.
 Comment[zh_CN]=文档装入时根�匹�模�自动设置书签
 Comment[zh_TW]=文件載入時以字串比�演算法來設定書籤。
-X-TDE-Library=ktexteditor_autobookmarker
+X-TDE-Library=tdetexteditor_autobookmarker
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc b/kate/plugins/autobookmarker/tdetexteditor_autobookmarkerrc
index 3ed8fe8c5..3ed8fe8c5 100644
--- a/kate/plugins/autobookmarker/ktexteditor_autobookmarkerrc
+++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarkerrc
diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt
index 8f4390f64..56bdfd9cd 100644
--- a/kate/plugins/insertfile/CMakeLists.txt
+++ b/kate/plugins/insertfile/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 
@@ -29,13 +29,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES ktexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_insertfile )
+install( FILES tdetexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdetexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_insertfile )
 
 
-##### ktexteditor_insertfile ####################
+##### tdetexteditor_insertfile ####################
 
-set( target ktexteditor_insertfile )
+set( target tdetexteditor_insertfile )
 
 set( ${target}_SRCS
   insertfileplugin.cpp
@@ -43,6 +43,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/insertfile/Makefile.am b/kate/plugins/insertfile/Makefile.am
index fc8b1e228..4a89ef3af 100644
--- a/kate/plugins/insertfile/Makefile.am
+++ b/kate/plugins/insertfile/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_insertfile.la
+kde_module_LTLIBRARIES = tdetexteditor_insertfile.la
 
-ktexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
-ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
-ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
+tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
+tdetexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
-insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile
-insertfiledata_DATA = ktexteditor_insertfileui.rc
+insertfiledatadir = $(kde_datadir)/tdetexteditor_insertfile
+insertfiledata_DATA = tdetexteditor_insertfileui.rc
 
-kde_services_DATA = ktexteditor_insertfile.desktop
+kde_services_DATA = tdetexteditor_insertfile.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_insertfile.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_insertfile.pot
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 6a350831f..e2e3d354a 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -19,25 +19,25 @@
 #include "insertfileplugin.h"
 #include "insertfileplugin.moc"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include <assert.h>
-#include <kio/job.h>
-#include <kaction.h>
-#include <kfiledialog.h>
+#include <tdeio/job.h>
+#include <tdeaction.h>
+#include <tdefiledialog.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "ktexteditor_insertfile" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "tdetexteditor_insertfile" ) )
 
 
 //BEGIN InsertFilePlugin
@@ -76,8 +76,8 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char
   view->insertChildClient( this );
   setInstance( KGenericFactory<InsertFilePlugin>::instance() );
   _job = 0;
-  (void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
-  setXMLFile( "ktexteditor_insertfileui.rc" );
+  (void) new TDEAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
+  setXMLFile( "tdetexteditor_insertfileui.rc" );
 }
 
 void InsertFilePluginView::slotInsertFile()
@@ -103,12 +103,12 @@ void InsertFilePluginView::slotInsertFile()
 
     KURL destURL;
     destURL.setPath( _tmpfile );
-    _job = KIO::file_copy( _file, destURL, 0600, true, false, true );
-    connect( _job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished ( KIO::Job * ) ) );
+    _job = TDEIO::file_copy( _file, destURL, 0600, true, false, true );
+    connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) );
   }
 }
 
-void InsertFilePluginView::slotFinished( KIO::Job *job )
+void InsertFilePluginView::slotFinished( TDEIO::Job *job )
 {
   assert( job == _job );
   _job = 0;
diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h
index 9331f8100..da08a02c7 100644
--- a/kate/plugins/insertfile/insertfileplugin.h
+++ b/kate/plugins/insertfile/insertfileplugin.h
@@ -22,8 +22,8 @@
 #ifndef _INSERT_FILE_PLUGIN_H_
 #define _INSERT_FILE_PLUGIN_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
 
 #include <kxmlguiclient.h>
 #include <tqobject.h>
@@ -58,13 +58,13 @@ class InsertFilePluginView : public TQObject, public KXMLGUIClient
     /* display a file dialog, and insert the chosen file */
     void slotInsertFile();
   private slots:
-    void slotFinished( KIO::Job *job );
-    //slotAborted( KIO::Job *job );
+    void slotFinished( TDEIO::Job *job );
+    //slotAborted( TDEIO::Job *job );
   private:
     void insertFile();
     KURL _file;
     TQString _tmpfile;
-    KIO::FileCopyJob *_job;
+    TDEIO::FileCopyJob *_job;
 };
 
 #endif // _INSERT_FILE_PLUGIN_H_
diff --git a/kate/plugins/insertfile/ktexteditor_insertfile.desktop b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
index 7e08d71b7..493369e29 100644
--- a/kate/plugins/insertfile/ktexteditor_insertfile.desktop
+++ b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
@@ -149,7 +149,7 @@ Comment[vi]=Chèn bất kỳ tập tin có khả năng Ä‘á»�c tại vị trí cá
 Comment[zh_CN]=在光标�置�入任何�读文件
 Comment[zh_HK]=在游標處�入任�的檔案
 Comment[zh_TW]=在游標處�入任�的�讀檔案
-X-TDE-Library=ktexteditor_insertfile
+X-TDE-Library=tdetexteditor_insertfile
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/insertfile/ktexteditor_insertfileui.rc b/kate/plugins/insertfile/tdetexteditor_insertfileui.rc
index 36ac0916f..d92e512ff 100644
--- a/kate/plugins/insertfile/ktexteditor_insertfileui.rc
+++ b/kate/plugins/insertfile/tdetexteditor_insertfileui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_insertfile" library="ktexteditor_insertfile" version="2">
+<kpartplugin name="tdetexteditor_insertfile" library="tdetexteditor_insertfile" version="2">
 <MenuBar>
  <Menu name="tools"><Text>&amp;Tools</Text>
     <separator group="tools_operations" />
diff --git a/kate/plugins/isearch/CMakeLists.txt b/kate/plugins/isearch/CMakeLists.txt
index 693c3a409..38a042973 100644
--- a/kate/plugins/isearch/CMakeLists.txt
+++ b/kate/plugins/isearch/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES ktexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_isearch )
+install( FILES tdetexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdetexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_isearch )
 
 
-##### ktexteditor_isearch #######################
+##### tdetexteditor_isearch #######################
 
-set( target ktexteditor_isearch )
+set( target tdetexteditor_isearch )
 
 set( ${target}_SRCS
   ISearchPlugin.cpp
@@ -41,6 +41,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 249abf9f2..7cb01ccc9 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -21,16 +21,16 @@
 #include <tqstyle.h>
 #include <tqpopupmenu.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kaction.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "ISearchPlugin.h"
 #include "ISearchPlugin.moc"
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_isearch, KGenericFactory<ISearchPlugin>( "ktexteditor_isearch" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_isearch, KGenericFactory<ISearchPlugin>( "tdetexteditor_isearch" ) )
 
 ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 	: TQObject ( view ), KXMLGUIClient (view)
@@ -64,11 +64,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 
 	setInstance( KGenericFactory<ISearchPlugin>::instance() );
 
-	m_searchForwardAction = new KAction(
+	m_searchForwardAction = new TDEAction(
 		i18n("Search Incrementally"), CTRL+ALT+Key_F,
 		this, TQT_SLOT(slotSearchForwardAction()),
 		actionCollection(), "edit_isearch" );
-	m_searchBackwardAction = new KAction(
+	m_searchBackwardAction = new TDEAction(
 		i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F,
 		this, TQT_SLOT(slotSearchBackwardAction()),
 		actionCollection(), "edit_isearch_reverse" );
@@ -97,13 +97,13 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 	m_comboAction->setAutoSized( true );
 	m_comboAction->setShortcutConfigurable( false );
 
-	KActionMenu* optionMenu = new KActionMenu(
+	TDEActionMenu* optionMenu = new TDEActionMenu(
 		i18n("Search Options"), "configure",
 		actionCollection(), "isearch_options" );
 	optionMenu->setDelayed( false );
 
-	KToggleAction* action = new KToggleAction(
-		i18n("Case Sensitive"), KShortcut(),
+	TDEToggleAction* action = new TDEToggleAction(
+		i18n("Case Sensitive"), TDEShortcut(),
 		actionCollection(), "isearch_case_sensitive" );
 	action->setShortcutConfigurable( false );
 	connect( action, TQT_SIGNAL(toggled(bool)),
@@ -111,8 +111,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 	action->setChecked( m_caseSensitive );
 	optionMenu->insert( action );
 
-	action = new KToggleAction(
-		i18n("From Beginning"), KShortcut(),
+	action = new TDEToggleAction(
+		i18n("From Beginning"), TDEShortcut(),
 		actionCollection(), "isearch_from_beginning" );
 	action->setShortcutConfigurable( false );
 	connect( action, TQT_SIGNAL(toggled(bool)),
@@ -120,8 +120,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 	action->setChecked( m_fromBeginning );
 	optionMenu->insert( action );
 
-	action = new KToggleAction(
-		i18n("Regular Expression"), KShortcut(),
+	action = new TDEToggleAction(
+		i18n("Regular Expression"), TDEShortcut(),
 		actionCollection(), "isearch_reg_exp" );
 	action->setShortcutConfigurable( false );
 	connect( action, TQT_SIGNAL(toggled(bool)),
@@ -129,17 +129,17 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 	action->setChecked( m_regExp );
 	optionMenu->insert( action );
 
-// 	optionMenu->insert( new KActionSeparator() );
+// 	optionMenu->insert( new TDEActionSeparator() );
 //
-// 	action = new KToggleAction(
-// 		i18n("Auto-Wrap Search"), KShortcut(),
+// 	action = new TDEToggleAction(
+// 		i18n("Auto-Wrap Search"), TDEShortcut(),
 // 		actionCollection(), "isearch_auto_wrap" );
 // 	connect( action, TQT_SIGNAL(toggled(bool)),
 // 	         this, TQT_SLOT(setAutoWrap(bool)) );
 // 	action->setChecked( m_autoWrap );
 // 	optionMenu->insert( action );
 
-	setXMLFile( "ktexteditor_isearchui.rc" );
+	setXMLFile( "tdetexteditor_isearchui.rc" );
 }
 
 ISearchPluginView::~ISearchPluginView()
@@ -170,12 +170,12 @@ void ISearchPluginView::setView( KTextEditor::View* view )
 
 void ISearchPluginView::readConfig()
 {
-    // KConfig* config = instance()->config();
+    // TDEConfig* config = instance()->config();
 }
 
 void ISearchPluginView::writeConfig()
 {
-    // KConfig* config = instance()->config();
+    // TDEConfig* config = instance()->config();
 }
 
 void ISearchPluginView::setCaseSensitive( bool caseSensitive )
diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h
index 836ecbc7e..b11b2a8b6 100644
--- a/kate/plugins/isearch/ISearchPlugin.h
+++ b/kate/plugins/isearch/ISearchPlugin.h
@@ -19,12 +19,12 @@
 #ifndef _ISearchPlugin_H_
 #define _ISearchPlugin_H_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/searchinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/selectioninterface.h>        
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/searchinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/selectioninterface.h>        
 
 #include <kxmlguiclient.h>
 #include <tqobject.h>
@@ -92,8 +92,8 @@ private:
 	KTextEditor::SearchInterface* m_searchIF;
 	KTextEditor::ViewCursorInterface* m_cursorIF;
 	KTextEditor::SelectionInterface* m_selectIF;
-	KAction*               m_searchForwardAction;
-	KAction*               m_searchBackwardAction;
+	TDEAction*               m_searchForwardAction;
+	TDEAction*               m_searchBackwardAction;
 	KWidgetAction*         m_comboAction;
 	TQGuardedPtr<TQLabel>    m_label;
 	TQGuardedPtr<KHistoryCombo> m_combo;
diff --git a/kate/plugins/isearch/Makefile.am b/kate/plugins/isearch/Makefile.am
index f71da53e7..cc9356954 100644
--- a/kate/plugins/isearch/Makefile.am
+++ b/kate/plugins/isearch/Makefile.am
@@ -2,17 +2,17 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_isearch.la
+kde_module_LTLIBRARIES = tdetexteditor_isearch.la
 
-ktexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
-ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
+tdetexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdetexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
           
-isearchdatadir = $(kde_datadir)/ktexteditor_isearch
-isearchdata_DATA = ktexteditor_isearchui.rc
+isearchdatadir = $(kde_datadir)/tdetexteditor_isearch
+isearchdata_DATA = tdetexteditor_isearchui.rc
 
-kde_services_DATA = ktexteditor_isearch.desktop
+kde_services_DATA = tdetexteditor_isearch.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_isearch.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_isearch.pot
 
diff --git a/kate/plugins/isearch/ktexteditor_isearch.desktop b/kate/plugins/isearch/tdetexteditor_isearch.desktop
index 2e49615d8..6fb7894c5 100644
--- a/kate/plugins/isearch/ktexteditor_isearch.desktop
+++ b/kate/plugins/isearch/tdetexteditor_isearch.desktop
@@ -146,7 +146,7 @@ Comment[uk]=Також відомий �к "Пошук за вводом"
 Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ».
 Comment[zh_CN]=也称为“�输���
 Comment[zh_TW]=也稱�「�時�尋�
-X-TDE-Library=ktexteditor_isearch
+X-TDE-Library=tdetexteditor_isearch
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/isearch/ktexteditor_isearchui.rc b/kate/plugins/isearch/tdetexteditor_isearchui.rc
index d8fc6b5dd..a12fb64a2 100644
--- a/kate/plugins/isearch/ktexteditor_isearchui.rc
+++ b/kate/plugins/isearch/tdetexteditor_isearchui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_isearch" library="ktexteditor_isearch" version="4">
+<kpartplugin name="tdetexteditor_isearch" library="tdetexteditor_isearch" version="4">
 <MenuBar>
 	<Menu name="edit"><text>&amp;Edit</text>
 		<Action name="edit_isearch" group="edit_find_merge"/>
diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt
index aba50c79f..7ceccc10d 100644
--- a/kate/plugins/kdatatool/CMakeLists.txt
+++ b/kate/plugins/kdatatool/CMakeLists.txt
@@ -17,8 +17,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 
@@ -29,13 +29,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES ktexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_kdatatool )
+install( FILES tdetexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdetexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_kdatatool )
 
 
-##### ktexteditor_kdatatool #####################
+##### tdetexteditor_kdatatool #####################
 
-set( target ktexteditor_kdatatool )
+set( target tdetexteditor_kdatatool )
 
 set( ${target}_SRCS
   kate_kdatatool.cpp
@@ -43,6 +43,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/kdatatool/Makefile.am b/kate/plugins/kdatatool/Makefile.am
index 210fa69e8..a0317d979 100644
--- a/kate/plugins/kdatatool/Makefile.am
+++ b/kate/plugins/kdatatool/Makefile.am
@@ -2,18 +2,18 @@ INCLUDES    = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_kdatatool.la
+kde_module_LTLIBRARIES = tdetexteditor_kdatatool.la
 
-ktexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
-ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
-ktexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
+tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
+tdetexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-kdatatooldatadir = $(kde_datadir)/ktexteditor_kdatatool
-kdatatooldata_DATA = ktexteditor_kdatatoolui.rc
+kdatatooldatadir = $(kde_datadir)/tdetexteditor_kdatatool
+kdatatooldata_DATA = tdetexteditor_kdatatoolui.rc
 
-kde_services_DATA = ktexteditor_kdatatool.desktop
+kde_services_DATA = tdetexteditor_kdatatool.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_kdatatool.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_kdatatool.pot
 
 
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index e78bb4228..e14cd9249 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -20,20 +20,20 @@
 #include "kate_kdatatool.h"
 #include "kate_kdatatool.moc"
 #include <kgenericfactory.h>
-#include <kaction.h>
-#include <ktexteditor/view.h>
+#include <tdeaction.h>
+#include <tdetexteditor/view.h>
 #include <kdebug.h>
 #include <kdatatool.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/selectioninterface.h>
-#include <kpopupmenu.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdepopupmenu.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdemessagebox.h>
 //END includes
 
 
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "ktexteditor_kdatatool" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "tdetexteditor_kdatatool" ) )
 
 namespace KTextEditor {
 
@@ -75,9 +75,9 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view )
 	view->insertChildClient (this);
 	setInstance( KGenericFactory<KDataToolPlugin>::instance() );
 
-	m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
+	m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
 	connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow()));
-	setXMLFile("ktexteditor_kdatatoolui.rc");
+	setXMLFile("tdetexteditor_kdatatoolui.rc");
 
 	m_view = view;
 }
@@ -96,7 +96,7 @@ void KDataToolPluginView::aboutToShow()
 	m_wordUnderCursor = TQString::null;
 
 	// unplug old actions, if any:
-	KAction *ac;
+	TDEAction *ac;
 	for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) {
 		m_menu->remove(ac);
 	}
@@ -150,14 +150,14 @@ void KDataToolPluginView::aboutToShow()
 			m_singleWord = true;
 			m_singleWord_line = line;
 		} else {
-			m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this, 
+			m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, 
 					TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
 			m_menu->insert(m_notAvailable);
 			return;
 		}
 	}
 
-	KInstance *inst=instance();
+	TDEInstance *inst=instance();
 
 	TQValueList<KDataToolInfo> tools;
 	tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst );
@@ -172,7 +172,7 @@ void KDataToolPluginView::aboutToShow()
 	}
 
 	if( m_actionList.isEmpty() ) {
-		m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this,
+		m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this,
 			TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
 		m_menu->insert(m_notAvailable);
 	}
diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h
index fbe4e7bf0..a217c6f27 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.h
+++ b/kate/plugins/kdatatool/kate_kdatatool.h
@@ -21,12 +21,12 @@
 #ifndef _KATE_KDATATOOL_
 #define _KATE_KDATATOOL_
 
-#include <ktexteditor/plugin.h>
+#include <tdetexteditor/plugin.h>
 #include <tqstringlist.h>
 #include <kxmlguiclient.h>
 #include <tqguardedptr.h>
 
-class KActionMenu;
+class TDEActionMenu;
 class KDataToolInfo;
 
 namespace KTextEditor
@@ -62,9 +62,9 @@ private:
 	bool m_singleWord;
 	int m_singleWord_line, m_singleWord_start, m_singleWord_end;
 	TQString m_wordUnderCursor;
-	TQPtrList<KAction> m_actionList;
-	TQGuardedPtr<KActionMenu> m_menu;
-	KAction *m_notAvailable;
+	TQPtrList<TDEAction> m_actionList;
+	TQGuardedPtr<TDEActionMenu> m_menu;
+	TDEAction *m_notAvailable;
 protected slots:
 	void aboutToShow();
 	void slotToolActivated( const KDataToolInfo &datatoolinfo, const TQString &string );
diff --git a/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc b/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc
deleted file mode 100644
index b98806200..000000000
--- a/kate/plugins/kdatatool/ktexteditor_kdatatoolui.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_kdatatoolui" library="ktexteditor_kdatatool" version="2">
-
-<Menu name="ktexteditor_popup" noMerge="1">
-  <Action name="popup_dataTool" group="popup_operations"/>
-</Menu>
-
-</kpartplugin>
diff --git a/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
index 9f3649521..d8019c570 100644
--- a/kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
+++ b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
@@ -162,7 +162,7 @@ Comment[zh_CN]=å�¯ç”¨åƒ�辞典(thesaurus)和拼写检查(spell check)这样的æ•
 Comment[zh_HK]=如果有安�的話，啟用��義字字典和拼字檢查等的文字工具
 Comment[zh_TW]=打開資料工具如�義字典與拼字檢查 (如果有安�的話)
 Comment[zu]=Nika amandla amathuluzi edata  anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
-X-TDE-Library=ktexteditor_kdatatool
+X-TDE-Library=tdetexteditor_kdatatool
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc b/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc
new file mode 100644
index 000000000..ae405e3e7
--- /dev/null
+++ b/kate/plugins/kdatatool/tdetexteditor_kdatatoolui.rc
@@ -0,0 +1,8 @@
+<!DOCTYPE kpartgui>
+<kpartplugin name="tdetexteditor_kdatatoolui" library="tdetexteditor_kdatatool" version="2">
+
+<Menu name="tdetexteditor_popup" noMerge="1">
+  <Action name="popup_dataTool" group="popup_operations"/>
+</Menu>
+
+</kpartplugin>
diff --git a/kate/plugins/wordcompletion/CMakeLists.txt b/kate/plugins/wordcompletion/CMakeLists.txt
index 007b93f20..c09dbda6d 100644
--- a/kate/plugins/wordcompletion/CMakeLists.txt
+++ b/kate/plugins/wordcompletion/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES ktexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_docwordcompletion )
+install( FILES tdetexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_docwordcompletion )
 
 
-##### ktexteditor_docwordcompletion #############
+##### tdetexteditor_docwordcompletion #############
 
-set( target ktexteditor_docwordcompletion )
+set( target tdetexteditor_docwordcompletion )
 
 set( ${target}_SRCS
   docwordcompletion.cpp
@@ -39,6 +39,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kate/plugins/wordcompletion/Makefile.am b/kate/plugins/wordcompletion/Makefile.am
index e79d02fb5..1fd67eaf7 100644
--- a/kate/plugins/wordcompletion/Makefile.am
+++ b/kate/plugins/wordcompletion/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES    = -I$(top_srcdir)/interfaces $(all_includes)
 METASOURCES = AUTO
 
 # Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_docwordcompletion.la
+kde_module_LTLIBRARIES = tdetexteditor_docwordcompletion.la
 
-ktexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
-ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
+tdetexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+tdetexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion
+docwordcompletiondatadir = $(kde_datadir)/tdetexteditor_docwordcompletion
 docwordcompletiondata_DATA = docwordcompletionui.rc
 
-kde_services_DATA = ktexteditor_docwordcompletion.desktop
+kde_services_DATA = tdetexteditor_docwordcompletion.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_docwordcompletion.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_docwordcompletion.pot
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 37da55224..26dce06d0 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -28,19 +28,19 @@
 //BEGIN includes
 #include "docwordcompletion.h"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/variableinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/variableinterface.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kaction.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
 #include <knotifyclient.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kiconloader.h>
 
 #include <tqregexp.h>
@@ -57,7 +57,7 @@
 //END
 
 //BEGIN DocWordCompletionPlugin
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "ktexteditor_docwordcompletion" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "tdetexteditor_docwordcompletion" ) )
 DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
                             const char* name,
                             const TQStringList& /*args*/ )
@@ -68,7 +68,7 @@ DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
 
 void DocWordCompletionPlugin::readConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "DocWordCompletion Plugin" );
   m_treshold = config->readNumEntry( "treshold", 3 );
   m_autopopup = config->readBoolEntry( "autopopup", true );
@@ -76,7 +76,7 @@ void DocWordCompletionPlugin::readConfig()
 
 void DocWordCompletionPlugin::writeConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("DocWordCompletion Plugin");
   config->writeEntry("autopopup", m_autopopup );
   config->writeEntry("treshold", m_treshold );
@@ -130,7 +130,7 @@ struct DocWordCompletionPluginViewPrivate
   TQString last;         // last word we were trying to match
   TQString lastIns;      // latest applied completion
   TQRegExp re;           // hrm
-  KToggleAction *autopopup; // for accessing state
+  TDEToggleAction *autopopup; // for accessing state
   uint treshold;        // the required length of a word before popping up the completion list automatically
   int directionalPos;   // be able to insert "" at the correct time
 };
@@ -145,15 +145,15 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au
   view->insertChildClient( this );
   setInstance( KGenericFactory<DocWordCompletionPlugin>::instance() );
 
-  (void) new KAction( i18n("Reuse Word Above"), CTRL+Key_8, this,
+  (void) new TDEAction( i18n("Reuse Word Above"), CTRL+Key_8, this,
     TQT_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" );
-  (void) new KAction( i18n("Reuse Word Below"), CTRL+Key_9, this,
+  (void) new TDEAction( i18n("Reuse Word Below"), CTRL+Key_9, this,
     TQT_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" );
-  (void) new KAction( i18n("Pop Up Completion List"), 0, this,
+  (void) new TDEAction( i18n("Pop Up Completion List"), 0, this,
     TQT_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" );
-  (void) new KAction( i18n("Shell Completion"), 0, this,
+  (void) new TDEAction( i18n("Shell Completion"), 0, this,
     TQT_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" );
-  d->autopopup = new KToggleAction( i18n("Automatic Completion Popup"), 0, this,
+  d->autopopup = new TDEToggleAction( i18n("Automatic Completion Popup"), 0, this,
     TQT_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" );
 
   d->autopopup->setChecked( autopopup );
diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h
index ed632631a..22b469695 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.h
+++ b/kate/plugins/wordcompletion/docwordcompletion.h
@@ -29,10 +29,10 @@
 #ifndef _DocWordCompletionPlugin_h_
 #define _DocWordCompletionPlugin_h_
 
-#include <ktexteditor/plugin.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/configinterfaceextension.h>
+#include <tdetexteditor/plugin.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/configinterfaceextension.h>
 #include <kxmlguiclient.h>
 
 #include <tqevent.h>
diff --git a/kate/plugins/wordcompletion/docwordcompletionui.rc b/kate/plugins/wordcompletion/docwordcompletionui.rc
index f8095e128..fb1c3f7a5 100644
--- a/kate/plugins/wordcompletion/docwordcompletionui.rc
+++ b/kate/plugins/wordcompletion/docwordcompletionui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartplugin name="ktexteditor_docwordcompletion" library="ktexteditor_docwordcompletion" version="4">
+<kpartplugin name="tdetexteditor_docwordcompletion" library="tdetexteditor_docwordcompletion" version="4">
 <MenuBar>
  <Menu name="tools"><Text>&amp;Tools</Text>
     <separator group="tools_operations" />
diff --git a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
index d0528d90f..b18e1bf84 100644
--- a/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+++ b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
@@ -132,7 +132,7 @@ Comment[uk]=Завершенн� �лів у документі. Пр�ме аб
 Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chi�u hoặc vào bộ bật lên.
 Comment[zh_CN]=在文档中基于方�或弹出补全��
 Comment[zh_TW]=在編輯文件時的單字補完功能
-X-TDE-Library=ktexteditor_docwordcompletion
+X-TDE-Library=tdetexteditor_docwordcompletion
 ServiceTypes=KTextEditor/Plugin
 Type=Service
 InitialPreference=8
diff --git a/kcert/Makefile.am b/kcert/Makefile.am
deleted file mode 100644
index e5885a494..000000000
--- a/kcert/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
-
-kde_module_LTLIBRARIES = libkcertpart.la
-
-libkcertpart_la_SOURCES	= kcertpart.cc
-
-libkcertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libkcertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_TDECORE)
-libkcertpart_la_DEPENDENCIES = $(LIB_KPARTS)
-
-libkcertpart_la_METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = kcertpart.desktop
-
-rcdir = $(kde_datadir)/kcertpart
-rc_DATA = kcertpart.rc
-
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 903126ca8..ee693fb4a 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -51,16 +51,16 @@ set( ${target}_SRCS
 # modules need this library
 tde_add_tdeinit_executable( ${target} AUTOMOC EXPORT
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
 
 
-#### kbuildsycoca ###############################
+#### tdebuildsycoca ###############################
 
-set( target kbuildsycoca )
+set( target tdebuildsycoca )
 
 set( ${target}_SRCS
-  kbuildsycoca.cpp kbuildservicetypefactory.cpp
+  tdebuildsycoca.cpp kbuildservicetypefactory.cpp
   kbuildservicefactory.cpp kbuildservicegroupfactory.cpp
   kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp
   kctimefactory.cpp vfolder_menu.cpp
@@ -68,7 +68,7 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
 
 
@@ -87,31 +87,31 @@ tde_add_executable( ${target}
 )
 
 
-#### kde-menu ###################################
+#### tde-menu ###################################
 
-set( target kde-menu )
+set( target tde-menu )
 
 set( ${target}_SRCS
-  kde-menu.cpp
+  tde-menu.cpp
 )
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-#### kmimelist ##################################
+#### tdemimelist ##################################
 
-set( target kmimelist )
+set( target tdemimelist )
 
 set( ${target}_SRCS
-  kmimelist.cpp
+  tdemimelist.cpp
 )
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kded/DESIGN b/kded/DESIGN
index 702fca853..0fffb0456 100644
--- a/kded/DESIGN
+++ b/kded/DESIGN
@@ -6,15 +6,15 @@ cache of servicetypes, mimetypes and services, for a particular user.
 
 It uses KDirWatch to monitor the directories contain the .desktop files.
 When a file is added/removed, it waits 5 seconds (in case of series of
-updates), and then launches kbuildsycoca.
+updates), and then launches tdebuildsycoca.
 
-kbuildsycoca recreates the sycoca file by:
+tdebuildsycoca recreates the sycoca file by:
 * parsing all .desktop files, replacing global ones by local ones (at any
   level of the hierarchy)
 * creating all objects in memory
-* saving everything in the sycoca file (see below for ksycoca internals)
+* saving everything in the sycoca file (see below for tdesycoca internals)
 * clearing all memory
-* notifying the applications that use ksycoca by a DCOP call to the ksycoca
+* notifying the applications that use tdesycoca by a DCOP call to the tdesycoca
 object (KSycoca::notifyDatabaseChanged()).
 
 Format of the sycoca database file
diff --git a/kded/Makefile.am b/kded/Makefile.am
index ba49c2c8f..093b5db0e 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -20,15 +20,15 @@
 INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
 
 lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
+tdeinit_LTLIBRARIES = kded.la tdebuildsycoca.la
 
 kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 kded_la_SOURCES = kded.cpp kdedmodule.cpp
 
-kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
-kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
+tdebuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdebuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdebuildsycoca_la_SOURCES = tdebuildsycoca.cpp kbuildservicetypefactory.cpp \
 				kbuildservicefactory.cpp \
 				kbuildservicegroupfactory.cpp \
 				kbuildimageiofactory.cpp \
@@ -36,25 +36,25 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 				kctimefactory.cpp \
 				vfolder_menu.cpp
 
-bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist
+bin_PROGRAMS = kdontchangethehostname tde-menu tdemimelist
 
-kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdontchangethehostname_LDADD = $(LIB_TDECORE)
 kdontchangethehostname_SOURCES = khostname.cpp
 
-kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kmimelist_LDADD = ../kio/libkio.la
-kmimelist_SOURCES = kmimelist.cpp
+tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdemimelist_LDADD = ../tdeio/libtdeio.la
+tdemimelist_SOURCES = tdemimelist.cpp
 
-kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kde_menu_LDADD = $(LIB_KIO)
-kde_menu_SOURCES = kde-menu.cpp
+kde_menu_SOURCES = tde-menu.cpp
 
 METASOURCES = AUTO
 
 include_HEADERS = kdedmodule.h
 
-noinst_HEADERS = kbuildsycoca.h kbuildservicetypefactory.h \
+noinst_HEADERS = tdebuildsycoca.h kbuildservicetypefactory.h \
 		kbuildservicefactory.h kbuildservicegroupfactory.h \
 		kbuildimageiofactory.h kresourcelist.h \
 		kbuildprotocolinfofactory.h
@@ -65,7 +65,7 @@ servicetypedir = $(kde_servicetypesdir)
 xdg_menu_DATA = applications.menu applications.menu-no-kde
 
 update_DATA = kded.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 include $(top_srcdir)/admin/Doxyfile.am
 
diff --git a/kded/README.kded b/kded/README.kded
index f0ff64d41..7265a1084 100644
--- a/kded/README.kded
+++ b/kded/README.kded
@@ -6,20 +6,20 @@ Some of these tasks are built in, others are started on demand.
 
 Built in tasks
 ==============
-*) Checking for newly installed software and updating ksycoca when new
-software is detected. Updating of ksycoca is done by the program kbuildsycoca
+*) Checking for newly installed software and updating tdesycoca when new
+software is detected. Updating of tdesycoca is done by the program tdebuildsycoca
 which gets started by kded. When kded is first started it always runs
-kbuildsycoca to ensure that ksycoca is up to date.
+tdebuildsycoca to ensure that tdesycoca is up to date.
 
 *) Checking for newly installed update files. Applications can install
 *.upd update files. These *.upd files are used to update configuration files 
 of users, primarily when new versions of applications are installed with
 (slightly) different configuration file formats. Updating of configuration
-files is done by kconf_update. kded starts kconf_update when it detects a 
-new update file. When kded is first started it always runs kconf_update to
-ensure that it has not missed any update files. kconf_update keeps track
+files is done by tdeconf_update. kded starts tdeconf_update when it detects a 
+new update file. When kded is first started it always runs tdeconf_update to
+ensure that it has not missed any update files. tdeconf_update keeps track
 of which update files have been processed already in the config-file
-kconf_updaterc. It only performs a certain update once.
+tdeconf_updaterc. It only performs a certain update once.
 
 *) Checking for hostname changes. It is a really bad idea to change the 
 hostname of a running system and it usually only happens with incorrectly
@@ -40,14 +40,14 @@ the hostname is checked for changes. The time is specified in milliseconds
 and has a default of 5000 (5 seconds).
 
 CheckSycoca: This option can be used to disable checking for new software.
-ksycoca will still be built when kded starts up and when applications
-explicitly request a rebuild of the ksycoca database. The user can 
-also manually rebuild ksycoca by running the kbuildsycoca program.
+tdesycoca will still be built when kded starts up and when applications
+explicitly request a rebuild of the tdesycoca database. The user can 
+also manually rebuild tdesycoca by running the tdebuildsycoca program.
 The default value of this option is "true". Checking can be disabled by 
 setting this option to "false".
 
 CheckUpdates: This option can be used to disable checking for update files.
-kconf_update will still be run when kded starts up.
+tdeconf_update will still be run when kded starts up.
 The default value of this option is "true". Checking can be disabled by 
 setting this option to "false".
 
diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp
index a0a3ce76e..b5873cad8 100644
--- a/kded/kbuildimageiofactory.cpp
+++ b/kded/kbuildimageiofactory.cpp
@@ -16,14 +16,14 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 #include <kimageiofactory.h>
diff --git a/kded/kbuildimageiofactory.h b/kded/kbuildimageiofactory.h
index 65197e17f..4a1caa81f 100644
--- a/kded/kbuildimageiofactory.h
+++ b/kded/kbuildimageiofactory.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 /**
- * Service group factory for building ksycoca
+ * Service group factory for building tdesycoca
  * @internal
  */
 class KBuildImageIOFactory : public KImageIOFactory
diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp
index c17b1e772..921e55ab9 100644
--- a/kded/kbuildprotocolinfofactory.cpp
+++ b/kded/kbuildprotocolinfofactory.cpp
@@ -17,15 +17,15 @@
  **/
 
 #include "kbuildprotocolinfofactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 KBuildProtocolInfoFactory::KBuildProtocolInfoFactory() :
diff --git a/kded/kbuildprotocolinfofactory.h b/kded/kbuildprotocolinfofactory.h
index e4ddcf6b8..4230670f4 100644
--- a/kded/kbuildprotocolinfofactory.h
+++ b/kded/kbuildprotocolinfofactory.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 /**
- * Protocol Info factory for building ksycoca
+ * Protocol Info factory for building tdesycoca
  * @internal
  */
 class KBuildProtocolInfoFactory : public KProtocolInfoFactory
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 8cc2e9462..6f127caf2 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -18,15 +18,15 @@
  **/
 
 #include "kbuildservicefactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 #include "kmimetype.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <assert.h>
 
diff --git a/kded/kbuildservicefactory.h b/kded/kbuildservicefactory.h
index eca439c5d..e0497bb9e 100644
--- a/kded/kbuildservicefactory.h
+++ b/kded/kbuildservicefactory.h
@@ -29,7 +29,7 @@
 #include <kbuildservicegroupfactory.h>
 
 /**
- * Service factory for building ksycoca
+ * Service factory for building tdesycoca
  * @internal
  */
 class KBuildServiceFactory : public KServiceFactory
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index e231cd5da..3903a6b39 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -17,15 +17,15 @@
  **/
 
 #include "kbuildservicegroupfactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 KBuildServiceGroupFactory::KBuildServiceGroupFactory() :
diff --git a/kded/kbuildservicegroupfactory.h b/kded/kbuildservicegroupfactory.h
index 23666fd0f..23b484cdb 100644
--- a/kded/kbuildservicegroupfactory.h
+++ b/kded/kbuildservicegroupfactory.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 /**
- * Service group factory for building ksycoca
+ * Service group factory for building tdesycoca
  * @internal
  */
 class KBuildServiceGroupFactory : public KServiceGroupFactory
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index c017a91e1..da2863347 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -17,15 +17,15 @@
  **/
 
 #include "kbuildservicetypefactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <kdesktopfile.h>
 
diff --git a/kded/kbuildservicetypefactory.h b/kded/kbuildservicetypefactory.h
index a68b8851b..68fb6c8fb 100644
--- a/kded/kbuildservicetypefactory.h
+++ b/kded/kbuildservicetypefactory.h
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 
 /**
- * Service-type factory for building ksycoca
+ * Service-type factory for building tdesycoca
  * @internal
  */
 class KBuildServiceTypeFactory : public KServiceTypeFactory
diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp
index 966966a48..f6fd68859 100644
--- a/kded/kctimefactory.cpp
+++ b/kded/kctimefactory.cpp
@@ -17,8 +17,8 @@
  **/
 
 #include "kctimefactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
 
 #include <assert.h>
 
diff --git a/kded/kctimefactory.h b/kded/kctimefactory.h
index 64cfe6c19..d415545b1 100644
--- a/kded/kctimefactory.h
+++ b/kded/kctimefactory.h
@@ -19,11 +19,11 @@
 #ifndef __k_ctime_factory_h__
 #define __k_ctime_factory_h__
 
-#include <ksycocafactory.h>
+#include <tdesycocafactory.h>
 #include <tqdict.h>
 
 /**
- * Service group factory for building ksycoca
+ * Service group factory for building tdesycoca
  * @internal
  */
 class KCTimeInfo : public KSycocaFactory
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 4b891d48a..947d3b816 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -36,16 +36,16 @@
 #include <dcopclient.h>
 
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
 #include <kdatastream.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kservicetype.h>
 
 #ifdef Q_WS_X11
@@ -72,20 +72,20 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
    {
       TQByteArray data;
       TQDataStream dataStream( data, IO_WriteOnly );
-      dataStream << TQString("kbuildsycoca") << args;
-      TQCString _launcher = KApplication::launcher();
+      dataStream << TQString("tdebuildsycoca") << args;
+      TQCString _launcher = TDEApplication::launcher();
 
       kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
    }
    else
    {
-      KApplication::tdeinitExecWait( "kbuildsycoca", args );
+      TDEApplication::tdeinitExecWait( "tdebuildsycoca", args );
    }
 }
 
 static void runKonfUpdate()
 {
-   KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
+   TDEApplication::tdeinitExecWait( "tdeconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
 }
 
 static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName)
@@ -93,22 +93,22 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new
    TQStringList args;
    args.append(TQFile::decodeName(oldName));
    args.append(TQFile::decodeName(newName));
-   KApplication::tdeinitExecWait( "kdontchangethehostname", args );
+   TDEApplication::tdeinitExecWait( "kdontchangethehostname", args );
 }
 
 Kded::Kded(bool checkUpdates, bool new_startup)
-  : DCOPObject("kbuildsycoca"), DCOPObjectProxy(),
+  : DCOPObject("tdebuildsycoca"), DCOPObjectProxy(),
     b_checkUpdates(checkUpdates),
     m_needDelayedCheck(false),
     m_newStartup( new_startup )
 {
   _self = this;
   TQCString cPath;
-  TQCString ksycoca_env = getenv("TDESYCOCA");
-  if (ksycoca_env.isEmpty())
-     cPath = TQFile::encodeName(KGlobal::dirs()->saveLocation("tmp")+"ksycoca");
+  TQCString tdesycoca_env = getenv("TDESYCOCA");
+  if (tdesycoca_env.isEmpty())
+     cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca");
   else
-     cPath = ksycoca_env;
+     cPath = tdesycoca_env;
   m_pTimer = new TQTimer(this);
   connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate()));
 
@@ -139,7 +139,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
                    const TQByteArray &data,
                    TQCString &replyType, TQByteArray &replyData)
 {
-  if (obj == "ksycoca") return false; // Ignore this one.
+  if (obj == "tdesycoca") return false; // Ignore this one.
 
   if (m_dontLoad[obj])
      return false;
@@ -155,7 +155,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
 void Kded::initModules()
 {
      m_dontLoad.clear();
-     KConfig *config = kapp->config();
+     TDEConfig *config = kapp->config();
      bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
     // not the same user like the one running the session (most likely we're run via sudo or something)
     if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
@@ -225,7 +225,7 @@ void Kded::initModules()
 void Kded::loadSecondPhase()
 {
      kdDebug(7020) << "Loading second phase autoload" << endl;
-     KConfig *config = kapp->config();
+     TDEConfig *config = kapp->config();
      KService::List kdedModules = KServiceType::offers("KDEDModule");
      for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
      {
@@ -450,7 +450,7 @@ tqWarning("Last DCOP call before KDED crash was from application '%s'\n"
 
 void Kded::installCrashHandler()
 {
-   KCrash::setEmergencySaveFunction(crashHandler);
+   TDECrash::setEmergencySaveFunction(crashHandler);
 }
 
 void Kded::recreate()
@@ -468,7 +468,7 @@ void Kded::runDelayedCheck()
 void Kded::recreate(bool initial)
 {
    m_recreateBusy = true;
-   // Using KLauncher here is difficult since we might not have a
+   // Using TDELauncher here is difficult since we might not have a
    // database
 
    if (!initial)
@@ -484,7 +484,7 @@ void Kded::recreate(bool initial)
       recreateDone();
       if(delayedCheck)
       {
-         // do a proper ksycoca check after a delay
+         // do a proper tdesycoca check after a delay
          TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck()));
          m_needDelayedCheck = true;
          delayedCheck = false;
@@ -665,7 +665,7 @@ KUpdateD::KUpdateD()
     TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)),
            this, TQT_SLOT(slotNewUpdateFile()));
 
-    TQStringList dirs = KGlobal::dirs()->findDirs("data", "kconf_update");
+    TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update");
     for( TQStringList::ConstIterator it = dirs.begin();
          it != dirs.end();
          ++it )
@@ -730,11 +730,11 @@ void KHostnameD::checkHostname()
 }
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "check", I18N_NOOP("Check Sycoca database only once"), 0 },
   { "new-startup", "Internal", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 class KDEDQtDCOPObject : public DCOPObject
@@ -872,26 +872,26 @@ public:
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-     KAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
+     TDEAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
         "$Id$",
         I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed"));
 
-     KApplication::installSigpipeHandler();
+     TDEApplication::installSigpipeHandler();
 
-     KCmdLineArgs::init(argc, argv, &aboutData);
+     TDECmdLineArgs::init(argc, argv, &aboutData);
 
      KUniqueApplication::addCmdLineOptions();
 
-     KCmdLineArgs::addCmdLineOptions( options );
+     TDECmdLineArgs::addCmdLineOptions( options );
 
      // this program is in tdelibs so it uses tdelibs as catalog
-     KLocale::setMainCatalogue("tdelibs");
+     TDELocale::setMainCatalogue("tdelibs");
 
      // WABA: Make sure not to enable session management.
      putenv(strdup("SESSION_MANAGER="));
 
      // Parse command line before checking DCOP
-     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
      // Check DCOP communication.
      {
@@ -904,8 +904,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
         }
      }
 
-     KInstance *instance = new KInstance(&aboutData);
-     KConfig *config = instance->config(); // Enable translations.
+     TDEInstance *instance = new TDEInstance(&aboutData);
+     TDEConfig *config = instance->config(); // Enable translations.
 
      if (args->isSet("check"))
      {
@@ -957,11 +957,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      // During startup kdesktop waits for KDED to finish.
      // Send a notifyDatabaseChanged signal even if the database hasn't
      // changed.
-     // If the database changed, kbuildsycoca's signal didn't go anywhere
+     // If the database changed, tdebuildsycoca's signal didn't go anywhere
      // anyway, because it was too early, so let's send this signal
      // unconditionnally (David)
      TQByteArray data;
-     client->send( "*", "ksycoca", "notifyDatabaseChanged()", data );
+     client->send( "*", "tdesycoca", "notifyDatabaseChanged()", data );
      client->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kded"));
 #ifdef Q_WS_X11
      XEvent e;
diff --git a/kded/kded.h b/kded/kded.h
index b30549083..a4968624a 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -29,15 +29,15 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 
-#include <ksycoca.h>
-#include <ksycocatype.h>
+#include <tdesycoca.h>
+#include <tdesycocatype.h>
 #include <kdedmodule.h>
 #include <klibloader.h>
 
 class KDirWatch;
 class KService;
 
-// No need for this in libkio - apps only get readonly access
+// No need for this in libtdeio - apps only get readonly access
 class Kded : public TQObject, public DCOPObject, public DCOPObjectProxy
 {
   Q_OBJECT
diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp
index ca28a5c62..61da755b3 100644
--- a/kded/kdedmodule.cpp
+++ b/kded/kdedmodule.cpp
@@ -24,9 +24,9 @@
 
 #include "kded.h"
 #include "kdedmodule.h"
-#include "kconfigdata.h"
+#include "tdeconfigdata.h"
 
-typedef TQMap<KEntryKey, KSharedPtr<KShared> > KDEDObjectMap;
+typedef TQMap<KEntryKey, TDESharedPtr<TDEShared> > KDEDObjectMap;
 
 class KDEDModulePrivate
 {
@@ -62,7 +62,7 @@ void KDEDModule::resetIdle()
       d->timer.start(d->timeout, true);
 }
 
-void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj)
+void KDEDModule::insert(const TQCString &app, const TQCString &key, TDEShared *obj)
 {
    if (!d->objMap)
       d->objMap = new KDEDObjectMap;
@@ -74,13 +74,13 @@ void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj
    KEntryKey indexKey(app, key);
 
    // Prevent deletion in case the same object is inserted again.
-   KSharedPtr<KShared> _obj = obj; 
+   TDESharedPtr<TDEShared> _obj = obj; 
 
    d->objMap->replace(indexKey, _obj);
    resetIdle();
 }
 
-KShared * KDEDModule::find(const TQCString &app, const TQCString &key)
+TDEShared * KDEDModule::find(const TQCString &app, const TQCString &key)
 {
    if (!d->objMap)
       return 0;
diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h
index 855a02824..f3954e842 100644
--- a/kded/kdedmodule.h
+++ b/kded/kdedmodule.h
@@ -91,12 +91,12 @@ public:
    * Any previous object inserted with the same values for @p app 
    * and @p key will be removed.
    */
-  void insert(const TQCString &app, const TQCString &key, KShared *obj);
+  void insert(const TQCString &app, const TQCString &key, TDEShared *obj);
 
   /**
    * Lookup object indexed with @p app and @p key
    */
-  KShared *find(const TQCString &app, const TQCString &key);
+  TDEShared *find(const TQCString &app, const TQCString &key);
   
   /**
    * remove object indexed with @p app and @p key.
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index d8c568869..c78152b97 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -28,19 +28,19 @@
 
 #include <dcopclient.h>
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
-#include <klocale.h>
-#include <kaboutdata.h>
-#include <kglobal.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdeaboutdata.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <kde_file.h>
 
-static KCmdLineOptions options[] = {
+static TDECmdLineOptions options[] = {
    { "+old", I18N_NOOP("Old hostname"), 0 },
    { "+new", I18N_NOOP("New hostname"), 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 static const char appName[] = "kdontchangethehostname";
@@ -65,7 +65,7 @@ protected:
 
 KHostName::KHostName()
 {
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    if (args->count() != 2)
       args->usage();
    oldName = args->arg(0);
@@ -166,15 +166,15 @@ void KHostName::changeX()
       // don't nuke the xauth when XAUTHLOCALHOSTNAME points to it
       if (!xauthlocalhostname || oldNetId != xauthlocalhostname)
       {
-        cmd = "xauth -n remove "+KProcess::quote(netId);
+        cmd = "xauth -n remove "+TDEProcess::quote(netId);
         system(TQFile::encodeName(cmd));
       }
       cmd = "xauth -n add ";
-      cmd += KProcess::quote(newNetId);
+      cmd += TDEProcess::quote(newNetId);
       cmd += " ";
-      cmd += KProcess::quote(authName);
+      cmd += TDEProcess::quote(authName);
       cmd += " ";
-      cmd += KProcess::quote(authKey);
+      cmd += TDEProcess::quote(authKey);
       system(TQFile::encodeName(cmd));
    }
 }
@@ -236,7 +236,7 @@ void KHostName::changeDcop()
       ::symlink(fname.data(), compatLink.data()); // Compatibility link
 
       // Update .ICEauthority
-      TQString cmd = "iceauth list "+KProcess::quote("netid="+oldNetId);
+      TQString cmd = "iceauth list "+TDEProcess::quote("netid="+oldNetId);
       FILE *iceFile = popen(TQFile::encodeName(cmd), "r");
       if (!iceFile)
       {
@@ -272,13 +272,13 @@ void KHostName::changeDcop()
             continue;
 
          cmd = "iceauth add ";
-         cmd += KProcess::quote(protName);
+         cmd += TDEProcess::quote(protName);
          cmd += " '' ";
-         cmd += KProcess::quote(newNetId);
+         cmd += TDEProcess::quote(newNetId);
          cmd += " ";
-         cmd += KProcess::quote(authName);
+         cmd += TDEProcess::quote(authName);
          cmd += " ";
-         cmd += KProcess::quote(authKey);
+         cmd += TDEProcess::quote(authKey);
          system(TQFile::encodeName(cmd));
       }
    }
@@ -288,7 +288,7 @@ void KHostName::changeDcop()
    char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME");
    if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname))
    {
-      TQString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId);
+      TQString cmd = "iceauth remove "+TDEProcess::quote("netid="+oldNetId);
       system(TQFile::encodeName(cmd));
       unlink(origFName.data());
       origFName = DCOPClient::dcopServerFileOld(oldName); // Compatibility link
@@ -299,8 +299,8 @@ void KHostName::changeDcop()
 void KHostName::changeStdDirs(const TQCString &type)
 {
    // We make links to the old dirs cause we can't delete the old dirs.
-   TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data()));
-   TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data()));
+   TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data()));
+   TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data()));
 
    KDE_struct_stat st_buf;
 
@@ -358,23 +358,23 @@ void KHostName::changeSessionManager()
       delete client;
       return;
    }
-   TQCString launcher = KApplication::launcher();
+   TQCString launcher = TDEApplication::launcher();
    client->send(launcher, launcher, "setLaunchEnv(TQCString,TQCString)", params);
    delete client;
 }
 
 int main(int argc, char **argv)
 {
-   KLocale::setMainCatalogue("tdelibs");
-   KAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
+   TDELocale::setMainCatalogue("tdelibs");
+   TDEAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
                 I18N_NOOP("Informs TDE about a change in hostname"),
-                KAboutData::License_GPL, "(c) 2001 Waldo Bastian");
+                TDEAboutData::License_GPL, "(c) 2001 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
 
-   KInstance k(&d);
+   TDEInstance k(&d);
 
    KHostName hn;
 
diff --git a/kded/kde-menu.cpp b/kded/tde-menu.cpp
index 0362e10e9..4cf7a843e 100644
--- a/kded/kde-menu.cpp
+++ b/kded/tde-menu.cpp
@@ -23,26 +23,26 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 
-#include "kaboutdata.h"
-#include "kapplication.h"
-#include "kcmdlineargs.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeaboutdata.h"
+#include "tdeapplication.h"
+#include "tdecmdlineargs.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 #include "kservice.h"
 #include "kservicegroup.h"
 #include "kstandarddirs.h"
 
-static KCmdLineOptions options[] = {
+static TDECmdLineOptions options[] = {
    { "utf8", I18N_NOOP("Output data in UTF-8 instead of local encoding"), 0 },
    { "print-menu-id", I18N_NOOP("Print menu-id of the menu that contains\nthe application"), 0 },
    { "print-menu-name", I18N_NOOP("Print menu name (caption) of the menu that\ncontains the application"), 0 },
    { "highlight", I18N_NOOP("Highlight the entry in the menu"), 0 },
    { "nocache-update", I18N_NOOP("Do not check if sycoca database is up to date"), 0 },
    { "+<application-id>", I18N_NOOP("The id of the menu entry to locate"), 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
-static const char appName[] = "kde-menu";
+static const char appName[] = "tde-menu";
 static const char appVersion[] = "1.0";
 static bool utf8;
 
@@ -60,7 +60,7 @@ static void result(const TQString &txt)
 
 static void error(int exitCode, const TQString &txt)
 {
-   tqWarning("kde-menu: %s", txt.local8Bit().data());
+   tqWarning("tde-menu: %s", txt.local8Bit().data());
    exit(exitCode);
 }
 
@@ -107,30 +107,30 @@ static void findMenuEntry(KServiceGroup::Ptr parent, const TQString &name, const
 
 int main(int argc, char **argv)
 {
-   KLocale::setMainCatalogue("tdelibs");
+   TDELocale::setMainCatalogue("tdelibs");
    const char *description = I18N_NOOP("TDE Menu query tool.\n"
    "This tool can be used to find in which menu a specific application is shown.\n"
    "The --highlight option can be used to visually indicate to the user where\n"
    "in the TDE menu a specific application is located.");
    
-   KAboutData d(appName, I18N_NOOP("kde-menu"), appVersion,
+   TDEAboutData d(appName, I18N_NOOP("tde-menu"), appVersion,
                 description,
-                KAboutData::License_GPL, "(c) 2003 Waldo Bastian");
+                TDEAboutData::License_GPL, "(c) 2003 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
 
-//   KApplication k(false, false);
-   KApplication k(false);
+//   TDEApplication k(false, false);
+   TDEApplication k(false);
    k.disableSessionManagement();
 
    // this program is in tdelibs so it uses tdelibs as catalog
-   KLocale::setMainCatalogue("tdelibs");
+   TDELocale::setMainCatalogue("tdelibs");
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    if (args->count() != 1)
-      KCmdLineArgs::usage(i18n("You must specify an application-id such as 'tde-konsole.desktop'"));
+      TDECmdLineArgs::usage(i18n("You must specify an application-id such as 'tde-konsole.desktop'"));
 
    utf8 = args->isSet("utf8");
 
@@ -139,19 +139,19 @@ int main(int argc, char **argv)
    bHighlight = args->isSet("highlight");
 
    if (!bPrintMenuId && !bPrintMenuName && !bHighlight)
-      KCmdLineArgs::usage(i18n("You must specify at least one of --print-menu-id, --print-menu-name or --highlight"));
+      TDECmdLineArgs::usage(i18n("You must specify at least one of --print-menu-id, --print-menu-name or --highlight"));
 
    if (args->isSet("cache-update"))
    {
       TQStringList args;
       args.append("--incremental");
       args.append("--checkstamps");
-      TQString command = "kbuildsycoca";
-      TQCString _launcher = KApplication::launcher();
+      TQString command = "tdebuildsycoca";
+      TQCString _launcher = TDEApplication::launcher();
       if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid())
       {
-         tqWarning("Can't talk to klauncher!");
-         command = KGlobal::dirs()->findExe(command);
+         tqWarning("Can't talk to tdelauncher!");
+         command = TDEGlobal::dirs()->findExe(command);
          command += " " + args.join(" ");
          system(command.local8Bit());
       }
diff --git a/kded/kbuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index f111b3762..4325162f7 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -21,7 +21,7 @@
 #include <tqeventloop.h>
 #include <config.h>
 
-#include "kbuildsycoca.h"
+#include "tdebuildsycoca.h"
 #include "kresourcelist.h"
 #include "vfolder_menu.h"
 
@@ -40,22 +40,22 @@
 #include <tqtimer.h>
 
 #include <assert.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
-#include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kcrash.h>
 
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
-                        // GUI version of kbuildsycoca, so-called "kbuildsycocaw".
+                        // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
 # include <tqlabel.h>
-# include <kmessagebox.h>
+# include <tdemessagebox.h>
   bool silent;
   bool showprogress;
 #endif
@@ -104,15 +104,15 @@ static TQString sycocaPath()
 
   if (bGlobalDatabase)
   {
-     path = KGlobal::dirs()->saveLocation("services")+"ksycoca";
+     path = TDEGlobal::dirs()->saveLocation("services")+"tdesycoca";
   }
   else
   {
-     TQCString ksycoca_env = getenv("TDESYCOCA");
-     if (ksycoca_env.isEmpty())
-        path = KGlobal::dirs()->saveLocation("cache")+"ksycoca";
+     TQCString tdesycoca_env = getenv("TDESYCOCA");
+     if (tdesycoca_env.isEmpty())
+        path = TDEGlobal::dirs()->saveLocation("cache")+"tdesycoca";
      else
-        path = TQFile::decodeName(ksycoca_env);
+        path = TQFile::decodeName(tdesycoca_env);
   }
 
   return path;
@@ -120,9 +120,9 @@ static TQString sycocaPath()
 
 static TQString oldSycocaPath()
 {
-  TQCString ksycoca_env = getenv("TDESYCOCA");
-  if (ksycoca_env.isEmpty())
-     return KGlobal::dirs()->saveLocation("tmp")+"ksycoca";
+  TQCString tdesycoca_env = getenv("TDESYCOCA");
+  if (tdesycoca_env.isEmpty())
+     return TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca";
 
   return TQString::null;
 }
@@ -189,7 +189,7 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory)
    TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file);
    if (!timeStamp)
    {
-      timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, file, true);
+      timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, file, true);
    }
    KSycocaEntry* entry = 0;
    if (g_allEntries)
@@ -317,7 +317,7 @@ bool KBuildSycoca::build()
 
      TQStringList relFiles;
 
-     (void) KGlobal::dirs()->findAllResources( g_resource,
+     (void) TDEGlobal::dirs()->findAllResources( g_resource,
                                                TQString::null,
                                                true, // Recursive!
                                                true, // uniq
@@ -417,7 +417,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
      TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile);
      if (!timeStamp)
      {
-        timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true);
+        timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true);
      }
 
      KServiceGroup* entry = 0;
@@ -463,7 +463,7 @@ bool KBuildSycoca::recreate()
 {
   TQString path(sycocaPath());
 #ifdef Q_WS_WIN
-  printf("kbuildsycoca: path='%s'\n", (const char*)path);
+  printf("tdebuildsycoca: path='%s'\n", (const char*)path);
 #endif
 
   // KSaveFile first writes to a temp file.
@@ -476,9 +476,9 @@ bool KBuildSycoca::recreate()
   }
   if (database->status() != 0)
   {
-    fprintf(stderr, "[kbuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status()));
+    fprintf(stderr, "[tdebuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status()));
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
-                        // GUI version of kbuildsycoca, so-called "kbuildsycocaw".
+                        // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
     if (!silent)
       KMessageBox::error(0, i18n("Error creating database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca"));
 #endif
@@ -487,7 +487,7 @@ bool KBuildSycoca::recreate()
 
   m_str = database->dataStream();
 
-  kdDebug(7021) << "Recreating ksycoca file (" << path << ", version " << KSycoca::version() << ")" << endl;
+  kdDebug(7021) << "Recreating tdesycoca file (" << path << ", version " << KSycoca::version() << ")" << endl;
 
   // It is very important to build the servicetype one first
   // Both are registered in KSycoca, no need to keep the pointers
@@ -505,11 +505,11 @@ bool KBuildSycoca::recreate()
     m_str = 0L;
     if (!database->close())
     {
-      fprintf(stderr, "[kbuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data());
-      fprintf(stderr, "[kbuildsycoca] Disk full?\n");
+      fprintf(stderr, "[tdebuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data());
+      fprintf(stderr, "[tdebuildsycoca] Disk full?\n");
 #ifdef KBUILDSYCOCA_GUI
       if (!silent)
-        KMessageBox::error(0, i18n("[kbuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca"));
+        KMessageBox::error(0, i18n("[tdebuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca"));
 #endif
       return false;
     }
@@ -527,9 +527,9 @@ bool KBuildSycoca::recreate()
   {
     // update the timestamp file
     TQString stamppath = path + "stamp";
-    TQFile ksycocastamp(stamppath);
-    ksycocastamp.open( IO_WriteOnly );
-    TQDataStream str( &ksycocastamp );
+    TQFile tdesycocastamp(stamppath);
+    tdesycocastamp.open( IO_WriteOnly );
+    TQDataStream str( &tdesycocastamp );
     str << newTimestamp;
     str << existingResourceDirs();
     if (g_vfolder)
@@ -563,10 +563,10 @@ void KBuildSycoca::save()
    }
    (*m_str) << (TQ_INT32) 0; // No more factories.
    // Write TDEDIRS
-   (*m_str) << KGlobal::dirs()->kfsstnd_prefixes();
+   (*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes();
    (*m_str) << newTimestamp;
-   (*m_str) << KGlobal::locale()->language();
-   (*m_str) << KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
+   (*m_str) << TDEGlobal::locale()->language();
+   (*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_tdesycoca", true);
    (*m_str) << (*g_allResourceDirs);
 
    // Write factory data....
@@ -636,10 +636,10 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime
    return true;
 }
 
-// check times of last modification of all files on which ksycoca depens,
+// check times of last modification of all files on which tdesycoca depens,
 // and also their directories
-// if all of them all older than the timestamp in file ksycocastamp, this
-// means that there's no need to rebuild ksycoca
+// if all of them all older than the timestamp in file tdesycocastamp, this
+// means that there's no need to rebuild tdesycoca
 bool KBuildSycoca::checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs )
 {
    kdDebug( 7021 ) << "checking file timestamps" << endl;
@@ -663,7 +663,7 @@ TQStringList KBuildSycoca::existingResourceDirs()
        return *dirs;
    dirs = new TQStringList;
    g_allResourceDirs = new TQStringList;
-   // these are all resources cached by ksycoca
+   // these are all resources cached by tdesycoca
    TQStringList resources;
    resources += KBuildServiceTypeFactory::resourceTypes();
    resources += KBuildServiceGroupFactory::resourceTypes();
@@ -673,7 +673,7 @@ TQStringList KBuildSycoca::existingResourceDirs()
    while( !resources.empty())
    {
       TQString res = resources.front();
-      *dirs += KGlobal::dirs()->resourceDirs( res.latin1());
+      *dirs += TDEGlobal::dirs()->resourceDirs( res.latin1());
       resources.remove( res ); // remove this 'res' and all its duplicates
    }
 
@@ -691,7 +691,7 @@ TQStringList KBuildSycoca::existingResourceDirs()
    return *dirs;
 }
 
-static KCmdLineOptions options[] = {
+static TDECmdLineOptions options[] = {
    { "nosignal", I18N_NOOP("Do not signal applications to update"), 0 },
    { "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 },
    { "checkstamps", I18N_NOOP("Check file timestamps"), 0 },
@@ -703,10 +703,10 @@ static KCmdLineOptions options[] = {
    { "silent", I18N_NOOP("Silent - work without windows and stderr"), 0 },
    { "showprogress", I18N_NOOP("Show progress information (even if 'silent' mode is on)"), 0 },
 #endif
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
-static const char appName[] = "kbuildsycoca";
+static const char appName[] = "tdebuildsycoca";
 static const char appVersion[] = "1.1";
 
 class WaitForSignal : public QObject
@@ -717,16 +717,16 @@ public:
 
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
-   KLocale::setMainCatalogue("tdelibs");
-   KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
+   TDELocale::setMainCatalogue("tdelibs");
+   TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
                 I18N_NOOP("Rebuilds the system configuration cache."),
-                KAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
+                TDEAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
    d.addAuthor("David Faure", I18N_NOOP("Author"), "faure@kde.org");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    bGlobalDatabase = args->isSet("global");
    bMenuTest = args->isSet("menutest");
 
@@ -736,11 +736,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      setenv("TDEROOTHOME", "-", 1);
    }
 
-   KApplication::disableAutoDcopRegistration();
+   TDEApplication::disableAutoDcopRegistration();
 #ifdef KBUILDSYCOCA_GUI
-   KApplication k;
+   TDEApplication k;
 #else
-   KApplication k(false, false);
+   TDEApplication k(false, false);
 #endif
    k.disableSessionManagement();
 
@@ -759,16 +759,16 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    }
 #endif
 
-   KCrash::setCrashHandler(KCrash::defaultCrashHandler);
-   KCrash::setEmergencySaveFunction(crashHandler);
-   KCrash::setApplicationName(TQString(appName));
+   TDECrash::setCrashHandler(TDECrash::defaultCrashHandler);
+   TDECrash::setEmergencySaveFunction(crashHandler);
+   TDECrash::setApplicationName(TQString(appName));
 
    // this program is in tdelibs so it uses tdelibs as catalog
-   KLocale::setMainCatalogue("tdelibs");
-   // force generating of KLocale object. if not, the database will get
+   TDELocale::setMainCatalogue("tdelibs");
+   // force generating of TDELocale object. if not, the database will get
    // be translated
-   KGlobal::locale();
-   KGlobal::dirs()->addResourceType("app-reg", "share/application-registry" );
+   TDEGlobal::locale();
+   TDEGlobal::dirs()->addResourceType("app-reg", "share/application-registry" );
 
    DCOPClient *dcopClient = new DCOPClient();
 
@@ -777,14 +777,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      TQCString registeredName = dcopClient->registerAs(appName, false);
      if (registeredName.isEmpty())
      {
-       fprintf(stderr, "[kbuildsycoca] Warning: %s is unable to register with DCOP.\n", appName);
+       fprintf(stderr, "[tdebuildsycoca] Warning: %s is unable to register with DCOP.\n", appName);
        break;
      }
      else if (registeredName == appName)
      {
        break; // Go
      }
-     fprintf(stderr, "[kbuildsycoca] Waiting for already running %s to finish.\n", appName);
+     fprintf(stderr, "[tdebuildsycoca] Waiting for already running %s to finish.\n", appName);
 
      dcopClient->setNotifications( true );
      while (dcopClient->isApplicationRegistered(appName))
@@ -796,7 +796,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      }
      dcopClient->setNotifications( false );
    }
-   fprintf(stderr, "[kbuildsycoca] %s running...\n", appName);
+   fprintf(stderr, "[tdebuildsycoca] %s running...\n", appName);
 
    bool checkfiles = bGlobalDatabase || args->isSet("checkfiles");
 
@@ -804,13 +804,13 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    if (incremental || !checkfiles)
    {
      KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
-     TQString current_language = KGlobal::locale()->language();
-     TQString ksycoca_language = KSycoca::self()->language();
-     TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
-     TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();
+     TQString current_language = TDEGlobal::locale()->language();
+     TQString tdesycoca_language = KSycoca::self()->language();
+     TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_tdesycoca", true);
+     TQ_UINT32 tdesycoca_update_sig = KSycoca::self()->updateSignature();
 
-     if ((current_update_sig != ksycoca_update_sig) ||
-         (current_language != ksycoca_language) ||
+     if ((current_update_sig != tdesycoca_update_sig) ||
+         (current_language != tdesycoca_language) ||
          (KSycoca::self()->timeStamp() == 0))
      {
         incremental = false;
@@ -829,10 +829,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
        TQString path = sycocaPath()+"stamp";
        TQCString qPath = TQFile::encodeName(path);
        cSycocaPath = qPath.data(); // Delete timestamps on crash
-       TQFile ksycocastamp(path);
-       if( ksycocastamp.open( IO_ReadOnly ))
+       TQFile tdesycocastamp(path);
+       if( tdesycocastamp.open( IO_ReadOnly ))
        {
-           TQDataStream str( &ksycocastamp );
+           TQDataStream str( &tdesycocastamp );
            if (!str.atEnd())
                str >> filestamp;
            if (!str.atEnd())
@@ -870,7 +870,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
       g_ctimeDict = 0;
       if (incremental)
       {
-         tqWarning("[kbuildsycoca] Reusing existing ksycoca.");
+         tqWarning("[tdebuildsycoca] Reusing existing tdesycoca.");
          KSycoca *oldSycoca = KSycoca::self();
          KSycocaFactoryList *factories = new KSycocaFactoryList;
          g_allEntries = new KSycocaEntryListList;
@@ -914,9 +914,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
       {
         // These directories may have been created with 0700 permission
         // better delete them if they are empty
-        TQString applnkDir = KGlobal::dirs()->saveLocation("apps", TQString::null, false);
+        TQString applnkDir = TDEGlobal::dirs()->saveLocation("apps", TQString::null, false);
         ::rmdir(TQFile::encodeName(applnkDir));
-        TQString servicetypesDir = KGlobal::dirs()->saveLocation("servicetypes", TQString::null, false);
+        TQString servicetypesDir = TDEGlobal::dirs()->saveLocation("servicetypes", TQString::null, false);
         ::rmdir(TQFile::encodeName(servicetypesDir));
       }
    }
@@ -940,20 +940,20 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
    if (args->isSet("signal"))
    {
-     // Notify ALL applications that have a ksycoca object, using a broadcast
+     // Notify ALL applications that have a tdesycoca object, using a broadcast
      TQByteArray data;
      TQDataStream stream(data, IO_WriteOnly);
      stream << *g_changeList;
-     dcopClient->send( "*", "ksycoca", "notifyDatabaseChanged(TQStringList)", data );
+     dcopClient->send( "*", "tdesycoca", "notifyDatabaseChanged(TQStringList)", data );
    }
 
 #ifdef KBUILDSYCOCA_GUI
    if (!silent) {
      progress.close();
-     KMessageBox::information(0, i18n("[kbuildsycoca] Configuration information reloaded successfully."), capt);
+     KMessageBox::information(0, i18n("[tdebuildsycoca] Configuration information reloaded successfully."), capt);
    }
 #endif
    return 0;
 }
 
-#include "kbuildsycoca.moc"
+#include "tdebuildsycoca.moc"
diff --git a/kded/kbuildsycoca.h b/kded/tdebuildsycoca.h
index f98001781..51e7af337 100644
--- a/kded/kbuildsycoca.h
+++ b/kded/tdebuildsycoca.h
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kbuildsycoca_h__
-#define __kbuildsycoca_h__ 
+#ifndef __tdebuildsycoca_h__
+#define __tdebuildsycoca_h__ 
 
 #include <sys/stat.h>
 
@@ -25,16 +25,16 @@
 #include <tqdict.h>
 
 #include <kservice.h>
-#include <ksycoca.h>
-#include <ksycocatype.h>
-#include <ksycocaentry.h>
+#include <tdesycoca.h>
+#include <tdesycocatype.h>
+#include <tdesycocaentry.h>
 #include <kservicegroup.h>
 
 #include "vfolder_menu.h"
 
 class TQDataStream;
 
-// No need for this in libkio - apps only get readonly access
+// No need for this in libtdeio - apps only get readonly access
 class KBuildSycoca : public KSycoca
 {
    Q_OBJECT
@@ -80,7 +80,7 @@ protected:
    bool build();
    
    /**
-    * Save the ksycoca file
+    * Save the tdesycoca file
     */
    void save();
 
diff --git a/kded/kmimelist.cpp b/kded/tdemimelist.cpp
index fff626cac..673520e52 100644
--- a/kded/kmimelist.cpp
+++ b/kded/tdemimelist.cpp
@@ -8,13 +8,13 @@
 #include <kuserprofile.h>
 #include <kprotocolinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"blurb",false);
+   TDEApplication k(argc,argv,"blurb",false);
 
    KMimeType::List mtl = KMimeType::allMimeTypes( );
    assert( mtl.count() );
diff --git a/kded/test/test.cpp b/kded/test/test.cpp
index e99eb1421..8d2aa91b9 100644
--- a/kded/test/test.cpp
+++ b/kded/test/test.cpp
@@ -1,6 +1,6 @@
 #include "test.h"
 
-class TestObject : public KShared
+class TestObject : public TDEShared
 {
 public:
    TestObject(const TQCString &_app) : app(_app)
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index e147dcfaf..408c6af9a 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h> // getenv
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kservice.h>
 #include <kde_file.h>
@@ -441,10 +441,10 @@ VFolderMenu::absoluteDir(const TQString &_dir, const TQString &baseDir, bool kee
 
    if (TQDir::isRelativePath(dir) && !keepRelativeToCfg)
    {
-      dir = KGlobal::dirs()->findResource("xdgconf-menu", dir);
+      dir = TDEGlobal::dirs()->findResource("xdgconf-menu", dir);
    }
 
-   dir = KGlobal::dirs()->realPath(dir);
+   dir = TDEGlobal::dirs()->realPath(dir);
 
    return dir;
 }
@@ -642,7 +642,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
       else if( e.tagName() == "MergeDir") {
          TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir"), true);
 
-         TQStringList dirs = KGlobal::dirs()->findDirs("xdgconf-menu", dir);
+         TQStringList dirs = TDEGlobal::dirs()->findDirs("xdgconf-menu", dir);
          for(TQStringList::ConstIterator it=dirs.begin();
              it != dirs.end(); ++it)
          {
@@ -653,12 +653,12 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
          if (!TQDir::isRelativePath(dir))
          {
             // Absolute
-            fileList = KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false);
+            fileList = TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false);
          }
          else
          {
             // Relative
-            (void) KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList);
+            (void) TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList);
          }
 
          for(TQStringList::ConstIterator it=fileList.begin();
@@ -699,7 +699,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir)
    if (!baseDir.isEmpty())
    {
       if (!TQDir::isRelativePath(baseDir))
-         m_docInfo.baseDir = KGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir);
+         m_docInfo.baseDir = TDEGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir);
       else
          m_docInfo.baseDir = baseDir;
    }
@@ -743,7 +743,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir
    m_docInfo.baseName = fileName.left( fileName.length() - 5 );
    TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName);
 
-   TQStringList result = KGlobal::dirs()->findAllResources("xdgconf-menu", baseName);
+   TQStringList result = TDEGlobal::dirs()->findAllResources("xdgconf-menu", baseName);
 
    while( !result.isEmpty() && (result[0] != basePath))
       result.remove(result.begin());
@@ -767,7 +767,7 @@ VFolderMenu::locateMenuFile(const TQString &fileName)
 {
    if (!TQDir::isRelativePath(fileName))
    {
-      if (KStandardDirs::exists(fileName))
+      if (TDEStandardDirs::exists(fileName))
          return fileName;
       return TQString::null;
    }
@@ -808,7 +808,7 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName)
 
    if (!TQDir::isRelativePath(fileName))
    {
-      if (KStandardDirs::exists(fileName))
+      if (TDEStandardDirs::exists(fileName))
          return fileName;
       return TQString::null;
    }
@@ -820,7 +820,7 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName)
        ++it)
    {
       tmp = (*it)+fileName;
-      if (KStandardDirs::exists(tmp))
+      if (TDEStandardDirs::exists(tmp))
          return tmp;
    }
 
@@ -830,13 +830,13 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName)
 void
 VFolderMenu::initDirs()
 {
-   m_defaultDataDirs = TQStringList::split(':', KGlobal::dirs()->kfsstnd_prefixes());
+   m_defaultDataDirs = TQStringList::split(':', TDEGlobal::dirs()->kfsstnd_prefixes());
    TQString localDir = m_defaultDataDirs.first();
    m_defaultDataDirs.remove(localDir); // Remove local dir
 
-   m_defaultAppDirs = KGlobal::dirs()->findDirs("xdgdata-apps", TQString::null);
-   m_defaultDirectoryDirs = KGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null);
-   m_defaultLegacyDirs = KGlobal::dirs()->resourceDirs("apps");
+   m_defaultAppDirs = TDEGlobal::dirs()->findDirs("xdgdata-apps", TQString::null);
+   m_defaultDirectoryDirs = TDEGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null);
+   m_defaultLegacyDirs = TDEGlobal::dirs()->resourceDirs("apps");
 }
 
 void
@@ -1038,7 +1038,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl;
    TQRegExp files("\\.(desktop|kdelnk)$");
    TQRegExp dirs("\\.directory$");
 
-   (void) KGlobal::dirs()->findAllResources( "apps",
+   (void) TDEGlobal::dirs()->findAllResources( "apps",
                                              TQString::null,
                                              true, // Recursive!
                                              true, // uniq
@@ -1629,7 +1629,7 @@ VFolderMenu::parseMenu(const TQString &file, bool forceLegacyLoad)
    m_legacyLoaded = false;
    m_appsInfo = 0;
 
-   TQStringList dirs = KGlobal::dirs()->resourceDirs("xdgconf-menu");
+   TQStringList dirs = TDEGlobal::dirs()->resourceDirs("xdgconf-menu");
    for(TQStringList::ConstIterator it=dirs.begin();
        it != dirs.end(); ++it)
    {
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index d68fbd3d6..ce8c223a9 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -23,8 +23,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 link_directories(
@@ -32,12 +32,12 @@ link_directories(
 )
 
 
-##### makekdewidgets ############################
+##### maketdewidgets ############################
 
-set( target makekdewidgets )
+set( target maketdewidgets )
 
 set( ${target}_SRCS
-  makekdewidgets.cpp
+  maketdewidgets.cpp
 )
 
 tde_add_executable( ${target}
@@ -55,12 +55,12 @@ set( ${target}_SRCS
 )
 
 add_custom_command( OUTPUT kdewidgets.cpp
-  COMMAND ./makekdewidgets -o kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
-  DEPENDS makekdewidgets ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
+  COMMAND ./maketdewidgets -o kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
+  DEPENDS maketdewidgets ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
 )
diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am
index d5be1e908..2ae867228 100644
--- a/kdewidgets/Makefile.am
+++ b/kdewidgets/Makefile.am
@@ -21,20 +21,20 @@
 SUBDIRS=. pics tests
 AM_CXXFLAGS = -DQT_PLUGIN
 
-INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdefile $(all_includes)
 
-bin_PROGRAMS = makekdewidgets
-makekdewidgets_SOURCES = makekdewidgets.cpp
-makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-makekdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la 
+bin_PROGRAMS = maketdewidgets
+maketdewidgets_SOURCES = maketdewidgets.cpp
+maketdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+maketdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la 
 
 kde_widget_LTLIBRARIES = kdewidgets.la
 kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
 
-kdewidgets.cpp: $(srcdir)/kde.widgets makekdewidgets
-	./makekdewidgets -o kdewidgets.cpp $(srcdir)/kde.widgets
+kdewidgets.cpp: $(srcdir)/kde.widgets maketdewidgets
+	./maketdewidgets -o kdewidgets.cpp $(srcdir)/kde.widgets
 
 CLEANFILES = kdewidgets.cpp
 
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index bce813f8d..04db6f0d5 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -1,7 +1,7 @@
 [Global]
 PluginName=KDEWidgets
 Includes=kinstance.h,classpreviews.h
-Init=new KInstance("kdewidgets");
+Init=new TDEInstance("kdewidgets");
 
 [KActiveLabel]
 ToolTip=Active Label (KDE)
@@ -26,7 +26,7 @@ Group=Graphics (KDE)
 ToolTip=Combo Box (KDE)
 Group=Input (KDE)
 
-[KCModule]
+[TDECModule]
 ToolTip=KControl Center Module (KDE)
 IsContainer=true
 Group=Container (KDE)
@@ -55,26 +55,26 @@ Group=Graphics (KDE)
 ToolTip=Fullfeatured edit box with buttons (KDE)
 Group=Views (KDE)
 
-[KFontCombo]
+[TDEFontCombo]
 ToolTip=Font Combo Box (KDE)
 WhatsThis=A TQCombo Box showing the installed system fonts (with preview)
 Group=Input (KDE)
 
-[KFontChooser]
-IncludeFile=kfontdialog.h
-IconSet=kfontcombo.png
+[TDEFontChooser]
+IncludeFile=tdefontdialog.h
+IconSet=tdefontcombo.png
 ToolTip=Font Chooser (KDE)
 WhatsThis=A font type, size and style selection widget complete with preview
 Group=Input (KDE)
 
-[KFontRequester]
-IncludeFile=kfontrequester.h
+[TDEFontRequester]
+IncludeFile=tdefontrequester.h
 ToolTip=Font Requester (KDE)
 WhatsThis=A compact font selection and preview widget
 Group=Input (KDE)
 
 [KGradientSelector]
-IncludeFile=kselect.h
+IncludeFile=tdeselect.h
 WhatsThis=A widget that allows the user to select two colors to form a gradient
 Group=Graphics (KDE)
 
@@ -94,12 +94,12 @@ ToolTip=LED Widget (KDE)
 WhatsThis=A widget showing a light emitter diode
 Group=Display (KDE)
 
-[KListBox]
+[TDEListBox]
 ToolTip=Extended List Box (KDE)
 WhatsThis=An improved version of the TQListBox that follows KDE settings
 Group=Views (KDE)
 
-[KListView]
+[TDEListView]
 ToolTip=Extended List View (KDE)
 WhatsThis=An improved version of the TQListView that allows certain KDE extensions
 Group=Views (KDE)
@@ -108,14 +108,14 @@ Group=Views (KDE)
 ToolTip=Line Edit (KDE)
 Group=Input (KDE)
 
-[KListViewSearchLine]
+[TDEListViewSearchLine]
 ToolTip=ListView Search Line (KDE)
 Group=Input (KDE)
 ConstructorArgs=(parent, 0, name)
 
-[KListViewSearchLineWidget]
+[TDEListViewSearchLineWidget]
 ToolTip=ListView Search Line Widget (KDE)
-IncludeFile=klistviewsearchline.h
+IncludeFile=tdelistviewsearchline.h
 Group=Input (KDE)
 ConstructorArgs=(0, parent, name)
 
@@ -145,12 +145,12 @@ Group=Buttons (KDE)
 ToolTip=Line Edit for restricted input (KDE)
 Group=Input (KDE)
 
-[KIconButton]
+[TDEIconButton]
 IncludeFile=kicondialog.h
 ToolTip=Button for selecting an icon (KDE)
 Group=Buttons (KDE)
 
-[KIconView]
+[TDEIconView]
 IncludeFile=kiconview.h
 ToolTip=Extended Icon View (KDE)
 WhatsThis=An improved version of the TQIconView that allows certain KDE extensions
@@ -243,8 +243,8 @@ ToolTip=A widget that provides a image preview of a URL
 Group=Display (KDE)
 ConstructorArgs=(parent)
 
-[KActionSelector]
-IncludeFile=kactionselector.h
+[TDEActionSelector]
+IncludeFile=tdeactionselector.h
 ToolTip=A widget for selecting and arranging actions/objects
 Group=Views (KDE)
 
@@ -271,11 +271,11 @@ ToolTip=A color palette in table form.
 Group=Display (KDE)
 ConstructorArgs=(parent, 210, 16)
 
-[KABC::LdapConfigWidget]
-IncludeFile=kabc/ldapconfigwidget.h
+[TDEABC::LdapConfigWidget]
+IncludeFile=tdeabc/ldapconfigwidget.h
 ToolTip=A widget which allows the user to set up LDAP connection parameters
 Group=Input (KDE)
-ConstructorArgs=(KABC::LdapConfigWidget::W_ALL, parent, name)
+ConstructorArgs=(TDEABC::LdapConfigWidget::W_ALL, parent, name)
 
 [KArrowButton]
 IncludeFile=karrowbutton.h
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/maketdewidgets.cpp
index 94a5bdde6..535ad0526 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/maketdewidgets.cpp
@@ -1,8 +1,8 @@
 /* Copyright (C) 2004-2005 ian reinhart geiser <geiseri@sourcextreme.com> */
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
-#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdecmdlineargs.h>
+#include <tdeconfig.h>
 #include <kmacroexpander.h>
 #include <kdebug.h>
 
@@ -15,7 +15,7 @@
 static const char description[] = I18N_NOOP( "Builds Qt widget plugins from an ini style description file." );
 static const char version[] = "0.2";
 static const char classHeader[] = 	"/**\n"
-					"* This file was autogenerated by makekdewidgets. Any changes will be lost!\n"
+					"* This file was autogenerated by maketdewidgets. Any changes will be lost!\n"
 					"* The generated code in this file is licensed under the same license that the\n"
 					"* input file.\n"
                                    	"*/\n"
@@ -107,30 +107,30 @@ static const char endCreate[] = "	return 0;\n"
                                  "KDE_Q_EXPORT_PLUGIN(%PluginName)\n";
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
     {
         { "+file", I18N_NOOP( "Input file" ), 0 },
         { "o <file>", I18N_NOOP( "Output file" ), 0 },
         { "n <plugin name>", I18N_NOOP( "Name of the plugin class to generate" ), "WidgetsPlugin" },
         { "g <group>", I18N_NOOP( "Default widget group name to display in designer" ), "Custom" },
         { "p <pixmap dir>", I18N_NOOP( "Embed pixmaps from a source directory" ), 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
-static TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group );
-static TQString buildWidgetCreate( const TQString &name, KConfig &input );
-static TQString buildWidgetInclude( const TQString &name, KConfig &input );
+static TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group );
+static TQString buildWidgetCreate( const TQString &name, TDEConfig &input );
+static TQString buildWidgetInclude( const TQString &name, TDEConfig &input );
 static void buildFile( TQTextStream &stream, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath );
-static TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath );
+static TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath );
 
 int main( int argc, char **argv ) {
-    new KInstance( "makekdewidgets" );
+    new TDEInstance( "maketdewidgets" );
 
-    KAboutData about( "makekdewidgets", I18N_NOOP( "makekdewidgets" ), version, description, KAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
+    TDEAboutData about( "maketdewidgets", I18N_NOOP( "maketdewidgets" ), version, description, TDEAboutData::License_GPL, "(C) 2004-2005 ian reinhart geiser", 0, 0, "geiseri@kde.org" );
     about.addAuthor( "ian reinhart geiser", 0, "geiseri@kde.org" );
-    KCmdLineArgs::init( argc, argv, &about );
-    KCmdLineArgs::addCmdLineOptions( options );
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() < 1 ) {
         args->usage();
         return ( 1 );
@@ -160,7 +160,7 @@ int main( int argc, char **argv ) {
 }
 
 void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileName, const TQString& pluginName, const TQString& iconPath ) {
-    KConfig input( fileName, true, false );
+    TDEConfig input( fileName, true, false );
     input.setGroup( "Global" );
     TQMap<TQString, TQString> MainMap;
     MainMap.insert( "PluginName", input.readEntry( "PluginName", pluginName ) );
@@ -195,7 +195,7 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam
 
 }
 
-TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &group ) {
+TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group ) {
     input.setGroup( name );
     TQMap<TQString, TQString> defMap;
     defMap.insert( "Group", input.readEntry( "Group", group ).replace( "\"", "\\\"" ) );
@@ -209,7 +209,7 @@ TQString buildWidgetDef( const TQString &name, KConfig &input, const TQString &g
     return KMacroExpander::expandMacros( widgetDef, defMap );
 }
 
-TQString buildWidgetCreate( const TQString &name, KConfig &input ) {
+TQString buildWidgetCreate( const TQString &name, TDEConfig &input ) {
     input.setGroup( name );
     TQMap<TQString, TQString> createMap;
     createMap.insert( "ImplClass", input.readEntry( "ImplClass", name ) );
@@ -218,12 +218,12 @@ TQString buildWidgetCreate( const TQString &name, KConfig &input ) {
     return KMacroExpander::expandMacros( widgetCreate, createMap );
 }
 
-TQString buildWidgetInclude( const TQString &name, KConfig &input ) {
+TQString buildWidgetInclude( const TQString &name, TDEConfig &input ) {
     input.setGroup( name );
     return "#include <" + input.readEntry( "IncludeFile", name.lower() + ".h" ) + ">";
 }
 
-TQString buildPixmap( const TQString &name, KConfig &input, const TQString &iconPath ) {
+TQString buildPixmap( const TQString &name, TDEConfig &input, const TQString &iconPath ) {
     input.setGroup( name );
     TQString cleanName = name.lower().replace( ":", "_" );
     TQString iconName = input.readEntry( "IconSet", cleanName + ".png" );
diff --git a/kdewidgets/pics/CMakeLists.txt b/kdewidgets/pics/CMakeLists.txt
index 8e7ff6b13..f398f174d 100644
--- a/kdewidgets/pics/CMakeLists.txt
+++ b/kdewidgets/pics/CMakeLists.txt
@@ -13,15 +13,15 @@
 
 install( FILES
     klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png
-    kfontrequester.png kurlrequester.png kcombobox.png kiconview.png
+    tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png
     kintspinbox.png kled.png ksqueezedtextlabel.png  kprogress.png
-    kurllabel.png kruler.png kcmodule.png kdoublespinbox.png
-    kdoublenuminput.png klistbox.png klistview.png kactivelabel.png
+    kurllabel.png kruler.png tdecmodule.png kdoublespinbox.png
+    kdoublenuminput.png tdelistbox.png tdelistview.png kactivelabel.png
     kiconbutton.png kcolorcombo.png khsselector.png kcolorbutton.png
     kgradientselector.png kdualcolorbutton.png ktimewidget.png
     kpushbutton.png kcharselect.png kdatepicker.png
-    kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png
+    kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png
     kintnuminput.png krestrictedline.png ktextedit.png
     kurlcomborequester.png kkeybutton.png kpalettetable.png
-    kactionselector.png kdatetable.png kdatetimewidget.png
+    tdeactionselector.png kdatetable.png kdatetimewidget.png
   DESTINATION ${DATA_INSTALL_DIR}/kdewidgets/pics )
diff --git a/kdewidgets/pics/Makefile.am b/kdewidgets/pics/Makefile.am
index 83e8aa357..0d4ee1e61 100644
--- a/kdewidgets/pics/Makefile.am
+++ b/kdewidgets/pics/Makefile.am
@@ -1,15 +1,15 @@
 kdewidgetsdata_DATA =  klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png \
-             kfontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
+             tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
              kled.png ksqueezedtextlabel.png  kprogress.png kurllabel.png \
-             kruler.png kcmodule.png kdoublespinbox.png kdoublenuminput.png \
-             klistbox.png klistview.png kactivelabel.png kiconbutton.png \
+             kruler.png tdecmodule.png kdoublespinbox.png kdoublenuminput.png \
+             tdelistbox.png tdelistview.png kactivelabel.png kiconbutton.png \
              kcolorcombo.png khsselector.png kcolorbutton.png \
              kgradientselector.png kdualcolorbutton.png ktimewidget.png \
              kpushbutton.png kcharselect.png kdatepicker.png \
-             kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png \
+             kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png \
              kintnuminput.png krestrictedline.png ktextedit.png \
              kurlcomborequester.png kkeybutton.png kpalettetable.png \
-	     kactionselector.png kdatetable.png kdatetimewidget.png 
+	     tdeactionselector.png kdatetable.png kdatetimewidget.png 
 
 
 kdewidgetsdatadir = $(kde_datadir)/kdewidgets/pics
diff --git a/kdewidgets/pics/kactionselector.png b/kdewidgets/pics/tdeactionselector.png
index acfdce496..acfdce496 100644
--- a/kdewidgets/pics/kactionselector.png
+++ b/kdewidgets/pics/tdeactionselector.png
diff --git a/kdewidgets/pics/kcmodule.png b/kdewidgets/pics/tdecmodule.png
index 1a6a9dc17..1a6a9dc17 100644
--- a/kdewidgets/pics/kcmodule.png
+++ b/kdewidgets/pics/tdecmodule.png
diff --git a/kdewidgets/pics/kfontcombo.png b/kdewidgets/pics/tdefontcombo.png
index 87835d6ce..87835d6ce 100644
--- a/kdewidgets/pics/kfontcombo.png
+++ b/kdewidgets/pics/tdefontcombo.png
diff --git a/kdewidgets/pics/kfontrequester.png b/kdewidgets/pics/tdefontrequester.png
index a01f4d692..a01f4d692 100644
--- a/kdewidgets/pics/kfontrequester.png
+++ b/kdewidgets/pics/tdefontrequester.png
diff --git a/kdewidgets/pics/klistbox.png b/kdewidgets/pics/tdelistbox.png
index f7405b39f..f7405b39f 100644
--- a/kdewidgets/pics/klistbox.png
+++ b/kdewidgets/pics/tdelistbox.png
diff --git a/kdewidgets/pics/klistview.png b/kdewidgets/pics/tdelistview.png
index 932d910c8..932d910c8 100644
--- a/kdewidgets/pics/klistview.png
+++ b/kdewidgets/pics/tdelistview.png
diff --git a/kdewidgets/tests/Makefile.am b/kdewidgets/tests/Makefile.am
index 3a4a9566a..220f8afac 100644
--- a/kdewidgets/tests/Makefile.am
+++ b/kdewidgets/tests/Makefile.am
@@ -23,9 +23,9 @@ check-local: testwithpixmaps.cpp testkde.cpp
 # md5sum -c $(srcdir)/sums
 
 testwithpixmaps.cpp: $(srcdir)/test.widgets
-	../makekdewidgets -o testwithpixmaps.cpp -p $(top_srcdir)/kdewidgets/pics $(srcdir)/test.widgets
+	../maketdewidgets -o testwithpixmaps.cpp -p $(top_srcdir)/kdewidgets/pics $(srcdir)/test.widgets
 testkde.cpp: $(srcdir)/test.widgets
-	../makekdewidgets -o testkde.cpp $(srcdir)/test.widgets
+	../maketdewidgets -o testkde.cpp $(srcdir)/test.widgets
 
 CLEANFILES = testwithpixmaps.cpp testkde.cpp
 
diff --git a/kdewidgets/tests/README b/kdewidgets/tests/README
index 9dd2132fa..5d97aa029 100644
--- a/kdewidgets/tests/README
+++ b/kdewidgets/tests/README
@@ -1,4 +1,4 @@
-These are the tests for the current makekdewidgets.
+These are the tests for the current maketdewidgets.
 
 Currently there are two modes generated, and the checksums checked.
 These files are correct and build plugins that are functionally 
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index b67abedee..bbbac6f90 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -1,7 +1,7 @@
 [Global]
 PluginName=KDEWidgets
 Includes=kinstance.h,classpreviews.h
-Init=new KInstance("kdewidgets");
+Init=new TDEInstance("kdewidgets");
 
 [KActiveLabel]
 ToolTip=Active Label (KDE)
@@ -26,7 +26,7 @@ Group=Graphics (KDE)
 ToolTip=Combo Box (KDE)
 Group=Input (KDE)
 
-[KCModule]
+[TDECModule]
 ToolTip=KControl Center Module (KDE)
 IsContainer=true
 Group=Container (KDE)
@@ -55,26 +55,26 @@ Group=Graphics (KDE)
 ToolTip=Fullfeatured edit box with buttons (KDE)
 Group=Views (KDE)
 
-[KFontCombo]
+[TDEFontCombo]
 ToolTip=Font Combo Box (KDE)
 WhatsThis=A QCombo Box showing the installed system fonts (with preview)
 Group=Input (KDE)
 
-[KFontChooser]
-IncludeFile=kfontdialog.h
-IconSet=kfontcombo.png
+[TDEFontChooser]
+IncludeFile=tdefontdialog.h
+IconSet=tdefontcombo.png
 ToolTip=Font Chooser (KDE)
 WhatsThis=A font type, size and style selection widget complete with preview
 Group=Input (KDE)
 
-[KFontRequester]
-IncludeFile=kfontrequester.h
+[TDEFontRequester]
+IncludeFile=tdefontrequester.h
 ToolTip=Font Requester (KDE)
 WhatsThis=A compact font selection and preview widget
 Group=Input (KDE)
 
 [KGradientSelector]
-IncludeFile=kselect.h
+IncludeFile=tdeselect.h
 WhatsThis=A widget that allows the user to select two colors to form a gradient
 Group=Graphics (KDE)
 
@@ -94,12 +94,12 @@ ToolTip=LED Widget (KDE)
 WhatsThis=A widget showing a light emitter diode
 Group=Display (KDE)
 
-[KListBox]
+[TDEListBox]
 ToolTip=Extended List Box (KDE)
 WhatsThis=An improved version of the QListBox that follows KDE settings
 Group=Views (KDE)
 
-[KListView]
+[TDEListView]
 ToolTip=Extended List View (KDE)
 WhatsThis=An improved version of the QListView that allows certain KDE extensions
 Group=Views (KDE)
@@ -134,12 +134,12 @@ Group=Buttons (KDE)
 ToolTip=Line Edit for restricted input (KDE)
 Group=Input (KDE)
 
-[KIconButton]
+[TDEIconButton]
 IncludeFile=kicondialog.h
 ToolTip=Button for selecting an icon (KDE)
 Group=Buttons (KDE)
 
-[KIconView]
+[TDEIconView]
 IncludeFile=kiconview.h
 ToolTip=Extended Icon View (KDE)
 WhatsThis=An improved version of the QIconView that allows certain KDE extensions
@@ -232,8 +232,8 @@ ToolTip=A widget that provides a image preview of a URL
 Group=Display (KDE)
 ConstructorArgs=(parent)
 
-[KActionSelector]
-IncludeFile=kactionselector.h
+[TDEActionSelector]
+IncludeFile=tdeactionselector.h
 ToolTip=A widget for selecting and arranging actions/objects
 Group=Views (KDE)
 
@@ -260,8 +260,8 @@ ToolTip=A color palette in table form.
 Group=Display (KDE)
 ConstructorArgs=(parent, 210, 16)
 
-[KABC::AddressLineEdit]
-IncludeFile=kabc/addresslineedit.h
+[TDEABC::AddressLineEdit]
+IncludeFile=tdeabc/addresslineedit.h
 ToolTip=A lineedit with LDAP and kabc completion.
 Group=Input (KDE)
 ConstructorArgs=(parent, true, name)
diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt
index 9d97712c6..8657e277e 100644
--- a/kdoctools/CMakeLists.txt
+++ b/kdoctools/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kioslave
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeioslave
   ${LIBXML2_INCLUDE_DIRS}
   ${LIBXSLT_INCLUDE_DIRS}
 )
@@ -33,8 +33,8 @@ link_directories(
 ##### other data ################################
 
 install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/checkXML DESTINATION ${BIN_INSTALL_DIR} )
-install( PROGRAMS move_kio_help_cache.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
-install( FILES kio_help.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( PROGRAMS move_tdeio_help_cache.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES tdeio_help.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( FILES help.protocol ghelp.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 # FIXME why automake version is so complicated?
@@ -54,36 +54,36 @@ install( FILES man-template.docbook template.docbook DESTINATION ${DATA_INSTALL_
 ##### kbzipfilter_dummy ##############################
 
 tde_add_library( kbzipfilter_dummy STATIC_PIC
-  SOURCES ${CMAKE_SOURCE_DIR}/kioslave/bzip2/kbzip2filter.cpp
+  SOURCES ${CMAKE_SOURCE_DIR}/tdeioslave/bzip2/kbzip2filter.cpp
 )
 
 
-#### kio_help ###################################
+#### tdeio_help ###################################
 
-set( target kio_help )
+set( target tdeio_help )
 
 set( ${target}_SRCS
-  kio_help.cpp main.cpp xslt.cpp
+  tdeio_help.cpp main.cpp xslt.cpp
 )
 
 tde_add_kpart( ${target} SHARED
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-#### kio_ghelp ###################################
+#### tdeio_ghelp ###################################
 
-set( target kio_ghelp )
+set( target tdeio_ghelp )
 
 set( ${target}_SRCS
-  kio_help.cpp main_ghelp.cpp xslt.cpp
+  tdeio_help.cpp main_ghelp.cpp xslt.cpp
 )
 
 tde_add_kpart( ${target} SHARED
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -102,6 +102,6 @@ set_source_files_properties( xslt_pure.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSL
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
+  LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdoctools/Mainpage.dox b/kdoctools/Mainpage.dox
index e6a5120d4..0ed4d0954 100644
--- a/kdoctools/Mainpage.dox
+++ b/kdoctools/Mainpage.dox
@@ -1,6 +1,6 @@
 /** @mainpage Trinity Documentation Tools
 
-Provides a KIO slave for accessing application documentation for
+Provides a TDEIO slave for accessing application documentation for
 Trinity and GNOME applications.
 
 @authors
@@ -21,6 +21,6 @@ holders.
 
 */
 
-// DOXYGEN_REFERENCES = tdecore tdeui kio
+// DOXYGEN_REFERENCES = tdecore tdeui tdeio
 // DOXYGEN_SET_PROJECT_NAME = KDocTools
 // vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am
index f5aab5ebe..c009fd19d 100644
--- a/kdoctools/Makefile.am
+++ b/kdoctools/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kioslave -I$(top_srcdir)/kioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeioslave -I$(top_srcdir)/tdeioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
 AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
 
 noinst_LTLIBRARIES = libkbzipfilter_dummy.la
@@ -8,17 +8,17 @@ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
 
 ####### Files
 
-kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la
+kde_module_LTLIBRARIES = tdeio_help.la tdeio_ghelp.la
 
-kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp
-kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
-kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_help_la_SOURCES = tdeio_help.cpp main.cpp xslt.cpp
+tdeio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
+tdeio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp
-kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
-kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_ghelp_la_SOURCES = tdeio_help.cpp main_ghelp.cpp xslt.cpp
+tdeio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
+tdeio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
-noinst_HEADERS = kio_help.h
+noinst_HEADERS = tdeio_help.h
 
 kdelnk_DATA = help.protocol ghelp.protocol
 kdelnkdir = $(kde_servicesdir)
@@ -36,12 +36,12 @@ bin_SCRIPTS = checkXML
 
 METASOURCES = AUTO
 
-update_DATA = kio_help.upd
-update_SCRIPTS = move_kio_help_cache.sh
-updatedir = $(kde_datadir)/kconf_update
+update_DATA = tdeio_help.upd
+update_SCRIPTS = move_tdeio_help_cache.sh
+updatedir = $(kde_datadir)/tdeconf_update
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_help.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_help.pot
 
 install-data-local:
 	@(for subdir in customization docbook; do \
@@ -59,7 +59,7 @@ uninstall-local:
 	-rm -rf $(DESTDIR)$(kde_datadir)/ksgmltools2/docbook
 
 kbzip2filter.cpp:
-	-$(LN_S) $(srcdir)/../kioslave/bzip2/kbzip2filter.cpp .
+	-$(LN_S) $(srcdir)/../tdeioslave/bzip2/kbzip2filter.cpp .
 
 CLEANFILES = kbzip2filter.cpp xslt_pure.o xslt_pure.cpp checkXML
 
diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities
index 1464f600d..313b848fc 100644
--- a/kdoctools/customization/entities/general.entities
+++ b/kdoctools/customization/entities/general.entities
@@ -223,7 +223,7 @@
 <!ENTITY khelpcenter	"<application>KHelpCenter</application>">
 <!ENTITY khexedit	"<application>KHexEdit</application>">
 <!ENTITY kicker	"<application>Kicker</application>">
-<!ENTITY kiconedit	"<application>KIconEdit</application>">
+<!ENTITY kiconedit	"<application>TDEIconEdit</application>">
 <!ENTITY kig	"<application>Kig</application>">
 <!ENTITY kikbd	"<application>kikbd</application>">
 <!ENTITY kinfocenter    "<application>KInfoCenter</application>">
@@ -248,8 +248,8 @@
 <!ENTITY kmathtool "<application>KMathTool</application>">
 <!ENTITY kmenuedit	"<application>KMenuEdit</application>">
 <!ENTITY kmessedwords	"<application>KMessedWords</application>">
-<!ENTITY kmid	"<application>KMid</application>">
-<!ENTITY kmidi	"<application>KMidi</application>">
+<!ENTITY tdemid	"<application>KMid</application>">
+<!ENTITY tdemidi	"<application>KMidi</application>">
 <!ENTITY kmines	"<application>KMines</application>">
 <!ENTITY kmix	"<application>KMix</application>">
 <!ENTITY kmoon	"<application>KMoon</application>">
@@ -299,7 +299,7 @@
 <!ENTITY kruler	"<application>TDE Screen Ruler</application>">
 <!ENTITY ksame	"<application>KSame</application>">
 <!ENTITY kscd	"<application>KsCD</application>">
-<!ENTITY kscreensaver	"<application>KScreensaver</application>">
+<!ENTITY tdescreensaver	"<application>KScreensaver</application>">
 <!ENTITY ksgmltools	"<application>ksgmltools</application>">
 <!ENTITY kshisen	"<application>KShisen</application>">
 <!ENTITY ksim	"<application>KSim</application>">
@@ -311,7 +311,7 @@
 <!ENTITY ksnapshot	"<application>KSnapshot</application>">
 <!ENTITY ksokoban	"<application>KSokoban</application>">
 <!ENTITY kspaceduel	"<application>KSpaceDuel</application>">
-<!ENTITY kspell	"<application>KSpell</application>">
+<!ENTITY tdespell	"<application>KSpell</application>">
 <!ENTITY ksplash "<application>KSplash</application>">
 <!ENTITY kspread	"<application>KSpread</application>">
 <!ENTITY kstars	"<application>KStars</application>">
@@ -421,5 +421,5 @@
 <!ENTITY kontour	"<application>Kontour</application>">
 <!ENTITY kpanel	"<application>KPanel</application>">
 <!ENTITY kscore	"<application>KScore</application>">
-<!ENTITY tkmidi	"<application>tkmidi</application>">
+<!ENTITY ttdemidi	"<application>ttdemidi</application>">
 <!ENTITY quanta "<application>Quanta</application>">
diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities
index ebc4b640d..518ba097b 100644
--- a/kdoctools/customization/obsolete/general.entities
+++ b/kdoctools/customization/obsolete/general.entities
@@ -213,7 +213,7 @@
 <!ENTITY khelpcenter	"<application>KHelpCenter</application>">
 <!ENTITY khexedit	"<application>KHexEdit</application>">
 <!ENTITY kicker	"<application>Kicker</application>">
-<!ENTITY kiconedit	"<application>KIconEdit</application>">
+<!ENTITY kiconedit	"<application>TDEIconEdit</application>">
 <!ENTITY kikbd	"<application>kikbd</application>">
 <!ENTITY kit	"<application>Kit</application>">
 <!ENTITY kiten	"<application>Kiten</application>">
@@ -233,8 +233,8 @@
 <!ENTITY kmathtool "<application>KMathTool</application>">
 <!ENTITY kmenuedit	"<application>kmenuedit</application>">
 <!ENTITY kmessedwords	"<application>KMessedWords</application>">
-<!ENTITY kmid	"<application>KMid</application>">
-<!ENTITY kmidi	"<application>KMidi</application>">
+<!ENTITY tdemid	"<application>KMid</application>">
+<!ENTITY tdemidi	"<application>KMidi</application>">
 <!ENTITY kmines	"<application>KMines</application>">
 <!ENTITY kmix	"<application>KMix</application>">
 <!ENTITY kmplot	"<application>KmPlot</application>">
@@ -279,7 +279,7 @@
 <!ENTITY ksame	"<application>KSame</application>">
 <!ENTITY kscd	"<application>KsCD</application>">
 <!ENTITY kscore	"<application>KScore</application>">
-<!ENTITY kscreensaver	"<application>KScreensaver</application>">
+<!ENTITY tdescreensaver	"<application>KScreensaver</application>">
 <!ENTITY ksgmltools	"<application>ksgmltools</application>">
 <!ENTITY kshisen	"<application>KShisen</application>">
 <!ENTITY ksim	"<application>KSim</application>">
@@ -290,7 +290,7 @@
 <!ENTITY ksnapshot	"<application>KSnapshot</application>">
 <!ENTITY ksokoban	"<application>KSokoban</application>">
 <!ENTITY kspaceduel	"<application>KSpaceDuel</application>">
-<!ENTITY kspell	"<application>KSpell</application>">
+<!ENTITY tdespell	"<application>KSpell</application>">
 <!ENTITY kspread	"<application>KSpread</application>">
 <!ENTITY kstars	"<application>KStars</application>">
 <!ENTITY kstart	"<application>kstart</application>">
@@ -357,7 +357,7 @@
 <!ENTITY Solaris	"<trademark>Solaris</trademark>">
 <!ENTITY SuSE	'<acronym><trademark class="registered">SuSE</trademark></acronym>'>
 <!ENTITY ThreeCom	'<trademark class="registered">3Com</trademark>'>
-<!ENTITY tkmidi	"<application>tkmidi</application>">
+<!ENTITY ttdemidi	"<application>ttdemidi</application>">
 <!ENTITY TrueType	'<trademark class="registered">TrueType</trademark>'>
 <!ENTITY UNIX	'<trademark class="registered">UNIX</trademark>'>
 <!ENTITY URL	"<acronym>URL</acronym>">
diff --git a/kdoctools/customization/pl/user.entities b/kdoctools/customization/pl/user.entities
index 509e433d8..73b0c4b3b 100644
--- a/kdoctools/customization/pl/user.entities
+++ b/kdoctools/customization/pl/user.entities
@@ -205,19 +205,19 @@ ktnef
 <!ENTITY ksysguard-narzednik    '<application>Ksysguardem</application>'>
 <!ENTITY ksysguard-miejscownik    '<application>Ksysguardzie</application>'>
 
-<!ENTITY kwallet-mianownik    '<application>Portfel &tde;</application>'>
-<!ENTITY kwallet-dopelniacz    '<application>Portfela &tde;</application>'>
-<!ENTITY kwallet-celownik    '<application>Portfelowi &tde;</application>'>
-<!ENTITY kwallet-biernik    '<application>Portfel &tde;</application>'>
-<!ENTITY kwallet-narzednik    '<application>Portfelem &tde;</application>'>
-<!ENTITY kwallet-miejscownik    '<application>Portfelu &tde;</application>'>
-
-<!ENTITY kwalletmanager-mianownik    '<application>Menedżer portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-dopelniacz    '<application>Menedżera portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-celownik    '<application>Menedżerowi portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-biernik    '<application>Menedżera portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-narzednik    '<application>Menedżerem portfeli &tde;</application>'>
-<!ENTITY kwalletmanager-miejscownik    '<application>Menedżerze portfeli &tde;</application>'>
+<!ENTITY tdewallet-mianownik    '<application>Portfel &tde;</application>'>
+<!ENTITY tdewallet-dopelniacz    '<application>Portfela &tde;</application>'>
+<!ENTITY tdewallet-celownik    '<application>Portfelowi &tde;</application>'>
+<!ENTITY tdewallet-biernik    '<application>Portfel &tde;</application>'>
+<!ENTITY tdewallet-narzednik    '<application>Portfelem &tde;</application>'>
+<!ENTITY tdewallet-miejscownik    '<application>Portfelu &tde;</application>'>
+
+<!ENTITY tdewalletmanager-mianownik    '<application>Menedżer portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-dopelniacz    '<application>Menedżera portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-celownik    '<application>Menedżerowi portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-biernik    '<application>Menedżera portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-narzednik    '<application>Menedżerem portfeli &tde;</application>'>
+<!ENTITY tdewalletmanager-miejscownik    '<application>Menedżerze portfeli &tde;</application>'>
 
 <!ENTITY noatun-mianownik    '<application>Noatun</application>'>
 <!ENTITY noatun-dopelniacz    '<application>Noatuna</application>'>
diff --git a/kdoctools/docbook/README.kde b/kdoctools/docbook/README.kde
index df33a8cba..ae080b287 100644
--- a/kdoctools/docbook/README.kde
+++ b/kdoctools/docbook/README.kde
@@ -1,4 +1,4 @@
-README file for tdebase/kioslave/help/docbook
+README file for tdebase/tdeioslave/help/docbook
 =============================================
 
 This are copies of
diff --git a/kdoctools/ghelp.protocol b/kdoctools/ghelp.protocol
index ec5e50a34..f8dca77c2 100644
--- a/kdoctools/ghelp.protocol
+++ b/kdoctools/ghelp.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_ghelp
+exec=tdeio_ghelp
 protocol=ghelp
 input=none
 output=filesystem
diff --git a/kdoctools/help.protocol b/kdoctools/help.protocol
index b4ee178e6..dc7a25b16 100644
--- a/kdoctools/help.protocol
+++ b/kdoctools/help.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_help
+exec=tdeio_help
 protocol=help
 input=none
 output=filesystem
diff --git a/kdoctools/kio_help.upd b/kdoctools/kio_help.upd
deleted file mode 100644
index 2f067b148..000000000
--- a/kdoctools/kio_help.upd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help
-Id=trinity_2
-Script=move_kio_help_cache.sh,sh
diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp
index 8e096d6cf..57a44156c 100644
--- a/kdoctools/main.cpp
+++ b/kdoctools/main.cpp
@@ -16,7 +16,7 @@
 #include <kinstance.h>
 #include <kdebug.h>
 #include <stdlib.h>
-#include "kio_help.h"
+#include "tdeio_help.h"
 #include <xslt.h>
 
 extern int xmlLoadExtDtdDefaultValue;
@@ -25,7 +25,7 @@ extern "C"
 {
     KDE_EXPORT int kdemain( int argc, char **argv )
     {
-        KInstance instance( "kio_help" );
+        TDEInstance instance( "tdeio_help" );
         fillInstance(instance);
         (void)instance.config(); // we need this one to make sure system globals are read
 
@@ -33,7 +33,7 @@ extern "C"
 
         if (argc != 4)
         {
-            fprintf(stderr, "Usage: kio_help protocol domain-socket1 domain-socket2\n");
+            fprintf(stderr, "Usage: tdeio_help protocol domain-socket1 domain-socket2\n");
             exit(-1);
         }
 
diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp
index 281b31f17..94bcc60dd 100644
--- a/kdoctools/main_ghelp.cpp
+++ b/kdoctools/main_ghelp.cpp
@@ -16,7 +16,7 @@
 #include <kinstance.h>
 #include <kdebug.h>
 #include <stdlib.h>
-#include "kio_help.h"
+#include "tdeio_help.h"
 #include <xslt.h>
 
 extern int xmlLoadExtDtdDefaultValue;
@@ -25,7 +25,7 @@ extern "C"
 {
     KDE_EXPORT int kdemain( int argc, char **argv )
     {
-        KInstance instance( "kio_ghelp" );
+        TDEInstance instance( "tdeio_ghelp" );
         fillInstance(instance);
         (void)instance.config(); // we need this one to make sure system globals are read
 
@@ -33,7 +33,7 @@ extern "C"
 
         if (argc != 4)
         {
-            fprintf(stderr, "Usage: kio_ghelp protocol domain-socket1 domain-socket2\n");
+            fprintf(stderr, "Usage: tdeio_ghelp protocol domain-socket1 domain-socket2\n");
             exit(-1);
         }
 
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 1600e628f..51f0b913a 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -18,9 +18,9 @@
 #include <xslt.h>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
+#include <tdeaboutdata.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
@@ -69,7 +69,7 @@ void parseEntry(PairList &list, xmlNodePtr cur, int base)
 
 }
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "stylesheet <xsl>",  I18N_NOOP( "Stylesheet to use" ), 0 },
     { "stdout", I18N_NOOP( "Output whole document to stdout" ), 0 },
@@ -81,7 +81,7 @@ static KCmdLineOptions options[] =
     { "srcdir <dir>", I18N_NOOP( "Set the srcdir, for tdelibs" ), 0},
     { "param <key>=<value>", I18N_NOOP( "Parameters to pass to the stylesheet" ), 0},
     { "+xml", I18N_NOOP("The file to transform"), 0},
-    KCmdLineLastOption // End of options.
+    TDECmdLineLastOption // End of options.
 };
 
 
@@ -91,19 +91,19 @@ int main(int argc, char **argv) {
 
     // xsltSetGenericDebugFunc(stderr, NULL);
 
-    KAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
+    TDEAboutData aboutData( "meinproc", I18N_NOOP("XML-Translator" ),
 	"$Revision$",
 	I18N_NOOP("TDE Translator for XML"));
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KLocale::setMainCatalogue("kio_help");
-    KInstance ins("meinproc");
-    KGlobal::locale();
+    TDELocale::setMainCatalogue("tdeio_help");
+    TDEInstance ins("meinproc");
+    TDEGlobal::locale();
 
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() != 1 ) {
         args->usage();
         return ( 1 );
@@ -163,7 +163,7 @@ int main(int argc, char **argv) {
         exe = XMLLINT;
 #endif
         if ( (::access( TQFile::encodeName( exe ), X_OK )!=0) ) {
-            exe = KStandardDirs::findExe( "xmllint" );
+            exe = TDEStandardDirs::findExe( "xmllint" );
             if (exe.isEmpty())
                 exe = locate( "exe", "xmllint" );
         }
@@ -171,7 +171,7 @@ int main(int argc, char **argv) {
             chdir( TQFile::encodeName( file.dirPath( true ) ) );
             TQString cmd = exe;
             cmd += " --catalogs --valid --noout ";
-            cmd += KProcess::quote(file.fileName());
+            cmd += TDEProcess::quote(file.fileName());
             cmd += " 2>&1";
             FILE *xmllint = popen( TQFile::encodeName( cmd ), "r");
             char buf[ 512 ];
diff --git a/kdoctools/move_kio_help_cache.sh b/kdoctools/move_kio_help_cache.sh
deleted file mode 100644
index c31331c9e..000000000
--- a/kdoctools/move_kio_help_cache.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-bas=`tde-config --localprefix`share/apps/kio_help
-mv "$bas/cache" "`tde-config --path cache`kio_help"
-rmdir "$bas"
-exit 0
diff --git a/kdoctools/move_tdeio_help_cache.sh b/kdoctools/move_tdeio_help_cache.sh
new file mode 100644
index 000000000..33096e885
--- /dev/null
+++ b/kdoctools/move_tdeio_help_cache.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+bas=`tde-config --localprefix`share/apps/tdeio_help
+mv "$bas/cache" "`tde-config --path cache`tdeio_help"
+rmdir "$bas"
+exit 0
diff --git a/kdoctools/kio_help.cpp b/kdoctools/tdeio_help.cpp
index 292c4de13..7b9d2a36e 100644
--- a/kdoctools/kio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -25,26 +25,26 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 
-#include "kio_help.h"
+#include "tdeio_help.h"
 #include <libxslt/xsltutils.h>
 #include <libxslt/transform.h>
 #include "xslt.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 TQString HelpProtocol::langLookup(const TQString& fname)
 {
     TQStringList search;
 
     // assemble the local search paths
-    const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html") + KGlobal::dirs()->resourceDirs("html-bundle");
+    const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html") + TDEGlobal::dirs()->resourceDirs("html-bundle");
 
-    TQStringList langs = KGlobal::locale()->languageList();
+    TQStringList langs = TDEGlobal::locale()->languageList();
     langs.append( "en" );
     langs.remove( "C" );
 
@@ -169,7 +169,7 @@ void HelpProtocol::get( const KURL& url )
 
     if (doc.isEmpty())
     {
-        error( KIO::ERR_DOES_NOT_EXIST, url.url() );
+        error( TDEIO::ERR_DOES_NOT_EXIST, url.url() );
         return;
     }
 
@@ -190,7 +190,7 @@ void HelpProtocol::get( const KURL& url )
       }
     } else {
         TQString docbook_file = file.left(file.findRev('/')) + "/index.docbook";
-        if (!KStandardDirs::exists(file)) {
+        if (!TDEStandardDirs::exists(file)) {
             file = docbook_file;
         } else {
             TQFileInfo fi(file);
@@ -240,7 +240,7 @@ void HelpProtocol::get( const KURL& url )
                 infoMessage( i18n( "Saving to cache" ) );
                 TQString cache = file.left( file.length() - 7 );
                 saveToCache( mParsed, locateLocal( "cache",
-                                                        "kio_help" + cache +
+                                                        "tdeio_help" + cache +
                                                         "cache.bz2" ) );
             }
         } else infoMessage( i18n( "Using cached version" ) );
@@ -333,7 +333,7 @@ void HelpProtocol::mimetype( const KURL &)
     finished();
 }
 
-// Copied from kio_file to avoid redirects
+// Copied from tdeio_file to avoid redirects
 
 #define MAX_IPC_SIZE (1024*32)
 
@@ -345,24 +345,24 @@ void HelpProtocol::get_file( const KURL& url )
     struct stat buff;
     if ( ::stat( _path.data(), &buff ) == -1 ) {
         if ( errno == EACCES )
-           error( KIO::ERR_ACCESS_DENIED, url.path() );
+           error( TDEIO::ERR_ACCESS_DENIED, url.path() );
         else
-           error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+           error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
 	return;
     }
 
     if ( S_ISDIR( buff.st_mode ) ) {
-	error( KIO::ERR_IS_DIRECTORY, url.path() );
+	error( TDEIO::ERR_IS_DIRECTORY, url.path() );
 	return;
     }
     if ( S_ISFIFO( buff.st_mode ) || S_ISSOCK ( buff.st_mode ) ) {
-	error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
+	error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
 	return;
     }
 
     int fd = open( _path.data(), O_RDONLY);
     if ( fd < 0 ) {
-	error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
+	error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
 	return;
     }
 
@@ -379,7 +379,7 @@ void HelpProtocol::get_file( const KURL& url )
        {
           if (errno == EINTR)
               continue;
-          error( KIO::ERR_COULD_NOT_READ, url.path());
+          error( TDEIO::ERR_COULD_NOT_READ, url.path());
           close(fd);
           return;
        }
diff --git a/kdoctools/kio_help.h b/kdoctools/tdeio_help.h
index 13c198af1..df002df15 100644
--- a/kdoctools/kio_help.h
+++ b/kdoctools/tdeio_help.h
@@ -15,10 +15,10 @@
 #include <tqvaluelist.h>
 
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
-class HelpProtocol : public KIO::SlaveBase
+class HelpProtocol : public TDEIO::SlaveBase
 {
 public:
 
diff --git a/kdoctools/tdeio_help.upd b/kdoctools/tdeio_help.upd
new file mode 100644
index 000000000..4be705f6e
--- /dev/null
+++ b/kdoctools/tdeio_help.upd
@@ -0,0 +1,3 @@
+# Move tdeio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help
+Id=trinity_2
+Script=move_tdeio_help_cache.sh,sh
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index f9803ff0d..498e6b2c8 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -11,8 +11,8 @@
 #include <tqregexp.h>
 #include <xslt.h>
 #include <kinstance.h>
-#include "kio_help.h"
-#include <klocale.h>
+#include "tdeio_help.h"
+#include <tdelocale.h>
 #include <assert.h>
 #include <kfilterbase.h>
 #include <kfilterdev.h>
@@ -114,7 +114,7 @@ xmlParserInputPtr meinExternalEntityLoader(const char *URL, const char *ID,
 	URL = "docbook/xml-dtd-4.1.2/docbookx.dtd";
 
     TQString file;
-    if (KStandardDirs::exists( TQDir::currentDirPath() + "/" + URL ) )
+    if (TDEStandardDirs::exists( TQDir::currentDirPath() + "/" + URL ) )
         file = TQDir::currentDirPath() + "/" + URL;
     else
         file = locate("dtd", URL);
@@ -179,14 +179,14 @@ TQString splitOut(const TQString &parsed, int index)
     return filedata;
 }
 
-void fillInstance(KInstance &ins, const TQString &srcdir) {
+void fillInstance(TDEInstance &ins, const TQString &srcdir) {
     TQString catalogs;
 
     if ( srcdir.isEmpty() ) {
         catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog");
         catalogs += ':';
         catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.2/docbook.cat");
-        ins.dirs()->addResourceType("dtd", KStandardDirs::kde_default("data") + "ksgmltools2");
+        ins.dirs()->addResourceType("dtd", TDEStandardDirs::kde_default("data") + "ksgmltools2");
     } else {
         catalogs += srcdir +"/customization/catalog:" + srcdir + "/docbook/xml-dtd-4.2/docbook.cat";
         ins.dirs()->addResourceDir("dtd", srcdir);
@@ -287,7 +287,7 @@ TQString lookForCache( const TQString &filename )
         return output;
     if ( readCache( filename,
                     locateLocal( "cache",
-                                 "kio_help" + cache +
+                                 "tdeio_help" + cache +
                                  "cache.bz2" ), output ) )
         return output;
 
diff --git a/kdoctools/xslt.h b/kdoctools/xslt.h
index 975bd3c88..c09e0c9eb 100644
--- a/kdoctools/xslt.h
+++ b/kdoctools/xslt.h
@@ -7,7 +7,7 @@
 TQString transform(const TQString &file, const TQString& stylesheet,
                   const TQValueVector<const char *> &params = TQValueVector<const char *>());
 TQString splitOut(const TQString &parsed, int index);
-void fillInstance(KInstance &ins, const TQString &srcdir = TQString::null );
+void fillInstance(TDEInstance &ins, const TQString &srcdir = TQString::null );
 bool saveToCache( const TQString &contents, const TQString &filename );
 TQString lookForCache( const TQString &filename );
 TQCString fromUnicode( const TQString &data );
diff --git a/khtml/Makefile.am b/khtml/Makefile.am
deleted file mode 100644
index 35825194d..000000000
--- a/khtml/Makefile.am
+++ /dev/null
@@ -1,133 +0,0 @@
-#    This file is part of the KDE libraries
-#    Copyright (C) 1997 Martin Jones (mjones@kde.org)
-#              (C) 1997 Torben Weis (weis@kde.org)
-
-#    This library is free software; you can redistribute it and/or
-#    modify it under the terms of the GNU Library General Public
-#    License as published by the Free Software Foundation; either
-#    version 2 of the License, or (at your option) any later version.
-
-#    This library is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#    Library General Public License for more details.
-
-#    You should have received a copy of the GNU Library General Public License
-#    along with this library; see the file COPYING.LIB.  If not, write to
-#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
-
-KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
-
-if DOJAVA
-JAVA_SUBDIR=java
-LIBKJAVA=
-endif
-
-SUBDIRS = misc dom css xml html rendering pics $(JAVA_SUBDIR) ecma . kmultipart
-
-CLEANFILES = dummy.cpp
-
-lib_LTLIBRARIES = libkhtml.la
-kde_module_LTLIBRARIES = libkhtmlpart.la khtmlimagepart.la
-
-libkhtml_la_SOURCES = kjserrordlg.ui khtmlview.cpp khtml_part.cpp khtml_run.cpp\
-			khtml_factory.cpp khtml_settings.cc khtml_events.cpp \
-			khtml_ext.cpp khtml_pagecache.cpp khtml_iface.skel \
-			khtml_iface.cc khtml_printsettings.cpp htmlpageinfo.ui \
-			khtmlimage.cpp
-
-libkhtml_la_METASOURCES = AUTO
-
-include_HEADERS = khtmlview.h khtml_part.h khtml_events.h khtml_settings.h khtmldefaults.h
-
-noinst_HEADERS = design.h testkhtml.h test_regression.h khtml_ext.h \
-		 khtml_pagecache.h khtmlimage.h khtmlpart_p.h khtml_printsettings.h \
-		kjserrordlg.ui.h
-
-if include_VERSION_SCRIPT
-VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map
-endif
-
-libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
-libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
-	./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
-	./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \
-	$(LIB_KPARTS) \
-	$(LIBTHAI) \
-	$(top_builddir)/tdeprint/libtdeprint.la  \
-	$(top_builddir)/kutils/libkutils.la \
-	$(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
-
-# init_libkhtml is in libkhtml.so; init_libkhtmlpart needs to be in the part
-dummy.cpp: $(srcdir)/Makefile.am
-	echo '#include <tdelibs_export.h>' > $@
-	echo 'extern "C" KDE_EXPORT void* init_libkhtml();' >> $@
-	echo 'extern "C" KDE_EXPORT void* init_libkhtmlpart() { return init_libkhtml(); } ' >> $@
-
-libkhtmlpart_la_SOURCES = dummy.cpp
-libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-libkhtmlpart_la_LIBADD = libkhtml.la $(LIB_QT)
-
-# init_khtmlimagefactory is in libkhtml.so; init_khtmlimagepart needs to be in the part
-imgdummy.cpp: $(srcdir)/Makefile.am
-	echo '#include <tdelibs_export.h>' > $@
-	echo 'extern "C"  KDE_EXPORT void* init_khtmlimagefactory();' >> $@
-	echo 'extern "C"  KDE_EXPORT void* init_khtmlimagepart() { return init_khtmlimagefactory(); } ' >> $@
-
-khtmlimagepart_la_SOURCES = imgdummy.cpp
-khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-khtmlimagepart_la_LIBADD = libkhtml.la $(LIB_QT)
-
-INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
-	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
-	-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
-	-I$(top_srcdir)/libltdl \
-	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
-	-I$(top_srcdir)/tdeprint \
-	-I$(top_srcdir)/interfaces \
-	-I$(top_srcdir)/interfaces/kregexpeditor \
-        -I$(top_srcdir)/kwallet/client \
-	-I$(top_srcdir)/kutils \
-	-I$(top_srcdir) $(all_includes)
-
-servicedir = $(kde_servicesdir)
-service_DATA = khtml.desktop khtmlimage.desktop
-
-rcdir = $(kde_datadir)/khtml
-rc_DATA = khtml.rc khtml_browser.rc khtml_popupmenu.rc
-
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
-
-## generate lib documentation
-srcdoc:
-	$(mkinstalldirs) $(SRCDOC_DEST)
-	kdoc -H -d $(SRCDOC_DEST) tdecore \
-	         $(include_HEADERS) -lqt
-
-EXTRA_DIST =  CHANGES DESIGN README.HTMLWidget README.tags 
-
-parser:
-	cd $(srcdir) && \
-	perl scripts/makeattrs && \
-	bash scripts/maketags && \
-	bash scripts/makeprop
-
-## test program
-check_PROGRAMS 	= testkhtml
-EXTRA_PROGRAMS = testkhtml_static testregression
-testkhtml_SOURCES = testkhtml.cpp domtreeview.cpp
-testkhtml_LDADD = libkhtml.la 
-testkhtml_static_SOURCES = testkhtml.cpp domtreeview.cpp 
-testkhtml_static_LDADD = libkhtml.la
-testkhtml_static_LDFLAGS = -static
-testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp
-testregression_LDADD = libkhtml.la
-
-DOXYGEN_REFERENCES = tdecore tdeui kio tdefx kparts
-DOXYGEN_EXCLUDE =  test*.* css ecma html java kmultipart misc pics rendering test xml
-
-include ../admin/Doxyfile.am
-
-.PHONY: parser
-
diff --git a/khtml/css/parser.h b/khtml/css/parser.h
deleted file mode 100644
index e3375db66..000000000
--- a/khtml/css/parser.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
-
-/*  Skeleton parser for Yacc-like parsing with Bison,
-    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     UNIMPORTANT_TOK = 258,
-     S = 259,
-     SGML_CD = 260,
-     INCLUDES = 261,
-     DASHMATCH = 262,
-     BEGINSWITH = 263,
-     ENDSWITH = 264,
-     CONTAINS = 265,
-     STRING = 266,
-     IDENT = 267,
-     NTH = 268,
-     HASH = 269,
-     IMPORT_SYM = 270,
-     PAGE_SYM = 271,
-     MEDIA_SYM = 272,
-     FONT_FACE_SYM = 273,
-     CHARSET_SYM = 274,
-     NAMESPACE_SYM = 275,
-     KHTML_RULE_SYM = 276,
-     KHTML_DECLS_SYM = 277,
-     KHTML_VALUE_SYM = 278,
-     IMPORTANT_SYM = 279,
-     QEMS = 280,
-     EMS = 281,
-     EXS = 282,
-     PXS = 283,
-     CMS = 284,
-     MMS = 285,
-     INS = 286,
-     PTS = 287,
-     PCS = 288,
-     DEGS = 289,
-     RADS = 290,
-     GRADS = 291,
-     MSECS = 292,
-     SECS = 293,
-     HERZ = 294,
-     KHERZ = 295,
-     DIMEN = 296,
-     PERCENTAGE = 297,
-     FLOAT = 298,
-     INTEGER = 299,
-     URI = 300,
-     FUNCTION = 301,
-     NOTFUNCTION = 302,
-     UNICODERANGE = 303
-   };
-#endif
-#define UNIMPORTANT_TOK 258
-#define S 259
-#define SGML_CD 260
-#define INCLUDES 261
-#define DASHMATCH 262
-#define BEGINSWITH 263
-#define ENDSWITH 264
-#define CONTAINS 265
-#define STRING 266
-#define IDENT 267
-#define NTH 268
-#define HASH 269
-#define IMPORT_SYM 270
-#define PAGE_SYM 271
-#define MEDIA_SYM 272
-#define FONT_FACE_SYM 273
-#define CHARSET_SYM 274
-#define NAMESPACE_SYM 275
-#define KHTML_RULE_SYM 276
-#define KHTML_DECLS_SYM 277
-#define KHTML_VALUE_SYM 278
-#define IMPORTANT_SYM 279
-#define QEMS 280
-#define EMS 281
-#define EXS 282
-#define PXS 283
-#define CMS 284
-#define MMS 285
-#define INS 286
-#define PTS 287
-#define PCS 288
-#define DEGS 289
-#define RADS 290
-#define GRADS 291
-#define MSECS 292
-#define SECS 293
-#define HERZ 294
-#define KHERZ 295
-#define DIMEN 296
-#define PERCENTAGE 297
-#define FLOAT 298
-#define INTEGER 299
-#define URI 300
-#define FUNCTION 301
-#define NOTFUNCTION 302
-#define UNICODERANGE 303
-
-
-
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-
-typedef union YYSTYPE {
-    CSSRuleImpl *rule;
-    CSSSelector *selector;
-    TQPtrList<CSSSelector> *selectorList;
-    bool ok;
-    MediaListImpl *mediaList;
-    CSSMediaRuleImpl *mediaRule;
-    CSSRuleListImpl *ruleList;
-    ParseString string;
-    float val;
-    int prop_id;
-    unsigned int attribute;
-    unsigned int element;
-    unsigned int ns;
-    CSSSelector::Relation relation;
-    CSSSelector::Match match;
-    bool b;
-    char tok;
-    Value value;
-    ValueList *valueList;
-} YYSTYPE;
-/* Line 1285 of yacc.c.  */
-
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-
-
diff --git a/khtml/css/tokenizer.cpp b/khtml/css/tokenizer.cpp
deleted file mode 100644
index 493a98032..000000000
--- a/khtml/css/tokenizer.cpp
+++ /dev/null
@@ -1,930 +0,0 @@
-/*
- * This file is part of the DOM implementation for KDE.
- *
- * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/* This file is mostly data generated by flex. Unfortunately flex
-   can't handle 16bit strings directly, so we just copy the part of
-   the code we need and modify it to our needs.
-
-   Most of the defines below are to make sure we can easily use the
-   flex generated code, using as little editing as possible.
-
-   The flex syntax to generate the lexer are more or less directly
-   copied from the CSS2.1 specs, with some fixes for comments and
-   the important symbol.
-
-   To regenerate, run flex on tokenizer.flex. After this, copy the
-   data tables and the YY_DECL method over to this file. Remove the
-   init code from YY_DECL and change the YY_END_OF_BUFFER to only call
-   yyterminate().
-
-*/
-
-// --------- begin generated code -------------------
-#define YY_NUM_RULES 51
-#define YY_END_OF_BUFFER 52
-static yyconst short int yy_accept[331] =
-    {   0,
-        0,    0,   52,   50,    2,    2,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   42,   50,   50,   50,   50,
-       11,   11,   11,   50,   50,    2,    0,    0,    0,   10,
-        0,   13,    0,    8,    0,    0,    9,    0,    0,    0,
-       11,   11,   43,    0,   41,    0,    0,   42,    0,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   12,
-       40,   40,   37,    0,    0,    0,    0,    0,    0,    0,
-        0,   11,   11,    7,   47,   11,    0,    0,   11,   11,
-        0,   11,    6,    5,    0,    0,    0,   10,    0,    0,
-       13,   13,    0,    0,   10,    0,    0,    4,   12,    0,
-
-        0,   40,   40,   40,    0,   40,   28,   40,   24,   26,
-       40,   38,   30,   40,   29,   36,   40,   32,   31,   27,
-       40,    0,    0,    0,    0,    0,    0,    0,    0,   11,
-       11,   11,   12,   11,   11,   48,   48,   11,    0,    0,
-        0,   13,    0,    0,    0,    1,   40,   40,   40,   40,
-       33,   40,   39,   12,   34,    3,    0,    0,    0,    0,
-        0,    0,    0,   11,   11,   44,    0,   48,   48,   48,
-       47,    0,    0,   13,    0,    0,    0,   40,   40,   40,
-       35,    0,    0,    0,    0,    0,    0,   15,   11,   11,
-       49,   48,   48,   48,   48,    0,    0,    0,    0,   46,
-
-        0,    0,    0,   13,    0,   40,   40,   25,    0,    0,
-        0,    0,   16,    0,   11,   11,   49,   48,   48,   48,
-       48,   48,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   46,    0,    0,    0,    0,   13,    0,   40,   40,
-        0,    0,    0,   14,    0,   11,   11,   49,   48,   48,
-       48,   48,   48,   48,    0,   45,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   13,
-        0,   40,   40,    0,   18,    0,    0,   11,   49,   48,
-       48,   48,   48,   48,   48,   48,    0,   45,    0,    0,
-        0,   45,    0,    0,    0,    0,   40,    0,    0,    0,
-
-        0,    0,   49,    0,    0,    0,   23,    0,    0,    0,
-       17,   19,   49,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   20,    0,    0,    0,   21,   22,    0
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    4,    5,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    6,    7,    8,    9,   10,   11,   12,   13,   14,
-       15,   16,   17,   12,   18,   19,   20,   21,   21,   21,
-       21,   21,   21,   21,   21,   21,   21,   12,   12,   22,
-       23,   24,   25,   26,   30,   31,   32,   33,   34,   35,
-       36,   37,   38,   39,   40,   41,   42,   43,   44,   45,
-       46,   47,   48,   49,   50,   51,   39,   52,   39,   53,
-       12,   27,   12,   28,   29,   12,   30,   31,   32,   33,
-
-       34,   35,   36,   37,   38,   39,   40,   41,   42,   43,
-       44,   45,   46,   47,   48,   49,   50,   51,   39,   52,
-       39,   53,   12,   54,   12,   55,    1,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56
-    } ;
-
-static yyconst int yy_meta[57] =
-    {   0,
-        1,    2,    3,    3,    3,    4,    4,    4,    4,    4,
-        4,    4,    4,    5,    4,    4,    4,    6,    4,    4,
-        6,    4,    4,    4,    7,    4,    8,    4,    8,    9,
-        9,    9,    9,    9,    9,    8,    8,    8,    8,    8,
-        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-        8,    8,    8,    4,    4,    8
-    } ;
-
-static yyconst short int yy_base[359] =
-    {   0,
-        0,    0,  807, 1638,   55,   60,   65,   64,  779,  781,
-       60,  780,   56,  781,  785,   93,  793,   63,  126,  773,
-       61,   75,  136,  772,  771,  162,  167,  751,   70, 1638,
-      204,  764,  154, 1638,   63,  238, 1638,  760,   64,  160,
-       82,  183,  133,  767, 1638,  755,  760,    0,  183,   53,
-      753,   52,   83,  169,  135,  121,   57,  192,  205,  206,
-      225,   86,  745,  752,  729,  731,  723,  716,  723,  726,
-      725,  231,  276, 1638, 1638,  234,  254,  733,  235,  249,
-      291,  277, 1638, 1638,  701,  195,  172,  219,  325,  359,
-      717,  393,  217,  237,  286,  427,  461, 1638,  160,  727,
-
-      135,  715,  495,  714,  344,  256,  700,  265,  699,  698,
-       88,  697,  696,  175,  695,  694,  233,  693,  679,  678,
-      267,  684,  664,  670,  656,  640,  651,  622,  627,  446,
-      305,  529,  639,  320,  321,  318,  634,  323,  614,  287,
-      521,  536,  326,  544,  641, 1638,  551,  621,  585,  311,
-      619,  339,  618,  360,  617, 1638,  594,  582,  556,  559,
-      564,  567,  566,  577,  592, 1638,  600,  324,  574,  572,
-      634,  549,  620,  635,  641,  579,  324,  656,  662,  278,
-      567,  551,  544,  562,  526,  528,  501, 1638,  677,  683,
-      698,  382,  523,  522,  521,  732,  758,  288,  341, 1638,
-
-      784,  496,  718,  744,  791,  799,  806,  517,  502,  489,
-      486,  471, 1638,  474,  814,  821,  829,  383,  493,  485,
-      484,  481,  400,  343,  407,  863,  356,  897,  931,  957,
-      983, 1009, 1035, 1069,  475,  848,  882,  917,  943,  969,
-      486,  453,  460, 1638,  445,  995, 1076, 1084,  416,  448,
-      447,  444,  443,  426,  440, 1638,  444,  408,  509, 1118,
-     1152,  601,  358, 1131, 1186, 1220, 1205,  407, 1227, 1235,
-     1242,  481, 1250,  456, 1638,  417,  406,  535, 1257,  403,
-     1638, 1638, 1638, 1638, 1638, 1638, 1049,  409,  410, 1265,
-     1299,  426,  443, 1285, 1300,  370,  676,  354,  334,  352,
-
-      339,  283, 1306, 1321, 1327, 1342, 1638,  261,  226,  225,
-     1638, 1638, 1638, 1348, 1363, 1369,  214,  192,  129, 1384,
-     1390, 1405,   73, 1638,   52, 1411, 1426, 1638, 1638, 1638,
-     1460, 1464, 1472, 1476, 1482, 1487, 1495, 1501, 1509, 1518,
-     1520, 1526, 1530, 1536, 1545, 1551, 1555, 1564, 1568, 1576,
-     1580, 1588, 1596, 1604, 1608, 1616, 1624, 1628
-    } ;
-
-static yyconst short int yy_def[359] =
-    {   0,
-      330,    1,  330,  330,  330,  330,  330,  331,  332,  330,
-      333,  330,  334,  330,  330,  330,  330,  330,  335,  330,
-      336,  336,  336,  330,  330,  330,  330,  330,  331,  330,
-      337,  332,  338,  330,  333,  339,  330,  330,  330,  335,
-      336,  336,   16,  340,  330,  341,  330,   16,  342,  343,
-      343,  343,  343,  343,  343,  343,  343,  343,  343,  343,
-      343,  343,  343,  330,  330,  330,  330,  330,  330,  330,
-      330,  336,  336,  330,  330,  336,  344,  330,  336,  336,
-      330,  336,  330,  330,  330,  331,  331,  331,  331,  337,
-      332,  332,  333,  333,  333,  333,  339,  330,  330,  340,
-
-      345,  343,  343,  343,  346,  343,  343,  343,  343,  343,
-      343,  343,  343,  343,  343,  343,  343,  343,  343,  343,
-      343,  330,  330,  330,  330,  330,  330,  330,  330,   73,
-      336,   73,  330,  336,  336,  347,  330,  336,  330,  331,
-       89,   92,  333,   96,  348,  330,  103,  343,  103,  343,
-      343,  343,  343,  343,  343,  330,  330,  330,  330,  330,
-      330,  330,  330,   73,  132,  330,  330,  349,  330,  330,
-      350,  330,   89,   92,   96,  348,  345,  103,  149,  343,
-      343,  330,  330,  330,  330,  330,  330,  330,   73,  132,
-      330,  351,  330,  330,  330,  350,  350,  352,  353,  330,
-
-      354,  330,   89,   92,   96,  103,  149,  343,  330,  330,
-      330,  330,  330,  330,   73,  132,  330,  355,  330,  330,
-      330,  330,  330,  352,  330,  356,  353,  357,  350,  350,
-      350,  350,  350,  354,  330,   89,   92,   96,  103,  149,
-      330,  330,  330,  330,  330,   73,  132,  330,  358,  330,
-      330,  330,  330,  330,  330,  330,  352,  352,  352,  352,
-      356,  353,  353,  353,  353,  357,  233,  330,   89,   92,
-       96,  343,  149,  330,  330,  330,  330,  246,  330,  330,
-      330,  330,  330,  330,  330,  330,  352,  352,  352,  260,
-      353,  353,  353,  265,  233,  330,  343,  330,  330,  330,
-
-      330,  330,  330,  260,  265,  233,  330,  330,  330,  330,
-      330,  330,  330,  260,  265,  233,  330,  330,  330,  260,
-      265,  233,  330,  330,  330,  260,  265,  330,  330,    0,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330
-    } ;
-
-static yyconst short int yy_nxt[1695] =
-    {   0,
-        4,    5,    6,    5,    5,    5,    7,    8,    9,   10,
-        4,    4,   11,    4,    4,   12,    4,   13,   14,   15,
-       16,   17,    4,    4,    4,   18,   19,   20,   21,   21,
-       21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
-       21,   21,   22,   21,   21,   21,   21,   21,   21,   23,
-       21,   21,   21,   24,   25,   21,   26,   26,   26,   26,
-       26,   26,   26,   26,   26,   26,   27,   27,   27,   27,
-       27,   30,   30,   38,   75,   30,   39,   30,  105,  105,
-       65,  106,   40,  105,   39,  329,   36,   77,   75,   36,
-       31,   78,   79,  107,   66,   75,   31,   67,   42,  113,
-
-       68,   77,   28,   45,   69,   70,   99,   71,   77,  105,
-       46,   47,  105,   48,  105,  121,  108,  152,   80,   49,
-      328,   50,   51,   51,   52,   53,   54,   51,   55,   56,
-       57,   51,   58,   51,   59,   60,   51,   61,   51,   62,
-       63,   51,   51,   51,   51,   51,   73,  105,   51,   75,
-      101,  330,   81,   43,  146,   73,   73,   73,   73,   73,
-       73,  105,   77,   26,   26,   26,   26,   26,   27,   27,
-       27,   27,   27,  112,   92,   51,   78,   78,  325,   30,
-       73,  111,   82,   92,   92,   92,   92,   92,   92,   73,
-       73,   73,   73,   73,   73,  105,   75,   29,   31,   78,
-
-       79,  105,   30,  103,   28,   29,   29,   29,   86,   77,
-      109,   88,  103,  103,  103,  103,  103,  103,  105,   35,
-      110,   31,   78,  117,   89,  324,   30,  153,  114,   30,
-       90,  105,  105,   89,   89,   89,   89,   89,   89,   35,
-       35,   35,   93,   36,   75,   31,  115,   75,   75,   30,
-       95,  105,  116,  154,  323,  134,  118,   77,   96,  105,
-       77,   77,   75,   36,   97,  319,  318,   96,   96,   96,
-       96,   96,   96,  119,  132,   77,  120,   72,   72,   72,
-       72,   72,  105,  132,  132,  132,  132,  132,  132,   75,
-       75,  105,  317,  105,   30,  225,  130,  135,   30,  155,
-
-      151,  150,   77,   77,  105,  130,  130,  130,  130,  130,
-      130,  136,   36,   31,  226,  137,  312,  138,   75,  208,
-      136,  136,  136,  136,  136,  136,   87,  140,  140,  140,
-       87,   77,   30,   75,  166,  167,  171,  105,   30,  177,
-      134,  167,  169,  146,  180,  141,   77,   77,  193,   77,
-      225,   31,   36,  225,  141,  141,  141,  141,  141,  141,
-       29,   29,   29,   86,  149,  105,   88,  228,  225,  226,
-      225,  181,  311,  149,  149,  149,  149,  149,  149,   89,
-      154,  310,  228,  309,  228,   90,  105,  308,   89,   89,
-       89,   89,   89,   89,   91,   91,   91,   91,   91,  167,
-
-      167,  223,  223,  223,  223,  223,  219,  250,  255,  255,
-      255,  255,  255,  142,  200,  225,  225,  225,  307,   33,
-      167,  256,  142,  142,  142,  142,  142,  142,   94,  143,
-      143,  143,   94,  167,  226,  226,  226,  302,  225,   30,
-      281,  255,  255,  255,  255,  255,  224,  144,  301,  296,
-      286,  225,  228,   36,  256,  225,  144,  144,  144,  144,
-      144,  144,   35,   35,   35,   93,  164,  285,  284,  228,
-      226,  283,  282,   95,  277,  164,  164,  164,  164,  164,
-      164,   96,  102,  102,  102,  102,  102,   97,  298,  276,
-       96,   96,   96,   96,   96,   96,  102,  102,  102,  102,
-
-      102,  275,  299,  274,  268,  254,  300,  105,  253,  252,
-      287,  255,  255,  255,  287,  147,  225,  251,  245,  244,
-      243,  105,  242,  288,  147,  147,  147,  147,  147,  147,
-      131,  131,  131,  131,  131,  226,  131,  131,  131,  131,
-      131,  173,  241,  105,  235,  222,  221,  220,  214,  165,
-      173,  173,  173,  173,  173,  173,  174,  213,  165,  165,
-      165,  165,  165,  165,  175,  174,  174,  174,  174,  174,
-      174,  178,  212,  175,  175,  175,  175,  175,  175,  211,
-      178,  178,  178,  178,  178,  178,  148,  148,  148,  148,
-      148,  210,  209,  105,  177,  202,  195,  189,  194,  188,
-
-      187,  186,  185,  227,  184,  179,  189,  189,  189,  189,
-      189,  189,  190,  225,  179,  179,  179,  179,  179,  179,
-      191,  190,  190,  190,  190,  190,  190,  228,  183,  191,
-      191,  191,  191,  191,  191,  196,  196,  196,  196,  196,
-      203,  198,  182,  105,  105,  105,  199,  105,  200,  203,
-      203,  203,  203,  203,  203,  204,  177,  172,  170,  133,
-      201,  205,  163,  162,  204,  204,  204,  204,  204,  204,
-      205,  205,  205,  205,  205,  205,  206,  148,  148,  148,
-      148,  148,  207,  161,  160,  206,  206,  206,  206,  206,
-      206,  207,  207,  207,  207,  207,  207,  215,  159,  158,
-
-      157,  156,  105,  216,  105,  105,  215,  215,  215,  215,
-      215,  215,  216,  216,  216,  216,  216,  216,  217,  105,
-      105,  105,  105,  105,  105,  105,  105,  217,  217,  217,
-      217,  217,  217,  196,  196,  196,  196,  196,  236,  198,
-      105,  105,  101,   33,  199,  139,  200,  236,  236,  236,
-      236,  236,  236,  133,  129,  128,  127,  126,  201,  223,
-      223,  223,  223,  223,  237,  330,  125,  124,  123,  122,
-      330,  105,  200,  237,  237,  237,  237,  237,  237,  105,
-       43,   49,  101,   98,  201,  223,  223,  223,  223,  229,
-       33,  231,   85,   84,   83,   74,  231,  231,  232,   64,
-
-       44,   43,   37,   34,  233,   33,  330,  330,  330,  330,
-      234,  238,  330,  233,  233,  233,  233,  233,  233,  239,
-      238,  238,  238,  238,  238,  238,  240,  330,  239,  239,
-      239,  239,  239,  239,  246,  240,  240,  240,  240,  240,
-      240,  247,  330,  246,  246,  246,  246,  246,  246,  248,
-      247,  247,  247,  247,  247,  247,  330,  330,  248,  248,
-      248,  248,  248,  248,  224,  224,  224,  257,  269,  330,
-      259,  330,  330,  330,  330,  330,  330,  269,  269,  269,
-      269,  269,  269,  260,  330,  330,  330,  330,  330,  261,
-      330,  330,  260,  260,  260,  260,  260,  260,  227,  227,
-
-      227,  262,  270,  330,  330,  330,  330,  330,  330,  264,
-      330,  270,  270,  270,  270,  270,  270,  265,  330,  330,
-      330,  330,  330,  266,  330,  330,  265,  265,  265,  265,
-      265,  265,  223,  223,  223,  223,  223,  271,  330,  330,
-      330,  330,  330,  330,  330,  200,  271,  271,  271,  271,
-      271,  271,  330,  330,  330,  330,  330,  201,  223,  223,
-      223,  223,  223,  272,  330,  330,  330,  330,  330,  330,
-      330,  200,  272,  272,  272,  272,  272,  272,  330,  330,
-      330,  330,  330,  201,  223,  223,  223,  223,  223,  273,
-      330,  330,  330,  330,  330,  330,  330,  200,  273,  273,
-
-      273,  273,  273,  273,  330,  330,  330,  330,  330,  201,
-      223,  223,  223,  223,  223,   76,  330,  330,  330,  330,
-      330,  330,  330,  200,   76,   76,   76,   76,   76,   76,
-      330,  330,  330,  330,  330,  201,  229,  229,  229,  229,
-      229,  330,  330,  330,  330,  330,  330,  330,  330,  200,
-      287,  255,  255,  255,  287,  267,  225,  330,  330,  330,
-      330,  201,  330,  288,  267,  267,  267,  267,  267,  267,
-      223,  223,  223,  223,  229,  226,  231,  330,  330,  330,
-      330,  231,  231,  232,  330,  330,  330,  330,  330,  233,
-      330,  330,  330,  330,  330,  234,  278,  330,  233,  233,
-
-      233,  233,  233,  233,  279,  278,  278,  278,  278,  278,
-      278,  330,  330,  279,  279,  279,  279,  279,  279,  258,
-      289,  289,  289,  258,  330,  225,  330,  330,  330,  330,
-      330,  330,  291,  255,  255,  255,  291,  330,  290,  330,
-      330,  330,  330,  225,  226,  292,  330,  290,  290,  290,
-      290,  290,  290,  224,  224,  224,  257,  228,  330,  259,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  260,  330,  330,  330,  330,  330,  261,  330,
-      330,  260,  260,  260,  260,  260,  260,  263,  293,  293,
-      293,  263,  330,  330,  330,  330,  330,  330,  225,  330,
-
-      330,  330,  330,  330,  330,  330,  294,  330,  330,  330,
-      330,  330,  228,  330,  330,  294,  294,  294,  294,  294,
-      294,  227,  227,  227,  262,  295,  330,  330,  330,  330,
-      330,  330,  264,  330,  295,  295,  295,  295,  295,  295,
-      265,  330,  330,  330,  330,  330,  266,   29,  330,  265,
-      265,  265,  265,  265,  265,   32,   29,   29,   29,   29,
-       29,   29,   35,  330,   32,   32,   32,   32,   32,   32,
-      297,   35,   35,   35,   35,   35,   35,  303,  330,  297,
-      297,  297,  297,  297,  297,  304,  303,  303,  303,  303,
-      303,  303,  330,  330,  304,  304,  304,  304,  304,  304,
-
-      291,  255,  255,  255,  291,  305,  330,  330,  330,  330,
-      330,  225,  330,  292,  305,  305,  305,  305,  305,  305,
-      306,  330,  330,  330,  330,  228,  313,  330,  330,  306,
-      306,  306,  306,  306,  306,  313,  313,  313,  313,  313,
-      313,  314,  330,  330,  330,  330,  330,  315,  330,  330,
-      314,  314,  314,  314,  314,  314,  315,  315,  315,  315,
-      315,  315,  316,  330,  330,  330,  330,  330,  320,  330,
-      330,  316,  316,  316,  316,  316,  316,  320,  320,  320,
-      320,  320,  320,  321,  330,  330,  330,  330,  330,  322,
-      330,  330,  321,  321,  321,  321,  321,  321,  322,  322,
-
-      322,  322,  322,  322,  326,  330,  330,  330,  330,  330,
-      327,  330,  330,  326,  326,  326,  326,  326,  326,  327,
-      327,  327,  327,  327,  327,  197,  330,  330,  330,  330,
-      330,  224,  330,  330,  197,  197,  197,  197,  197,  197,
-      224,  224,  224,  224,  224,  224,  227,  330,  330,  330,
-      330,  330,  330,  330,  330,  227,  227,  227,  227,  227,
-      227,   29,  330,   29,   29,   29,   29,   29,   29,   32,
-      330,   32,   32,   35,  330,   35,   35,   35,   35,   35,
-       35,   41,  330,   41,   41,   72,   72,   72,   72,   72,
-       72,   76,   76,  330,   76,   76,   87,   87,   87,   87,
-
-       87,   87,   87,   87,   91,   91,   91,   91,   91,   91,
-       94,   94,   94,   94,   94,   94,   94,   94,  100,  100,
-      100,  100,  100,  100,  100,  100,  100,   51,   51,  102,
-      102,  102,  102,  102,  102,  104,  330,  104,  104,  131,
-      131,  131,  131,  131,  131,  145,  145,  145,  145,  145,
-      145,  145,  145,  145,  148,  148,  148,  148,  148,  148,
-      168,  168,  330,  168,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  192,  192,  330,  192,  197,  197,  197,
-      330,  197,  197,  197,  197,  218,  218,  330,  218,  224,
-      330,  224,  224,  224,  224,  224,  224,  227,  330,  227,
-
-      227,  227,  227,  227,  227,  230,  230,  230,  230,  230,
-      230,  230,  230,  249,  249,  330,  249,  258,  258,  258,
-      258,  258,  258,  258,  258,  263,  263,  263,  263,  263,
-      263,  263,  263,  280,  280,  330,  280,    3,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330
-
-    } ;
-
-static yyconst short int yy_chk[1695] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    5,    5,    5,    5,
-        5,    6,    6,    6,    6,    6,    7,    7,    7,    7,
-        7,    8,   11,   13,   21,   35,   13,   29,   52,   50,
-       18,   50,   13,   57,   39,  325,   11,   21,   22,   35,
-        8,   22,   22,   52,   18,   41,   29,   18,   13,   57,
-
-       18,   22,    7,   16,   18,   18,   39,   18,   41,   53,
-       16,   16,   62,   16,  111,   62,   53,  111,   22,   16,
-      323,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-       16,   16,   16,   16,   16,   16,   19,   56,   16,   23,
-      101,   43,   23,   43,  101,   19,   19,   19,   19,   19,
-       19,   55,   23,   26,   26,   26,   26,   26,   27,   27,
-       27,   27,   27,   56,   33,   43,   99,   99,  319,   87,
-       40,   55,   23,   33,   33,   33,   33,   33,   33,   40,
-       40,   40,   40,   40,   40,   54,   42,   86,   87,   42,
-
-       42,  114,   86,   49,   27,   31,   31,   31,   31,   42,
-       54,   31,   49,   49,   49,   49,   49,   49,   58,   93,
-       54,   86,   60,   60,   31,  318,   88,  114,   58,   93,
-       31,   59,   60,   31,   31,   31,   31,   31,   31,   36,
-       36,   36,   36,   93,   72,   88,   59,   76,   79,   94,
-       36,   61,   59,  117,  317,   79,   61,   72,   36,  117,
-       76,   79,   80,   94,   36,  310,  309,   36,   36,   36,
-       36,   36,   36,   61,   77,   80,   61,   73,   73,   73,
-       73,   73,  106,   77,   77,   77,   77,   77,   77,   73,
-       82,  108,  308,  121,  140,  198,   73,   80,   95,  121,
-
-      108,  106,   73,   82,  180,   73,   73,   73,   73,   73,
-       73,   81,   95,  140,  198,   81,  302,   82,  131,  180,
-       81,   81,   81,   81,   81,   81,   89,   89,   89,   89,
-       89,  131,   89,  134,  135,  136,  138,  150,  143,  177,
-      134,  168,  136,  177,  150,   89,  134,  135,  168,  138,
-      224,   89,  143,  199,   89,   89,   89,   89,   89,   89,
-       90,   90,   90,   90,  105,  152,   90,  199,  227,  224,
-      263,  152,  301,  105,  105,  105,  105,  105,  105,   90,
-      154,  300,  227,  299,  263,   90,  154,  298,   90,   90,
-       90,   90,   90,   90,   92,   92,   92,   92,   92,  192,
-
-      218,  223,  223,  223,  223,  223,  192,  218,  225,  225,
-      225,  225,  225,   92,  223,  258,  288,  289,  296,   92,
-      280,  225,   92,   92,   92,   92,   92,   92,   96,   96,
-       96,   96,   96,  249,  258,  288,  289,  277,  292,   96,
-      249,  255,  255,  255,  255,  255,  257,   96,  276,  268,
-      254,  257,  292,   96,  255,  293,   96,   96,   96,   96,
-       96,   96,   97,   97,   97,   97,  130,  253,  252,  293,
-      257,  251,  250,   97,  245,  130,  130,  130,  130,  130,
-      130,   97,  272,  272,  272,  272,  272,   97,  274,  243,
-       97,   97,   97,   97,   97,   97,  103,  103,  103,  103,
-
-      103,  242,  274,  241,  235,  222,  274,  272,  221,  220,
-      259,  259,  259,  259,  259,  103,  259,  219,  214,  212,
-      211,  103,  210,  259,  103,  103,  103,  103,  103,  103,
-      132,  132,  132,  132,  132,  259,  278,  278,  278,  278,
-      278,  141,  209,  208,  202,  195,  194,  193,  187,  132,
-      141,  141,  141,  141,  141,  141,  142,  186,  132,  132,
-      132,  132,  132,  132,  144,  142,  142,  142,  142,  142,
-      142,  147,  185,  144,  144,  144,  144,  144,  144,  184,
-      147,  147,  147,  147,  147,  147,  149,  149,  149,  149,
-      149,  183,  182,  181,  176,  172,  170,  164,  169,  163,
-
-      162,  161,  160,  262,  159,  149,  164,  164,  164,  164,
-      164,  164,  165,  262,  149,  149,  149,  149,  149,  149,
-      167,  165,  165,  165,  165,  165,  165,  262,  158,  167,
-      167,  167,  167,  167,  167,  171,  171,  171,  171,  171,
-      173,  171,  157,  155,  153,  151,  171,  148,  171,  173,
-      173,  173,  173,  173,  173,  174,  145,  139,  137,  133,
-      171,  175,  129,  128,  174,  174,  174,  174,  174,  174,
-      175,  175,  175,  175,  175,  175,  178,  297,  297,  297,
-      297,  297,  179,  127,  126,  178,  178,  178,  178,  178,
-      178,  179,  179,  179,  179,  179,  179,  189,  125,  124,
-
-      123,  122,  297,  190,  120,  119,  189,  189,  189,  189,
-      189,  189,  190,  190,  190,  190,  190,  190,  191,  118,
-      116,  115,  113,  112,  110,  109,  107,  191,  191,  191,
-      191,  191,  191,  196,  196,  196,  196,  196,  203,  196,
-      104,  102,  100,   91,  196,   85,  196,  203,  203,  203,
-      203,  203,  203,   78,   71,   70,   69,   68,  196,  197,
-      197,  197,  197,  197,  204,  197,   67,   66,   65,   64,
-      197,   63,  197,  204,  204,  204,  204,  204,  204,   51,
-       47,   46,   44,   38,  197,  201,  201,  201,  201,  201,
-       32,  201,   28,   25,   24,   20,  201,  201,  201,   17,
-
-       15,   14,   12,   10,  201,    9,    3,    0,    0,    0,
-      201,  205,    0,  201,  201,  201,  201,  201,  201,  206,
-      205,  205,  205,  205,  205,  205,  207,    0,  206,  206,
-      206,  206,  206,  206,  215,  207,  207,  207,  207,  207,
-      207,  216,    0,  215,  215,  215,  215,  215,  215,  217,
-      216,  216,  216,  216,  216,  216,    0,    0,  217,  217,
-      217,  217,  217,  217,  226,  226,  226,  226,  236,    0,
-      226,    0,    0,    0,    0,    0,    0,  236,  236,  236,
-      236,  236,  236,  226,    0,    0,    0,    0,    0,  226,
-        0,    0,  226,  226,  226,  226,  226,  226,  228,  228,
-
-      228,  228,  237,    0,    0,    0,    0,    0,    0,  228,
-        0,  237,  237,  237,  237,  237,  237,  228,    0,    0,
-        0,    0,    0,  228,    0,    0,  228,  228,  228,  228,
-      228,  228,  229,  229,  229,  229,  229,  238,  229,    0,
-        0,    0,    0,  229,    0,  229,  238,  238,  238,  238,
-      238,  238,    0,    0,    0,    0,    0,  229,  230,  230,
-      230,  230,  230,  239,  230,    0,    0,    0,    0,  230,
-        0,  230,  239,  239,  239,  239,  239,  239,    0,    0,
-        0,    0,    0,  230,  231,  231,  231,  231,  231,  240,
-      231,    0,    0,    0,    0,  231,    0,  231,  240,  240,
-
-      240,  240,  240,  240,    0,    0,    0,    0,    0,  231,
-      232,  232,  232,  232,  232,  246,  232,    0,    0,    0,
-        0,  232,    0,  232,  246,  246,  246,  246,  246,  246,
-        0,    0,    0,    0,    0,  232,  233,  233,  233,  233,
-      233,    0,  233,    0,    0,    0,    0,  233,    0,  233,
-      287,  287,  287,  287,  287,  233,  287,    0,    0,    0,
-        0,  233,    0,  287,  233,  233,  233,  233,  233,  233,
-      234,  234,  234,  234,  234,  287,  234,    0,    0,    0,
-        0,  234,  234,  234,    0,    0,    0,    0,    0,  234,
-        0,    0,    0,    0,    0,  234,  247,    0,  234,  234,
-
-      234,  234,  234,  234,  248,  247,  247,  247,  247,  247,
-      247,    0,    0,  248,  248,  248,  248,  248,  248,  260,
-      260,  260,  260,  260,    0,  260,    0,    0,    0,    0,
-        0,    0,  264,  264,  264,  264,  264,    0,  260,    0,
-        0,    0,    0,  264,  260,  264,    0,  260,  260,  260,
-      260,  260,  260,  261,  261,  261,  261,  264,    0,  261,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  261,    0,    0,    0,    0,    0,  261,    0,
-        0,  261,  261,  261,  261,  261,  261,  265,  265,  265,
-      265,  265,    0,    0,    0,    0,    0,    0,  265,    0,
-
-        0,    0,    0,    0,    0,    0,  265,    0,    0,    0,
-        0,    0,  265,    0,    0,  265,  265,  265,  265,  265,
-      265,  266,  266,  266,  266,  267,    0,    0,    0,    0,
-        0,    0,  266,    0,  267,  267,  267,  267,  267,  267,
-      266,    0,    0,    0,    0,    0,  266,  269,    0,  266,
-      266,  266,  266,  266,  266,  270,  269,  269,  269,  269,
-      269,  269,  271,    0,  270,  270,  270,  270,  270,  270,
-      273,  271,  271,  271,  271,  271,  271,  279,    0,  273,
-      273,  273,  273,  273,  273,  290,  279,  279,  279,  279,
-      279,  279,    0,    0,  290,  290,  290,  290,  290,  290,
-
-      291,  291,  291,  291,  291,  294,    0,    0,    0,    0,
-        0,  291,    0,  291,  294,  294,  294,  294,  294,  294,
-      295,    0,    0,    0,    0,  291,  303,    0,    0,  295,
-      295,  295,  295,  295,  295,  303,  303,  303,  303,  303,
-      303,  304,    0,    0,    0,    0,    0,  305,    0,    0,
-      304,  304,  304,  304,  304,  304,  305,  305,  305,  305,
-      305,  305,  306,    0,    0,    0,    0,    0,  314,    0,
-        0,  306,  306,  306,  306,  306,  306,  314,  314,  314,
-      314,  314,  314,  315,    0,    0,    0,    0,    0,  316,
-        0,    0,  315,  315,  315,  315,  315,  315,  316,  316,
-
-      316,  316,  316,  316,  320,    0,    0,    0,    0,    0,
-      321,    0,    0,  320,  320,  320,  320,  320,  320,  321,
-      321,  321,  321,  321,  321,  322,    0,    0,    0,    0,
-        0,  326,    0,    0,  322,  322,  322,  322,  322,  322,
-      326,  326,  326,  326,  326,  326,  327,    0,    0,    0,
-        0,    0,    0,    0,    0,  327,  327,  327,  327,  327,
-      327,  331,    0,  331,  331,  331,  331,  331,  331,  332,
-        0,  332,  332,  333,    0,  333,  333,  333,  333,  333,
-      333,  334,    0,  334,  334,  335,  335,  335,  335,  335,
-      335,  336,  336,    0,  336,  336,  337,  337,  337,  337,
-
-      337,  337,  337,  337,  338,  338,  338,  338,  338,  338,
-      339,  339,  339,  339,  339,  339,  339,  339,  340,  340,
-      340,  340,  340,  340,  340,  340,  340,  341,  341,  342,
-      342,  342,  342,  342,  342,  343,    0,  343,  343,  344,
-      344,  344,  344,  344,  344,  345,  345,  345,  345,  345,
-      345,  345,  345,  345,  346,  346,  346,  346,  346,  346,
-      347,  347,    0,  347,  348,  348,  348,  348,  348,  348,
-      348,  348,  348,  349,  349,    0,  349,  350,  350,  350,
-        0,  350,  350,  350,  350,  351,  351,    0,  351,  352,
-        0,  352,  352,  352,  352,  352,  352,  353,    0,  353,
-
-      353,  353,  353,  353,  353,  354,  354,  354,  354,  354,
-      354,  354,  354,  355,  355,    0,  355,  356,  356,  356,
-      356,  356,  356,  356,  356,  357,  357,  357,  357,  357,
-      357,  357,  357,  358,  358,    0,  358,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
-      330,  330,  330,  330
-
-    } ;
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register unsigned short *yy_cp, *yy_bp;
-	register int yy_act;
-
-#line 25 "tokenizer.flex"
-
-
-#line 1009 "tok"
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 331 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 1638 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 27 "tokenizer.flex"
-/* ignore comments */
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 29 "tokenizer.flex"
-{yyTok = S; return yyTok;}
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 31 "tokenizer.flex"
-{yyTok = SGML_CD; return yyTok;}
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 32 "tokenizer.flex"
-{yyTok = SGML_CD; return yyTok;}
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 33 "tokenizer.flex"
-{yyTok = INCLUDES; return yyTok;}
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 34 "tokenizer.flex"
-{yyTok = DASHMATCH; return yyTok;}
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 35 "tokenizer.flex"
-{yyTok = BEGINSWITH; return yyTok;}
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 36 "tokenizer.flex"
-{yyTok = ENDSWITH; return yyTok;}
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 37 "tokenizer.flex"
-{yyTok = CONTAINS; return yyTok;}
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 39 "tokenizer.flex"
-{yyTok = STRING; return yyTok;}
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 41 "tokenizer.flex"
-{yyTok = IDENT; return yyTok;}
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 43 "tokenizer.flex"
-{yyTok = NTH; return yyTok;}
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 45 "tokenizer.flex"
-{yyTok = HASH; return yyTok;}
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 47 "tokenizer.flex"
-{yyTok = IMPORT_SYM; return yyTok;}
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 48 "tokenizer.flex"
-{yyTok = PAGE_SYM; return yyTok;}
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 49 "tokenizer.flex"
-{yyTok = MEDIA_SYM; return yyTok;}
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 50 "tokenizer.flex"
-{yyTok = FONT_FACE_SYM; return yyTok;}
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 51 "tokenizer.flex"
-{yyTok = CHARSET_SYM; return yyTok;}
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 52 "tokenizer.flex"
-{yyTok = NAMESPACE_SYM; return yyTok; }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 53 "tokenizer.flex"
-{yyTok = KHTML_RULE_SYM; return yyTok; }
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 54 "tokenizer.flex"
-{yyTok = KHTML_DECLS_SYM; return yyTok; }
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 55 "tokenizer.flex"
-{yyTok = KHTML_VALUE_SYM; return yyTok; }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 57 "tokenizer.flex"
-{yyTok = IMPORTANT_SYM; return yyTok;}
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 59 "tokenizer.flex"
-{yyTok = EMS; return yyTok;}
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 60 "tokenizer.flex"
-{yyTok = QEMS; return yyTok;} /* quirky ems */
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 61 "tokenizer.flex"
-{yyTok = EXS; return yyTok;}
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 62 "tokenizer.flex"
-{yyTok = PXS; return yyTok;}
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 63 "tokenizer.flex"
-{yyTok = CMS; return yyTok;}
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 64 "tokenizer.flex"
-{yyTok = MMS; return yyTok;}
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 65 "tokenizer.flex"
-{yyTok = INS; return yyTok;}
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 66 "tokenizer.flex"
-{yyTok = PTS; return yyTok;}
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 67 "tokenizer.flex"
-{yyTok = PCS; return yyTok;}
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 68 "tokenizer.flex"
-{yyTok = DEGS; return yyTok;}
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 69 "tokenizer.flex"
-{yyTok = RADS; return yyTok;}
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 70 "tokenizer.flex"
-{yyTok = GRADS; return yyTok;}
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 71 "tokenizer.flex"
-{yyTok = MSECS; return yyTok;}
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 72 "tokenizer.flex"
-{yyTok = SECS; return yyTok;}
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 73 "tokenizer.flex"
-{yyTok = HERZ; return yyTok;}
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 74 "tokenizer.flex"
-{yyTok = KHERZ; return yyTok;}
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 75 "tokenizer.flex"
-{yyTok = DIMEN; return yyTok;}
-	YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 76 "tokenizer.flex"
-{yyTok = PERCENTAGE; return yyTok;}
-	YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 77 "tokenizer.flex"
-{yyTok = INTEGER; return yyTok;}
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 78 "tokenizer.flex"
-{yyTok = FLOAT; return yyTok;}
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 81 "tokenizer.flex"
-{yyTok = NOTFUNCTION; return yyTok;}
-	YY_BREAK
-case 45:
-YY_RULE_SETUP
-#line 82 "tokenizer.flex"
-{yyTok = URI; return yyTok;}
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 83 "tokenizer.flex"
-{yyTok = URI; return yyTok;}
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 84 "tokenizer.flex"
-{yyTok = FUNCTION; return yyTok;}
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 86 "tokenizer.flex"
-{yyTok = UNICODERANGE; return yyTok;}
-	YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 87 "tokenizer.flex"
-{yyTok = UNICODERANGE; return yyTok;}
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 89 "tokenizer.flex"
-{yyTok = *yytext; return yyTok;}
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 91 "tokenizer.flex"
-ECHO;
-	YY_BREAK
-#line 1347 "tok"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-        yy_c_buf_p = yytext;
-        yy_act = YY_STATE_EOF(YY_START);
-        goto do_action;
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of yylex */
diff --git a/khtml/kmultipart/Makefile.am b/khtml/kmultipart/Makefile.am
deleted file mode 100644
index b79df405d..000000000
--- a/khtml/kmultipart/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-INCLUDES = -I$(top_srcdir)/khtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/kutils $(all_includes)
-
-# These are not really libraries, but modules dynamically opened.
-# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity
-kde_module_LTLIBRARIES = libkmultipart.la
-
-libkmultipart_la_SOURCES = kmultipart.cpp
-libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
-libkmultipart_la_DEPENDENCIES = $(LIB_KPARTS)
-libkmultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-
-# Automatically generate moc files
-METASOURCES = AUTO
-
-# Install the .desktop file into the kde_services directory
-kde_services_DATA = kmultipart.desktop
-
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index f227b4f88..3b72a1db6 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -142,7 +142,8 @@ if( OPENEXR_FOUND )
     DESTINATION ${PLUGIN_INSTALL_DIR}
   )
   # FIXME COMPILE_FLAGS must be written a little better
-  set_target_properties( ${target}-module PROPERTIES COMPILE_FLAGS -I${OPENEXR_INCLUDE_DIRS} )
+  STRING(REGEX REPLACE ";" " -I" OPENEXR_INCLUDE_FLAGS "-I${OPENEXR_INCLUDE_DIRS}")
+  set_target_properties( ${target}-module PROPERTIES COMPILE_FLAGS "${OPENEXR_INCLUDE_FLAGS}" )
   install( FILES exr.kimgio DESTINATION ${SERVICES_INSTALL_DIR} )
 endif( OPENEXR_FOUND )
 
diff --git a/kimgio/Makefile.am b/kimgio/Makefile.am
index ad833c292..41ca9a892 100644
--- a/kimgio/Makefile.am
+++ b/kimgio/Makefile.am
@@ -81,7 +81,7 @@ kimg_hdr_la_LIBADD = $(LIB_QT)
 
 noinst_HEADERS= xview.h eps.h tiffr.h g3r.h ico.h jp2.h pcx.h tga.h rgb.h xcf.h gimp.h exr.h dds.h psd.h hdr.h
 
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS)
 
 servicedir = $(kde_servicesdir)
 service_DATA = png.kimgio xpm.kimgio bmp.kimgio pbm.kimgio pgm.kimgio \
diff --git a/kimgio/README b/kimgio/README
index 6c9cec844..142823e6c 100644
--- a/kimgio/README
+++ b/kimgio/README
@@ -22,7 +22,7 @@ XCF	<read>
 
 To use these formats, you only need to:
 
-1. link the application with the libkio library
+1. link the application with the libtdeio library
 2. Include the <kimageio.h> header
 3. call KImageIO::registerFormats() once, somewhere in your code
    before you load an image.
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index d174bf893..22251002c 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqdatastream.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <math.h> // sqrtf
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index a323feace..bcf916836 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -5,8 +5,8 @@
 #include <tqfile.h>
 #include <tqpainter.h>
 #include <tqprinter.h>
-#include <kapplication.h>
-#include <ktempfile.h>
+#include <tdeapplication.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include "eps.h"
 
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index c28cb799b..563c151a2 100644
--- a/kimgio/exr.cpp
+++ b/kimgio/exr.cpp
@@ -35,7 +35,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/kimgio/gimp.h b/kimgio/gimp.h
index 114ffdc0f..7da1a45f8 100644
--- a/kimgio/gimp.h
+++ b/kimgio/gimp.h
@@ -21,7 +21,7 @@
  *
  */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 /*
  * These are the constants and functions I extracted from The GIMP source
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index 82cba5c12..5f1832f02 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -14,7 +14,7 @@
 #include <tqdatastream.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 typedef TQ_UINT8 uchar;
 
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
index 2200c948c..5de8fff8e 100644
--- a/kimgio/jp2.cpp
+++ b/kimgio/jp2.cpp
@@ -12,7 +12,7 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqcolor.h>
 #include <tqcstring.h>
 #include <tqfile.h>
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index fd1408918..88be32621 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -39,7 +39,7 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK ltdlc-static kparts-shared
+  LINK ltdlc-static tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -94,34 +94,34 @@ tde_add_executable( ${target}
 )
 
 
-#### kioslave ###################################
+#### tdeioslave ###################################
 
-set( target kioslave )
+set( target tdeioslave )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kioslave.cpp
-  LINK ltdlc-static kio-shared
+  SOURCES tdeioslave.cpp
+  LINK ltdlc-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-#### kstartupconfig #############################
+#### tdestartupconfig #############################
 
-set( target kstartupconfig )
+set( target tdestartupconfig )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kstartupconfig.cpp
+  SOURCES tdestartupconfig.cpp
   LINK tdefakes-shared ${TQT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-#### kdostartupconfig ###########################
+#### tdedostartupconfig ###########################
 
-set( target kdostartupconfig )
+set( target tdedostartupconfig )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kdostartupconfig.cpp
+  SOURCES tdedostartupconfig.cpp
   LINK tdecore-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
@@ -153,15 +153,15 @@ tde_add_executable( ${target}
 )
 
 
-#### klauncher ##################################
+#### tdelauncher ##################################
 
-set( target klauncher )
+set( target tdelauncher )
 
 set( ${target}_SRCS
-  klauncher.cpp klauncher_main.cpp autostart.cpp
+  tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
diff --git a/kinit/Makefile.am b/kinit/Makefile.am
index ef329980a..3090d041e 100644
--- a/kinit/Makefile.am
+++ b/kinit/Makefile.am
@@ -19,11 +19,11 @@ INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(TDEINIT_XFT_INCLUDES)
 
 SUBDIRS = . tests
 
-bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper kioslave \
-               kstartupconfig kdostartupconfig start_tdeinit start_tdeinit_wrapper
+bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper tdeioslave \
+               tdestartupconfig tdedostartupconfig start_tdeinit start_tdeinit_wrapper
 
 lib_LTLIBRARIES = 
-tdeinit_LTLIBRARIES = klauncher.la
+tdeinit_LTLIBRARIES = tdelauncher.la
 tdeinit_SOURCES = kinit.cpp setproctitle.cpp
 
 # NOTE: We link against all common libraries even if we don't need them ourselves.
@@ -35,10 +35,10 @@ tdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
                   $(KDE_RPATH)
 tdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT)
 
-kioslave_SOURCES = kioslave.cpp
-kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
+tdeioslave_SOURCES = tdeioslave.cpp
+tdeioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
                   $(KDE_RPATH)
-kioslave_LDADD = $(LIB_KIO) 
+tdeioslave_LDADD = $(LIB_KIO) 
 
 tdeinit_wrapper_SOURCES = wrapper.c
 tdeinit_wrapper_LDADD = $(LIBSOCKET)
@@ -55,16 +55,16 @@ lnusertemp_LDFLAGS = $(KDE_RPATH)
 kwrapper_SOURCES = kwrapper.c
 kwrapper_LDADD = $(LIBSOCKET)
 
-klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
-klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
+tdelauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdelauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+tdelauncher_la_SOURCES = tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
 
-kstartupconfig_SOURCES  = kstartupconfig.cpp
-kstartupconfig_LDADD  = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
-kdostartupconfig_SOURCES = kdostartupconfig.cpp
-kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
+tdestartupconfig_SOURCES  = tdestartupconfig.cpp
+tdestartupconfig_LDADD  = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
+tdedostartupconfig_SOURCES = tdedostartupconfig.cpp
+tdedostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
                            $(KDE_RPATH)
-kdostartupconfig_LDADD  = $(LIB_TDECORE)
+tdedostartupconfig_LDADD  = $(LIB_TDECORE)
 
 start_tdeinit_SOURCES = start_tdeinit.c
 tdeinitpath = $(bindir)/tdeinit
@@ -75,7 +75,7 @@ start_tdeinit_wrapper_SOURCES = start_tdeinit_wrapper.c
 
 METASOURCES = AUTO
 
-noinst_HEADERS = klauncher.h autostart.h klauncher_cmds.h setproctitle.h
+noinst_HEADERS = tdelauncher.h autostart.h tdelauncher_cmds.h setproctitle.h
 
 kwrapper.o: wrapper.c
 
diff --git a/kinit/README b/kinit/README
index 97ce088cc..644efbaf6 100644
--- a/kinit/README
+++ b/kinit/README
@@ -33,7 +33,7 @@ Starting an application linked against libqt, libtdecore and libtdeui
 in the conventional way takes approx. 150ms on a Pentium III - 500Mhz. 
 Starting the same application via tdeinit takes less than 10ms.
 
-(application without KApplication constructor, the KApplication 
+(application without TDEApplication constructor, the TDEApplication 
 constructor requires an extra 100ms in both cases)
 
 Memory Usage
@@ -43,16 +43,16 @@ An application linked against libqt, libtdecore and libtdeui started
 in the conventional way requires about 498Kb memory. 
 (average of 10 instances) If the same application is started via
 tdeinit it requires about 142Kb. A difference of 356Kb (application 
-without KApplication constructor) 
+without TDEApplication constructor) 
 
-If we take the KApplication constructor into account, an application
+If we take the TDEApplication constructor into account, an application
 started in the conventional way takes about 679Kb memory while the same
 application started via tdeinit requires about 380Kb. Here the difference
 is somewhat less, 299Kb. This seems to be caused by the fact that the
 dynamic linker does "lazy linking". We can force the linker to link
 everything at startup by specifying "LD_BIND_NOW=true". When tdeinit is
 started with this option on, tdeinit is back to its full efficiency, an
-application with a KApplication constructor now uses 338Kb of memory.
+application with a TDEApplication constructor now uses 338Kb of memory.
 A difference of 341Kb with the normal case.
 
 Adapting programs to use tdeinit.
diff --git a/kinit/README.DCOP b/kinit/README.DCOP
index af5aff809..cd5ba983e 100644
--- a/kinit/README.DCOP
+++ b/kinit/README.DCOP
@@ -1,4 +1,4 @@
-"KLauncher" supports the following DCOP functions:
+"TDELauncher" supports the following DCOP functions:
 
 /**
  * Starts a program.
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index c7feb1752..ccdbd3d97 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -22,9 +22,9 @@
 
 #include "autostart.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <stdlib.h>
@@ -49,14 +49,14 @@ AutoStart::AutoStart( bool new_startup )
 {
   m_startList = new AutoStartList;
   m_startList->setAutoDelete(true);
-  KGlobal::dirs()->addResourceType("autostart", "share/autostart");
+  TDEGlobal::dirs()->addResourceType("autostart", "share/autostart");
   TQString xdgdirs = getenv("XDG_CONFIG_DIRS");
   if (xdgdirs.isEmpty())
         xdgdirs = "/etc/xdg";
 
   TQStringList xdgdirslist = TQStringList::split( ':', xdgdirs );
   for ( TQStringList::Iterator itr = xdgdirslist.begin(); itr != xdgdirslist.end(); ++itr ) {
-	KGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart");
+	TDEGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart");
   }
 }
 
@@ -102,7 +102,7 @@ static bool startCondition(const TQString &condition)
   if (list[0].isEmpty() || list[2].isEmpty()) 
      return true;
 
-  KConfig config(list[0], true, false);
+  TDEConfig config(list[0], true, false);
   if (!list[1].isEmpty())
      config.setGroup(list[1]);
 
@@ -114,8 +114,8 @@ static bool startCondition(const TQString &condition)
 void
 AutoStart::loadAutoStartList()
 {
-   TQStringList files = KGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true);
-   TQStringList kdefiles = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
+   TQStringList files = TDEGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true);
+   TQStringList kdefiles = TDEGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
    files += kdefiles;
    
    for(TQStringList::ConstIterator it = files.begin();
@@ -143,7 +143,7 @@ AutoStart::loadAutoStartList()
            localit != files.end();
            ++localit)
        {
-           if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localtdedir()) == true)) {
+           if (((*localit).startsWith(TDEGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(TDEGlobal::dirs()->localtdedir()) == true)) {
                // Same local file name?
                TQString localOuter;
                TQString localInner;
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 11fed9c34..1dc03002d 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -54,11 +54,11 @@
 #include <tqfont.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
@@ -68,13 +68,13 @@
 #endif
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#include <kstartupinfo.h> // schroder
+#include <tdestartupinfo.h> // schroder
 #endif
 
 #include <tdeversion.h>
 
 #include "ltdl.h"
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
 
 //#if defined Q_WS_X11 && ! defined K_WS_QTONLY
 #ifdef Q_WS_X11
@@ -113,7 +113,7 @@ static Display *X11display = 0;
 static int X11_startup_notify_fd = -1;
 static Display *X11_startup_notify_display = 0;
 #endif
-static const KInstance *s_instance = 0;
+static const TDEInstance *s_instance = 0;
 #define MAX_SOCK_FILE 255
 static char sock_file[MAX_SOCK_FILE];
 static char sock_file_old[MAX_SOCK_FILE];
@@ -166,12 +166,12 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
 }
 #endif
 
-/* These are to link libkparts even if 'smart' linker is used */
-#include <kparts/plugin.h>
-extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); }
-/* These are to link libkio even if 'smart' linker is used */
-#include <kio/authinfo.h>
-extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); }
+/* These are to link libtdeparts even if 'smart' linker is used */
+#include <tdeparts/plugin.h>
+extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); }
+/* These are to link libtdeio even if 'smart' linker is used */
+#include <tdeio/authinfo.h>
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
 
 /*
  * Close fd's which are only useful for the parent process.
@@ -318,7 +318,7 @@ const char* get_env_var( const char* var, int envc, const char* envs )
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
 //#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded
-static void init_startup_info( KStartupInfoId& id, const char* bin,
+static void init_startup_info( TDEStartupInfoId& id, const char* bin,
     int envc, const char* envs )
 {
     const char* dpy = get_env_var( DISPLAY"=", envc, envs );
@@ -328,26 +328,26 @@ static void init_startup_info( KStartupInfoId& id, const char* bin,
     if( X11_startup_notify_display == NULL )
         return;
     X11_startup_notify_fd = XConnectionNumber( X11_startup_notify_display );
-    KStartupInfoData data;
+    TDEStartupInfoData data;
     int desktop = get_current_desktop( X11_startup_notify_display );
     data.setDesktop( desktop );
     data.setBin( bin );
-    KStartupInfo::sendChangeX( X11_startup_notify_display, id, data );
+    TDEStartupInfo::sendChangeX( X11_startup_notify_display, id, data );
     XFlush( X11_startup_notify_display );
 }
 
-static void complete_startup_info( KStartupInfoId& id, pid_t pid )
+static void complete_startup_info( TDEStartupInfoId& id, pid_t pid )
 {
     if( X11_startup_notify_display == NULL )
         return;
     if( pid == 0 ) // failure
-        KStartupInfo::sendFinishX( X11_startup_notify_display, id );
+        TDEStartupInfo::sendFinishX( X11_startup_notify_display, id );
     else
     {
-        KStartupInfoData data;
+        TDEStartupInfoData data;
         data.addPid( pid );
         data.setHostname();
-        KStartupInfo::sendChangeX( X11_startup_notify_display, id, data );
+        TDEStartupInfo::sendChangeX( X11_startup_notify_display, id, data );
     }
     XCloseDisplay( X11_startup_notify_display );
     X11_startup_notify_display = NULL;
@@ -429,8 +429,8 @@ static pid_t launch(int argc, const char *_name, const char *args,
   TQCString name;
   TQCString exec;
 
-  if (strcmp(_name, "klauncher") == 0) {
-     /* klauncher is launched in a special way:
+  if (strcmp(_name, "tdelauncher") == 0) {
+     /* tdelauncher is launched in a special way:
       * It has a communication socket on LAUNCHER_FD
       */
      if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, d.launcher))
@@ -482,7 +482,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
 //#ifdef Q_WS_X11
-  KStartupInfoId startup_id;
+  TDEStartupInfoId startup_id;
   startup_id.initId( startup_id_str );
   if( !startup_id.none())
       init_startup_info( startup_id, name, envc, envs );
@@ -551,7 +551,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
 //#ifdef Q_WS_X11
       if( startup_id.none())
-          KStartupInfo::resetStartupEnv();
+          TDEStartupInfo::resetStartupEnv();
       else
           startup_id.setupStartupEnv();
 #endif
@@ -891,7 +891,7 @@ static void init_tdeinit_socket()
      if(connect(s, (struct sockaddr *)&server, socklen) == 0)
      {
         fprintf(stderr, "[tdeinit] Shutting down running client.\n");
-        klauncher_header request_header;
+        tdelauncher_header request_header;
         request_header.cmd = LAUNCHER_TERMINATE_TDEINIT;
         request_header.arg_length = 0;
         write(s, &request_header, sizeof(request_header));
@@ -1074,9 +1074,9 @@ static void launcher_died()
       return;
    }
 
-   // KLauncher died... restart
+   // TDELauncher died... restart
 #ifndef NDEBUG
-   fprintf(stderr, "[tdeinit] KLauncher died unexpectedly.\n");
+   fprintf(stderr, "[tdeinit] TDELauncher died unexpectedly.\n");
 #endif
    // Make sure it's really dead.
    if (d.launcher_pid)
@@ -1090,9 +1090,9 @@ static void launcher_died()
    close(d.launcher[0]);
    d.launcher[0] = -1;
 
-   pid_t pid = launch( 1, "klauncher", 0 );
+   pid_t pid = launch( 1, "tdelauncher", 0 );
 #ifndef NDEBUG
-   fprintf(stderr, "[tdeinit] Relaunching KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
+   fprintf(stderr, "[tdeinit] Relaunching TDELauncher, pid = %ld result = %d\n", (long) pid, d.result);
 #endif
 }
 
@@ -1105,7 +1105,7 @@ static void handle_launcher_request(int sock = -1)
        launcher = true;
    }
 
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    char *request_data = 0L;
    int result = read_socket(sock, (char *) &request_header, sizeof(request_header));
    if (result != 0)
@@ -1141,7 +1141,7 @@ static void handle_launcher_request(int sock = -1)
        (request_header.cmd == LAUNCHER_EXEC_NEW)))
    {
       pid_t pid;
-      klauncher_header response_header;
+      tdelauncher_header response_header;
       long response_data;
       long l;
       memcpy( &l, request_data, sizeof( long ));
@@ -1273,7 +1273,7 @@ static void handle_launcher_request(int sock = -1)
 
 #ifndef NDEBUG
       if (launcher)
-         fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from klauncher.\n", env_name, env_value);
+         fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from tdelauncher.\n", env_name, env_value);
       else
          fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from socket.\n", env_name, env_value);
 #endif
@@ -1301,7 +1301,7 @@ static void handle_launcher_request(int sock = -1)
    else if (request_header.cmd == LAUNCHER_TERMINATE_TDEINIT)
    {
 #ifndef NDEBUG
-       fprintf(stderr,"[tdeinit] Killing tdeinit/klauncher.\n");
+       fprintf(stderr,"[tdeinit] Killing tdeinit/tdelauncher.\n");
 #endif
        if (d.launcher_pid)
           kill(d.launcher_pid, SIGTERM);
@@ -1359,7 +1359,7 @@ static void handle_requests(pid_t waitForPid)
            if (d.launcher_pid)
            {
            // TODO send process died message
-              klauncher_header request_header;
+              tdelauncher_header request_header;
               long request_data[2];
               request_header.cmd = LAUNCHER_DIED;
               request_header.arg_length = sizeof(long) * 2;
@@ -1686,7 +1686,7 @@ int main(int argc, char **argv, char **envp)
    int i;
    pid_t pid;
    int launch_dcop = 1;
-   int launch_klauncher = 1;
+   int launch_tdelauncher = 1;
    int launch_kded = 1;
    int keep_running = 1;
    int new_startup = 0;
@@ -1699,8 +1699,8 @@ int main(int argc, char **argv, char **envp)
       safe_argv[i] = strcpy((char*)malloc(strlen(argv[i])+1), argv[i]);
       if (strcmp(safe_argv[i], "--no-dcop") == 0)
          launch_dcop = 0;
-      if (strcmp(safe_argv[i], "--no-klauncher") == 0)
-         launch_klauncher = 0;
+      if (strcmp(safe_argv[i], "--no-tdelauncher") == 0)
+         launch_tdelauncher = 0;
       if (strcmp(safe_argv[i], "--no-kded") == 0)
          launch_kded = 0;
       if (strcmp(safe_argv[i], "--suicide") == 0)
@@ -1717,7 +1717,7 @@ int main(int argc, char **argv, char **envp)
       {
         printf("Usage: tdeinit [options]\n");
      // printf("    --no-dcop         Do not start dcopserver\n");
-     // printf("    --no-klauncher    Do not start klauncher\n");
+     // printf("    --no-tdelauncher    Do not start tdelauncher\n");
         printf("    --no-kded         Do not start kded\n");
         printf("    --suicide         Terminate when no TDE applications are left running\n");
      // printf("    --exit            Terminate when kded has run\n");
@@ -1729,7 +1729,7 @@ int main(int argc, char **argv, char **envp)
 
    // Fork here and let parent process exit.
    // Parent process may only exit after all required services have been
-   // launched. (dcopserver/klauncher and services which start with '+')
+   // launched. (dcopserver/tdelauncher and services which start with '+')
    signal( SIGCHLD, secondary_child_handler);
    if (fork() > 0) // Go into background
    {
@@ -1752,19 +1752,19 @@ int main(int argc, char **argv, char **envp)
       setsid();
 
    /** Create our instance **/
-   s_instance = new KInstance("tdeinit");
+   s_instance = new TDEInstance("tdeinit");
 
    /** Prepare to change process name **/
    tdeinit_initsetproctitle(argc, argv, envp);
    tdeinit_library_path();
    // Don't make our instance the global instance
-   // (do it only after tdeinit_library_path, that one indirectly uses KConfig,
-   // which seems to be buggy and always use KGlobal instead of the maching KInstance)
-   KGlobal::_instance = 0L;
+   // (do it only after tdeinit_library_path, that one indirectly uses TDEConfig,
+   // which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance)
+   TDEGlobal::_instance = 0L;
    // don't change envvars before tdeinit_initsetproctitle()
    unsetenv("LD_BIND_NOW");
    unsetenv("DYLD_BIND_AT_LAUNCH");
-   KApplication::loadedByKdeinit = true;
+   TDEApplication::loadedByKdeinit = true;
 
    d.maxname = strlen(argv[0]);
    d.launcher_pid = 0;
@@ -1812,16 +1812,16 @@ int main(int argc, char **argv, char **envp)
 	  (void) lt_dlopen(TQFile::encodeName(konq).data());
    }
 #endif 
-   if (launch_klauncher)
+   if (launch_tdelauncher)
    {
       if( new_startup )
-         pid = launch( 2, "klauncher", "--new-startup" );
+         pid = launch( 2, "tdelauncher", "--new-startup" );
       else
-         pid = launch( 1, "klauncher", 0 );
+         pid = launch( 1, "tdelauncher", 0 );
 #ifndef NDEBUG
-      fprintf(stderr, "[tdeinit] Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
+      fprintf(stderr, "[tdeinit] Launched TDELauncher, pid = %ld result = %d\n", (long) pid, d.result);
 #endif
-      handle_requests(pid); // Wait for klauncher to be ready
+      handle_requests(pid); // Wait for tdelauncher to be ready
    }
    
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
diff --git a/kinit/kdostartupconfig.cpp b/kinit/tdedostartupconfig.cpp
index fceed88e2..bbfdf88a4 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/tdedostartupconfig.cpp
@@ -24,13 +24,13 @@ DEALINGS IN THE SOFTWARE.
 
 #undef QT_NO_CAST_ASCII
 
-// See description in kstartupconfig.cpp .
+// See description in tdestartupconfig.cpp .
 
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 TQString get_entry( TQString* ll )
@@ -62,8 +62,8 @@ TQString get_entry( TQString* ll )
 
 int main()
     {
-    KInstance inst( "kdostartupconfig" );
-    kdDebug() << "Running kdostartupconfig." << endl;
+    TDEInstance inst( "tdedostartupconfig" );
+    kdDebug() << "Running tdedostartupconfig." << endl;
     TQString keysname = locateLocal( "config", "startupconfigkeys" );
     TQFile keys( keysname );
     if( !keys.open( IO_ReadOnly ))
@@ -95,7 +95,7 @@ int main()
             return 6;
         if( group.left( 1 ) == "[" && group.right( 1 ) == "]" )
             { // whole config group
-            KConfig cfg( file );
+            TDEConfig cfg( file );
             group = group.mid( 1, group.length() - 2 );
             TQMap< TQString, TQString > entries = cfg.entryMap( group );
             startupconfig << "# " << line << "\n";
@@ -115,7 +115,7 @@ int main()
             { // a single key
             if( key.isEmpty())
                 return 7;
-            KConfig cfg( file );
+            TDEConfig cfg( file );
             cfg.setGroup( group );
             TQString value = cfg.readEntry( key, def );
             startupconfig << "# " << line << "\n";
@@ -126,13 +126,13 @@ int main()
             }
         startupconfigfiles << line << endl;
         // use even currently non-existing paths in $TDEDIRS
-        TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, KGlobal::dirs()->kfsstnd_prefixes());
+        TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, TDEGlobal::dirs()->kfsstnd_prefixes());
         for( TQStringList::ConstIterator it = dirs.begin();
              it != dirs.end();
              ++it )
             {
             TQString cfg = *it + "share/config/" + file;
-            if( KStandardDirs::exists( cfg ))
+            if( TDEStandardDirs::exists( cfg ))
                 startupconfigfiles << cfg << "\n";
             else
                 startupconfigfiles << "!" << cfg << "\n";
diff --git a/kinit/kioslave.cpp b/kinit/tdeioslave.cpp
index f132abb0d..1690ca2f7 100644
--- a/kinit/kioslave.cpp
+++ b/kinit/tdeioslave.cpp
@@ -47,15 +47,15 @@
 # endif
 #endif
 
-/* These are to link libkio even if 'smart' linker is used */
-#include <kio/authinfo.h>
-extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); }
+/* These are to link libtdeio even if 'smart' linker is used */
+#include <tdeio/authinfo.h>
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
 
 int main(int argc, char **argv)
 {
      if (argc < 5)
      {
-        fprintf(stderr, "Usage: kioslave <slave-lib> <protocol> <klauncher-socket> <app-socket>\n\nThis program is part of TDE.\n");
+        fprintf(stderr, "Usage: tdeioslave <slave-lib> <protocol> <tdelauncher-socket> <app-socket>\n\nThis program is part of TDE.\n");
         exit(1);
      }
      TQCString libpath = argv[1];     
diff --git a/kinit/klauncher.cpp b/kinit/tdelauncher.cpp
index 2d706e36b..f7ca08678 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/tdelauncher.cpp
@@ -29,28 +29,28 @@
 
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#include <kstartupinfo.h> // schroder
+#include <tdestartupinfo.h> // schroder
 #endif
 
 
-#include "kio/global.h"
-#include "kio/connection.h"
-#include "kio/slaveinterface.h"
+#include "tdeio/global.h"
+#include "tdeio/connection.h"
+#include "tdeio/slaveinterface.h"
 
-#include "klauncher.h"
-#include "klauncher_cmds.h"
+#include "tdelauncher.h"
+#include "tdelauncher_cmds.h"
 
 //#if defined Q_WS_X11 && ! defined K_WS_QTONLY
 #ifdef Q_WS_X11
@@ -61,12 +61,12 @@
 // Dispose slaves after being idle for SLAVE_MAX_IDLE seconds
 #define SLAVE_MAX_IDLE	30
 
-using namespace KIO;
+using namespace TDEIO;
 
-template class TQPtrList<KLaunchRequest>;
+template class TQPtrList<TDELaunchRequest>;
 template class TQPtrList<IdleSlave>;
 
-IdleSlave::IdleSlave(KSocket *socket)
+IdleSlave::IdleSlave(TDESocket *socket)
 {
    mConn.init(socket);
    mConn.connect(this, TQT_SLOT(gotInput()));
@@ -162,10 +162,10 @@ IdleSlave::age(time_t now)
    return (int) difftime(now, mBirthDate);
 }
 
-KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
-//  : KApplication( false, false ), // No Styles, No GUI
-  : KApplication( false, true ),	// TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
-    DCOPObject("klauncher"),
+TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
+//  : TDEApplication( false, false ), // No Styles, No GUI
+  : TDEApplication( false, true ),	// TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
+    DCOPObject("tdelauncher"),
     tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
     dontBlockReading(false), newStartup( new_startup )
 {
@@ -181,12 +181,12 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
    dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateKDE()",
                                     objId(), "terminateKDE()", false );
 
-   TQString prefix = locateLocal("socket", "klauncher");
+   TQString prefix = locateLocal("socket", "tdelauncher");
    KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket"));
    if (domainname.status() != 0)
    {
       // Sever error!
-      tqDebug("KLauncher: Fatal error, can't create tempfile!");
+      tqDebug("TDELauncher: Fatal error, can't create tempfile!");
       ::exit(1);
    }
    mPoolSocketName = domainname.name();
@@ -194,9 +194,9 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
    domainname.close();
    domainname.unlink();
 #endif
-   mPoolSocket = new KServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
-   connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)),
-           TQT_SLOT(acceptSlave(KSocket *)));
+   mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
+   connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)),
+           TQT_SLOT(acceptSlave(TDESocket *)));
 
    connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
 
@@ -218,18 +218,18 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
       mSlaveValgrindSkin = getenv("TDE_SLAVE_VALGRIND_SKIN");
       tqWarning("Klauncher running slaves through valgrind for slaves of protocol '%s'", mSlaveValgrind.data());
    }
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    request_header.cmd = LAUNCHER_OK;
    request_header.arg_length = 0;
    write(tdeinitSocket, &request_header, sizeof(request_header));
 }
 
-KLauncher::~KLauncher()
+TDELauncher::~TDELauncher()
 {
    close();
 }
 
-void KLauncher::close()
+void TDELauncher::close()
 {
    if (!mPoolSocketName.isEmpty())
    {
@@ -244,15 +244,15 @@ void KLauncher::close()
 }
 
 void
-KLauncher::destruct(int exit_code)
+TDELauncher::destruct(int exit_code)
 {
-   if (kapp) ((KLauncher*)kapp)->close();
+   if (kapp) ((TDELauncher*)kapp)->close();
    // We don't delete kapp here, that's intentional.
    ::exit(exit_code);
 }
 
 bool
-KLauncher::process(const TQCString &fun, const TQByteArray &data,
+TDELauncher::process(const TQCString &fun, const TQByteArray &data,
                    TQCString &replyType, TQByteArray &replyData)
 {
    if ((fun == "exec_blind(TQCString,TQValueList<TQCString>)")
@@ -267,7 +267,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
       stream >> name >> arg_list;
       if( fun == "exec_blind(TQCString,TQValueList<TQCString>,TQValueList<TQCString>,TQCString)" )
           stream >> envs >> startup_id;
-      kdDebug(7016) << "KLauncher: Got exec_blind('" << name << "', ...)" << endl;
+      kdDebug(7016) << "TDELauncher: Got exec_blind('" << name << "', ...)" << endl;
       exec_blind( name, arg_list, envs, startup_id);
       return true;
    }
@@ -315,29 +315,29 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
       bool finished;
       if (strncmp(fun, "start_service_by_name(", 22) == 0)
       {
-         kdDebug(7016) << "KLauncher: Got start_service_by_name('" << serviceName << "', ...)" << endl;
+         kdDebug(7016) << "TDELauncher: Got start_service_by_name('" << serviceName << "', ...)" << endl;
          finished = start_service_by_name(serviceName, urls, envs, startup_id, bNoWait);
       }
       else if (strncmp(fun, "start_service_by_desktop_path(", 30) == 0)
       {
-         kdDebug(7016) << "KLauncher: Got start_service_by_desktop_path('" << serviceName << "', ...)" << endl;
+         kdDebug(7016) << "TDELauncher: Got start_service_by_desktop_path('" << serviceName << "', ...)" << endl;
          finished = start_service_by_desktop_path(serviceName, urls, envs, startup_id, bNoWait);
       }
       else if (strncmp(fun, "start_service_by_desktop_name(", 30) == 0)
       {
-         kdDebug(7016) << "KLauncher: Got start_service_by_desktop_name('" << serviceName << "', ...)" << endl;
+         kdDebug(7016) << "TDELauncher: Got start_service_by_desktop_name('" << serviceName << "', ...)" << endl;
          finished = start_service_by_desktop_name(serviceName, urls, envs, startup_id, bNoWait );
       }
       else if ((fun == "tdeinit_exec(TQString,TQStringList)")
               || (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)")
               || (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)"))
       {
-         kdDebug(7016) << "KLauncher: Got tdeinit_exec('" << serviceName << "', ...)" << endl;
+         kdDebug(7016) << "TDELauncher: Got tdeinit_exec('" << serviceName << "', ...)" << endl;
          finished = tdeinit_exec(serviceName, urls, envs, startup_id, false);
       }
       else
       {
-         kdDebug(7016) << "KLauncher: Got tdeinit_exec_wait('" << serviceName << "', ...)" << endl;
+         kdDebug(7016) << "TDELauncher: Got tdeinit_exec_wait('" << serviceName << "', ...)" << endl;
          finished = tdeinit_exec(serviceName, urls, envs, startup_id, true);
       }
       if (!finished)
@@ -396,8 +396,8 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
    }
    else if (fun == "reparseConfiguration()")
    {
-      KGlobal::config()->reparseConfiguration();
-      kdDebug(7016) << "KLauncher::process : reparseConfiguration" << endl;
+      TDEGlobal::config()->reparseConfiguration();
+      kdDebug(7016) << "TDELauncher::process : reparseConfiguration" << endl;
       KProtocolManager::reparseConfiguration();
       IdleSlave *slave;
       for(slave = mSlaveList.first(); slave; slave = mSlaveList.next())
@@ -409,8 +409,8 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
    {
       ::signal( SIGHUP, SIG_IGN);
       ::signal( SIGTERM, SIG_IGN);
-      kdDebug() << "KLauncher::process ---> terminateKDE" << endl;
-      klauncher_header request_header;
+      kdDebug() << "TDELauncher::process ---> terminateKDE" << endl;
+      tdelauncher_header request_header;
       request_header.cmd = LAUNCHER_TERMINATE_KDE;
       request_header.arg_length = 0;
       write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -418,14 +418,14 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
    }
    else if (fun == "autoStart()")
    {
-      kdDebug() << "KLauncher::process ---> autoStart" << endl;
+      kdDebug() << "TDELauncher::process ---> autoStart" << endl;
       autoStart(1);
       replyType = "void";
       return true;
    }
    else if (fun == "autoStart(int)")
    {
-      kdDebug() << "KLauncher::process ---> autoStart(int)" << endl;
+      kdDebug() << "TDELauncher::process ---> autoStart(int)" << endl;
       TQDataStream stream(data, IO_ReadOnly);
       int phase;
       stream >> phase;
@@ -443,15 +443,15 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
 }
 
 QCStringList
-KLauncher::interfaces()
+TDELauncher::interfaces()
 {
     QCStringList ifaces = DCOPObject::interfaces();
-    ifaces += "KLauncher";
+    ifaces += "TDELauncher";
     return ifaces;
 }
 
 QCStringList
-KLauncher::functions()
+TDELauncher::functions()
 {
     QCStringList funcs = DCOPObject::functions();
     funcs << "void exec_blind(TQCString,TQValueList<TQCString>)";
@@ -480,12 +480,12 @@ KLauncher::functions()
     return funcs;
 }
 
-void KLauncher::setLaunchEnv(const TQCString &name, const TQCString &_value)
+void TDELauncher::setLaunchEnv(const TQCString &name, const TQCString &_value)
 {
    TQCString value(_value);
    if (value.isNull())
       value = "";
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    TQByteArray requestData(name.length()+value.length()+2);
    memcpy(requestData.data(), name.data(), name.length()+1);
    memcpy(requestData.data()+name.length()+1, value.data(), value.length()+1);
@@ -522,9 +522,9 @@ read_socket(int sock, char *buffer, int len)
 
 
 void
-KLauncher::slotKDEInitData(int)
+TDELauncher::slotKDEInitData(int)
 {
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    TQByteArray requestData;
    if( dontBlockReading )
    {
@@ -572,25 +572,25 @@ KLauncher::slotKDEInitData(int)
      {
        case KService::DCOP_None:
        {
-         lastRequest->status = KLaunchRequest::Running;
+         lastRequest->status = TDELaunchRequest::Running;
          break;
        }
 
        case KService::DCOP_Unique:
        {
-         lastRequest->status = KLaunchRequest::Launching;
+         lastRequest->status = TDELaunchRequest::Launching;
          break;
        }
 
        case KService::DCOP_Wait:
        {
-         lastRequest->status = KLaunchRequest::Launching;
+         lastRequest->status = TDELaunchRequest::Launching;
          break;
        }
 
        case KService::DCOP_Multi:
        {
-         lastRequest->status = KLaunchRequest::Launching;
+         lastRequest->status = TDELaunchRequest::Launching;
          break;
        }
      }
@@ -599,7 +599,7 @@ KLauncher::slotKDEInitData(int)
    }
    if (lastRequest && (request_header.cmd == LAUNCHER_ERROR))
    {
-     lastRequest->status = KLaunchRequest::Error;
+     lastRequest->status = TDELaunchRequest::Error;
      if (!requestData.isEmpty())
         lastRequest->errorMsg = TQString::fromUtf8((char *) requestData.data());
      lastRequest = 0;
@@ -611,20 +611,20 @@ KLauncher::slotKDEInitData(int)
 }
 
 void
-KLauncher::processDied(pid_t pid, long /* exitStatus */)
+TDELauncher::processDied(pid_t pid, long /* exitStatus */)
 {
-   KLaunchRequest *request = requestList.first();
+   TDELaunchRequest *request = requestList.first();
    for(; request; request = requestList.next())
    {
       if (request->pid == pid)
       {
          if (request->dcop_service_type == KService::DCOP_Wait)
-            request->status = KLaunchRequest::Done;
+            request->status = TDELaunchRequest::Done;
          else if ((request->dcop_service_type == KService::DCOP_Unique) &&
 		(dcopClient()->isApplicationRegistered(request->dcop_name)))
-            request->status = KLaunchRequest::Running;
+            request->status = TDELaunchRequest::Running;
          else
-            request->status = KLaunchRequest::Error;
+            request->status = TDELaunchRequest::Error;
          requestDone(request);
          return;
       }
@@ -632,17 +632,17 @@ KLauncher::processDied(pid_t pid, long /* exitStatus */)
 }
 
 void
-KLauncher::slotAppRegistered(const TQCString &appId)
+TDELauncher::slotAppRegistered(const TQCString &appId)
 {
    const char *cAppId = appId.data();
    if (!cAppId) return;
 
-   KLaunchRequest *request = requestList.first();
-   KLaunchRequest *nextRequest;
+   TDELaunchRequest *request = requestList.first();
+   TDELaunchRequest *nextRequest;
    for(; request; request = nextRequest)
    {
       nextRequest = requestList.next();
-      if (request->status != KLaunchRequest::Launching)
+      if (request->status != TDELaunchRequest::Launching)
          continue;
 
       // For unique services check the requested service name first
@@ -650,7 +650,7 @@ KLauncher::slotAppRegistered(const TQCString &appId)
           ((appId == request->dcop_name) ||
            dcopClient()->isApplicationRegistered(request->dcop_name)))
       {
-         request->status = KLaunchRequest::Running;
+         request->status = TDELaunchRequest::Running;
          requestDone(request);
          continue;
       }
@@ -663,7 +663,7 @@ KLauncher::slotAppRegistered(const TQCString &appId)
           ((cAppId[l] == '\0') || (cAppId[l] == '-')))
       {
          request->dcop_name = appId;
-         request->status = KLaunchRequest::Running;
+         request->status = TDELaunchRequest::Running;
          requestDone(request);
          continue;
       }
@@ -671,7 +671,7 @@ KLauncher::slotAppRegistered(const TQCString &appId)
 }
 
 void
-KLauncher::autoStart(int phase)
+TDELauncher::autoStart(int phase)
 {
    if( mAutoStart.phase() >= phase )
        return;
@@ -690,7 +690,7 @@ KLauncher::autoStart(int phase)
 }
 
 void
-KLauncher::slotAutoStart()
+TDELauncher::slotAutoStart()
 {
    KService::Ptr s;
    do
@@ -727,10 +727,10 @@ KLauncher::slotAutoStart()
 }
 
 void
-KLauncher::requestDone(KLaunchRequest *request)
+TDELauncher::requestDone(TDELaunchRequest *request)
 {
-   if ((request->status == KLaunchRequest::Running) ||
-       (request->status == KLaunchRequest::Done))
+   if ((request->status == TDELaunchRequest::Running) ||
+       (request->status == TDELaunchRequest::Done))
    {
       DCOPresult.result = 0;
       DCOPresult.dcopName = request->dcop_name;
@@ -758,9 +758,9 @@ KLauncher::requestDone(KLaunchRequest *request)
             dpy = XOpenDisplay( request->startup_dpy );
          if( dpy )
          {
-            KStartupInfoId id;
+            TDEStartupInfoId id;
             id.initId( request->startup_id );
-            KStartupInfo::sendFinishX( dpy, id );
+            TDEStartupInfo::sendFinishX( dpy, id );
             if( mCached_dpy != dpy && mCached_dpy != NULL )
                XCloseDisplay( mCached_dpy );
             mCached_dpy = dpy;
@@ -788,11 +788,11 @@ KLauncher::requestDone(KLaunchRequest *request)
 }
 
 void
-KLauncher::requestStart(KLaunchRequest *request)
+TDELauncher::requestStart(TDELaunchRequest *request)
 {
    requestList.append( request );
    // Send request to tdeinit.
-   klauncher_header request_header;
+   tdelauncher_header request_header;
    TQByteArray requestData;
    int length = 0;
    length += sizeof(long); // Nr of. Args
@@ -879,17 +879,17 @@ KLauncher::requestStart(KLaunchRequest *request)
 }
 
 void
-KLauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_list,
+TDELauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_list,
     const TQValueList<TQCString> &envs, const TQCString& startup_id )
 {
-   KLaunchRequest *request = new KLaunchRequest;
+   TDELaunchRequest *request = new TDELaunchRequest;
    request->autoStart = false;
    request->name = name;
    request->arg_list =  arg_list;
    request->dcop_name = 0;
    request->dcop_service_type = KService::DCOP_None;
    request->pid = 0;
-   request->status = KLaunchRequest::Launching;
+   request->status = TDELaunchRequest::Launching;
    request->transaction = 0; // No confirmation is send
    request->envs = envs;
    // Find service, if any - strip path if needed
@@ -907,7 +907,7 @@ KLauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_
 
 
 bool
-KLauncher::start_service_by_name(const TQString &serviceName, const TQStringList &urls,
+TDELauncher::start_service_by_name(const TQString &serviceName, const TQStringList &urls,
     const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind)
 {
    KService::Ptr service = 0;
@@ -924,7 +924,7 @@ KLauncher::start_service_by_name(const TQString &serviceName, const TQStringList
 }
 
 bool
-KLauncher::start_service_by_desktop_path(const TQString &serviceName, const TQStringList &urls,
+TDELauncher::start_service_by_desktop_path(const TQString &serviceName, const TQStringList &urls,
     const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind)
 {
    KService::Ptr service = 0;
@@ -949,7 +949,7 @@ KLauncher::start_service_by_desktop_path(const TQString &serviceName, const TQSt
 }
 
 bool
-KLauncher::start_service_by_desktop_name(const TQString &serviceName, const TQStringList &urls,
+TDELauncher::start_service_by_desktop_name(const TQString &serviceName, const TQStringList &urls,
     const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind)
 {
    KService::Ptr service = 0;
@@ -966,7 +966,7 @@ KLauncher::start_service_by_desktop_name(const TQString &serviceName, const TQSt
 }
 
 bool
-KLauncher::start_service(KService::Ptr service, const TQStringList &_urls,
+TDELauncher::start_service(KService::Ptr service, const TQStringList &_urls,
     const TQValueList<TQCString> &envs, const TQCString& startup_id, bool blind, bool autoStart)
 {
    TQStringList urls = _urls;
@@ -977,7 +977,7 @@ KLauncher::start_service(KService::Ptr service, const TQStringList &_urls,
       cancel_service_startup_info( NULL, startup_id, envs ); // cancel it if any
       return false;
    }
-   KLaunchRequest *request = new KLaunchRequest;
+   TDELaunchRequest *request = new TDELaunchRequest;
    request->autoStart = autoStart;
 
    if ((urls.count() > 1) && !service->allowMultipleFiles())
@@ -1047,11 +1047,11 @@ KLauncher::start_service(KService::Ptr service, const TQStringList &_urls,
 }
 
 void
-KLauncher::send_service_startup_info( KLaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
+TDELauncher::send_service_startup_info( TDELaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
     const TQValueList<TQCString> &envs )
 {
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11 // KStartup* isn't implemented for Qt/Embedded yet
+//#ifdef Q_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
     request->startup_id = "0";
     if( startup_id == "0" )
         return;
@@ -1059,7 +1059,7 @@ KLauncher::send_service_startup_info( KLaunchRequest *request, KService::Ptr ser
     TQCString wmclass;
     if( !KRun::checkStartupNotify( TQString::null, service, &silent, &wmclass ))
         return;
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( startup_id );
     const char* dpy_str = NULL;
     for( TQValueList<TQCString>::ConstIterator it = envs.begin();
@@ -1082,16 +1082,16 @@ KLauncher::send_service_startup_info( KLaunchRequest *request, KService::Ptr ser
 
     request->startup_dpy = dpy_str;
 
-    KStartupInfoData data;
+    TDEStartupInfoData data;
     data.setName( service->name());
     data.setIcon( service->icon());
     data.setDescription( i18n( "Launching %1" ).arg( service->name()));
     if( !wmclass.isEmpty())
         data.setWMClass( wmclass );
     if( silent )
-        data.setSilent( KStartupInfoData::Yes );
+        data.setSilent( TDEStartupInfoData::Yes );
     // the rest will be sent by tdeinit
-    KStartupInfo::sendStartupX( dpy, id, data );
+    TDEStartupInfo::sendStartupX( dpy, id, data );
     if( mCached_dpy != dpy && mCached_dpy != NULL )
         XCloseDisplay( mCached_dpy );
     mCached_dpy = dpy;
@@ -1102,11 +1102,11 @@ KLauncher::send_service_startup_info( KLaunchRequest *request, KService::Ptr ser
 }
 
 void
-KLauncher::cancel_service_startup_info( KLaunchRequest* request, const TQCString& startup_id,
+TDELauncher::cancel_service_startup_info( TDELaunchRequest* request, const TQCString& startup_id,
     const TQValueList<TQCString> &envs )
 {
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11 // KStartup* isn't implemented for Qt/Embedded yet
+//#ifdef Q_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
     if( request != NULL )
         request->startup_id = "0";
     if( !startup_id.isEmpty() && startup_id != "0" )
@@ -1125,9 +1125,9 @@ KLauncher::cancel_service_startup_info( KLaunchRequest* request, const TQCString
             dpy = XOpenDisplay( dpy_str );
         if( dpy == NULL )
             return;
-        KStartupInfoId id;
+        TDEStartupInfoId id;
         id.initId( startup_id );
-        KStartupInfo::sendFinishX( dpy, id );
+        TDEStartupInfo::sendFinishX( dpy, id );
         if( mCached_dpy != dpy && mCached_dpy != NULL )
            XCloseDisplay( mCached_dpy );
         mCached_dpy = dpy;
@@ -1136,10 +1136,10 @@ KLauncher::cancel_service_startup_info( KLaunchRequest* request, const TQCString
 }
 
 bool
-KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
+TDELauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
    const TQValueList<TQCString> &envs, TQCString startup_id, bool wait)
 {
-   KLaunchRequest *request = new KLaunchRequest;
+   TDELaunchRequest *request = new TDELaunchRequest;
    request->autoStart = false;
 
    for(TQStringList::ConstIterator it = args.begin();
@@ -1162,7 +1162,7 @@ KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
    request->startup_id = startup_id;
 #endif
    request->envs = envs;
-   if( app != "kbuildsycoca" ) // avoid stupid loop
+   if( app != "tdebuildsycoca" ) // avoid stupid loop
    {
        // Find service, if any - strip path if needed
        KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 ));
@@ -1178,7 +1178,7 @@ KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
 }
 
 void
-KLauncher::queueRequest(KLaunchRequest *request)
+TDELauncher::queueRequest(TDELaunchRequest *request)
 {
    requestQueue.append( request );
    if (!bProcessingQueue)
@@ -1189,14 +1189,14 @@ KLauncher::queueRequest(KLaunchRequest *request)
 }
 
 void
-KLauncher::slotDequeue()
+TDELauncher::slotDequeue()
 {
    do {
-      KLaunchRequest *request = requestQueue.take(0);
+      TDELaunchRequest *request = requestQueue.take(0);
       // process request
-      request->status = KLaunchRequest::Launching;
+      request->status = TDELaunchRequest::Launching;
       requestStart(request);
-      if (request->status != KLaunchRequest::Launching)
+      if (request->status != TDELaunchRequest::Launching)
       {
          // Request handled.
          requestDone( request );
@@ -1207,7 +1207,7 @@ KLauncher::slotDequeue()
 }
 
 void
-KLauncher::createArgs( KLaunchRequest *request, const KService::Ptr service ,
+TDELauncher::createArgs( TDELaunchRequest *request, const KService::Ptr service ,
                        const TQStringList &urls)
 {
   TQStringList params = KRun::processDesktopExec(*service, urls, false);
@@ -1223,7 +1223,7 @@ KLauncher::createArgs( KLaunchRequest *request, const KService::Ptr service ,
 ///// IO-Slave functions
 
 pid_t
-KLauncher::requestHoldSlave(const KURL &url, const TQString &app_socket)
+TDELauncher::requestHoldSlave(const KURL &url, const TQString &app_socket)
 {
     IdleSlave *slave;
     for(slave = mSlaveList.first(); slave; slave = mSlaveList.next())
@@ -1242,7 +1242,7 @@ KLauncher::requestHoldSlave(const KURL &url, const TQString &app_socket)
 
 
 pid_t
-KLauncher::requestSlave(const TQString &protocol,
+TDELauncher::requestSlave(const TQString &protocol,
                         const TQString &host,
                         const TQString &app_socket,
                         TQString &error)
@@ -1283,7 +1283,7 @@ KLauncher::requestSlave(const TQString &protocol,
         return 0;
     }
 
-    TQCString name = _name.latin1(); // ex: "kio_ftp"
+    TQCString name = _name.latin1(); // ex: "tdeio_ftp"
     TQCString arg1 = protocol.latin1();
     TQCString arg2 = TQFile::encodeName(mPoolSocketName);
     TQCString arg3 = TQFile::encodeName(app_socket);
@@ -1292,10 +1292,10 @@ KLauncher::requestSlave(const TQString &protocol,
     arg_list.append(arg2);
     arg_list.append(arg3);
 
-//    kdDebug(7016) << "KLauncher: launching new slave " << _name << " with protocol=" << protocol << endl;
+//    kdDebug(7016) << "TDELauncher: launching new slave " << _name << " with protocol=" << protocol << endl;
     if (mSlaveDebug == arg1)
     {
-       klauncher_header request_header;
+       tdelauncher_header request_header;
        request_header.cmd = LAUNCHER_DEBUG_WAIT;
        request_header.arg_length = 0;
        write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -1303,7 +1303,7 @@ KLauncher::requestSlave(const TQString &protocol,
     if (mSlaveValgrind == arg1)
     {
        arg_list.prepend(TQFile::encodeName(KLibLoader::findLibrary(name)));
-       arg_list.prepend(TQFile::encodeName(locate("exe", "kioslave")));
+       arg_list.prepend(TQFile::encodeName(locate("exe", "tdeioslave")));
        name = "valgrind";
        if (!mSlaveValgrindSkin.isEmpty()) {
            arg_list.prepend(TQCString("--tool=") + mSlaveValgrindSkin);
@@ -1311,7 +1311,7 @@ KLauncher::requestSlave(const TQString &protocol,
 	   arg_list.prepend("--tool=memcheck");
     }
 
-    KLaunchRequest *request = new KLaunchRequest;
+    TDELaunchRequest *request = new TDELaunchRequest;
     request->autoStart = false;
     request->name = name;
     request->arg_list =  arg_list;
@@ -1321,7 +1321,7 @@ KLauncher::requestSlave(const TQString &protocol,
 #ifdef Q_WS_X11
     request->startup_id = "0";
 #endif
-    request->status = KLaunchRequest::Launching;
+    request->status = TDELaunchRequest::Launching;
     request->transaction = 0; // No confirmation is send
     requestStart(request);
     pid_t pid = request->pid;
@@ -1338,7 +1338,7 @@ KLauncher::requestSlave(const TQString &protocol,
 }
 
 void
-KLauncher::waitForSlave(pid_t pid)
+TDELauncher::waitForSlave(pid_t pid)
 {
     IdleSlave *slave;
     for(slave = mSlaveList.first(); slave; slave = mSlaveList.next())
@@ -1353,7 +1353,7 @@ KLauncher::waitForSlave(pid_t pid)
 }
 
 void
-KLauncher::acceptSlave(KSocket *slaveSocket)
+TDELauncher::acceptSlave(TDESocket *slaveSocket)
 {
     IdleSlave *slave = new IdleSlave(slaveSocket);
     // Send it a SLAVE_STATUS command.
@@ -1368,7 +1368,7 @@ KLauncher::acceptSlave(KSocket *slaveSocket)
 }
 
 void
-KLauncher::slotSlaveStatus(IdleSlave *slave)
+TDELauncher::slotSlaveStatus(IdleSlave *slave)
 {
     SlaveWaitRequest *waitRequest = mSlaveWaitRequest.first();
     while(waitRequest)
@@ -1390,7 +1390,7 @@ KLauncher::slotSlaveStatus(IdleSlave *slave)
 }
 
 void
-KLauncher::slotSlaveGone()
+TDELauncher::slotSlaveGone()
 {
     IdleSlave *slave = (IdleSlave *) sender();
     mSlaveList.removeRef(slave);
@@ -1401,7 +1401,7 @@ KLauncher::slotSlaveGone()
 }
 
 void
-KLauncher::idleTimeout()
+TDELauncher::idleTimeout()
 {
     bool keepOneFileSlave=true;
     time_t now = time(0);
@@ -1418,4 +1418,4 @@ KLauncher::idleTimeout()
     }
 }
 
-#include "klauncher.moc"
+#include "tdelauncher.moc"
diff --git a/kinit/klauncher.h b/kinit/tdelauncher.h
index 763d20e53..791958980 100644
--- a/kinit/klauncher.h
+++ b/kinit/tdelauncher.h
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kio/connection.h>
+#include <tdeio/connection.h>
 #include <ksock.h>
 #include <kurl.h>
 #include <kuniqueapplication.h>
@@ -43,7 +43,7 @@ class IdleSlave : public TQObject
 {
    Q_OBJECT
 public:
-   IdleSlave(KSocket *socket);
+   IdleSlave(TDESocket *socket);
    bool match( const TQString &protocol, const TQString &host, bool connected);
    void connect( const TQString &app_socket);
    pid_t pid() const { return mPid;}
@@ -59,7 +59,7 @@ protected slots:
    void gotInput();
 
 protected:
-   KIO::Connection mConn;
+   TDEIO::Connection mConn;
    TQString mProtocol;
    TQString mHost;
    bool mConnected;
@@ -76,7 +76,7 @@ public:
    DCOPClientTransaction *transaction;
 };
 
-class KLaunchRequest
+class TDELaunchRequest
 {
 public:
    TQCString name;
@@ -105,14 +105,14 @@ struct serviceResult
   pid_t pid;
 };
 
-class KLauncher : public KApplication, public DCOPObject
+class TDELauncher : public TDEApplication, public DCOPObject
 {
    Q_OBJECT
 
 public:
-   KLauncher(int _tdeinitSocket, bool new_startup);
+   TDELauncher(int _tdeinitSocket, bool new_startup);
 
-   ~KLauncher();
+   ~TDELauncher();
 
    void close();
    static void destruct(int exit_code); // exit!
@@ -126,8 +126,8 @@ public:
 protected:
    void processDied(pid_t pid, long exitStatus);
 
-   void requestStart(KLaunchRequest *request);
-   void requestDone(KLaunchRequest *request);
+   void requestStart(TDELaunchRequest *request);
+   void requestDone(TDELaunchRequest *request);
 
    void setLaunchEnv(const TQCString &name, const TQCString &value);
    void exec_blind(const TQCString &name, const TQValueList<TQCString> &arg_list,
@@ -148,7 +148,7 @@ protected:
 
    void autoStart(int phase);
 
-   void createArgs( KLaunchRequest *request, const KService::Ptr service,
+   void createArgs( TDELaunchRequest *request, const KService::Ptr service,
                     const TQStringList &url);
 
    pid_t requestHoldSlave(const KURL &url, const TQString &app_socket);
@@ -156,11 +156,11 @@ protected:
                       const TQString &app_socket, TQString &error);
 
 
-   void queueRequest(KLaunchRequest *);
+   void queueRequest(TDELaunchRequest *);
 
-   void send_service_startup_info( KLaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
+   void send_service_startup_info( TDELaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
        const TQValueList<TQCString> &envs );
-   void cancel_service_startup_info( KLaunchRequest *request, const TQCString& startup_id,
+   void cancel_service_startup_info( TDELaunchRequest *request, const TQCString& startup_id,
        const TQValueList<TQCString> &envs );
 
 public slots:
@@ -169,20 +169,20 @@ public slots:
    void slotKDEInitData(int);
    void slotAppRegistered(const TQCString &appId);
    void slotSlaveStatus(IdleSlave *);
-   void acceptSlave( KSocket *);
+   void acceptSlave( TDESocket *);
    void slotSlaveGone();
    void idleTimeout();
 
 protected:
-   TQPtrList<KLaunchRequest> requestList; // Requests being handled
-   TQPtrList<KLaunchRequest> requestQueue; // Requests waiting to being handled
+   TQPtrList<TDELaunchRequest> requestList; // Requests being handled
+   TQPtrList<TDELaunchRequest> requestQueue; // Requests waiting to being handled
    int tdeinitSocket;
    TQSocketNotifier *tdeinitNotifier;
    serviceResult DCOPresult;
-   KLaunchRequest *lastRequest;
+   TDELaunchRequest *lastRequest;
    TQPtrList<SlaveWaitRequest> mSlaveWaitRequest;
    TQString mPoolSocketName;
-   KServerSocket *mPoolSocket;
+   TDEServerSocket *mPoolSocket;
    TQPtrList<IdleSlave> mSlaveList;
    TQTimer mTimer;
    TQTimer mAutoTimer;
diff --git a/kinit/klauncher_cmds.h b/kinit/tdelauncher_cmds.h
index 54b13f45a..5763e5a38 100644
--- a/kinit/klauncher_cmds.h
+++ b/kinit/tdelauncher_cmds.h
@@ -24,7 +24,7 @@ typedef struct
 {
    long cmd;
    long arg_length;
-} klauncher_header;
+} tdelauncher_header;
 
 /* Launcher commands: */
 
diff --git a/kinit/klauncher_main.cpp b/kinit/tdelauncher_main.cpp
index 0842bc2c2..747050668 100644
--- a/kinit/klauncher_main.cpp
+++ b/kinit/tdelauncher_main.cpp
@@ -22,32 +22,32 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "kapplication.h"
-#include "klauncher.h"
-#include "kcmdlineargs.h"
+#include "tdeapplication.h"
+#include "tdelauncher.h"
+#include "tdecmdlineargs.h"
 #include "kcrash.h"
 #include "kdebug.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <tqcstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
 
 static void sig_handler(int sig_num)
 {
    // No recursion
    signal( SIGHUP, SIG_IGN);
    signal( SIGTERM, SIG_IGN);
-   fprintf(stderr, "[klauncher] Exiting on signal %d\n", sig_num);
-   KLauncher::destruct(255);
+   fprintf(stderr, "[tdelauncher] Exiting on signal %d\n", sig_num);
+   TDELauncher::destruct(255);
 }
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "new-startup", "Internal", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
@@ -55,34 +55,34 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
    // Started via tdeinit.
    if (fcntl(LAUNCHER_FD, F_GETFD) == -1)
    {
-      fprintf(stderr, "%s", i18n("[klauncher] This program is not supposed to be started manually.\n"
-                                 "[klauncher] It is started automatically by tdeinit.\n").local8Bit().data());
+      fprintf(stderr, "%s", i18n("[tdelauncher] This program is not supposed to be started manually.\n"
+                                 "[tdelauncher] It is started automatically by tdeinit.\n").local8Bit().data());
       return 1;
    }
 
-   TQCString cname = KApplication::launcher();
+   TQCString cname = TDEApplication::launcher();
    char *name = cname.data();
-   KCmdLineArgs::init(argc, argv, name, "KLauncher", "A service launcher.",
+   TDECmdLineArgs::init(argc, argv, name, "TDELauncher", "A service launcher.",
                        "v1.0");
 
-   KLauncher::addCmdLineOptions();
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDELauncher::addCmdLineOptions();
+   TDECmdLineArgs::addCmdLineOptions( options );
 
    // WABA: Make sure not to enable session management.
    putenv(strdup("SESSION_MANAGER="));
 
    // Allow the locale to initialize properly
-   KLocale::setMainCatalogue("tdelibs");
+   TDELocale::setMainCatalogue("tdelibs");
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
    int maxTry = 3;
    while(true)
    {
-      TQCString dcopName = KApplication::dcopClient()->registerAs(name, false);
+      TQCString dcopName = TDEApplication::dcopClient()->registerAs(name, false);
       if (dcopName.isEmpty())
       {
-         kdWarning() << "[klauncher] DCOP communication problem!" << endl;
+         kdWarning() << "[tdelauncher] DCOP communication problem!" << endl;
          return 1;
       }
       if (dcopName == cname)
@@ -90,22 +90,22 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
 
       if (--maxTry == 0)
       {
-         kdWarning() << "[klauncher] Another instance of klauncher is already running!" << endl;
+         kdWarning() << "[tdelauncher] Another instance of tdelauncher is already running!" << endl;
          return 1;
       }
       
       // Wait a bit...
-      kdWarning() << "[klauncher] Waiting for already running klauncher to exit." << endl;
+      kdWarning() << "[tdelauncher] Waiting for already running tdelauncher to exit." << endl;
       sleep(1);
 
       // Try again...
    }
    
-   KLauncher *launcher = new KLauncher(LAUNCHER_FD, args->isSet("new-startup"));
+   TDELauncher *launcher = new TDELauncher(LAUNCHER_FD, args->isSet("new-startup"));
    launcher->dcopClient()->setDefaultObject( name );
    launcher->dcopClient()->setDaemonMode( true );
 
-   KCrash::setEmergencySaveFunction(sig_handler);
+   TDECrash::setEmergencySaveFunction(sig_handler);
    signal( SIGHUP, sig_handler);
    signal( SIGPIPE, SIG_IGN);
    signal( SIGTERM, sig_handler);
diff --git a/kinit/kstartupconfig.cpp b/kinit/tdestartupconfig.cpp
index 3204d6f7d..373ac6787 100644
--- a/kinit/kstartupconfig.cpp
+++ b/kinit/tdestartupconfig.cpp
@@ -42,10 +42,10 @@ It is not possible to specify default values, but since the configuration option
 are processed in the order they are specified this can be solved by first
 specifying a group and then all the entries that need default values.
 
-When a kconf_update script is used to update such option, kstartupconfig is run
-before kconf_update and therefore cannot see the change in time. To avoid this
-problem, together with the kconf_update script also the matching global config
-file should be updated (any change, kstartupconfig will see the timestamp change).
+When a tdeconf_update script is used to update such option, tdestartupconfig is run
+before tdeconf_update and therefore cannot see the change in time. To avoid this
+problem, together with the tdeconf_update script also the matching global config
+file should be updated (any change, tdestartupconfig will see the timestamp change).
 
 Note that the kdeglobals config file is not used as a depedendency for other config
 files.
@@ -58,7 +58,7 @@ followed by paths of all files that are relevant to the option. Non-existent fil
 have '!' prepended (for the case they'll be later created), the list of files is
 terminated by line containing '*'. If the timestamps of all relevant files are older
 than the timestamp of the startupconfigfile file, there's no need to update anything.
-Otherwise kdostartupconfig is launched to create or update all the necessary files
+Otherwise tdedostartupconfig is launched to create or update all the necessary files
 (which already requires loading KDE libraries, but this case should be rare).
 
 */
@@ -90,7 +90,7 @@ int main()
     strlcat( filename, "/share/config/startupconfig", 1024 );
     if( access( filename, R_OK ) != 0 )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "tdedostartupconfig" );
         return WEXITSTATUS( ret );
         }
     strlcpy( filename, tdehome, 1024 );
@@ -98,14 +98,14 @@ int main()
     struct stat st;
     if( stat( filename, &st ) != 0 )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "tdedostartupconfig" );
         return WEXITSTATUS( ret );
         }
     time_t config_time = st.st_mtime;
     FILE* config = fopen( filename, "r" );
     if( config == NULL )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "tdedostartupconfig" );
         return WEXITSTATUS( ret );
         }
     strlcpy( filename, tdehome, 1024 );
@@ -169,7 +169,7 @@ int main()
     fclose( config );
     if( need_update )
         {
-        int ret = system( "kdostartupconfig" );
+        int ret = system( "tdedostartupconfig" );
         return WEXITSTATUS( ret );
         }
     return 0;
diff --git a/kinit/tests/Makefile.am b/kinit/tests/Makefile.am
index 909e7c14b..e1157bf72 100644
--- a/kinit/tests/Makefile.am
+++ b/kinit/tests/Makefile.am
@@ -3,8 +3,8 @@
 INCLUDES=	-I$(srcdir)/../.. $(all_includes) 
 ####### Files
 
-check_PROGRAMS = klaunchertest
+check_PROGRAMS = tdelaunchertest
 
-klaunchertest_SOURCES = klaunchertest.cpp 
-klaunchertest_LDADD   = $(LIB_KIO)
+tdelaunchertest_SOURCES = tdelaunchertest.cpp 
+tdelaunchertest_LDADD   = $(LIB_KIO)
 
diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/tdelaunchertest.cpp
index f246e7086..07eaf21f7 100644
--- a/kinit/tests/klaunchertest.cpp
+++ b/kinit/tests/tdelaunchertest.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqstring.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <stdio.h>
 #include <tqvaluelist.h>
@@ -28,9 +28,9 @@
 
 int main(int argc, char *argv[])
 {
-   KApplication::tdeinitExec("konsole");
+   TDEApplication::tdeinitExec("konsole");
 
-   KApplication k(argc, argv, "klaunchertest");
+   TDEApplication k(argc, argv, "tdelaunchertest");
  
    kapp->dcopClient()->registerAs( kapp->name()) ;
 
@@ -38,13 +38,13 @@ int main(int argc, char *argv[])
    TQString error;
    TQCString dcopService;
    int pid;
-   int result = KApplication::startServiceByDesktopName(
+   int result = TDEApplication::startServiceByDesktopName(
 		TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
 
    printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
       result, error.ascii(), dcopService.data(), pid);
 
-   result = KApplication::startServiceByDesktopName(
+   result = TDEApplication::startServiceByDesktopName(
 		TQString::fromLatin1("konqueror"), TQString::null,  &error, &dcopService, &pid );
 
    printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
diff --git a/kinit/wrapper.c b/kinit/wrapper.c
index 36a75d46b..565c9a152 100644
--- a/kinit/wrapper.c
+++ b/kinit/wrapper.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -310,7 +310,7 @@ int main(int argc, char **argv)
    int kwrapper = 0;
    long arg_count;
    long env_count;
-   klauncher_header header;
+   tdelauncher_header header;
    char *start, *p, *buffer;
    char cwd[8192];
    const char *tty = NULL;
diff --git a/kio/data.protocol b/kio/data.protocol
deleted file mode 100644
index 85b0e8b66..000000000
--- a/kio/data.protocol
+++ /dev/null
@@ -1,71 +0,0 @@
-[Protocol]
-protocol=data
-input=stream
-output=none
-reading=true
-Icon=www
-Class=:internet
-Description=A kioslave for data URIs (rfc2397)
-Description[af]= ´n kioslave vir data URIs (rfc2397)
-Description[be]=Модуль kioslave дл� URI з данн�мі (rfc2397)
-Description[br]=Ur kioslave evit an URIoù roadoù (rfc2397)
-Description[bs]=Kioslave za data URIs (rfc2397)
-Description[ca]=Un kioslave per a URIs de dades (rfc2397)
-Description[cs]=Kioslave pro datová URI (rfc2397)
-Description[csb]=Plugins protokółu pòdôwków URI (rfc2397)
-Description[da]=En kioslave for data-URI'er (rfc2397)
-Description[de]=Ein-/Ausgabemodul für Daten-URIs (rfc2397)
-Description[el]=Ένα kioslave για URI δεδομένων (rfc2397)
-Description[es]=Un kioslave para datos URIs (rfc2397)
-Description[et]=Andme-URI-de I/O-moodul (rfc2397)
-Description[eu]=Datuen URLen (rfc2397) kioslave-a
-Description[fa]=یک kioslave برای URIهای داده )rfc2397(
-Description[fi]=kioslave data URI:lle (rfc2397)
-Description[fr]=Un module d'entrée / sortie pour les URI de données (rfc2397)
-Description[fy]=In kioslave foar data-URI-adresse (rfc2397)
-Description[gl]=Un kioslave para URIs de dados (rfc2397)
-Description[hi]=डाटा यूआरआई (आर�फसी2397) के लि� �क के-आई-ओ-स�लेव
-Description[hr]=kioslave za podatkovne URI-ije (rfc2397)
-Description[hu]=KDE-protokoll adat-URI-k használataához (RFC 2397)
-Description[id]=Kioslave for URI data (rfc2397)
-Description[is]=kioslave fyrir gagnaslóðir (rfc2397)
-Description[it]=Un kioslave per il protocollo di URI di dati (rfc2397)
-Description[ja]=データ URIs (rfc2397) � kioslave
-Description[ka]=URI მ�ნ�ცემთ� (rfc2397) დ�მმუშ�ვებელი
-Description[kk]=URI деректерді өңдеу kioslave модулі (rfc2397)
-Description[km]=kioslave មួយ​សម្រាប់​ទិន្នន�យ URIs (rfc2397)
-Description[lb]=E kioslave fir Donnéen-URIs (rfc2397)
-Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
-Description[mk]=kio-�лужител за податочни URI (rfc2397)
-Description[ms]=Kioslave untuk URI data (rfc2397)
-Description[nb]=kioslave for data URI-er (rfc2397)
-Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397)
-Description[ne]=डेटा URIs का लागि किओस�लेभ (rfc2397)
-Description[nl]=Een kioslave voor data-URI-adressen (rfc2397)
-Description[nn]=A kioslave for data URI-ar (rfc2397)
-Description[pa]= ਡਾਟਾ URI ਲਈ kioslave(rfc2397)
-Description[pl]=Wtyczka protokołu URI danych (rfc2397)
-Description[pt]=Um 'kioslave' para URIs data (rfc2397)
-Description[pt_BR]=Uma implementação para o protocolo de URIs de dados (rfc2397)
-Description[ro]=Un dispozitiv de I/E pentru URI-urile de date (rfc2397)
-Description[ru]=Обработчик URI данных (rfc2397)
-Description[rw]=Kioslave y'ibyatanzwe URI (rfc2397)
-Description[se]=kiošláva dáhta-URI:aid várás (rfc2397)
-Description[sk]=IO klient pre dátové URI (rfc2397)
-Description[sl]=kioslave za podatkovne URI-je (rfc2397)
-Description[sr]=kioslave за URI-ије података (rfc2397)
-Description[sr@Latn]=kioslave za URI-ije podataka (rfc2397)
-Description[sv]=En I/O-slav för datawebbadresser (RFC 2397)
-Description[ta]=தரவ� வலைமனைகள�க�கான ஒர� kioslave (rfc2397)
-Description[te]=దత�తాంశం య�ఆరైల కొరక� కె�ఓబానిస (rfc2397)
-Description[tg]=kioslave барои URIs (rfc2397)
-Description[th]=kioslave สำหรับข้อมูล URIs (rfc2397)
-Description[tr]= Veri adresleri için bir kioslave (rfc2397)
-Description[tt]=Biremle URI öçen kioslave (rfc2397)
-Description[uk]=Підлеглий В/В дл� адре� (URI) даних (rfc2397)
-Description[vi]=Một kioslave cho các địa điểm URI kiểu dữ liệu (rfc2397).
-Description[zh_CN]=data URI(rfc2397) çš„ kioslave
-DocPath=kioslave/data.html
-URIMode=rawuri
-defaultMimetype=application/octet-stream
-determineMimetypeFromExtension=false
diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp
deleted file mode 100644
index 859e75452..000000000
--- a/kio/kfile/tests/kcustommenueditortest.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "kcustommenueditor.h"
-#include <kapplication.h>
-#include <klocale.h>
-#include <kconfig.h>
-
-int main(int argc, char** argv)
-{
-  KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KCustomMenuEditorTest");
-  KCustomMenuEditor editor(0);
-  KConfig *cfg = new KConfig("kdesktop_custom_menu2");
-  editor.load(cfg);
-  if (editor.exec())
-  {
-     editor.save(cfg);
-     cfg->sync();
-  }
-}
-
diff --git a/kio/kio/ktraderparse.h b/kio/kio/ktraderparse.h
deleted file mode 100644
index bfeb15fe0..000000000
--- a/kio/kio/ktraderparse.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef __parse_h__
-#define __parse_h__
-
-/*
- * Functions definition for yacc
- */
-void KTraderParse_mainParse( const char *_code );
-void KTraderParse_setParseTree( void *_ptr1 );
-void KTraderParse_error( const char* err );
-void* KTraderParse_newOR( void *_ptr1, void *_ptr2 );
-void* KTraderParse_newAND( void *_ptr1, void *_ptr2 );
-void* KTraderParse_newCMP( void *_ptr1, void *_ptr2, int _i );
-void* KTraderParse_newIN( void *_ptr1, void *_ptr2 );
-void* KTraderParse_newMATCH( void *_ptr1, void *_ptr2 );
-void* KTraderParse_newCALC( void *_ptr1, void *_ptr2, int _i );
-void* KTraderParse_newBRACKETS( void *_ptr1 );
-void* KTraderParse_newNOT( void *_ptr1 );
-void* KTraderParse_newEXIST( char *_ptr1 );
-void* KTraderParse_newID( char *_ptr1 );
-void* KTraderParse_newSTRING( char *_ptr1 );
-void* KTraderParse_newNUM( int _i );
-void* KTraderParse_newFLOAT( float _f );
-void* KTraderParse_newBOOL( char _b );
-
-void* KTraderParse_newWITH( void *_ptr1 );
-void* KTraderParse_newMAX( void *_ptr1 );
-void* KTraderParse_newMIN( void *_ptr1 );
-void* KTraderParse_newMAX2( char *_id );
-void* KTraderParse_newMIN2( char *_id );
-void* KTraderParse_newFIRST();
-void* KTraderParse_newRANDOM();
-
-#endif
diff --git a/kio/kio/progressbase.cpp b/kio/kio/progressbase.cpp
deleted file mode 100644
index f01c00a7a..000000000
--- a/kio/kio/progressbase.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/* This file is part of the KDE libraries
-   Copyright (C) 2000 Matej Koss <koss@miesto.sk>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "jobclasses.h"
-#include "progressbase.h"
-
-namespace KIO {
-
-ProgressBase::ProgressBase( TQWidget *parent )
-  : TQWidget( parent )
-{
-  m_pJob = 0;
-
-  // delete dialog after the job is finished / canceled
-  m_bOnlyClean = false;
-
-  // stop job on close
-  m_bStopOnClose = true;
-}
-
-
-void ProgressBase::setJob( KIO::Job *job )
-{
-  // first connect all slots
-  connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
-
-  connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
-
-  // then assign job
-  m_pJob = job;
-}
-
-
-void ProgressBase::setJob( KIO::CopyJob *job )
-{
-  // first connect all slots
-  connect( job, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
-	   TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-	   TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( copying( KIO::Job*, const KURL& , const KURL& ) ),
-	   TQT_SLOT( slotCopying( KIO::Job*, const KURL&, const KURL& ) ) );
-  connect( job, TQT_SIGNAL( moving( KIO::Job*, const KURL& , const KURL& ) ),
-	   TQT_SLOT( slotMoving( KIO::Job*, const KURL&, const KURL& ) ) );
-  connect( job, TQT_SIGNAL( creatingDir( KIO::Job*, const KURL& ) ),
- 	   TQT_SLOT( slotCreatingDir( KIO::Job*, const KURL& ) ) );
-
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
-
-  connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
-
-  // then assign job
-  m_pJob = job;
-}
-
-
-void ProgressBase::setJob( KIO::DeleteJob *job )
-{
-  // first connect all slots
-  connect( job, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
-	   TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-	   TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( deleting( KIO::Job*, const KURL& ) ),
-	   TQT_SLOT( slotDeleting( KIO::Job*, const KURL& ) ) );
-
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
-
-  connect( job, TQT_SIGNAL( canceled( KIO::Job* ) ),
-	   TQT_SLOT( slotFinished( KIO::Job* ) ) );
-
-  // then assign job
-  m_pJob = job;
-}
-
-
-void ProgressBase::closeEvent( TQCloseEvent* ) {
-  // kill job when desired
-  if ( m_bStopOnClose ) {
-    slotStop();
-  } else {
-    // clean or delete dialog
-    if ( m_bOnlyClean ) {
-      slotClean();
-    } else {
-      delete this;
-    }
-  }
-}
-
-void ProgressBase::finished() {
-  // clean or delete dialog
-  if ( m_bOnlyClean ) {
-    slotClean();
-  } else {
-    deleteLater();
-  }
-}
-
-void ProgressBase::slotFinished( KIO::Job* ) {
-  finished();
-}
-
-
-void ProgressBase::slotStop() {
-  if ( m_pJob ) {
-    m_pJob->kill(); // this will call slotFinished
-    m_pJob = 0L;
-  } else {
-    slotFinished( 0 ); // here we call it ourselves
-  }
-
-  emit stopped();
-}
-
-
-void ProgressBase::slotClean() {
-  hide();
-}
-
-void ProgressBase::virtual_hook( int, void* )
-{ /*BASE::virtual_hook( id, data );*/ }
-
-} /* namespace */
-
-#include "progressbase.moc"
-
diff --git a/kio/kio/yacc.y b/kio/kio/yacc.y
deleted file mode 100644
index 1b86f4737..000000000
--- a/kio/kio/yacc.y
+++ /dev/null
@@ -1,126 +0,0 @@
-%{
-#include <stdlib.h>
-#include <stdio.h>
-#include "ktraderparse.h"
-
-void yyerror(const char *s);
-int yylex();
-void KTraderParse_initFlex( const char *s );
-
-%}
-
-%union
-{
-     char valb;
-     int vali;
-     double vald;
-     char *name;
-     void *ptr;
-}
-
-%token NOT
-%token EQ
-%token NEQ
-%token LEQ
-%token GEQ
-%token LE
-%token GR
-%token OR
-%token AND
-%token TOKEN_IN
-%token EXIST
-%token MAX
-%token MIN
-
-%token <valb> VAL_BOOL
-%token <name> VAL_STRING
-%token <name> VAL_ID
-%token <vali> VAL_NUM
-%token <vald> VAL_FLOAT
-
-%type <ptr> bool
-%type <ptr> bool_or
-%type <ptr> bool_and
-%type <ptr> bool_compare
-%type <ptr> expr_in
-%type <ptr> expr_twiddle
-%type <ptr> expr
-%type <ptr> term
-%type <ptr> factor_non
-%type <ptr> factor
-
-/* Grammar follows */
-
-%%
-
-constraint: /* empty */ { KTraderParse_setParseTree( 0L ); }
-          | bool { KTraderParse_setParseTree( $<ptr>1 ); }
-;
-
-bool: bool_or { $$ = $<ptr>1; }
-;
-
-bool_or: bool_and OR bool_or { $$ = KTraderParse_newOR( $<ptr>1, $<ptr>3 ); }
-       | bool_and { $$ = $<ptr>1; }
-;
-
-bool_and: bool_compare AND bool_and { $$ = KTraderParse_newAND( $<ptr>1, $<ptr>3 ); }
-        | bool_compare { $$ = $<ptr>1; }
-;
-
-bool_compare: expr_in EQ expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 1 ); }
-            | expr_in NEQ expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 2 ); }
-            | expr_in GEQ expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 3 ); }
-            | expr_in LEQ expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 4 ); }
-            | expr_in LE expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 5 ); }
-            | expr_in GR expr_in { $$ = KTraderParse_newCMP( $<ptr>1, $<ptr>3, 6 ); }
-            | expr_in { $$ = $<ptr>1; }
-;
-
-expr_in: expr_twiddle TOKEN_IN VAL_ID { $$ = KTraderParse_newIN( $<ptr>1, KTraderParse_newID( $<name>3 ) ); }
-       | expr_twiddle { $$ = $<ptr>1; }
-;
-
-expr_twiddle: expr '~' expr { $$ = KTraderParse_newMATCH( $<ptr>1, $<ptr>3 ); }
-            | expr { $$ = $<ptr>1; }
-;
-
-expr: expr '+' term { $$ = KTraderParse_newCALC( $<ptr>1, $<ptr>3, 1 ); }
-    | expr '-' term { $$ = KTraderParse_newCALC( $<ptr>1, $<ptr>3, 2 ); }
-    | term { $$ = $<ptr>1; }
-;
-
-term: term '*' factor_non { $$ = KTraderParse_newCALC( $<ptr>1, $<ptr>3, 3 ); }
-    | term '/' factor_non { $$ = KTraderParse_newCALC( $<ptr>1, $<ptr>3, 4 ); }
-    | factor_non { $$ = $<ptr>1; }
-;
-
-factor_non: NOT factor { $$ = KTraderParse_newNOT( $<ptr>2 ); }
-          | factor { $$ = $<ptr>1; }
-;
-
-factor: '(' bool_or ')' { $$ = KTraderParse_newBRACKETS( $<ptr>2 ); }
-      | EXIST VAL_ID { $$ = KTraderParse_newEXIST( $<name>2 ); }
-      | VAL_ID { $$ = KTraderParse_newID( $<name>1 ); }
-      | VAL_NUM { $$ = KTraderParse_newNUM( $<vali>1 ); }
-      | VAL_FLOAT { $$ = KTraderParse_newFLOAT( $<vald>1 ); }
-      | VAL_STRING { $$ = KTraderParse_newSTRING( $<name>1 ); }
-      | VAL_BOOL { $$ = KTraderParse_newBOOL( $<valb>1 ); }
-      | MAX VAL_ID { $$ = KTraderParse_newMAX2( $<name>2 ); }
-      | MIN VAL_ID { $$ = KTraderParse_newMIN2( $<name>2 ); }
-;
-
-/* End of grammar */
-
-%%
-
-void yyerror ( const char *s )  /* Called by yyparse on error */
-{
-    KTraderParse_error( s );
-}
-
-void KTraderParse_mainParse( const char *_code )
-{
-  KTraderParse_initFlex( _code );
-  yyparse();
-}
diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am
deleted file mode 100644
index 277a62974..000000000
--- a/kio/kioexec/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AM_CPPFLAGS = $(all_includes)
-
-bin_PROGRAMS = kioexec
-
-kioexec_SOURCES = main.cpp
-kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kioexec_LDADD   = $(LIB_KIO)
-
-noinst_HEADERS = main.h
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) $(kioexec_SOURCES) -o $(podir)/kioexec.pot
-
-install-exec-local:
-	@rm -f $(DESTDIR)$(bindir)/kfmexec
-	@$(LN_S) kioexec $(DESTDIR)$(bindir)/kfmexec
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am
deleted file mode 100644
index ad5a377a2..000000000
--- a/kio/misc/kfile/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-METASOURCES = AUTO
-
-noinst_HEADERS = fileprops.h
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
-
-bin_PROGRAMS = kfile
-kfile_SOURCES = fileprops.cpp
-kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kfile_LDADD = $(LIB_KIO)
-
diff --git a/kio/misc/kntlm/Makefile.am b/kio/misc/kntlm/Makefile.am
deleted file mode 100644
index 91efaf40f..000000000
--- a/kio/misc/kntlm/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES=$(all_includes)
-
-lib_LTLIBRARIES = libkntlm.la
-METASOURCES     = AUTO
-
-kntlmincludedir = $(includedir)/kio
-kntlminclude_HEADERS = kntlm.h
-
-libkntlm_la_SOURCES = kntlm.cpp des.cpp
-libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
-libkntlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
-
diff --git a/kio/pics/Makefile.am b/kio/pics/Makefile.am
deleted file mode 100644
index db5ddb1cc..000000000
--- a/kio/pics/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-kiouiservericonsdir = $(kde_datadir)/kio_uiserver/icons
-kiouiservericons_ICON = AUTO
-
diff --git a/kio/tests/ksycocaupdatetest.cpp b/kio/tests/ksycocaupdatetest.cpp
deleted file mode 100644
index 1d9e3fcaa..000000000
--- a/kio/tests/ksycocaupdatetest.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <kservice.h>
-
-#include <kapplication.h>
-
-int main(int argc, char *argv[])
-{
-   KApplication k(argc,argv,"whatever"); // KMessageBox needs KApp for makeStdCaption
-
-   KService::rebuildKSycoca(0);
-   return 0;
-}
diff --git a/kioslave/file/Makefile.am b/kioslave/file/Makefile.am
deleted file mode 100644
index 3daf0cbcc..000000000
--- a/kioslave/file/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am of tdebase/kioslave/file
-
-AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
-
-INCLUDES = $(all_includes)
-
-####### Files
-
-kde_module_LTLIBRARIES = kio_file.la
-
-kio_file_la_SOURCES = file.cc
-kio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(ACL_LIBS)
-kio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
-noinst_HEADERS = file.h
-
-fileinclude_HEADERS = file.h
-fileincludedir = $(includedir)/kio
-
-METASOURCES = AUTO
-
-kdelnkdir = $(kde_servicesdir)
-kdelnk_DATA = file.protocol
diff --git a/kioslave/ftp/Makefile.am b/kioslave/ftp/Makefile.am
deleted file mode 100644
index c062d6430..000000000
--- a/kioslave/ftp/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES= $(all_includes)
-
-####### Files
-
-kde_module_LTLIBRARIES = kio_ftp.la
-
-kio_ftp_la_SOURCES = ftp.cc
-kio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
-kio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
-
-noinst_HEADERS = ftp.h
-
-kdelnk_DATA = ftp.protocol
-kdelnkdir = $(kde_servicesdir)
-
-
diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am
deleted file mode 100644
index f8e099140..000000000
--- a/kioslave/http/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$
-# Makefile.am of tdebase/kioslave/http
-
-SUBDIRS = kcookiejar
-
-INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/tdecore/network $(all_includes) $(GSSAPI_INCS)
-AM_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH)
-
-####### Files
-
-bin_PROGRAMS=
-lib_LTLIBRARIES=
-tdeinit_LTLIBRARIES = kio_http_cache_cleaner.la
-kde_module_LTLIBRARIES = kio_http.la
-
-kio_http_la_SOURCES = http.cc
-kio_http_la_METASOURCES = AUTO
-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/kntlm/libkntlm.la
-kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
-
-kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
-kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
-kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
-
-noinst_HEADERS = http.h
-
-kdelnkdir = $(kde_servicesdir)
-kdelnk_DATA = http_cache_cleaner.desktop http.protocol https.protocol \
-              webdav.protocol webdavs.protocol
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kjs/README b/kjs/README
index 7e01b0b41..a0545086e 100644
--- a/kjs/README
+++ b/kjs/README
@@ -13,7 +13,7 @@ for the standard page.
 About 95% of the required features should be covered by now. Note that this
 number covers the core language elements only. Features like the famous
 roll-over buttons on the www are NOT part of the standard. Those extensions
-are added via a module loaded dynamically by the KHTML Widget.
+are added via a module loaded dynamically by the TDEHTML Widget.
 
 I'll provide some examples of how to extend this library for various needs at
 a later point in time. Feel free to contact me via mail if you have any
diff --git a/kmdi/Makefile.am b/kmdi/Makefile.am
deleted file mode 100644
index 5e176dc17..000000000
--- a/kmdi/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-SUBDIRS = kmdi . test
-
-INCLUDES = -I$(top_srcdir)/kmdi/res -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
-
-lib_LTLIBRARIES = libkmdi.la
-libkmdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libkmdi_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
-
-libkmdi_la_SOURCES = kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \
-                     kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp kmdidockcontainer.cpp \
-		     kmditoolviewaccessor.cpp kmdiguiclient.cpp kmdidocumentviewtabwidget.cpp \
-                     kmdifocuslist.cpp
-
-include_HEADERS = kmdichildarea.h kmdichildfrm.h kmdichildfrmcaption.h kmdidefines.h \
-                  kmdiiterator.h kmdilistiterator.h kmdimainfrm.h kmdinulliterator.h \
-                  kmditaskbar.h kmdichildview.h kmditoolviewaccessor.h
-
-METASOURCES = AUTO
-
-include ../admin/Doxyfile.am
diff --git a/kmdi/kmdi/Makefile.am b/kmdi/kmdi/Makefile.am
deleted file mode 100644
index 7f16a30dd..000000000
--- a/kmdi/kmdi/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
-
-lib_LTLIBRARIES = libkmdi2.la
-libkmdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
-libkmdi2_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
-
-libkmdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
-
-kmdiincludedir = $(includedir)/kmdi
-kmdiinclude_HEADERS = global.h mainwindow.h toolviewaccessor.h tabwidget.h
-
-METASOURCES = AUTO
-
-include ../../admin/Doxyfile.am
diff --git a/knewstuff/CMakeLists.txt b/knewstuff/CMakeLists.txt
index 50350f29f..4493ee385 100644
--- a/knewstuff/CMakeLists.txt
+++ b/knewstuff/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 link_directories(
@@ -38,7 +38,7 @@ install( FILES
 ##### other data ################################
 
 install( FILES types DESTINATION ${DATA_INSTALL_DIR}/knewstuff )
-install( FILES khotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdehotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
 tde_install_icons( )
 
 
@@ -55,17 +55,17 @@ 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}
 )
 
 
-##### khotnewstuff ##############################
+##### tdehotnewstuff ##############################
 
-set( target khotnewstuff )
+set( target tdehotnewstuff )
 
 set( ${target}_SRCS
-  khotnewstuff.cpp
+  tdehotnewstuff.cpp
 )
 
 tde_add_executable( ${target} AUTOMOC
diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am
index 50272b343..c15716c8e 100644
--- a/knewstuff/Makefile.am
+++ b/knewstuff/Makefile.am
@@ -10,26 +10,26 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
   uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
   knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp
 
-bin_PROGRAMS = khotnewstuff
+bin_PROGRAMS = tdehotnewstuff
 
-khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-khotnewstuff_LDADD = libknewstuff.la
-khotnewstuff_SOURCES = khotnewstuff.cpp
+tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdehotnewstuff_LDADD = libknewstuff.la
+tdehotnewstuff_SOURCES = tdehotnewstuff.cpp
 
 EXTRA_PROGRAMS = testnewstuff ghns
 
-testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testnewstuff_LDADD   = libknewstuff.la
 testnewstuff_SOURCES = testnewstuff.cpp
 
-ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 ghns_LDADD   = libknewstuff.la
 ghns_SOURCES = ghns.cpp
 
 knewstuffdir = $(kde_datadir)/knewstuff
 knewstuff_DATA = types
 
-kde_conf_DATA = khotnewstuffrc
+kde_conf_DATA = tdehotnewstuffrc
 
 knsdir = $(includedir)/knewstuff
 kns_HEADERS = downloaddialog.h engine.h entry.h knewstuffgeneric.h knewstuff.h providerdialog.h provider.h uploaddialog.h knewstuffbutton.h knewstuffsecure.h
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index e8e2bfb3f..8c31712cb 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -21,15 +21,15 @@
 #include "downloaddialog.h"
 #include "downloaddialog.moc"
 
-#include <klocale.h>
-#include <klistview.h>
+#include <tdelocale.h>
+#include <tdelistview.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
-#include <kconfig.h>
-#include <kapplication.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <knewstuff/entry.h>
@@ -50,18 +50,18 @@ struct DownloadDialog::Private
 {
     TQString m_providerlist;
     TQWidget *m_page;
-    KListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l;
+    TDEListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l;
     TQPtrList<Entry> m_installlist;
-    TQMap<KIO::Job*, Provider*> m_variantjobs;
-    TQMap<KIO::Job*, TQStringList> m_variants;
+    TQMap<TDEIO::Job*, Provider*> m_variantjobs;
+    TQMap<TDEIO::Job*, TQStringList> m_variants;
     TQMap<Provider*, Provider*> m_newproviders;
 };
 
-class NumSortListViewItem : public KListViewItem
+class NumSortListViewItem : public TDEListViewItem
 {
   public:
   NumSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null )  :
-  KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
+  TDEListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
   {
   }
 
@@ -72,15 +72,15 @@ class NumSortListViewItem : public KListViewItem
       s.sprintf("%08d", text(col).toInt());
       return s;
     }
-    return KListViewItem::key( col, asc );
+    return TDEListViewItem::key( col, asc );
   }
 };
 
-class DateSortListViewItem : public KListViewItem
+class DateSortListViewItem : public TDEListViewItem
 {
   public:
   DateSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null )  :
-  KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
+  TDEListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
   {
   }
 
@@ -88,11 +88,11 @@ class DateSortListViewItem : public KListViewItem
     if (col == 2)
     {
       TQString s;
-      TQDate date = KGlobal::locale()->readDate(text(col));
+      TQDate date = TDEGlobal::locale()->readDate(text(col));
       s.sprintf("%08d", date.year() * 366 + date.dayOfYear());
       return s;
     }
-    return KListViewItem::key( col, asc );
+    return TDEListViewItem::key( col, asc );
   }
 };
 
@@ -157,7 +157,7 @@ DownloadDialog::~DownloadDialog()
 {
     for (TQMap<TQWidget *, TQValueList<TQPushButton *>* >::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
         delete it.data();
-    for (TQMap<TQWidget *, TQValueList<KListView *>* >::const_iterator it = m_map.constBegin(); it != m_map.constEnd(); ++it)
+    for (TQMap<TQWidget *, TQValueList<TDEListView *>* >::const_iterator it = m_map.constBegin(); it != m_map.constEnd(); ++it)
         delete it.data();
     delete d;
 }
@@ -174,11 +174,11 @@ void DownloadDialog::load(TQString providerList)
 
 void DownloadDialog::clear()
 {
-  TQMap<TQWidget*, TQValueList<KListView*>* >::Iterator it;
-  TQMap<TQWidget*, TQValueList<KListView*>* >::Iterator end(m_map.end());
+  TQMap<TQWidget*, TQValueList<TDEListView*>* >::Iterator it;
+  TQMap<TQWidget*, TQValueList<TDEListView*>* >::Iterator end(m_map.end());
   for(it = m_map.begin(); it != end; ++it)
   {
-    TQValueList<KListView*> *v = it.data();
+    TQValueList<TDEListView*> *v = it.data();
     kdDebug() << "clear listviews in " << v << endl;
     if(v)
     {
@@ -237,16 +237,16 @@ void DownloadDialog::addProvider(Provider *p)
   {
     if(!p->icon().protocol().isEmpty())
     {
-      ret = KIO::NetAccess::download(p->icon(), tmp, this);
+      ret = TDEIO::NetAccess::download(p->icon(), tmp, this);
       if(ret) pix = TQPixmap(tmp);
     }
     else
     {
-      pix = KGlobal::iconLoader()->loadIcon(p->icon().path(), KIcon::Panel);
+      pix = TDEGlobal::iconLoader()->loadIcon(p->icon().path(), TDEIcon::Panel);
       ret = true;
     }
   }
-  if(!ret) pix = KGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel);
+  if(!ret) pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", TDEIcon::Panel);
   frame = addPage(p->name(), p->name(), pix);
   m_frame = frame;
 
@@ -266,19 +266,19 @@ void DownloadDialog::addProvider(Provider *p)
   TQHBoxLayout *box = new TQHBoxLayout(frame);
   box->add(ctl);
 
-  d->m_lvtmp_r = new KListView(w_r);
+  d->m_lvtmp_r = new TDEListView(w_r);
   d->m_lvtmp_r->addColumn(i18n("Name"));
   d->m_lvtmp_r->addColumn(i18n("Version"));
   d->m_lvtmp_r->addColumn(i18n("Rating"));
   d->m_lvtmp_r->setSorting(2, false);
 
-  d->m_lvtmp_d = new KListView(w_d);
+  d->m_lvtmp_d = new TDEListView(w_d);
   d->m_lvtmp_d->addColumn(i18n("Name"));
   d->m_lvtmp_d->addColumn(i18n("Version"));
   d->m_lvtmp_d->addColumn(i18n("Downloads"));
   d->m_lvtmp_d->setSorting(2, false);
 
-  d->m_lvtmp_l = new KListView(w_l);
+  d->m_lvtmp_l = new TDEListView(w_l);
   d->m_lvtmp_l->addColumn(i18n("Name"));
   d->m_lvtmp_l->addColumn(i18n("Version"));
   d->m_lvtmp_l->addColumn(i18n("Release Date"));
@@ -315,7 +315,7 @@ void DownloadDialog::addProvider(Provider *p)
   TQVBoxLayout *box4 = new TQVBoxLayout(w_l);
   box4->add(d->m_lvtmp_l);
 
-  TQValueList<KListView*> *v = new TQValueList<KListView*>;
+  TQValueList<TDEListView*> *v = new TQValueList<TDEListView*>;
   *v << d->m_lvtmp_r << d->m_lvtmp_d << d->m_lvtmp_l;
   m_map[frame] = v;
   m_rts[frame] = rt;
@@ -331,7 +331,7 @@ void DownloadDialog::addProvider(Provider *p)
   TQTimer::singleShot(100, this, TQT_SLOT(slotFinish()));
 }
 
-void DownloadDialog::slotResult(KIO::Job *job)
+void DownloadDialog::slotResult(TDEIO::Job *job)
 {
   TQDomDocument dom;
   TQDomElement knewstuff;
@@ -392,7 +392,7 @@ int DownloadDialog::installStatus(Entry *entry)
   TQString datestring;
   int installed;
 
-  TQString lang = KGlobal::locale()->language();
+  TQString lang = TDEGlobal::locale()->language();
 
   kapp->config()->setGroup("KNewStuffStatus");
   datestring = kapp->config()->readEntry(entry->name(lang));
@@ -415,28 +415,28 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants)
 
   installed = installStatus(entry);
 
-  if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small);
-  else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small);
+  if(installed > 0) pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);
+  else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", TDEIcon::Small);
   else pix = TQPixmap();
 
-  TQString lang = KGlobal::locale()->language();
+  TQString lang = TDEGlobal::locale()->language();
 
   if(variants.contains("score"))
   {
-    KListViewItem *tmp_r = new NumSortListViewItem(lv_r,
+    TDEListViewItem *tmp_r = new NumSortListViewItem(lv_r,
       entry->name(lang), entry->version(), TQString("%1").arg(entry->rating()));
     tmp_r->setPixmap(0, pix);
   }
   if(variants.contains("downloads"))
   {
-    KListViewItem *tmp_d = new NumSortListViewItem(lv_d,
+    TDEListViewItem *tmp_d = new NumSortListViewItem(lv_d,
       entry->name(lang), entry->version(), TQString("%1").arg(entry->downloads()));
     tmp_d->setPixmap(0, pix);
   }
   if(variants.contains("latest"))
   {
-    KListViewItem *tmp_l = new DateSortListViewItem(lv_l,
-      entry->name(lang), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate()));
+    TDEListViewItem *tmp_l = new DateSortListViewItem(lv_l,
+      entry->name(lang), entry->version(), TDEGlobal::locale()->formatDate(entry->releaseDate()));
     tmp_l->setPixmap(0, pix);
   }
 
@@ -459,7 +459,7 @@ void DownloadDialog::addEntry(Entry *entry)
   kdDebug() << "added entry " << entry->name() << endl;
 }
 
-void DownloadDialog::slotData(KIO::Job *job, const TQByteArray &a)
+void DownloadDialog::slotData(TDEIO::Job *job, const TQByteArray &a)
 {
   TQCString tmp(a, a.size() + 1);
   m_data[job].append(TQString::fromUtf8(tmp));
@@ -470,7 +470,7 @@ void DownloadDialog::slotDetails()
   Entry *e = getEntry();
   if(!e) return;
 
-  TQString lang = KGlobal::locale()->language();
+  TQString lang = TDEGlobal::locale()->language();
 
   TQString info = i18n
   (
@@ -490,7 +490,7 @@ void DownloadDialog::slotDetails()
     ).arg(e->release()
     ).arg(e->rating()
     ).arg(e->downloads()
-    ).arg(KGlobal::locale()->formatDate(e->releaseDate())
+    ).arg(TDEGlobal::locale()->formatDate(e->releaseDate())
     ).arg(e->summary(lang)
   );
 
@@ -539,8 +539,8 @@ void DownloadDialog::slotInstall()
     KURL source = e->payload();
     KURL dest = KURL(m_s->downloadDestination(e));
 
-    KIO::FileCopyJob *job = KIO::file_copy(source, dest, -1, true);
-    connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotInstalled(KIO::Job*)));
+    TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true);
+    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*)));
   }
 }
 
@@ -550,9 +550,9 @@ void DownloadDialog::install(Entry *e)
   kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate)));
   kapp->config()->sync();
 
-  TQPixmap pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small);
+  TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);
 
-  TQString lang = KGlobal::locale()->language();
+  TQString lang = TDEGlobal::locale()->language();
   
   if(m_entryitem)
   {
@@ -580,12 +580,12 @@ void DownloadDialog::install(Entry *e)
   d->m_lvtmp_d->setEnabled( true );
 }
 
-void DownloadDialog::slotInstalled(KIO::Job *job)
+void DownloadDialog::slotInstalled(TDEIO::Job *job)
 {
   bool ret = job && (job->error() == 0);
   if(ret)
   {
-    KIO::FileCopyJob *cjob = ::tqqt_cast<KIO::FileCopyJob*>(job);
+    TDEIO::FileCopyJob *cjob = ::tqqt_cast<TDEIO::FileCopyJob*>(job);
     if(cjob)
     {
       ret = m_s->install(cjob->destURL().path());
@@ -640,12 +640,12 @@ void DownloadDialog::slotSelected()
   TQString tmp;
   bool enabled;
   Entry *e = getEntry();
-  TQString lang = KGlobal::locale()->language();
+  TQString lang = TDEGlobal::locale()->language();
   bool ret;
 
   if(e)
   {
-    TQString lang = KGlobal::locale()->language();
+    TQString lang = TDEGlobal::locale()->language();
 
     TQListViewItem *item;
     if(m_curtab != 0)
@@ -673,7 +673,7 @@ void DownloadDialog::slotSelected()
     }
     else
     {
-      ret = KIO::NetAccess::download(e->preview(lang), tmp, this);
+      ret = TDEIO::NetAccess::download(e->preview(lang), tmp, this);
     }
 
     TQString desc = TQString("<b>%1</b><br>").arg(e->name(lang));
@@ -685,7 +685,7 @@ void DownloadDialog::slotSelected()
     {
       desc += TQString("%1").arg(e->author());
     }
-    desc += TQString("<br>%1").arg(KGlobal::locale()->formatDate(e->releaseDate()));
+    desc += TQString("<br>%1").arg(TDEGlobal::locale()->formatDate(e->releaseDate()));
     desc += TQString("<br><br>");
     if(ret)
     {
@@ -728,7 +728,7 @@ Entry *DownloadDialog::getEntry()
 
   TQString entryName = entryItem->text(0);
 
-  TQString lang = KGlobal::locale()->language();
+  TQString lang = TDEGlobal::locale()->language();
 
   for(Entry *e = m_entries.first(); e; e = m_entries.next())
     if(e->name(lang) == entryName)
@@ -770,7 +770,7 @@ void DownloadDialog::slotPage(TQWidget *w)
 
 void DownloadDialog::loadProvider(Provider *p)
 {
-  TQMap<KIO::Job*, Provider*>::Iterator it;
+  TQMap<TDEIO::Job*, Provider*>::Iterator it;
 
   for(it = d->m_variantjobs.begin(); it != d->m_variantjobs.end(); it++)
   {
@@ -810,15 +810,15 @@ void DownloadDialog::loadProvider(Provider *p)
     TQString url = it.key();
     TQStringList urlvariants = it.data();
 
-    KIO::TransferJob *variantjob = KIO::get(url);
+    TDEIO::TransferJob *variantjob = TDEIO::get(url);
     d->m_newproviders[p] = p;
     d->m_variantjobs[variantjob] = p;
     d->m_variants[variantjob] = urlvariants;
     m_data[variantjob] = "";
 
-    connect(variantjob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)));
-    connect(variantjob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-      TQT_SLOT(slotData(KIO::Job*, const TQByteArray&)));
+    connect(variantjob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+    connect(variantjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+      TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
   }
 
   if(variants.count() == 0) return;
@@ -827,7 +827,7 @@ void DownloadDialog::loadProvider(Provider *p)
 
   kdDebug() << "-- reached old downloadurl section; variants left: " << variants.count() << endl;
 
-  KIO::TransferJob *job = KIO::get(p->downloadUrl());
+  TDEIO::TransferJob *job = TDEIO::get(p->downloadUrl());
 
   d->m_newproviders[p] = p;
   d->m_variantjobs[job] = p;
@@ -835,9 +835,9 @@ void DownloadDialog::loadProvider(Provider *p)
   //m_jobs[job] = p; // not used anymore due to variants
   m_data[job] = "";
 
-  connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)));
-  connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-    TQT_SLOT(slotData(KIO::Job*, const TQByteArray&)));
+  connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+  connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+    TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
 }
 
 void DownloadDialog::setType(TQString type)
diff --git a/knewstuff/downloaddialog.h b/knewstuff/downloaddialog.h
index 2c30ee9ba..1d61d259d 100644
--- a/knewstuff/downloaddialog.h
+++ b/knewstuff/downloaddialog.h
@@ -23,12 +23,12 @@
 #include <kdialogbase.h>
 #include <knewstuff/provider.h>
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
 
-class KListView;
+class TDEListView;
 class TQTextBrowser;
 class TQFrame;
 class KNewStuffGeneric;
@@ -112,7 +112,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
       a previously set type.
 
       @param providerList the URl to the list of providers; if empty
-             we first try the ProvidersUrl from KGlobal::config, then we
+             we first try the ProvidersUrl from TDEGlobal::config, then we
              fall back to a hardcoded value.
     */
     void load(TQString providerList); // KDE4: merge with load() above
@@ -211,11 +211,11 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
     void slotOk();
 
   private slots:
-    void slotResult(KIO::Job *job);
-    void slotData(KIO::Job *job, const TQByteArray &a);
+    void slotResult(TDEIO::Job *job);
+    void slotData(TDEIO::Job *job, const TQByteArray &a);
     void slotInstall();
     void slotDetails();
-    void slotInstalled(KIO::Job *job);
+    void slotInstalled(TDEIO::Job *job);
     void slotTab();
     void slotSelected();
     void slotPage(TQWidget *w);
@@ -232,7 +232,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
 
     ProviderLoader *m_loader;
     TQString m_entryname;
-    KListView *lv_r, *lv_d, *lv_l;
+    TDEListView *lv_r, *lv_d, *lv_l;
     TQTextBrowser *m_rt;
     TQFrame *m_frame;
     TQListViewItem *m_entryitem;
@@ -240,12 +240,12 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
     Entry *m_entry;
     KNewStuffGeneric *m_s;
     int m_curtab;
-    TQMap<TQWidget*, TQValueList<KListView*>* > m_map;
+    TQMap<TQWidget*, TQValueList<TDEListView*>* > m_map;
     TQMap<TQWidget*, Provider*> m_providers;
     TQMap<TQWidget*, TQTextBrowser*> m_rts;
     TQMap<TQWidget*, TQValueList<TQPushButton*>* > m_buttons;
-    TQMap<KIO::Job*, Provider*> m_jobs;
-    TQMap<KIO::Job*, TQString> m_data;
+    TQMap<TDEIO::Job*, Provider*> m_jobs;
+    TQMap<TDEIO::Job*, TQString> m_data;
     TQString m_filter;
     Engine *m_engine;
     Private *d;
diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp
index e460c2318..2b33e85f5 100644
--- a/knewstuff/engine.cpp
+++ b/knewstuff/engine.cpp
@@ -22,11 +22,11 @@
 #include <tqdom.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeio/job.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "knewstuff.h"
@@ -104,18 +104,18 @@ void Engine::getMetaInformation( Provider::List *providers )
   for ( p = providers->first(); p; p = providers->next() ) {
     if ( p->downloadUrl().isEmpty() ) continue;
 
-    KIO::TransferJob *job = KIO::get( p->downloadUrl(), false, false );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             TQT_SLOT( slotNewStuffJobResult( KIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotNewStuffJobData( KIO::Job *, const TQByteArray & ) ) );
+    TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl(), false, false );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
     mNewStuffJobData.insert( job, "" );
     mProviderJobs[ job ] = p;
   }
 }
 
-void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data )
+void Engine::slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data )
 {
   if ( data.isEmpty() ) return;
 
@@ -126,7 +126,7 @@ void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data )
   mNewStuffJobData[ job ].append( TQString::fromUtf8( str ) );
 }
 
-void Engine::slotNewStuffJobResult( KIO::Job *job )
+void Engine::slotNewStuffJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     kdDebug() << "Error downloading new stuff descriptions." << endl;
@@ -199,12 +199,12 @@ void Engine::download( Entry *entry )
   kdDebug() << "  SOURCE: " << source.url() << endl;
   kdDebug() << "  DESTINATION: " << destination.url() << endl;
 
-  KIO::FileCopyJob *job = KIO::file_copy( source, destination, -1, true );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotDownloadJobResult( KIO::Job * ) ) );
+  TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) );
 }
 
-void Engine::slotDownloadJobResult( KIO::Job *job )
+void Engine::slotDownloadJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     kdDebug() << "Error downloading new stuff payload." << endl;
@@ -321,9 +321,9 @@ void Engine::upload( Entry *entry )
       KURL destination = mUploadProvider->uploadUrl();
       destination.setFileName( fi.fileName() );
 
-      KIO::FileCopyJob *job = KIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination );
-      connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotUploadPayloadJobResult( KIO::Job * ) ) );
+      TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination );
+      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) );
     } else {
       emit uploadFinished( false );
     }
@@ -364,7 +364,7 @@ bool Engine::createMetaFile( Entry *entry )
   return true;
 }
 
-void Engine::slotUploadPayloadJobResult( KIO::Job *job )
+void Engine::slotUploadPayloadJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     kdDebug() << "Error uploading new stuff payload." << endl;
@@ -383,12 +383,12 @@ void Engine::slotUploadPayloadJobResult( KIO::Job *job )
   KURL previewDestination = mUploadProvider->uploadUrl();
   previewDestination.setFileName( fi.fileName() );
 
-  KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination );
-  connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotUploadPreviewJobResult( KIO::Job * ) ) );
+  TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination );
+  connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) );
 }
 
-void Engine::slotUploadPreviewJobResult( KIO::Job *job )
+void Engine::slotUploadPreviewJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     kdDebug() << "Error uploading new stuff preview." << endl;
@@ -402,12 +402,12 @@ void Engine::slotUploadPreviewJobResult( KIO::Job *job )
   KURL metaDestination = mUploadProvider->uploadUrl();
   metaDestination.setFileName( fi.fileName() );
 
-  KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination );
-  connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotUploadMetaJobResult( KIO::Job * ) ) );
+  TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination );
+  connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) );
 }
 
-void Engine::slotUploadMetaJobResult( KIO::Job *job )
+void Engine::slotUploadMetaJobResult( TDEIO::Job *job )
 {
   mUploadMetaFile = TQString::null;
   if ( job->error() ) {
diff --git a/knewstuff/engine.h b/knewstuff/engine.h
index f4b0b4920..374f9122d 100644
--- a/knewstuff/engine.h
+++ b/knewstuff/engine.h
@@ -27,7 +27,7 @@
 #include "entry.h"
 #include "provider.h"
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class KNewStuff;
 
@@ -143,14 +143,14 @@ class KDE_EXPORT Engine : public TQObject
     void getMetaInformation( Provider::List *providers );
     void selectUploadProvider( Provider::List *providers );
 
-    void slotNewStuffJobData( KIO::Job *job, const TQByteArray &data );
-    void slotNewStuffJobResult( KIO::Job *job );
+    void slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data );
+    void slotNewStuffJobResult( TDEIO::Job *job );
 
-    void slotDownloadJobResult( KIO::Job *job );
+    void slotDownloadJobResult( TDEIO::Job *job );
 
-    void slotUploadPayloadJobResult( KIO::Job *job );
-    void slotUploadPreviewJobResult (KIO::Job *job );
-    void slotUploadMetaJobResult( KIO::Job *job );
+    void slotUploadPayloadJobResult( TDEIO::Job *job );
+    void slotUploadPreviewJobResult (TDEIO::Job *job );
+    void slotUploadMetaJobResult( TDEIO::Job *job );
 
   protected:
     bool createMetaFile( Entry * );
@@ -160,8 +160,8 @@ class KDE_EXPORT Engine : public TQObject
 
     ProviderLoader *mProviderLoader;
 
-    TQMap<KIO::Job *,TQString> mNewStuffJobData;
-    TQMap<KIO::Job *,Provider *> mProviderJobs;
+    TQMap<TDEIO::Job *,TQString> mNewStuffJobData;
+    TQMap<TDEIO::Job *,Provider *> mProviderJobs;
 
     TQPtrList<Entry> mNewStuffList;
 
diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp
index 55d60579c..00f7df522 100644
--- a/knewstuff/entry.cpp
+++ b/knewstuff/entry.cpp
@@ -23,8 +23,8 @@
 #include <tqptrdict.h>
 #include <tqwindowdefs.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KNS;
 
@@ -72,7 +72,7 @@ TQString Entry::name( const TQString &lang ) const
 
   if ( !d(this)->mNameMap[ lang ].isEmpty() ) return d(this)->mNameMap[ lang ];
   else {
-    TQStringList langs = KGlobal::locale()->languageList();
+    TQStringList langs = TDEGlobal::locale()->languageList();
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !d(this)->mNameMap[ *it ].isEmpty() ) return d(this)->mNameMap[ *it ];
   }
@@ -175,7 +175,7 @@ TQString Entry::summary( const TQString &lang ) const
 
   if ( !mSummaryMap[ lang ].isEmpty() ) return mSummaryMap[ lang ];
   else {
-    TQStringList langs = KGlobal::locale()->languageList();
+    TQStringList langs = TDEGlobal::locale()->languageList();
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mSummaryMap[ *it ].isEmpty() ) return mSummaryMap[ *it ];
   }
@@ -228,7 +228,7 @@ KURL Entry::payload( const TQString &lang ) const
 {
   KURL payload = mPayloadMap[ lang ];
   if ( payload.isEmpty() ) {
-    TQStringList langs = KGlobal::locale()->languageList();
+    TQStringList langs = TDEGlobal::locale()->languageList();
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mPayloadMap[ *it ].isEmpty() ) return mPayloadMap[ *it ];
   }
@@ -251,7 +251,7 @@ KURL Entry::preview( const TQString &lang ) const
 {
   KURL preview = mPreviewMap[ lang ];
   if ( preview.isEmpty() ) {
-    TQStringList langs = KGlobal::locale()->languageList();
+    TQStringList langs = TDEGlobal::locale()->languageList();
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mPreviewMap[ *it ].isEmpty() ) return mPreviewMap[ *it ];
   }
diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp
index 90596da3d..0702f16bb 100644
--- a/knewstuff/ghns.cpp
+++ b/knewstuff/ghns.cpp
@@ -25,11 +25,11 @@
 #include <tqtextstream.h>
 #include <tqlabel.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kdialog.h>
 
@@ -78,10 +78,10 @@ void GhnsWidget::downloadWallpapers()
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("ghns","Get Hot New Stuff","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDEAboutData aboutData("ghns","Get Hot New Stuff","0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   GhnsWidget wid;
   app.setMainWidget( &wid );
diff --git a/knewstuff/ghns.h b/knewstuff/ghns.h
index 727dc6a0f..74efc007e 100644
--- a/knewstuff/ghns.h
+++ b/knewstuff/ghns.h
@@ -25,7 +25,7 @@
 
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "knewstuff.h"
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index 6a37aa61d..b652ba4a8 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -18,10 +18,10 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "engine.h"
@@ -30,12 +30,12 @@
 
 using namespace KNS;
 
-KAction* KNS::standardAction(const TQString& what,
+TDEAction* KNS::standardAction(const TQString& what,
                              const TQObject *recvr,
-                             const char *slot, KActionCollection* parent,
+                             const char *slot, TDEActionCollection* parent,
                              const char *name)
 {
-    return new KAction(i18n("Download New %1").arg(what), "knewstuff",
+    return new TDEAction(i18n("Download New %1").arg(what), "knewstuff",
                        0, recvr, slot, parent, name);
 }
 
@@ -71,8 +71,8 @@ void KNewStuff::download()
 
 TQString KNewStuff::downloadDestination( Entry * )
 {
-  return KGlobal::dirs()->saveLocation( "tmp" ) +
-         KApplication::randomString( 10 );
+  return TDEGlobal::dirs()->saveLocation( "tmp" ) +
+         TDEApplication::randomString( 10 );
 }
 
 void KNewStuff::upload()
diff --git a/knewstuff/knewstuff.h b/knewstuff/knewstuff.h
index 5d2319aec..ca07c7f0d 100644
--- a/knewstuff/knewstuff.h
+++ b/knewstuff/knewstuff.h
@@ -26,17 +26,17 @@
 
 class TQObject;
 class TQWidget;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 
 namespace KNS {
 class Engine;
 class Entry;
 
-KDE_EXPORT KAction* standardAction(const TQString& what,
+KDE_EXPORT TDEAction* standardAction(const TQString& what,
                         const TQObject *recvr,
                         const char *slot,
-                        KActionCollection* parent,
+                        TDEActionCollection* parent,
                         const char *name = 0);
 }
 
diff --git a/knewstuff/knewstuffbutton.cpp b/knewstuff/knewstuffbutton.cpp
index 3ad0d6ac6..3baa83397 100644
--- a/knewstuff/knewstuffbutton.cpp
+++ b/knewstuff/knewstuffbutton.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "downloaddialog.h"
 #include "knewstuffbutton.h"
diff --git a/knewstuff/knewstuffbutton.h b/knewstuff/knewstuffbutton.h
index 6935ba653..bebd08297 100644
--- a/knewstuff/knewstuffbutton.h
+++ b/knewstuff/knewstuffbutton.h
@@ -46,7 +46,7 @@ class Button : public KPushButton
          * @param what text describing what is being downloaded. will be
          *        shown on the button as "Download New <what>"
          * @param providerList the URL to the list of providers; if empty
-         *        we first try the ProvidersUrl from KGlobal::config, then we
+         *        we first try the ProvidersUrl from TDEGlobal::config, then we
          *        fall back to a hardcoded value
          * @param resourceType the Hotstuff data type for this downlaod such
          *        as "korganizer/calendar"
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp
index 8438e25ea..ef6a37456 100644
--- a/knewstuff/knewstuffgeneric.cpp
+++ b/knewstuff/knewstuffgeneric.cpp
@@ -24,11 +24,11 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 
 #include "entry.h"
@@ -40,7 +40,7 @@ using namespace std;
 KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *parent )
   : KNewStuff( type, parent )
 {
-  mConfig = KGlobal::config();
+  mConfig = TDEGlobal::config();
 }
 
 KNewStuffGeneric::~KNewStuffGeneric()
@@ -72,9 +72,9 @@ bool KNewStuffGeneric::install( const TQString &fileName )
     for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) {
         list2 << (*it).replace("%f", fileName);
     }
-    KProcess proc;
+    TDEProcess proc;
     proc << list2;
-    proc.start( KProcess::Block );
+    proc.start( TDEProcess::Block );
   }
 
   return true;
@@ -134,7 +134,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry )
 {
   TQString file = destinationPath(entry);
 
-  if ( KStandardDirs::exists( file ) ) {
+  if ( TDEStandardDirs::exists( file ) ) {
     int result = KMessageBox::warningContinueCancel( parentWidget(),
         i18n("The file '%1' already exists. Do you want to overwrite it?")
         .arg( file ),
diff --git a/knewstuff/knewstuffgeneric.h b/knewstuff/knewstuffgeneric.h
index 6347bf539..053f83a05 100644
--- a/knewstuff/knewstuffgeneric.h
+++ b/knewstuff/knewstuffgeneric.h
@@ -23,7 +23,7 @@
 
 #include "knewstuff.h"
 
-class KConfig;
+class TDEConfig;
 
 /**
  * @short Basic KNewStuff class with predefined actions.
@@ -80,7 +80,7 @@ class KDE_EXPORT KNewStuffGeneric : public KNewStuff
   private:
     TQString destinationPath( KNS::Entry *entry );
 
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 #endif
diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp
index f68be7ae3..67374800e 100644
--- a/knewstuff/knewstuffsecure.cpp
+++ b/knewstuff/knewstuffsecure.cpp
@@ -16,12 +16,12 @@
 #include <tqfileinfo.h>
 
 //kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeio/netaccess.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>
@@ -144,7 +144,7 @@ void KNewStuffSecure::slotValidated(int result)
      emit installFinished();
   } else
   {
-    KConfig *cfg = KGlobal::config();
+    TDEConfig *cfg = TDEGlobal::config();
     cfg->deleteGroup("KNewStuffStatus");
     cfg->setGroup("KNewStuffStatus");
     for (TQMap<TQString, TQString>::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it)
@@ -159,7 +159,7 @@ void KNewStuffSecure::slotValidated(int result)
 
 void KNewStuffSecure::downloadResource()
 {
-  KConfig *cfg = KGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   m_installedResources = cfg->entryMap("KNewStuffStatus");
   engine()->ignoreInstallResult(true);
   KNewStuff::download();
@@ -179,7 +179,7 @@ void KNewStuffSecure::uploadResource(const TQString& fileName)
   m_tempDir->setAutoDelete(true);
   TQFileInfo f(fileName);
   m_signedFileName = m_tempDir->name() + "/" + f.fileName();
-  KIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true);
+  TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true);
   Security::ref()->signFile(m_signedFileName);
 }
 
@@ -215,7 +215,7 @@ void KNewStuffSecure::slotFileSigned(int result)
       file.close();
     }
     tar.close();
-    KIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true);
+    TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true);
     KNewStuff::upload(m_signedFileName, TQString::null);
     disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
   }
@@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory()
 {
   if (m_tempDir)
   {
-    KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget());
+    TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget());
     delete m_tempDir;
     m_tempDir = 0L;
   }
diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp
index 3c4018a13..20f1668f7 100644
--- a/knewstuff/provider.cpp
+++ b/knewstuff/provider.cpp
@@ -18,12 +18,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeio/job.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqptrdict.h>
 #include <tqwindowdefs.h>
@@ -219,7 +219,7 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
   mProviders.clear();
   mJobData = "";
 
-  KConfig *cfg = KGlobal::config();
+  TDEConfig *cfg = TDEGlobal::config();
   cfg->setGroup("KNewStuff");
 
   TQString providersUrl = providersList;
@@ -236,16 +236,16 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
 
   kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl;
   
-  KIO::TransferJob *job = KIO::get( KURL( providersUrl ), false, false );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotJobResult( KIO::Job * ) ) );
-  connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-           TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
+  TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ), false, false );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+           TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
 //  job->dumpObjectInfo();
 }
 
-void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data )
+void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data )
 {
   kdDebug() << "ProviderLoader::slotJobData()" << endl;
 
@@ -256,7 +256,7 @@ void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data )
   mJobData.append( TQString::fromUtf8( str ) );
 }
 
-void ProviderLoader::slotJobResult( KIO::Job *job )
+void ProviderLoader::slotJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     job->showErrorDialog( TQT_TQWIDGET(parent()) );
diff --git a/knewstuff/provider.h b/knewstuff/provider.h
index 37e2a8daf..2a0d54a12 100644
--- a/knewstuff/provider.h
+++ b/knewstuff/provider.h
@@ -28,7 +28,7 @@
 
 #include <kurl.h>
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 namespace KNS {
 
@@ -186,7 +186,7 @@ class KDE_EXPORT ProviderLoader : public TQObject
      *
      * @param type data type such as 'kdesktop/wallpaper'.
      * @param providerList the URl to the list of providers; if empty
-     *    we first try the ProvidersUrl from KGlobal::config, then we
+     *    we first try the ProvidersUrl from TDEGlobal::config, then we
      *    fall back to a hardcoded value.
      */
     void load( const TQString &type, const TQString &providerList = TQString::null );
@@ -198,8 +198,8 @@ class KDE_EXPORT ProviderLoader : public TQObject
     void providersLoaded( Provider::List * );
 
   protected slots:
-    void slotJobData( KIO::Job *, const TQByteArray & );
-    void slotJobResult( KIO::Job * );
+    void slotJobData( TDEIO::Job *, const TQByteArray & );
+    void slotJobResult( TDEIO::Job * );
 
   private:
     TQWidget *mParentWidget;
diff --git a/knewstuff/providerdialog.cpp b/knewstuff/providerdialog.cpp
index a66258701..f71558ecd 100644
--- a/knewstuff/providerdialog.cpp
+++ b/knewstuff/providerdialog.cpp
@@ -22,9 +22,9 @@
 #include <tqstring.h>
 #include <tqlabel.h>
 
-#include <klistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "engine.h"
 #include "provider.h"
@@ -34,11 +34,11 @@
 
 using namespace KNS;
 
-class ProviderItem : public KListViewItem
+class ProviderItem : public TDEListViewItem
 {
   public:
-    ProviderItem( KListView *parent, Provider *provider ) :
-      KListViewItem( parent ), mProvider( provider )
+    ProviderItem( TDEListView *parent, Provider *provider ) :
+      TDEListViewItem( parent ), mProvider( provider )
     {
       setText( 0, provider->name() );
     }
@@ -61,7 +61,7 @@ ProviderDialog::ProviderDialog( Engine *engine, TQWidget *parent ) :
   TQLabel *description = new TQLabel( i18n("Please select one of the providers listed below:"), topPage );
   topLayout->addWidget( description );
 
-  mListView = new KListView( topPage );
+  mListView = new TDEListView( topPage );
   mListView->addColumn( i18n("Name") );
   topLayout->addWidget( mListView );
 }
diff --git a/knewstuff/providerdialog.h b/knewstuff/providerdialog.h
index 3e02e30aa..549a65416 100644
--- a/knewstuff/providerdialog.h
+++ b/knewstuff/providerdialog.h
@@ -22,7 +22,7 @@
 
 #include <kdialogbase.h>
 
-class KListView;
+class TDEListView;
 
 namespace KNS {
 
@@ -68,7 +68,7 @@ class ProviderDialog : public KDialogBase
   private:
     Engine *mEngine;
 
-    KListView *mListView;
+    TDEListView *mListView;
 };
 
 }
diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp
index 247c6d5bc..d161c2969 100644
--- a/knewstuff/security.cpp
+++ b/knewstuff/security.cpp
@@ -22,9 +22,9 @@
  //kde includes
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocio.h>
 
@@ -57,9 +57,9 @@ void Security::readKeys()
   m_keys.clear();
   KProcIO *readProcess=new KProcIO();
   *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
-  connect(readProcess, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *)));
+  connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
   connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
-  if (!readProcess->start(KProcess::NotifyOnExit, true))
+  if (!readProcess->start(TDEProcess::NotifyOnExit, true))
     KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>"));
   else
     m_gpgRunning = true;
@@ -75,13 +75,13 @@ void Security::readSecretKeys()
   m_runMode = ListSecret;
   KProcIO *readProcess=new KProcIO();
   *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys";
-  connect(readProcess, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotProcessExited(KProcess *)));
+  connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
   connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
-  if (readProcess->start(KProcess::NotifyOnExit, true))
+  if (readProcess->start(TDEProcess::NotifyOnExit, true))
     m_gpgRunning = true;  
 }
 
-void Security::slotProcessExited(KProcess *process)
+void Security::slotProcessExited(TDEProcess *process)
 {
   switch (m_runMode)
    {
@@ -248,9 +248,9 @@ void Security::slotCheckValidity()
   //verify the signature
   KProcIO *verifyProcess=new KProcIO();
   *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName;
-  connect(verifyProcess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotProcessExited(KProcess *)));
+  connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
   connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
-  if (verifyProcess->start(KProcess::NotifyOnExit,true))
+  if (verifyProcess->start(TDEProcess::NotifyOnExit,true))
       m_gpgRunning = true;
   else
   {
@@ -328,10 +328,10 @@ void Security::slotSignFile()
   //verify the signature
   KProcIO *signProcess=new KProcIO();
   *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName;
-  connect(signProcess, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotProcessExited(KProcess *)));
+  connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
   connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
   m_runMode = Sign;
-  if (signProcess->start(KProcess::NotifyOnExit,true))
+  if (signProcess->start(TDEProcess::NotifyOnExit,true))
     m_gpgRunning = true;
   else
   {
diff --git a/knewstuff/security.h b/knewstuff/security.h
index 2831770e0..230821e7e 100644
--- a/knewstuff/security.h
+++ b/knewstuff/security.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 
 class KProcIO;
-class KProcess;
+class TDEProcess;
 
 struct KeyStruct {
    TQString id;
@@ -120,7 +120,7 @@ private:
    TQString m_secretKey; /// the key used for signing
 
 private slots:
-   void slotProcessExited(KProcess *process);
+   void slotProcessExited(TDEProcess *process);
    void slotDataArrived(KProcIO *process);
 
 signals:
diff --git a/knewstuff/khotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp
index e479bd3b3..fb9e92a9b 100644
--- a/knewstuff/khotnewstuff.cpp
+++ b/knewstuff/tdehotnewstuff.cpp
@@ -18,31 +18,31 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "downloaddialog.h"
 
-static const KCmdLineOptions op[] =
+static const TDECmdLineOptions op[] =
 {
 	{"type <type>", I18N_NOOP("Display only media of this type"), 0},
 	{"+[providerlist]", I18N_NOOP("Provider list to use"), 0},
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
 {
-	KAboutData about("khotnewstuff", "KHotNewStuff", "0.2");
-	KCmdLineArgs *args;
+	TDEAboutData about("tdehotnewstuff", "KHotNewStuff", "0.2");
+	TDECmdLineArgs *args;
 
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(op);
-	args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::addCmdLineOptions(op);
+	args = TDECmdLineArgs::parsedArgs();
 
-	KApplication i;
+	TDEApplication i;
 
 	KNS::DownloadDialog d;
 	if(args->isSet("type")) d.setType(args->getOption("type"));
diff --git a/knewstuff/khotnewstuffrc b/knewstuff/tdehotnewstuffrc
index 737ad61c2..737ad61c2 100644
--- a/knewstuff/khotnewstuffrc
+++ b/knewstuff/tdehotnewstuffrc
diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp
index b0c380c68..3494c5230 100644
--- a/knewstuff/testnewstuff.cpp
+++ b/knewstuff/testnewstuff.cpp
@@ -24,11 +24,11 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kdialog.h>
 
@@ -54,9 +54,9 @@ bool TestNewStuff::install( const TQString &fileName )
 
 bool TestNewStuff::createUploadFile( const TQString &fileName )
 {
-  KProcess p;
+  TDEProcess p;
   p << "touch" << fileName;
-  p.start(KProcess::Block);
+  p.start(TDEProcess::Block);
   kdDebug() << "TestNewStuff::createUploadFile(): " << fileName << endl;
   return true;
 }
@@ -107,10 +107,10 @@ void MyWidget::upload()
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDEAboutData aboutData("knewstufftest","KNewStuff Test","0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   MyWidget wid;
   app.setMainWidget( &wid );
diff --git a/knewstuff/testnewstuff.h b/knewstuff/testnewstuff.h
index 3af0d68cc..a7bc5710f 100644
--- a/knewstuff/testnewstuff.h
+++ b/knewstuff/testnewstuff.h
@@ -25,7 +25,7 @@
 
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "knewstuff.h"
diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp
index cecc67e32..f4b3dd50e 100644
--- a/knewstuff/uploaddialog.cpp
+++ b/knewstuff/uploaddialog.cpp
@@ -26,13 +26,13 @@
 #include <tqstring.h>
 #include <ktextedit.h>
 
-#include <klistview.h>
-#include <klocale.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
-#include <kconfig.h>
-#include <kapplication.h>
+#include <tdemessagebox.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
 #include <kuser.h>
 
 #include "engine.h"
@@ -94,7 +94,7 @@ UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) :
   topLayout->addWidget( languageLabel, 6, 0 );
   mLanguageCombo = new TQComboBox( topPage );
   topLayout->addWidget( mLanguageCombo, 6, 1 );
-  mLanguageCombo->insertStringList( KGlobal::locale()->languageList() );
+  mLanguageCombo->insertStringList( TDEGlobal::locale()->languageList() );
 
   TQLabel *previewLabel = new TQLabel( i18n("Preview URL:"), topPage );
   topLayout->addWidget( previewLabel, 7, 0 );
@@ -136,7 +136,7 @@ void UploadDialog::slotOk()
   entry->setSummary( mSummaryEdit->text(), mLanguageCombo->currentText() );
 
   if ( mPayloadUrl.isValid() ) {
-    KConfig *conf = kapp->config();
+    TDEConfig *conf = kapp->config();
     conf->setGroup( TQString("KNewStuffUpload:%1").arg(mPayloadUrl.fileName()) );
     conf->writeEntry("name", mNameEdit->text());
     conf->writeEntry("author", mAuthorEdit->text());
@@ -164,7 +164,7 @@ void UploadDialog::setPayloadFile( const TQString &payloadFile )
 {
   mPayloadUrl = payloadFile;
 
-  KConfig *conf = kapp->config();
+  TDEConfig *conf = kapp->config();
   conf->setGroup( TQString("KNewStuffUpload:%1").arg(mPayloadUrl.fileName()) );
   TQString name = conf->readEntry("name");
   TQString author = conf->readEntry("author");
diff --git a/kparts/Makefile.am b/kparts/Makefile.am
deleted file mode 100644
index e4991bbbd..000000000
--- a/kparts/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-####### General stuff
-
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
-
-INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/kio/ -I$(top_srcdir)/libltdl \
-	-I$(top_srcdir)/kfile $(all_includes)
-libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
-libkparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
-
-check-local:
-	(cd tests && $(MAKE) check )
-
-####### Files
-
-lib_LTLIBRARIES = libkparts.la
-
-libkparts_la_SOURCES = part.cpp plugin.cpp partmanager.cpp mainwindow.cpp dockmainwindow.cpp \
-		       event.cpp browserextension.cpp factory.cpp  historyprovider.cpp \
-		       browserinterface.cpp browserrun.cpp statusbarextension.cpp
-
-kpartsincludedir = $(includedir)/kparts
-kpartsinclude_HEADERS = part.h plugin.h partmanager.h mainwindow.h dockmainwindow.h event.h \
-	browserextension.h factory.h historyprovider.h browserinterface.h genericfactory.h \
-	componentfactory.h browserrun.h statusbarextension.h
-
-libkparts_la_METASOURCES = AUTO
-
-servicetype_DATA = kpart.desktop krop.desktop krwp.desktop browserview.desktop 
-servicetypedir = $(kde_servicetypesdir)
-
-DOXYGEN_REFERENCES = tdecore tdeui tdefx kio
-include ../admin/Doxyfile.am
diff --git a/krandr/Makefile.am b/krandr/Makefile.am
deleted file mode 100644
index e95e80f21..000000000
--- a/krandr/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-INCLUDES =  -I$(srcdir)/.. $(all_includes)
-
-# For the future: examine if condensing the tons of *_LDFLAGS variables
-# into $(all_libraries) isn't better
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
-
-libkrandrincludedir = $(includedir)/libkrandr
-libkrandrinclude_HEADERS = randr.h lowlevel_randr.h ktimerdialog.h libkrandr.h
-
-lib_LTLIBRARIES = libkrandr.la
-libkrandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libkrandr.cc
-METASOURCES = AUTO
-
-libkrandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
-libkrandr_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR)
-
-DOXYGEN_REFERENCES = tdecore
-include ../admin/Doxyfile.am
diff --git a/kresources/Makefile.am b/kresources/Makefile.am
deleted file mode 100644
index 315968e78..000000000
--- a/kresources/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-INCLUDES = $(all_includes)
-
-METASOURCES = AUTO
-
-lib_LTLIBRARIES = libkresources.la
-
-libkresources_la_SOURCES = resource.cpp \
-  factory.cpp \
-  manageriface.skel \
-  manageriface.stub \
-  managerimpl.cpp \
-  configwidget.cpp \
-  configdialog.cpp \
-  selectdialog.cpp \
-  configpage.cpp
-
-libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libkresources_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
-
-kresincludedir = $(includedir)/kresources
-kresinclude_HEADERS = resource.h \
-  configwidget.h \
-  factory.h \
-  manageriface.h \
-  managerimpl.h \
-  manager.h \
-  selectdialog.h \
-  configdialog.h \
-  configpage.h
-
-kde_module_LTLIBRARIES = kcm_kresources.la
-
-kcm_kresources_la_SOURCES = kcmkresources.cpp
-kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
-
-
-check_PROGRAMS = testresources
-
-testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-testresources_LDADD   = libkresources.la
-testresources_SOURCES = testresources.cpp
-
-xdg_apps_DATA = kresources.desktop
-
-servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = kresources_plugin.desktop kresources_manager.desktop
-
-include ../admin/Doxyfile.am
diff --git a/kspell2/Makefile.am b/kspell2/Makefile.am
deleted file mode 100644
index a3ef1b807..000000000
--- a/kspell2/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-SUBDIRS = . ui tests plugins
-METASOURCES = AUTO
-
-noinst_LTLIBRARIES = libkspell2base.la
-
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/kutils $(all_includes)
-
-kspell2baseincludedir = $(includedir)/kspell2
-
-kspell2baseinclude_HEADERS = settings.h filter.h \
-	dictionary.h broker.h \
-	backgroundchecker.h defaultdictionary.h 
-
-libkspell2base_la_SOURCES = settings.cpp broker.cpp \
-	client.cpp filter.cpp backgroundchecker.cpp \
-	backgroundthread.cpp backgroundengine.cpp \
-	defaultdictionary.cpp 
-
-libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
-
-servicetype_DATA = kspellclient.desktop
-servicetypedir = $(kde_servicetypesdir)
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kspell2/plugins/aspell/Makefile.am b/kspell2/plugins/aspell/Makefile.am
deleted file mode 100644
index b3eb64f33..000000000
--- a/kspell2/plugins/aspell/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-METASOURCES = AUTO
-
-AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
-
-# For the future: examine if condensing the tons of *_LDFLAGS variables
-# into $(all_libraries) isn't better
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
-
-kde_module_LTLIBRARIES = kspell_aspell.la
-
-kspell_aspell_la_SOURCES = kspell_aspellclient.cpp kspell_aspelldict.cpp
-
-kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell $(LIB_QT) $(LIB_TDECORE)
-
-service_DATA = kspell_aspell.desktop
-servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/hspell/Makefile.am b/kspell2/plugins/hspell/Makefile.am
deleted file mode 100644
index ebc78472a..000000000
--- a/kspell2/plugins/hspell/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-METASOURCES = AUTO
-
-AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
-
-# For the future: examine if condensing the tons of *_LDFLAGS variables
-# into $(all_libraries) isn't better
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
-
-kde_module_LTLIBRARIES = kspell_hspell.la
-
-kspell_hspell_la_SOURCES = kspell_hspellclient.cpp kspell_hspelldict.cpp
-
-kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz $(LIB_QT) $(LIB_TDECORE)
-
-service_DATA = kspell_hspell.desktop
-servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/ispell/Makefile.am b/kspell2/plugins/ispell/Makefile.am
deleted file mode 100644
index 2605fe249..000000000
--- a/kspell2/plugins/ispell/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-METASOURCES = AUTO
-
-AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
-
-# For the future: examine if condensing the tons of *_LDFLAGS variables
-# into $(all_libraries) isn't better
-AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
-
-kde_module_LTLIBRARIES = kspell_ispell.la
-
-kspell_ispell_la_SOURCES = kspell_ispellclient.cpp kspell_ispelldict.cpp \
-	correct.cpp		\
-	good.cpp		\
-	hash.cpp		\
-	lookup.cpp		\
-	makedent.cpp		\
-	tgood.cpp		\
-	ispell_checker.cpp
-
-kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_ispell_la_LIBADD = ../../ui/libkspell2.la  $(LIB_QT) $(LIB_TDECORE)
-
-service_DATA = kspell_ispell.desktop
-servicedir = $(kde_servicesdir)
diff --git a/kspell2/tests/Makefile.am b/kspell2/tests/Makefile.am
deleted file mode 100644
index b47c45927..000000000
--- a/kspell2/tests/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/kspell2 -I$(top_srcdir)/kspell2/ui $(all_includes)
-METASOURCES = AUTO
-
-
-check_PROGRAMS = test test_filter backgroundtest \
-	test_dialog test_highlighter test_configdialog
-
-test_SOURCES = test.cpp
-test_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
-
-test_filter_SOURCES = test_filter.cpp
-test_filter_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
-
-backgroundtest_SOURCES = backgroundtest.cpp
-backgroundtest_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
-
-test_dialog_SOURCES = test_dialog.cpp
-test_dialog_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
-
-test_highlighter_SOURCES = test_highlighter.cpp
-test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
-
-test_configdialog_SOURCES = test_configdialog.cpp
-test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
diff --git a/kspell2/ui/Makefile.am b/kspell2/ui/Makefile.am
deleted file mode 100644
index bc1fe608b..000000000
--- a/kspell2/ui/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-METASOURCES = AUTO
-
-lib_LTLIBRARIES = libkspell2.la
-# Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
-noinst_LTLIBRARIES = libkspell2_noinst.la
-
-KDE_CXXFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT
-INCLUDES = -I$(top_srcdir)/kspell2 $(all_includes)
-
-kspell2includedir = $(includedir)/kspell2
-kspell2include_HEADERS = dialog.h highlighter.h configdialog.h \
-	configwidget.h
-
-libkspell2_noinst_la_SOURCES = kspell2ui.ui configwidget.cpp \
-	highlighter.cpp configui.ui configdialog.cpp
-
-dialog.lo: kspell2ui.h
-
-libkspell2_la_SOURCES = dialog.cpp
-libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la ../../kutils/libkutils.la  $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE)
diff --git a/kstyles/asteroid/Makefile.am b/kstyles/asteroid/Makefile.am
index 2b8735e08..3d2bcab8c 100644
--- a/kstyles/asteroid/Makefile.am
+++ b/kstyles/asteroid/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS = asteroid.h
 kde_style_LTLIBRARIES = asteroid.la
 
 asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-asteroid_la_LIBADD = -ltdefx -lkutils
+asteroid_la_LIBADD = -ltdefx -ltdeutils
 asteroid_la_SOURCES = asteroid.cpp
 
 themercdir = $(kde_datadir)/kstyle/themes
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 11a06f29a..7119af5a8 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -91,10 +91,10 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin);
 
 /* Ok, now we get to the good stuff. */
 
-AsteroidStyle::AsteroidStyle() : KStyle(AllowMenuTransparency)
+AsteroidStyle::AsteroidStyle() : TDEStyle(AllowMenuTransparency)
 {
-	if (tqApp->inherits("KApplication")) {
-		connect(tqApp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+	if (tqApp->inherits("TDEApplication")) {
+		connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
 	}
 
 	backwards = TQApplication::reverseLayout();
@@ -139,13 +139,13 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
 		installObjectEventHandler(ceData, elementFlags, ptr, this);
 	}
 	else {
-		KStyle::polish(ceData, elementFlags, ptr);
+		TDEStyle::polish(ceData, elementFlags, ptr);
 	}
 }
 
 void AsteroidStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	KStyle::unPolish(ceData, elementFlags, ptr);
+	TDEStyle::unPolish(ceData, elementFlags, ptr);
 }
 
 /*!
@@ -179,7 +179,7 @@ void AsteroidStyle::renderMenuBlendPixmap(KPixmap &pix,
 	p.fillRect(0, 0, pix.width(), pix.height(), cg.background());
 }
 
-void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp,
+void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp,
                                         TQPainter *p,
                                         const TQStyleControlElementData &ceData,
                                         ControlElementFlags elementFlags,
@@ -289,7 +289,7 @@ void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp,
         	}
 
 		default: {
-			KStyle::drawKStylePrimitive(ksp, p, ceData, elementFlags, r, cg, sf, o, w);
+			TDEStyle::drawTDEStylePrimitive(ksp, p, ceData, elementFlags, r, cg, sf, o, w);
 		}
 	}
 }
@@ -320,7 +320,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
 		}
 		
 		default:
-			return KStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget);
+			return TDEStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget);
 	}
 }
 
@@ -975,7 +975,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
 		}
 
 		default: {
-			KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, sf, o);
+			TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, sf, o);
 		}
 	}
 }
@@ -1716,7 +1716,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 		}
 
 		default: {
-			KStyle::drawControl(ce, p, ceData, elementFlags, r, cg, sf, o, w);
+			TDEStyle::drawControl(ce, p, ceData, elementFlags, r, cg, sf, o, w);
 		}
 	}
 }
@@ -1763,7 +1763,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
 		CE_HeaderLabel
 	 */
 			default: {
-			KStyle::drawControlMask(ce, p, ceData, elementFlags, r, o, w);
+			TDEStyle::drawControlMask(ce, p, ceData, elementFlags, r, o, w);
 		}
 	}
 }
@@ -2091,7 +2091,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 
 			// Draw slider groove
 			if ((sc & SC_SliderGroove) && groove.isValid()) {
-				drawKStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, sf, o, w );
+				drawTDEStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, sf, o, w );
 
 				// Draw the focus rect around the groove
 				if (elementFlags & CEF_HasFocus)
@@ -2109,7 +2109,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 			if ((sc & SC_SliderHandle) && handle.isValid()) {
 				if (sa == SC_SliderHandle)
 					sf |= Style_Active;
-				drawKStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, sf, o, w );
+				drawTDEStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, sf, o, w );
 			}
 
 			p2.end();
@@ -2179,7 +2179,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 
 
 		default: {
-			KStyle::drawComplexControl(cc, p, ceData, elementFlags, r, cg, sf, sc, sa, o, w);
+			TDEStyle::drawComplexControl(cc, p, ceData, elementFlags, r, cg, sf, sc, sa, o, w);
 		}
 	}
 }
@@ -2204,7 +2204,7 @@ void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc,
 		CC_ListView
 	 */
 			default: {
-			KStyle::drawComplexControlMask(cc, p, ceData, elementFlags, r, o, w);
+			TDEStyle::drawComplexControlMask(cc, p, ceData, elementFlags, r, o, w);
 		}
 	}
 }
@@ -2303,7 +2303,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData &
 			if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) {
 				return 3;
 			} else {
-				return KStyle::pixelMetric(pm, ceData, elementFlags, w);
+				return TDEStyle::pixelMetric(pm, ceData, elementFlags, w);
 			}
 		}
 
@@ -2335,7 +2335,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData &
 			return 0;
 
 		default: {
-			return KStyle::pixelMetric(pm, ceData, elementFlags, w);
+			return TDEStyle::pixelMetric(pm, ceData, elementFlags, w);
 		}
 	}
 }
@@ -2379,7 +2379,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat
 		SR_DialogButtonCustom
 	 */
 		default: {
-			return KStyle::subRect(sr, ceData, elementFlags, w);
+			return TDEStyle::subRect(sr, ceData, elementFlags, w);
 		}
 	}
 }
@@ -2441,7 +2441,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
 					return TQRect(r.x()+2, r.y()+2, r.width()-20, r.height()-4);
 				}
 				default: {
-					return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
+					return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
 				}
 			}
 
@@ -2474,7 +2474,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
 				case SC_SpinWidgetFrame:
 					return ceData.rect;
 				default:
-					return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
+					return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
 					break;
 			}
 
@@ -2482,7 +2482,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
 		}
 
 		default: {
-			return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
+			return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w);
 		}
 	}
 }
@@ -2516,7 +2516,7 @@ TQSize AsteroidStyle::sizeFromContents(ContentsType ct,
 
 		case CT_PushButton: {
 			const TQPushButton *pb = dynamic_cast<const TQPushButton *>(w);
-			const TQSize ret = KStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w);
+			const TQSize ret = TDEStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w);
 			int rw = ret.width(), rh = ret.height();
 			int mw;
 			int mh;
@@ -2615,7 +2615,7 @@ TQSize AsteroidStyle::sizeFromContents(ContentsType ct,
 		}
 
 		default: {
-			return KStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w);
+			return TDEStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w);
 		}
 	}
 }
diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h
index 7bd652a12..d6be130aa 100644
--- a/kstyles/asteroid/asteroid.h
+++ b/kstyles/asteroid/asteroid.h
@@ -7,9 +7,9 @@
 #ifndef __ASTEROID_H
 #define __ASTEROID_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
-class AsteroidStyle : public KStyle
+class AsteroidStyle : public TDEStyle
 {
 	Q_OBJECT
 	
@@ -34,7 +34,7 @@ public:
 	                           const TQColorGroup &,
 	                           const TQPopupMenu *) const;
 	
-	void drawKStylePrimitive(KStylePrimitive,
+	void drawTDEStylePrimitive(TDEStylePrimitive,
 	                         TQPainter *,
 	                         const TQStyleControlElementData &ceData,
 	                         ControlElementFlags elementFlags,
@@ -98,7 +98,7 @@ public:
 
 	int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0) const;
 
-	int kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const;
+	int kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const;
 
 	TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp
index 0dc02e7ec..4fccff059 100644
--- a/kstyles/highcolor/highcolor.cpp
+++ b/kstyles/highcolor/highcolor.cpp
@@ -174,7 +174,7 @@ KPixmap* GradientSet::gradient(GradientType type)
 // ---------------------------------------------------------------------------
 
 HighColorStyle::HighColorStyle( StyleType styleType ) 
-	: KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar )
+	: TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar )
 {
 	type = styleType;
 	highcolor = (type == HighColor && TQPixmap::defaultDepth() > 8);
@@ -209,7 +209,7 @@ void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElem
 		}
 	}
 
-	KStyle::polish( ceData, elementFlags, ptr );
+	TDEStyle::polish( ceData, elementFlags, ptr );
 }
 
 
@@ -230,7 +230,7 @@ void HighColorStyle::unPolish(const TQStyleControlElementData &ceData, ControlEl
 		}
 	}
 
-	KStyle::unPolish( ceData, elementFlags, ptr );
+	TDEStyle::unPolish( ceData, elementFlags, ptr );
 }
 
 
@@ -796,7 +796,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe,
 				p->drawLine(x+1, y+1, x+1, y2-1);
 				p->setPen(oldPen);
 			} else
-				KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+				TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
 
 			break;
 		}
@@ -959,13 +959,13 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe,
 				p->restore();
 			
 			} else
-				KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
+				TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
 		}
 	}
 }
 
 
-void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 										  TQPainter* p,
 										  const TQStyleControlElementData &ceData,
 										  ControlElementFlags elementFlags,
@@ -1139,7 +1139,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe,
 		}
 
 		default:
-			KStyle::drawKStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1515,7 +1515,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
 		}
 
 		default:
-			KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1543,7 +1543,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element,
 		}
 
 		default:
-			KStyle::drawControlMask(element, p, ceData, elementFlags, r, opt, widget);
+			TDEStyle::drawControlMask(element, p, ceData, elementFlags, r, opt, widget);
 	}
 }
 
@@ -1728,7 +1728,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
 
 
 		default:
-			KStyle::drawComplexControl(control, p, ceData, elementFlags,
+			TDEStyle::drawComplexControl(control, p, ceData, elementFlags,
 						r, cg, flags, controls, active, opt, widget);
 			break;
 	}
@@ -1759,7 +1759,7 @@ void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control,
 		}
 
 		default:
-			KStyle::drawComplexControlMask(control, p, ceData, elementFlags, r, opt, widget);
+			TDEStyle::drawComplexControlMask(control, p, ceData, elementFlags, r, opt, widget);
 	}
 }
 
@@ -1786,7 +1786,7 @@ void HighColorStyle::drawItem( TQPainter *p,
 	} else
 		col = penColor;
 
-	KStyle::drawItem( p, r, flags, cg, enabled, pixmap,
+	TDEStyle::drawItem( p, r, flags, cg, enabled, pixmap,
 			text, len, col );
 }
 
@@ -1813,7 +1813,7 @@ TQRect HighColorStyle::subRect(SubRect r, const TQStyleControlElementData &ceDat
 					 wrect.width()  - dfw2 - dbw2 - 1,
 					 wrect.height() - dfw2 - dbw2 - 1);
 	} else
-		return KStyle::subRect(r, ceData, elementFlags, widget);
+		return TDEStyle::subRect(r, ceData, elementFlags, widget);
 }
 
 
@@ -1856,7 +1856,7 @@ int HighColorStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &
 			return 0;
 
 		default:
-			return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+			return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
 	}
 }
 
@@ -1878,7 +1878,7 @@ int HighColorStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceD
 			}
 			break;
 		default:
-			ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
+			ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
 			break;
 	}
 
@@ -1984,7 +1984,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents,
 
 
 		default:
-			return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+			return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
 	}
 }
 
@@ -2005,13 +2005,13 @@ TQPixmap HighColorStyle::stylePixmap(StylePixmap stylepixmap,
 			break;
 	}
 
-	return KStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
+	return TDEStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
 }
 
 
 bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
-	if (KStyle::objectEventHandler( ceData, elementFlags, source, event ))
+	if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
 		return true;
 
 	TQToolBar* toolbar;
diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h
index 5f58b3f9c..7fa618a92 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/kstyles/highcolor/highcolor.h
@@ -34,7 +34,7 @@
 #include <tqintdict.h>
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 enum GradientType{ VSmall=0, VMed, VLarge, HMed, HLarge, GradientCount };
@@ -55,7 +55,7 @@ class GradientSet
 
 class TQPopupMenu;
 
-class HighColorStyle : public KStyle
+class HighColorStyle : public TDEStyle
 {
 	Q_OBJECT
 
@@ -71,7 +71,7 @@ class HighColorStyle : public KStyle
 		void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg,
 								 	const TQPopupMenu* popup ) const;
 
-		void drawKStylePrimitive( KStylePrimitive kpe,
+		void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp
index 233fb7365..f271113ca 100644
--- a/kstyles/highcontrast/config/highcontrastconfig.cpp
+++ b/kstyles/highcontrast/config/highcontrastconfig.cpp
@@ -28,8 +28,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqlayout.h>
 #include <tqsettings.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "highcontrastconfig.h"
 
@@ -44,7 +44,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
 {
     // Should have no margins here, the dialog provides them
     TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
-    KGlobal::locale()->insertCatalogue("kstyle_highcontrast_config");
+    TDEGlobal::locale()->insertCatalogue("kstyle_highcontrast_config");
 
     wideLinesBox = new TQCheckBox(i18n("Use wider lines"), this);
 
@@ -62,7 +62,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
 
 HighContrastStyleConfig::~HighContrastStyleConfig()
 {
-    KGlobal::locale()->removeCatalogue("kstyle_keramik_config");
+    TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
 }
 
 
diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp
index d212f7445..af021a91a 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/kstyles/highcontrast/highcontrast.cpp
@@ -113,7 +113,7 @@ void addOffset (TQRect* r, int offset, int lineWidth = 0)
 // ---------------------------------------------------------------------------
 
 HighContrastStyle::HighContrastStyle()
-	: KStyle( 0, ThreeButtonScrollBar )
+	: TDEStyle( 0, ThreeButtonScrollBar )
 {
 	TQSettings settings;
 	settings.beginGroup("/highcontraststyle/Settings/");
@@ -175,7 +175,7 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control
 		}
 	}
 
-	KStyle::polish (ceData, elementFlags, ptr);
+	TDEStyle::polish (ceData, elementFlags, ptr);
 }
 
 
@@ -188,7 +188,7 @@ void HighContrastStyle::unPolish (const TQStyleControlElementData &ceData, Contr
 		}
 	}
 
-	KStyle::unPolish (ceData, elementFlags, ptr);
+	TDEStyle::unPolish (ceData, elementFlags, ptr);
 }
 
 void HighContrastStyle::setColorsNormal (TQPainter* p, const TQColorGroup& cg, int flags, int highlight) const
@@ -687,13 +687,13 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
 		}
 
 		default: {
-			KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
+			TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
 		}
 	}
 }
 
 
-void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
+void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 										TQPainter* p,
 										const TQStyleControlElementData &ceData,
 										ControlElementFlags elementFlags,
@@ -758,11 +758,11 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
 
 		case KPE_ListViewExpander: {
 			// TODO There is no pixelMetric associated with the
-			// ListViewExpander in KStyle.
+			// ListViewExpander in TDEStyle.
 			// To have a properly large expander, the CC_ListView case of
 			// drawComplexControl should be handled.
 			// Probably it would be better to add a KPM_ListViewExpander metric
-			// to the KStyle KStylePixelMetric enum, and have the KStyle
+			// to the TDEStyle TDEStylePixelMetric enum, and have the TDEStyle
 			// drawComplexControl handle it.
 			TQ_PrimitiveElement direction;
 			if (flags & Style_On) { // Collapsed = On
@@ -776,10 +776,10 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
 			break;
 		}
 		case KPE_ListViewBranch: 
-			// TODO Draw (thick) dotted line. Check kstyle.cpp
+			// TODO Draw (thick) dotted line. Check tdestyle.cpp
 			// Fall down for now
 		default:
-			KStyle::drawKStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1158,7 +1158,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
 		}
 
 		default:
-			KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -1188,13 +1188,13 @@ void HighContrastStyle::drawControlMask (TQ_ControlElement element,
 		}
 
 		default: {
-			KStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
+			TDEStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
 		}
 	}
 }
 
 // Helper to find the next sibling that's not hidden
-// Lifted from kstyle.cpp
+// Lifted from tdestyle.cpp
 static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
 {
     TQListViewItem* sibling = item;
@@ -1329,7 +1329,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 		// -------------------------------------------------------------------
 		case CC_ListView: {
 			/*
-			 * Sigh... Lifted and modified from kstyle.cpp 
+			 * Sigh... Lifted and modified from tdestyle.cpp 
 			 */
 			/* 
 			 * Many thanks to TrollTech AS for donating CC_ListView from TQWindowsStyle.
@@ -1405,8 +1405,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 							boxrect = TQRect( bx-h/2, linebot-h/2, h, h );
 							boxflags = child->isOpen() ? TQStyle::Style_Off : TQStyle::Style_On;
 
-							// KStyle extension: Draw the box and expand/collapse indicator
-							drawKStylePrimitive( KPE_ListViewExpander, p, ceData, elementFlags, boxrect, cg, boxflags, opt, NULL );
+							// TDEStyle extension: Draw the box and expand/collapse indicator
+							drawTDEStylePrimitive( KPE_ListViewExpander, p, ceData, elementFlags, boxrect, cg, boxflags, opt, NULL );
 
 							// dotlinery
 							p->setPen( cg.mid() );
@@ -1459,8 +1459,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 						branchrect  = TQRect( point, other-(thickness/2), end-point, thickness );
 						branchflags = TQStyle::Style_Horizontal;
 
-						// KStyle extension: Draw the horizontal branch
-						drawKStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
+						// TDEStyle extension: Draw the horizontal branch
+						drawTDEStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
 
 					} else {
 						// Vertical branch
@@ -1475,8 +1475,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 						else
 							branchflags = TQStyle::Style_Default;
 
-						// KStyle extension: Draw the vertical branch
-						drawKStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
+						// TDEStyle extension: Draw the vertical branch
+						drawTDEStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
 					}
 				}
 			}
@@ -1484,7 +1484,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 		}
 
 		default:
-			KStyle::drawComplexControl(control, p, ceData, elementFlags,
+			TDEStyle::drawComplexControl(control, p, ceData, elementFlags,
 						r, cg, flags, controls, active, opt, widget);
 			break;
 	}
@@ -1506,7 +1506,7 @@ void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c,
 			break;
 		}
 		default: {
-			KStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
+			TDEStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
 		}
 	}
 }
@@ -1530,7 +1530,7 @@ void HighContrastStyle::drawItem( TQPainter *p,
 	
 	enabled = true; //do not ghost it in Qt
 
-	KStyle::drawItem (p, r, flags, cg, enabled, pixmap, text, len, penColor);
+	TDEStyle::drawItem (p, r, flags, cg, enabled, pixmap, text, len, penColor);
 	
 	p->restore();
 }
@@ -1585,7 +1585,7 @@ TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
 		default: break;
 	}
 
-	return KStyle::querySubControlMetrics (control, ceData, elementFlags, subcontrol, opt, widget);
+	return TDEStyle::querySubControlMetrics (control, ceData, elementFlags, subcontrol, opt, widget);
 }
 
 
@@ -1679,19 +1679,19 @@ int HighContrastStyle::pixelMetric(PixelMetric m, const TQStyleControlElementDat
 			return 0;
 
 		default:
-			return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+			return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
 	}
 }
 
-int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+int HighContrastStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
 {
 	switch (kpm) {
 		case KPM_ListViewBranchThickness:
 			// XXX Proper support of thick branches requires reimplementation of
-			// the drawKStylePrimitive KPE_ListViewBranch case.
+			// the drawTDEStylePrimitive KPE_ListViewBranch case.
 			return basicLineWidth;
 		default:
-			return KStyle::kPixelMetric(kpm, ceData, elementFlags, widget);
+			return TDEStyle::kPixelMetric(kpm, ceData, elementFlags, widget);
 	}
 }
 
@@ -1817,7 +1817,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents,
 
 
 		default:
-			return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+			return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
 	}
 }
 
@@ -1829,13 +1829,13 @@ TQRect HighContrastStyle::subRect (SubRect subrect, const TQStyleControlElementD
 		case SR_ProgressBarLabel:
 			return ceData.rect;
 		default:
-			return KStyle::subRect (subrect, ceData, elementFlags, widget);
+			return TDEStyle::subRect (subrect, ceData, elementFlags, widget);
 	}
 }
 
 bool HighContrastStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
-	return KStyle::objectEventHandler (ceData, elementFlags, source, event);
+	return TDEStyle::objectEventHandler (ceData, elementFlags, source, event);
 }
 
 /*! \reimp */
@@ -1856,7 +1856,7 @@ int HighContrastStyle::styleHint(StyleHint sh, const TQStyleControlElementData &
 			}
 			break;
 		default:
-			ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
+			ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
 			break;
 	}
 
diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h
index 89a716dc1..552526254 100644
--- a/kstyles/highcontrast/highcontrast.h
+++ b/kstyles/highcontrast/highcontrast.h
@@ -14,7 +14,7 @@
  *               (C) 2000 Dirk Mueller          <mueller@kde.org>
  *               (C) 2001 Martijn Klingens      <klingens@kde.org>
  *
- * Includes portions from KStyle,
+ * Includes portions from TDEStyle,
  *     Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
  *
  * Many thanks to Bradley T. Hughes for the 3 button scrollbar code.
@@ -41,12 +41,12 @@
 #include <tqintdict.h>
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 class TQPopupMenu;
 
-class HighContrastStyle : public KStyle
+class HighContrastStyle : public TDEStyle
 {
 	Q_OBJECT
 
@@ -59,7 +59,7 @@ class HighContrastStyle : public KStyle
 		void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 		void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
-		void drawKStylePrimitive( KStylePrimitive kpe,
+		void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -137,7 +137,7 @@ class HighContrastStyle : public KStyle
 		int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					const TQWidget *widget = 0 ) const;
 
-		int kPixelMetric( KStylePixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+		int kPixelMetric( TDEStylePixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					const TQWidget *widget = 0 ) const;
 
 		TQSize sizeFromContents( ContentsType contents,
diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am
index 83e1d4a03..4f3dbebae 100644
--- a/kstyles/keramik/Makefile.am
+++ b/kstyles/keramik/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed
 
 genembed_SOURCES = genembed.cpp
 genembed_LDADD = ../../tdefx/libtdefx.la
-genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
 	 pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index 7105d81c5..fa1848203 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -12,7 +12,7 @@
              (C) 2000 Dirk Mueller          <mueller@kde.org>
              (C) 2001 Martijn Klingens      <klingens@kde.org>
 
-   Progressbar code based on KStyle, Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>,
+   Progressbar code based on TDEStyle, Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>,
    Improvements to progressbar animation from Plastik, Copyright (C) 2003 Sandro Giessl <sandro@giessl.com>
 
    This library is free software; you can redistribute it and/or
@@ -237,7 +237,7 @@ TQRect KeramikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
 		}
 
 		default:
-			return KStyle::subRect( r, ceData, elementFlags, widget );
+			return TDEStyle::subRect( r, ceData, elementFlags, widget );
 	}
 }
 
@@ -269,14 +269,14 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap,
 			break;
 	}
 
-	return KStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
+	return TDEStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
 }
 
 
 
 
 KeramikStyle::KeramikStyle()
-	:KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ),
+	:TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ),
 		maskMode(false), formMode(false),
 		toolbarBlendWidget(0), titleBarMode(None), flatMode(false), customScrollMode(false), kickerMode(false)
 {
@@ -354,7 +354,7 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 	
 		else if ( widget->parentWidget() &&
 				( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) ||
-					widget->inherits( "KCompletionBox" ) ) ) {
+					widget->inherits( "TDECompletionBox" ) ) ) {
 			TQListBox* listbox = (TQListBox*) widget;
 			listbox->setLineWidth( 4 );
 			listbox->setBackgroundMode( NoBackground );
@@ -379,7 +379,7 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 		}
 	}
 
-	KStyle::polish(ceData, elementFlags, ptr);
+	TDEStyle::polish(ceData, elementFlags, ptr);
 }
 
 void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
@@ -399,7 +399,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
 	
 		else if ( widget->parentWidget() &&
 				( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) ||
-					widget->inherits( "KCompletionBox" ) ) ) {
+					widget->inherits( "TDECompletionBox" ) ) ) {
 			TQListBox* listbox = (TQListBox*) widget;
 			listbox->setLineWidth( 1 );
 			listbox->setBackgroundMode( PaletteBackground );
@@ -418,7 +418,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
 		}
 	}
 
-	KStyle::unPolish(ceData, elementFlags, ptr);
+	TDEStyle::unPolish(ceData, elementFlags, ptr);
 }
 
 void KeramikStyle::progressBarDestroyed(TQObject* obj)
@@ -985,7 +985,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
 					return;
 				}
 			}
-			KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+			TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
 			break;
 		}
 		case PE_WindowFrame:
@@ -1014,7 +1014,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
 				p->drawLine(x+1, y+1, x+1, y2-1);
 				p->setPen(oldPen);
 			} else
-				KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+				TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
 
 			break;
 		}
@@ -1215,12 +1215,12 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
 
 			}
 			else
-				KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
+				TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
 		}
 	}
 }
 
-void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 										  TQPainter* p,
 										  const TQStyleControlElementData &ceData,
 										  ControlElementFlags elementFlags,
@@ -1350,14 +1350,14 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe,
 
 
 		default:
-			KStyle::drawKStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
 bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const
 {
 	if (widget) {
-		//Form widgets are in the KHTMLView, but that has 2 further inner levels
+		//Form widgets are in the TDEHTMLView, but that has 2 further inner levels
 		//of widgets - QClipperWidget, and outside of that, QViewportWidget
 		TQWidget* potentialClipPort = widget->parentWidget();
 		if ((ceData.parentWidgetData.widgetObjectTypes.isEmpty()) && (ceData.parentWidgetFlags & CEF_IsTopLevel)) {
@@ -1369,9 +1369,9 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C
 				qstrcmp(potentialViewPort->name(), "qt_viewport") )
 			return false;
 	
-		TQWidget* potentialKHTML  = potentialViewPort->parentWidget();
-		if (!potentialKHTML || potentialKHTML->isTopLevel() ||
-				qstrcmp(potentialKHTML->className(), "KHTMLView") )
+		TQWidget* potentialTDEHTML  = potentialViewPort->parentWidget();
+		if (!potentialTDEHTML || potentialTDEHTML->isTopLevel() ||
+				qstrcmp(potentialTDEHTML->className(), "TDEHTMLView") )
 			return false;
 	
 	
@@ -1539,7 +1539,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 				//	nr.setWidth(r.width()-2); //Account for shadow
 			}
 
-			KStyle::drawControl(element, p, ceData, elementFlags, nr, cg, flags, opt, widget);
+			TDEStyle::drawControl(element, p, ceData, elementFlags, nr, cg, flags, opt, widget);
 			break;
 		}
 
@@ -1602,7 +1602,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 										 tb->orientation() == Qt::Horizontal);
 			}
 			else
-				KStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
+				TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
 					r, cg, flags, opt, widget );
 			break;
 		}
@@ -1958,7 +1958,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 
 
 		default:
-			KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+			TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
 	}
 }
 
@@ -2353,7 +2353,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 		case CC_TitleBar:
 			titleBarMode = Regular; //Handle buttons on titlebar different from toolbuttons
 		default:
-			KStyle::drawComplexControl( control, p, ceData, elementFlags,
+			TDEStyle::drawComplexControl( control, p, ceData, elementFlags,
 						r, cg, flags, controls, active, opt, widget );
 
 			titleBarMode = None;
@@ -2457,7 +2457,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce
 			return 2;
 
 		default:
-			return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+			return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
 	}
 }
 
@@ -2500,7 +2500,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 			}
 			else
 			{
-				return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+				return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
 			}
 		}
 
@@ -2568,7 +2568,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 		}
 		
 		default:
-			return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
+			return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget );
 	}
 }
 
@@ -2580,7 +2580,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
                                                   const TQStyleOption& opt,
                                                   const TQWidget* widget ) const
 {
-	SubControl result = KStyle::querySubControl( control, ceData, elementFlags, point, opt, widget );
+	SubControl result = TDEStyle::querySubControl( control, ceData, elementFlags, point, opt, widget );
 	if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine )
 	{
 		TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget );
@@ -2771,7 +2771,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
 		}
 		default: break;
 	}
-	return KStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget );
+	return TDEStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget );
 }
 
 
@@ -2791,7 +2791,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
 
 bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
-	if (KStyle::objectEventHandler( ceData, elementFlags, source, event ))
+	if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
 		return true;
 
 	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
@@ -2993,7 +2993,7 @@ int KeramikStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDat
 			ret = 1;
 			break;
 		default:
-			ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
+			ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w);
 			break;
 	}
 
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index 5acaabf8d..7bf8cd3d4 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -33,13 +33,13 @@
 #define __keramik_h__
 
 #include <tqframe.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 #include "pixmaploader.h"
 
 class TQProgressBar;
 
-class KeramikStyle : public KStyle
+class KeramikStyle : public TDEStyle
 {
 	Q_OBJECT
 
@@ -55,7 +55,7 @@ public:
 	void polish( TQPalette& );
 	void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
-	void drawKStylePrimitive( KStylePrimitive kpe,
+	void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 	                          TQPainter* p,
 	                          const TQStyleControlElementData &ceData,
 	                          ControlElementFlags elementFlags,
diff --git a/kstyles/keramik/keramikimage.h b/kstyles/keramik/keramikimage.h
index c8e684a00..05bc75900 100644
--- a/kstyles/keramik/keramikimage.h
+++ b/kstyles/keramik/keramikimage.h
@@ -12,7 +12,7 @@
              (C) 2000 Dirk Mueller          <mueller@kde.org>
              (C) 2001 Martijn Klingens      <klingens@kde.org>
 
-    Progressbar code based on KStyle, Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
+    Progressbar code based on TDEStyle, Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index 7be529840..a169de874 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -24,7 +24,7 @@
 
 #include "klegacystyle.h"
 #include "klegacystyle.moc"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #define INCLUDE_MENUITEM_DEF
@@ -1743,7 +1743,7 @@ bool KLegacyStylePrivate::parseStyle() {
 }
 
 
-KLegacyStyle::KLegacyStyle(void) : KStyle() {
+KLegacyStyle::KLegacyStyle(void) : TDEStyle() {
     setButtonDefaultIndicatorWidth(6);
     setScrollBarExtent(15, 15);
     setButtonMargin(3);
@@ -1873,7 +1873,7 @@ void KLegacyStyle::polish(TQApplication *app) {
 
     qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &KLegacyStyle::drawMenuBarItem);
 
-    KStyle::polish(app);
+    TDEStyle::polish(app);
 }
 
 
@@ -2066,12 +2066,12 @@ void KLegacyStyle::polish(TQWidget *widget) {
  	widget->setMouseTracking(mouseTrack);
     }
 
-    KStyle::polish(widget);
+    TDEStyle::polish(widget);
 }
 
 
 void KLegacyStyle::polishPopupMenu(TQPopupMenu *popup) {
-    KStyle::polishPopupMenu(popup);
+    TDEStyle::polishPopupMenu(popup);
 
     popup->setMouseTracking(true);
     popup->setCheckable(true);
@@ -2089,7 +2089,7 @@ void KLegacyStyle::unPolish(TQWidget *widget) {
     widget->removeEventFilter(this);
     widget->unsetPalette();
     widget->setAutoMask(false);
-    KStyle::unPolish(widget);
+    TDEStyle::unPolish(widget);
 }
 
 
@@ -2099,7 +2099,7 @@ void KLegacyStyle::unPolish(TQApplication *app) {
 
     qt_set_draw_menu_bar_impl(0);
 
-    KStyle::unPolish(app);
+    TDEStyle::unPolish(app);
 }
 
 
@@ -2150,7 +2150,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQButton::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
+	TDEStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
 	return;
     }
 
@@ -2165,7 +2165,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h,
     if (pix && (! pix->isNull()))
 	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
+	TDEStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
 }
 
 
@@ -2173,7 +2173,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
     GtkObject *gobj = priv->gtkDict.find(TQPushButton::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawPushButton(btn, p);
+	TDEStyle::drawPushButton(btn, p);
 	return;
     }
 
@@ -2199,7 +2199,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
 	if (pix)
 	    p->drawPixmap(x1, y1, *pix);
         else
-	    KStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1,
+	    TDEStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1,
 				    g, true, &fill);
     }
 
@@ -2227,7 +2227,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
     if (pix && ! pix->isNull())
 	p->drawPixmap(x1, y1, *pix);
     else {
-	KStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1,
+	TDEStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1,
 				g, btn->isOn() || btn->isDown(), &fill);
     }
 }
@@ -2240,7 +2240,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
+	TDEStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
 	return;
     }
 
@@ -2255,7 +2255,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h,
     if (pix && (! pix->isNull()))
      	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
+	TDEStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
 }
 
 
@@ -2263,7 +2263,7 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i
     GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawIndicatorMask(p, x, y, w, h, state);
+	TDEStyle::drawIndicatorMask(p, x, y, w, h, state);
 	return;
     }
 
@@ -2278,14 +2278,14 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i
     if (pix && pix->mask() && ! pix->mask()->isNull())
 	p->drawPixmap(x, y, *(pix->mask()));
     else
-	KStyle::drawIndicatorMask(p, x, y, w, h, state);
+	TDEStyle::drawIndicatorMask(p, x, y, w, h, state);
 }
 
 
 TQSize KLegacyStyle::indicatorSize(void) const {
     GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
-    if (! gobj)	return KStyle::indicatorSize();
+    if (! gobj)	return TDEStyle::indicatorSize();
 
     KLegacyImageDataKey key;
     key.cachekey = 0;
@@ -2293,7 +2293,7 @@ TQSize KLegacyStyle::indicatorSize(void) const {
     key.data.shadow = KLegacy::Out;
     KLegacyImageData *id = gobj->getImageData(key, "checkbutton");
 
-    if (! id) return KStyle::indicatorSize();
+    if (! id) return TDEStyle::indicatorSize();
 
     TQString filename;
     if (! id->file.isNull())
@@ -2301,13 +2301,13 @@ TQSize KLegacyStyle::indicatorSize(void) const {
     else if (! id->overlayFile.isNull())
 	filename = id->overlayFile;
     else
-	return KStyle::indicatorSize();
+	return TDEStyle::indicatorSize();
 
     TQImage *image = imageCache->find(filename);
     if (! image) {
         image = new TQImage(filename);
 
-        if (! image) return KStyle::indicatorSize();
+        if (! image) return TDEStyle::indicatorSize();
 
         imageCache->insert(filename, image);
     }
@@ -2338,7 +2338,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int
     if (pix && (! pix->isNull()))
 	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawExclusiveIndicator(p, x, y, w, h, g, down, enabled);
+	TDEStyle::drawExclusiveIndicator(p, x, y, w, h, g, down, enabled);
 }
 
 
@@ -2348,7 +2348,7 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w,
     GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
+	TDEStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
 	return;
     }
 
@@ -2363,7 +2363,7 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w,
     if (pix && pix->mask() && ! pix->mask()->isNull())
 	p->drawPixmap(x, y, *(pix->mask()));
     else
-	KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
+	TDEStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
 }
 
 
@@ -2371,7 +2371,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
     GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
-	return KStyle::indicatorSize();
+	return TDEStyle::indicatorSize();
     }
 
     KLegacyImageDataKey key;
@@ -2380,7 +2380,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
     key.data.shadow = KLegacy::Out;
     KLegacyImageData *id = gobj->getImageData(key, "radiobutton");
 
-    if (! id) return KStyle::indicatorSize();
+    if (! id) return TDEStyle::indicatorSize();
 
     TQString filename;
     if (! id->file.isNull()) {
@@ -2388,7 +2388,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
     } else if (! id->overlayFile.isNull()) {
 	filename = id->overlayFile;
     } else {
-	return KStyle::indicatorSize();
+	return TDEStyle::indicatorSize();
     }
 
     TQImage *image = imageCache->find(filename);
@@ -2396,7 +2396,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
         image = new TQImage(filename);
 
         if (! image) {
-	    return KStyle::indicatorSize();
+	    return TDEStyle::indicatorSize();
 	}
 
         imageCache->insert(filename, image);
@@ -2534,7 +2534,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
+	TDEStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
 	return;
     }
 
@@ -2552,7 +2552,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
     if (pix && ! pix->isNull()) {
 	p->drawPixmap(x, y, *pix);
     } else {
-	KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
+	TDEStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
 	return;
     }
 
@@ -2574,7 +2574,7 @@ TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) {
     GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject());
 
     if (! gobj) {
-	return KStyle::comboButtonRect(x, y, w, h);
+	return TDEStyle::comboButtonRect(x, y, w, h);
     }
 
     KLegacyImageDataKey key;
@@ -2583,7 +2583,7 @@ TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) {
     KLegacyImageData *id = gobj->getImageData(key, "optionmenu");
 
     if (! id) {
-	return KStyle::comboButtonRect(x, y, w, h);
+	return TDEStyle::comboButtonRect(x, y, w, h);
     }
 
     return TQRect(x + id->border.left() + 1, y + id->border.top() + 1,
@@ -2651,7 +2651,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
     GtkObject *gobj = priv->gtkDict.find(TQScrollBar::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
+	TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
 	return;
     }
 
@@ -2663,7 +2663,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
     KLegacyImageData *groove_id = gobj->getImageData(gkey, "trough");
 
     if (! groove_id) {
-	KStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
+	TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
 	return;
     }
 
@@ -2704,7 +2704,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
     KLegacyImageData *slider_id = gobj->getImageData(skey, "slider");
 
     if (! slider_id) {
-	KStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
+	TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
 	return;
     }
 
@@ -2765,7 +2765,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ
     GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
+	TDEStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
 	return;
     }
 
@@ -2781,7 +2781,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ
     if (pix && ! pix->isNull())
 	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
+	TDEStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
 }
 
 
@@ -2792,7 +2792,7 @@ void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
+	TDEStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
 	return;
     }
 
@@ -2808,7 +2808,7 @@ void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h,
     if (pix && ! pix->isNull())
 	p->drawPixmap(x, y, *pix);
     else
-        KStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
+        TDEStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
 }
 
 
@@ -2819,7 +2819,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down,
     GtkObject *gobj = priv->gtkDict.find(&arrow_ptr);
 
     if (! gobj) {
-	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
+	TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
 	return;
     }
 
@@ -2840,7 +2840,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down,
     if (pix && ! pix->isNull())
 	p->drawPixmap(x, y, *pix);
     else
-	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
+	TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
 }
 
 
@@ -2851,7 +2851,7 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down,
     GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr);
 
     if (! gobj) {
-	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
+	TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
 	return;
     }
 
@@ -2868,14 +2868,14 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down,
     	p->drawPixmap(x + ((w - pix->width()) / 2),
 	              y + ((h - pix->height()) / 2), *pix);
     else
-	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
+	TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
 }
 
 
 void KLegacyStyle::drawPanel(TQPainter *p, int x, int y, int w, int h,
 			  const TQColorGroup &g, bool sunken, int, const TQBrush *brush)
 {
-    KStyle::drawPanel(p, x, y, w, h, g, sunken, 1, brush);
+    TDEStyle::drawPanel(p, x, y, w, h, g, sunken, 1, brush);
 }
 
 
@@ -2894,7 +2894,7 @@ void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h,
     GtkObject *gobj = priv->gtkDict.find(&checkmenuitem_ptr);
 
     if (! gobj) {
-	KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
+	TDEStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
 	return;
     }
 
@@ -2910,7 +2910,7 @@ void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h,
 	y += (h - pix->height()) / 2;
 	p->drawPixmap(x, y, *pix);
     } else {
-	KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
+	TDEStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
     }
 }
 
@@ -2945,7 +2945,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
     GtkObject *gobj = priv->gtkDict.find(TQTabBar::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawTab(p, tabbar, tab, selected);
+	TDEStyle::drawTab(p, tabbar, tab, selected);
 	return;
     }
 
@@ -2974,17 +2974,17 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
     if (pix && ! pix->isNull())
 	p->drawPixmap(tab->r.left(), ry, *pix);
     else
-	KStyle::drawTab(p, tabbar, tab, selected);
+	TDEStyle::drawTab(p, tabbar, tab, selected);
 }
 
 
 void KLegacyStyle::drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
-				  const TQColorGroup &g, KToolBarPos type, TQBrush *fill)
+				  const TQColorGroup &g, TDEToolBarPos type, TQBrush *fill)
 {
     GtkObject *gobj = priv->gtkDict.find(TQToolBar::staticMetaObject());
 
     if (! gobj) {
-	KStyle::drawKBarHandle(p, x, y, w, h, g, type, fill);
+	TDEStyle::drawKBarHandle(p, x, y, w, h, g, type, fill);
 	return;
     }
 
@@ -3040,7 +3040,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h
 
     TQString s(title);
 
-    static const TQString &modStr = KGlobal::staticQString(
+    static const TQString &modStr = TDEGlobal::staticQString(
         TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"));
 
     int modStrPos = s.find(modStr);
@@ -3362,5 +3362,5 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	}
     }
 
-    return KStyle::eventFilter(obj, e);
+    return TDEStyle::eventFilter(obj, e);
 }
diff --git a/kstyles/klegacy/klegacystyle.h b/kstyles/klegacy/klegacystyle.h
index 18c073f9a..f82fd5d0a 100644
--- a/kstyles/klegacy/klegacystyle.h
+++ b/kstyles/klegacy/klegacystyle.h
@@ -25,13 +25,13 @@
 #ifndef   __KLegacyStyle_hh
 #define   __KLegacyStyle_hh
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 // forward declaration
 class KLegacyStylePrivate;
 
 
-class Q_EXPORT KLegacyStyle : public KStyle {
+class Q_EXPORT KLegacyStyle : public TDEStyle {
     Q_OBJECT
 public:
     KLegacyStyle(void);
@@ -60,7 +60,7 @@ public:
     
     // toolbar stuffs
     virtual void drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
-                                const TQColorGroup &g, KToolBarPos type, TQBrush *fill = 0);
+                                const TQColorGroup &g, TDEToolBarPos type, TQBrush *fill = 0);
     virtual void drawKickerHandle(TQPainter *p, int x, int y, int w, int h,
                                   const TQColorGroup &g, TQBrush *fill = 0);
     virtual void drawKickerAppletHandle(TQPainter *p, int x, int y, int w, int h,
diff --git a/kstyles/klegacy/plugin.cpp b/kstyles/klegacy/plugin.cpp
index a146de2c3..558b54e73 100644
--- a/kstyles/klegacy/plugin.cpp
+++ b/kstyles/klegacy/plugin.cpp
@@ -1,14 +1,14 @@
 #include "klegacystyle.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C" {
-    KStyle* allocate();
+    TDEStyle* allocate();
     int minor_version();
     int major_version();
     const char *description();
 }
 
-KStyle* allocate()
+TDEStyle* allocate()
 {
     return(new KLegacyStyle());
 }
diff --git a/kstyles/kthemestyle/kstyledirs.cpp b/kstyles/kthemestyle/kstyledirs.cpp
index 7e548d0d5..8755fb294 100644
--- a/kstyles/kthemestyle/kstyledirs.cpp
+++ b/kstyles/kthemestyle/kstyledirs.cpp
@@ -1,7 +1,7 @@
 /*
  $Id$
 
- Simple helper routines for style's use of KStandardDirs with TQSettings, etc.
+ Simple helper routines for style's use of TDEStandardDirs with TQSettings, etc.
 
  This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -25,19 +25,19 @@
 #include <kstandarddirs.h>
 #include "kstyledirs.h"
 
-KStyleDirs* KStyleDirs::instance = 0;
+TDEStyleDirs* TDEStyleDirs::instance = 0;
 
-KStyleDirs::KStyleDirs()
+TDEStyleDirs::TDEStyleDirs()
 {
-    addResourceType( "themepixmap", KStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" );
-    addResourceType( "themerc", KStandardDirs::kde_default( "data" ) + "kstyle/themes/" );
+    addResourceType( "themepixmap", TDEStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" );
+    addResourceType( "themerc", TDEStandardDirs::kde_default( "data" ) + "kstyle/themes/" );
 }
 
-KStyleDirs::~KStyleDirs()
+TDEStyleDirs::~TDEStyleDirs()
 {
 }
 
-void KStyleDirs::addToSearch( const char* type, TQSettings& s ) const
+void TDEStyleDirs::addToSearch( const char* type, TQSettings& s ) const
 {
     const TQStringList & dirs = resourceDirs(type);
     for ( int c = dirs.size()-1; c >= 0 ; c-- )
diff --git a/kstyles/kthemestyle/kstyledirs.h b/kstyles/kthemestyle/kstyledirs.h
index 9d2635136..410fad2ef 100644
--- a/kstyles/kthemestyle/kstyledirs.h
+++ b/kstyles/kthemestyle/kstyledirs.h
@@ -30,22 +30,22 @@
 /**
 * @short Access to the standard KDE directories for the pixmap style
 * @author Maksim Orlovich<mo002j@mail.rochester.edu> is responsible for this file,
-    but all the interesting work is done by KStandardDirs
+    but all the interesting work is done by TDEStandardDirs
 * @version $Id$
 *
-* This class provides a this wrapper for styles around KStandardDirs,
+* This class provides a this wrapper for styles around TDEStandardDirs,
 * permitting integration with TQSettings and easy loading of pixmaps
 *
 * It add share/apps/kstyle/themes as "themerc",
 *    share/apps/kstyle/pixmaps "themepixmap"
 */
-class KStyleDirs: public KStandardDirs
+class TDEStyleDirs: public TDEStandardDirs
 {
 public:
-    static KStyleDirs* dirs()
+    static TDEStyleDirs* dirs()
     {
         if ( !instance)
-            instance = new KStyleDirs;
+            instance = new TDEStyleDirs;
         return instance;
     }
 
@@ -60,7 +60,7 @@ public:
 
     For example, when one does the following:
     TQSettings settings;
-    KStyleDirs dirs;
+    TDEStyleDirs dirs;
     dirs.addToSearch("config",settings);
 
     The one can do settings.readEntry("kstyle/KDE/WidgetStyle") to access a settings in kstylerc.
@@ -68,15 +68,15 @@ public:
     void addToSearch( const char* type, TQSettings& q) const; //Better name?
 
 protected:
-    static KStyleDirs* instance;
+    static TDEStyleDirs* instance;
     /**
     Creates an instance of the class, and calculates the path information.
     */
-    KStyleDirs();
-    KStyleDirs(const KStyleDirs&);
-    KStyleDirs& operator= (const KStyleDirs&);
+    TDEStyleDirs();
+    TDEStyleDirs(const TDEStyleDirs&);
+    TDEStyleDirs& operator= (const TDEStyleDirs&);
 
-    virtual ~KStyleDirs();
+    virtual ~TDEStyleDirs();
 };
 
 #endif
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index 56cbeb09f..adbf49084 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -7,7 +7,7 @@
  KDE3 port (C) 2001-2002 Maksim Orlovich <mo002j@mail.rochester.edu>
  Port version 0.9.7
 
- Palette setup code is from KApplication,
+ Palette setup code is from TDEApplication,
 		Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
 		Copyright (C) 1998, 1999, 2000 KDE Team
 
@@ -60,7 +60,7 @@ Bugs:
 Can't delete old slider image when calculating the rotated one for some reason.
 */
 
-//Shamelessly stolen from KConfigBase
+//Shamelessly stolen from TDEConfigBase
 static TQColor readColorEntry( TQSettings* s, const char *pKey,
                               const TQColor* pDefault )
 {
@@ -423,7 +423,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ )
     TQSettings config;
     if (configDirName.isEmpty() || configDirName == ".")
     {
-    	KStyleDirs::dirs()->addToSearch( "themerc", config );
+    	TDEStyleDirs::dirs()->addToSearch( "themerc", config );
     }
     else config.insertSearchPath( TQSettings::Unix, configDirName );
 
@@ -525,7 +525,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ )
 }
 
 KThemeBase::KThemeBase( const TQString& dir, const TQString & configFile )
-        : KStyle( FilledFrameWorkaround ), configFileName( configFile )
+        : TDEStyle( FilledFrameWorkaround ), configFileName( configFile )
 {
     d = new KThemeBasePrivate;
     if ( configFileName.isEmpty() )
@@ -648,7 +648,7 @@ KThemeBase::~KThemeBase()
         if ( grHighColors[ i ] )
             delete( grHighColors[ i ] );
     }
-    KStyleDirs::release();
+    TDEStyleDirs::release();
     delete cache;
     delete d;
 }
@@ -656,7 +656,7 @@ KThemeBase::~KThemeBase()
 TQImage* KThemeBase::loadImage( const TQString &name )
 {
     TQImage * image = new TQImage;
-    TQString path = KStyleDirs::dirs()->findResource( "themepixmap",name );
+    TQString path = TDEStyleDirs::dirs()->findResource( "themepixmap",name );
     image->load( path );
     if ( !image->isNull() )
         return ( image );
@@ -668,7 +668,7 @@ TQImage* KThemeBase::loadImage( const TQString &name )
 KThemePixmap* KThemeBase::loadPixmap( const TQString &name )
 {
     KThemePixmap * pixmap = new KThemePixmap( false );
-    TQString path = KStyleDirs::dirs()->findResource( "themepixmap", name );
+    TQString path = TDEStyleDirs::dirs()->findResource( "themepixmap", name );
     pixmap->load( path );
     if ( !pixmap->isNull() )
         return pixmap;
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index 3e2019383..1e16bcee7 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -6,7 +6,7 @@
 
  KDE3 port (C) 2001 Maksim Orlovich <mo002j@mail.rochester.edu>
 
- Palette setup code is from KApplication,
+ Palette setup code is from TDEApplication,
 Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
 Copyright (C) 1998, 1999, 2000 KDE Team
 
@@ -34,7 +34,7 @@ Copyright (C) 1998, 1999, 2000 KDE Team
 #include <kpixmap.h>
 #include <tqintcache.h>
 #include <tqstring.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqsettings.h>
 #include <tqpalette.h> // for QColorGroup
 #include "kstyledirs.h"
@@ -211,7 +211,7 @@ class KThemeBasePrivate;
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KThemeBase: public KStyle
+class KThemeBase: public TDEStyle
 {
     Q_OBJECT
 public:
@@ -280,7 +280,7 @@ public:
         Background, RotSliderGroove, RotInactiveTab, RotActiveTab, WIDGETS};
 
     /**
-     * The scaling type specified by the KConfig file.
+     * The scaling type specified by the TDEConfig file.
      *
      * @param widget A Widgets enum value.
      *
@@ -288,7 +288,7 @@ public:
      */
     ScaleHint scaleHint( WidgetType widget ) const;
     /**
-     * The gradient type specified by the KConfig file.
+     * The gradient type specified by the TDEConfig file.
      *
      * @param widget A Widgets enum value.
      *
@@ -510,14 +510,14 @@ protected:
     */
     virtual int pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget = 0 ) const
     {
-        return KStyle::pixelMetric( metric, ceData, elementFlags, widget );
+        return TDEStyle::pixelMetric( metric, ceData, elementFlags, widget );
     }
 
     virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & cg,
                                  SFlags flags = Style_Default,
                                  const TQStyleOption& option = TQStyleOption::Default ) const
     {
-        KStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg,
+        TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg,
                                 flags, option );
     }
 
@@ -532,7 +532,7 @@ protected:
                               const TQStyleOption& opt = TQStyleOption::Default,
                               const TQWidget *widget = 0 ) const
     {
-        KStyle::drawControl( element, p, ceData, elementFlags,
+        TDEStyle::drawControl( element, p, ceData, elementFlags,
                              r, cg, how, opt, widget );
     }
 
@@ -544,7 +544,7 @@ protected:
                                   const TQStyleOption& opt = TQStyleOption::Default,
                                   const TQWidget *widget = 0 ) const
     {
-        KStyle::drawControlMask( element, p, ceData, elementFlags, r, opt, widget );
+        TDEStyle::drawControlMask( element, p, ceData, elementFlags, r, opt, widget );
     }
 
 
@@ -560,11 +560,11 @@ protected:
                                      const TQStyleOption& opt = TQStyleOption::Default,
                                      const TQWidget* widget = 0 ) const
     {
-        KStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget );
+        TDEStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget );
     }
 
 
-    virtual void drawKStylePrimitive( KStylePrimitive kpe,
+    virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
                                       TQPainter* p,
                                       const TQStyleControlElementData &ceData,
                                       ControlElementFlags elementFlags,
@@ -574,7 +574,7 @@ protected:
                                       const TQStyleOption& opt = TQStyleOption::Default,
                                       const TQWidget* widget = 0 ) const
     {
-        KStyle::drawKStylePrimitive( kpe,
+        TDEStyle::drawTDEStylePrimitive( kpe,
                                      p, ceData, elementFlags, r,
                                      cg, flags, opt, widget );
     }
@@ -585,7 +585,7 @@ protected:
                            TQStyleHintReturn* returnData = 0,
                            const TQWidget *widget = 0 ) const
     {
-        return KStyle::styleHint( sh,
+        return TDEStyle::styleHint( sh,
                                   ceData,
                                   elementFlags,
                                   opt,
@@ -600,7 +600,7 @@ protected:
                                     const TQStyleOption& opt = TQStyleOption::Default,
                                     const TQWidget *widget = 0 ) const
     {
-        return KStyle::sizeFromContents( contents,
+        return TDEStyle::sizeFromContents( contents,
                                          ceData, elementFlags, contentsSize, opt, widget );
     }
 
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index ff7199939..a164821b1 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -53,7 +53,7 @@ Port version 0.9.7
 #include <tqpalette.h>
 #include <tqtabbar.h>
 #include <tqtoolbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdrawutil.h>
 #include <tqdrawutil.h>
 #include <tqprogressbar.h>
@@ -130,7 +130,7 @@ public:
     TQStringList keys() const
     {
         TQSettings cfg;
-        KStyleDirs::dirs()->addToSearch( "config", cfg );
+        TDEStyleDirs::dirs()->addToSearch( "config", cfg );
 
         TQStringList keys;
         bool ok;
@@ -145,7 +145,7 @@ public:
     TQStyle* create( const TQString& key )
     {
         TQSettings cfg;
-        KStyleDirs::dirs()->addToSearch( "config", cfg );
+        TDEStyleDirs::dirs()->addToSearch( "config", cfg );
 
         TQString file = cfg.readEntry( "/kthemestyle/" + key + "/file" );
         if ( !key.isEmpty() )
@@ -330,7 +330,7 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQStyleControlElementData &ceData,
             return checkbox;
         }
     }
-    return KStyle::subRect(sr, ceData, elementFlags, widget);
+    return TDEStyle::subRect(sr, ceData, elementFlags, widget);
 }
 
 int KThemeStyle::pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget ) const
@@ -515,7 +515,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
         }
     }
 
-    return KStyle::objectEventHandler(ceData, elementFlags, source, event);
+    return TDEStyle::objectEventHandler(ceData, elementFlags, source, event);
 }
 
 void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
@@ -569,7 +569,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
         {
             w->setBackgroundMode( TQWidget::NoBackground );
         }
-        else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
+        else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
         {
             w->setBackgroundMode( TQWidget::PaletteBackground );
         }
@@ -626,7 +626,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
         }
     }
 
-    KStyle::polish( ceData, elementFlags, ptr );
+    TDEStyle::polish( ceData, elementFlags, ptr );
 }
 
 void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
@@ -652,7 +652,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem
             w->setBackgroundMode( TQWidget::PaletteButton );
 
         //For toolbar internal separators, return to button, too (can't use tqqt_cast here since don't have access to the class)
-        else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
+        else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
             w->setBackgroundMode( TQWidget::PaletteButton );
 
         //For scrollbars, we don't do much, since the widget queries the style on the switch
@@ -662,7 +662,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem
          w->unsetPalette();
     }
 
-    KStyle::unPolish( ceData, elementFlags, ptr );
+    TDEStyle::unPolish( ceData, elementFlags, ptr );
 }
 
 
@@ -1831,7 +1831,7 @@ void KThemeStyle::drawControlMask( ControlElement element,
 }
 
 
-void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
                                        TQPainter* p,
                                        const TQStyleControlElementData &ceData,
                                        ControlElementFlags elementFlags,
@@ -2004,7 +2004,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
 
     if ( !handled )
     {
-        KThemeBase::drawKStylePrimitive( kpe, p, ceData, elementFlags,
+        KThemeBase::drawTDEStylePrimitive( kpe, p, ceData, elementFlags,
                                          r, cg, flags, opt, widget );
     }
 
diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h
index 457064a56..24f24e1a8 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/kstyles/kthemestyle/kthemestyle.h
@@ -72,8 +72,8 @@ public:
     /**
      * Constructs a new KThemeStyle object.
      *
-     * @param configDir The directory which has the KConfig file.
-     * @param configFile A KConfig file to use as the theme configuration.
+     * @param configDir The directory which has the TDEConfig file.
+     * @param configFile A TDEConfig file to use as the theme configuration.
      * Defaults to ~/.kderc.
      */
     KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null );
@@ -116,7 +116,7 @@ public:
                                      const TQStyleOption& = TQStyleOption::Default,
                                      const TQWidget* widget = 0 ) const;
 
-    virtual void drawKStylePrimitive( KStylePrimitive kpe,
+    virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
                                       TQPainter* p,
                                       const TQStyleControlElementData &ceData,
                                       ControlElementFlags elementFlags,
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp
index ef71e3c7f..0d343f778 100644
--- a/kstyles/light/lightstyle-v2.cpp
+++ b/kstyles/light/lightstyle-v2.cpp
@@ -67,7 +67,7 @@ static LightStyleV2Private *singleton = 0;
 
 
 LightStyleV2::LightStyleV2()
-    : KStyle(AllowMenuTransparency)
+    : TDEStyle(AllowMenuTransparency)
 {
     if (! singleton)
 	singleton = new LightStyleV2Private;
@@ -85,7 +85,7 @@ LightStyleV2::~LightStyleV2()
 
 void LightStyleV2::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-    KStyle::polishPopupMenu(ceData, elementFlags, ptr);
+    TDEStyle::polishPopupMenu(ceData, elementFlags, ptr);
 }
 
 static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg,
diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h
index 3141ad978..90b3e89c9 100644
--- a/kstyles/light/lightstyle-v2.h
+++ b/kstyles/light/lightstyle-v2.h
@@ -24,7 +24,7 @@
 #define LIGHTSTYLE_V2_H
 
 
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 #ifdef QT_PLUGIN
@@ -34,7 +34,7 @@
 #endif // QT_PLUGIN
 
 
-class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public KStyle
+class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle
 {
     Q_OBJECT
 
diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp
index bf0163029..735bd3169 100644
--- a/kstyles/light/lightstyle-v3.cpp
+++ b/kstyles/light/lightstyle-v3.cpp
@@ -45,7 +45,7 @@
 // The Light Style, 3rd revision
 
 LightStyleV3::LightStyleV3()
-    : KStyle(AllowMenuTransparency)
+    : TDEStyle(AllowMenuTransparency)
 {
     basestyle = TQStyleFactory::create( "Windows" );
     if ( ! basestyle )
@@ -61,7 +61,7 @@ LightStyleV3::~LightStyleV3()
 
 void LightStyleV3::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-    KStyle::polishPopupMenu(ceData, elementFlags, ptr);
+    TDEStyle::polishPopupMenu(ceData, elementFlags, ptr);
     // empty to satisy pure virtual requirements
 }
 
diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h
index ccda6cada..0330c8f87 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/kstyles/light/lightstyle-v3.h
@@ -28,7 +28,7 @@
 #include <tqcommonstyle.h>
 #endif // QT_H
 
-#include "kstyle.h"
+#include "tdestyle.h"
 
 #ifdef QT_PLUGIN
 #  define Q_EXPORT_STYLE_LIGHT_V3
@@ -37,7 +37,7 @@
 #endif // QT_PLUGIN
 
 
-class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public KStyle
+class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle
 {
     Q_OBJECT
     TQStyle *basestyle;
diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastikconf.cpp
index 70d4f6cfa..491f06ffa 100644
--- a/kstyles/plastik/config/plastikconf.cpp
+++ b/kstyles/plastik/config/plastikconf.cpp
@@ -30,8 +30,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqsettings.h>
 #include <tqcolor.h>
 #include <tqgroupbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <kdemacros.h>
 
@@ -41,7 +41,7 @@ extern "C"
 {
 	KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent)
 	{
-		KGlobal::locale()->insertCatalogue("kstyle_plastik_config");
+		TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config");
 		return new PlastikStyleConfig(parent);
 	}
 }
@@ -50,7 +50,7 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent)
 {
 	//Should have no margins here, the dialog provides them
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
-	KGlobal::locale()->insertCatalogue("kstyle_plastik_config");
+	TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config");
 
 // 	scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this);
 	animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this);
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index e97cf6aed..e7b6acd7f 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -20,7 +20,7 @@
    Copyright (C) 2000 Daniel M. Duley       <mosfet@kde.org>
              (C) 2000 Dirk Mueller          <mueller@kde.org>
              (C) 2001 Martijn Klingens      <klingens@kde.org>
-   Progressbar code based on KStyle,
+   Progressbar code based on TDEStyle,
    Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
 
    This library is free software; you can redistribute it and/or
@@ -151,7 +151,7 @@ class PlastikStylePlugin : public TQStylePlugin
 KDE_Q_EXPORT_PLUGIN( PlastikStylePlugin )
 // -- end --
 
-PlastikStyle::PlastikStyle() : KStyle( AllowMenuTransparency, ThreeButtonScrollBar),
+PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrollBar),
     kickerMode(false),
     kornMode(false),
     flatMode(false)
@@ -240,9 +240,9 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
     if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 	TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
-	if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...?
-		khtmlWidgets[widget] = true;
-		connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(khtmlWidgetDestroyed(TQObject*)));
+	if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
+		tdehtmlWidgets[widget] = true;
+		connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*)));
 	}
 	
 	// use tqqt_cast where possible to check if the widget inheits one of the classes. might improve
@@ -275,7 +275,7 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 	}
     }
 
-    KStyle::polish(ceData, elementFlags, ptr);
+    TDEStyle::polish(ceData, elementFlags, ptr);
 }
 
 void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
@@ -283,8 +283,8 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
     if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 	TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
-	if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...?
-		khtmlWidgets.remove(widget);
+	if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
+		tdehtmlWidgets.remove(widget);
 	}
 	
 	// use tqqt_cast to check if the widget inheits one of the classes.
@@ -311,12 +311,12 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
 	}
     }
 
-    KStyle::unPolish(ceData, elementFlags, ptr);
+    TDEStyle::unPolish(ceData, elementFlags, ptr);
 }
 
-void PlastikStyle::khtmlWidgetDestroyed(TQObject* obj)
+void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj)
 {
-    khtmlWidgets.remove(TQT_TQWIDGET(obj));
+    tdehtmlWidgets.remove(TQT_TQWIDGET(obj));
 }
 
 void PlastikStyle::progressBarDestroyed(TQObject* obj)
@@ -719,7 +719,7 @@ void PlastikStyle::renderButton(TQPainter *p,
                                bool mouseOver,
                                bool horizontal,
                                bool enabled,
-                               bool khtmlMode) const
+                               bool tdehtmlMode) const
 {
     // small fix for the kicker buttons...
     if(kickerMode) enabled = true;
@@ -728,7 +728,7 @@ void PlastikStyle::renderButton(TQPainter *p,
 
     uint contourFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom;
     if(!enabled) contourFlags|=Is_Disabled;
-    if(khtmlMode) contourFlags|=Draw_AlphaBlend;
+    if(tdehtmlMode) contourFlags|=Draw_AlphaBlend;
 
     uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom;
     if(horizontal) surfaceFlags|=Is_Horizontal;
@@ -1198,7 +1198,7 @@ void PlastikStyle::renderTab(TQPainter *p,
     }
 }
 
-void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
+void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe,
                                       TQPainter *p,
                                       const TQStyleControlElementData &ceData,
                                       ControlElementFlags elementFlags,
@@ -1373,7 +1373,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
             break;
         }
 
-    // copied and slightly modified from KStyle.
+    // copied and slightly modified from TDEStyle.
     case KPE_ListViewBranch: {
         // Typical Windows style listview branch element (dotted line).
 
@@ -1446,7 +1446,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe,
     }
 
         default:
-            KStyle::drawKStylePrimitive(kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
+            TDEStyle::drawTDEStylePrimitive(kpe, p, ceData, elementFlags, r, cg, flags, opt, widget);
     }
 }
 
@@ -1526,8 +1526,8 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
         case PE_ButtonTool:
         case PE_ButtonDropDown:
         case PE_ButtonCommand: {
-            bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget());
-            renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode );
+            bool tdehtmlMode = opt.isDefault() ? false : tdehtmlWidgets.contains(opt.widget());
+            renderButton(p, r, cg, (on||down), mouseOver, true, enabled, tdehtmlMode );
             break;
         }
 
@@ -1884,12 +1884,12 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
 
             // HACK!!
             //
-            // In order to draw nice edges in khtml, we need to paint alpha-blended.
+            // In order to draw nice edges in tdehtml, we need to paint alpha-blended.
             // On the other hand, we can't paint alpha-blended in normal widgets.
             //
-            // In this place there is no reliable way to detect if we are in khtml; the
-            // only thing we know is that khtml buffers its widgets into a pixmap. So
-            // when the paint device is a TQPixmap, chances are high that we are in khtml.
+            // In this place there is no reliable way to detect if we are in tdehtml; the
+            // only thing we know is that tdehtml buffers its widgets into a pixmap. So
+            // when the paint device is a TQPixmap, chances are high that we are in tdehtml.
             // It's possible that this breaks other things, so let's see how it works...
             if (p->device() && dynamic_cast<TQPixmap*>(p->device() ) ) {
                 contourFlags += Draw_AlphaBlend;
@@ -2175,7 +2175,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
         }
 
         default: {
-            return KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
+            return TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt);
         }
     }
 }
@@ -2375,7 +2375,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
                     renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget);
                     break;
                     default:
-                            KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+                            TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
             }
 
             break;
@@ -2734,7 +2734,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
             break;
 
         default:
-          KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
+          TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget);
     }
 }
 
@@ -2755,7 +2755,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element,
         }
 
         default: {
-            KStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
+            TDEStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w);
         }
     }
 }
@@ -2778,7 +2778,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
             break;
         }
         default: {
-            KStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
+            TDEStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w);
         }
     }
 }
@@ -2816,7 +2816,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
                                               :cg.background();
 
             uint contourFlags = 0;
-            if( khtmlWidgets.contains(cb) )
+            if( tdehtmlWidgets.contains(cb) )
                 contourFlags |= Draw_AlphaBlend;
             
             if (_inputFocusHighlight && hasFocus && editable && enabled)
@@ -3168,7 +3168,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
         }
 
         default:
-            KStyle::drawComplexControl(control, p, ceData, elementFlags,
+            TDEStyle::drawComplexControl(control, p, ceData, elementFlags,
                                         r, cg, flags, controls,
                                         active, opt, widget);
             break;
@@ -3183,7 +3183,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
             return querySubControlMetrics( CC_ComboBox, ceData, elementFlags, SC_ComboBoxEditField, TQStyleOption::Default, widget );
         }
 
-        // Don't use KStyles progressbar subrect
+        // Don't use TDEStyles progressbar subrect
         // TODO:
         case SR_ProgressBarGroove: {
             return TQRect(ceData.rect);
@@ -3195,7 +3195,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
         }
 
         default: {
-            return KStyle::subRect(r, ceData, elementFlags, widget);
+            return TDEStyle::subRect(r, ceData, elementFlags, widget);
         }
     }
 }
@@ -3216,7 +3216,7 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
                     return TQRect(r.left()+2, r.top()+2, r.width()-4-15-1, r.height()-4);
                 }
                 default: {
-                    return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
+                    return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
                 }
             }
             break;
@@ -3260,13 +3260,13 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
                     return TQRect(buttonsLeft, r.top()+1, bs.width(), r.height()-2);
                 }
                 default: {
-                    return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
+                    return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
                 }
             }
             break;
         }
         default: {
-            return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
+            return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
         }
     }
 }
@@ -3373,7 +3373,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce
             return 2;
 
         default:
-            return KStyle::pixelMetric(m, ceData, elementFlags, widget);
+            return TDEStyle::pixelMetric(m, ceData, elementFlags, widget);
     }
 }
 
@@ -3456,14 +3456,14 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
             if(widget->parent() && ::tqqt_cast<TQToolBar*>(widget->parent()) )
                 return TQSize( s.width()+2*4, s.height()+2*4 );
             else
-                return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
+                return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
         }
 
         default:
-            return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
+            return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
     }
 
-    return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
+    return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
 }
 
 int PlastikStyle::styleHint( TQ_StyleHint stylehint,
@@ -3489,13 +3489,13 @@ int PlastikStyle::styleHint( TQ_StyleHint stylehint,
 	}
 
         default:
-            return KStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget);
+            return TDEStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget);
     }
 }
 
 bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *ev )
 {
-    if (KStyle::objectEventHandler(ceData, elementFlags, source, ev) )
+    if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) )
         return true;
 
     if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index 708666a7f..68f707d79 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -18,7 +18,7 @@
    Copyright (C) 2000 Daniel M. Duley       <mosfet@kde.org>
              (C) 2000 Dirk Mueller          <mueller@kde.org>
              (C) 2001 Martijn Klingens      <klingens@kde.org>
-   Progressbar code based on KStyle,
+   Progressbar code based on TDEStyle,
    Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
 
    This library is free software; you can redistribute it and/or
@@ -39,7 +39,7 @@
 #ifndef __PLASTIK_H
 #define __PLASTIK_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqbitmap.h>
 #include <tqintcache.h>
 
@@ -54,7 +54,7 @@ class TQSettings;
 class TQTab;
 class TQTimer;
 
-class PlastikStyle : public KStyle
+class PlastikStyle : public TDEStyle
 {
     Q_OBJECT
 
@@ -66,7 +66,7 @@ public:
     void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
     void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 
-    void drawKStylePrimitive(KStylePrimitive kpe,
+    void drawTDEStylePrimitive(TDEStylePrimitive kpe,
                              TQPainter* p,
                              const TQStyleControlElementData &ceData,
                              ControlElementFlags elementFlags,
@@ -233,7 +233,7 @@ protected:
                       bool mouseOver = false,
                       bool horizontal = true,
                       bool enabled = true,
-                      bool khtmlMode = false) const;
+                      bool tdehtmlMode = false) const;
 
     void renderPanel(TQPainter *p,
                      const TQRect &r,
@@ -269,7 +269,7 @@ protected:
     virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
 protected slots:
-    void khtmlWidgetDestroyed(TQObject* w);
+    void tdehtmlWidgetDestroyed(TQObject* w);
 
     //Animation slots.
     void updateProgressPos();
@@ -300,8 +300,8 @@ private:
     TQColor _focusHighlightColor;
     TQColor _checkMarkColor;
 
-    // track khtml widgets.
-    TQMap<const TQWidget*,bool> khtmlWidgets;
+    // track tdehtml widgets.
+    TQMap<const TQWidget*,bool> tdehtmlWidgets;
 
     //Animation support.
     TQMap<TQWidget*, int> progAnimWidgets;
diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am
index 2d7fab839..84272a681 100644
--- a/kstyles/utils/installtheme/Makefile.am
+++ b/kstyles/utils/installtheme/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = 	kinstalltheme
 kinstalltheme_SOURCES = main.cpp 
 
 # the library search path. 
-kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index b9ab927cc..3ce63dfdf 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -25,10 +25,10 @@
 #include <tqstringlist.h>
 #include <tqsettings.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
@@ -37,11 +37,11 @@ static const char ver[] = "0.9.1";
 
 int main(int argc, char **argv)
 {
-    KCmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver);
-    KApplication qapp(false, false); //We don't  allow styles.. Kind of ironic, isn't it?
+    TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver);
+    TDEApplication qapp(false, false); //We don't  allow styles.. Kind of ironic, isn't it?
 
-    KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes"));
-    TQStringList themercs = KGlobal::dirs()->findAllResources("themercs","*.themerc");
+    TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("kstyle/themes"));
+    TQStringList themercs = TDEGlobal::dirs()->findAllResources("themercs","*.themerc");
 
     TQMap <TQString, TQString> themes; //Name->file mapping..
 
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
         }
     }
 
-    KSimpleConfig cache( KGlobal::dirs()->saveLocation("config")+"kthemestylerc");
+    KSimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc");
 
 #if 0
 //Doesn't seem to work with present Qt..
diff --git a/kstyles/web/plugin.cpp b/kstyles/web/plugin.cpp
index c22bb08fa..bd4371ce3 100644
--- a/kstyles/web/plugin.cpp
+++ b/kstyles/web/plugin.cpp
@@ -1,9 +1,9 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include "webstyle.h"
 
 extern "C"
 {
-  KStyle *      allocate()      { return new WebStyle; }
+  TDEStyle *      allocate()      { return new WebStyle; }
   int           minor_version() { return 0; }
   int           major_version() { return 1; }
   const char *  description()   { return(i18n("Web style plugin").utf8()); }
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index ab5282e06..b3b461954 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -32,9 +32,9 @@
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -218,7 +218,7 @@ drawFunkyRect
 }
 
 WebStyle::WebStyle()
-  : KStyle()
+  : TDEStyle()
 {
   setButtonDefaultIndicatorWidth(6);
   setScrollBarExtent(_scrollBarExtent, _scrollBarExtent);
@@ -423,7 +423,7 @@ WebStyle::drawPushButtonLabel(TQPushButton * b, TQPainter * p)
 {
   // This is complicated stuff and we don't really want to mess with it.
 
-  KStyle::drawPushButtonLabel(b, p);
+  TDEStyle::drawPushButtonLabel(b, p);
 }
 
   void
@@ -474,7 +474,7 @@ WebStyle::drawScrollBarControls
     Qt::ArrowType t =
       sb->orientation() == Horizontal ? Qt::RightArrow : Qt::DownArrow;
 
-    // Is it me or is KStyle::drawArrow broken ?
+    // Is it me or is TDEStyle::drawArrow broken ?
 
     drawArrow
       (
@@ -930,7 +930,7 @@ WebStyle::drawArrow
  const TQBrush * fill
 )
 {
-  KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, fill);
+  TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, fill);
 }
 
   void
@@ -965,7 +965,7 @@ WebStyle::drawSlider
 }
 
   void
-WebStyle::drawKToolBar
+WebStyle::drawTDEToolBar
 (
  TQPainter * p,
  int x,
@@ -973,7 +973,7 @@ WebStyle::drawKToolBar
  int w,
  int h,
  const TQColorGroup & g,
- KToolBarPos /* pos */,
+ TDEToolBarPos /* pos */,
  TQBrush * /* fill */
 )
 {
@@ -993,7 +993,7 @@ WebStyle::drawKBarHandle
  int w,
  int h,
  const TQColorGroup & g,
- KToolBarPos /* pos */,
+ TDEToolBarPos /* pos */,
  TQBrush * /* fill */
 )
 {
@@ -1025,7 +1025,7 @@ WebStyle::drawKMenuBar
 }
 
   void
-WebStyle::drawKToolBarButton
+WebStyle::drawTDEToolBarButton
 (
  TQPainter * p,
  int x,
@@ -1037,7 +1037,7 @@ WebStyle::drawKToolBarButton
  bool raised,
  bool enabled,
  bool popup,
- KToolButtonType type,
+ TDEToolButtonType type,
  const TQString & btext,
  const TQPixmap * pixmap,
  TQFont * font,
@@ -1308,7 +1308,7 @@ WebStyle::drawPopupMenuItem
 )
 {
   // TODO
-  KStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h);
+  TDEStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h);
 }
 
   void
diff --git a/kstyles/web/webstyle.h b/kstyles/web/webstyle.h
index 5cd930c73..0e4c59dbd 100644
--- a/kstyles/web/webstyle.h
+++ b/kstyles/web/webstyle.h
@@ -20,7 +20,7 @@
 #ifndef WEB_STYLE_H
 #define WEB_STYLE_H
 
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqpalette.h>
 
 class TQPainter;
@@ -28,7 +28,7 @@ class TQScrollBar;
 class TQPushButton;
 class TQWidget;
 
-class WebStyle : public KStyle
+class WebStyle : public TDEStyle
 {
   public:
 
@@ -210,7 +210,7 @@ class WebStyle : public KStyle
        bool tickBelow
       );
 
-    void drawKToolBar
+    void drawTDEToolBar
       (
        TQPainter *, 
        int x, 
@@ -218,7 +218,7 @@ class WebStyle : public KStyle
        int w, 
        int h,
        const TQColorGroup &, 
-       KToolBarPos,
+       TDEToolBarPos,
        TQBrush * fill = 0
       );
 
@@ -230,7 +230,7 @@ class WebStyle : public KStyle
        int w, 
        int h,
        const TQColorGroup &,
-       KToolBarPos, 
+       TDEToolBarPos, 
        TQBrush * fill = 0
       );
 
@@ -246,7 +246,7 @@ class WebStyle : public KStyle
        TQBrush * fill = 0
       );
 
-    void drawKToolBarButton
+    void drawTDEToolBarButton
       (
        TQPainter * p, 
        int x, 
@@ -258,7 +258,7 @@ class WebStyle : public KStyle
        bool raised = true, 
        bool enabled = true,
        bool popup = false,
-       KToolButtonType = Icon,
+       TDEToolButtonType = Icon,
        const TQString & btext = TQString::null,
        const TQPixmap * = 0,
        TQFont * = 0,
diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am
deleted file mode 100644
index 9ce5040d7..000000000
--- a/kunittest/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-INCLUDES = $(all_includes)
-METASOURCES = AUTO
-
-lib_LTLIBRARIES = libkunittest.la
-libkunittest_la_SOURCES = runner.cpp tester.cpp
-libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
-libkunittest_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
-
-libkunittestinclude_HEADERS = runner.h tester.h module.h
-libkunittestincludedir = $(includedir)/kunittest
-
-bin_PROGRAMS = kunittestmodrunner
-kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kunittestmodrunner_LDADD = libkunittest.la $(LIB_TDECORE)
-kunittestmodrunner_SOURCES = modrunner.cpp
-
-# The check_ target makes sure we don't install the modules,
-# $(KDE_CHECK_PLUGIN) assures a shared library is created.
-check_LTLIBRARIES = kunittest_samplemodule.la
-kunittest_samplemodule_la_SOURCES = samplemodule.cpp
-kunittest_samplemodule_la_LIBADD = libkunittest.la
-kunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
-
-check-local:
-	./kunittestmodrunner
-
-include ../admin/Doxyfile.am
diff --git a/kutils/Makefile.am b/kutils/Makefile.am
deleted file mode 100644
index d8ebcf156..000000000
--- a/kutils/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-SUBDIRS = ksettings .
-INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
-
-lib_LTLIBRARIES   = libkutils.la
-libkutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-# Needs KTrader
-libkutils_la_LIBADD  = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
-
-libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
-                       kreplacedialog.cpp kcmoduleinfo.cpp kcmoduleloader.cpp \
-                       kcmultidialog.cpp kmultitabbar.cpp kplugininfo.cpp \
-                       kcmoduleproxy.cpp kpluginselector.cpp \
-                       kcmodulecontainer.cpp kcmoduleproxyIface.skel \
-                       kcmoduleproxyIfaceImpl.cpp
-
-include_HEADERS = kfind.h kfinddialog.h kreplace.h kreplacedialog.h \
-                  kcmoduleinfo.h kcmoduleloader.h kcmultidialog.h \
-                  kmultitabbar.h kplugininfo.h kcmoduleproxy.h \
-                  kpluginselector.h kcmodulecontainer.h
-
-noinst_HEADERS = kmultitabbar_p.h kpluginselector_p.h \
-                 kcmoduleproxyIface.h kcmoduleproxyIfaceImpl.h
-
-kde_servicetypes_DATA = kplugininfo.desktop
-
-METASOURCES = AUTO
-
-DOXYGEN_REFERENCES = tdecore tdeui kio
-include ../admin/Doxyfile.am
-
-# vim: et
diff --git a/kwallet/backend/Makefile.am b/kwallet/backend/Makefile.am
deleted file mode 100644
index f07c72df9..000000000
--- a/kwallet/backend/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-INCLUDES = -I$(srcdir)/../client $(all_includes)
-
-lib_LTLIBRARIES = libkwalletbackend.la
-
-libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
-libkwalletbackend_la_LIBADD = $(LIB_QT) ../../tdecore/libtdecore.la
-libkwalletbackend_la_SOURCES = blockcipher.cc		\
-			       blowfish.cc		\
-			       cbc.cc			\
-			       sha1.cc			\
-			       kwalletentry.cc		\
-			       kwalletbackend.cc
-
-
-libkwalletbackend_la_METASOURCES = AUTO
-
-noinst_HEADERS = blowfishtables.h	\
-		 cbc.h			\
-		 sha1.h			\
-		 blockcipher.h		\
-		 kwalletentry.h		\
-		 kwalletbackend.h	\
-		 blowfish.h
-
diff --git a/kwallet/client/Makefile.am b/kwallet/client/Makefile.am
deleted file mode 100644
index 8ea320dc7..000000000
--- a/kwallet/client/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-INCLUDES= -I$(srcdir) $(all_includes)
-
-lib_LTLIBRARIES = libkwalletclient.la
-
-libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
-libkwalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
-libkwalletclient_la_SOURCES =   kwallet.skel \
-				kwallet.cc
-
-libkwalletclient_la_METASOURCES = AUTO
-
-include_HEADERS = kwallet.h kwallettypes.h
-
diff --git a/kwallet/tests/Makefile.am b/kwallet/tests/Makefile.am
deleted file mode 100644
index d3d9ecb99..000000000
--- a/kwallet/tests/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
-
-METASOURCES = AUTO
-check_PROGRAMS = kwalletasync kwalletsync kwalletboth
-
-kwalletasync_SOURCES = kwalletasync.cpp kwallettest.cpp
-kwalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletasync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-
-kwalletsync_SOURCES = kwalletsync.cpp
-kwalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletsync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-
-kwalletboth_SOURCES = kwalletboth.cpp kwallettest.cpp
-kwalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletboth_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-INCLUDES = -I$(top_srcdir)/kwallet/client
diff --git a/kwallet/tests/README b/kwallet/tests/README
deleted file mode 100644
index 73c3ad1db..000000000
--- a/kwallet/tests/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Tests for opening the wallet synchronously and asynchronously
-
-kwalletsync - open synchronously
-kwalletasync - open asynchronously
-kwalletboth - start opening asynchronously, then, during the async call, open synchronously
diff --git a/kwallet/tests/kwallettest.cpp b/kwallet/tests/kwallettest.cpp
deleted file mode 100644
index a17644cfb..000000000
--- a/kwallet/tests/kwallettest.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kwallettest.h"
-#include "kwallettest.moc"
diff --git a/libkscreensaver/Makefile.am b/libkscreensaver/Makefile.am
deleted file mode 100644
index 36e5b999b..000000000
--- a/libkscreensaver/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-lib_LTLIBRARIES = libkscreensaver.la
-libkscreensaver_la_SOURCES = main.cpp kscreensaver.cpp
-libkscreensaver_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
-if undefined_symbols_allowed
-libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
-else
-libkscreensaver_la_LDFLAGS = $(all_libraries) -static
-endif 
-
-include_HEADERS = kscreensaver.h kscreensaver_vroot.h
-
-INCLUDES = $(all_includes)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/libkscreensaver.pot 
-
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/libkmid/CMakeLists.txt b/libtdemid/CMakeLists.txt
index d0bc35d84..bc9fdb416 100644
--- a/libkmid/CMakeLists.txt
+++ b/libtdemid/CMakeLists.txt
@@ -28,19 +28,19 @@ install( FILES
     midiout.h player.h track.h midimapper.h midfile.h
     dattypes.h midistat.h deviceman.h synthout.h
     fmout.h gusout.h alsaout.h voiceman.h notearray.h
-    mt32togm.h midispec.h libkmid.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/libkmid )
+    mt32togm.h midispec.h libtdemid.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libtdemid )
 
 
-##### kmid ######################################
+##### tdemid ######################################
 
-set( target kmid )
+set( target tdemid )
 
 set( ${target}_SRCS
   midiout.cc player.cc track.cc midimapper.cc
   midfile.cc dattypes.cc midistat.cc deviceman.cc
   synthout.cc fmout.cc gusout.cc alsaout.cc voiceman.cc
-  mt32togm.cc notearray.cc libkmid.cc
+  mt32togm.cc notearray.cc libtdemid.cc
 )
 
 tde_add_library( ${target} SHARED
diff --git a/libkmid/Makefile.am b/libtdemid/Makefile.am
index 507b7381e..9616de31f 100644
--- a/libkmid/Makefile.am
+++ b/libtdemid/Makefile.am
@@ -5,20 +5,20 @@ INCLUDES =  -I$(srcdir)/.. $(all_includes)
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 
-libkmidincludedir = $(includedir)/libkmid
-libkmidinclude_HEADERS = midiout.h player.h track.h midimapper.h \
+libtdemidincludedir = $(includedir)/libtdemid
+libtdemidinclude_HEADERS = midiout.h player.h track.h midimapper.h \
 	midfile.h dattypes.h midistat.h deviceman.h synthout.h \
 	fmout.h gusout.h alsaout.h voiceman.h notearray.h mt32togm.h \
-	midispec.h libkmid.h
+	midispec.h libtdemid.h
 
-lib_LTLIBRARIES = libkmid.la
-libkmid_la_SOURCES  = midiout.cc player.cc track.cc midimapper.cc \
+lib_LTLIBRARIES = libtdemid.la
+libtdemid_la_SOURCES  = midiout.cc player.cc track.cc midimapper.cc \
 	midfile.cc dattypes.cc midistat.cc deviceman.cc synthout.cc \
 	fmout.cc gusout.cc alsaout.cc voiceman.cc mt32togm.cc notearray.cc \
-	libkmid.cc
+	libtdemid.cc
 
-libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
-libkmid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT)
+libtdemid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
+libtdemid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT)
 
 DOXYGEN_REFERENCES = tdecore
 include ../admin/Doxyfile.am
diff --git a/libkmid/alsaout.cc b/libtdemid/alsaout.cc
index 4c7f48f4e..517852b25 100644
--- a/libkmid/alsaout.cc
+++ b/libtdemid/alsaout.cc
@@ -3,7 +3,7 @@
     alsaout.cc   - class AlsaOut which represents an alsa client/port pair
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/alsaout.h b/libtdemid/alsaout.h
index fd4a46579..016ca29c6 100644
--- a/libkmid/alsaout.h
+++ b/libtdemid/alsaout.h
@@ -1,7 +1,7 @@
 /*  alsaout.cc   - class AlsaOut which represents an alsa client/port pair
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
 #ifndef _ALSAOUT_H
 #define _ALSAOUT_H
 
-#include <libkmid/midiout.h>
+#include <libtdemid/midiout.h>
 
 struct snd_seq_event;
 typedef struct snd_seq_event snd_seq_event_t;
diff --git a/libkmid/awe_sup.h b/libtdemid/awe_sup.h
index 5602cf15f..5e649736c 100644
--- a/libkmid/awe_sup.h
+++ b/libtdemid/awe_sup.h
@@ -1,7 +1,7 @@
 /*  awe_sup.h  - A wrapper on awe_voice.h
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/configure.in.in b/libtdemid/configure.in.in
index 7500e3455..d8a5f391e 100644
--- a/libkmid/configure.in.in
+++ b/libtdemid/configure.in.in
@@ -1,7 +1,7 @@
-dnl libkmid's specific checks
+dnl libtdemid's specific checks
 
-#AC_MSG_CHECKING(if libkmid would compile)
-#AC_CACHE_VAL(kde_libkmid_compiles,
+#AC_MSG_CHECKING(if libtdemid would compile)
+#AC_CACHE_VAL(kde_libtdemid_compiles,
 #[
 #AC_TRY_COMPILE([
 ##ifndef __FreeBSD__
@@ -17,7 +17,7 @@ dnl libkmid's specific checks
 #])
 #AC_MSG_RESULT($kde_libmid_compiles)
 #if test $kde_libmid_compiles = no; then
-#  DO_NOT_COMPILE="$DO_NOT_COMPILE libkmid"
+#  DO_NOT_COMPILE="$DO_NOT_COMPILE libtdemid"
 #fi
 
 #AC_MSG_CHECKING([for OSS support])
diff --git a/libkmid/dattypes.cc b/libtdemid/dattypes.cc
index 821abd00a..218591fa4 100644
--- a/libkmid/dattypes.cc
+++ b/libtdemid/dattypes.cc
@@ -3,7 +3,7 @@
     dattypes.cc  - Some always useful definitions and functions
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/dattypes.h b/libtdemid/dattypes.h
index 0e647980f..e2d9d0a89 100644
--- a/libkmid/dattypes.h
+++ b/libtdemid/dattypes.h
@@ -1,7 +1,7 @@
 /*  dattypes.h  - Some useful definitions and functions 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html                                         
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html                                         
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
diff --git a/libkmid/deviceman.cc b/libtdemid/deviceman.cc
index c8030f44e..fec0ff090 100644
--- a/libkmid/deviceman.cc
+++ b/libtdemid/deviceman.cc
@@ -3,7 +3,7 @@
     deviceman.cc  - The device manager, that hides the use of midiOut
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -67,8 +67,8 @@
 
 #if 1
 #include <kinstance.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #endif
 
 //#define DEVICEMANDEBUG
@@ -108,9 +108,9 @@ DeviceManager::DeviceManager(int def)
 #if 1
   if (def==-1)
   {
-    KInstance *tmp_instance=0L;
-    if (!KGlobal::_instance) tmp_instance=new KInstance("nonKDEapp");
-    KConfig *config = new KConfig("kcmmidirc", true);
+    TDEInstance *tmp_instance=0L;
+    if (!TDEGlobal::_instance) tmp_instance=new TDEInstance("nonKDEapp");
+    TDEConfig *config = new TDEConfig("kcmmidirc", true);
 
     config->setGroup("Configuration");
     default_dev=config->readNumEntry("midiDevice",0);
diff --git a/libkmid/deviceman.h b/libtdemid/deviceman.h
index 8bd0728a6..40788ad34 100644
--- a/libkmid/deviceman.h
+++ b/libtdemid/deviceman.h
@@ -1,7 +1,7 @@
 /*  deviceman.h  - The device manager, that hides the use of midiOut
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ -23,7 +23,7 @@
 #ifndef DEVICEMAN_H
 #define DEVICEMAN_H
 
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 #include <tdelibs_export.h>
 
 class MidiOut;
diff --git a/libkmid/fmout.cc b/libtdemid/fmout.cc
index bce421f81..72b3198c9 100644
--- a/libkmid/fmout.cc
+++ b/libtdemid/fmout.cc
@@ -4,7 +4,7 @@
 			for fm synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/fmout.h b/libtdemid/fmout.h
index 328ca5626..1a1cf6215 100644
--- a/libkmid/fmout.h
+++ b/libtdemid/fmout.h
@@ -2,7 +2,7 @@
 			for FM synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html                                         
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html                                         
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ -24,8 +24,8 @@
 #ifndef _FMOUT_H
 #define _FMOUT_H
 
-#include <libkmid/midiout.h>
-#include <libkmid/voiceman.h>
+#include <libtdemid/midiout.h>
+#include <libtdemid/voiceman.h>
 
 /**
  * FM device output class . FMOut is used to send MIDI events to 
diff --git a/libkmid/gusout.cc b/libtdemid/gusout.cc
index 6b207956b..69aae3927 100644
--- a/libkmid/gusout.cc
+++ b/libtdemid/gusout.cc
@@ -4,7 +4,7 @@
          Ultrasound cards through a /dev/sequencer device
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/gusout.h b/libtdemid/gusout.h
index 1fd8a3cbd..c3eb409dd 100644
--- a/libkmid/gusout.h
+++ b/libtdemid/gusout.h
@@ -2,7 +2,7 @@
          Ultrasound cards through a /dev/sequencer device
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -25,8 +25,8 @@
 #ifndef _GUSOUT_H
 #define _GUSOUT_H
 
-#include <libkmid/midiout.h>
-#include <libkmid/voiceman.h>
+#include <libtdemid/midiout.h>
+#include <libtdemid/voiceman.h>
 
 /**
  * Gravis Ultrasound synthesizer output class . This class is used to send midi
diff --git a/libkmid/gusvoices.h b/libtdemid/gusvoices.h
index da364eb18..1b818c15f 100644
--- a/libkmid/gusvoices.h
+++ b/libtdemid/gusvoices.h
@@ -1,7 +1,7 @@
 /*  gusvoices.h  - struct with Gravis Ultrasound patches' names
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/libkmid.cc b/libtdemid/libtdemid.cc
index 59e96ad0f..04a0dac0d 100644
--- a/libkmid/libkmid.cc
+++ b/libtdemid/libtdemid.cc
@@ -1,10 +1,10 @@
 /**************************************************************************
  
-    libkmid.cc  - class KMidSimpleAPI that makes it easy to use libkmid
+    libtdemid.cc  - class KMidSimpleAPI that makes it easy to use libtdemid
                         and a C wrapper.
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
  
 ***************************************************************************/ 
 
-#include "libkmid.h"
+#include "libtdemid.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
diff --git a/libkmid/libkmid.h b/libtdemid/libtdemid.h
index 53f765093..7d7c2f239 100644
--- a/libkmid/libkmid.h
+++ b/libtdemid/libtdemid.h
@@ -1,8 +1,8 @@
-/*  libkmid.h     - class KMidSimpleAPI that makes it easy to use libkmid
+/*  libtdemid.h     - class KMidSimpleAPI that makes it easy to use libtdemid
 			and a C wrapper.
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -30,7 +30,7 @@
 #include <tdelibs_export.h>
 
 /**
- * Simple API covering most of the uses of libkmid.
+ * Simple API covering most of the uses of libtdemid.
  *
  * You can use the members of this class in pure C applications, just by using
  * the same name as the corresponding function member. 
@@ -47,9 +47,9 @@
  * @li kMidStop();
  * @li kMidDestruct();
  *
- * to stop the music and release the memory allocated by libkmid.
+ * to stop the music and release the memory allocated by libtdemid.
  *
- * @short A very simple API around the rest of libkmid.
+ * @short A very simple API around the rest of libtdemid.
  * @version 0.9.5 17/01/2000
  * @author Antonio Larrosa Jimenez <larrosa@kde.org> 
  */
@@ -62,7 +62,7 @@ class KMID_EXPORT KMidSimpleAPI
   public:
 
     /**
-     * Initializes libkmid. Creates the DeviceManager object, and initializes
+     * Initializes libtdemid. Creates the DeviceManager object, and initializes
      * some variables that will be used later.
      *
      * @return 0 if OK, and a positive number when there's any error (for
@@ -102,7 +102,7 @@ class KMID_EXPORT KMidSimpleAPI
     static int kMidStop(void);
 
     /**
-     * Releases the memory allocated by libkmid. To continue playing, you must
+     * Releases the memory allocated by libtdemid. To continue playing, you must
      * first make a(nother) call to kMidInit().
      */
     static void kMidDestruct(void);
@@ -123,7 +123,7 @@ class KMID_EXPORT KMidSimpleAPI
     static int kMidDevices(void);
 
     /**
-     * Returns the name of the i-th device . In case libkmid wasn't yet
+     * Returns the name of the i-th device . In case libtdemid wasn't yet
      * initialized ( see kMidInit() ), the return value is NULL, and in
      * case the parameter has a value out of the valid range 
      * ( see kMidDevices() ) it returns an empty string.
@@ -134,7 +134,7 @@ class KMID_EXPORT KMidSimpleAPI
     static const char *kMidName(int i);
 
     /**
-     * Returns the type of the i-th device . In case libkmid wasn't yet
+     * Returns the type of the i-th device . In case libtdemid wasn't yet
      * initialized ( see kMidInit() ), the return value is NULL, and in
      * case the parameter has a value out of the valid range 
      * ( see kMidDevices() ) it returns an empty string.
@@ -164,12 +164,12 @@ class KMID_EXPORT KMidSimpleAPI
     static void kMidSetMidiMapper(const char *mapfilename);
 
     /**
-     * Returns the version number of libkmid, i.e. "0.9.5" or "1.0 Beta"
+     * Returns the version number of libtdemid, i.e. "0.9.5" or "1.0 Beta"
      */
     static const char *kMidVersion(void);
 
     /**
-     * Returns the copyright notice that applications using libkmid should print
+     * Returns the copyright notice that applications using libtdemid should print
      * to the user in an about box or somewhere visible.
      * I.e. 
      *
diff --git a/libkmid/midfile.cc b/libtdemid/midfile.cc
index 0e804e4e3..f8222b3f8 100644
--- a/libkmid/midfile.cc
+++ b/libtdemid/midfile.cc
@@ -3,7 +3,7 @@
     midfile.cc - function which reads a midi file,and creates the track classes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -54,7 +54,7 @@ double metronomeTempoToTempo(ulong x)
 int uncompressFile(const char *gzname, char *tmpname)
   // Returns 0 if OK, 1 if error (tmpname not set)
 {
-  TQString cmd("gzip -dc " + KProcess::quote(gzname));
+  TQString cmd("gzip -dc " + TDEProcess::quote(gzname));
   FILE *infile = popen( TQFile::encodeName(cmd).data(), "r");
   if (infile==NULL) {
     fprintf(stderr,"ERROR : popen failed : %s\n",TQFile::encodeName(cmd).data());
diff --git a/libkmid/midfile.h b/libtdemid/midfile.h
index 18687b25c..0791ff0fa 100644
--- a/libkmid/midfile.h
+++ b/libtdemid/midfile.h
@@ -1,7 +1,7 @@
 /*  midfile.h  - function which reads a midi file,and creates the track classes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,8 +24,8 @@
 #ifndef _MIDFILE_H
 #define _MIDFILE_H
 
-#include <libkmid/dattypes.h>
-#include <libkmid/track.h>
+#include <libtdemid/dattypes.h>
+#include <libtdemid/track.h>
 #include <stdio.h>
 #include <tdelibs_export.h>
 
diff --git a/libkmid/midimapper.cc b/libtdemid/midimapper.cc
index 0b8022b8e..837728410 100644
--- a/libkmid/midimapper.cc
+++ b/libtdemid/midimapper.cc
@@ -3,7 +3,7 @@
     midimapper.cc  - The midi mapper object  
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midimapper.h b/libtdemid/midimapper.h
index 0edefdeec..59fe9f1b5 100644
--- a/libkmid/midimapper.h
+++ b/libtdemid/midimapper.h
@@ -1,7 +1,7 @@
 /*  midimapper.h  - The midi mapper object
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
 #define _MIDIMAPPER_H
 
 #include <stdio.h>
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 #include <tdelibs_export.h>
 
 #define KM_NAME_SIZE 30
@@ -40,7 +40,7 @@
  * as if the synthesizer was GM compatible.
  *
  * Please see the KMid documentation 
- * ( http://www.arrakis.es/~rlarrosa/kmid.html ) for information on the
+ * ( http://www.arrakis.es/~rlarrosa/tdemid.html ) for information on the
  * format of a MIDI mapper definition file, and how they work.
  * 
  * I created this class because I had one of those non-GM keyboards, 
diff --git a/libkmid/midiout.cc b/libtdemid/midiout.cc
index e4a03a405..24a209cce 100644
--- a/libkmid/midiout.cc
+++ b/libtdemid/midiout.cc
@@ -3,7 +3,7 @@
     midiout.cc   - class midiOut which handles external midi devices
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midiout.h b/libtdemid/midiout.h
index 93bbfff8c..046d78a31 100644
--- a/libkmid/midiout.h
+++ b/libtdemid/midiout.h
@@ -1,7 +1,7 @@
 /*  midiout.h	- class midiOut which handles the /dev/sequencer device
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,9 +24,9 @@
 #ifndef _MIDIOUT_H
 #define _MIDIOUT_H
 
-#include <libkmid/dattypes.h>
-#include <libkmid/deviceman.h>
-#include <libkmid/midimapper.h>
+#include <libtdemid/dattypes.h>
+#include <libtdemid/deviceman.h>
+#include <libtdemid/midimapper.h>
 #include <stdio.h>
 
 /**
diff --git a/libkmid/midispec.h b/libtdemid/midispec.h
index 3f60d49f2..63ca41a9d 100644
--- a/libkmid/midispec.h
+++ b/libtdemid/midispec.h
@@ -1,7 +1,7 @@
 /*  midispec.h  - Some definitions to make the code more readable 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midistat.cc b/libtdemid/midistat.cc
index 29d1436c8..6a6c94b0c 100644
--- a/libkmid/midistat.cc
+++ b/libtdemid/midistat.cc
@@ -3,7 +3,7 @@
     midistat.cc	- class MidiStatus, change it internally and then send it. 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/midistat.h b/libtdemid/midistat.h
index 17dda1269..5078f3733 100644
--- a/libkmid/midistat.h
+++ b/libtdemid/midistat.h
@@ -1,7 +1,7 @@
 /*  midistat.h	- class midiStat, change it internally and then send it. 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
 #ifndef _MIDISTAT_H
 #define _MIDISTAT_H
 
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 
 /**
  * Stores the status of a MIDI device . That is, current patch in each channel,
diff --git a/libkmid/mt32togm.cc b/libtdemid/mt32togm.cc
index a59eb959c..a59eb959c 100644
--- a/libkmid/mt32togm.cc
+++ b/libtdemid/mt32togm.cc
diff --git a/libkmid/mt32togm.h b/libtdemid/mt32togm.h
index 74fb27875..fe7dec3c2 100644
--- a/libkmid/mt32togm.h
+++ b/libtdemid/mt32togm.h
@@ -1,7 +1,7 @@
 /*  mt32togm.h  - the translation map from MT32 patches to GM patches 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/notearray.cc b/libtdemid/notearray.cc
index 70652f16e..9899fd837 100644
--- a/libkmid/notearray.cc
+++ b/libtdemid/notearray.cc
@@ -3,7 +3,7 @@
     notearray.cc  - NoteArray class, which holds an array of notes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/notearray.h b/libtdemid/notearray.h
index b09e0dd1a..833fe4987 100644
--- a/libkmid/notearray.h
+++ b/libtdemid/notearray.h
@@ -1,7 +1,7 @@
 /*  notearray.h  - NoteArray class, which holds an array of notes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,7 +24,7 @@
 #ifndef NOTEARRAY_H
 #define NOTEARRAY_H
 
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 #include <tdelibs_export.h>
 
 /**
diff --git a/libkmid/player.cc b/libtdemid/player.cc
index a68a9b147..ff7093496 100644
--- a/libkmid/player.cc
+++ b/libtdemid/player.cc
@@ -3,7 +3,7 @@
     player.cc  - class MidiPlayer. Plays a set of tracks
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html            
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/player.h b/libtdemid/player.h
index 6a9210292..ae33de849 100644
--- a/libkmid/player.h
+++ b/libtdemid/player.h
@@ -1,7 +1,7 @@
 /*  player.h  - class MidiPlayer. Plays a set of tracks
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -24,11 +24,11 @@
 #ifndef _PLAYER_H
 #define _PLAYER_H
 
-#include <libkmid/dattypes.h>
-#include <libkmid/midfile.h>
-#include <libkmid/deviceman.h>
-#include <libkmid/track.h>
-#include <libkmid/notearray.h>
+#include <libtdemid/dattypes.h>
+#include <libtdemid/midfile.h>
+#include <libtdemid/deviceman.h>
+#include <libtdemid/track.h>
+#include <libtdemid/notearray.h>
 #include <kdemacros.h>
 
 /**
@@ -249,7 +249,7 @@ struct PlayerController
  *
  * Alternatively, if everything you want is to play a midi file in a game or
  * any other application that doesn't need to fine tune the midi playing, just
- * use the kmidplay() function.
+ * use the tdemidplay() function.
  *
  * @see KMidSimpleAPI
  *
diff --git a/libkmid/sndcard.h b/libtdemid/sndcard.h
index c533451ed..e6eab5255 100644
--- a/libkmid/sndcard.h
+++ b/libtdemid/sndcard.h
@@ -1,7 +1,7 @@
 /*  sndcard.h  - include the OSS' soundcard.h file
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
  
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/synthout.cc b/libtdemid/synthout.cc
index 069bbd32f..6d7ef47a1 100644
--- a/libkmid/synthout.cc
+++ b/libtdemid/synthout.cc
@@ -5,7 +5,7 @@
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98  Antonio Larrosa Jimenez and P.J.Leonard
                   1999,2000 Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/synthout.h b/libtdemid/synthout.h
index 4d34336ee..db1f507f1 100644
--- a/libkmid/synthout.h
+++ b/libtdemid/synthout.h
@@ -3,7 +3,7 @@
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98  Antonio Larrosa Jimenez and P.J.Leonard
 		  1999,2000 Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html                                         
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html                                         
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ -25,7 +25,7 @@
 #ifndef _SYNTHOUT_H
 #define _SYNTHOUT_H
 
-#include <libkmid/midiout.h>
+#include <libtdemid/midiout.h>
 
 /**
  * Synth (AWE) device output class . SynthOut is used to send MIDI events to
diff --git a/libkmid/tests/Kathzy.mid b/libtdemid/tests/Kathzy.mid
index f3a857fba..f3a857fba 100644
--- a/libkmid/tests/Kathzy.mid
+++ b/libtdemid/tests/Kathzy.mid
diff --git a/libkmid/tests/Makefile.am b/libtdemid/tests/Makefile.am
index 58bf5d58b..a00018c62 100644
--- a/libkmid/tests/Makefile.am
+++ b/libtdemid/tests/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
 noinst_PROGRAMS = ctest apitest notesoff
 
 ctest_SOURCES = ctest.c
-ctest_LDADD = ../libkmid.la
+ctest_LDADD = ../libtdemid.la
 
 apitest_SOURCES = apitest.cc
-apitest_LDADD = ../libkmid.la
+apitest_LDADD = ../libtdemid.la
 
 notesoff_SOURCES = notesoff.cc
-notesoff_LDADD = ../libkmid.la
+notesoff_LDADD = ../libtdemid.la
 
diff --git a/libkmid/tests/apitest.cc b/libtdemid/tests/apitest.cc
index 308fe2957..7f370331e 100644
--- a/libkmid/tests/apitest.cc
+++ b/libtdemid/tests/apitest.cc
@@ -1,11 +1,11 @@
-#include <libkmid/libkmid.h>
+#include <libtdemid/libtdemid.h>
 #include <unistd.h>
 #include <stdio.h>
 
 int main (int , char **)
 {
-  printf("Libkmid test2 . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
-  printf("Using libkmid from a simple C++ application\n");
+  printf("Libtdemid test2 . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
+  printf("Using libtdemid from a simple C++ application\n");
 
   KMidSimpleAPI::kMidInit();
   KMidSimpleAPI::kMidLoad("Kathzy.mid");
diff --git a/libkmid/tests/ctest.c b/libtdemid/tests/ctest.c
index 6e427a2c7..0e7d25884 100644
--- a/libkmid/tests/ctest.c
+++ b/libtdemid/tests/ctest.c
@@ -1,4 +1,4 @@
-#include <libkmid/libkmid.h>
+#include <libtdemid/libtdemid.h>
 #include <unistd.h>
 #include <stdio.h>
 
@@ -7,12 +7,12 @@ int main (int argc, char **argv)
   int i;
   char c;
 
-  printf("Test1 %s. Using libkmid from a simple C application\n",kMidVersion());
+  printf("Test1 %s. Using libtdemid from a simple C application\n",kMidVersion());
   printf("%s\n",kMidCopyright());
 
   if (kMidInit()!=0) 
   {
-    printf("Error initializing libkmid\n");
+    printf("Error initializing libtdemid\n");
     return 0;
   }
 
diff --git a/libkmid/tests/notesoff.cc b/libtdemid/tests/notesoff.cc
index 15cbb7f73..15e00bd6c 100644
--- a/libkmid/tests/notesoff.cc
+++ b/libtdemid/tests/notesoff.cc
@@ -1,12 +1,12 @@
-#include <libkmid/libkmid.h>
-#include <libkmid/deviceman.h>
+#include <libtdemid/libtdemid.h>
+#include <libtdemid/deviceman.h>
 #include <unistd.h>
 #include <stdio.h>
 
 int main (int , char **)
 {
-  printf("Libkmid Notes Off . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
-  printf("Using libkmid from a simple C++ application\n");
+  printf("Libtdemid Notes Off . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
+  printf("Using libtdemid from a simple C++ application\n");
 
   KMidSimpleAPI::kMidInit();
 
diff --git a/libkmid/track.cc b/libtdemid/track.cc
index ccaaf69d2..c7c858919 100644
--- a/libkmid/track.cc
+++ b/libtdemid/track.cc
@@ -3,7 +3,7 @@
     track.cc  - class track, which has a midi file track and its events
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/track.h b/libtdemid/track.h
index 073fc9825..96a1e77d5 100644
--- a/libkmid/track.h
+++ b/libtdemid/track.h
@@ -1,7 +1,7 @@
 /*  track.h  - class track, which has a midi file track and its events
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -25,7 +25,7 @@
 #define _TRACK_H
 
 #include <stdio.h>
-#include <libkmid/dattypes.h>
+#include <libtdemid/dattypes.h>
 
 /**
  * An structure that represents a MIDI event.
diff --git a/libkmid/voiceman.cc b/libtdemid/voiceman.cc
index 8e7863720..867ee6024 100644
--- a/libkmid/voiceman.cc
+++ b/libtdemid/voiceman.cc
@@ -3,7 +3,7 @@
     voiceman.cc - The VoiceManager class handles a set of voices for synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkmid/voiceman.h b/libtdemid/voiceman.h
index 79dee9d3d..42b67434b 100644
--- a/libkmid/voiceman.h
+++ b/libtdemid/voiceman.h
@@ -1,7 +1,7 @@
 /*  voiceman.h - The VoiceManager class handles a set of voices for synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
-    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html
+    LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkscreensaver/CMakeLists.txt b/libtdescreensaver/CMakeLists.txt
index 472f8a834..8cfc6ba7d 100644
--- a/libkscreensaver/CMakeLists.txt
+++ b/libtdescreensaver/CMakeLists.txt
@@ -27,16 +27,16 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kscreensaver.h kscreensaver_vroot.h
+    tdescreensaver.h tdescreensaver_vroot.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### kscreensaver ##############################
+##### tdescreensaver ##############################
 
-set( target kscreensaver )
+set( target tdescreensaver )
 
 set( ${target}_SRCS
-  main.cpp kscreensaver.cpp
+  main.cpp tdescreensaver.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/libtdescreensaver/Makefile.am b/libtdescreensaver/Makefile.am
new file mode 100644
index 000000000..8f7a6104a
--- /dev/null
+++ b/libtdescreensaver/Makefile.am
@@ -0,0 +1,18 @@
+lib_LTLIBRARIES = libtdescreensaver.la
+libtdescreensaver_la_SOURCES = main.cpp tdescreensaver.cpp
+libtdescreensaver_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
+if undefined_symbols_allowed
+libtdescreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
+else
+libtdescreensaver_la_LDFLAGS = $(all_libraries) -static
+endif 
+
+include_HEADERS = tdescreensaver.h tdescreensaver_vroot.h
+
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp *.h -o $(podir)/libtdescreensaver.pot 
+
+include $(top_srcdir)/admin/Doxyfile.am
diff --git a/libkscreensaver/configure.in.in b/libtdescreensaver/configure.in.in
index 1777b1e98..1777b1e98 100644
--- a/libkscreensaver/configure.in.in
+++ b/libtdescreensaver/configure.in.in
diff --git a/libkscreensaver/main.cpp b/libtdescreensaver/main.cpp
index 0ff7c0a1b..073d7845d 100644
--- a/libkscreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -24,15 +24,15 @@
 #include <signal.h>
 
 #include <tqdialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kcrash.h>
 
-#include "kscreensaver.h"
-#include "kscreensaver_vroot.h"
+#include "tdescreensaver.h"
+#include "tdescreensaver_vroot.h"
 
 extern "C"
 {
@@ -43,13 +43,13 @@ extern "C"
     TQDialog *kss_setup();
 }
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "setup", I18N_NOOP("Setup screen saver"), 0 },
   { "window-id wid", I18N_NOOP("Run in the specified XWindow"), 0 },
   { "root", I18N_NOOP("Run in the root XWindow"), 0 },
   { "demo", I18N_NOOP("Start screen saver in demo mode"), "default"},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 static void crashHandler( int  )
@@ -93,22 +93,22 @@ typedef WId Window;
 
 KDE_EXPORT int main(int argc, char *argv[])
 {
-    KLocale::setMainCatalogue("libkscreensaver");
-    KCmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version);
+    TDELocale::setMainCatalogue("libtdescreensaver");
+    TDECmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version);
 
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication app;
+    TDEApplication app;
 
-    KCrash::setCrashHandler( crashHandler );
-    KGlobal::locale()->insertCatalogue("klock");
-    KGlobal::locale()->insertCatalogue("kscreensaver");
+    TDECrash::setCrashHandler( crashHandler );
+    TDEGlobal::locale()->insertCatalogue("klock");
+    TDEGlobal::locale()->insertCatalogue("tdescreensaver");
 
     DemoWindow *demoWidget = 0;
     Window saveWin = 0;
     KScreenSaver *target;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if (args->isSet("setup"))
     {
diff --git a/libkscreensaver/kscreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp
index 4c7b343cb..30120b164 100644
--- a/libkscreensaver/kscreensaver.cpp
+++ b/libtdescreensaver/tdescreensaver.cpp
@@ -20,8 +20,8 @@
 
 #include <tqpainter.h>
 #include <tqtimer.h>
-#include <kapplication.h>
-#include "kscreensaver.h"
+#include <tdeapplication.h>
+#include "tdescreensaver.h"
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
 #else
@@ -67,7 +67,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget()
     if ( w == 0 ) w = 600;
     if ( h == 0 ) h = 420;
     resize( w, h );
-    KApplication::sendPostedEvents();
+    TDEApplication::sendPostedEvents();
     show();
 }
 
@@ -79,12 +79,12 @@ KScreenSaver::~KScreenSaver()
 
 void KScreenSaver::embed( TQWidget *w )
 {
-    KApplication::sendPostedEvents();
+    TDEApplication::sendPostedEvents();
 #ifdef Q_WS_X11 //FIXME
     XReparentWindow(tqt_xdisplay(), w->winId(), winId(), 0, 0);
 #endif
     w->setGeometry( 0, 0, width(), height() );
-    KApplication::sendPostedEvents();
+    TDEApplication::sendPostedEvents();
 }
 
 bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e )
@@ -228,4 +228,4 @@ void KBlankEffect::blankBlocks()
     }
 }
 
-#include "kscreensaver.moc"
+#include "tdescreensaver.moc"
diff --git a/libkscreensaver/kscreensaver.h b/libtdescreensaver/tdescreensaver.h
index de23f8431..de23f8431 100644
--- a/libkscreensaver/kscreensaver.h
+++ b/libtdescreensaver/tdescreensaver.h
diff --git a/libkscreensaver/kscreensaver_vroot.h b/libtdescreensaver/tdescreensaver_vroot.h
index aae76f9d9..aae76f9d9 100644
--- a/libkscreensaver/kscreensaver_vroot.h
+++ b/libtdescreensaver/tdescreensaver_vroot.h
diff --git a/mimetypes/application/x-linguist.desktop b/mimetypes/application/x-linguist.desktop
index d2cdb6855..2405f4633 100644
--- a/mimetypes/application/x-linguist.desktop
+++ b/mimetypes/application/x-linguist.desktop
@@ -18,7 +18,7 @@ Comment[cy]=Ffeil Tarddiad Cyfieithiad Qt
 Comment[da]=Qt oversættelseskildefil
 Comment[de]=Qt-Ãœbersetzungsquelle
 Comment[el]=Πηγαίο α�χείο μετάφ�ασης Qt
-Comment[eo]=Qta tradukfontdosiero
+Comment[eo]=Qta tradutdefontdosiero
 Comment[es]=Archivo fuente de traducción de Qt
 Comment[et]=Qt Translationi lähtetekst
 Comment[eu]=Qt itzulpenerako iturburuko fitxategia
diff --git a/mimetypes/application/x-xliff.desktop b/mimetypes/application/x-xliff.desktop
index 19c894b00..e12026b7e 100644
--- a/mimetypes/application/x-xliff.desktop
+++ b/mimetypes/application/x-xliff.desktop
@@ -15,7 +15,7 @@ Comment[csb]=Lopk dolmaczënkù XLIFF
 Comment[da]=XLIFF oversættelsesfil
 Comment[de]=XLIFF-Ãœbersetzungsdatei
 Comment[el]=Α�χείο μεταφ�άσεων XLIFF
-Comment[eo]=XLIFF tradukfontdosiero
+Comment[eo]=XLIFF tradutdefontdosiero
 Comment[es]=Archivo de traducción XLIFF
 Comment[et]=XLIFF tõlkefail
 Comment[eu]=XLIFF itzulpen fitxategia
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp
index 29174e773..f36220886 100644
--- a/networkstatus/connectionmanager.cpp
+++ b/networkstatus/connectionmanager.cpp
@@ -19,9 +19,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 
 #include "clientiface_stub.h"
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index ed7c402f3..41bff9edb 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "clientifaceimpl.h"
diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp
index 957d6f739..a77f1c1fd 100644
--- a/networkstatus/networkstatusindicator.cpp
+++ b/networkstatus/networkstatusindicator.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "connectionmanager.h"
 
diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp
index 44211c696..809d9cd0b 100644
--- a/networkstatus/testservice.cpp
+++ b/networkstatus/testservice.cpp
@@ -21,7 +21,7 @@
 
 #include <tqtimer.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "provideriface.h"
 
 #include "testservice.h"
@@ -92,7 +92,7 @@ void TestService::slotStatusChange()
 
 int main( int argc, char** argv )
 {
-	KApplication app(argc, argv, "testdcop");
+	TDEApplication app(argc, argv, "testdcop");
 	TestService * test = new TestService;
 	Q_UNUSED( test );
 	return app.exec();
diff --git a/pics/Makefile.am b/pics/Makefile.am
index 68267ab78..580f33eee 100644
--- a/pics/Makefile.am
+++ b/pics/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = $(KSVGTOPNG)
 
 ksvgtopng_SOURCES = ksvgtopng.cpp
 ksvgtopng_LDADD =  $(LIB_TDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la
-ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 install-data-local:
 	-rm -f $(DESTDIR)$(kde_icondir)/default.tde
diff --git a/pics/crystalsvg/cr128-action-document-open-recent.png b/pics/crystalsvg/cr128-action-document-open-recent.png
new file mode 100644
index 000000000..7b3588497
--- /dev/null
+++ b/pics/crystalsvg/cr128-action-document-open-recent.png
diff --git a/pics/crystalsvg/cr128-app-accessories-dictionary.png b/pics/crystalsvg/cr128-app-accessories-dictionary.png
new file mode 100644
index 000000000..fd57f9ab8
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-accessories-dictionary.png
diff --git a/pics/crystalsvg/cr128-app-khelpcenter.png b/pics/crystalsvg/cr128-app-khelpcenter.png
new file mode 100644
index 000000000..949fd3dce
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-khelpcenter.png
diff --git a/pics/crystalsvg/cr128-app-kmix.png b/pics/crystalsvg/cr128-app-kmix.png
new file mode 100644
index 000000000..5543818ba
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-kmix.png
diff --git a/pics/crystalsvg/cr128-app-kwrite.png b/pics/crystalsvg/cr128-app-kwrite.png
new file mode 100644
index 000000000..fd4db26dc
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-kwrite.png
diff --git a/pics/crystalsvg/cr128-app-preferences-desktop-accessibility.png b/pics/crystalsvg/cr128-app-preferences-desktop-accessibility.png
new file mode 100644
index 000000000..5405523ea
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-preferences-desktop-accessibility.png
diff --git a/pics/crystalsvg/cr128-app-preferences-desktop-font.png b/pics/crystalsvg/cr128-app-preferences-desktop-font.png
new file mode 100644
index 000000000..f859e33e7
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-preferences-desktop-font.png
diff --git a/pics/crystalsvg/cr128-app-preferences-desktop-locale.png b/pics/crystalsvg/cr128-app-preferences-desktop-locale.png
new file mode 100644
index 000000000..25403acc9
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-preferences-desktop-locale.png
diff --git a/pics/crystalsvg/cr128-app-preferences-desktop-multimedia.png b/pics/crystalsvg/cr128-app-preferences-desktop-multimedia.png
new file mode 100644
index 000000000..5543818ba
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-preferences-desktop-multimedia.png
diff --git a/pics/crystalsvg/cr128-app-preferences-desktop-screensaver.png b/pics/crystalsvg/cr128-app-preferences-desktop-screensaver.png
new file mode 100644
index 000000000..e8f036fe3
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-preferences-desktop-screensaver.png
diff --git a/pics/crystalsvg/cr128-app-preferences-desktop-theme.png b/pics/crystalsvg/cr128-app-preferences-desktop-theme.png
new file mode 100644
index 000000000..8c496e5d3
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-preferences-desktop-theme.png
diff --git a/pics/crystalsvg/cr128-app-preferences-desktop-wallpaper.png b/pics/crystalsvg/cr128-app-preferences-desktop-wallpaper.png
new file mode 100644
index 000000000..d18790b09
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-preferences-desktop-wallpaper.png
diff --git a/pics/crystalsvg/cr128-app-system-file-manager.png b/pics/crystalsvg/cr128-app-system-file-manager.png
new file mode 100644
index 000000000..c032a6e06
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-system-file-manager.png
diff --git a/pics/crystalsvg/cr128-app-system-software-install.png b/pics/crystalsvg/cr128-app-system-software-install.png
new file mode 100644
index 000000000..4fa61f263
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-system-software-install.png
diff --git a/pics/crystalsvg/cr128-app-system-software-update.png b/pics/crystalsvg/cr128-app-system-software-update.png
new file mode 100644
index 000000000..a68965f5c
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-system-software-update.png
diff --git a/pics/crystalsvg/cr128-app-utilities-system-monitor.png b/pics/crystalsvg/cr128-app-utilities-system-monitor.png
new file mode 100644
index 000000000..f2223cde8
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-utilities-system-monitor.png
diff --git a/pics/crystalsvg/cr128-app-utilities-terminal.png b/pics/crystalsvg/cr128-app-utilities-terminal.png
new file mode 100644
index 000000000..a7f21faa5
--- /dev/null
+++ b/pics/crystalsvg/cr128-app-utilities-terminal.png
diff --git a/pics/crystalsvg/cr128-device-modem.png b/pics/crystalsvg/cr128-device-modem.png
new file mode 100644
index 000000000..018f7a3b9
--- /dev/null
+++ b/pics/crystalsvg/cr128-device-modem.png
diff --git a/pics/crystalsvg/cr128-mime-kmultiple.png b/pics/crystalsvg/cr128-mime-tdemultiple.png
index 9e822431c..9e822431c 100644
--- a/pics/crystalsvg/cr128-mime-kmultiple.png
+++ b/pics/crystalsvg/cr128-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr16-action-application-exit.png b/pics/crystalsvg/cr16-action-application-exit.png
new file mode 100644
index 000000000..a77152b5b
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-application-exit.png
diff --git a/pics/crystalsvg/cr16-action-contact-new.png b/pics/crystalsvg/cr16-action-contact-new.png
new file mode 100644
index 000000000..cec9f51f8
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-contact-new.png
diff --git a/pics/crystalsvg/cr16-action-document-open-recent.png b/pics/crystalsvg/cr16-action-document-open-recent.png
new file mode 100644
index 000000000..037c2da98
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-document-open-recent.png
diff --git a/pics/crystalsvg/cr16-action-document-send.png b/pics/crystalsvg/cr16-action-document-send.png
new file mode 100644
index 000000000..62b053433
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-document-send.png
diff --git a/pics/crystalsvg/cr16-action-format-justify-fill.png b/pics/crystalsvg/cr16-action-format-justify-fill.png
new file mode 100644
index 000000000..a5c8d9197
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-format-justify-fill.png
diff --git a/pics/crystalsvg/cr16-action-help-about.png b/pics/crystalsvg/cr16-action-help-about.png
new file mode 100644
index 000000000..77fbc016c
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-help-about.png
diff --git a/pics/crystalsvg/cr16-action-help-contents.png b/pics/crystalsvg/cr16-action-help-contents.png
new file mode 100644
index 000000000..4ed65a97e
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-help-contents.png
diff --git a/pics/crystalsvg/cr16-action-list-add.png b/pics/crystalsvg/cr16-action-list-add.png
new file mode 100644
index 000000000..fe07994c2
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-list-add.png
diff --git a/pics/crystalsvg/cr16-action-list-remove.png b/pics/crystalsvg/cr16-action-list-remove.png
new file mode 100644
index 000000000..b2cc9be41
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-list-remove.png
diff --git a/pics/crystalsvg/cr16-action-system-reboot.png b/pics/crystalsvg/cr16-action-system-reboot.png
new file mode 100644
index 000000000..e0021413b
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-system-reboot.png
diff --git a/pics/crystalsvg/cr16-action-system-search.png b/pics/crystalsvg/cr16-action-system-search.png
new file mode 100644
index 000000000..f9451cc11
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-system-search.png
diff --git a/pics/crystalsvg/cr16-action-system-shutdown.png b/pics/crystalsvg/cr16-action-system-shutdown.png
new file mode 100644
index 000000000..a77152b5b
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-system-shutdown.png
diff --git a/pics/crystalsvg/cr16-action-view-refresh.png b/pics/crystalsvg/cr16-action-view-refresh.png
new file mode 100644
index 000000000..e0021413b
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-view-refresh.png
diff --git a/pics/crystalsvg/cr16-actions-address-book-new.png b/pics/crystalsvg/cr16-actions-address-book-new.png
new file mode 100755
index 000000000..7e64d1003
--- /dev/null
+++ b/pics/crystalsvg/cr16-actions-address-book-new.png
diff --git a/pics/crystalsvg/cr16-actions-appointment-new.png b/pics/crystalsvg/cr16-actions-appointment-new.png
new file mode 100755
index 000000000..0dbf8d938
--- /dev/null
+++ b/pics/crystalsvg/cr16-actions-appointment-new.png
diff --git a/pics/crystalsvg/cr16-actions-edit-find-replace.png b/pics/crystalsvg/cr16-actions-edit-find-replace.png
new file mode 100755
index 000000000..73bdb6591
--- /dev/null
+++ b/pics/crystalsvg/cr16-actions-edit-find-replace.png
diff --git a/pics/crystalsvg/cr16-actions-edit-select-all.png b/pics/crystalsvg/cr16-actions-edit-select-all.png
new file mode 100755
index 000000000..c236b1839
--- /dev/null
+++ b/pics/crystalsvg/cr16-actions-edit-select-all.png
diff --git a/pics/crystalsvg/cr16-actions-paper-blank.png b/pics/crystalsvg/cr16-actions-paper-blank.png
new file mode 100755
index 000000000..d7d347f3e
--- /dev/null
+++ b/pics/crystalsvg/cr16-actions-paper-blank.png
diff --git a/pics/crystalsvg/cr16-app-accessories-calculator.png b/pics/crystalsvg/cr16-app-accessories-calculator.png
new file mode 100644
index 000000000..deb6fcd4c
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-accessories-calculator.png
diff --git a/pics/crystalsvg/cr16-app-accessories-character-map.png b/pics/crystalsvg/cr16-app-accessories-character-map.png
new file mode 100644
index 000000000..8e0f8d6bb
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-accessories-character-map.png
diff --git a/pics/crystalsvg/cr16-app-accessories-dictionary.png b/pics/crystalsvg/cr16-app-accessories-dictionary.png
new file mode 100644
index 000000000..643500fc1
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-accessories-dictionary.png
diff --git a/pics/crystalsvg/cr16-app-khelpcenter.png b/pics/crystalsvg/cr16-app-khelpcenter.png
new file mode 100644
index 000000000..d242b4b3e
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-khelpcenter.png
diff --git a/pics/crystalsvg/cr16-app-kmix.png b/pics/crystalsvg/cr16-app-kmix.png
new file mode 100644
index 000000000..a422967e7
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-kmix.png
diff --git a/pics/crystalsvg/cr16-app-kwrite.png b/pics/crystalsvg/cr16-app-kwrite.png
new file mode 100644
index 000000000..3c939e637
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-kwrite.png
diff --git a/pics/crystalsvg/cr16-app-preferences-desktop-accessibility.png b/pics/crystalsvg/cr16-app-preferences-desktop-accessibility.png
new file mode 100644
index 000000000..a952d7786
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-preferences-desktop-accessibility.png
diff --git a/pics/crystalsvg/cr16-app-preferences-desktop-font.png b/pics/crystalsvg/cr16-app-preferences-desktop-font.png
new file mode 100644
index 000000000..78d71d03a
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-preferences-desktop-font.png
diff --git a/pics/crystalsvg/cr16-app-preferences-desktop-keyboard.png b/pics/crystalsvg/cr16-app-preferences-desktop-keyboard.png
new file mode 100644
index 000000000..198d20221
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-preferences-desktop-keyboard.png
diff --git a/pics/crystalsvg/cr16-app-preferences-desktop-locale.png b/pics/crystalsvg/cr16-app-preferences-desktop-locale.png
new file mode 100644
index 000000000..0dfece4d3
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-preferences-desktop-locale.png
diff --git a/pics/crystalsvg/cr16-app-preferences-desktop-multimedia.png b/pics/crystalsvg/cr16-app-preferences-desktop-multimedia.png
new file mode 100644
index 000000000..d2bf93a19
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-preferences-desktop-multimedia.png
diff --git a/pics/crystalsvg/cr16-app-preferences-desktop-screensaver.png b/pics/crystalsvg/cr16-app-preferences-desktop-screensaver.png
new file mode 100644
index 000000000..200fe3dcc
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-preferences-desktop-screensaver.png
diff --git a/pics/crystalsvg/cr16-app-preferences-desktop-theme.png b/pics/crystalsvg/cr16-app-preferences-desktop-theme.png
new file mode 100644
index 000000000..2b3588a05
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-preferences-desktop-theme.png
diff --git a/pics/crystalsvg/cr16-app-preferences-desktop-wallpaper.png b/pics/crystalsvg/cr16-app-preferences-desktop-wallpaper.png
new file mode 100644
index 000000000..8645b601b
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-preferences-desktop-wallpaper.png
diff --git a/pics/crystalsvg/cr16-app-system-file-manager.png b/pics/crystalsvg/cr16-app-system-file-manager.png
new file mode 100644
index 000000000..013f78bc4
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-system-file-manager.png
diff --git a/pics/crystalsvg/cr16-app-system-software-install.png b/pics/crystalsvg/cr16-app-system-software-install.png
new file mode 100644
index 000000000..d85d33956
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-system-software-install.png
diff --git a/pics/crystalsvg/cr16-app-system-software-update.png b/pics/crystalsvg/cr16-app-system-software-update.png
new file mode 100644
index 000000000..4952024e7
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-system-software-update.png
diff --git a/pics/crystalsvg/cr16-app-utilities-system-monitor.png b/pics/crystalsvg/cr16-app-utilities-system-monitor.png
new file mode 100644
index 000000000..1c2e678da
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-utilities-system-monitor.png
diff --git a/pics/crystalsvg/cr16-app-utilities-terminal.png b/pics/crystalsvg/cr16-app-utilities-terminal.png
new file mode 100644
index 000000000..e4fabb297
--- /dev/null
+++ b/pics/crystalsvg/cr16-app-utilities-terminal.png
diff --git a/pics/crystalsvg/cr16-device-modem.png b/pics/crystalsvg/cr16-device-modem.png
new file mode 100644
index 000000000..9b13f1229
--- /dev/null
+++ b/pics/crystalsvg/cr16-device-modem.png
diff --git a/pics/crystalsvg/cr16-mime-kmultiple.png b/pics/crystalsvg/cr16-mime-tdemultiple.png
index d19526823..d19526823 100644
--- a/pics/crystalsvg/cr16-mime-kmultiple.png
+++ b/pics/crystalsvg/cr16-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr22-action-application-exit.png b/pics/crystalsvg/cr22-action-application-exit.png
new file mode 100644
index 000000000..b266020f5
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-application-exit.png
diff --git a/pics/crystalsvg/cr22-action-contact-new.png b/pics/crystalsvg/cr22-action-contact-new.png
new file mode 100644
index 000000000..539debe04
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-contact-new.png
diff --git a/pics/crystalsvg/cr22-action-document-open-recent.png b/pics/crystalsvg/cr22-action-document-open-recent.png
new file mode 100644
index 000000000..a79982ea1
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-document-open-recent.png
diff --git a/pics/crystalsvg/cr22-action-document-send.png b/pics/crystalsvg/cr22-action-document-send.png
new file mode 100644
index 000000000..a802f04ae
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-document-send.png
diff --git a/pics/crystalsvg/cr22-action-format-justify-fill.png b/pics/crystalsvg/cr22-action-format-justify-fill.png
new file mode 100644
index 000000000..60e79b5c2
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-format-justify-fill.png
diff --git a/pics/crystalsvg/cr22-action-help-about.png b/pics/crystalsvg/cr22-action-help-about.png
new file mode 100644
index 000000000..c6d338a38
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-help-about.png
diff --git a/pics/crystalsvg/cr22-action-help-contents.png b/pics/crystalsvg/cr22-action-help-contents.png
new file mode 100644
index 000000000..644347b66
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-help-contents.png
diff --git a/pics/crystalsvg/cr22-action-list-add.png b/pics/crystalsvg/cr22-action-list-add.png
new file mode 100644
index 000000000..97514fbd4
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-list-add.png
diff --git a/pics/crystalsvg/cr22-action-list-remove.png b/pics/crystalsvg/cr22-action-list-remove.png
new file mode 100644
index 000000000..9c4837d26
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-list-remove.png
diff --git a/pics/crystalsvg/cr22-action-system-reboot.png b/pics/crystalsvg/cr22-action-system-reboot.png
new file mode 100644
index 000000000..3fa8db769
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-system-reboot.png
diff --git a/pics/crystalsvg/cr22-action-system-search.png b/pics/crystalsvg/cr22-action-system-search.png
new file mode 100644
index 000000000..20d3668ee
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-system-search.png
diff --git a/pics/crystalsvg/cr22-action-system-shutdown.png b/pics/crystalsvg/cr22-action-system-shutdown.png
new file mode 100644
index 000000000..b266020f5
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-system-shutdown.png
diff --git a/pics/crystalsvg/cr22-action-view-refresh.png b/pics/crystalsvg/cr22-action-view-refresh.png
new file mode 100644
index 000000000..3fa8db769
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-view-refresh.png
diff --git a/pics/crystalsvg/cr22-actions-address-book-new.png b/pics/crystalsvg/cr22-actions-address-book-new.png
new file mode 100755
index 000000000..73811e79e
--- /dev/null
+++ b/pics/crystalsvg/cr22-actions-address-book-new.png
diff --git a/pics/crystalsvg/cr22-actions-appointment-new.png b/pics/crystalsvg/cr22-actions-appointment-new.png
new file mode 100755
index 000000000..c4e835e66
--- /dev/null
+++ b/pics/crystalsvg/cr22-actions-appointment-new.png
diff --git a/pics/crystalsvg/cr22-actions-edit-select-all.png b/pics/crystalsvg/cr22-actions-edit-select-all.png
new file mode 100755
index 000000000..fc5c9b8a3
--- /dev/null
+++ b/pics/crystalsvg/cr22-actions-edit-select-all.png
diff --git a/pics/crystalsvg/cr22-actions-paper-blank.png b/pics/crystalsvg/cr22-actions-paper-blank.png
new file mode 100755
index 000000000..133ff1f6a
--- /dev/null
+++ b/pics/crystalsvg/cr22-actions-paper-blank.png
diff --git a/pics/crystalsvg/cr22-app-accessories-calculator.png b/pics/crystalsvg/cr22-app-accessories-calculator.png
new file mode 100644
index 000000000..8ef1df841
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-accessories-calculator.png
diff --git a/pics/crystalsvg/cr22-app-khelpcenter.png b/pics/crystalsvg/cr22-app-khelpcenter.png
new file mode 100644
index 000000000..71f59060a
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-khelpcenter.png
diff --git a/pics/crystalsvg/cr22-app-kwrite.png b/pics/crystalsvg/cr22-app-kwrite.png
new file mode 100644
index 000000000..29c225bea
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-kwrite.png
diff --git a/pics/crystalsvg/cr22-app-preferences-desktop-accessibility.png b/pics/crystalsvg/cr22-app-preferences-desktop-accessibility.png
new file mode 100644
index 000000000..ba7027a14
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-preferences-desktop-accessibility.png
diff --git a/pics/crystalsvg/cr22-app-preferences-desktop-font.png b/pics/crystalsvg/cr22-app-preferences-desktop-font.png
new file mode 100644
index 000000000..19fccc6c5
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-preferences-desktop-font.png
diff --git a/pics/crystalsvg/cr22-app-preferences-desktop-keyboard.png b/pics/crystalsvg/cr22-app-preferences-desktop-keyboard.png
new file mode 100644
index 000000000..4360481af
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-preferences-desktop-keyboard.png
diff --git a/pics/crystalsvg/cr22-app-preferences-desktop-locale.png b/pics/crystalsvg/cr22-app-preferences-desktop-locale.png
new file mode 100644
index 000000000..827360a8b
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-preferences-desktop-locale.png
diff --git a/pics/crystalsvg/cr22-app-preferences-desktop-screensaver.png b/pics/crystalsvg/cr22-app-preferences-desktop-screensaver.png
new file mode 100644
index 000000000..7448fe237
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-preferences-desktop-screensaver.png
diff --git a/pics/crystalsvg/cr22-app-preferences-desktop-theme.png b/pics/crystalsvg/cr22-app-preferences-desktop-theme.png
new file mode 100644
index 000000000..f3aef6eed
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-preferences-desktop-theme.png
diff --git a/pics/crystalsvg/cr22-app-preferences-desktop-wallpaper.png b/pics/crystalsvg/cr22-app-preferences-desktop-wallpaper.png
new file mode 100644
index 000000000..3f742a847
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-preferences-desktop-wallpaper.png
diff --git a/pics/crystalsvg/cr22-app-system-file-manager.png b/pics/crystalsvg/cr22-app-system-file-manager.png
new file mode 100644
index 000000000..1413af913
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-system-file-manager.png
diff --git a/pics/crystalsvg/cr22-app-system-software-update.png b/pics/crystalsvg/cr22-app-system-software-update.png
new file mode 100644
index 000000000..3b3880cc5
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-system-software-update.png
diff --git a/pics/crystalsvg/cr22-app-utilities-terminal.png b/pics/crystalsvg/cr22-app-utilities-terminal.png
new file mode 100644
index 000000000..9033d420f
--- /dev/null
+++ b/pics/crystalsvg/cr22-app-utilities-terminal.png
diff --git a/pics/crystalsvg/cr22-device-modem.png b/pics/crystalsvg/cr22-device-modem.png
new file mode 100644
index 000000000..614d4c478
--- /dev/null
+++ b/pics/crystalsvg/cr22-device-modem.png
diff --git a/pics/crystalsvg/cr22-mime-kmultiple.png b/pics/crystalsvg/cr22-mime-tdemultiple.png
index 485cc80de..485cc80de 100644
--- a/pics/crystalsvg/cr22-mime-kmultiple.png
+++ b/pics/crystalsvg/cr22-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr32-action-application-exit.png b/pics/crystalsvg/cr32-action-application-exit.png
new file mode 100644
index 000000000..744588794
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-application-exit.png
diff --git a/pics/crystalsvg/cr32-action-contact-new.png b/pics/crystalsvg/cr32-action-contact-new.png
new file mode 100644
index 000000000..6b01866e0
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-contact-new.png
diff --git a/pics/crystalsvg/cr32-action-document-open-recent.png b/pics/crystalsvg/cr32-action-document-open-recent.png
new file mode 100644
index 000000000..503a00459
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-document-open-recent.png
diff --git a/pics/crystalsvg/cr32-action-document-properties.png b/pics/crystalsvg/cr32-action-document-properties.png
new file mode 100644
index 000000000..96642db7f
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-document-properties.png
diff --git a/pics/crystalsvg/cr32-action-document-send.png b/pics/crystalsvg/cr32-action-document-send.png
new file mode 100644
index 000000000..01bd04655
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-document-send.png
diff --git a/pics/crystalsvg/cr32-action-format-justify-fill.png b/pics/crystalsvg/cr32-action-format-justify-fill.png
new file mode 100644
index 000000000..c4a9b8cc8
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-format-justify-fill.png
diff --git a/pics/crystalsvg/cr32-action-help-about.png b/pics/crystalsvg/cr32-action-help-about.png
new file mode 100644
index 000000000..ad4cf170e
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-help-about.png
diff --git a/pics/crystalsvg/cr32-action-help-contents.png b/pics/crystalsvg/cr32-action-help-contents.png
new file mode 100644
index 000000000..93bf094a1
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-help-contents.png
diff --git a/pics/crystalsvg/cr32-action-list-add.png b/pics/crystalsvg/cr32-action-list-add.png
new file mode 100644
index 000000000..f98e2a8ca
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-list-add.png
diff --git a/pics/crystalsvg/cr32-action-list-remove.png b/pics/crystalsvg/cr32-action-list-remove.png
new file mode 100644
index 000000000..c03d56b53
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-list-remove.png
diff --git a/pics/crystalsvg/cr32-action-system-reboot.png b/pics/crystalsvg/cr32-action-system-reboot.png
new file mode 100644
index 000000000..bf523dd33
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-system-reboot.png
diff --git a/pics/crystalsvg/cr32-action-system-search.png b/pics/crystalsvg/cr32-action-system-search.png
new file mode 100644
index 000000000..176e838a1
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-system-search.png
diff --git a/pics/crystalsvg/cr32-action-system-shutdown.png b/pics/crystalsvg/cr32-action-system-shutdown.png
new file mode 100644
index 000000000..744588794
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-system-shutdown.png
diff --git a/pics/crystalsvg/cr32-action-view-refresh.png b/pics/crystalsvg/cr32-action-view-refresh.png
new file mode 100644
index 000000000..bf523dd33
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-view-refresh.png
diff --git a/pics/crystalsvg/cr32-actions-address-book-new.png b/pics/crystalsvg/cr32-actions-address-book-new.png
new file mode 100755
index 000000000..daf5b84cd
--- /dev/null
+++ b/pics/crystalsvg/cr32-actions-address-book-new.png
diff --git a/pics/crystalsvg/cr32-actions-appointment-new.png b/pics/crystalsvg/cr32-actions-appointment-new.png
new file mode 100755
index 000000000..6d2dbae51
--- /dev/null
+++ b/pics/crystalsvg/cr32-actions-appointment-new.png
diff --git a/pics/crystalsvg/cr32-actions-edit-select-all.png b/pics/crystalsvg/cr32-actions-edit-select-all.png
new file mode 100755
index 000000000..a447e95b7
--- /dev/null
+++ b/pics/crystalsvg/cr32-actions-edit-select-all.png
diff --git a/pics/crystalsvg/cr32-actions-paper-blank.png b/pics/crystalsvg/cr32-actions-paper-blank.png
new file mode 100755
index 000000000..98bc71702
--- /dev/null
+++ b/pics/crystalsvg/cr32-actions-paper-blank.png
diff --git a/pics/crystalsvg/cr32-app-accessories-calculator.png b/pics/crystalsvg/cr32-app-accessories-calculator.png
new file mode 100644
index 000000000..34063167c
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-accessories-calculator.png
diff --git a/pics/crystalsvg/cr32-app-accessories-character-map.png b/pics/crystalsvg/cr32-app-accessories-character-map.png
new file mode 100644
index 000000000..19611e5a2
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-accessories-character-map.png
diff --git a/pics/crystalsvg/cr32-app-accessories-dictionary.png b/pics/crystalsvg/cr32-app-accessories-dictionary.png
new file mode 100644
index 000000000..fa3a0537e
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-accessories-dictionary.png
diff --git a/pics/crystalsvg/cr32-app-khelpcenter.png b/pics/crystalsvg/cr32-app-khelpcenter.png
new file mode 100644
index 000000000..79dd450e8
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-khelpcenter.png
diff --git a/pics/crystalsvg/cr32-app-kmix.png b/pics/crystalsvg/cr32-app-kmix.png
new file mode 100644
index 000000000..2036faa52
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-kmix.png
diff --git a/pics/crystalsvg/cr32-app-kwrite.png b/pics/crystalsvg/cr32-app-kwrite.png
new file mode 100644
index 000000000..e4185bfe6
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-kwrite.png
diff --git a/pics/crystalsvg/cr32-app-preferences-desktop-accessibility.png b/pics/crystalsvg/cr32-app-preferences-desktop-accessibility.png
new file mode 100644
index 000000000..c83070ca3
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-preferences-desktop-accessibility.png
diff --git a/pics/crystalsvg/cr32-app-preferences-desktop-font.png b/pics/crystalsvg/cr32-app-preferences-desktop-font.png
new file mode 100644
index 000000000..9ace98c25
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-preferences-desktop-font.png
diff --git a/pics/crystalsvg/cr32-app-preferences-desktop-keyboard.png b/pics/crystalsvg/cr32-app-preferences-desktop-keyboard.png
new file mode 100644
index 000000000..3bbc80536
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-preferences-desktop-keyboard.png
diff --git a/pics/crystalsvg/cr32-app-preferences-desktop-locale.png b/pics/crystalsvg/cr32-app-preferences-desktop-locale.png
new file mode 100644
index 000000000..96b4201ac
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-preferences-desktop-locale.png
diff --git a/pics/crystalsvg/cr32-app-preferences-desktop-multimedia.png b/pics/crystalsvg/cr32-app-preferences-desktop-multimedia.png
new file mode 100644
index 000000000..1e397c524
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-preferences-desktop-multimedia.png
diff --git a/pics/crystalsvg/cr32-app-preferences-desktop-screensaver.png b/pics/crystalsvg/cr32-app-preferences-desktop-screensaver.png
new file mode 100644
index 000000000..f527126bc
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-preferences-desktop-screensaver.png
diff --git a/pics/crystalsvg/cr32-app-preferences-desktop-theme.png b/pics/crystalsvg/cr32-app-preferences-desktop-theme.png
new file mode 100644
index 000000000..2bf6a7782
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-preferences-desktop-theme.png
diff --git a/pics/crystalsvg/cr32-app-preferences-desktop-wallpaper.png b/pics/crystalsvg/cr32-app-preferences-desktop-wallpaper.png
new file mode 100644
index 000000000..564ef39e8
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-preferences-desktop-wallpaper.png
diff --git a/pics/crystalsvg/cr32-app-system-file-manager.png b/pics/crystalsvg/cr32-app-system-file-manager.png
new file mode 100644
index 000000000..ed21ceb5e
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-system-file-manager.png
diff --git a/pics/crystalsvg/cr32-app-system-software-install.png b/pics/crystalsvg/cr32-app-system-software-install.png
new file mode 100644
index 000000000..e13d3d500
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-system-software-install.png
diff --git a/pics/crystalsvg/cr32-app-system-software-update.png b/pics/crystalsvg/cr32-app-system-software-update.png
new file mode 100644
index 000000000..ee196a81f
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-system-software-update.png
diff --git a/pics/crystalsvg/cr32-app-utilities-system-monitor.png b/pics/crystalsvg/cr32-app-utilities-system-monitor.png
new file mode 100644
index 000000000..53005ff57
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-utilities-system-monitor.png
diff --git a/pics/crystalsvg/cr32-app-utilities-terminal.png b/pics/crystalsvg/cr32-app-utilities-terminal.png
new file mode 100644
index 000000000..81b85b5c4
--- /dev/null
+++ b/pics/crystalsvg/cr32-app-utilities-terminal.png
diff --git a/pics/crystalsvg/cr32-device-modem.png b/pics/crystalsvg/cr32-device-modem.png
new file mode 100644
index 000000000..bedd810de
--- /dev/null
+++ b/pics/crystalsvg/cr32-device-modem.png
diff --git a/pics/crystalsvg/cr32-mime-kmultiple.png b/pics/crystalsvg/cr32-mime-tdemultiple.png
index 45cb5ffe8..45cb5ffe8 100644
--- a/pics/crystalsvg/cr32-mime-kmultiple.png
+++ b/pics/crystalsvg/cr32-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr48-action-application-exit.png b/pics/crystalsvg/cr48-action-application-exit.png
new file mode 100644
index 000000000..f1ca32a50
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-application-exit.png
diff --git a/pics/crystalsvg/cr48-action-list-add.png b/pics/crystalsvg/cr48-action-list-add.png
new file mode 100644
index 000000000..b90d5f10a
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-list-add.png
diff --git a/pics/crystalsvg/cr48-action-list-remove.png b/pics/crystalsvg/cr48-action-list-remove.png
new file mode 100644
index 000000000..2e8547bfe
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-list-remove.png
diff --git a/pics/crystalsvg/cr48-action-system-reboot.png b/pics/crystalsvg/cr48-action-system-reboot.png
new file mode 100644
index 000000000..5b8270983
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-system-reboot.png
diff --git a/pics/crystalsvg/cr48-action-system-shutdown.png b/pics/crystalsvg/cr48-action-system-shutdown.png
new file mode 100644
index 000000000..f1ca32a50
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-system-shutdown.png
diff --git a/pics/crystalsvg/cr48-action-view-refresh.png b/pics/crystalsvg/cr48-action-view-refresh.png
new file mode 100644
index 000000000..5b8270983
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-view-refresh.png
diff --git a/pics/crystalsvg/cr48-actions-address-book-new.png b/pics/crystalsvg/cr48-actions-address-book-new.png
new file mode 100755
index 000000000..090c5b63a
--- /dev/null
+++ b/pics/crystalsvg/cr48-actions-address-book-new.png
diff --git a/pics/crystalsvg/cr48-actions-appointment-new.png b/pics/crystalsvg/cr48-actions-appointment-new.png
new file mode 100755
index 000000000..fabdd53d4
--- /dev/null
+++ b/pics/crystalsvg/cr48-actions-appointment-new.png
diff --git a/pics/crystalsvg/cr48-actions-edit-select-all.png b/pics/crystalsvg/cr48-actions-edit-select-all.png
new file mode 100755
index 000000000..84a7368f5
--- /dev/null
+++ b/pics/crystalsvg/cr48-actions-edit-select-all.png
diff --git a/pics/crystalsvg/cr48-actions-paper-blank.png b/pics/crystalsvg/cr48-actions-paper-blank.png
new file mode 100755
index 000000000..1a94cdac5
--- /dev/null
+++ b/pics/crystalsvg/cr48-actions-paper-blank.png
diff --git a/pics/crystalsvg/cr48-app-accessories-calculator.png b/pics/crystalsvg/cr48-app-accessories-calculator.png
new file mode 100644
index 000000000..3da02ada5
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-accessories-calculator.png
diff --git a/pics/crystalsvg/cr48-app-accessories-character-map.png b/pics/crystalsvg/cr48-app-accessories-character-map.png
new file mode 100644
index 000000000..c806cdcea
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-accessories-character-map.png
diff --git a/pics/crystalsvg/cr48-app-accessories-dictionary.png b/pics/crystalsvg/cr48-app-accessories-dictionary.png
new file mode 100644
index 000000000..40efecd0f
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-accessories-dictionary.png
diff --git a/pics/crystalsvg/cr48-app-khelpcenter.png b/pics/crystalsvg/cr48-app-khelpcenter.png
new file mode 100644
index 000000000..24582cf57
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-khelpcenter.png
diff --git a/pics/crystalsvg/cr48-app-kmix.png b/pics/crystalsvg/cr48-app-kmix.png
new file mode 100644
index 000000000..dc766a89c
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-kmix.png
diff --git a/pics/crystalsvg/cr48-app-kwrite.png b/pics/crystalsvg/cr48-app-kwrite.png
new file mode 100644
index 000000000..08c72efab
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-kwrite.png
diff --git a/pics/crystalsvg/cr48-app-preferences-desktop-accessibility.png b/pics/crystalsvg/cr48-app-preferences-desktop-accessibility.png
new file mode 100644
index 000000000..c74f3d99f
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-preferences-desktop-accessibility.png
diff --git a/pics/crystalsvg/cr48-app-preferences-desktop-font.png b/pics/crystalsvg/cr48-app-preferences-desktop-font.png
new file mode 100644
index 000000000..a17a1f282
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-preferences-desktop-font.png
diff --git a/pics/crystalsvg/cr48-app-preferences-desktop-keyboard.png b/pics/crystalsvg/cr48-app-preferences-desktop-keyboard.png
new file mode 100644
index 000000000..04c821147
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-preferences-desktop-keyboard.png
diff --git a/pics/crystalsvg/cr48-app-preferences-desktop-locale.png b/pics/crystalsvg/cr48-app-preferences-desktop-locale.png
new file mode 100644
index 000000000..e7defacbc
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-preferences-desktop-locale.png
diff --git a/pics/crystalsvg/cr48-app-preferences-desktop-multimedia.png b/pics/crystalsvg/cr48-app-preferences-desktop-multimedia.png
new file mode 100644
index 000000000..dc766a89c
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-preferences-desktop-multimedia.png
diff --git a/pics/crystalsvg/cr48-app-preferences-desktop-screensaver.png b/pics/crystalsvg/cr48-app-preferences-desktop-screensaver.png
new file mode 100644
index 000000000..749f42253
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-preferences-desktop-screensaver.png
diff --git a/pics/crystalsvg/cr48-app-preferences-desktop-theme.png b/pics/crystalsvg/cr48-app-preferences-desktop-theme.png
new file mode 100644
index 000000000..50430c726
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-preferences-desktop-theme.png
diff --git a/pics/crystalsvg/cr48-app-preferences-desktop-wallpaper.png b/pics/crystalsvg/cr48-app-preferences-desktop-wallpaper.png
new file mode 100644
index 000000000..c2328e70b
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-preferences-desktop-wallpaper.png
diff --git a/pics/crystalsvg/cr48-app-system-file-manager.png b/pics/crystalsvg/cr48-app-system-file-manager.png
new file mode 100644
index 000000000..11d84db32
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-system-file-manager.png
diff --git a/pics/crystalsvg/cr48-app-system-software-install.png b/pics/crystalsvg/cr48-app-system-software-install.png
new file mode 100644
index 000000000..db59aecca
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-system-software-install.png
diff --git a/pics/crystalsvg/cr48-app-system-software-update.png b/pics/crystalsvg/cr48-app-system-software-update.png
new file mode 100644
index 000000000..5abac9bb0
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-system-software-update.png
diff --git a/pics/crystalsvg/cr48-app-utilities-system-monitor.png b/pics/crystalsvg/cr48-app-utilities-system-monitor.png
new file mode 100644
index 000000000..b636ff0e6
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-utilities-system-monitor.png
diff --git a/pics/crystalsvg/cr48-app-utilities-terminal.png b/pics/crystalsvg/cr48-app-utilities-terminal.png
new file mode 100644
index 000000000..97498f6d3
--- /dev/null
+++ b/pics/crystalsvg/cr48-app-utilities-terminal.png
diff --git a/pics/crystalsvg/cr48-device-modem.png b/pics/crystalsvg/cr48-device-modem.png
new file mode 100644
index 000000000..5c2bf7827
--- /dev/null
+++ b/pics/crystalsvg/cr48-device-modem.png
diff --git a/pics/crystalsvg/cr48-mime-kmultiple.png b/pics/crystalsvg/cr48-mime-tdemultiple.png
index 00651fcd2..00651fcd2 100644
--- a/pics/crystalsvg/cr48-mime-kmultiple.png
+++ b/pics/crystalsvg/cr48-mime-tdemultiple.png
diff --git a/pics/crystalsvg/cr64-action-document-open-recent.png b/pics/crystalsvg/cr64-action-document-open-recent.png
new file mode 100644
index 000000000..068a38680
--- /dev/null
+++ b/pics/crystalsvg/cr64-action-document-open-recent.png
diff --git a/pics/crystalsvg/cr64-actions-appointment-new.png b/pics/crystalsvg/cr64-actions-appointment-new.png
new file mode 100755
index 000000000..02cde5725
--- /dev/null
+++ b/pics/crystalsvg/cr64-actions-appointment-new.png
diff --git a/pics/crystalsvg/cr64-app-accessories-calculator.png b/pics/crystalsvg/cr64-app-accessories-calculator.png
new file mode 100644
index 000000000..5ebe853b1
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-accessories-calculator.png
diff --git a/pics/crystalsvg/cr64-app-accessories-dictionary.png b/pics/crystalsvg/cr64-app-accessories-dictionary.png
new file mode 100644
index 000000000..ba6ed634c
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-accessories-dictionary.png
diff --git a/pics/crystalsvg/cr64-app-khelpcenter.png b/pics/crystalsvg/cr64-app-khelpcenter.png
new file mode 100644
index 000000000..6ea007cf8
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-khelpcenter.png
diff --git a/pics/crystalsvg/cr64-app-kmix.png b/pics/crystalsvg/cr64-app-kmix.png
new file mode 100644
index 000000000..f7679b274
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-kmix.png
diff --git a/pics/crystalsvg/cr64-app-kwrite.png b/pics/crystalsvg/cr64-app-kwrite.png
new file mode 100644
index 000000000..c553a93c2
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-kwrite.png
diff --git a/pics/crystalsvg/cr64-app-preferences-desktop-accessibility.png b/pics/crystalsvg/cr64-app-preferences-desktop-accessibility.png
new file mode 100644
index 000000000..1d932d01d
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-preferences-desktop-accessibility.png
diff --git a/pics/crystalsvg/cr64-app-preferences-desktop-font.png b/pics/crystalsvg/cr64-app-preferences-desktop-font.png
new file mode 100644
index 000000000..6fdab333d
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-preferences-desktop-font.png
diff --git a/pics/crystalsvg/cr64-app-preferences-desktop-locale.png b/pics/crystalsvg/cr64-app-preferences-desktop-locale.png
new file mode 100644
index 000000000..042c0d345
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-preferences-desktop-locale.png
diff --git a/pics/crystalsvg/cr64-app-preferences-desktop-multimedia.png b/pics/crystalsvg/cr64-app-preferences-desktop-multimedia.png
new file mode 100644
index 000000000..406aad0f1
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-preferences-desktop-multimedia.png
diff --git a/pics/crystalsvg/cr64-app-preferences-desktop-screensaver.png b/pics/crystalsvg/cr64-app-preferences-desktop-screensaver.png
new file mode 100644
index 000000000..69c8214fb
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-preferences-desktop-screensaver.png
diff --git a/pics/crystalsvg/cr64-app-preferences-desktop-theme.png b/pics/crystalsvg/cr64-app-preferences-desktop-theme.png
new file mode 100644
index 000000000..784b5aef3
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-preferences-desktop-theme.png
diff --git a/pics/crystalsvg/cr64-app-preferences-desktop-wallpaper.png b/pics/crystalsvg/cr64-app-preferences-desktop-wallpaper.png
new file mode 100644
index 000000000..0f9de6c17
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-preferences-desktop-wallpaper.png
diff --git a/pics/crystalsvg/cr64-app-system-file-manager.png b/pics/crystalsvg/cr64-app-system-file-manager.png
new file mode 100644
index 000000000..637751f61
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-system-file-manager.png
diff --git a/pics/crystalsvg/cr64-app-system-software-install.png b/pics/crystalsvg/cr64-app-system-software-install.png
new file mode 100644
index 000000000..d43ebbd05
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-system-software-install.png
diff --git a/pics/crystalsvg/cr64-app-system-software-update.png b/pics/crystalsvg/cr64-app-system-software-update.png
new file mode 100644
index 000000000..20766d9e7
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-system-software-update.png
diff --git a/pics/crystalsvg/cr64-app-utilities-system-monitor.png b/pics/crystalsvg/cr64-app-utilities-system-monitor.png
new file mode 100644
index 000000000..95ef34953
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-utilities-system-monitor.png
diff --git a/pics/crystalsvg/cr64-app-utilities-terminal.png b/pics/crystalsvg/cr64-app-utilities-terminal.png
new file mode 100644
index 000000000..0b443d5ad
--- /dev/null
+++ b/pics/crystalsvg/cr64-app-utilities-terminal.png
diff --git a/pics/crystalsvg/cr64-device-modem.png b/pics/crystalsvg/cr64-device-modem.png
new file mode 100644
index 000000000..d904be0e0
--- /dev/null
+++ b/pics/crystalsvg/cr64-device-modem.png
diff --git a/pics/crystalsvg/cr64-mime-kmultiple.png b/pics/crystalsvg/cr64-mime-tdemultiple.png
index ee7a8194e..ee7a8194e 100644
--- a/pics/crystalsvg/cr64-mime-kmultiple.png
+++ b/pics/crystalsvg/cr64-mime-tdemultiple.png
diff --git a/pics/crystalsvg/crsc-action-application-exit.svgz b/pics/crystalsvg/crsc-action-application-exit.svgz
new file mode 100644
index 000000000..f2a2d1665
--- /dev/null
+++ b/pics/crystalsvg/crsc-action-application-exit.svgz
diff --git a/pics/crystalsvg/crsc-action-document-open-recent.svgz b/pics/crystalsvg/crsc-action-document-open-recent.svgz
new file mode 100644
index 000000000..8a9aa7b15
--- /dev/null
+++ b/pics/crystalsvg/crsc-action-document-open-recent.svgz
diff --git a/pics/crystalsvg/crsc-action-help-about.svgz b/pics/crystalsvg/crsc-action-help-about.svgz
new file mode 100644
index 000000000..471068939
--- /dev/null
+++ b/pics/crystalsvg/crsc-action-help-about.svgz
diff --git a/pics/crystalsvg/crsc-action-list-add.svgz b/pics/crystalsvg/crsc-action-list-add.svgz
new file mode 100644
index 000000000..826b16fa3
--- /dev/null
+++ b/pics/crystalsvg/crsc-action-list-add.svgz
diff --git a/pics/crystalsvg/crsc-action-list-remove.svgz b/pics/crystalsvg/crsc-action-list-remove.svgz
new file mode 100644
index 000000000..49240941c
--- /dev/null
+++ b/pics/crystalsvg/crsc-action-list-remove.svgz
diff --git a/pics/crystalsvg/crsc-action-system-reboot.svgz b/pics/crystalsvg/crsc-action-system-reboot.svgz
new file mode 100644
index 000000000..b17140011
--- /dev/null
+++ b/pics/crystalsvg/crsc-action-system-reboot.svgz
diff --git a/pics/crystalsvg/crsc-action-system-shutdown.svgz b/pics/crystalsvg/crsc-action-system-shutdown.svgz
new file mode 100644
index 000000000..f2a2d1665
--- /dev/null
+++ b/pics/crystalsvg/crsc-action-system-shutdown.svgz
diff --git a/pics/crystalsvg/crsc-action-view-refresh.svgz b/pics/crystalsvg/crsc-action-view-refresh.svgz
new file mode 100644
index 000000000..b17140011
--- /dev/null
+++ b/pics/crystalsvg/crsc-action-view-refresh.svgz
diff --git a/pics/crystalsvg/crsc-app-accessories-calculator.svgz b/pics/crystalsvg/crsc-app-accessories-calculator.svgz
new file mode 100644
index 000000000..4690fb456
--- /dev/null
+++ b/pics/crystalsvg/crsc-app-accessories-calculator.svgz
diff --git a/pics/crystalsvg/crsc-mime-kmultiple.svgz b/pics/crystalsvg/crsc-mime-tdemultiple.svgz
index c8b696048..c8b696048 100644
--- a/pics/crystalsvg/crsc-mime-kmultiple.svgz
+++ b/pics/crystalsvg/crsc-mime-tdemultiple.svgz
diff --git a/kabc/CMakeLists.txt b/tdeabc/CMakeLists.txt
index 3cca65863..0cd900c08 100644
--- a/kabc/CMakeLists.txt
+++ b/tdeabc/CMakeLists.txt
@@ -29,8 +29,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/kab
 )
 
@@ -53,14 +53,14 @@ install( FILES
     ldapclient.h addresseelist.h locknull.h ldif.h
     ldapurl.h ldapconfigwidget.h sortmode.h
     ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
 
 
 ##### other data ################################
 
-install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
-install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources )
-install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
+install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+install( FILES tdeabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
+install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/tdeabc )
 
 
 ##### generated files ###########################
@@ -80,9 +80,9 @@ add_custom_command(
 )
 
 
-##### kabc ######################################
+##### tdeabc ######################################
 
-set( target kabc )
+set( target tdeabc )
 
 set( ${target}_SRCS
   address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp
@@ -102,22 +102,22 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK vcards-static vcard-shared kio-shared kresources-shared
+  LINK vcards-static vcard-shared tdeio-shared tderesources-shared
   DEPENDENCIES addressee.h dcopidl
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### kab2kabc ##################################
+##### tdeab2tdeabc ##################################
 
-set( target kab2kabc )
+set( target tdeab2tdeabc )
 
 set( ${target}_SRCS
-  kab2kabc.cpp
+  tdeab2tdeabc.cpp
 )
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kab-static kabc-shared
+  LINK kab-static tdeabc-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kabc/HACKING b/tdeabc/HACKING
index 429ae0865..429ae0865 100644
--- a/kabc/HACKING
+++ b/tdeabc/HACKING
diff --git a/kabc/HOWTO b/tdeabc/HOWTO
index 7b41371b0..5187f2580 100644
--- a/kabc/HOWTO
+++ b/tdeabc/HOWTO
@@ -18,11 +18,11 @@ Management Layer *
 ******************
 
      .-------------------.
-     | KABC::AddressBook |
+     | TDEABC::AddressBook |
     .--------------------------------.
-    | KABC::Addressee                |  => Iterators
-    | KABC::Addressee                |
-    | KABC::Addressee                |  => Search functions
+    | TDEABC::Addressee                |  => Iterators
+    | TDEABC::Addressee                |
+    | TDEABC::Addressee                |  => Search functions
     | ...                            |
     `--------------------------------'
                        |
@@ -44,8 +44,8 @@ Storage Layer *        |
 
 The Management Layer
 ---------------------
-The Management Layer consists of the two classes KABC::AddressBook and
-KABC::Addressee. KABC::AddressBook is a container for KABC::Addressee objects
+The Management Layer consists of the two classes TDEABC::AddressBook and
+TDEABC::Addressee. TDEABC::AddressBook is a container for TDEABC::Addressee objects
 and provides 2 kinds of access methods.
 1) Iterators
     With iterators you can iterate over each of the contacts of the
@@ -55,13 +55,13 @@ and provides 2 kinds of access methods.
     With search functions you can search for contacts with special attributes
     such as "all contacts with the name 'Harald'"
 
-The class KABC::Addressee represents a single contact and contains all data
+The class TDEABC::Addressee represents a single contact and contains all data
 a vCard could store (as specified in RFC 2426).
 
 The Storage Layer
 ------------------
-The Storage Layer consists of the class KABC::Resource and its derived classes.
-These classes are used by KABC::AddressBook to load and store the contacts to
+The Storage Layer consists of the class TDEABC::Resource and its derived classes.
+These classes are used by TDEABC::AddressBook to load and store the contacts to
 the single backends.
 At the moment libkabc provides 4 types of resources:
 1) ResourceFile
@@ -79,7 +79,7 @@ At the moment libkabc provides 4 types of resources:
     FTP, Fish, WebDAV, POP3, IMAP or whatever the KIO frame work supports
 
 In general the developer does not have to take how to save the single contacts.
-He just has to plug one of the above mentioned resources into KABC::AddressBook
+He just has to plug one of the above mentioned resources into TDEABC::AddressBook
 and perform a save action.
 
 Examples
@@ -88,27 +88,27 @@ Like a picture, C/C++ code is worth a 1000 words I'd like to give you a
 lot of examples now, how to use libkabc for several tasks:
 
 
-Using KABC::StdAddressBook and Iterators
+Using TDEABC::StdAddressBook and Iterators
 -----------------------------------------
 Normally you have to plugin the resources manually into the addressbook object
 and call the load() function before you can access the contacts, but there is
-a special class KABC::StdAddressBook, which loads all resources of the standard
+a special class TDEABC::StdAddressBook, which loads all resources of the standard
 address book of the user automatically. You can use it the following way:
 
 
-     #include <kabc/stdaddressbook.h>
+     #include <tdeabc/stdaddressbook.h>
 
- 1:  KABC::AddressBook *ab = KABC::StdAddressBook::self();
- 2:  KABC::AddressBook::Iterator it;
+ 1:  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self();
+ 2:  TDEABC::AddressBook::Iterator it;
  3:  for ( it = ab->begin(); it != ab->end(); ++it ) {
- 4:    KABC::Addressee addr = (*it);
+ 4:    TDEABC::Addressee addr = (*it);
  5:
  6:    kdDebug() << "Name = " << addr.formattedName() << endl;
  7:  }
 
 The above example prints out the names of all the contacts in the user's address
 book. In line 1 you retrieve a pointer to the user's standard address book
-(provided by KABC::StdAddressBook via a singleton design pattern).
+(provided by TDEABC::StdAddressBook via a singleton design pattern).
 In line 2 an iterator is defined, which is used in line 3 to iterate over the
 whole address book. The assignment in line 4 is intended only to show more
 clearly how iterators function.
@@ -117,21 +117,21 @@ of the current contact is printed out to stderr.
 As you can see that's all magic, and it's quite easy ;)
 
 
-Using KABC::AddressBook manually
+Using TDEABC::AddressBook manually
 ---------------------------------
 In some cases you don't want to load the user's standard address book, but,
 for example, just a single vCard. For this purpose you have to use the
-class KABC::AddressBook and handle the resource stuff manually.
+class TDEABC::AddressBook and handle the resource stuff manually.
 The following code will create a file resource and save a contact into it:
 
 
-     #include <kabc/addressbook.h>
-     #include <kabc/resourcefile.h>
+     #include <tdeabc/addressbook.h>
+     #include <tdeabc/resourcefile.h>
 
- 1:  KABC::AddressBook ab;
+ 1:  TDEABC::AddressBook ab;
  2:
  3:  // create a file resource
- 4:  KABC::Resource *res = new KABC::ResourceFile( "/home/user/myvcard.vcf", "vcard" );
+ 4:  TDEABC::Resource *res = new TDEABC::ResourceFile( "/home/user/myvcard.vcf", "vcard" );
  5:
  6:  if ( !ab.addResource( res ) ) {
  7:    kdDebug() << "Unable to open resource" << endl;
@@ -143,18 +143,18 @@ The following code will create a file resource and save a contact into it:
 13:    return 2;
 14:  }
 15:
-16:  KABC::Addressee addr;
+16:  TDEABC::Addressee addr;
 17:  addr.setNameFromString( "Otto Harald Meyer" );
 18:  addr.setBirthday( QDate( 1982, 07, 19 ) );
 19:  addr.setNickName( "otto" );
 20:  addr.setMailer( "kmail" );
 21:
 22:  // TZ
-23:  KABC::TimeZone tz( 60 );  // takes time shift in minutes as argument
+23:  TDEABC::TimeZone tz( 60 );  // takes time shift in minutes as argument
 24:  addr.setTimeZone( tz );
 25:
 26:  // GEO
-27:  KABC::Geo geo( 52.5, 13.36 ); // takes latitude and longitude as argument
+27:  TDEABC::Geo geo( 52.5, 13.36 ); // takes latitude and longitude as argument
 28:  addr.setGeo( geo );
 29:
 30:  addr.setTitle( "dude, the" );
@@ -164,11 +164,11 @@ The following code will create a file resource and save a contact into it:
 34:  addr.setUrl( KURL( "http://kaddressbook.org" ) );
 35:
 36:  // CLASS
-37:  KABC::Secrecy secrecy( KABC::Secrecy::Confidential );
+37:  TDEABC::Secrecy secrecy( TDEABC::Secrecy::Confidential );
 38:  addr.setSecrecy( secrecy );
 39:
 40:  // PHOTO or LOGO
-41:  KABC::Picture photo;
+41:  TDEABC::Picture photo;
 42:  QImage img;
 43:  if ( img.load( "face.png", "PNG" ) ) {
 44:    photo.setData( img );
@@ -180,13 +180,13 @@ The following code will create a file resource and save a contact into it:
 50:  addr.insertEmail( "otti@yahoo.com", false );
 51:
 52:  // TEL
-53:  KABC::PhoneNumber phoneHome( "0351 5466738", KABC::PhoneNumber::Home );
-54:  KABC::PhoneNumber phoneWork( "0351 2335411", KABC::PhoneNumber::Work );
+53:  TDEABC::PhoneNumber phoneHome( "0351 5466738", TDEABC::PhoneNumber::Home );
+54:  TDEABC::PhoneNumber phoneWork( "0351 2335411", TDEABC::PhoneNumber::Work );
 55:  addr.insertPhoneNumber( phoneHome );
 56:  addr.insertPhoneNumber( phoneWork );
 57:
 58:  // ADR
-59:  KABC::Address homeAddr( KABC::Address::Home );
+59:  TDEABC::Address homeAddr( TDEABC::Address::Home );
 60:  homeAddr.setStreet( "Milliwaystreet 42" );
 61:  homeAddr.setLocality( "London" );
 62:  homeAddr.setRegion( "Saxony" );
@@ -201,7 +201,7 @@ The following code will create a file resource and save a contact into it:
 71:  ab.insertAddressee( addr ); // will be assigned to the standard resource
 72:                              // automatically
 73:
-74:  KABC::Ticket *ticket = ab.requestSaveTicket( res );
+74:  TDEABC::Ticket *ticket = ab.requestSaveTicket( res );
 75:  if ( !ticket ) {
 76:    kdError() << "Resource is locked by other application!" << endl;
 77:  } else {
@@ -214,8 +214,8 @@ The following code will create a file resource and save a contact into it:
 84:
 85:  return 0;
 
-In line 1 the KABC::AddressBook is created.  In line 4 you creat the
-KABC::ResourceFile (which will handle the loading/saving).
+In line 1 the TDEABC::AddressBook is created.  In line 4 you creat the
+TDEABC::ResourceFile (which will handle the loading/saving).
 The resource takes 2 arguments, the first is the file name and the
 second one the file format. At the moment libkabc supports two file formats:
 1) vCard, as specified in RFC 2426
@@ -229,8 +229,8 @@ as you want.
 In line 11 we try to load all contacts from the backends into the address book.
 As before, it returns whether opening was successful.
 
-In line 16 a KABC::Addressee is created, which we will fill now with data,
-before inserting it into the KABC::AddressBook.
+In line 16 a TDEABC::Addressee is created, which we will fill now with data,
+before inserting it into the TDEABC::AddressBook.
 The setNameFromString() function in the following line takes a string as
 argument and tries to parse it into the single name components such as: given
 name, family name, additional names, honoric prefix and honoric suffix.
@@ -240,34 +240,34 @@ and
   addr.setFamilyName( "Meyer" );
 etc. etc.
 
-In line 23 we use the class KABC::TimeZone to store the timezone. This class
+In line 23 we use the class TDEABC::TimeZone to store the timezone. This class
 takes the time shift in minutes.
 
-In line 27 the KABC::Geo class is used for storing the geographical
+In line 27 the TDEABC::Geo class is used for storing the geographical
 information. The arguments are the latitude and longitude as float values.
 
-KABC::Secrecy in line 37 represents the CLASS entity of a vCard and can take
-KABC::Secrecy::Public, KABC::Secrecy::Private or KABC::Secrecy::Confidential
+TDEABC::Secrecy in line 37 represents the CLASS entity of a vCard and can take
+TDEABC::Secrecy::Public, TDEABC::Secrecy::Private or TDEABC::Secrecy::Confidential
 as argument.
 
-In line 41 we make use of KABC::Picture class to store the photo of the
+In line 41 we make use of TDEABC::Picture class to store the photo of the
 contact. This class can contain either an URL or the raw image data in form
 of a QImage, in this example we use the latter.
 
 In line 43 we try to load the image "face.png" from the local directory and
-assign this QImage to the KABC::Picture class via the setData() function.
+assign this QImage to the TDEABC::Picture class via the setData() function.
 Additionally we set the type of the picture to "image/png".
 
 From 49 - 50 we insert 2 email addresses with the first one as preferred
 (second argument is true).
 
 In 53 and the following 3 lines we add two telephone numbers. For this purpose
-libkabc provides the KABC::PhoneNumber class, which takes the phone number in
+libkabc provides the TDEABC::PhoneNumber class, which takes the phone number in
 string representation as first argument and the type as second. The types can
-be combined, so 'KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax' would be
+be combined, so 'TDEABC::PhoneNumber::Home | TDEABC::PhoneNumber::Fax' would be
 the Home Fax.
 
-In line 59 we create a KABC::Address object and set the single parts in the
+In line 59 we create a TDEABC::Address object and set the single parts in the
 following lines.
 
 In line 67 we assign the contact to a special category.
@@ -279,25 +279,25 @@ The first argument of this function should be the name of the application, so
 the data for each other. The second argument contains the name of the
 custom entry and the third argument the value in string representation.
 
-In line 71 we finally insert the KABC::Addressee object into the
-KABC::AddressBook. Since we have only one resource loaded, the contact is
+In line 71 we finally insert the TDEABC::Addressee object into the
+TDEABC::AddressBook. Since we have only one resource loaded, the contact is
 automatically assigned to this resource. If you have several writeable
 resources loaded, you should ask the user which resource the contact shall
 belong to and assign the selected resource to the contact with
-  KABC::Addressee.setResource( KABC::Resource *resource );
+  TDEABC::Addressee.setResource( TDEABC::Resource *resource );
 before inserting it into the address book.
 
 To prevent multiple access to one resource and possible resulting data loss
 we have to lock the resource before saving our changes.
-For this purpose KABC::AddressBook provides the function
-  requestSaveTicket( KABC::Resource* )
+For this purpose TDEABC::AddressBook provides the function
+  requestSaveTicket( TDEABC::Resource* )
 which takes a pointer to the resource which shall be saved as argument and
 returns a so called 'Save Ticket' if locking succeeded or a null pointer
 if the resource is already locked by another application.
 
 So when we retrieved a valid ticket in line 74, we try to save our changes in
 line 78.
-The KABC::AddressBook::save() function takes the save ticket as argument and
+The TDEABC::AddressBook::save() function takes the save ticket as argument and
 returns whether saving succeeded.  It also releases the save ticket when successful.
 
 Important!
@@ -305,8 +305,8 @@ If the save() call fails, you have to release the save ticket manually, as is
 done in line 80, otherwise possible locks, created by the resources, won't be
 removed.
 
-You can see also, that manual use is quite easy for the KABC::AddressBook class
-and for the ResourceFile. For more information about the API of KABC::Addressee
+You can see also, that manual use is quite easy for the TDEABC::AddressBook class
+and for the ResourceFile. For more information about the API of TDEABC::Addressee
 please take a look at the official API documentation or the header files.
 
 
@@ -315,15 +315,15 @@ Distribution Lists
 libkabc provides so called distribution lists to group contacts. These lists
 just store the uid of contacts, so they can be used for every kind of contact
 grouping. There are 2 classes which handle the whole distribution list tasks,
-KABC::DistributionListManager and KABC::DistributionList. The first one keeps
+TDEABC::DistributionListManager and TDEABC::DistributionList. The first one keeps
 track of all available distribution lists and the latter one is the
 representation of one list.
 
 
-     #include <kabc/distributionlist.h>
-     #include <kabc/stdaddressbook.h>
+     #include <tdeabc/distributionlist.h>
+     #include <tdeabc/stdaddressbook.h>
 
- 1:  KABC::DistributionListManager manager( KABC::StdAddressBook::self() );
+ 1:  TDEABC::DistributionListManager manager( TDEABC::StdAddressBook::self() );
  2:
  3:  // load the lists
  4:  manager.load();
@@ -331,7 +331,7 @@ representation of one list.
  6:  QStringList listNames = manager.listNames();
  7:  QStringList::Iterator it;
  8:  for ( it = listNames.begin(); it != listNames.end(); ++it ) {
- 9:    KABC::DistributionList *list = manager.list( *it );
+ 9:    TDEABC::DistributionList *list = manager.list( *it );
 10:    kdDebug() << list->name() << endl;
 11:
 12:    QStringList emails = list->emails();
@@ -340,14 +340,14 @@ representation of one list.
 15:      kdDebug() << QString( "\t%1" ).arg( (*eit).latin1() ) << endl;
 16:  }
 
-In the first line a KABC::DistributionListManager is created. The manager takes
-a pointer to a KABC::AddressBook, because he has to resolve the stored uids to
+In the first line a TDEABC::DistributionListManager is created. The manager takes
+a pointer to a TDEABC::AddressBook, because he has to resolve the stored uids to
 currently available email addresses.
 In line 4 the manager loads all distribution lists from the central config file
-$HOME/.trinity/share/apps/kabc/distlists.
+$HOME/.trinity/share/apps/tdeabc/distlists.
 The next line queries the names of all available distribution lists, which are
 used in line 9 to retrieve a pointer to the specific list.
-Now that you have a KABC::DistributionList object, you can performe the
+Now that you have a TDEABC::DistributionList object, you can performe the
 following actions on it:
  - set / get the name
  - insert an entry
@@ -357,15 +357,15 @@ following actions on it:
 
 In line 12 we query all email addresses of every resource and print them out.
 
-<kabc/distributionlist.h> contains also the declaration for the class
-KABC::DistributionListWatcher. This class exists only once per application and
+<tdeabc/distributionlist.h> contains also the declaration for the class
+TDEABC::DistributionListWatcher. This class exists only once per application and
 its only job is to emit a signal as soon as the distribution list file has
 changed. So to make your application aware of changes use the following code:
 
 
-     #include <kabc/distributionlist.h>
+     #include <tdeabc/distributionlist.h>
 
- 1:  connect( KABC::DistributionListWatcher::self(), SIGNAL( changed() ),
+ 1:  connect( TDEABC::DistributionListWatcher::self(), SIGNAL( changed() ),
  2:           this, SLOT( slotDistributionListChanged() ) );
 
 You see, as usual, easy ;)
diff --git a/kabc/Makefile.am b/tdeabc/Makefile.am
index c4aa489e7..a1f1d1b74 100644
--- a/kabc/Makefile.am
+++ b/tdeabc/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = vcard vcardparser . formats plugins scripts tests
 
 # Make sure $(all_includes) remains last!
-INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \
+INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_srcdir)/kab \
            -I$(srcdir)/vcard/include -I$(srcdir)/vcardparser/ \
            -I$(srcdir)/vcard/include/generated \
            -I$(srcdir)/vcardparser $(all_includes)
@@ -19,13 +19,13 @@ addressee.cpp addressee.h field.cpp: \
 
 CLEANFILES = addressee.h addressee.cpp field.cpp
 
-lib_LTLIBRARIES = libkabc.la
-libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
-libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
-                    $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkabc_la_COMPILE_FIRST = addressee.h
+lib_LTLIBRARIES = libtdeabc.la
+libtdeabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
+libtdeabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
+                    $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdeabc_la_COMPILE_FIRST = addressee.h
 
-libkabc_la_SOURCES = \
+libtdeabc_la_SOURCES = \
   address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \
   distributionlist.cpp distributionlistdialog.cpp distributionlisteditor.cpp \
   errorhandler.cpp field.cpp formatfactory.cpp geo.cpp key.cpp \
@@ -38,8 +38,8 @@ libkabc_la_SOURCES = \
   sortmode.cpp
 
 
-kabcincludedir = $(includedir)/kabc
-kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
+tdeabcincludedir = $(includedir)/tdeabc
+tdeabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
   agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.h \
   errorhandler.h field.h format.h formatfactory.h formatplugin.h geo.h key.h \
   phonenumber.h picture.h plugin.h resource.h \
@@ -50,22 +50,22 @@ kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
 
 METASOURCES = AUTO
 
-bin_PROGRAMS = kab2kabc
+bin_PROGRAMS = tdeab2tdeabc
 
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kab2kabc_LDADD = libkabc.la ../kab/libkab.la
-kab2kabc_SOURCES = kab2kabc.cpp
+tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeab2tdeabc_LDADD = libtdeabc.la ../kab/libkab.la
+tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp
 
-autostart_DATA = kab2kabc.desktop
+autostart_DATA = tdeab2tdeabc.desktop
 autostartdir = $(datadir)/autostart
 
-manager_DATA = kabc_manager.desktop
-managerdir = $(kde_servicesdir)/kresources
+manager_DATA = tdeabc_manager.desktop
+managerdir = $(kde_servicesdir)/tderesources
 
 DOXYGEN_REFERENCES = tdecore tdeui
 
 map_DATA = countrytransl.map
-mapdir = $(kde_datadir)/kabc
+mapdir = $(kde_datadir)/tdeabc
 
 EXTRA_DIST = $(map_DATA)
 
diff --git a/kabc/README b/tdeabc/README
index 46d21b9b6..46d21b9b6 100644
--- a/kabc/README
+++ b/tdeabc/README
diff --git a/kabc/README.AddressFormat b/tdeabc/README.AddressFormat
index 8079e4914..8079e4914 100644
--- a/kabc/README.AddressFormat
+++ b/tdeabc/README.AddressFormat
diff --git a/tdeabc/TODO b/tdeabc/TODO
new file mode 100644
index 000000000..13f75b6bb
--- /dev/null
+++ b/tdeabc/TODO
@@ -0,0 +1 @@
+Factor out TDELockFile.
diff --git a/kabc/address.cpp b/tdeabc/address.cpp
index 0787bcc4e..e5305f5a0 100644
--- a/kabc/address.cpp
+++ b/tdeabc/address.cpp
@@ -20,16 +20,16 @@
 
 #include "address.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 
 #include <tqfile.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 TQMap<TQString, TQString> *Address::mISOMap = 0;
 static KStaticDeleter< TQMap<TQString, TQString> > isoMapDeleter;
@@ -37,13 +37,13 @@ static KStaticDeleter< TQMap<TQString, TQString> > isoMapDeleter;
 Address::Address() :
   mEmpty( true ), mType( 0 )
 {
-  mId = KApplication::randomString( 10 );
+  mId = TDEApplication::randomString( 10 );
 }
 
 Address::Address( int type ) :
   mEmpty( true ), mType( type )
 {
-  mId = KApplication::randomString( 10 );
+  mId = TDEApplication::randomString( 10 );
 }
 
 bool Address::operator==( const Address &a ) const
@@ -338,7 +338,7 @@ TQString Address::formattedAddress( const TQString &realName,
     ciso = countryToISO( country() );
   } else {
     // fall back to our own country
-    ciso = KGlobal::locale()->country();
+    ciso = TDEGlobal::locale()->country();
   }
   KSimpleConfig entry( locate( "locale", 
         TQString( "l10n/" ) + ciso + TQString( "/entry.desktop" ) ) );
@@ -369,7 +369,7 @@ TQString Address::formattedAddress( const TQString &realName,
   // the rules of our own system country )
   if ( !country().isEmpty() ) {
     KSimpleConfig entry( locate( "locale", TQString( "l10n/" )
-          + KGlobal::locale()->country() + TQString( "/entry.desktop" ) ) );
+          + TDEGlobal::locale()->country() + TQString( "/entry.desktop" ) ) );
     entry.setGroup( "KCM Locale" );
     TQString cpos = entry.readEntry( "AddressCountryPosition" );
     if ( "BELOW" == cpos || cpos.isEmpty() ) {
@@ -520,8 +520,8 @@ TQString Address::countryToISO( const TQString &cname )
   if ( it != mISOMap->end() )
     return it.data();
 
-  TQString mapfile = KGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+  TQString mapfile = TDEGlobal::dirs()->findResource( "data", 
+          TQString::fromLatin1( "tdeabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
@@ -540,8 +540,8 @@ TQString Address::countryToISO( const TQString &cname )
   }
   
   // fall back to system country
-  mISOMap->insert( cname, KGlobal::locale()->country() );
-  return KGlobal::locale()->country();
+  mISOMap->insert( cname, TDEGlobal::locale()->country() );
+  return TDEGlobal::locale()->country();
 }
 
 TQString Address::ISOtoCountry( const TQString &ISOname )
@@ -550,8 +550,8 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
   if ( ISOname.simplifyWhiteSpace().isEmpty() )
     return TQString::null;
 
-  TQString mapfile = KGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+  TQString mapfile = TDEGlobal::dirs()->findResource( "data", 
+          TQString::fromLatin1( "tdeabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
@@ -572,7 +572,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
   return ISOname;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Address &addr )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Address &addr )
 {
     return s << addr.mId << addr.mType << addr.mPostOfficeBox <<
 	    addr.mExtended << addr.mStreet << addr.mLocality <<
@@ -580,7 +580,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Address &addr )
 	    addr.mLabel;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Address &addr )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Address &addr )
 {
     s >> addr.mId >> addr.mType >> addr.mPostOfficeBox >> addr.mExtended >>
 	    addr.mStreet >> addr.mLocality >> addr.mRegion >>
diff --git a/kabc/address.h b/tdeabc/address.h
index a1ffa9f17..796be25a0 100644
--- a/kabc/address.h
+++ b/tdeabc/address.h
@@ -45,7 +45,7 @@
 #define KABC_FMTTAG_condwhite  TQString("%w")
 #define KABC_FMTTAG_purgeempty TQString("%0")
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Postal address information.
@@ -281,7 +281,7 @@ class KABC_EXPORT Address
 
     /**
       Returns ISO code for a localized country name. Only localized country
-      names will be understood. This might be replaced by a KLocale method in
+      names will be understood. This might be replaced by a TDELocale method in
       the future.
       @param cname  name of the country
       @return       two digit ISO code
@@ -290,7 +290,7 @@ class KABC_EXPORT Address
 
     /**
       Returns a localized country name for a ISO code. 
-      This might be replaced by a KLocale method in the future.
+      This might be replaced by a TDELocale method in the future.
       @param ISOname two digit ISO code
       @return        localized name of the country
       @since 3.2
diff --git a/kabc/addressbook.cpp b/tdeabc/addressbook.cpp
index bf6d0d17a..3a8a71f2b 100644
--- a/kabc/addressbook.cpp
+++ b/tdeabc/addressbook.cpp
@@ -22,11 +22,11 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "errorhandler.h"
@@ -35,13 +35,13 @@
 #include "addressbook.h"
 #include "addressbook.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 struct AddressBook::AddressBookData
 {
   Field::List mAllFields;
   ErrorHandler *mErrorHandler;
-  KConfig *mConfig;
+  TDEConfig *mConfig;
   KRES::Manager<Resource> *mManager;
   TQPtrList<Resource> mPendingLoadResources;
   TQPtrList<Resource> mPendingSaveResources;
@@ -318,7 +318,7 @@ AddressBook::AddressBook( const TQString &config )
   if ( config.isEmpty() )
     d->mConfig = 0;
   else
-    d->mConfig = new KConfig( config );
+    d->mConfig = new TDEConfig( config );
   d->mManager = new KRES::Manager<Resource>( "contact" );
   d->mManager->readConfig( d->mConfig );
   d->end.d->mResources = TQValueList<Resource*>();
@@ -673,7 +673,7 @@ bool AddressBook::addCustomField( const TQString &label, int category,
     d->mAllFields = Field::allFields();
   }
 
-  TQString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
+  TQString a = app.isNull() ? TDEGlobal::instance()->instanceName() : app;
   TQString k = key.isNull() ? label : key;
 
   Field *field = Field::createCustomField( label, category, k, a );
@@ -685,14 +685,14 @@ bool AddressBook::addCustomField( const TQString &label, int category,
   return true;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const AddressBook &ab )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const AddressBook &ab )
 {
   if (!ab.d) return s;
 
   return s;// << ab.d->mAddressees;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, AddressBook &ab )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, AddressBook &ab )
 {
   if (!ab.d) return s;
 
diff --git a/kabc/addressbook.h b/tdeabc/addressbook.h
index 7b973be28..09d18d6bb 100644
--- a/kabc/addressbook.h
+++ b/tdeabc/addressbook.h
@@ -24,12 +24,12 @@
 #include <tqobject.h>
 #include <tqptrlist.h>
 
-#include <kresources/manager.h>
+#include <tderesources/manager.h>
 
 #include "addressee.h"
 #include "field.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class ErrorHandler;
 class Resource;
diff --git a/kabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp
index ec8e7be05..028d178b0 100644
--- a/kabc/addresseedialog.cpp
+++ b/tdeabc/addresseedialog.cpp
@@ -23,7 +23,7 @@
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "stdaddressbook.h"
@@ -31,7 +31,7 @@
 #include "addresseedialog.h"
 #include "addresseedialog.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 AddresseeItem::AddresseeItem( TQListView *parent, const Addressee &addressee ) :
   TQListViewItem( parent ),
@@ -66,7 +66,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
   TQBoxLayout *listLayout = new TQVBoxLayout;
   topLayout->addLayout( listLayout );
 
-  mAddresseeList = new KListView( topWidget );
+  mAddresseeList = new TDEListView( topWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->setAllColumnsShowFocus( true );
@@ -78,7 +78,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
            TQT_SLOT( updateEdit( TQListViewItem * ) ) );
 
   mAddresseeEdit = new KLineEdit( topWidget );
-  mAddresseeEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
+  mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
   connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ),
            TQT_SLOT( selectItem( const TQString & ) ) );
   mAddresseeEdit->setFocus();
@@ -96,7 +96,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
                                               topWidget );
     selectedLayout->addWidget( selectedGroup );
 
-    mSelectedList = new KListView( selectedGroup );
+    mSelectedList = new TDEListView( selectedGroup );
     mSelectedList->addColumn( i18n("Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
diff --git a/kabc/addresseedialog.h b/tdeabc/addresseedialog.h
index ebb4bbfcd..718aa61da 100644
--- a/kabc/addresseedialog.h
+++ b/tdeabc/addresseedialog.h
@@ -25,11 +25,11 @@
 
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "addressbook.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Special ListViewItem, that is used by the AddresseeDialog.
@@ -143,10 +143,10 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
 
     bool mMultiple;
 
-    KListView *mAddresseeList;
+    TDEListView *mAddresseeList;
     KLineEdit *mAddresseeEdit;
 
-    KListView *mSelectedList;
+    TDEListView *mSelectedList;
 
     AddressBook *mAddressBook;
 
diff --git a/kabc/addresseehelper.cpp b/tdeabc/addresseehelper.cpp
index f04adc95f..f752788dd 100644
--- a/kabc/addresseehelper.cpp
+++ b/tdeabc/addresseehelper.cpp
@@ -19,12 +19,12 @@
 
 #include <tqapplication.h>
 
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 
 #include "addresseehelper.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 AddresseeHelper * AddresseeHelper::s_self;
 
@@ -39,11 +39,11 @@ AddresseeHelper *AddresseeHelper::self()
 
 AddresseeHelper::AddresseeHelper()
   : TQObject( tqApp ),
-    DCOPObject( "KABC::AddresseeHelper" )
+    DCOPObject( "TDEABC::AddresseeHelper" )
 {
   initSettings();
 
-  connectDCOPSignal( "kaddressbook", "KABC::AddressBookConfig",
+  connectDCOPSignal( "kaddressbook", "TDEABC::AddressBookConfig",
                      "changed()", "initSettings()", false );
 }
 
@@ -81,7 +81,7 @@ void AddresseeHelper::initSettings()
   mPrefixes.insert( "von" );
   mPrefixes.insert( "de" );
 
-  KConfig config( "kabcrc", true, false ); // readonly, no kdeglobals
+  TDEConfig config( "kabcrc", true, false ); // readonly, no kdeglobals
   config.setGroup( "General" );
 
   addToSet( config.readListEntry( "Prefixes" ),   mTitles );
diff --git a/kabc/addresseehelper.h b/tdeabc/addresseehelper.h
index 5280e6b2d..30617b72b 100644
--- a/kabc/addresseehelper.h
+++ b/tdeabc/addresseehelper.h
@@ -31,7 +31,7 @@
   static data, shared by ALL addressee objects
 */
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT AddresseeHelper : public TQObject, public DCOPObject
 {
diff --git a/kabc/addresseelist.cpp b/tdeabc/addresseelist.cpp
index 47324001c..4787c65aa 100644
--- a/kabc/addresseelist.cpp
+++ b/tdeabc/addresseelist.cpp
@@ -26,7 +26,7 @@
 #include "field.h"
 #include "sortmode.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 //
 //
@@ -230,11 +230,11 @@ void AddresseeList::sortByField( Field *field )
   if ( count() == 0 )
     return;
 
-  KABC::FieldSortMode *mode = new KABC::FieldSortMode( sActiveField, !mReverseSorting );
+  TDEABC::FieldSortMode *mode = new TDEABC::FieldSortMode( sActiveField, !mReverseSorting );
 
-  KABC::Addressee::setSortMode( mode );
+  TDEABC::Addressee::setSortMode( mode );
   qHeapSort( *this );
-  KABC::Addressee::setSortMode( 0 );
+  TDEABC::Addressee::setSortMode( 0 );
 
   delete mode;
 }
@@ -244,9 +244,9 @@ void AddresseeList::sortByMode( SortMode *mode )
   if ( count() == 0 )
     return;
 
-  KABC::Addressee::setSortMode( mode );
+  TDEABC::Addressee::setSortMode( mode );
   qHeapSort( *this );
-  KABC::Addressee::setSortMode( 0 );
+  TDEABC::Addressee::setSortMode( 0 );
 }
 
 Field*
diff --git a/kabc/addresseelist.h b/tdeabc/addresseelist.h
index 7c9df0275..bebe0a460 100644
--- a/kabc/addresseelist.h
+++ b/tdeabc/addresseelist.h
@@ -26,7 +26,7 @@
 
 #include "addressee.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class Field;
 class SortField;
@@ -178,9 +178,9 @@ class KABC_EXPORT AddresseeList : public TQValueList<Addressee>
      * class MySortingTrait {
      *   public:
      *     // eq returns true if a1 and a2 are equal
-     *     static bool eq(KABC::Addressee a1, KABC::Addressee a2);
+     *     static bool eq(TDEABC::Addressee a1, TDEABC::Addressee a2);
      *     // lt returns true is a1 is "less than" a2
-     *     static bool lt(KABC::Addressee a1, KABC::Addressee a2);
+     *     static bool lt(TDEABC::Addressee a1, TDEABC::Addressee a2);
      * };
      * \endcode
      * You can then pass this class to the sortByTrait method like this:
diff --git a/kabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp
index fe9d1f602..8194f8ca3 100644
--- a/kabc/addresslineedit.cpp
+++ b/tdeabc/addresslineedit.cpp
@@ -32,16 +32,16 @@
 #include <tqevent.h>
 #include <tqdragobject.h>
 
-#include <kcompletionbox.h>
-#include <kconfig.h>
+#include <tdecompletionbox.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurldrag.h>
 
-#include <kabc/stdaddressbook.h>
-#include <kabc/distributionlist.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/distributionlist.h>
 #include "ldapclient.h"
 
 #include <kdebug.h>
@@ -53,21 +53,21 @@
 //=============================================================================
 
 
-using namespace KABC;
+using namespace TDEABC;
 
-KCompletion * AddressLineEdit::s_completion = 0L;
+TDECompletion * AddressLineEdit::s_completion = 0L;
 bool AddressLineEdit::s_addressesDirty = false;
 TQTimer* AddressLineEdit::s_LDAPTimer = 0L;
 LdapSearch* AddressLineEdit::s_LDAPSearch = 0L;
 TQString* AddressLineEdit::s_LDAPText = 0L;
 AddressLineEdit* AddressLineEdit::s_LDAPLineEdit = 0L;
-KConfig *AddressLineEdit::s_config = 0L;
+TDEConfig *AddressLineEdit::s_config = 0L;
 
-static KStaticDeleter<KCompletion> completionDeleter;
+static KStaticDeleter<TDECompletion> completionDeleter;
 static KStaticDeleter<TQTimer> ldapTimerDeleter;
 static KStaticDeleter<LdapSearch> ldapSearchDeleter;
 static KStaticDeleter<TQString> ldapTextDeleter;
-static KStaticDeleter<KConfig> configDeleter;
+static KStaticDeleter<TDEConfig> configDeleter;
 
 AddressLineEdit::AddressLineEdit(TQWidget* parent,
 		bool useCompletion,
@@ -93,8 +93,8 @@ AddressLineEdit::AddressLineEdit(TQWidget* parent,
 void AddressLineEdit::init()
 {
   if ( !s_completion ) {
-      completionDeleter.setObject( s_completion, new KCompletion() );
-      s_completion->setOrder( KCompletion::Sorted );
+      completionDeleter.setObject( s_completion, new TDECompletion() );
+      s_completion->setOrder( TDECompletion::Sorted );
       s_completion->setIgnoreCase( true );
   }
 
@@ -115,7 +115,7 @@ void AddressLineEdit::init()
       connect( this, TQT_SIGNAL( completion(const TQString&)),
                this, TQT_SLOT(slotCompletion() ));
       
-      KCompletionBox *box = completionBox();
+      TDECompletionBox *box = completionBox();
       connect( box, TQT_SIGNAL( highlighted( const TQString& )),
                this, TQT_SLOT( slotPopupCompletion( const TQString& ) ));
       connect( box, TQT_SIGNAL( userCancelled( const TQString& )),
@@ -136,10 +136,10 @@ AddressLineEdit::~AddressLineEdit()
 
 //-----------------------------------------------------------------------------
 
-KConfig* AddressLineEdit::config()
+TDEConfig* AddressLineEdit::config()
 {
   if ( !s_config )
-    configDeleter.setObject( s_config, new KConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
+    configDeleter.setObject( s_config, new TDEConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
 
   return s_config;
 }
@@ -156,12 +156,12 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
 {
     bool accept = false;
 
-    if (KStdAccel::shortcut(KStdAccel::SubstringCompletion).contains(KKey(e)))
+    if (TDEStdAccel::shortcut(TDEStdAccel::SubstringCompletion).contains(KKey(e)))
     {
         doCompletion(true);
         accept = true;
     }
-    else if (KStdAccel::shortcut(KStdAccel::TextCompletion).contains(KKey(e)))
+    else if (TDEStdAccel::shortcut(TDEStdAccel::TextCompletion).contains(KKey(e)))
     {
         int len = text().length();
         
@@ -326,16 +326,16 @@ void AddressLineEdit::doCompletion(bool ctrlT)
         return;
     }
     
-    KGlobalSettings::Completion  mode = completionMode();
+    TDEGlobalSettings::Completion  mode = completionMode();
     
     switch ( mode )
     {
-        case KGlobalSettings::CompletionPopupAuto:
+        case TDEGlobalSettings::CompletionPopupAuto:
         {
             if (s.isEmpty())
                 break;
         }
-        case KGlobalSettings::CompletionPopup:        
+        case TDEGlobalSettings::CompletionPopup:        
         {
             m_previousAddresses = prevAddr;
             TQStringList items = s_completion->allMatches( s );
@@ -368,7 +368,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
                 // completion (suggestion) since it does not know how to deal
                 // with providing proper completions for different items on the 
                 // same line, e.g. comma-separated list of email addresses.
-                bool autoSuggest = (mode != KGlobalSettings::CompletionPopupAuto);                                
+                bool autoSuggest = (mode != TDEGlobalSettings::CompletionPopupAuto);                                
                 setCompletedItems( items, autoSuggest );
                 
                 if (!autoSuggest)
@@ -385,7 +385,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
             break;
         }
 
-        case KGlobalSettings::CompletionShell:
+        case TDEGlobalSettings::CompletionShell:
         {
             TQString match = s_completion->makeCompletion( s );
             if ( !match.isNull() && match != s )
@@ -396,8 +396,8 @@ void AddressLineEdit::doCompletion(bool ctrlT)
             break;
         }
 
-        case KGlobalSettings::CompletionMan: // Short-Auto in fact
-        case KGlobalSettings::CompletionAuto:
+        case TDEGlobalSettings::CompletionMan: // Short-Auto in fact
+        case TDEGlobalSettings::CompletionAuto:
         {
             if (!s.isEmpty())
             {              
@@ -410,7 +410,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
                 break;
             }
         }        
-        case KGlobalSettings::CompletionNone:
+        case TDEGlobalSettings::CompletionNone:
         default: // fall through        
             break;
     }
@@ -496,7 +496,7 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs )
     
     if( hasFocus() || completionBox()->hasFocus())
     {
-        if( completionMode() != KGlobalSettings::CompletionNone )
+        if( completionMode() != TDEGlobalSettings::CompletionNone )
         {
             doCompletion( false );
         }
@@ -559,8 +559,8 @@ TQStringList AddressLineEdit::addresses()
   TQString endQuote("\" ");
   TQString addr, email;
 
-  KABC::AddressBook *addressBook = KABC::StdAddressBook::self();
-  KABC::AddressBook::Iterator it;
+  TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self();
+  TDEABC::AddressBook::Iterator it;
   for( it = addressBook->begin(); it != addressBook->end(); ++it ) {
     TQStringList emails = (*it).emails();
     
@@ -598,7 +598,7 @@ TQStringList AddressLineEdit::addresses()
     }
   }
   
-  KABC::DistributionListManager manager( addressBook );
+  TDEABC::DistributionListManager manager( addressBook );
   manager.load();
   result += manager.listNames();
 
diff --git a/kabc/addresslineedit.h b/tdeabc/addresslineedit.h
index 093acf97b..ee10b5bbd 100644
--- a/kabc/addresslineedit.h
+++ b/tdeabc/addresslineedit.h
@@ -30,9 +30,9 @@
 #include "klineedit.h"
 #include "kcompletion.h"
 
-class KConfig;
+class TDEConfig;
 
-namespace KABC {
+namespace TDEABC {
 
 class LdapSearch;
 
@@ -61,7 +61,7 @@ public:
    */
   virtual void setFont( const TQFont& );
 
-  static KConfig *config();
+  static TDEConfig *config();
 
 public slots:
   /**
@@ -107,12 +107,12 @@ private:
   TQString m_typedText; // unused
 
   static bool s_addressesDirty;
-  static KCompletion *s_completion;
+  static TDECompletion *s_completion;
   static TQTimer *s_LDAPTimer;
   static LdapSearch *s_LDAPSearch;
   static TQString *s_LDAPText;
   static AddressLineEdit *s_LDAPLineEdit;
-  static KConfig *s_config;
+  static TDEConfig *s_config;
 
 private:
   class AddressLineEditPrivate* d;
diff --git a/kabc/agent.cpp b/tdeabc/agent.cpp
index 571b7803e..2b2747697 100644
--- a/kabc/agent.cpp
+++ b/tdeabc/agent.cpp
@@ -22,7 +22,7 @@
 
 #include "agent.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Agent::Agent()
   : mAddressee( 0 ), mIntern( false )
@@ -122,7 +122,7 @@ TQString Agent::asString() const
     return mUrl;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Agent &agent )
 {
   TQ_UINT32 hasAddressee = ( agent.mAddressee != 0 );
 
@@ -133,7 +133,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
   return s;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Agent &agent )
 {
   TQ_UINT32 hasAddressee;
 
diff --git a/kabc/agent.h b/tdeabc/agent.h
index dbe048f08..b982456c5 100644
--- a/kabc/agent.h
+++ b/tdeabc/agent.h
@@ -27,7 +27,7 @@ class TQDataStream;
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class Addressee;
 
diff --git a/kabc/countrytransl.map b/tdeabc/countrytransl.map
index 1459f0942..1459f0942 100644
--- a/kabc/countrytransl.map
+++ b/tdeabc/countrytransl.map
diff --git a/kabc/distributionlist.cpp b/tdeabc/distributionlist.cpp
index bb89b6d00..e811c4d65 100644
--- a/kabc/distributionlist.cpp
+++ b/tdeabc/distributionlist.cpp
@@ -28,7 +28,7 @@
 
 #include "distributionlist.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 DistributionList::DistributionList( DistributionListManager *manager,
                                     const TQString &name ) :
@@ -185,7 +185,7 @@ TQStringList DistributionListManager::listNames()
 
 bool DistributionListManager::load()
 {
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
 
   TQMap<TQString,TQString> entryMap = cfg.entryMap( "DistributionLists" );
   cfg.setGroup( "DistributionLists" );
@@ -233,7 +233,7 @@ bool DistributionListManager::save()
 {
   kdDebug(5700) << "DistListManager::save()" << endl;
 
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
 
   cfg.deleteGroup( "DistributionLists" );
   cfg.setGroup( "DistributionLists" );
@@ -273,7 +273,7 @@ DistributionListWatcher::DistributionListWatcher()
  : TQObject( tqApp, "DistributionListWatcher" )
 {
   mDirWatch = new KDirWatch;
-  mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
+  mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) );
   
   connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) );
   mDirWatch->startScan();
diff --git a/kabc/distributionlist.h b/tdeabc/distributionlist.h
index 78d182467..0c2bdf0bd 100644
--- a/kabc/distributionlist.h
+++ b/tdeabc/distributionlist.h
@@ -25,7 +25,7 @@
 
 #include "addressbook.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class DistributionListManager;
 
@@ -180,7 +180,7 @@ class KABC_EXPORT DistributionListManager
   Exapmle:
 
   \code
-  KABC::DistributionListWatcher *watchdog = KABC::DistributionListWatcher::self()
+  TDEABC::DistributionListWatcher *watchdog = TDEABC::DistributionListWatcher::self()
 
   connect( watchdog, TQT_SIGNAL( changed() ), TQT_SLOT( doSomething() ) );
   \endcode
diff --git a/kabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp
index b00b14d42..c440fcb4c 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/tdeabc/distributionlistdialog.cpp
@@ -27,9 +27,9 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "addressbook.h"
 #include "addresseedialog.h"
@@ -38,7 +38,7 @@
 #include "distributionlistdialog.h"
 #include "distributionlistdialog.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 DistributionListDialog::DistributionListDialog( AddressBook *addressBook, TQWidget *parent)
     : KDialogBase( parent, "", true, i18n("Configure Distribution Lists"), Ok, Ok, true)
diff --git a/kabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h
index 1bd6fc788..d4286a54b 100644
--- a/kabc/distributionlistdialog.h
+++ b/tdeabc/distributionlistdialog.h
@@ -29,7 +29,7 @@ class TQListView;
 class TQComboBox;
 class TQButtonGroup;
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class DistributionListEditorWidget;
@@ -46,8 +46,8 @@ class DistributionListManager;
   Example:
  
   \code
-  KABC::DistributionListDialog *dlg = new
-          KABC::DistributionListDialog( KABC::StdAddressBook::self(), this );
+  TDEABC::DistributionListDialog *dlg = new
+          TDEABC::DistributionListDialog( TDEABC::StdAddressBook::self(), this );
  
   dlg->exec();
   \endcode
diff --git a/kabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp
index 573f0970a..76fd35568 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/tdeabc/distributionlisteditor.cpp
@@ -26,7 +26,7 @@
 #include <tqradiobutton.h>
 
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "addressbook.h"
@@ -36,7 +36,7 @@
 #include "distributionlisteditor.h"
 #include "distributionlisteditor.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString &current,
                                       TQWidget *parent ) :
diff --git a/kabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h
index faec280e6..6da6495f8 100644
--- a/kabc/distributionlisteditor.h
+++ b/tdeabc/distributionlisteditor.h
@@ -28,7 +28,7 @@ class TQListView;
 class TQComboBox;
 class TQButtonGroup;
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class DistributionListManager;
diff --git a/kabc/errorhandler.cpp b/tdeabc/errorhandler.cpp
index d8ab650c7..3208b84c9 100644
--- a/kabc/errorhandler.cpp
+++ b/tdeabc/errorhandler.cpp
@@ -21,14 +21,14 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqapplication.h>
 
 #include "errorhandler.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 void ConsoleErrorHandler::error( const TQString &msg )
 {
diff --git a/kabc/errorhandler.h b/tdeabc/errorhandler.h
index 9a316541d..d3d3f253d 100644
--- a/kabc/errorhandler.h
+++ b/tdeabc/errorhandler.h
@@ -28,7 +28,7 @@
 
 class TQWidget;
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   Abstract class that provides displaying of error messages.
diff --git a/kabc/field.h b/tdeabc/field.h
index f1de43717..08322ecf5 100644
--- a/kabc/field.h
+++ b/tdeabc/field.h
@@ -26,9 +26,9 @@
 
 #include "addressee.h"
 
-class KConfig;
+class TDEConfig;
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT Field
 {
@@ -78,18 +78,18 @@ public:
    * Addressee. Returns TQString::null, if it is not possible to convert the
    * value to a string.
    */
-  virtual TQString value( const KABC::Addressee & );
+  virtual TQString value( const TDEABC::Addressee & );
 
   /**
    * Sets the value of the field in the given Addressee. Returns true on success
    * or false, if the given string couldn't be converted to a valid value.
    */
-  virtual bool setValue( KABC::Addressee &, const TQString & );
+  virtual bool setValue( TDEABC::Addressee &, const TQString & );
 
   /**
    * Returns a string, that can be used for sorting.
    */
-  TQString sortKey( const KABC::Addressee & );
+  TQString sortKey( const TDEABC::Addressee & );
 
   /**
    * Returns, if the field is a user-defined field.
@@ -134,11 +134,11 @@ public:
    * @param identifier The unique identifier
    * @param fields     The list of the fields
    */
-  static void saveFields( KConfig *cfg, const TQString &identifier,
+  static void saveFields( TDEConfig *cfg, const TQString &identifier,
                           const Field::List &fields );
   /**
    * This is the same as above, with the difference, that
-   * the list is stored in KGlobal::config() in group "KABCFields".
+   * the list is stored in TDEGlobal::config() in group "KABCFields".
    */
   static void saveFields( const TQString &identifier,
                           const Field::List &fields );
@@ -149,11 +149,11 @@ public:
    * @param cfg        The config file object
    * @param identifier The unique identifier
    */
-  static Field::List restoreFields( KConfig *cfg, const TQString &identifier );
+  static Field::List restoreFields( TDEConfig *cfg, const TQString &identifier );
 
   /**
    * This is the same as above, with the difference, that
-   * the list is loaded from KGlobal::config() from group "KABCFields".
+   * the list is loaded from TDEGlobal::config() from group "KABCFields".
    */
   static Field::List restoreFields( const TQString &identifier );
 
diff --git a/kabc/format.h b/tdeabc/format.h
index ed036673c..77c2edcc5 100644
--- a/kabc/format.h
+++ b/tdeabc/format.h
@@ -24,7 +24,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 
diff --git a/kabc/formatfactory.cpp b/tdeabc/formatfactory.cpp
index 8af9e1701..4839acc4d 100644
--- a/kabc/formatfactory.cpp
+++ b/tdeabc/formatfactory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
@@ -30,7 +30,7 @@
 
 #include "formatfactory.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 FormatFactory *FormatFactory::mSelf = 0;
 static KStaticDeleter<FormatFactory> factoryDeleter;
@@ -56,7 +56,7 @@ FormatFactory::FormatFactory()
   info->descriptionLabel = i18n( "vCard Format" );
   mFormatList.insert( "vcard", info );
 
-  const TQStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
+  const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"tdeabc/formats/*.desktop", true, true );
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
   {
     KSimpleConfig config( *it, true );
diff --git a/kabc/formatfactory.h b/tdeabc/formatfactory.h
index 76a3704d5..0994fe109 100644
--- a/kabc/formatfactory.h
+++ b/tdeabc/formatfactory.h
@@ -24,12 +24,12 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 
 #include "formatplugin.h"
 
-namespace KABC {
+namespace TDEABC {
 
 struct FormatInfo
 {
@@ -44,12 +44,12 @@ struct FormatInfo
  * Example:
  *
  * \code
- * KABC::FormatFactory *factory = KABC::FormatFactory::self();
+ * TDEABC::FormatFactory *factory = TDEABC::FormatFactory::self();
  *
  * TQStringList list = factory->formats();
  * TQStringList::Iterator it;
  * for ( it = list.begin(); it != list.end(); ++it ) {
- *   KABC::FormatPlugin *format = factory->format( (*it) );
+ *   TDEABC::FormatPlugin *format = factory->format( (*it) );
  *   // do something with format
  * }
  * \endcode
diff --git a/kabc/formatplugin.h b/tdeabc/formatplugin.h
index 33f4beea0..c6fb59858 100644
--- a/kabc/formatplugin.h
+++ b/tdeabc/formatplugin.h
@@ -26,7 +26,7 @@
 #include "plugin.h"
 #include "resource.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class Addressee;
diff --git a/kabc/formats/CMakeLists.txt b/tdeabc/formats/CMakeLists.txt
index 327cb1ea6..48fddc70c 100644
--- a/kabc/formats/CMakeLists.txt
+++ b/tdeabc/formats/CMakeLists.txt
@@ -10,16 +10,16 @@
 #################################################
 
 include_directories(
-  ${CMAKE_BINARY_DIR}/kabc
-  ${CMAKE_SOURCE_DIR}/kabc
+  ${CMAKE_BINARY_DIR}/tdeabc
+  ${CMAKE_SOURCE_DIR}/tdeabc
 
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -29,12 +29,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES binary.desktop DESTINATION ${DATA_INSTALL_DIR}/kabc/formats )
+install( FILES binary.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeabc/formats )
 
 
-##### kabcformat_binary #########################
+##### tdeabcformat_binary #########################
 
-set( target kabcformat_binary )
+set( target tdeabcformat_binary )
 
 set( ${target}_SRCS
   binaryformat.cpp
@@ -42,6 +42,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeabc/formats/Makefile.am b/tdeabc/formats/Makefile.am
new file mode 100644
index 000000000..e96ff8203
--- /dev/null
+++ b/tdeabc/formats/Makefile.am
@@ -0,0 +1,22 @@
+INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
+
+kde_module_LTLIBRARIES = tdeabcformat_binary.la
+
+tdeabcformat_binary_la_SOURCES = binaryformat.cpp
+tdeabcformat_binary_la_LDFLAGS =  -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
+                                -no-undefined
+tdeabcformat_binary_la_LIBADD  = $(LIB_TDEABC) $(LIB_QT) $(LIB_TDECORE)
+tdeabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
+
+# these are the headers for your project
+noinst_HEADERS = binaryformat.h
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeabcformat_binary.pot
+
+linkdir = $(kde_datadir)/tdeabc/formats
+link_DATA = binary.desktop
+EXTRA_DIST = $(link_DATA)
diff --git a/kabc/formats/binary.desktop b/tdeabc/formats/binary.desktop
index 993286ad5..5441ac23a 100644
--- a/kabc/formats/binary.desktop
+++ b/tdeabc/formats/binary.desktop
@@ -86,4 +86,4 @@ Name[zu]=Okuhambisana ngambili
 
 [Plugin]
 Type=binary
-X-TDE-Library=kabcformat_binary
+X-TDE-Library=tdeabcformat_binary
diff --git a/kabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp
index a82a017a3..15dbec8a8 100644
--- a/kabc/formats/binaryformat.cpp
+++ b/tdeabc/formats/binaryformat.cpp
@@ -22,7 +22,7 @@
 #include <tqimage.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"
@@ -34,7 +34,7 @@
 
 #define BINARY_FORMAT_VERSION 1
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
@@ -172,7 +172,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
 
   if ( photo.isIntern() ) {
     TQImage img;
-    if ( !img.load( locateLocal( "data", "kabc/photos/" ) + addressee.uid() ) )
+    if ( !img.load( locateLocal( "data", "tdeabc/photos/" ) + addressee.uid() ) )
       kdDebug(5700) << "No photo available for '" << addressee.uid() << "'." << endl;
 
     addressee.setPhoto( img );
@@ -180,7 +180,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
 
   if ( logo.isIntern() ) {
     TQImage img;
-    if ( !img.load( locateLocal( "data", "kabc/logos/" ) + addressee.uid() ) )
+    if ( !img.load( locateLocal( "data", "tdeabc/logos/" ) + addressee.uid() ) )
       kdDebug(5700) << "No logo available for '" << addressee.uid() << "'." << endl;
 
     addressee.setLogo( img );
@@ -201,7 +201,7 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stre
 
   if ( photo.isIntern() ) {
     TQImage img = photo.data();
-    TQString fileName = locateLocal( "data", "kabc/photos/" ) + addressee.uid();
+    TQString fileName = locateLocal( "data", "tdeabc/photos/" ) + addressee.uid();
 
     if ( !img.save( fileName, "PNG" ) )
       kdDebug(5700) << "Unable to save photo for '" << addressee.uid() << "'." << endl;
@@ -209,7 +209,7 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stre
 
   if ( logo.isIntern() ) {
     TQImage img = logo.data();
-    TQString fileName = locateLocal( "data", "kabc/logos/" ) + addressee.uid();
+    TQString fileName = locateLocal( "data", "tdeabc/logos/" ) + addressee.uid();
 
     if ( !img.save( fileName, "PNG" ) )
       kdDebug(5700) << "Unable to save logo for '" << addressee.uid() << "'." << endl;
diff --git a/kabc/formats/binaryformat.h b/tdeabc/formats/binaryformat.h
index 09efde41a..faf6c8e5a 100644
--- a/kabc/formats/binaryformat.h
+++ b/tdeabc/formats/binaryformat.h
@@ -22,7 +22,7 @@
 
 #include "formatplugin.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class Addressee;
diff --git a/kabc/geo.cpp b/tdeabc/geo.cpp
index 44f9851e4..9883595a4 100644
--- a/kabc/geo.cpp
+++ b/tdeabc/geo.cpp
@@ -22,7 +22,7 @@
 
 #include "geo.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Geo::Geo()
   : mLatitude( 91 ), mLongitude( 181 ), mValidLat( false ), mValidLong( false )
@@ -93,12 +93,12 @@ TQString Geo::asString() const
   return "(" + TQString::number(mLatitude) + "," + TQString::number(mLongitude) + ")";
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Geo &geo )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Geo &geo )
 {
     return s << (float)geo.mLatitude << (float)geo.mLongitude;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Geo &geo )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Geo &geo )
 {
     s >> geo.mLatitude >> geo.mLongitude;
 
diff --git a/kabc/geo.h b/tdeabc/geo.h
index cac6abaff..55cf18680 100644
--- a/kabc/geo.h
+++ b/tdeabc/geo.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Geographic position
diff --git a/kabc/key.cpp b/tdeabc/key.cpp
index 0d917595d..d4456f516 100644
--- a/kabc/key.cpp
+++ b/tdeabc/key.cpp
@@ -18,17 +18,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 #include "key.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Key::Key( const TQString &text, int type )
   : mTextData( text ), mIsBinary( false ), mType( type )
 {
-  mId = KApplication::randomString(8);
+  mId = TDEApplication::randomString(8);
 }
 
 Key::~Key()
@@ -138,13 +138,13 @@ TQString Key::typeLabel( int type )
   }
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Key &key )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Key &key )
 {
     return s << key.mId << key.mIsBinary << key.mTextData << key.mBinaryData <<
              key.mCustomTypeString << key.mType;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Key &key )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Key &key )
 {
     s >> key.mId >> key.mIsBinary >> key.mTextData >> key.mBinaryData >>
     key.mCustomTypeString >> key.mType;
diff --git a/kabc/key.h b/tdeabc/key.h
index 08df0264d..94d1a28b3 100644
--- a/kabc/key.h
+++ b/tdeabc/key.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
  * @short A class to store an encryption key.
diff --git a/kabc/ldapclient.cpp b/tdeabc/ldapclient.cpp
index 39e4c504f..31256f46f 100644
--- a/kabc/ldapclient.cpp
+++ b/tdeabc/ldapclient.cpp
@@ -29,8 +29,8 @@
 #include <tqtextstream.h>
 #include <tqurl.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kprotocolinfo.h>
@@ -39,7 +39,7 @@
 #include "ldif.h"
 #include "ldapurl.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 class LdapClient::LdapClientPrivate{
 public:
@@ -137,12 +137,12 @@ void LdapClient::startQuery( const TQString& filter )
 
   startParseLDIF();
   mActive = true;
-  mJob = KIO::get( url, false, false );
-  connect( mJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
-  connect( mJob, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
-  connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ),
+  mJob = TDEIO::get( url, false, false );
+  connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+  connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
            this, TQT_SLOT( slotDone() ) );
 }
 
@@ -156,7 +156,7 @@ void LdapClient::cancelQuery()
   mActive = false;
 }
 
-void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
+void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data )
 {
 #ifndef NDEBUG // don't create the QString
 //  TQString str( data );
@@ -165,7 +165,7 @@ void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
   parseLDIF( data );
 }
 
-void LdapClient::slotInfoMessage( KIO::Job*, const TQString & )
+void LdapClient::slotInfoMessage( TDEIO::Job*, const TQString & )
 {
   //tqDebug("Job said \"%s\"", info.latin1());
 }
@@ -180,8 +180,8 @@ void LdapClient::slotDone()
   }
 #endif
   int err = mJob->error();
-  if ( err && err != KIO::ERR_USER_CANCELED ) {
-    emit error( KIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) );
+  if ( err && err != TDEIO::ERR_USER_CANCELED ) {
+    emit error( TDEIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) );
   }
   emit done();
 }
@@ -251,7 +251,7 @@ LdapSearch::LdapSearch()
   }
 
   // stolen from KAddressBook
-  KConfig config( "kabldaprc", true );
+  TDEConfig config( "kabldaprc", true );
   config.setGroup( "LDAP" );
   int numHosts = config.readUnsignedNumEntry( "NumSelectedHosts");
   if ( !numHosts ) {
@@ -285,8 +285,8 @@ LdapSearch::LdapSearch()
       attrs << "cn" << "mail" << "givenname" << "sn";
       ldapClient->setAttrs( attrs );
 
-      connect( ldapClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
-               this, TQT_SLOT( slotLDAPResult( const KABC::LdapObject& ) ) );
+      connect( ldapClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
+               this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
       connect( ldapClient, TQT_SIGNAL( done() ),
                this, TQT_SLOT( slotLDAPDone() ) );
       connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ),
@@ -338,7 +338,7 @@ void LdapSearch::cancelSearch()
   mResults.clear();
 }
 
-void LdapSearch::slotLDAPResult( const KABC::LdapObject& obj )
+void LdapSearch::slotLDAPResult( const TDEABC::LdapObject& obj )
 {
   mResults.append( obj );
   if ( !mDataTimer.isActive() )
@@ -381,7 +381,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
 {
   TQString search_text_upper = mSearchText.upper();
 
-  TQValueList< KABC::LdapObject >::ConstIterator it1;
+  TQValueList< TDEABC::LdapObject >::ConstIterator it1;
   for ( it1 = mResults.begin(); it1 != mResults.end(); ++it1 ) {
     TQString name, mail, givenname, sn;
 
diff --git a/kabc/ldapclient.h b/tdeabc/ldapclient.h
index 2054b1302..a4a5747a6 100644
--- a/kabc/ldapclient.h
+++ b/tdeabc/ldapclient.h
@@ -31,9 +31,9 @@
 #include <tqguardedptr.h>
 #include <tqtimer.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class LdapClient;
 typedef TQValueList<TQByteArray> LdapAttrValue;
@@ -103,7 +103,7 @@ class KABC_EXPORT LdapClient : public TQObject
     /*! Emitted once for each object returned
      * from the query
      */
-    void result( const KABC::LdapObject& );
+    void result( const TDEABC::LdapObject& );
 
   public slots:
     /*!
@@ -157,8 +157,8 @@ class KABC_EXPORT LdapClient : public TQObject
     void cancelQuery();
 
   protected slots:
-    void slotData( KIO::Job*, const TQByteArray &data );
-    void slotInfoMessage( KIO::Job*, const TQString &info );
+    void slotData( TDEIO::Job*, const TQByteArray &data );
+    void slotInfoMessage( TDEIO::Job*, const TQString &info );
     void slotDone();
 
   protected:
@@ -172,7 +172,7 @@ class KABC_EXPORT LdapClient : public TQObject
     TQString mScope;
     TQStringList mAttrs;
 
-    TQGuardedPtr<KIO::SimpleJob> mJob;
+    TQGuardedPtr<TDEIO::SimpleJob> mJob;
     bool mActive;
 
     LdapObject mCurrentObject;
@@ -221,11 +221,11 @@ class KABC_EXPORT LdapSearch : public TQObject
     void searchData( const TQStringList& );
     /// Another form for the results, with separate fields
     /// (This signal can be emitted many times)
-    void searchData( const KABC::LdapResultList& );
+    void searchData( const TDEABC::LdapResultList& );
     void searchDone();
 
   private slots:
-    void slotLDAPResult( const KABC::LdapObject& );
+    void slotLDAPResult( const TDEABC::LdapObject& );
     void slotLDAPError( const TQString& );
     void slotLDAPDone();
     void slotDataTimer();
diff --git a/kabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp
index b0a899d8c..6e339cb2c 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/tdeabc/ldapconfigwidget.cpp
@@ -29,10 +29,10 @@
 #include <tqhbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kmessagebox.h>
-#include <kaccelmanager.h>
+#include <tdemessagebox.h>
+#include <tdeaccelmanager.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kprogress.h>
@@ -42,7 +42,7 @@
 #include "ldapconfigwidget.h"
 #include "ldapconfigwidget.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 LdapConfigWidget::LdapConfigWidget( TQWidget* parent,
   const char* name, WFlags fl ) : TQWidget( parent, name, fl )
@@ -243,7 +243,7 @@ void LdapConfigWidget::initWidget()
 
 }
 
-void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d )
+void LdapConfigWidget::loadData( TDEIO::Job*, const TQByteArray& d )
 {
   LDIF::ParseVal ret;
 
@@ -261,10 +261,10 @@ void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d )
   } while ( ret != LDIF::MoreData );
 }
 
-void LdapConfigWidget::loadResult( KIO::Job* job)
+void LdapConfigWidget::loadResult( TDEIO::Job* job)
 {
   int error = job->error();
-  if ( error && error != KIO::ERR_USER_CANCELED )
+  if ( error && error != TDEIO::ERR_USER_CANCELED )
     mErrorMsg = job->errorString();
   else
     mErrorMsg = "";
@@ -291,12 +291,12 @@ void LdapConfigWidget::sendQuery()
 
   kdDebug(5700) << "sendQuery url: " << _url.prettyURL() << endl;
   mLdif.startParsing();
-  KIO::Job *job = KIO::get( _url, true, false );
+  TDEIO::Job *job = TDEIO::get( _url, true, false );
   job->addMetaData("no-auth-prompt","true");
-  connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-    this, TQT_SLOT( loadData( KIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-    this, TQT_SLOT( loadResult( KIO::Job* ) ) );
+  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+    this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQT_SLOT( loadResult( TDEIO::Job* ) ) );
 
   if ( mProg == NULL )
     mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true );
diff --git a/kabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h
index c4144b027..662534fd6 100644
--- a/kabc/ldapconfigwidget.h
+++ b/tdeabc/ldapconfigwidget.h
@@ -25,9 +25,9 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-#include <kabc/ldapurl.h>
-#include <kabc/ldif.h>
-#include <kio/job.h>
+#include <tdeabc/ldapurl.h>
+#include <tdeabc/ldif.h>
+#include <tdeio/job.h>
 
 class TQGridLayout;
 class TQSpinBox;
@@ -38,13 +38,13 @@ class KComboBox;
 class KLineEdit;
 class KProgressDialog;
 
-namespace KABC {
+namespace TDEABC {
 
   /**
     @short LDAP Configuration widget
  
     This class can be used to query the user for LDAP connection parameters. 
-    It's KConfigXT compatible, using widget names starting with kcfg_
+    It's TDEConfigXT compatible, using widget names starting with kcfg_
   */
 
   class KABC_EXPORT LdapConfigWidget : public TQWidget
@@ -223,23 +223,23 @@ namespace KABC {
 
       /**
        * Sets the size limit.
-       * KConfig widget name: kcfg_ldapsizelimit
+       * TDEConfig widget name: kcfg_ldapsizelimit
        */
       void setSizeLimit( int sizelimit );
       /**
        * Returns the size limit.
-       * KConfig widget name: kcfg_ldapsizelimit
+       * TDEConfig widget name: kcfg_ldapsizelimit
        */
       int sizeLimit() const;
 
       /**
        * Sets the time limit.
-       * KConfig widget name: kcfg_ldaptimelimit
+       * TDEConfig widget name: kcfg_ldaptimelimit
        */
       void setTimeLimit( int timelimit );
       /**
        * Returns the time limit.
-       * KConfig widget name: kcfg_ldaptimelimit
+       * TDEConfig widget name: kcfg_ldaptimelimit
        */
       int timeLimit() const;
 
@@ -252,7 +252,7 @@ namespace KABC {
        * Returns a LDAP Url constructed from the settings given.
        * Extensions are filled for use in the LDAP ioslave
        */
-      KABC::LDAPUrl url() const;
+      TDEABC::LDAPUrl url() const;
 
     private slots:
       void setLDAPPort();
@@ -262,8 +262,8 @@ namespace KABC {
       void setSASL( int state );
       void mQueryDNClicked();
       void mQueryMechClicked();
-      void loadData( KIO::Job*, const TQByteArray& );
-      void loadResult( KIO::Job* );  
+      void loadData( TDEIO::Job*, const TQByteArray& );
+      void loadResult( TDEIO::Job* );  
     private:
 
       int mFlags;
diff --git a/kabc/ldapurl.cpp b/tdeabc/ldapurl.cpp
index 9032c16d3..95363efaf 100644
--- a/kabc/ldapurl.cpp
+++ b/tdeabc/ldapurl.cpp
@@ -24,7 +24,7 @@
 
 #include "ldapurl.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 LDAPUrl::LDAPUrl()
 {
diff --git a/kabc/ldapurl.h b/tdeabc/ldapurl.h
index 0c2693758..f86c8a466 100644
--- a/kabc/ldapurl.h
+++ b/tdeabc/ldapurl.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
  * LDAPUrl
diff --git a/kabc/ldif.cpp b/tdeabc/ldif.cpp
index 9d007b7ff..a40f5a818 100644
--- a/kabc/ldif.cpp
+++ b/tdeabc/ldif.cpp
@@ -23,7 +23,7 @@
 
 #include "ldif.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 LDIF::LDIF()
 {
@@ -254,7 +254,7 @@ LDIF::ParseVal LDIF::processLine()
       break;
     case Entry_Mod:
       if ( mModType == Mod_None ) {
-        kdDebug(5700) << "kio_ldap: new modtype " << mAttr << endl;
+        kdDebug(5700) << "tdeio_ldap: new modtype " << mAttr << endl;
         if ( mAttr.isEmpty() && mVal.size() == 0 ) {
           retval = EndEntry;
         } else if ( attrLower == "add" ) {
diff --git a/kabc/ldif.h b/tdeabc/ldif.h
index f4da5f4f3..6cbc536e8 100644
--- a/kabc/ldif.h
+++ b/tdeabc/ldif.h
@@ -27,7 +27,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
   /**
    * LDIF
diff --git a/kabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp
index 4bf989395..8338f5ba0 100644
--- a/kabc/ldifconverter.cpp
+++ b/tdeabc/ldifconverter.cpp
@@ -38,7 +38,7 @@
 #include <tqregexp.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 
@@ -49,7 +49,7 @@
 #include "ldifconverter.h"
 #include "vcardconverter.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 /* generate LDIF stream */
 
diff --git a/kabc/ldifconverter.h b/tdeabc/ldifconverter.h
index a8052a65f..8788136b3 100644
--- a/kabc/ldifconverter.h
+++ b/tdeabc/ldifconverter.h
@@ -26,7 +26,7 @@
 #include "addressee.h"
 #include "addresseelist.h"
 
-namespace KABC {
+namespace TDEABC {
 
   /**
    * A set of functions to convert a string with LDIF information to addressees 
diff --git a/kabc/lock.cpp b/tdeabc/lock.cpp
index b5e0ea5a6..782b60afa 100644
--- a/kabc/lock.cpp
+++ b/tdeabc/lock.cpp
@@ -20,11 +20,11 @@
 
 #include "lock.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfile.h>
 
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 Lock::Lock( const TQString &identifier )
   : mIdentifier( identifier )
@@ -48,7 +48,7 @@ Lock::~Lock()
 
 TQString Lock::locksDir()
 {
-  return locateLocal( "data", "kabc/lock/" );
+  return locateLocal( "data", "tdeabc/lock/" );
 }
 
 bool Lock::readLockFile( const TQString &filename, int &pid, TQString &app )
@@ -68,7 +68,7 @@ bool Lock::writeLockFile( const TQString &filename )
   TQFile file( filename );
   if ( !file.open( IO_WriteOnly ) ) return false;
   TQTextStream t( &file );
-  t << ::getpid() << endl << TQString( KGlobal::instance()->instanceName() );
+  t << ::getpid() << endl << TQString( TDEGlobal::instance()->instanceName() );
 
   return true;
 }
@@ -104,14 +104,14 @@ bool Lock::lock()
       identifier.replace( '_', '/' );
 
       mError = i18n("The address book '%1' is locked by application '%2'.\nIf you believe this is incorrect, just remove the lock file from '%3'")
-               .arg( identifier ).arg( app ).arg( locateLocal( "data", "kabc/lock/*.lock" ) );
+               .arg( identifier ).arg( app ).arg( locateLocal( "data", "tdeabc/lock/*.lock" ) );
       return false;
     }
   }
 
   TQString lockUniqueName;
   lockUniqueName = mIdentifier + kapp->randomString( 8 );
-  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
+  mLockUniqueName = locateLocal( "data", "tdeabc/lock/" + lockUniqueName );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
diff --git a/kabc/lock.h b/tdeabc/lock.h
index addc2032f..0b4c2ffe0 100644
--- a/kabc/lock.h
+++ b/tdeabc/lock.h
@@ -26,7 +26,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   This class provides locking functionality for a file, directory or an
diff --git a/kabc/locknull.cpp b/tdeabc/locknull.cpp
index 234c2c214..c38bda0ce 100644
--- a/kabc/locknull.cpp
+++ b/tdeabc/locknull.cpp
@@ -21,10 +21,10 @@
 
 #include "locknull.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 LockNull::LockNull( bool allowAccess )
   : Lock( TQString::null ), mAllowAccess( allowAccess )
diff --git a/kabc/locknull.h b/tdeabc/locknull.h
index dfefe122a..fdc6e9aab 100644
--- a/kabc/locknull.h
+++ b/tdeabc/locknull.h
@@ -25,7 +25,7 @@
 
 #include "lock.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   This class provides a lock without actually locking. It can be constructed in
diff --git a/kabc/phonenumber.cpp b/tdeabc/phonenumber.cpp
index 31a99f9ea..f6022052c 100644
--- a/kabc/phonenumber.cpp
+++ b/tdeabc/phonenumber.cpp
@@ -18,12 +18,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 #include "phonenumber.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 PhoneNumber::PhoneNumber() :
   mType( Home )
@@ -45,7 +45,7 @@ PhoneNumber::~PhoneNumber()
 
 void PhoneNumber::init()
 {
-  mId = KApplication::randomString( 8 );
+  mId = TDEApplication::randomString( 8 );
 }
 
 void PhoneNumber::validateNumber( const TQString &number )
@@ -200,12 +200,12 @@ TQString PhoneNumber::typeLabel( int type )
   }
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const PhoneNumber &phone )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const PhoneNumber &phone )
 {
     return s << phone.mId << phone.mType << phone.mNumber;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, PhoneNumber &phone )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, PhoneNumber &phone )
 {
     s >> phone.mId >> phone.mType >> phone.mNumber;
 
diff --git a/kabc/phonenumber.h b/tdeabc/phonenumber.h
index 3e6ae0941..737f57ff8 100644
--- a/kabc/phonenumber.h
+++ b/tdeabc/phonenumber.h
@@ -26,7 +26,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Phonenumber information.
diff --git a/kabc/picture.cpp b/tdeabc/picture.cpp
index 4ddd3f537..057be604c 100644
--- a/kabc/picture.cpp
+++ b/tdeabc/picture.cpp
@@ -20,7 +20,7 @@
 
 #include "picture.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Picture::Picture()
   : mIntern( false )
@@ -106,13 +106,13 @@ TQString Picture::asString() const
     return mUrl;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Picture &picture )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Picture &picture )
 {
   return s << picture.mIntern << picture.mUrl << picture.mType;
 //  return s << picture.mIntern << picture.mUrl << picture.mType << picture.mData;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Picture &picture )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Picture &picture )
 {
   s >> picture.mIntern >> picture.mUrl >> picture.mType;
 //  s >> picture.mIntern >> picture.mUrl >> picture.mType >> picture.mData;
diff --git a/kabc/picture.h b/tdeabc/picture.h
index e6ed690c2..ca8f086ed 100644
--- a/kabc/picture.h
+++ b/tdeabc/picture.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT Picture
 {
diff --git a/kabc/plugin.cpp b/tdeabc/plugin.cpp
index a53192559..9c1453bc5 100644
--- a/kabc/plugin.cpp
+++ b/tdeabc/plugin.cpp
@@ -20,7 +20,7 @@
 
 #include "plugin.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Plugin::Plugin()
 {
diff --git a/kabc/plugin.h b/tdeabc/plugin.h
index 0c8e3b338..b242e5a8c 100644
--- a/kabc/plugin.h
+++ b/tdeabc/plugin.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT Plugin
 {
diff --git a/kabc/plugins/CMakeLists.txt b/tdeabc/plugins/CMakeLists.txt
index 019afd842..597486816 100644
--- a/kabc/plugins/CMakeLists.txt
+++ b/tdeabc/plugins/CMakeLists.txt
@@ -12,4 +12,4 @@
 add_subdirectory( file )
 add_subdirectory( dir )
 add_subdirectory( net )
-add_subdirectory( ldapkio )
+add_subdirectory( ldaptdeio )
diff --git a/tdeabc/plugins/Makefile.am b/tdeabc/plugins/Makefile.am
new file mode 100644
index 000000000..bdedbec0f
--- /dev/null
+++ b/tdeabc/plugins/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = file dir net ldaptdeio
diff --git a/kabc/plugins/dir/CMakeLists.txt b/tdeabc/plugins/dir/CMakeLists.txt
index 1bc7d8daf..322c659d4 100644
--- a/kabc/plugins/dir/CMakeLists.txt
+++ b/tdeabc/plugins/dir/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kabc
-  ${CMAKE_SOURCE_DIR}/kabc
+  ${CMAKE_BINARY_DIR}/tdeabc
+  ${CMAKE_SOURCE_DIR}/tdeabc
 
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 link_directories(
@@ -34,17 +34,17 @@ link_directories(
 
 install( FILES
     resourcedir.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
 
 
 ##### other data ################################
 
-install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
 
 
-##### kabc_dir (library) ########################
+##### tdeabc_dir (library) ########################
 
-set( target kabc_dir )
+set( target tdeabc_dir )
 
 set( ${target}_SRCS
   resourcedir.cpp resourcedirconfig.cpp
@@ -53,14 +53,14 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### kabc_dir (module) #########################
+##### tdeabc_dir (module) #########################
 
-set( target kabc_dir )
+set( target tdeabc_dir )
 
 set( ${target}_SRCS
   resourcedirplugin.cpp
@@ -68,6 +68,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kabc_dir-shared
+  LINK tdeabc_dir-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am
new file mode 100644
index 000000000..d054bbaf9
--- /dev/null
+++ b/tdeabc/plugins/dir/Makefile.am
@@ -0,0 +1,28 @@
+INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_builddir) $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS = resourcedirconfig.h
+
+lib_LTLIBRARIES = libtdeabc_dir.la
+libtdeabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
+libtdeabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
+libtdeabc_dir_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
+libtdeabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
+
+kde_module_LTLIBRARIES = tdeabc_dir.la
+tdeabc_dir_la_SOURCES = resourcedirplugin.cpp
+tdeabc_dir_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+tdeabc_dir_la_LIBADD = libtdeabc_dir.la $(LIB_QT) $(LIB_TDECORE)
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeabc_dir.pot
+
+kabcincludedir = $(includedir)/tdeabc
+kabcinclude_HEADERS = resourcedir.h
+
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
+service_DATA = dir.desktop
+
+resourcedirplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/dir/dir.desktop b/tdeabc/plugins/dir/dir.desktop
index a841040f9..292815637 100644
--- a/kabc/plugins/dir/dir.desktop
+++ b/tdeabc/plugins/dir/dir.desktop
@@ -85,7 +85,7 @@ Name[zh_CN]=目录
 Name[zh_HK]=目錄
 Name[zh_TW]=目錄
 Name[zu]=Uhlu lwamafayela
-X-TDE-Library=kabc_dir
+X-TDE-Library=tdeabc_dir
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=contact
diff --git a/kabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp
index 0897c9cee..eaf774066 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/tdeabc/plugins/dir/resourcedir.cpp
@@ -28,12 +28,12 @@
 #include <tqtimer.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 
@@ -45,18 +45,18 @@
 
 #include "resourcedir.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
-  void *init_kabc_dir()
+  void *init_tdeabc_dir()
   {
     return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
   }
 }
 
 
-ResourceDir::ResourceDir( const KConfig *config )
+ResourceDir::ResourceDir( const TDEConfig *config )
   : Resource( config ), mAsynchronous( false )
 {
   if ( config ) {
@@ -100,7 +100,7 @@ ResourceDir::~ResourceDir()
   mFormat = 0;
 }
 
-void ResourceDir::writeConfig( KConfig *config )
+void ResourceDir::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
diff --git a/kabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h
index 96c894e2e..035b8a6ae 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/tdeabc/plugins/dir/resourcedir.h
@@ -21,16 +21,16 @@
 #ifndef KABC_RESOURCEDIR_H
 #define KABC_RESOURCEDIR_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 class TQTimer;
 
-namespace KABC {
+namespace TDEABC {
 
 class FormatPlugin;
 class Lock;
@@ -43,11 +43,11 @@ class KABC_EXPORT ResourceDir : public Resource
   Q_OBJECT
 
   public:
-    ResourceDir( const KConfig* );
+    ResourceDir( const TDEConfig* );
     ResourceDir( const TQString &path, const TQString &type = "vcard" );
     ~ResourceDir();
 
-    virtual void writeConfig( KConfig* );
+    virtual void writeConfig( TDEConfig* );
 
     virtual bool doOpen();
     virtual void doClose();
@@ -82,7 +82,7 @@ class KABC_EXPORT ResourceDir : public Resource
   
     /**
       Remove a addressee from its source.
-      This method is mainly called by KABC::AddressBook.
+      This method is mainly called by TDEABC::AddressBook.
      */
     virtual void removeAddressee( const Addressee& addr );
 
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp
index 819d75d96..212ef6156 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/tdeabc/plugins/dir/resourcedirconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
@@ -32,7 +32,7 @@
 
 #include "resourcedirconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceDirConfig::ResourceDirConfig( TQWidget* parent,  const char* name )
     : KRES::ConfigWidget( parent, name )
@@ -86,7 +86,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res )
 
   mFileNameEdit->setURL( resource->path() );
   if ( mFileNameEdit->url().isEmpty() )
-    mFileNameEdit->setURL( KABC::StdAddressBook::directoryName() );
+    mFileNameEdit->setURL( TDEABC::StdAddressBook::directoryName() );
 }
 
 void ResourceDirConfig::saveSettings( KRES::Resource *res )
diff --git a/kabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h
index 4333fdae1..98efd76d0 100644
--- a/kabc/plugins/dir/resourcedirconfig.h
+++ b/tdeabc/plugins/dir/resourcedirconfig.h
@@ -24,9 +24,9 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget
 { 
diff --git a/kabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp
index a2bd6d138..5662a7062 100644
--- a/kabc/plugins/dir/resourcedirplugin.cpp
+++ b/tdeabc/plugins/dir/resourcedirplugin.cpp
@@ -21,11 +21,11 @@
 #include "resourcedir.h"
 #include "resourcedirconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_kabc_dir()
+  KDE_EXPORT void *init_tdeabc_dir()
   {
     return new KRES::PluginFactory<ResourceDir, ResourceDirConfig>();
   }
diff --git a/tdeabc/plugins/evolution/Makefile.am b/tdeabc/plugins/evolution/Makefile.am
new file mode 100644
index 000000000..67a5a64b8
--- /dev/null
+++ b/tdeabc/plugins/evolution/Makefile.am
@@ -0,0 +1,19 @@
+INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = resourceevo.h dbwrapper.h
+
+kde_module_LTLIBRARIES = tdeabc_evo.la
+
+tdeabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
+
+tdeabc_evo_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
+tdeabc_evo_la_LIBADD	= ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../tdeabc/vcardparser/libvcards.la
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeabc_evolution.pot
+
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
+service_DATA = evolution.desktop
diff --git a/kabc/plugins/evolution/README b/tdeabc/plugins/evolution/README
index 7dfefce00..7dfefce00 100644
--- a/kabc/plugins/evolution/README
+++ b/tdeabc/plugins/evolution/README
diff --git a/kabc/plugins/evolution/dbwrapper.cpp b/tdeabc/plugins/evolution/dbwrapper.cpp
index fbdff165a..fbdff165a 100644
--- a/kabc/plugins/evolution/dbwrapper.cpp
+++ b/tdeabc/plugins/evolution/dbwrapper.cpp
diff --git a/kabc/plugins/evolution/dbwrapper.h b/tdeabc/plugins/evolution/dbwrapper.h
index e5e0a2c33..e5e0a2c33 100644
--- a/kabc/plugins/evolution/dbwrapper.h
+++ b/tdeabc/plugins/evolution/dbwrapper.h
diff --git a/kabc/plugins/evolution/evolution.desktop b/tdeabc/plugins/evolution/evolution.desktop
index 98030e906..6893abdad 100644
--- a/kabc/plugins/evolution/evolution.desktop
+++ b/tdeabc/plugins/evolution/evolution.desktop
@@ -19,7 +19,7 @@ Name[ven]=Tsikoni
 Name[wa]=Evolucion
 Name[xh]=Utshintsho lwendawo ngokwenqanawa
 Name[zu]=Evolushini
-X-TDE-Library=kabc_evo
+X-TDE-Library=tdeabc_evo
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=contact
diff --git a/kabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp
index 9a44b2adb..a5df5fe18 100644
--- a/kabc/plugins/evolution/resourceevo.cpp
+++ b/tdeabc/plugins/evolution/resourceevo.cpp
@@ -1,23 +1,23 @@
 #include <tqdir.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <stdio.h>
 
-#include <kabc/vcardparser/vcardtool.h>
+#include <tdeabc/vcardparser/vcardtool.h>
 
 #include "dbwrapper.h"
 #include "resourceevo.h"
 
 using namespace Evolution;
-using namespace KABC;
+using namespace TDEABC;
 
 class EvolutionFactory : public KRES::PluginFactoryBase
 {
   public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
       return new ResourceEvolution( config );
     }
@@ -30,13 +30,13 @@ class EvolutionFactory : public KRES::PluginFactoryBase
 
 extern "C"
 {
-  KDE_EXPORT void *init_kabc_evo()
+  KDE_EXPORT void *init_tdeabc_evo()
   {
     return ( new EvolutionFactory() );
   }
 }
 
-ResourceEvolution::ResourceEvolution( const KConfig* conf )
+ResourceEvolution::ResourceEvolution( const TDEConfig* conf )
     : Resource( conf ), mWrap(0l)
 {
     m_isOpen = false;
diff --git a/kabc/plugins/evolution/resourceevo.h b/tdeabc/plugins/evolution/resourceevo.h
index 0f5b3a0d2..82bcab5cb 100644
--- a/kabc/plugins/evolution/resourceevo.h
+++ b/tdeabc/plugins/evolution/resourceevo.h
@@ -4,10 +4,10 @@ namespace Evolution {
     class DBWrapper;
 }
 
-namespace KABC {
+namespace TDEABC {
     class ResourceEvolution : public Resource {
     public:
-        ResourceEvolution( const KConfig* config );
+        ResourceEvolution( const TDEConfig* config );
         ~ResourceEvolution();
 
         bool doOpen();
diff --git a/kabc/plugins/file/CMakeLists.txt b/tdeabc/plugins/file/CMakeLists.txt
index 0c767b00d..c7dbfef46 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/tdeabc/plugins/file/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kabc
-  ${CMAKE_SOURCE_DIR}/kabc
+  ${CMAKE_BINARY_DIR}/tdeabc
+  ${CMAKE_SOURCE_DIR}/tdeabc
 
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 link_directories(
@@ -34,17 +34,17 @@ link_directories(
 
 install( FILES
     resourcefile.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
 
 
 ##### other data ################################
 
-install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
 
 
-##### kabc_file (library) #######################
+##### tdeabc_file (library) #######################
 
-set( target kabc_file )
+set( target tdeabc_file )
 
 set( ${target}_SRCS
   resourcefile.cpp resourcefileconfig.cpp
@@ -53,14 +53,14 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### kabc_file (module) ########################
+##### tdeabc_file (module) ########################
 
-set( target kabc_file )
+set( target tdeabc_file )
 
 set( ${target}_SRCS
   resourcefileplugin.cpp
@@ -68,6 +68,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kabc_file-shared
+  LINK tdeabc_file-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am
new file mode 100644
index 000000000..475fcd4dc
--- /dev/null
+++ b/tdeabc/plugins/file/Makefile.am
@@ -0,0 +1,28 @@
+INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = resourcefileconfig.h
+
+lib_LTLIBRARIES = libtdeabc_file.la
+libtdeabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
+libtdeabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+libtdeabc_file_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
+libtdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
+
+
+kde_module_LTLIBRARIES = tdeabc_file.la
+tdeabc_file_la_SOURCES = resourcefileplugin.cpp
+tdeabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
+tdeabc_file_la_LIBADD = libtdeabc_file.la $(LIB_QT) $(LIB_TDECORE)
+tdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeabc_file.pot
+
+kabcincludedir = $(includedir)/tdeabc
+kabcinclude_HEADERS = resourcefile.h
+
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
+service_DATA = file.desktop
diff --git a/kabc/plugins/file/file.desktop b/tdeabc/plugins/file/file.desktop
index 1359dd1c6..4c7991989 100644
--- a/kabc/plugins/file/file.desktop
+++ b/tdeabc/plugins/file/file.desktop
@@ -75,7 +75,7 @@ Name[wa]=Fitchî
 Name[zh_CN]=文件
 Name[zh_HK]=檔案
 Name[zh_TW]=檔案
-X-TDE-Library=kabc_file
+X-TDE-Library=tdeabc_file
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=contact
diff --git a/kabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp
index b391dffa5..4df5db42c 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/tdeabc/plugins/file/resourcefile.cpp
@@ -29,11 +29,11 @@
 #include <tqfileinfo.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kio/scheduler.h>
-#include <klocale.h>
+#include <tdeio/scheduler.h>
+#include <tdelocale.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 
@@ -44,9 +44,9 @@
 
 #include "resourcefile.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
-ResourceFile::ResourceFile( const KConfig *config )
+ResourceFile::ResourceFile( const TDEConfig *config )
   : Resource( config ), mFormat( 0 ),
     mAsynchronous( false )
 {
@@ -98,7 +98,7 @@ ResourceFile::~ResourceFile()
   mFormat = 0;
 }
 
-void ResourceFile::writeConfig( KConfig *config )
+void ResourceFile::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
@@ -365,9 +365,9 @@ void ResourceFile::fileChanged()
 
 void ResourceFile::removeAddressee( const Addressee &addr )
 {
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/photos/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/logos/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/sounds/" ) + addr.uid() ) );
 
   mAddrMap.erase( addr.uid() );
 }
diff --git a/kabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h
index b44c22ec1..76652d179 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/tdeabc/plugins/file/resourcefile.h
@@ -21,14 +21,14 @@
 #ifndef KABC_RESOURCEFILE_H
 #define KABC_RESOURCEFILE_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class FormatPlugin;
 class ResourceConfigWidget;
@@ -47,7 +47,7 @@ class KABC_EXPORT ResourceFile : public Resource
 
       @param cfg The config object where custom resource settings are stored.
      */
-    ResourceFile( const KConfig *cfg );
+    ResourceFile( const TDEConfig *cfg );
 
     /**
       Construct file resource on file @arg fileName using format @arg formatName.
@@ -62,7 +62,7 @@ class KABC_EXPORT ResourceFile : public Resource
     /**
       Writes the config back.
      */
-    virtual void writeConfig( KConfig *cfg );
+    virtual void writeConfig( TDEConfig *cfg );
 
     /**
       Tries to open the file and checks for the proper format.
@@ -122,7 +122,7 @@ class KABC_EXPORT ResourceFile : public Resource
 
     /**
       Remove a addressee from its source.
-      This method is mainly called by KABC::AddressBook.
+      This method is mainly called by TDEABC::AddressBook.
      */
     virtual void removeAddressee( const Addressee& addr );
 
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp
index 92b07594f..516a33a61 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/tdeabc/plugins/file/resourcefileconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
@@ -34,7 +34,7 @@
 
 #include "resourcefileconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceFileConfig::ResourceFileConfig( TQWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
@@ -90,7 +90,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res  )
 
   mFileNameEdit->setURL( resource->fileName() );
   if ( mFileNameEdit->url().isEmpty() )
-    mFileNameEdit->setURL( KABC::StdAddressBook::fileName() );
+    mFileNameEdit->setURL( TDEABC::StdAddressBook::fileName() );
 }
 
 void ResourceFileConfig::saveSettings( KRES::Resource *res )
diff --git a/kabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h
index 343a5623d..e7b8ca9ea 100644
--- a/kabc/plugins/file/resourcefileconfig.h
+++ b/tdeabc/plugins/file/resourcefileconfig.h
@@ -24,9 +24,9 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget
 { 
diff --git a/kabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp
index 4dce19bc0..5a44f76ca 100644
--- a/kabc/plugins/file/resourcefileplugin.cpp
+++ b/tdeabc/plugins/file/resourcefileplugin.cpp
@@ -21,11 +21,11 @@
 #include "resourcefile.h"
 #include "resourcefileconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_kabc_file()
+  KDE_EXPORT void *init_tdeabc_file()
   {
     return new KRES::PluginFactory<ResourceFile, ResourceFileConfig>();
   }
diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/tdeabc/plugins/ldaptdeio/CMakeLists.txt
index 57370c9cf..6e85a73d5 100644
--- a/kabc/plugins/ldapkio/CMakeLists.txt
+++ b/tdeabc/plugins/ldaptdeio/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kabc
-  ${CMAKE_SOURCE_DIR}/kabc
+  ${CMAKE_BINARY_DIR}/tdeabc
+  ${CMAKE_SOURCE_DIR}/tdeabc
 
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfiles
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefiles
 )
 
 link_directories(
@@ -33,41 +33,41 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    resourceldapkio.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+    resourceldaptdeio.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
 
 
 ##### other data ################################
 
-install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES ldaptdeio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
 
 
-##### kabc_ldapkio ##############################
+##### tdeabc_ldaptdeio ##############################
 
-set( target kabc_ldapkio )
+set( target tdeabc_ldaptdeio )
 
 set( ${target}_SRCS
-  resourceldapkio.cpp resourceldapkioconfig.cpp
+  resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### kabc_ldapkio ##############################
+##### tdeabc_ldaptdeio ##############################
 
-set( target kabc_ldapkio )
+set( target tdeabc_ldaptdeio )
 
 set( ${target}_SRCS
-  resourceldapkioplugin.cpp
+  resourceldaptdeioplugin.cpp
 )
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kabc_ldapkio-shared
+  LINK tdeabc_ldaptdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am
new file mode 100644
index 000000000..205c412ce
--- /dev/null
+++ b/tdeabc/plugins/ldaptdeio/Makefile.am
@@ -0,0 +1,28 @@
+INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS = resourceldaptdeioconfig.h
+
+lib_LTLIBRARIES = libtdeabc_ldaptdeio.la
+libtdeabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
+libtdeabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+libtdeabc_ldaptdeio_la_LIBADD	= $(LIB_TDEABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdeabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
+
+kde_module_LTLIBRARIES = tdeabc_ldaptdeio.la
+tdeabc_ldaptdeio_la_SOURCES = resourceldaptdeioplugin.cpp
+tdeabc_ldaptdeio_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
+tdeabc_ldaptdeio_la_LIBADD	= libtdeabc_ldaptdeio.la $(LIB_QT) $(LIB_TDECORE)
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeabc_ldaptdeio.pot
+
+kabcincludedir = $(includedir)/tdeabc
+kabcinclude_HEADERS = resourceldaptdeio.h
+
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
+service_DATA = ldaptdeio.desktop
+
+resourceldaptdeioplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/ldapkio/ldapkio.desktop b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
index e70bf9c9d..683a38d13 100644
--- a/kabc/plugins/ldapkio/ldapkio.desktop
+++ b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
@@ -3,8 +3,8 @@ Name=LDAP
 Name[bn]=�ল-ডি-�-পি (LDAP)
 Name[hi]=�लडी�पी (LDAP)
 Name[te]=ఎల�డి�పి
-X-TDE-Library=kabc_ldapkio
+X-TDE-Library=tdeabc_ldaptdeio
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=contact
-X-TDE-ResourceType=ldapkio
+X-TDE-ResourceType=ldaptdeio
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index f4b4f83b8..0e182755a 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -25,29 +25,29 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <stdlib.h>
-#include <kio/netaccess.h>
-#include <kabc/ldif.h>
-#include <kabc/ldapurl.h>
+#include <tdeio/netaccess.h>
+#include <tdeabc/ldif.h>
+#include <tdeabc/ldapurl.h>
 
-#include "resourceldapkio.h"
-#include "resourceldapkioconfig.h"
+#include "resourceldaptdeio.h"
+#include "resourceldaptdeioconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 // Hack from Netaccess
 void tqt_enter_modal( TQWidget *widget );
 void tqt_leave_modal( TQWidget *widget );
 
-class ResourceLDAPKIO::ResourceLDAPKIOPrivate 
+class ResourceLDAPTDEIO::ResourceLDAPTDEIOPrivate 
 {
   public:
     LDIF mLdif;
@@ -69,10 +69,10 @@ class ResourceLDAPKIO::ResourceLDAPKIOPrivate
     KTempFile *mTmp;
 };
 
-ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
+ResourceLDAPTDEIO::ResourceLDAPTDEIO( const TDEConfig *config )
   : Resource( config )
 {
-  d = new ResourceLDAPKIOPrivate;
+  d = new ResourceLDAPTDEIOPrivate;
   if ( config ) {
     TQMap<TQString, TQString> attrList;
     TQStringList attributes = config->readListEntry( "LdapAttributes" );
@@ -110,17 +110,17 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
     d->mCachePolicy = Cache_No;
     d->mAutoCache = true;
   }
-  d->mCacheDst = KGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" +
+  d->mCacheDst = TDEGlobal::dirs()->saveLocation("cache", "ldaptdeio") + "/" +
     type() + "_" + identifier();
   init(); 
 }
 
-ResourceLDAPKIO::~ResourceLDAPKIO() 
+ResourceLDAPTDEIO::~ResourceLDAPTDEIO() 
 {
   delete d;
 }
 
-void ResourceLDAPKIO::enter_loop()
+void ResourceLDAPTDEIO::enter_loop()
 {
   TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
   dummy.setFocusPolicy( TQ_NoFocus );
@@ -129,14 +129,14 @@ void ResourceLDAPKIO::enter_loop()
   tqt_leave_modal(&dummy);
 }
 
-void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
+void ResourceLDAPTDEIO::entries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
 {
-  KIO::UDSEntryListConstIterator it = list.begin();
-  KIO::UDSEntryListConstIterator end = list.end();
+  TDEIO::UDSEntryListConstIterator it = list.begin();
+  TDEIO::UDSEntryListConstIterator end = list.end();
   for (; it != end; ++it) {
-    KIO::UDSEntry::ConstIterator it2 = (*it).begin();
+    TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
     for( ; it2 != (*it).end(); it2++ ) {
-      if ( (*it2).m_uds == KIO::UDS_URL ) {
+      if ( (*it2).m_uds == TDEIO::UDS_URL ) {
         KURL tmpurl( (*it2).m_str );
         d->mResultDn = tmpurl.path();
         kdDebug(7125) << "findUid(): " << d->mResultDn << endl;
@@ -147,20 +147,20 @@ void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )
   }
 }
 
-void ResourceLDAPKIO::listResult( KIO::Job *job)
+void ResourceLDAPTDEIO::listResult( TDEIO::Job *job)
 {
   d->mError = job->error();  
-  if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
+  if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
     mErrorMsg = job->errorString();
   else 
     mErrorMsg = "";
   tqApp->exit_loop();
 }
 
-TQString ResourceLDAPKIO::findUid( const TQString &uid ) 
+TQString ResourceLDAPTDEIO::findUid( const TQString &uid ) 
 {
   LDAPUrl url( d->mLDAPUrl );
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
   
   mErrorMsg = d->mResultDn = "";
 
@@ -168,21 +168,21 @@ TQString ResourceLDAPKIO::findUid( const TQString &uid )
   url.setFilter( "(" + mAttributes[ "uid" ] + "=" + uid + ")" + mFilter );
   url.setExtension( "x-dir", "one" );
 
-  kdDebug(7125) << "ResourceLDAPKIO::findUid() uid: " << uid << " url " << 
+  kdDebug(7125) << "ResourceLDAPTDEIO::findUid() uid: " << uid << " url " << 
     url.prettyURL() << endl;
   
-  KIO::ListJob * listJob = KIO::listDir( url, false /* no GUI */ );
+  TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ );
   connect( listJob, 
-    TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
-    TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
-  connect( listJob, TQT_SIGNAL( result( KIO::Job* ) ), 
-    this, TQT_SLOT( listResult( KIO::Job* ) ) );
+    TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+    TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+  connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ), 
+    this, TQT_SLOT( listResult( TDEIO::Job* ) ) );
 
   enter_loop();
   return d->mResultDn;
 }
 
-TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value, bool mod )
+TQCString ResourceLDAPTDEIO::addEntry( const TQString &attr, const TQString &value, bool mod )
 {
   TQCString tmp;
   if ( !attr.isEmpty() ) {
@@ -193,7 +193,7 @@ TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value
   return ( tmp );
 }
 
-bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr, 
+bool ResourceLDAPTDEIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr, 
   const TQString &olddn )
 {
   TQCString tmp;
@@ -313,14 +313,14 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
   return true;
 }
 
-void ResourceLDAPKIO::setReadOnly( bool value )
+void ResourceLDAPTDEIO::setReadOnly( bool value )
 {
   //save the original readonly flag, because offline using disables writing
   d->mReadOnly = true;
   Resource::setReadOnly( value );
 }
 
-void ResourceLDAPKIO::init()
+void ResourceLDAPTDEIO::init()
 {
   if ( mPort == 0 ) mPort = 389;
 
@@ -414,10 +414,10 @@ void ResourceLDAPKIO::init()
 
   d->mReadOnly = readOnly();
 
-  kdDebug(7125) << "resource_ldapkio url: " << d->mLDAPUrl.prettyURL() << endl;
+  kdDebug(7125) << "resource_ldaptdeio url: " << d->mLDAPUrl.prettyURL() << endl;
 }
 
-void ResourceLDAPKIO::writeConfig( KConfig *config )
+void ResourceLDAPTDEIO::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
@@ -450,7 +450,7 @@ void ResourceLDAPKIO::writeConfig( KConfig *config )
   config->writeEntry( "LdapAttributes", attributes );
 }
 
-Ticket *ResourceLDAPKIO::requestSaveTicket()
+Ticket *ResourceLDAPTDEIO::requestSaveTicket()
 {
   if ( !addressBook() ) {
     kdDebug(7125) << "no addressbook" << endl;
@@ -460,21 +460,21 @@ Ticket *ResourceLDAPKIO::requestSaveTicket()
   return createTicket( this );
 }
 
-void ResourceLDAPKIO::releaseSaveTicket( Ticket *ticket )
+void ResourceLDAPTDEIO::releaseSaveTicket( Ticket *ticket )
 {
   delete ticket;
 }
 
-bool ResourceLDAPKIO::doOpen()
+bool ResourceLDAPTDEIO::doOpen()
 {
   return true;
 }
 
-void ResourceLDAPKIO::doClose()
+void ResourceLDAPTDEIO::doClose()
 {
 }
 
-void ResourceLDAPKIO::createCache()
+void ResourceLDAPTDEIO::createCache()
 {
   d->mTmp = NULL;
   if ( d->mCachePolicy == Cache_NoConnection && d->mAutoCache ) {
@@ -483,7 +483,7 @@ void ResourceLDAPKIO::createCache()
   }
 }
 
-void ResourceLDAPKIO::activateCache()
+void ResourceLDAPTDEIO::activateCache()
 {
   if ( d->mTmp && d->mError == 0 ) {
     d->mTmp->close();
@@ -495,12 +495,12 @@ void ResourceLDAPKIO::activateCache()
   }
 }
 
-KIO::Job *ResourceLDAPKIO::loadFromCache()
+TDEIO::Job *ResourceLDAPTDEIO::loadFromCache()
 {
-  KIO::Job *job = NULL;
+  TDEIO::Job *job = NULL;
   if ( d->mCachePolicy == Cache_Always || 
      ( d->mCachePolicy == Cache_NoConnection && 
-      d->mError == KIO::ERR_COULD_NOT_CONNECT ) ) {
+      d->mError == TDEIO::ERR_COULD_NOT_CONNECT ) ) {
 
     d->mAddr = Addressee();
     d->mAd = Address( Address::Home );
@@ -510,17 +510,17 @@ KIO::Job *ResourceLDAPKIO::loadFromCache()
     Resource::setReadOnly( true );
   
     KURL url( d->mCacheDst );
-    job = KIO::get( url, true, false );
-    connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
+    job = TDEIO::get( url, true, false );
+    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
   }
   return job;
 }
 
-bool ResourceLDAPKIO::load()
+bool ResourceLDAPTDEIO::load()
 {
-  kdDebug(7125) << "ResourceLDAPKIO::load()" << endl;
-  KIO::Job *job;
+  kdDebug(7125) << "ResourceLDAPTDEIO::load()" << endl;
+  TDEIO::Job *job;
 
   clear();
   //clear the addressee
@@ -534,31 +534,31 @@ bool ResourceLDAPKIO::load()
 
   createCache();
   if ( d->mCachePolicy != Cache_Always ) {
-    job = KIO::get( d->mLDAPUrl, true, false );
-    connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-      this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+    job = TDEIO::get( d->mLDAPUrl, true, false );
+    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
     enter_loop();
   }
 
   job = loadFromCache();    
   if ( job ) {
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-      this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
     enter_loop();
   }
   if ( mErrorMsg.isEmpty() ) {
-    kdDebug(7125) << "ResourceLDAPKIO load ok!" << endl; 
+    kdDebug(7125) << "ResourceLDAPTDEIO load ok!" << endl; 
     return true;
   } else {
-    kdDebug(7125) << "ResourceLDAPKIO load finished with error: " << mErrorMsg << endl; 
+    kdDebug(7125) << "ResourceLDAPTDEIO load finished with error: " << mErrorMsg << endl; 
     addressBook()->error( mErrorMsg );
     return false;
   }
 }
 
-bool ResourceLDAPKIO::asyncLoad()
+bool ResourceLDAPTDEIO::asyncLoad()
 {
   clear();
   //clear the addressee
@@ -571,18 +571,18 @@ bool ResourceLDAPKIO::asyncLoad()
 
   createCache();
   if ( d->mCachePolicy != Cache_Always ) {
-    KIO::Job *job = KIO::get( d->mLDAPUrl, true, false );
-    connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-      this, TQT_SLOT( result( KIO::Job* ) ) );
+    TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false );
+    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQT_SLOT( result( TDEIO::Job* ) ) );
   } else {
     result( NULL );
   }
   return true;
 }
 
-void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data )
+void ResourceLDAPTDEIO::data( TDEIO::Job *, const TQByteArray &data )
 {
   if ( data.size() ) {
     d->mLdif.setLDIF( data );
@@ -659,7 +659,7 @@ void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data )
         } else if ( name == mAttributes[ "uid" ].lower() ) {
           d->mAddr.setUid( TQString::fromUtf8( value, value.size() ) );
         } else if ( name == mAttributes[ "jpegPhoto" ].lower() ) {
-          KABC::Picture photo;
+          TDEABC::Picture photo;
           TQImage img( value );
           if ( !img.isNull() ) {
             photo.setData( img );
@@ -685,11 +685,11 @@ void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data )
   } while ( ret != LDIF::MoreData );
 }
 
-void ResourceLDAPKIO::loadCacheResult( KIO::Job *job )
+void ResourceLDAPTDEIO::loadCacheResult( TDEIO::Job *job )
 {
   mErrorMsg = "";
   d->mError = job->error();
-  if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) {
+  if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) {
     mErrorMsg = job->errorString();
   }
   if ( !mErrorMsg.isEmpty() )
@@ -698,12 +698,12 @@ void ResourceLDAPKIO::loadCacheResult( KIO::Job *job )
     emit loadingFinished( this );
 }
 
-void ResourceLDAPKIO::result( KIO::Job *job )
+void ResourceLDAPTDEIO::result( TDEIO::Job *job )
 {
   mErrorMsg = "";
   if ( job ) {
     d->mError = job->error();
-    if ( d->mError && d->mError != KIO::ERR_USER_CANCELED ) {
+    if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED ) {
       mErrorMsg = job->errorString();
     }
   } else {
@@ -711,11 +711,11 @@ void ResourceLDAPKIO::result( KIO::Job *job )
   }
   activateCache();
 
-  KIO::Job *cjob;
+  TDEIO::Job *cjob;
   cjob = loadFromCache();
   if ( cjob ) {
-    connect( cjob, TQT_SIGNAL( result( KIO::Job* ) ),
-      this, TQT_SLOT( loadCacheResult( KIO::Job* ) ) );
+    connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) );
   } else {
     if ( !mErrorMsg.isEmpty() )
       emit loadingError( this, mErrorMsg );
@@ -724,43 +724,43 @@ void ResourceLDAPKIO::result( KIO::Job *job )
   }
 }
 
-bool ResourceLDAPKIO::save( Ticket* )
+bool ResourceLDAPTDEIO::save( Ticket* )
 {
-  kdDebug(7125) << "ResourceLDAPKIO save" << endl;
+  kdDebug(7125) << "ResourceLDAPTDEIO save" << endl;
   
   d->mSaveIt = begin();
-  KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false );
-  connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
-    this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-    this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+  TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
+  connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+    this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
   enter_loop();
   if ( mErrorMsg.isEmpty() ) {
-    kdDebug(7125) << "ResourceLDAPKIO save ok!" << endl; 
+    kdDebug(7125) << "ResourceLDAPTDEIO save ok!" << endl; 
     return true;
   } else {
-    kdDebug(7125) << "ResourceLDAPKIO finished with error: " << mErrorMsg << endl; 
+    kdDebug(7125) << "ResourceLDAPTDEIO finished with error: " << mErrorMsg << endl; 
     addressBook()->error( mErrorMsg );
     return false;
   }
 }
 
-bool ResourceLDAPKIO::asyncSave( Ticket* )
+bool ResourceLDAPTDEIO::asyncSave( Ticket* )
 {
-  kdDebug(7125) << "ResourceLDAPKIO asyncSave" << endl;
+  kdDebug(7125) << "ResourceLDAPTDEIO asyncSave" << endl;
   d->mSaveIt = begin();
-  KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false );
-  connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
-    this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-    this, TQT_SLOT( saveResult( KIO::Job* ) ) );
+  TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
+  connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+    this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQT_SLOT( saveResult( TDEIO::Job* ) ) );
   return true;
 }
 
-void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job )
+void ResourceLDAPTDEIO::syncLoadSaveResult( TDEIO::Job *job )
 {
   d->mError = job->error();
-  if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
+  if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
     mErrorMsg = job->errorString();
   else
     mErrorMsg = "";
@@ -769,53 +769,53 @@ void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job )
   tqApp->exit_loop();
 }
 
-void ResourceLDAPKIO::saveResult( KIO::Job *job )
+void ResourceLDAPTDEIO::saveResult( TDEIO::Job *job )
 {
   d->mError = job->error();
-  if ( d->mError && d->mError != KIO::ERR_USER_CANCELED )
+  if ( d->mError && d->mError != TDEIO::ERR_USER_CANCELED )
     emit savingError( this, job->errorString() );
   else
     emit savingFinished( this );
 }
 
-void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data )
+void ResourceLDAPTDEIO::saveData( TDEIO::Job*, TQByteArray& data )
 {
   while ( d->mSaveIt != end() &&
        !(*d->mSaveIt).changed() ) d->mSaveIt++;
 
   if ( d->mSaveIt == end() ) {
-    kdDebug(7125) << "ResourceLDAPKIO endData" << endl;
+    kdDebug(7125) << "ResourceLDAPTDEIO endData" << endl;
     data.resize(0);
     return;
   }
   
-  kdDebug(7125) << "ResourceLDAPKIO saveData: " << (*d->mSaveIt).assembledName() << endl;
+  kdDebug(7125) << "ResourceLDAPTDEIO saveData: " << (*d->mSaveIt).assembledName() << endl;
   
   AddresseeToLDIF( data, *d->mSaveIt, findUid( (*d->mSaveIt).uid() ) );  
-//  kdDebug(7125) << "ResourceLDAPKIO save LDIF: " << TQString::fromUtf8(data) << endl;
+//  kdDebug(7125) << "ResourceLDAPTDEIO save LDIF: " << TQString::fromUtf8(data) << endl;
   // mark as unchanged
   (*d->mSaveIt).setChanged( false );
 
   d->mSaveIt++;  
 }
 
-void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
+void ResourceLDAPTDEIO::removeAddressee( const Addressee& addr )
 {
   TQString dn = findUid( addr.uid() );
   
-  kdDebug(7125) << "ResourceLDAPKIO: removeAddressee: " << dn << endl;
+  kdDebug(7125) << "ResourceLDAPTDEIO: removeAddressee: " << dn << endl;
 
   if ( !mErrorMsg.isEmpty() ) {
     addressBook()->error( mErrorMsg );
     return;
   }
   if ( !dn.isEmpty() ) {
-    kdDebug(7125) << "ResourceLDAPKIO: found uid: " << dn << endl;
+    kdDebug(7125) << "ResourceLDAPTDEIO: found uid: " << dn << endl;
     LDAPUrl url( d->mLDAPUrl );
     url.setPath( "/" + dn );
     url.setExtension( "x-dir", "base" );
     url.setScope( LDAPUrl::Base );
-    if ( KIO::NetAccess::del( url, NULL ) ) mAddrMap.erase( addr.uid() );
+    if ( TDEIO::NetAccess::del( url, NULL ) ) mAddrMap.erase( addr.uid() );
   } else {
     //maybe it's not saved yet
     mAddrMap.erase( addr.uid() );
@@ -823,219 +823,219 @@ void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
 }
 
 
-void ResourceLDAPKIO::setUser( const TQString &user )
+void ResourceLDAPTDEIO::setUser( const TQString &user )
 {
   mUser = user;
 }
 
-TQString ResourceLDAPKIO::user() const
+TQString ResourceLDAPTDEIO::user() const
 {
   return mUser;
 }
 
-void ResourceLDAPKIO::setPassword( const TQString &password )
+void ResourceLDAPTDEIO::setPassword( const TQString &password )
 {
   mPassword = password;
 }
 
-TQString ResourceLDAPKIO::password() const
+TQString ResourceLDAPTDEIO::password() const
 {
   return mPassword;
 }
 
-void ResourceLDAPKIO::setDn( const TQString &dn )
+void ResourceLDAPTDEIO::setDn( const TQString &dn )
 {
   mDn = dn;
 }
 
-TQString ResourceLDAPKIO::dn() const
+TQString ResourceLDAPTDEIO::dn() const
 {
   return mDn;
 }
 
-void ResourceLDAPKIO::setHost( const TQString &host )
+void ResourceLDAPTDEIO::setHost( const TQString &host )
 {
   mHost = host;
 }
 
-TQString ResourceLDAPKIO::host() const
+TQString ResourceLDAPTDEIO::host() const
 {
   return mHost;
 }
 
-void ResourceLDAPKIO::setPort( int port )
+void ResourceLDAPTDEIO::setPort( int port )
 {
   mPort = port;
 }
 
-int ResourceLDAPKIO::port() const
+int ResourceLDAPTDEIO::port() const
 {
   return mPort;
 }
 
-void ResourceLDAPKIO::setVer( int ver )
+void ResourceLDAPTDEIO::setVer( int ver )
 {
   d->mVer = ver;
 }
 
-int ResourceLDAPKIO::ver() const
+int ResourceLDAPTDEIO::ver() const
 {
   return d->mVer;
 }
     
-void ResourceLDAPKIO::setSizeLimit( int sizelimit )
+void ResourceLDAPTDEIO::setSizeLimit( int sizelimit )
 {
   d->mSizeLimit = sizelimit;
 }
 
-int ResourceLDAPKIO::sizeLimit()
+int ResourceLDAPTDEIO::sizeLimit()
 {
   return d->mSizeLimit;
 }
     
-void ResourceLDAPKIO::setTimeLimit( int timelimit )
+void ResourceLDAPTDEIO::setTimeLimit( int timelimit )
 {
   d->mTimeLimit = timelimit;
 }
 
-int ResourceLDAPKIO::timeLimit()
+int ResourceLDAPTDEIO::timeLimit()
 {
   return d->mTimeLimit;
 }
 
-void ResourceLDAPKIO::setFilter( const TQString &filter )
+void ResourceLDAPTDEIO::setFilter( const TQString &filter )
 {
   mFilter = filter;
 }
 
-TQString ResourceLDAPKIO::filter() const
+TQString ResourceLDAPTDEIO::filter() const
 {
   return mFilter;
 }
 
-void ResourceLDAPKIO::setIsAnonymous( bool value )
+void ResourceLDAPTDEIO::setIsAnonymous( bool value )
 {
   mAnonymous = value;
 }
 
-bool ResourceLDAPKIO::isAnonymous() const
+bool ResourceLDAPTDEIO::isAnonymous() const
 {
   return mAnonymous;
 }
 
-void ResourceLDAPKIO::setIsTLS( bool value )
+void ResourceLDAPTDEIO::setIsTLS( bool value )
 {
   d->mTLS = value;
 }
 
-bool ResourceLDAPKIO::isTLS() const
+bool ResourceLDAPTDEIO::isTLS() const
 {
   return d->mTLS;
 }
-void ResourceLDAPKIO::setIsSSL( bool value )
+void ResourceLDAPTDEIO::setIsSSL( bool value )
 {
   d->mSSL = value;
 }
 
-bool ResourceLDAPKIO::isSSL() const
+bool ResourceLDAPTDEIO::isSSL() const
 {
   return d->mSSL;
 }
 
-void ResourceLDAPKIO::setIsSubTree( bool value )
+void ResourceLDAPTDEIO::setIsSubTree( bool value )
 {
   d->mSubTree = value;
 }
 
-bool ResourceLDAPKIO::isSubTree() const
+bool ResourceLDAPTDEIO::isSubTree() const
 {
   return d->mSubTree;
 }
 
-void ResourceLDAPKIO::setAttributes( const TQMap<TQString, TQString> &attributes )
+void ResourceLDAPTDEIO::setAttributes( const TQMap<TQString, TQString> &attributes )
 {
   mAttributes = attributes;
 }
 
-TQMap<TQString, TQString> ResourceLDAPKIO::attributes() const
+TQMap<TQString, TQString> ResourceLDAPTDEIO::attributes() const
 {
   return mAttributes;
 }
 
-void ResourceLDAPKIO::setRDNPrefix( int value )
+void ResourceLDAPTDEIO::setRDNPrefix( int value )
 {
   d->mRDNPrefix = value;
 }
 
-int ResourceLDAPKIO::RDNPrefix() const
+int ResourceLDAPTDEIO::RDNPrefix() const
 {
   return d->mRDNPrefix;
 }
 
-void ResourceLDAPKIO::setIsSASL( bool value )
+void ResourceLDAPTDEIO::setIsSASL( bool value )
 {
   d->mSASL = value;
 }
 
-bool ResourceLDAPKIO::isSASL() const
+bool ResourceLDAPTDEIO::isSASL() const
 {
   return d->mSASL;
 }
 
-void ResourceLDAPKIO::setMech( const TQString &mech )
+void ResourceLDAPTDEIO::setMech( const TQString &mech )
 {
   d->mMech = mech;
 }
 
-TQString ResourceLDAPKIO::mech() const
+TQString ResourceLDAPTDEIO::mech() const
 {
   return d->mMech;
 }
 
-void ResourceLDAPKIO::setRealm( const TQString &realm )
+void ResourceLDAPTDEIO::setRealm( const TQString &realm )
 {
   d->mRealm = realm;
 }
 
-TQString ResourceLDAPKIO::realm() const
+TQString ResourceLDAPTDEIO::realm() const
 {
   return d->mRealm;
 }
     
-void ResourceLDAPKIO::setBindDN( const TQString &binddn )
+void ResourceLDAPTDEIO::setBindDN( const TQString &binddn )
 {
   d->mBindDN = binddn;
 }
 
-TQString ResourceLDAPKIO::bindDN() const
+TQString ResourceLDAPTDEIO::bindDN() const
 {
   return d->mBindDN;
 }
 
-void ResourceLDAPKIO::setCachePolicy( int pol )
+void ResourceLDAPTDEIO::setCachePolicy( int pol )
 {
   d->mCachePolicy = pol;
 }
 
-int ResourceLDAPKIO::cachePolicy() const
+int ResourceLDAPTDEIO::cachePolicy() const
 {
   return d->mCachePolicy;
 }
 
-void ResourceLDAPKIO::setAutoCache( bool value )
+void ResourceLDAPTDEIO::setAutoCache( bool value )
 {
   d->mAutoCache = value;
 }
 
-bool ResourceLDAPKIO::autoCache()
+bool ResourceLDAPTDEIO::autoCache()
 {
   return d->mAutoCache;
 }
 
-TQString ResourceLDAPKIO::cacheDst() const
+TQString ResourceLDAPTDEIO::cacheDst() const
 {
   return d->mCacheDst;
 }    
 
 
-#include "resourceldapkio.moc"
+#include "resourceldaptdeio.moc"
diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
index 2b5685fdc..051470960 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
@@ -22,29 +22,29 @@
 #ifndef KABC_RESOURCELDAP_H
 #define KABC_RESOURCELDAP_H
 
-#include <kabc/resource.h>
-#include <kabc/ldif.h>
-#include <kio/job.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/ldif.h>
+#include <tdeio/job.h>
 
-class KConfig;
+class TDEConfig;
 
-namespace KABC {
+namespace TDEABC {
 
-class KABC_EXPORT ResourceLDAPKIO : public Resource
+class KABC_EXPORT ResourceLDAPTDEIO : public Resource
 {
   Q_OBJECT
 
   public:
     enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always };
 
-    ResourceLDAPKIO( const KConfig* );
-    virtual ~ResourceLDAPKIO();
+    ResourceLDAPTDEIO( const TDEConfig* );
+    virtual ~ResourceLDAPTDEIO();
     /**
      *  Call this after you used one of the set... methods 
      */
     virtual void init();
     
-    virtual void writeConfig( KConfig* );
+    virtual void writeConfig( TDEConfig* );
 
     virtual bool doOpen();
     virtual void doClose();
@@ -128,14 +128,14 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
     TQString cacheDst() const;
     
 protected slots:
-    void entries( KIO::Job*, const KIO::UDSEntryList& );
-    void data( KIO::Job*, const TQByteArray& );
-    void result( KIO::Job* );
-    void listResult( KIO::Job* );
-    void syncLoadSaveResult( KIO::Job* );
-    void saveResult( KIO::Job* );
-    void saveData( KIO::Job*, TQByteArray& );
-    void loadCacheResult( KIO::Job* );
+    void entries( TDEIO::Job*, const TDEIO::UDSEntryList& );
+    void data( TDEIO::Job*, const TQByteArray& );
+    void result( TDEIO::Job* );
+    void listResult( TDEIO::Job* );
+    void syncLoadSaveResult( TDEIO::Job* );
+    void saveResult( TDEIO::Job* );
+    void saveData( TDEIO::Job*, TQByteArray& );
+    void loadCacheResult( TDEIO::Job* );
   
   private:
     TQString mUser;
@@ -151,9 +151,9 @@ protected slots:
     int mGetCounter; //KDE 4: remove
     bool mErrorOccured; //KDE 4: remove
     TQString mErrorMsg;
-    TQMap<KIO::Job*, TQByteArray> mJobMap; //KDE 4: remove
+    TQMap<TDEIO::Job*, TQByteArray> mJobMap; //KDE 4: remove
 
-    KIO::Job *loadFromCache();
+    TDEIO::Job *loadFromCache();
     void createCache();
     void activateCache();
     void enter_loop();
@@ -162,8 +162,8 @@ protected slots:
     bool AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr, 
       const TQString &olddn );
     
-    class ResourceLDAPKIOPrivate;
-    ResourceLDAPKIOPrivate *d;
+    class ResourceLDAPTDEIOPrivate;
+    ResourceLDAPTDEIOPrivate *d;
 };
 
 }
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index 271328525..25099414c 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -29,23 +29,23 @@
 #include <tqhbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdemessagebox.h>
+#include <tdeio/netaccess.h>
 
-#include "resourceldapkio.h"
+#include "resourceldaptdeio.h"
 
-#include "resourceldapkioconfig.h"
-#include "resourceldapkioconfig.moc"
+#include "resourceldaptdeioconfig.h"
+#include "resourceldaptdeioconfig.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
-ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent,  const char* name )
+ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent,  const char* name )
   : KRES::ConfigWidget( parent, name )
 {
   TQBoxLayout *mainLayout = new TQVBoxLayout( this );
@@ -62,12 +62,12 @@ ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent,  const char* nam
   connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) );
 }
 
-void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res )
+void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res )
 {
-  ResourceLDAPKIO *resource = dynamic_cast<ResourceLDAPKIO*>( res );
+  ResourceLDAPTDEIO *resource = dynamic_cast<ResourceLDAPTDEIO*>( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceLDAPKIOConfig::loadSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceLDAPTDEIOConfig::loadSettings(): cast failed" << endl;
     return;
   }
 
@@ -98,12 +98,12 @@ void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res )
   mAutoCache = resource->autoCache();
 }
 
-void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res )
+void ResourceLDAPTDEIOConfig::saveSettings( KRES::Resource *res )
 {
-  ResourceLDAPKIO *resource = dynamic_cast<ResourceLDAPKIO*>( res );
+  ResourceLDAPTDEIO *resource = dynamic_cast<ResourceLDAPTDEIO*>( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceLDAPKIOConfig::saveSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceLDAPTDEIOConfig::saveSettings(): cast failed" << endl;
     return;
   }
 
@@ -131,7 +131,7 @@ void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res )
 
 }
 
-void ResourceLDAPKIOConfig::editAttributes()
+void ResourceLDAPTDEIOConfig::editAttributes()
 {
   AttributesDialog dlg( mAttributes, mRDNPrefix, this );
   if ( dlg.exec() ) {
@@ -140,7 +140,7 @@ void ResourceLDAPKIOConfig::editAttributes()
   }
 }
 
-void ResourceLDAPKIOConfig::editCache()
+void ResourceLDAPTDEIOConfig::editCache()
 {
   LDAPUrl src;
   TQStringList attr;
@@ -293,7 +293,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
     }
   }
 
-  KAcceleratorManager::manage( this );
+  TDEAcceleratorManager::manage( this );
 }
 
 AttributesDialog::~AttributesDialog()
@@ -378,7 +378,7 @@ int OfflineDialog::cachePolicy() const
 
 void OfflineDialog::loadCache() 
 {
-  if ( KIO::NetAccess::download( mSrc, mDst, this ) ) {
+  if ( TDEIO::NetAccess::download( mSrc, mDst, this ) ) {
     KMessageBox::information( this, 
       i18n("Successfully downloaded directory server contents!") );
   } else {
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
index f8e0003ec..0041946b7 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
@@ -27,9 +27,9 @@
 #include <tqdict.h>
 
 #include <kdialogbase.h>
-#include <kresources/configwidget.h>
-#include <kabc/ldif.h>
-#include <kabc/ldapconfigwidget.h>
+#include <tderesources/configwidget.h>
+#include <tdeabc/ldif.h>
+#include <tdeabc/ldapconfigwidget.h>
 
 
 class TQCheckBox;
@@ -40,14 +40,14 @@ class TQString;
 class KComboBox;
 class KLineEdit;
 
-namespace KABC {
+namespace TDEABC {
 
-class KABC_EXPORT ResourceLDAPKIOConfig : public KRES::ConfigWidget
+class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
 
   public:
-    ResourceLDAPKIOConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
index 98b21061e..dcb373b3c 100644
--- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
@@ -18,19 +18,19 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "resourceldapkio.h"
-#include "resourceldapkioconfig.h"
+#include "resourceldaptdeio.h"
+#include "resourceldaptdeioconfig.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_kabc_ldapkio()
+  KDE_EXPORT void *init_tdeabc_ldaptdeio()
   {
-    KGlobal::locale()->insertCatalogue("kabc_ldapkio");
-    return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPKIOConfig>();
+    TDEGlobal::locale()->insertCatalogue("tdeabc_ldaptdeio");
+    return new KRES::PluginFactory<ResourceLDAPTDEIO, ResourceLDAPTDEIOConfig>();
   }
 }
diff --git a/kabc/plugins/net/CMakeLists.txt b/tdeabc/plugins/net/CMakeLists.txt
index 5433af217..71a5c49df 100644
--- a/kabc/plugins/net/CMakeLists.txt
+++ b/tdeabc/plugins/net/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kabc
-  ${CMAKE_SOURCE_DIR}/kabc
+  ${CMAKE_BINARY_DIR}/tdeabc
+  ${CMAKE_SOURCE_DIR}/tdeabc
 
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 link_directories(
@@ -34,17 +34,17 @@ link_directories(
 
 install( FILES
     resourcenet.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
 
 
 ##### other data ################################
 
-install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc )
 
 
-##### kabc_net (library) ########################
+##### tdeabc_net (library) ########################
 
-set( target kabc_net )
+set( target tdeabc_net )
 
 set( ${target}_SRCS
   resourcenet.cpp resourcenetconfig.cpp
@@ -53,14 +53,14 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
-##### kabc_net (module) #########################
+##### tdeabc_net (module) #########################
 
-set( target kabc_net )
+set( target tdeabc_net )
 
 set( ${target}_SRCS
   resourcenetplugin.cpp
@@ -68,6 +68,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kabc_net-shared
+  LINK tdeabc_net-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am
new file mode 100644
index 000000000..8fd53f34f
--- /dev/null
+++ b/tdeabc/plugins/net/Makefile.am
@@ -0,0 +1,28 @@
+INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS = resourcenetconfig.h
+
+lib_LTLIBRARIES = libtdeabc_net.la
+libtdeabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
+libtdeabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+libtdeabc_net_la_LIBADD	= $(top_builddir)/tdeabc/libkabc.la $(LIB_KIO)
+libtdeabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
+
+kde_module_LTLIBRARIES = tdeabc_net.la
+tdeabc_net_la_SOURCES = resourcenetplugin.cpp
+tdeabc_net_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore
+tdeabc_net_la_LIBADD	= libtdeabc_net.la
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeabc_net.pot
+
+kabcincludedir = $(includedir)/tdeabc
+kabcinclude_HEADERS = resourcenet.h
+
+servicedir = $(kde_servicesdir)/tderesources/tdeabc
+service_DATA = net.desktop
+
+resourcenetplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/net/net.desktop b/tdeabc/plugins/net/net.desktop
index 2c72c202d..adc7394b5 100644
--- a/kabc/plugins/net/net.desktop
+++ b/tdeabc/plugins/net/net.desktop
@@ -83,7 +83,7 @@ Name[zh_CN]=网络
 Name[zh_HK]=網絡
 Name[zh_TW]=網路
 Name[zu]=Umsebenzi wokuxhumana okusakazekile
-X-TDE-Library=kabc_net
+X-TDE-Library=tdeabc_net
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=contact
diff --git a/kabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp
index 914885877..390e84224 100644
--- a/kabc/plugins/net/resourcenet.cpp
+++ b/tdeabc/plugins/net/resourcenet.cpp
@@ -21,11 +21,11 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
-#include <klocale.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
+#include <tdelocale.h>
 #include <ksavefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 
 #include "addressbook.h"
@@ -35,21 +35,21 @@
 
 #include "resourcenet.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 class ResourceNet::ResourceNetPrivate
 {
   public:
-    KIO::Job *mLoadJob;
+    TDEIO::Job *mLoadJob;
     bool mIsLoading;
 
-    KIO::Job *mSaveJob;
+    TDEIO::Job *mSaveJob;
     bool mIsSaving;
 
     TQString mLastErrorString;
 };
 
-ResourceNet::ResourceNet( const KConfig *config )
+ResourceNet::ResourceNet( const TDEConfig *config )
   : Resource( config ), mFormat( 0 ),
     mTempFile( 0 ),
     d( new ResourceNetPrivate )
@@ -104,7 +104,7 @@ ResourceNet::~ResourceNet()
   deleteLocalTempFile();
 }
 
-void ResourceNet::writeConfig( KConfig *config )
+void ResourceNet::writeConfig( TDEConfig *config )
 {
   Resource::writeConfig( config );
 
@@ -137,7 +137,7 @@ bool ResourceNet::load()
 {
   TQString tempFile;
 
-  if ( !KIO::NetAccess::download( mUrl, tempFile, 0 ) ) {
+  if ( !TDEIO::NetAccess::download( mUrl, tempFile, 0 ) ) {
     addressBook()->error( i18n( "Unable to download file '%1'." ).arg( mUrl.prettyURL() ) );
     return false;
   }
@@ -145,7 +145,7 @@ bool ResourceNet::load()
   TQFile file( tempFile );
   if ( !file.open( IO_ReadOnly ) ) {
     addressBook()->error( i18n( "Unable to open file '%1'." ).arg( tempFile ) );
-    KIO::NetAccess::removeTempFile( tempFile );
+    TDEIO::NetAccess::removeTempFile( tempFile );
     return false;
   }
 
@@ -153,7 +153,7 @@ bool ResourceNet::load()
   if ( !result )
       addressBook()->error( i18n( "Problems during parsing file '%1'." ).arg( tempFile ) );
 
-  KIO::NetAccess::removeTempFile( tempFile );
+  TDEIO::NetAccess::removeTempFile( tempFile );
 
   return result;
 }
@@ -189,11 +189,11 @@ bool ResourceNet::asyncLoad()
   KURL dest;
   dest.setPath( mTempFile->name() );
 
-  KIO::Scheduler::checkSlaveOnHold( true );
-  d->mLoadJob = KIO::file_copy( mUrl, dest, -1, true, false, false );
+  TDEIO::Scheduler::checkSlaveOnHold( true );
+  d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false );
   d->mIsLoading = true;
-  connect( d->mLoadJob, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( downloadFinished( KIO::Job* ) ) );
+  connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) );
 
   return true;
 }
@@ -247,7 +247,7 @@ bool ResourceNet::save( Ticket* )
     return false;
   }
 
-  ok = KIO::NetAccess::upload( tempFile.name(), mUrl, 0 );
+  ok = TDEIO::NetAccess::upload( tempFile.name(), mUrl, 0 );
   if ( !ok )
     addressBook()->error( i18n( "Unable to upload to '%1'." ).arg( mUrl.prettyURL() ) );
 
@@ -283,11 +283,11 @@ bool ResourceNet::asyncSave( Ticket* )
   KURL src;
   src.setPath( mTempFile->name() );
 
-  KIO::Scheduler::checkSlaveOnHold( true );
+  TDEIO::Scheduler::checkSlaveOnHold( true );
   d->mIsSaving = true;
-  d->mSaveJob = KIO::file_copy( src, mUrl, -1, true, false, false );
-  connect( d->mSaveJob, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( uploadFinished( KIO::Job* ) ) );
+  d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false );
+  connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) );
 
   return true;
 }
@@ -344,7 +344,7 @@ TQString ResourceNet::format() const
   return mFormatName;
 }
 
-void ResourceNet::downloadFinished( KIO::Job* )
+void ResourceNet::downloadFinished( TDEIO::Job* )
 {
   kdDebug(5700) << "ResourceNet::downloadFinished()" << endl;
 
@@ -370,7 +370,7 @@ void ResourceNet::downloadFinished( KIO::Job* )
   deleteLocalTempFile();
 }
 
-void ResourceNet::uploadFinished( KIO::Job *job )
+void ResourceNet::uploadFinished( TDEIO::Job *job )
 {
   kdDebug(5700) << "ResourceFile::uploadFinished()" << endl;
 
diff --git a/kabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h
index 326c3780b..18a3b715b 100644
--- a/kabc/plugins/net/resourcenet.h
+++ b/tdeabc/plugins/net/resourcenet.h
@@ -21,21 +21,21 @@
 #ifndef KABC_RESOURCENET_H
 #define KABC_RESOURCENET_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 class TQFile;
 class TQTimer;
 class KTempFile;
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
-namespace KABC {
+namespace TDEABC {
 
 class FormatPlugin;
 
@@ -47,11 +47,11 @@ class KABC_EXPORT ResourceNet : public Resource
   Q_OBJECT
 
   public:
-    ResourceNet( const KConfig* );
+    ResourceNet( const TDEConfig* );
     ResourceNet( const KURL &url, const TQString &format );
     ~ResourceNet();
 
-    virtual void writeConfig( KConfig* );
+    virtual void writeConfig( TDEConfig* );
 
     virtual bool doOpen();
     virtual void doClose();
@@ -88,8 +88,8 @@ class KABC_EXPORT ResourceNet : public Resource
     void init( const KURL &url, const TQString &format );
 
   private slots:
-    void downloadFinished( KIO::Job* );
-    void uploadFinished( KIO::Job* );
+    void downloadFinished( TDEIO::Job* );
+    void uploadFinished( TDEIO::Job* );
     void signalError();
 
   private:
diff --git a/kabc/plugins/net/resourcenetconfig.cpp b/tdeabc/plugins/net/resourcenetconfig.cpp
index b441fbd98..ab3cddf3e 100644
--- a/kabc/plugins/net/resourcenetconfig.cpp
+++ b/tdeabc/plugins/net/resourcenetconfig.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "formatfactory.h"
@@ -31,7 +31,7 @@
 
 #include "resourcenetconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceNetConfig::ResourceNetConfig( TQWidget* parent, const char* name )
     : ConfigWidget( parent, name ), mInEditMode( false )
diff --git a/kabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
index e07937739..f2ba37800 100644
--- a/kabc/plugins/net/resourcenetconfig.h
+++ b/tdeabc/plugins/net/resourcenetconfig.h
@@ -24,9 +24,9 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
 { 
diff --git a/kabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp
index 189bab051..8db397152 100644
--- a/kabc/plugins/net/resourcenetplugin.cpp
+++ b/tdeabc/plugins/net/resourcenetplugin.cpp
@@ -21,11 +21,11 @@
 #include "resourcenet.h"
 #include "resourcenetconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_kabc_net()
+  KDE_EXPORT void *init_tdeabc_net()
   {
     return new KRES::PluginFactory<ResourceNet, ResourceNetConfig>();
   }
diff --git a/tdeabc/plugins/sql/Makefile.am b/tdeabc/plugins/sql/Makefile.am
new file mode 100644
index 000000000..43dd193f6
--- /dev/null
+++ b/tdeabc/plugins/sql/Makefile.am
@@ -0,0 +1,20 @@
+INCLUDES = -I$(top_srcdir)/tdeabc -I$(top_builddir)/tdeabc $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = resourcesql.h resourcesqlconfig.h
+
+kde_module_LTLIBRARIES = tdeabc_sql.la
+
+tdeabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp
+
+tdeabc_sql_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
+tdeabc_sql_la_LIBADD	= ../../libkabc.la ../../../tdeui/libtdeui.la
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdeabc_sql.pot
+
+linkdir		= $(kde_datadir)/tderesources/contact
+link_DATA	= sql.desktop
+EXTRA_DIST	= $(link_DATA)
diff --git a/kabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp
index 55f02bae7..ed284cdc5 100644
--- a/kabc/plugins/sql/resourcesql.cpp
+++ b/tdeabc/plugins/sql/resourcesql.cpp
@@ -22,24 +22,24 @@
 #include <tqsqlcursor.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resourcesql.h"
 #include "resourcesqlconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_kabc_sql()
+  KDE_EXPORT void *init_tdeabc_sql()
   {
     return new KRES::PluginFactory<ResourceSql,ResourceSqlConfig>();
   }
 }
 
-ResourceSql::ResourceSql( AddressBook *ab, const KConfig *config )
+ResourceSql::ResourceSql( AddressBook *ab, const TDEConfig *config )
   : Resource( ab ), mDb( 0 )
 {
   TQString user, password, db, host;
diff --git a/kabc/plugins/sql/resourcesql.h b/tdeabc/plugins/sql/resourcesql.h
index 80ebf9e7a..b7c82e6b0 100644
--- a/kabc/plugins/sql/resourcesql.h
+++ b/tdeabc/plugins/sql/resourcesql.h
@@ -21,21 +21,21 @@
 #ifndef KABC_RESOURCESQL_H
 #define KABC_RESOURCESQL_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "addressbook.h"
 #include "resource.h"
 
 class TQSqlDatabase;
 
-namespace KABC {
+namespace TDEABC {
 
 class ResourceSql : public Resource
 {
 public:
   ResourceSql( AddressBook *ab, const TQString &user, const TQString &password,
     const TQString &db, const TQString &host );
-  ResourceSql( AddressBook *ab, const KConfig * );
+  ResourceSql( AddressBook *ab, const TDEConfig * );
   
   bool open();
   void close();
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/tdeabc/plugins/sql/resourcesqlconfig.cpp
index ef1651cde..34a678aca 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/tdeabc/plugins/sql/resourcesqlconfig.cpp
@@ -24,12 +24,12 @@
 #include <tqvbox.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resource.h"
 #include "resourcesqlconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent,  const char* name )
     : ResourceConfigWidget( parent, name )
@@ -74,19 +74,19 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent,  const char* name )
   mainLayout->addWidget( mDbName, 4, 1 );
 }
 
-void ResourceSqlConfig::loadSettings( KConfig *config )
+void ResourceSqlConfig::loadSettings( TDEConfig *config )
 {
   mUser->setText( config->readEntry( "SqlUser" ) );
-  mPassword->setText( KABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) );
+  mPassword->setText( TDEABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) );
   mDbName->setText( config->readEntry( "SqlName" ) );
   mHost->setText( config->readEntry( "SqlHost" ) );
   mPort->setValue( config->readNumEntry( "SqlPort" ) );
 }
 
-void ResourceSqlConfig::saveSettings( KConfig *config )
+void ResourceSqlConfig::saveSettings( TDEConfig *config )
 {
   config->writeEntry( "SqlUser", mUser->text() );
-  config->writeEntry( "SqlPassword", KABC::Resource::cryptStr( mPassword->text() ) );
+  config->writeEntry( "SqlPassword", TDEABC::Resource::cryptStr( mPassword->text() ) );
   config->writeEntry( "SqlName", mDbName->text() );
   config->writeEntry( "SqlHost", mHost->text() );
   config->writeEntry( "SqlPort", mPort->value() );
diff --git a/kabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h
index 7bd27d969..f9b2c0a61 100644
--- a/kabc/plugins/sql/resourcesqlconfig.h
+++ b/tdeabc/plugins/sql/resourcesqlconfig.h
@@ -26,7 +26,7 @@
 class KLineEdit;
 class TQSpinBox;
 
-namespace KABC {
+namespace TDEABC {
 
 class ResourceSqlConfig : public ResourceConfigWidget
 { 
@@ -36,8 +36,8 @@ public:
   ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 );
 
 public slots:
-  void loadSettings( KConfig *config );
-  void saveSettings( KConfig *config );
+  void loadSettings( TDEConfig *config );
+  void saveSettings( TDEConfig *config );
 
 private:
   KLineEdit* mUser;
diff --git a/kabc/plugins/sql/sql.desktop b/tdeabc/plugins/sql/sql.desktop
index 4ac553008..6881ebebe 100644
--- a/kabc/plugins/sql/sql.desktop
+++ b/tdeabc/plugins/sql/sql.desktop
@@ -7,4 +7,4 @@ Name[te]=�స�క�య�ఎల�
 
 [Plugin]
 Type=sql
-X-TDE-Library=kabc_sql
+X-TDE-Library=tdeabc_sql
diff --git a/kabc/resource.cpp b/tdeabc/resource.cpp
index d43c68320..4128db82c 100644
--- a/kabc/resource.cpp
+++ b/tdeabc/resource.cpp
@@ -19,11 +19,11 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resource.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Ticket::Ticket( Resource *resource )
   : mResource( resource )
@@ -197,7 +197,7 @@ bool Resource::ConstIterator::operator!=( const ConstIterator &it )
 }
 
 
-Resource::Resource( const KConfig *config )
+Resource::Resource( const TDEConfig *config )
   : KRES::Resource( config ), mAddressBook( 0 )
 {
 }
@@ -236,7 +236,7 @@ Resource::ConstIterator Resource::end() const
   return it;
 }
 
-void Resource::writeConfig( KConfig *config )
+void Resource::writeConfig( TDEConfig *config )
 {
   KRES::Resource::writeConfig( config );
 }
diff --git a/kabc/resource.h b/tdeabc/resource.h
index 0412a22b1..620d9ec47 100644
--- a/kabc/resource.h
+++ b/tdeabc/resource.h
@@ -21,12 +21,12 @@
 #ifndef KABC_RESOURCE_H
 #define KABC_RESOURCE_H
 
-#include <kresources/resource.h>
+#include <tderesources/resource.h>
 
 #include "addressbook.h"
 #include "plugin.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
  * @short Helper class for handling coordinated save of address books.
@@ -118,7 +118,7 @@ class KABC_EXPORT Resource : public KRES::Resource
       @param config The config object where the derived classes can
                     read out their settings.
      */
-    Resource( const KConfig *config );
+    Resource( const TDEConfig *config );
 
     /**
       Destructor.
@@ -157,7 +157,7 @@ class KABC_EXPORT Resource : public KRES::Resource
     /**
       Writes the resource specific config to file.
      */
-    virtual void writeConfig( KConfig *config );
+    virtual void writeConfig( TDEConfig *config );
 
     /**
       Request a ticket, you have to pass through save() to
diff --git a/kabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp
index 256125cd2..1b9d1a40d 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/tdeabc/resourceselectdialog.cpp
@@ -18,9 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbuttonbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kstdguiitem.h>
 
 #include <tqgroupbox.h>
@@ -31,7 +31,7 @@
 
 #include "resourceselectdialog.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, const char *name )
     : KDialog( parent, name, true )
@@ -45,7 +45,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
   TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal,  this );
   groupBox->setTitle( i18n( "Resources" ) );
 
-  mResourceId = new KListBox( groupBox );
+  mResourceId = new TDEListBox( groupBox );
 
   mainLayout->addWidget( groupBox );
 
diff --git a/kabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h
index 6441dc247..5065a3c82 100644
--- a/kabc/resourceselectdialog.h
+++ b/tdeabc/resourceselectdialog.h
@@ -26,9 +26,9 @@
 #include <kdialog.h>
 #include <kdemacros.h>
 
-class KListBox;
+class TDEListBox;
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class Resource;
@@ -48,7 +48,7 @@ class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog
     static Resource *getResource( AddressBook *ab, TQWidget *parent = 0 );
 
   private:
-    KListBox *mResourceId;
+    TDEListBox *mResourceId;
     TQMap<int, Resource*> mResourceMap;
 };
 
diff --git a/kabc/scripts/Makefile.am b/tdeabc/scripts/Makefile.am
index 7715fba5c..7715fba5c 100644
--- a/kabc/scripts/Makefile.am
+++ b/tdeabc/scripts/Makefile.am
diff --git a/kabc/scripts/addressee.src.cpp b/tdeabc/scripts/addressee.src.cpp
index db956bc14..c090f7e4e 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/tdeabc/scripts/addressee.src.cpp
@@ -24,8 +24,8 @@
 
 #include <ksharedptr.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 #include "addresseehelper.h"
 #include "field.h"
@@ -34,7 +34,7 @@
 
 #include "addressee.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static bool matchBinaryPattern( int value, int pattern );
 
@@ -42,9 +42,9 @@ template <class L>
 static bool listEquals( const TQValueList<L>&, const TQValueList<L>& );
 static bool emailsEquals( const TQStringList&, const TQStringList& );
 
-KABC::SortMode *Addressee::mSortMode = 0;
+TDEABC::SortMode *Addressee::mSortMode = 0;
 
-struct Addressee::AddresseeData : public KShared
+struct Addressee::AddresseeData : public TDEShared
 {
   TQString uid;
   TQString uri;
@@ -68,7 +68,7 @@ Addressee::AddresseeData* Addressee::shared_null = 0;
 Addressee::AddresseeData* Addressee::makeSharedNull()
 {
   Addressee::shared_null = new AddresseeData;
-  shared_null->_KShared_ref(); //just in case (we should add KSD)
+  shared_null->_TDEShared_ref(); //just in case (we should add KSD)
   shared_null->empty = true;
   shared_null->changed = false;
   shared_null->resource = 0;
@@ -105,7 +105,7 @@ void Addressee::detach()
     mData->empty = true;
     mData->changed = false;
     mData->resource = 0;
-    mData->uid = KApplication::randomString( 10 );
+    mData->uid = TDEApplication::randomString( 10 );
     return;
   } else if ( mData.count() == 1 ) return;
 
@@ -1032,7 +1032,7 @@ bool Addressee::changed() const
   return mData->changed;
 }
 
-void Addressee::setSortMode( KABC::SortMode *mode )
+void Addressee::setSortMode( TDEABC::SortMode *mode )
 {
   mSortMode = mode;
 }
@@ -1045,7 +1045,7 @@ bool Addressee::operator< ( const Addressee &addr )
     return mSortMode->lesser( *this, addr );
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Addressee &a )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Addressee &a )
 {
   if (!a.mData) return s;
 
@@ -1061,7 +1061,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Addressee &a )
   return s;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Addressee &a )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Addressee &a )
 {
   if (!a.mData)
     return s;
diff --git a/kabc/scripts/addressee.src.h b/tdeabc/scripts/addressee.src.h
index f87edc5ec..aa449112e 100644
--- a/kabc/scripts/addressee.src.h
+++ b/tdeabc/scripts/addressee.src.h
@@ -39,7 +39,7 @@
 #include "sound.h"
 #include "timezone.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class Resource;
 class Field;
@@ -383,7 +383,7 @@ class KABC_EXPORT Addressee
      */
     bool changed() const;
 
-    static void setSortMode( KABC::SortMode *mode );
+    static void setSortMode( TDEABC::SortMode *mode );
 
     bool operator< ( const Addressee &addr );
 
@@ -391,12 +391,12 @@ class KABC_EXPORT Addressee
     void detach();
 
     struct AddresseeData;
-    mutable KSharedPtr<AddresseeData> mData;
+    mutable TDESharedPtr<AddresseeData> mData;
 
   private:
     static AddresseeData* shared_null;
     static AddresseeData* makeSharedNull();
-    static KABC::SortMode *mSortMode;
+    static TDEABC::SortMode *mSortMode;
 };
 
 KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Addressee & );
diff --git a/kabc/scripts/createisomap.pl b/tdeabc/scripts/createisomap.pl
index 897cd4896..897cd4896 100755
--- a/kabc/scripts/createisomap.pl
+++ b/tdeabc/scripts/createisomap.pl
diff --git a/kabc/scripts/entrylist b/tdeabc/scripts/entrylist
index 87c342a06..87c342a06 100644
--- a/kabc/scripts/entrylist
+++ b/tdeabc/scripts/entrylist
diff --git a/kabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp
index 5291303f5..a87d00679 100644
--- a/kabc/scripts/field.src.cpp
+++ b/tdeabc/scripts/field.src.cpp
@@ -18,14 +18,14 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 
 #include "field.h"
 #include "address.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 class Field::FieldImpl
 {
@@ -113,7 +113,7 @@ TQString Field::categoryLabel( int category )
   }
 }
 
-TQString Field::value( const KABC::Addressee &a )
+TQString Field::value( const TDEABC::Addressee &a )
 {
   switch ( mImpl->fieldId() ) {
     --CASEVALUE--
@@ -213,7 +213,7 @@ TQString Field::value( const KABC::Addressee &a )
   }
 }
 
-bool Field::setValue( KABC::Addressee &a, const TQString &value )
+bool Field::setValue( TDEABC::Addressee &a, const TQString &value )
 {
   switch ( mImpl->fieldId() ) {
     --CASESETVALUE--
@@ -261,84 +261,84 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value )
       }
     case FieldImpl::HomeAddressStreet:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setStreet( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressLocality:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setLocality( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressRegion:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setRegion( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressPostalCode:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setPostalCode( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressCountry:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setCountry( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressLabel:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setLabel( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressStreet:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setStreet( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressLocality:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setLocality( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressRegion:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setRegion( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressPostalCode:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setPostalCode( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressCountry:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setCountry( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressLabel:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setLabel( value );
         a.insertAddress( address );
         return true;
@@ -354,7 +354,7 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value )
   }
 }
 
-TQString Field::sortKey( const KABC::Addressee &a )
+TQString Field::sortKey( const TDEABC::Addressee &a )
 {
   switch ( mImpl->fieldId() ) {
     --CASEVALUE--
@@ -428,13 +428,13 @@ void Field::deleteFields()
 void Field::saveFields( const TQString &identifier,
                         const Field::List &fields )
 {
-  KConfig *cfg = KGlobal::config();
-  KConfigGroupSaver( cfg, "KABCFields" );
+  TDEConfig *cfg = TDEGlobal::config();
+  TDEConfigGroupSaver( cfg, "KABCFields" );
 
   saveFields( cfg, identifier, fields );
 }
 
-void Field::saveFields( KConfig *cfg, const TQString &identifier,
+void Field::saveFields( TDEConfig *cfg, const TQString &identifier,
                         const Field::List &fields )
 {
   TQValueList<int> fieldIds;
@@ -458,13 +458,13 @@ void Field::saveFields( KConfig *cfg, const TQString &identifier,
 
 Field::List Field::restoreFields( const TQString &identifier )
 {
-  KConfig *cfg = KGlobal::config();
-  KConfigGroupSaver( cfg, "KABCFields" );
+  TDEConfig *cfg = TDEGlobal::config();
+  TDEConfigGroupSaver( cfg, "KABCFields" );
  
   return restoreFields( cfg, identifier );
 }
 
-Field::List Field::restoreFields( KConfig *cfg, const TQString &identifier )
+Field::List Field::restoreFields( TDEConfig *cfg, const TQString &identifier )
 {
   const TQValueList<int> fieldIds = cfg->readIntListEntry( identifier );
 
diff --git a/kabc/scripts/makeaddressee b/tdeabc/scripts/makeaddressee
index fa955b0bf..fa955b0bf 100755
--- a/kabc/scripts/makeaddressee
+++ b/tdeabc/scripts/makeaddressee
diff --git a/kabc/secrecy.cpp b/tdeabc/secrecy.cpp
index 7ec439b0c..3fe33f17d 100644
--- a/kabc/secrecy.cpp
+++ b/tdeabc/secrecy.cpp
@@ -18,11 +18,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "secrecy.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Secrecy::Secrecy( int type )
   : mType( type )
@@ -87,12 +87,12 @@ TQString Secrecy::asString() const
   return typeLabel( mType );
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Secrecy &secrecy )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Secrecy &secrecy )
 {
     return s << secrecy.mType;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Secrecy &secrecy )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Secrecy &secrecy )
 {
     s >> secrecy.mType;
 
diff --git a/kabc/secrecy.h b/tdeabc/secrecy.h
index 5cc60b11d..596d1b675 100644
--- a/kabc/secrecy.h
+++ b/tdeabc/secrecy.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT Secrecy
 {
diff --git a/kabc/sortmode.cpp b/tdeabc/sortmode.cpp
index ee9a6f82d..1fef420eb 100644
--- a/kabc/sortmode.cpp
+++ b/tdeabc/sortmode.cpp
@@ -18,11 +18,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/field.h>
+#include <tdeabc/field.h>
 
 #include "sortmode.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 NameSortMode::NameSortMode()
  : mNameType( FormattedName ), mAscendingOrder( true ), d( 0 )
@@ -35,7 +35,7 @@ NameSortMode::NameSortMode( NameType type, bool ascending )
 {
 }
 
-bool NameSortMode::lesser( const KABC::Addressee &first, const KABC::Addressee &second ) const
+bool NameSortMode::lesser( const TDEABC::Addressee &first, const TDEABC::Addressee &second ) const
 {
   bool lesser = false;
 
@@ -60,12 +60,12 @@ bool NameSortMode::lesser( const KABC::Addressee &first, const KABC::Addressee &
   return lesser;
 }
 
-FieldSortMode::FieldSortMode( KABC::Field *field, bool ascending )
+FieldSortMode::FieldSortMode( TDEABC::Field *field, bool ascending )
   : mField( field ), mAscendingOrder( ascending ), d( 0 )
 {
 }
 
-bool FieldSortMode::lesser( const KABC::Addressee &first, const KABC::Addressee &second ) const
+bool FieldSortMode::lesser( const TDEABC::Addressee &first, const TDEABC::Addressee &second ) const
 {
   if ( !mField )
     return false;
diff --git a/kabc/sortmode.h b/tdeabc/sortmode.h
index 9768fc8c5..49f3490ba 100644
--- a/kabc/sortmode.h
+++ b/tdeabc/sortmode.h
@@ -23,15 +23,15 @@
 
 #include <tdelibs_export.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Sort method for sorting an addressee list.
 
   This interface should be reimplemented by classes which shall act as
-  SortModes for KABC::AddresseeList.
+  SortModes for TDEABC::AddresseeList.
 */
 class KABC_EXPORT SortMode
 {
@@ -40,7 +40,7 @@ class KABC_EXPORT SortMode
       Reimplement this method and return whether the first contact is 'smaller'
       than the second.
      */
-    virtual bool lesser( const KABC::Addressee &first, const KABC::Addressee &second ) const = 0;
+    virtual bool lesser( const TDEABC::Addressee &first, const TDEABC::Addressee &second ) const = 0;
 };
 
 class KABC_EXPORT NameSortMode : public SortMode
@@ -73,7 +73,7 @@ class KABC_EXPORT NameSortMode : public SortMode
     /**
       Returns whether the first contact is 'smaller' then the second.
      */
-    virtual bool lesser( const KABC::Addressee&, const KABC::Addressee& ) const;
+    virtual bool lesser( const TDEABC::Addressee&, const TDEABC::Addressee& ) const;
 
   private:
     NameType mNameType;
@@ -94,15 +94,15 @@ class KABC_EXPORT FieldSortMode : public SortMode
       @param field The field.
       @param ascending true for ascending sort, false for descending.
      */
-    FieldSortMode( KABC::Field *field, bool ascending = true );
+    FieldSortMode( TDEABC::Field *field, bool ascending = true );
 
     /**
       Returns whether the first contact is 'smaller' then the second.
      */
-    virtual bool lesser( const KABC::Addressee&, const KABC::Addressee& ) const;
+    virtual bool lesser( const TDEABC::Addressee&, const TDEABC::Addressee& ) const;
 
   private:
-    KABC::Field *mField;
+    TDEABC::Field *mField;
     bool mAscendingOrder;
 
     class FieldSortModePrivate;
diff --git a/kabc/sound.cpp b/tdeabc/sound.cpp
index cf645be83..fbdadd2d2 100644
--- a/kabc/sound.cpp
+++ b/tdeabc/sound.cpp
@@ -22,7 +22,7 @@
 
 #include <tqdatastream.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 Sound::Sound()
   : mIntern( false )
@@ -104,13 +104,13 @@ TQString Sound::asString() const
     return mUrl;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Sound &sound )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Sound &sound )
 {
   return s << sound.mIntern << sound.mUrl;
 //  return s << sound.mIntern << sound.mUrl << sound.mData;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Sound &sound )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Sound &sound )
 {
   s >> sound.mIntern >> sound.mUrl;
 //  s >> sound.mIntern >> sound.mUrl >> sound.mData;
diff --git a/kabc/sound.h b/tdeabc/sound.h
index 133c0facb..4602c9ed6 100644
--- a/kabc/sound.h
+++ b/tdeabc/sound.h
@@ -26,7 +26,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /** @short Class that holds a Sound clip for a contact.
  *
@@ -40,10 +40,10 @@ namespace KABC {
  *      KAudioPlayer::play( tmp.name() );
  *    } else if(!sound.url().isEmpty()) {
  *      TQString tmpFile;
- *      if(!KIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL))
+ *      if(!TDEIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL))
  *      {
  *        KMessageBox::error(0L,
- *                           KIO::NetAccess::lastErrorString(),
+ *                           TDEIO::NetAccess::lastErrorString(),
  *                           i18n("Failed to download sound file"),
  *                           KMessageBox::Notify
  *                          );
diff --git a/kabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp
index 6b574d86f..c0789f215 100644
--- a/kabc/stdaddressbook.cpp
+++ b/tdeabc/stdaddressbook.cpp
@@ -20,11 +20,11 @@
 
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcrash.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kresources/manager.h>
+#include <tdelocale.h>
+#include <tderesources/manager.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
@@ -33,7 +33,7 @@
 
 #include "stdaddressbook.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 StdAddressBook *StdAddressBook::mSelf = 0;
 bool StdAddressBook::mAutomaticSave = true;
@@ -42,12 +42,12 @@ static KStaticDeleter<StdAddressBook> addressBookDeleter;
 
 TQString StdAddressBook::fileName()
 {
-  return locateLocal( "data", "kabc/std.vcf" );
+  return locateLocal( "data", "tdeabc/std.vcf" );
 }
 
 TQString StdAddressBook::directoryName()
 {
-  return locateLocal( "data", "kabc/stdvcf" );
+  return locateLocal( "data", "tdeabc/stdvcf" );
 }
 
 void StdAddressBook::handleCrash()
@@ -188,7 +188,7 @@ bool StdAddressBook::automaticSave()
 // should get const for 4.X
 Addressee StdAddressBook::whoAmI()
 {
-  KConfig config( "kabcrc" );
+  TDEConfig config( "kabcrc" );
   config.setGroup( "General" );
 
   return findByUid( config.readEntry( "WhoAmI" ) );
@@ -196,7 +196,7 @@ Addressee StdAddressBook::whoAmI()
 
 void StdAddressBook::setWhoAmI( const Addressee &addr )
 {
-  KConfig config( "kabcrc" );
+  TDEConfig config( "kabcrc" );
   config.setGroup( "General" );
 
   config.writeEntry( "WhoAmI", addr.uid() );
diff --git a/kabc/stdaddressbook.h b/tdeabc/stdaddressbook.h
index 935b2bad1..86804a91e 100644
--- a/kabc/stdaddressbook.h
+++ b/tdeabc/stdaddressbook.h
@@ -23,7 +23,7 @@
 
 #include "addressbook.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   Standard KDE address book
@@ -37,19 +37,19 @@ namespace KABC {
   Example:
 
   \code
-  KABC::AddressBook *ab = KABC::StdAddressBook::self();
+  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self();
 
   AddressBook::Ticket *ticket = ab->requestSaveTicket();
 
   if ( ticket ) {
-    KABC::AddressBook::Iterator it;
+    TDEABC::AddressBook::Iterator it;
     for ( it = ab->begin(); it != ab->end(); ++it ) {
       kdDebug() << "UID=" << (*it).uid() << endl;
 
       // do some other stuff
     }
 
-    KABC::StdAddressBook::save( ticket );
+    TDEABC::StdAddressBook::save( ticket );
   }
   \endcode
 */
diff --git a/kabc/kab2kabc.cpp b/tdeabc/tdeab2tdeabc.cpp
index 9d8ea75ee..20aef735c 100644
--- a/kabc/kab2kabc.cpp
+++ b/tdeabc/tdeab2tdeabc.cpp
@@ -22,31 +22,31 @@
 #include <tqtextstream.h>
 
 #include <kabapi.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"
 #include "stdaddressbook.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "disable-autostart", I18N_NOOP( "Disable automatic startup on login" ), 0 },
   { "quiet", "", 0 },
   { "o", 0, 0 },
   { "override", I18N_NOOP( "Override existing entries" ), "1" },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
-void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
+void readKMailEntry( const TQString &kmailEntry, TDEABC::AddressBook *ab )
 {
   kdDebug() << "KMAILENTRY: " << kmailEntry << endl;
 
@@ -105,9 +105,9 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   kdDebug() << "  NAME    : " << name    << endl;
   kdDebug() << "  COMMENT : " << comment << endl;
 
-  KABC::Addressee::List al = ab->findByEmail( email );
+  TDEABC::Addressee::List al = ab->findByEmail( email );
   if ( al.isEmpty() ) {
-    KABC::Addressee a;
+    TDEABC::Addressee a;
     a.setNameFromString( name );
     a.insertEmail( email );
     a.setNote( comment );
@@ -118,16 +118,16 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   }
 }
 
-void importKMailAddressBook( KABC::AddressBook *ab )
+void importKMailAddressBook( TDEABC::AddressBook *ab )
 {
   TQString fileName = locateLocal( "data", "kmail/addressbook" );
   TQString kmailConfigName = locate( "config", "kmailrc" );
   if ( !kmailConfigName.isEmpty() ) {
-    KConfig cfg( kmailConfigName );
+    TDEConfig cfg( kmailConfigName );
     cfg.setGroup( "Addressbook" );
     fileName = cfg.readPathEntry( "default", fileName );
   }
-  if ( !KStandardDirs::exists( fileName ) ) {
+  if ( !TDEStandardDirs::exists( fileName ) ) {
     kdDebug(5700) << "Couldn't find KMail addressbook." << endl;
     return;
   }
@@ -251,7 +251,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
     } else if ( fieldName == "ROLE" ) {
       a.setRole( fieldValue );
     } else if ( fieldName == "BDAY" ) {
-      a.setBirthday( KGlobal::locale()->readDate( fieldValue ) );
+      a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) );
     } else if ( fieldName == "WEBPAGE" ) {
       a.setUrl( KURL( fieldValue ) );
     } else if ( fieldName == "N" ) {
@@ -278,9 +278,9 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
   if ( !otherAddress.isEmpty() ) a.insertAddress( otherAddress );
 }
 
-void importKab( KABC::AddressBook *ab, bool override, bool quiet )
+void importKab( TDEABC::AddressBook *ab, bool override, bool quiet )
 {
-  TQString fileName = KGlobal::dirs()->saveLocation( "data", "kab/" );
+  TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" );
   fileName += "addressbook.kab";
   if ( !TQFile::exists( fileName ) ) {
     if ( !quiet ) {
@@ -330,7 +330,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
       } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) {
         readKAddressBookEntries( *customIt, a );
       } else {
-        a.insertCustom( "kab2kabc", TQString::number( count++ ), *customIt );
+        a.insertCustom( "tdeab2tdeabc", TQString::number( count++ ), *customIt );
       }
     }
     if ( idFound ) {
@@ -432,15 +432,15 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
+  TDEAboutData aboutData( "tdeab2tdeabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   bool override = false;
 
@@ -458,12 +458,12 @@ int main( int argc, char **argv )
   if ( args->isSet( "disable-autostart" ) ) {
     kdDebug() << "Disable autostart." << endl;
 
-    KConfig *config = app.config();
+    TDEConfig *config = app.config();
     config->setGroup( "Startup" );
     config->writeEntry( "EnableAutostart", false );
   }
 
-  KABC::AddressBook *kabcBook = StdAddressBook::self();
+  TDEABC::AddressBook *kabcBook = StdAddressBook::self();
 
   importKMailAddressBook( kabcBook );
 
diff --git a/kabc/kab2kabc.desktop b/tdeabc/tdeab2tdeabc.desktop
index 3015b3935..ef7641b23 100644
--- a/kabc/kab2kabc.desktop
+++ b/tdeabc/tdeab2tdeabc.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=kab2kabc
+Name=tdeab2tdeabc
 Name[af]=kab-na-kabc
 Name[csb]=Kònwersëjô adresowi knéżczi
 Name[eo]=Konvertilo de "kab" al "kabc"
@@ -13,8 +13,8 @@ Name[pt_BR]=Conversão de  kab para kabc
 Name[ro]=Kab2kabc
 Name[sv]=Kab2kabc
 Name[te]=కెఎబి2కెఎబిసి
-Name[zu]=i-kab2kabc
-Exec=kab2kabc --disable-autostart --quiet
+Name[zu]=i-tdeab2tdeabc
+Exec=tdeab2tdeabc --disable-autostart --quiet
 Icon=misc
 Type=Application
 Comment=libkab to libkabc conversion tool.
@@ -23,19 +23,19 @@ Comment[ar]=أداة تحويل libkab إلى libkabc.
 Comment[az]=libkab - libkabc dönüşdürmə vasitəsi.
 Comment[be]=Ін�трумент пераўтвар�нн� libkab у libkabc.
 Comment[bg]=Програма за конвертиране на libkab до libkabc.
-Comment[bn]=libkab থেকে libkabc-তে পরিবর�তন করার প�রোগ�রাম।
+Comment[bn]=libkab থেকে libtdeabc-তে পরিবর�তন করার প�রোগ�রাম।
 Comment[bs]=alat za pretvaranje libkab u libkabc.
 Comment[ca]=Eina de conversió de libkab a libkabc.
 Comment[cs]=Převod dat z libkab do libkabc.
 Comment[csb]=Nôrzãdze do kònwersëji z libkab do libkabc.
 Comment[cy]=erfyn trosi libkab i libkabc
-Comment[da]=libkab-til-libkabc-konverteringsværktøj.
+Comment[da]=libkab-til-libtdeabc-konverteringsværktøj.
 Comment[de]=Konvertierung von libkab in libkabc
 Comment[el]=Ε�γαλείο μετατ�οπής από το libkab στο libkabc.
 Comment[eo]=Konvertilo de "libkab" al "libkabc"
 Comment[es]=Conversor libkab a libkabc.
 Comment[et]=libkab -> libkabc teisendamine
-Comment[eu]=libkab-etik libkabc-era bihurtzeko tresna.
+Comment[eu]=libkab-etik libtdeabc-era bihurtzeko tresna.
 Comment[fa]=ابزار تبدیل libkab به libcabc.
 Comment[fi]=libkab-libkabc -muunnin
 Comment[fr]=Outil de conversion de libkab vers libkabc.
@@ -59,7 +59,7 @@ Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel.
 Comment[lt]=libkab į libkabc konvertavimo įrankis.
 Comment[lv]=libkab uz libkabc kovertēšanas rīks.
 Comment[mk]=алатка за претворање од libkab во libkabc.
-Comment[mn]=libkab-аа� libkabc-руу хөрвүүл�гч
+Comment[mn]=libkab-аа� libtdeabc-руу хөрвүүл�гч
 Comment[ms]=perkakasan penukaran libkab to libkabc.
 Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc
 Comment[nb]=libkab til libkabc konverteringsverktøy.
@@ -101,5 +101,5 @@ Comment[zh_TW]=libkab 至 libkabc 轉�工具
 Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc
 Terminal=false
 NoDisplay=true
-X-TDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true
+X-TDE-autostart-condition=tdeab2tdeabcrc:Startup:EnableAutostart:true
 OnlyShowIn=TDE;
diff --git a/kabc/kabc_manager.desktop b/tdeabc/tdeabc_manager.desktop
index 0af910f52..0af910f52 100644
--- a/kabc/kabc_manager.desktop
+++ b/tdeabc/tdeabc_manager.desktop
diff --git a/kabc/tests/Makefile.am b/tdeabc/tests/Makefile.am
index 3af688026..aca0597ad 100644
--- a/kabc/tests/Makefile.am
+++ b/tdeabc/tests/Makefile.am
@@ -1,5 +1,5 @@
 # Make sure $(all_includes) remains last!
-INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kab \
+INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_srcdir)/kab \
            -I$(srcdir)/../vcardparser/ -I$(srcdir)/../vcard/include \
            -I$(srcdir)/../vcard/include/generated \
            -I$(srcdir)/../vcardparser $(all_includes)
@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
 testlock_LDFLAGS = $(all_libraries)
 testlock_SOURCES = testlock.cpp
 
-testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testldapclient_SOURCES = testldapclient.cpp
 
 EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
   testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
 
-testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-testkabc_SOURCES = testkabc.cpp
+testtdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testtdeabc_SOURCES = testkabc.cpp
 
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testaddressee_SOURCES = testaddressee.cpp
 
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testaddresseelist_SOURCES = testaddresseelist.cpp
 
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testaddressfmt_SOURCES = testaddressfmt.cpp
 
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testkabcdlg_SOURCES = testkabcdlg.cpp
 
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testdistlist_SOURCES = testdistlist.cpp
 
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testaddresslineedit_SOURCES = testaddresslineedit.cpp
 
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+bigread_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la
 bigread_SOURCES = bigread.cpp
 
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+bigwrite_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la
 bigwrite_SOURCES = bigwrite.cpp
 
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testdb_SOURCES = testdb.cpp
 
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kabcargl_SOURCES = kabcargl.cpp
 
diff --git a/kabc/tests/bigread.cpp b/tdeabc/tests/bigread.cpp
index e64bafef8..a2c9da070 100644
--- a/kabc/tests/bigread.cpp
+++ b/tdeabc/tests/bigread.cpp
@@ -1,10 +1,10 @@
 #include <sys/times.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
 #include "addressbook.h"
 #include "vcardformat.h"
@@ -13,14 +13,14 @@
 #include "resourcesql.h"
 #endif
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("bigread","BigReadKabc","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDEAboutData aboutData("bigread","BigReadKabc","0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
   
   AddressBook ab; 
    
diff --git a/kabc/tests/bigwrite.cpp b/tdeabc/tests/bigwrite.cpp
index 0dd6a7a05..ab7fec7cf 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/tdeabc/tests/bigwrite.cpp
@@ -1,23 +1,23 @@
 #include <sys/times.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
 #include "addressbook.h"
 #include "vcardformat.h"
 #include "plugins/file/resourcefile.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDEAboutData aboutData("bigwrite","BigWriteKabc","0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   AddressBook ab;
   ResourceFile r( "my.kabc", "vcard" );
diff --git a/kabc/tests/kabcargl.cpp b/tdeabc/tests/kabcargl.cpp
index b57724c15..d3a71890e 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/tdeabc/tests/kabcargl.cpp
@@ -22,25 +22,25 @@
 #include <tqtextstream.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "stdaddressbook.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
+  TDEAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
   aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
 
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   TQString filename = StdAddressBook::fileName();
   
diff --git a/kabc/tests/testaddressee.cpp b/tdeabc/tests/testaddressee.cpp
index d05c3af24..96989a06d 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/tdeabc/tests/testaddressee.cpp
@@ -1,8 +1,8 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"
@@ -11,23 +11,23 @@
 #include "vcardformat.h"
 #include "phonenumber.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "save", "", 0 },
   { "number", "", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testaddressee","TestAddressee","0.1");
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions(options);
+  TDEAboutData aboutData("testaddressee","TestAddressee","0.1");
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
-  KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+  TDEApplication app;
+  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
   kdDebug() << "Creating a" << endl;
   Addressee a;
diff --git a/kabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp
index e7cc123f1..12964a687 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/tdeabc/tests/testaddresseelist.cpp
@@ -1,30 +1,30 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"
 #include "addresseelist.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "save", "", 0 },
   { "number", "", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int /*argc*/,char /* **argv*/)
 {
-/*  KAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions(options);
+/*  TDEAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
-  KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); */
+  TDEApplication app;
+  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); */
 
   kdDebug() << "Creating addressees" << endl;
   Addressee a, b, c, d, e, f;
diff --git a/kabc/tests/testaddressfmt.cpp b/tdeabc/tests/testaddressfmt.cpp
index 19b2e8306..79545f6f9 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/tdeabc/tests/testaddressfmt.cpp
@@ -1,29 +1,29 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"
 #include "address.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "save", "", 0 },
   { "number", "", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions(options);
+  TDEAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
+  TDEApplication app;
 
   Address a;
   a.setStreet("Lummerlandstr. 1");
diff --git a/kabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp
index 0dea6f742..80bd311da 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/tdeabc/tests/testaddresslineedit.cpp
@@ -1,20 +1,20 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
 #include "addresslineedit.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main( int argc,char **argv )
 {
-  KAboutData aboutData( "testaddresslineedit",
+  TDEAboutData aboutData( "testaddresslineedit",
                         I18N_NOOP( "Test Address LineEdit" ), "0.1" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   AddressLineEdit *lineEdit = new AddressLineEdit( 0 );
 
diff --git a/kabc/tests/testdb.cpp b/tdeabc/tests/testdb.cpp
index f94397a62..c6b02c14a 100644
--- a/kabc/tests/testdb.cpp
+++ b/tdeabc/tests/testdb.cpp
@@ -1,22 +1,22 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
 #include "addressbook.h"
 #include "vcardformat.h"
 #include "resourcesql.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testdb","TestKabcDB","0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDEAboutData aboutData("testdb","TestKabcDB","0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
-//  KApplication app( false, false );
-  KApplication app;
+//  TDEApplication app( false, false );
+  TDEApplication app;
 
   AddressBook ab;
   
diff --git a/kabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp
index abf551ace..833dca84e 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/tdeabc/tests/testdistlist.cpp
@@ -1,34 +1,34 @@
 #include <tqwidget.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
 #include "stdaddressbook.h"
 
 #include "distributionlisteditor.h"
 #include "distributionlist.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"list <listname>", I18N_NOOP("Show distribution list with name <listname>"), 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDEAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("list")) {
     TQString name = args->getOption("list");
     
diff --git a/kabc/tests/testkabc.cpp b/tdeabc/tests/testkabc.cpp
index c5d2d12e4..2cc7effb4 100644
--- a/kabc/tests/testkabc.cpp
+++ b/tdeabc/tests/testkabc.cpp
@@ -1,8 +1,8 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
@@ -16,14 +16,14 @@
 #include "agent.h"
 #include "vcardconverter.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
-    KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
+    TDECmdLineArgs::init(argc, argv, &aboutData);
 
-    KApplication app( false, false );
+    TDEApplication app( false, false );
     AddressBook *ab = StdAddressBook::self();
 
 #define READ
diff --git a/kabc/tests/testkabcdlg.cpp b/tdeabc/tests/testkabcdlg.cpp
index 3c9a23792..7b4b18e3e 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/tdeabc/tests/testkabcdlg.cpp
@@ -1,30 +1,30 @@
 #include <tqwidget.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
 #include "addresseedialog.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"multiple", I18N_NOOP("Allow selection of multiple addressees"), 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDEAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("multiple")) {
     Addressee::List al = AddresseeDialog::getAddressees( 0 );
     Addressee::List::ConstIterator it;
diff --git a/kabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp
index 2fa6a1c72..71a34ee5e 100644
--- a/kabc/tests/testldapclient.cpp
+++ b/tdeabc/tests/testldapclient.cpp
@@ -18,9 +18,9 @@
 
 #include "testldapclient.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqeventloop.h>
 
@@ -29,9 +29,9 @@
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0);
-  KApplication app;
+  TDEApplication::disableAutoDcopRegistration();
+  TDECmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0);
+  TDEApplication app;
 
   TestLDAPClient test;
   test.setup();
@@ -97,8 +97,8 @@ void TestLDAPClient::testIntevation()
   // But this certainly looks fishy, it might break on non-utf8 systems.
   TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*Ägypten MDK*)(sn=*Ägypten MDK*))";
 
-  connect( mClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
-           this, TQT_SLOT( slotLDAPResult( const KABC::LdapObject& ) ) );
+  connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
+           this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
   connect( mClient, TQT_SIGNAL( done() ),
            this, TQT_SLOT( slotLDAPDone() ) );
   connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
@@ -123,11 +123,11 @@ static TQString asUtf8( const TQByteArray &val )
     return TQString::fromUtf8( data, val.size() );
 }
 
-static TQString join( const KABC::LdapAttrValue& lst, const TQString& sep )
+static TQString join( const TDEABC::LdapAttrValue& lst, const TQString& sep )
 {
   TQString res;
   bool already = false;
-  for ( KABC::LdapAttrValue::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+  for ( TDEABC::LdapAttrValue::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
     if ( already )
       res += sep;
     already = TRUE;
@@ -136,7 +136,7 @@ static TQString join( const KABC::LdapAttrValue& lst, const TQString& sep )
   return res;
 }
 
-void TestLDAPClient::slotLDAPResult( const KABC::LdapObject& obj )
+void TestLDAPClient::slotLDAPResult( const TDEABC::LdapObject& obj )
 {
   TQString cn = join( obj.attrs[ "cn" ], ", " );
   kdDebug() << " cn:" << cn << endl;
diff --git a/kabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h
index 1995914c3..502115b07 100644
--- a/kabc/tests/testldapclient.h
+++ b/tdeabc/tests/testldapclient.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 
 #include "../ldapclient.h"
-typedef KABC::LdapClient LdapClient;
+typedef TDEABC::LdapClient LdapClient;
 
 class TestLDAPClient : public TQObject
 {
@@ -38,7 +38,7 @@ public:
     void testIntevation();
 
 private slots:
-    void slotLDAPResult( const KABC::LdapObject& );
+    void slotLDAPResult( const TDEABC::LdapObject& );
     void slotLDAPError( const TQString& );
     void slotLDAPDone();
 
diff --git a/kabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
index 4674606e0..7f3cf634b 100644
--- a/kabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -23,14 +23,14 @@
 
 #include "stdaddressbook.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 #include <kdirwatch.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 
 #include <tqwidget.h>
@@ -45,7 +45,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 LockWidget::LockWidget( const TQString &identifier )
 {
@@ -153,27 +153,27 @@ void LockWidget::unlock()
 }
 
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "a", 0, 0 },
   { "addressbook", "Standard address book", 0 },
   { "d", 0, 0 },
   { "diraddressbook", "Standard address book directory resource", 0 },
   { "+identifier", "Identifier of resource to be locked, e.g. filename", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDEAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TQString identifier;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if ( args->count() == 1 ) {
     identifier = args->arg( 0 );
   } else if ( args->count() != 0 ) {
diff --git a/kabc/tests/testlock.h b/tdeabc/tests/testlock.h
index a94d4e8c6..01d07fc47 100644
--- a/kabc/tests/testlock.h
+++ b/tdeabc/tests/testlock.h
@@ -42,7 +42,7 @@ class KABC_EXPORT LockWidget : public TQWidget
     void updateLockView();
     
   private:
-    KABC::Lock *mLock;
+    TDEABC::Lock *mLock;
 
     TQLabel *mStatus;
     TQListView *mLockView;
diff --git a/kabc/timezone.cpp b/tdeabc/timezone.cpp
index 59a184c6d..7b773db63 100644
--- a/kabc/timezone.cpp
+++ b/tdeabc/timezone.cpp
@@ -22,7 +22,7 @@
 
 #include "timezone.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 TimeZone::TimeZone() :
   mOffset( 0 ), mValid( false )
@@ -71,12 +71,12 @@ TQString TimeZone::asString() const
   return TQString::number( mOffset );
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const TimeZone &zone )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const TimeZone &zone )
 {
     return s << zone.mOffset;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, TimeZone &zone )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, TimeZone &zone )
 {
     s >> zone.mOffset;
     zone.mValid = true;
diff --git a/kabc/timezone.h b/tdeabc/timezone.h
index 8705797fb..b53df7728 100644
--- a/kabc/timezone.h
+++ b/tdeabc/timezone.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
  * @short Time zone information.
diff --git a/kabc/vcard/AdrParam.cpp b/tdeabc/vcard/AdrParam.cpp
index 5ad56f4fb..5ad56f4fb 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/tdeabc/vcard/AdrParam.cpp
diff --git a/kabc/vcard/AdrValue.cpp b/tdeabc/vcard/AdrValue.cpp
index 535ba6980..535ba6980 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/tdeabc/vcard/AdrValue.cpp
diff --git a/kabc/vcard/AgentParam.cpp b/tdeabc/vcard/AgentParam.cpp
index 9e4531b02..9e4531b02 100644
--- a/kabc/vcard/AgentParam.cpp
+++ b/tdeabc/vcard/AgentParam.cpp
diff --git a/kabc/vcard/AgentValue.cpp b/tdeabc/vcard/AgentValue.cpp
index 7d356f8d7..7d356f8d7 100644
--- a/kabc/vcard/AgentValue.cpp
+++ b/tdeabc/vcard/AgentValue.cpp
diff --git a/kabc/vcard/CMakeLists.txt b/tdeabc/vcard/CMakeLists.txt
index 8ad988434..8ad988434 100644
--- a/kabc/vcard/CMakeLists.txt
+++ b/tdeabc/vcard/CMakeLists.txt
diff --git a/kabc/vcard/ClassValue.cpp b/tdeabc/vcard/ClassValue.cpp
index 21417f87b..21417f87b 100644
--- a/kabc/vcard/ClassValue.cpp
+++ b/tdeabc/vcard/ClassValue.cpp
diff --git a/kabc/vcard/ContentLine.cpp b/tdeabc/vcard/ContentLine.cpp
index 52bcdf4f5..52bcdf4f5 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/tdeabc/vcard/ContentLine.cpp
diff --git a/kabc/vcard/DateParam.cpp b/tdeabc/vcard/DateParam.cpp
index ffaf4b3f6..ffaf4b3f6 100644
--- a/kabc/vcard/DateParam.cpp
+++ b/tdeabc/vcard/DateParam.cpp
diff --git a/kabc/vcard/DateValue.cpp b/tdeabc/vcard/DateValue.cpp
index 9f578a158..9f578a158 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/tdeabc/vcard/DateValue.cpp
diff --git a/kabc/vcard/EmailParam.cpp b/tdeabc/vcard/EmailParam.cpp
index 7daf19ccc..7daf19ccc 100644
--- a/kabc/vcard/EmailParam.cpp
+++ b/tdeabc/vcard/EmailParam.cpp
diff --git a/kabc/vcard/Entity.cpp b/tdeabc/vcard/Entity.cpp
index 5eaf6a1d0..5eaf6a1d0 100644
--- a/kabc/vcard/Entity.cpp
+++ b/tdeabc/vcard/Entity.cpp
diff --git a/kabc/vcard/Enum.cpp b/tdeabc/vcard/Enum.cpp
index bcb48f98a..bcb48f98a 100644
--- a/kabc/vcard/Enum.cpp
+++ b/tdeabc/vcard/Enum.cpp
diff --git a/kabc/vcard/FloatValue.cpp b/tdeabc/vcard/FloatValue.cpp
index ac1f2c6b5..ac1f2c6b5 100644
--- a/kabc/vcard/FloatValue.cpp
+++ b/tdeabc/vcard/FloatValue.cpp
diff --git a/kabc/vcard/GeoValue.cpp b/tdeabc/vcard/GeoValue.cpp
index 2bac28c1e..2bac28c1e 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/tdeabc/vcard/GeoValue.cpp
diff --git a/kabc/vcard/ImageParam.cpp b/tdeabc/vcard/ImageParam.cpp
index 69611eeab..69611eeab 100644
--- a/kabc/vcard/ImageParam.cpp
+++ b/tdeabc/vcard/ImageParam.cpp
diff --git a/kabc/vcard/ImageValue.cpp b/tdeabc/vcard/ImageValue.cpp
index 5d8d29bb7..5d8d29bb7 100644
--- a/kabc/vcard/ImageValue.cpp
+++ b/tdeabc/vcard/ImageValue.cpp
diff --git a/kabc/vcard/ImgValue.cpp b/tdeabc/vcard/ImgValue.cpp
index 42889acd8..42889acd8 100644
--- a/kabc/vcard/ImgValue.cpp
+++ b/tdeabc/vcard/ImgValue.cpp
diff --git a/kabc/vcard/LangValue.cpp b/tdeabc/vcard/LangValue.cpp
index f7e5a759e..f7e5a759e 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/tdeabc/vcard/LangValue.cpp
diff --git a/kabc/vcard/Makefile.am b/tdeabc/vcard/Makefile.am
index 738faff03..e8a33c3a9 100644
--- a/kabc/vcard/Makefile.am
+++ b/tdeabc/vcard/Makefile.am
@@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
 check_PROGRAMS = testwrite testread
 
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testwrite_LDADD = libvcard.la 
 testwrite_SOURCES = testwrite.cpp
 
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testread_LDADD = libvcard.la 
 testread_SOURCES = testread.cpp
diff --git a/kabc/vcard/NValue.cpp b/tdeabc/vcard/NValue.cpp
index e63268134..e63268134 100644
--- a/kabc/vcard/NValue.cpp
+++ b/tdeabc/vcard/NValue.cpp
diff --git a/kabc/vcard/OrgValue.cpp b/tdeabc/vcard/OrgValue.cpp
index 94ca18243..94ca18243 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/tdeabc/vcard/OrgValue.cpp
diff --git a/kabc/vcard/Param.cpp b/tdeabc/vcard/Param.cpp
index 8c5ad9e2c..8c5ad9e2c 100644
--- a/kabc/vcard/Param.cpp
+++ b/tdeabc/vcard/Param.cpp
diff --git a/kabc/vcard/PhoneNumberValue.cpp b/tdeabc/vcard/PhoneNumberValue.cpp
index 02a1266fe..02a1266fe 100644
--- a/kabc/vcard/PhoneNumberValue.cpp
+++ b/tdeabc/vcard/PhoneNumberValue.cpp
diff --git a/kabc/vcard/README b/tdeabc/vcard/README
index 18a9daf4a..18a9daf4a 100644
--- a/kabc/vcard/README
+++ b/tdeabc/vcard/README
diff --git a/kabc/vcard/RToken.cpp b/tdeabc/vcard/RToken.cpp
index 582a9e1c7..582a9e1c7 100644
--- a/kabc/vcard/RToken.cpp
+++ b/tdeabc/vcard/RToken.cpp
diff --git a/kabc/vcard/SoundValue.cpp b/tdeabc/vcard/SoundValue.cpp
index 5be75d358..5be75d358 100644
--- a/kabc/vcard/SoundValue.cpp
+++ b/tdeabc/vcard/SoundValue.cpp
diff --git a/kabc/vcard/SourceParam.cpp b/tdeabc/vcard/SourceParam.cpp
index 6a0e772ac..6a0e772ac 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/tdeabc/vcard/SourceParam.cpp
diff --git a/kabc/vcard/TelParam.cpp b/tdeabc/vcard/TelParam.cpp
index 072b1dc81..072b1dc81 100644
--- a/kabc/vcard/TelParam.cpp
+++ b/tdeabc/vcard/TelParam.cpp
diff --git a/kabc/vcard/TelValue.cpp b/tdeabc/vcard/TelValue.cpp
index c9c1b85aa..c9c1b85aa 100644
--- a/kabc/vcard/TelValue.cpp
+++ b/tdeabc/vcard/TelValue.cpp
diff --git a/kabc/vcard/TextBinParam.cpp b/tdeabc/vcard/TextBinParam.cpp
index 4e0ebadff..4e0ebadff 100644
--- a/kabc/vcard/TextBinParam.cpp
+++ b/tdeabc/vcard/TextBinParam.cpp
diff --git a/kabc/vcard/TextBinValue.cpp b/tdeabc/vcard/TextBinValue.cpp
index e7da0b7c6..e7da0b7c6 100644
--- a/kabc/vcard/TextBinValue.cpp
+++ b/tdeabc/vcard/TextBinValue.cpp
diff --git a/kabc/vcard/TextListValue.cpp b/tdeabc/vcard/TextListValue.cpp
index 2bec2e181..2bec2e181 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/tdeabc/vcard/TextListValue.cpp
diff --git a/kabc/vcard/TextParam.cpp b/tdeabc/vcard/TextParam.cpp
index b353483ec..b353483ec 100644
--- a/kabc/vcard/TextParam.cpp
+++ b/tdeabc/vcard/TextParam.cpp
diff --git a/kabc/vcard/TextValue.cpp b/tdeabc/vcard/TextValue.cpp
index cf8e0673f..cf8e0673f 100644
--- a/kabc/vcard/TextValue.cpp
+++ b/tdeabc/vcard/TextValue.cpp
diff --git a/kabc/vcard/URIValue.cpp b/tdeabc/vcard/URIValue.cpp
index bba8db0fa..bba8db0fa 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/tdeabc/vcard/URIValue.cpp
diff --git a/kabc/vcard/UTCValue.cpp b/tdeabc/vcard/UTCValue.cpp
index 30473661f..30473661f 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/tdeabc/vcard/UTCValue.cpp
diff --git a/kabc/vcard/VCard.cpp b/tdeabc/vcard/VCard.cpp
index eb3f57f6e..eb3f57f6e 100644
--- a/kabc/vcard/VCard.cpp
+++ b/tdeabc/vcard/VCard.cpp
diff --git a/kabc/vcard/VCardEntity.cpp b/tdeabc/vcard/VCardEntity.cpp
index 1f8cea5b1..1f8cea5b1 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/tdeabc/vcard/VCardEntity.cpp
diff --git a/kabc/vcard/Value.cpp b/tdeabc/vcard/Value.cpp
index c95c0712b..c95c0712b 100644
--- a/kabc/vcard/Value.cpp
+++ b/tdeabc/vcard/Value.cpp
diff --git a/kabc/vcard/include/VCard.h b/tdeabc/vcard/include/VCard.h
index 17b50e8f2..17b50e8f2 100644
--- a/kabc/vcard/include/VCard.h
+++ b/tdeabc/vcard/include/VCard.h
diff --git a/kabc/vcard/include/VCardAdrParam.h b/tdeabc/vcard/include/VCardAdrParam.h
index d40165f4a..d40165f4a 100644
--- a/kabc/vcard/include/VCardAdrParam.h
+++ b/tdeabc/vcard/include/VCardAdrParam.h
diff --git a/kabc/vcard/include/VCardAdrValue.h b/tdeabc/vcard/include/VCardAdrValue.h
index 94ed93aee..94ed93aee 100644
--- a/kabc/vcard/include/VCardAdrValue.h
+++ b/tdeabc/vcard/include/VCardAdrValue.h
diff --git a/kabc/vcard/include/VCardAgentParam.h b/tdeabc/vcard/include/VCardAgentParam.h
index 90c3bd528..90c3bd528 100644
--- a/kabc/vcard/include/VCardAgentParam.h
+++ b/tdeabc/vcard/include/VCardAgentParam.h
diff --git a/kabc/vcard/include/VCardAgentValue.h b/tdeabc/vcard/include/VCardAgentValue.h
index dd68145c9..dd68145c9 100644
--- a/kabc/vcard/include/VCardAgentValue.h
+++ b/tdeabc/vcard/include/VCardAgentValue.h
diff --git a/kabc/vcard/include/VCardClassValue.h b/tdeabc/vcard/include/VCardClassValue.h
index 5de79167b..5de79167b 100644
--- a/kabc/vcard/include/VCardClassValue.h
+++ b/tdeabc/vcard/include/VCardClassValue.h
diff --git a/kabc/vcard/include/VCardContentLine.h b/tdeabc/vcard/include/VCardContentLine.h
index ea59444a0..ea59444a0 100644
--- a/kabc/vcard/include/VCardContentLine.h
+++ b/tdeabc/vcard/include/VCardContentLine.h
diff --git a/kabc/vcard/include/VCardDateParam.h b/tdeabc/vcard/include/VCardDateParam.h
index 410eae6b7..410eae6b7 100644
--- a/kabc/vcard/include/VCardDateParam.h
+++ b/tdeabc/vcard/include/VCardDateParam.h
diff --git a/kabc/vcard/include/VCardDateValue.h b/tdeabc/vcard/include/VCardDateValue.h
index 4f2e2fe7f..4f2e2fe7f 100644
--- a/kabc/vcard/include/VCardDateValue.h
+++ b/tdeabc/vcard/include/VCardDateValue.h
diff --git a/kabc/vcard/include/VCardDefines.h b/tdeabc/vcard/include/VCardDefines.h
index e778bc24f..e778bc24f 100644
--- a/kabc/vcard/include/VCardDefines.h
+++ b/tdeabc/vcard/include/VCardDefines.h
diff --git a/kabc/vcard/include/VCardEmailParam.h b/tdeabc/vcard/include/VCardEmailParam.h
index 1fe558afd..1fe558afd 100644
--- a/kabc/vcard/include/VCardEmailParam.h
+++ b/tdeabc/vcard/include/VCardEmailParam.h
diff --git a/kabc/vcard/include/VCardEntity.h b/tdeabc/vcard/include/VCardEntity.h
index e87c5f1a6..e87c5f1a6 100644
--- a/kabc/vcard/include/VCardEntity.h
+++ b/tdeabc/vcard/include/VCardEntity.h
diff --git a/kabc/vcard/include/VCardEnum.h b/tdeabc/vcard/include/VCardEnum.h
index 4552ccdbc..4552ccdbc 100644
--- a/kabc/vcard/include/VCardEnum.h
+++ b/tdeabc/vcard/include/VCardEnum.h
diff --git a/kabc/vcard/include/VCardFloatValue.h b/tdeabc/vcard/include/VCardFloatValue.h
index 45a6823be..45a6823be 100644
--- a/kabc/vcard/include/VCardFloatValue.h
+++ b/tdeabc/vcard/include/VCardFloatValue.h
diff --git a/kabc/vcard/include/VCardGeoValue.h b/tdeabc/vcard/include/VCardGeoValue.h
index 4228587a4..4228587a4 100644
--- a/kabc/vcard/include/VCardGeoValue.h
+++ b/tdeabc/vcard/include/VCardGeoValue.h
diff --git a/kabc/vcard/include/VCardGroup.h b/tdeabc/vcard/include/VCardGroup.h
index ce884f100..ce884f100 100644
--- a/kabc/vcard/include/VCardGroup.h
+++ b/tdeabc/vcard/include/VCardGroup.h
diff --git a/kabc/vcard/include/VCardImageParam.h b/tdeabc/vcard/include/VCardImageParam.h
index 10ab8a3f5..10ab8a3f5 100644
--- a/kabc/vcard/include/VCardImageParam.h
+++ b/tdeabc/vcard/include/VCardImageParam.h
diff --git a/kabc/vcard/include/VCardImageValue.h b/tdeabc/vcard/include/VCardImageValue.h
index 45fbcad9c..45fbcad9c 100644
--- a/kabc/vcard/include/VCardImageValue.h
+++ b/tdeabc/vcard/include/VCardImageValue.h
diff --git a/kabc/vcard/include/VCardImgValue.h b/tdeabc/vcard/include/VCardImgValue.h
index 7d4bbfa2d..7d4bbfa2d 100644
--- a/kabc/vcard/include/VCardImgValue.h
+++ b/tdeabc/vcard/include/VCardImgValue.h
diff --git a/kabc/vcard/include/VCardLangValue.h b/tdeabc/vcard/include/VCardLangValue.h
index 7767d52fa..7767d52fa 100644
--- a/kabc/vcard/include/VCardLangValue.h
+++ b/tdeabc/vcard/include/VCardLangValue.h
diff --git a/kabc/vcard/include/VCardNValue.h b/tdeabc/vcard/include/VCardNValue.h
index 9db37fbbc..9db37fbbc 100644
--- a/kabc/vcard/include/VCardNValue.h
+++ b/tdeabc/vcard/include/VCardNValue.h
diff --git a/kabc/vcard/include/VCardOrgValue.h b/tdeabc/vcard/include/VCardOrgValue.h
index a2bd803e5..a2bd803e5 100644
--- a/kabc/vcard/include/VCardOrgValue.h
+++ b/tdeabc/vcard/include/VCardOrgValue.h
diff --git a/kabc/vcard/include/VCardParam.h b/tdeabc/vcard/include/VCardParam.h
index 93d70f06b..93d70f06b 100644
--- a/kabc/vcard/include/VCardParam.h
+++ b/tdeabc/vcard/include/VCardParam.h
diff --git a/kabc/vcard/include/VCardPhoneNumberValue.h b/tdeabc/vcard/include/VCardPhoneNumberValue.h
index 3f9e106ca..3f9e106ca 100644
--- a/kabc/vcard/include/VCardPhoneNumberValue.h
+++ b/tdeabc/vcard/include/VCardPhoneNumberValue.h
diff --git a/kabc/vcard/include/VCardRToken.h b/tdeabc/vcard/include/VCardRToken.h
index 17a3943d3..17a3943d3 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/tdeabc/vcard/include/VCardRToken.h
diff --git a/kabc/vcard/include/VCardSndValue.h b/tdeabc/vcard/include/VCardSndValue.h
index 09a3a8238..09a3a8238 100644
--- a/kabc/vcard/include/VCardSndValue.h
+++ b/tdeabc/vcard/include/VCardSndValue.h
diff --git a/kabc/vcard/include/VCardSoundValue.h b/tdeabc/vcard/include/VCardSoundValue.h
index 61858f058..61858f058 100644
--- a/kabc/vcard/include/VCardSoundValue.h
+++ b/tdeabc/vcard/include/VCardSoundValue.h
diff --git a/kabc/vcard/include/VCardSourceParam.h b/tdeabc/vcard/include/VCardSourceParam.h
index 1d9d03d47..1d9d03d47 100644
--- a/kabc/vcard/include/VCardSourceParam.h
+++ b/tdeabc/vcard/include/VCardSourceParam.h
diff --git a/kabc/vcard/include/VCardTelParam.h b/tdeabc/vcard/include/VCardTelParam.h
index 9eea5da2f..9eea5da2f 100644
--- a/kabc/vcard/include/VCardTelParam.h
+++ b/tdeabc/vcard/include/VCardTelParam.h
diff --git a/kabc/vcard/include/VCardTelValue.h b/tdeabc/vcard/include/VCardTelValue.h
index 043a45aa9..043a45aa9 100644
--- a/kabc/vcard/include/VCardTelValue.h
+++ b/tdeabc/vcard/include/VCardTelValue.h
diff --git a/kabc/vcard/include/VCardTextBinParam.h b/tdeabc/vcard/include/VCardTextBinParam.h
index 5a681ad48..5a681ad48 100644
--- a/kabc/vcard/include/VCardTextBinParam.h
+++ b/tdeabc/vcard/include/VCardTextBinParam.h
diff --git a/kabc/vcard/include/VCardTextBinValue.h b/tdeabc/vcard/include/VCardTextBinValue.h
index 316fa7832..316fa7832 100644
--- a/kabc/vcard/include/VCardTextBinValue.h
+++ b/tdeabc/vcard/include/VCardTextBinValue.h
diff --git a/kabc/vcard/include/VCardTextListValue.h b/tdeabc/vcard/include/VCardTextListValue.h
index 53760c75a..53760c75a 100644
--- a/kabc/vcard/include/VCardTextListValue.h
+++ b/tdeabc/vcard/include/VCardTextListValue.h
diff --git a/kabc/vcard/include/VCardTextParam.h b/tdeabc/vcard/include/VCardTextParam.h
index d593c0578..d593c0578 100644
--- a/kabc/vcard/include/VCardTextParam.h
+++ b/tdeabc/vcard/include/VCardTextParam.h
diff --git a/kabc/vcard/include/VCardTextValue.h b/tdeabc/vcard/include/VCardTextValue.h
index 66eed32a8..66eed32a8 100644
--- a/kabc/vcard/include/VCardTextValue.h
+++ b/tdeabc/vcard/include/VCardTextValue.h
diff --git a/kabc/vcard/include/VCardURIValue.h b/tdeabc/vcard/include/VCardURIValue.h
index 696887774..696887774 100644
--- a/kabc/vcard/include/VCardURIValue.h
+++ b/tdeabc/vcard/include/VCardURIValue.h
diff --git a/kabc/vcard/include/VCardUTCValue.h b/tdeabc/vcard/include/VCardUTCValue.h
index cb09ccf00..cb09ccf00 100644
--- a/kabc/vcard/include/VCardUTCValue.h
+++ b/tdeabc/vcard/include/VCardUTCValue.h
diff --git a/kabc/vcard/include/VCardVCard.h b/tdeabc/vcard/include/VCardVCard.h
index 53563e8c0..53563e8c0 100644
--- a/kabc/vcard/include/VCardVCard.h
+++ b/tdeabc/vcard/include/VCardVCard.h
diff --git a/kabc/vcard/include/VCardVCardEntity.h b/tdeabc/vcard/include/VCardVCardEntity.h
index 422790c22..422790c22 100644
--- a/kabc/vcard/include/VCardVCardEntity.h
+++ b/tdeabc/vcard/include/VCardVCardEntity.h
diff --git a/kabc/vcard/include/VCardValue.h b/tdeabc/vcard/include/VCardValue.h
index 3c167d70a..3c167d70a 100644
--- a/kabc/vcard/include/VCardValue.h
+++ b/tdeabc/vcard/include/VCardValue.h
diff --git a/kabc/vcard/include/generated/AdrParam-generated.h b/tdeabc/vcard/include/generated/AdrParam-generated.h
index 1afdcd36a..1afdcd36a 100644
--- a/kabc/vcard/include/generated/AdrParam-generated.h
+++ b/tdeabc/vcard/include/generated/AdrParam-generated.h
diff --git a/kabc/vcard/include/generated/AdrValue-generated.h b/tdeabc/vcard/include/generated/AdrValue-generated.h
index 9882d1186..9882d1186 100644
--- a/kabc/vcard/include/generated/AdrValue-generated.h
+++ b/tdeabc/vcard/include/generated/AdrValue-generated.h
diff --git a/kabc/vcard/include/generated/AgentParam-generated.h b/tdeabc/vcard/include/generated/AgentParam-generated.h
index 07b87d106..07b87d106 100644
--- a/kabc/vcard/include/generated/AgentParam-generated.h
+++ b/tdeabc/vcard/include/generated/AgentParam-generated.h
diff --git a/kabc/vcard/include/generated/AgentValue-generated.h b/tdeabc/vcard/include/generated/AgentValue-generated.h
index e2866bb8f..e2866bb8f 100644
--- a/kabc/vcard/include/generated/AgentValue-generated.h
+++ b/tdeabc/vcard/include/generated/AgentValue-generated.h
diff --git a/kabc/vcard/include/generated/ClassValue-generated.h b/tdeabc/vcard/include/generated/ClassValue-generated.h
index e10c65568..e10c65568 100644
--- a/kabc/vcard/include/generated/ClassValue-generated.h
+++ b/tdeabc/vcard/include/generated/ClassValue-generated.h
diff --git a/kabc/vcard/include/generated/ContentLine-generated.h b/tdeabc/vcard/include/generated/ContentLine-generated.h
index ad2ac7649..ad2ac7649 100644
--- a/kabc/vcard/include/generated/ContentLine-generated.h
+++ b/tdeabc/vcard/include/generated/ContentLine-generated.h
diff --git a/kabc/vcard/include/generated/DateParam-generated.h b/tdeabc/vcard/include/generated/DateParam-generated.h
index 75e7ad72d..75e7ad72d 100644
--- a/kabc/vcard/include/generated/DateParam-generated.h
+++ b/tdeabc/vcard/include/generated/DateParam-generated.h
diff --git a/kabc/vcard/include/generated/DateValue-generated.h b/tdeabc/vcard/include/generated/DateValue-generated.h
index cf0eb40d8..cf0eb40d8 100644
--- a/kabc/vcard/include/generated/DateValue-generated.h
+++ b/tdeabc/vcard/include/generated/DateValue-generated.h
diff --git a/kabc/vcard/include/generated/EmailParam-generated.h b/tdeabc/vcard/include/generated/EmailParam-generated.h
index 46ae1f80f..46ae1f80f 100644
--- a/kabc/vcard/include/generated/EmailParam-generated.h
+++ b/tdeabc/vcard/include/generated/EmailParam-generated.h
diff --git a/kabc/vcard/include/generated/FloatValue-generated.h b/tdeabc/vcard/include/generated/FloatValue-generated.h
index 155f52ae1..155f52ae1 100644
--- a/kabc/vcard/include/generated/FloatValue-generated.h
+++ b/tdeabc/vcard/include/generated/FloatValue-generated.h
diff --git a/kabc/vcard/include/generated/GeoValue-generated.h b/tdeabc/vcard/include/generated/GeoValue-generated.h
index b525e8c21..b525e8c21 100644
--- a/kabc/vcard/include/generated/GeoValue-generated.h
+++ b/tdeabc/vcard/include/generated/GeoValue-generated.h
diff --git a/kabc/vcard/include/generated/Group-generated.h b/tdeabc/vcard/include/generated/Group-generated.h
index 38e1c2a3a..38e1c2a3a 100644
--- a/kabc/vcard/include/generated/Group-generated.h
+++ b/tdeabc/vcard/include/generated/Group-generated.h
diff --git a/kabc/vcard/include/generated/ImageParam-generated.h b/tdeabc/vcard/include/generated/ImageParam-generated.h
index 78a5a97cf..78a5a97cf 100644
--- a/kabc/vcard/include/generated/ImageParam-generated.h
+++ b/tdeabc/vcard/include/generated/ImageParam-generated.h
diff --git a/kabc/vcard/include/generated/ImageValue-generated.h b/tdeabc/vcard/include/generated/ImageValue-generated.h
index 882081fbc..882081fbc 100644
--- a/kabc/vcard/include/generated/ImageValue-generated.h
+++ b/tdeabc/vcard/include/generated/ImageValue-generated.h
diff --git a/kabc/vcard/include/generated/ImgParam-generated.h b/tdeabc/vcard/include/generated/ImgParam-generated.h
index 04132c857..04132c857 100644
--- a/kabc/vcard/include/generated/ImgParam-generated.h
+++ b/tdeabc/vcard/include/generated/ImgParam-generated.h
diff --git a/kabc/vcard/include/generated/ImgValue-generated.h b/tdeabc/vcard/include/generated/ImgValue-generated.h
index 0774de9bf..0774de9bf 100644
--- a/kabc/vcard/include/generated/ImgValue-generated.h
+++ b/tdeabc/vcard/include/generated/ImgValue-generated.h
diff --git a/kabc/vcard/include/generated/LangValue-generated.h b/tdeabc/vcard/include/generated/LangValue-generated.h
index c4930c59e..c4930c59e 100644
--- a/kabc/vcard/include/generated/LangValue-generated.h
+++ b/tdeabc/vcard/include/generated/LangValue-generated.h
diff --git a/kabc/vcard/include/generated/NValue-generated.h b/tdeabc/vcard/include/generated/NValue-generated.h
index d78715ec0..d78715ec0 100644
--- a/kabc/vcard/include/generated/NValue-generated.h
+++ b/tdeabc/vcard/include/generated/NValue-generated.h
diff --git a/kabc/vcard/include/generated/Name-generated.h b/tdeabc/vcard/include/generated/Name-generated.h
index 17d56e680..17d56e680 100644
--- a/kabc/vcard/include/generated/Name-generated.h
+++ b/tdeabc/vcard/include/generated/Name-generated.h
diff --git a/kabc/vcard/include/generated/OrgValue-generated.h b/tdeabc/vcard/include/generated/OrgValue-generated.h
index 661ecf5a3..661ecf5a3 100644
--- a/kabc/vcard/include/generated/OrgValue-generated.h
+++ b/tdeabc/vcard/include/generated/OrgValue-generated.h
diff --git a/kabc/vcard/include/generated/Param-generated.h b/tdeabc/vcard/include/generated/Param-generated.h
index bf63e7166..bf63e7166 100644
--- a/kabc/vcard/include/generated/Param-generated.h
+++ b/tdeabc/vcard/include/generated/Param-generated.h
diff --git a/kabc/vcard/include/generated/ParamName-generated.h b/tdeabc/vcard/include/generated/ParamName-generated.h
index 60b1e12d5..60b1e12d5 100644
--- a/kabc/vcard/include/generated/ParamName-generated.h
+++ b/tdeabc/vcard/include/generated/ParamName-generated.h
diff --git a/kabc/vcard/include/generated/ParamValue-generated.h b/tdeabc/vcard/include/generated/ParamValue-generated.h
index f31a166c6..f31a166c6 100644
--- a/kabc/vcard/include/generated/ParamValue-generated.h
+++ b/tdeabc/vcard/include/generated/ParamValue-generated.h
diff --git a/kabc/vcard/include/generated/PhoneNumberValue-generated.h b/tdeabc/vcard/include/generated/PhoneNumberValue-generated.h
index f0eb6b4f4..f0eb6b4f4 100644
--- a/kabc/vcard/include/generated/PhoneNumberValue-generated.h
+++ b/tdeabc/vcard/include/generated/PhoneNumberValue-generated.h
diff --git a/kabc/vcard/include/generated/SoundValue-generated.h b/tdeabc/vcard/include/generated/SoundValue-generated.h
index 64081be0b..64081be0b 100644
--- a/kabc/vcard/include/generated/SoundValue-generated.h
+++ b/tdeabc/vcard/include/generated/SoundValue-generated.h
diff --git a/kabc/vcard/include/generated/SourceParam-generated.h b/tdeabc/vcard/include/generated/SourceParam-generated.h
index e3b13bca1..e3b13bca1 100644
--- a/kabc/vcard/include/generated/SourceParam-generated.h
+++ b/tdeabc/vcard/include/generated/SourceParam-generated.h
diff --git a/kabc/vcard/include/generated/TelParam-generated.h b/tdeabc/vcard/include/generated/TelParam-generated.h
index 9f8f24270..9f8f24270 100644
--- a/kabc/vcard/include/generated/TelParam-generated.h
+++ b/tdeabc/vcard/include/generated/TelParam-generated.h
diff --git a/kabc/vcard/include/generated/TelValue-generated.h b/tdeabc/vcard/include/generated/TelValue-generated.h
index 600da7727..600da7727 100644
--- a/kabc/vcard/include/generated/TelValue-generated.h
+++ b/tdeabc/vcard/include/generated/TelValue-generated.h
diff --git a/kabc/vcard/include/generated/TextBinParam-generated.h b/tdeabc/vcard/include/generated/TextBinParam-generated.h
index 37dc56e55..37dc56e55 100644
--- a/kabc/vcard/include/generated/TextBinParam-generated.h
+++ b/tdeabc/vcard/include/generated/TextBinParam-generated.h
diff --git a/kabc/vcard/include/generated/TextBinValue-generated.h b/tdeabc/vcard/include/generated/TextBinValue-generated.h
index 4c9580421..4c9580421 100644
--- a/kabc/vcard/include/generated/TextBinValue-generated.h
+++ b/tdeabc/vcard/include/generated/TextBinValue-generated.h
diff --git a/kabc/vcard/include/generated/TextListValue-generated.h b/tdeabc/vcard/include/generated/TextListValue-generated.h
index 8babb0d9f..8babb0d9f 100644
--- a/kabc/vcard/include/generated/TextListValue-generated.h
+++ b/tdeabc/vcard/include/generated/TextListValue-generated.h
diff --git a/kabc/vcard/include/generated/TextNSParam-generated.h b/tdeabc/vcard/include/generated/TextNSParam-generated.h
index bd8e74b07..bd8e74b07 100644
--- a/kabc/vcard/include/generated/TextNSParam-generated.h
+++ b/tdeabc/vcard/include/generated/TextNSParam-generated.h
diff --git a/kabc/vcard/include/generated/TextParam-generated.h b/tdeabc/vcard/include/generated/TextParam-generated.h
index 54ae611a5..54ae611a5 100644
--- a/kabc/vcard/include/generated/TextParam-generated.h
+++ b/tdeabc/vcard/include/generated/TextParam-generated.h
diff --git a/kabc/vcard/include/generated/TextValue-generated.h b/tdeabc/vcard/include/generated/TextValue-generated.h
index 5b56b54a7..5b56b54a7 100644
--- a/kabc/vcard/include/generated/TextValue-generated.h
+++ b/tdeabc/vcard/include/generated/TextValue-generated.h
diff --git a/kabc/vcard/include/generated/URIValue-generated.h b/tdeabc/vcard/include/generated/URIValue-generated.h
index 5a691e6d6..5a691e6d6 100644
--- a/kabc/vcard/include/generated/URIValue-generated.h
+++ b/tdeabc/vcard/include/generated/URIValue-generated.h
diff --git a/kabc/vcard/include/generated/UTCValue-generated.h b/tdeabc/vcard/include/generated/UTCValue-generated.h
index 0c6edfb46..0c6edfb46 100644
--- a/kabc/vcard/include/generated/UTCValue-generated.h
+++ b/tdeabc/vcard/include/generated/UTCValue-generated.h
diff --git a/kabc/vcard/include/generated/VCard-generated.h b/tdeabc/vcard/include/generated/VCard-generated.h
index 4f36d11da..4f36d11da 100644
--- a/kabc/vcard/include/generated/VCard-generated.h
+++ b/tdeabc/vcard/include/generated/VCard-generated.h
diff --git a/kabc/vcard/include/generated/VCardEntity-generated.h b/tdeabc/vcard/include/generated/VCardEntity-generated.h
index 4e973e62a..4e973e62a 100644
--- a/kabc/vcard/include/generated/VCardEntity-generated.h
+++ b/tdeabc/vcard/include/generated/VCardEntity-generated.h
diff --git a/kabc/vcard/include/generated/Value-generated.h b/tdeabc/vcard/include/generated/Value-generated.h
index 935d137b6..935d137b6 100644
--- a/kabc/vcard/include/generated/Value-generated.h
+++ b/tdeabc/vcard/include/generated/Value-generated.h
diff --git a/kabc/vcard/include/generated/generate b/tdeabc/vcard/include/generated/generate
index 926dbf136..926dbf136 100755
--- a/kabc/vcard/include/generated/generate
+++ b/tdeabc/vcard/include/generated/generate
diff --git a/kabc/vcard/include/generated/generateHeaders.awk b/tdeabc/vcard/include/generated/generateHeaders.awk
index 471db11b4..471db11b4 100755
--- a/kabc/vcard/include/generated/generateHeaders.awk
+++ b/tdeabc/vcard/include/generated/generateHeaders.awk
diff --git a/kabc/vcard/include/generated/headerBodies b/tdeabc/vcard/include/generated/headerBodies
index 5e77b2b5e..5e77b2b5e 100644
--- a/kabc/vcard/include/generated/headerBodies
+++ b/tdeabc/vcard/include/generated/headerBodies
diff --git a/kabc/vcard/testread.cpp b/tdeabc/vcard/testread.cpp
index 3a33c7d54..3a33c7d54 100644
--- a/kabc/vcard/testread.cpp
+++ b/tdeabc/vcard/testread.cpp
diff --git a/kabc/vcard/testwrite.cpp b/tdeabc/vcard/testwrite.cpp
index f9b8944d7..42b76c80f 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/tdeabc/vcard/testwrite.cpp
@@ -1,17 +1,17 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
 #include <VCard.h>
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDEAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
   
   kdDebug() << "Test Write VCard" << endl;
 
diff --git a/kabc/vcard/vCard-all.cpp b/tdeabc/vcard/vCard-all.cpp
index 07bbcd2bb..07bbcd2bb 100644
--- a/kabc/vcard/vCard-all.cpp
+++ b/tdeabc/vcard/vCard-all.cpp
diff --git a/kabc/vcard21parser.cpp b/tdeabc/vcard21parser.cpp
index 8a3bfcaea..46581b411 100644
--- a/kabc/vcard21parser.cpp
+++ b/tdeabc/vcard21parser.cpp
@@ -25,7 +25,7 @@
 #include "vcard21parser.h"
 #include "vcardconverter.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 bool VCardLineX::isValid() const
 {
@@ -199,15 +199,15 @@ VCard21Parser::~VCard21Parser()
 {
 }
 
-void VCard21Parser::readFromString(KABC::AddressBook *addressbook, const TQString &data)
+void VCard21Parser::readFromString(TDEABC::AddressBook *addressbook, const TQString &data)
 {
-  KABC::Addressee mAddressee = readFromString(data);
+  TDEABC::Addressee mAddressee = readFromString(data);
   addressbook->insertAddressee(mAddressee);
 }
 
-KABC::Addressee VCard21Parser::readFromString( const TQString &data)
+TDEABC::Addressee VCard21Parser::readFromString( const TQString &data)
 {
-  KABC::Addressee addressee;
+  TDEABC::Addressee addressee;
   VCard21ParserImpl *vCard = VCard21ParserImpl::parseVCard(data);
   TQString tmpStr;
 
@@ -369,9 +369,9 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
 
 
 
-KABC::Address VCard21Parser::readAddressFromQStringList ( const TQStringList &data, const int type )
+TDEABC::Address VCard21Parser::readAddressFromQStringList ( const TQStringList &data, const int type )
 {
-  KABC::Address mAddress;
+  TDEABC::Address mAddress;
   mAddress.setType( type );
 
   if ( data.count() > 0 )
diff --git a/kabc/vcard21parser.h b/tdeabc/vcard21parser.h
index 0eb66fa93..a743e65f3 100644
--- a/kabc/vcard21parser.h
+++ b/tdeabc/vcard21parser.h
@@ -132,7 +132,7 @@
 #define VC_ERR_INVALID_NAME        5
 #define VC_ERR_MISSING_MANDATORY   6
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 
@@ -160,17 +160,17 @@ public:
    * @param ab  The address book.
    * @param str The vcard string.
    */
-  void readFromString( KABC::AddressBook *ab, const TQString &str );
+  void readFromString( TDEABC::AddressBook *ab, const TQString &str );
 
   /**
    * FIXME: we need a writeToString method
-   * TQString writeToString (KABC::AddressBook *);
+   * TQString writeToString (TDEABC::AddressBook *);
    */
 
   /**
    * Parses a string in vcard2.1 format and returns the inherent addressee.
    */
-  KABC::Addressee readFromString( const TQString &data);
+  TDEABC::Addressee readFromString( const TQString &data);
 
   /**
    * Helper method to store a address.
@@ -178,7 +178,7 @@ public:
    * @param data  A string list, that is filled with 'street', 'house number' ...
    * @param type  The type of the returned address.
    */
-  static KABC::Address readAddressFromQStringList (const TQStringList &data, const int type);
+  static TDEABC::Address readAddressFromQStringList (const TQStringList &data, const int type);
 };
 
 }
diff --git a/kabc/vcardconverter.cpp b/tdeabc/vcardconverter.cpp
index d575b019c..2dff56aa2 100644
--- a/kabc/vcardconverter.cpp
+++ b/tdeabc/vcardconverter.cpp
@@ -24,7 +24,7 @@
 
 #include "vcardconverter.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 struct VCardConverter::VCardConverterData
 {
@@ -101,17 +101,17 @@ bool VCardConverter::addresseeToVCard( const Addressee &addr, TQString &str, Ver
 
 /* Helper functions */
 
-TQString KABC::dateToVCardString( const TQDateTime &dateTime )
+TQString TDEABC::dateToVCardString( const TQDateTime &dateTime )
 {
   return dateTime.toString("yyyyMMddThhmmssZ");
 }
 
-TQString KABC::dateToVCardString( const TQDate &date )
+TQString TDEABC::dateToVCardString( const TQDate &date )
 {
   return date.toString("yyyyMMdd");
 }
 
-TQDateTime KABC::VCardStringToDate( const TQString &dateString )
+TQDateTime TDEABC::VCardStringToDate( const TQString &dateString )
 {
   TQDate date;
   TQTime time;
diff --git a/kabc/vcardconverter.h b/tdeabc/vcardconverter.h
index ab09279f2..982c704d4 100644
--- a/kabc/vcardconverter.h
+++ b/tdeabc/vcardconverter.h
@@ -25,7 +25,7 @@
 
 #include "addressee.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Class to converting contact objects into vCard format and vice versa.
diff --git a/kabc/vcardformat.cpp b/tdeabc/vcardformat.cpp
index 147aa4259..b8bfaa6b6 100644
--- a/kabc/vcardformat.cpp
+++ b/tdeabc/vcardformat.cpp
@@ -22,7 +22,7 @@
 
 #include "vcardformat.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 VCardFormat::VCardFormat()
 {
diff --git a/kabc/vcardformat.h b/tdeabc/vcardformat.h
index 8194056cb..b5d6ff133 100644
--- a/kabc/vcardformat.h
+++ b/tdeabc/vcardformat.h
@@ -24,7 +24,7 @@
 
 #include "format.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class VCardFormatImpl;
diff --git a/kabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp
index ebaf337b0..e88ab3078 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/tdeabc/vcardformatimpl.cpp
@@ -23,14 +23,14 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <VCard.h>
 
 #include "addressbook.h"
 #include "vcardformatimpl.h"
 
-using namespace KABC;
+using namespace TDEABC;
 using namespace VCARD;
 
 bool VCardFormatImpl::load( Addressee &addressee, TQFile *file )
@@ -849,7 +849,7 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty
       if ( type == EntityLogo )
         dir = "logos";
 
-      img.save( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ), pic.type().utf8() );
+      img.save( locateLocal( "data", "tdeabc/" + dir + "/" + addr.uid() ), pic.type().utf8() );
       cl.setValue( new TextValue( "<dummy>" ) );
     }
     params.append( new Param( "ENCODING", "b" ) );
@@ -889,7 +889,7 @@ Picture VCardFormatImpl::readPictureValue( VCARD::ContentLine *cl, VCARD::Entity
       if ( type == EntityLogo )
         dir = "logos";
 
-      img.load( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ) );
+      img.load( locateLocal( "data", "tdeabc/" + dir + "/" + addr.uid() ) );
     } else {
       TQByteArray data;
       KCodecs::base64Decode( v->asString(), data );
@@ -921,7 +921,7 @@ void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, co
     if ( intern ) { // only for vCard export we really write the data inline
         cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
     } else { // save sound in cache
-      TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+      TQFile file( locateLocal( "data", "tdeabc/sounds/" + addr.uid() ) );
       if ( file.open( IO_WriteOnly ) ) {
         file.writeBlock( data );
       }
@@ -953,7 +953,7 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
   if ( isInline ) {
     TQByteArray data;
     if ( v->asString() == "<dummy>" ) { // no sound inline stored => sound is in cache
-      TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+      TQFile file( locateLocal( "data", "tdeabc/sounds/" + addr.uid() ) );
       if ( file.open( IO_ReadOnly ) ) {
         data = file.readAll();
         file.close();
diff --git a/kabc/vcardformatimpl.h b/tdeabc/vcardformatimpl.h
index 78c466a86..ddcd6fc07 100644
--- a/kabc/vcardformatimpl.h
+++ b/tdeabc/vcardformatimpl.h
@@ -33,7 +33,7 @@
 #include <VCard.h>
 #endif 
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 
diff --git a/kabc/vcardformatplugin.cpp b/tdeabc/vcardformatplugin.cpp
index 6194cd0fe..83c4a8a7b 100644
--- a/kabc/vcardformatplugin.cpp
+++ b/tdeabc/vcardformatplugin.cpp
@@ -26,7 +26,7 @@
 
 #include "vcardformatplugin.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 VCardFormatPlugin::VCardFormatPlugin()
 {
diff --git a/kabc/vcardformatplugin.h b/tdeabc/vcardformatplugin.h
index 5ac7e49c2..c9cc4f351 100644
--- a/kabc/vcardformatplugin.h
+++ b/tdeabc/vcardformatplugin.h
@@ -23,7 +23,7 @@
 
 #include "formatplugin.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class Addressee;
diff --git a/kabc/vcardparser/CMakeLists.txt b/tdeabc/vcardparser/CMakeLists.txt
index 2c6fa112a..15a2ce5c8 100644
--- a/kabc/vcardparser/CMakeLists.txt
+++ b/tdeabc/vcardparser/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     vcard.h vcardline.h vcardparser.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
 
 
 ##### vcards ####################################
diff --git a/kabc/vcardparser/Makefile.am b/tdeabc/vcardparser/Makefile.am
index e698c687a..20c6ed45d 100644
--- a/kabc/vcardparser/Makefile.am
+++ b/tdeabc/vcardparser/Makefile.am
@@ -1,23 +1,23 @@
-INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes)
+INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc $(all_includes)
 
 noinst_LTLIBRARIES = libvcards.la
 libvcards_la_SOURCES = vcard.cpp vcardline.cpp vcardparser.cpp
 
-vcardsincludedir = $(includedir)/kabc
+vcardsincludedir = $(includedir)/tdeabc
 vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
 
 check_PROGRAMS = testread testwrite testread2
 
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testread_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testread_SOURCES = testread.cpp
 
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testread2_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testread2_SOURCES = testread2.cpp testutils.cpp
 
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testwrite_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testwrite_SOURCES = testwrite.cpp
 
 TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
@@ -25,7 +25,7 @@ TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
 check-local: testread
 	rm -f FAILED; \
 	for i in $(TESTFILES); \
-	  do perl $(top_srcdir)/kabc/vcardparser/checkvcard.pl \
-	    $(top_srcdir)/kabc/vcardparser/tests/$$i; \
+	  do perl $(top_srcdir)/tdeabc/vcardparser/checkvcard.pl \
+	    $(top_srcdir)/tdeabc/vcardparser/tests/$$i; \
 	done; \
 	[ ! -e FAILED ]
diff --git a/kabc/vcardparser/README.testing b/tdeabc/vcardparser/README.testing
index a7794931d..a7794931d 100644
--- a/kabc/vcardparser/README.testing
+++ b/tdeabc/vcardparser/README.testing
diff --git a/kabc/vcardparser/checkvcard.pl b/tdeabc/vcardparser/checkvcard.pl
index 67160ea4a..67160ea4a 100755
--- a/kabc/vcardparser/checkvcard.pl
+++ b/tdeabc/vcardparser/checkvcard.pl
diff --git a/kabc/vcardparser/testread.cpp b/tdeabc/vcardparser/testread.cpp
index 7dd8692fc..284526abd 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/tdeabc/vcardparser/testread.cpp
@@ -25,34 +25,34 @@
 
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
+#include <tdeaboutdata.h>
 
 #include "vcardconverter.h"
 #include "vcard.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"vcard21", I18N_NOOP("vCard 2.1"), 0},
   {"+inputfile", I18N_NOOP("Input file"), 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
-  KAboutData aboutData( "testread", "vCard test reader", "0.1" );
+  TDEAboutData aboutData( "testread", "vCard test reader", "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->count() != 1 ) {
     std::cerr << "Missing argument" << std::endl;
@@ -74,11 +74,11 @@ int main( int argc, char **argv )
   text = s.read();
   file.close();
 
-  KABC::VCardConverter converter;
-  KABC::Addressee::List list = converter.parseVCards( text );
+  TDEABC::VCardConverter converter;
+  TDEABC::Addressee::List list = converter.parseVCards( text );
 
   if ( args->isSet( "vcard21" ) ) {
-    text = converter.createVCards( list, KABC::VCardConverter::v2_1 ); // uses version 2.1
+    text = converter.createVCards( list, TDEABC::VCardConverter::v2_1 ); // uses version 2.1
   } else {
     text = converter.createVCards( list ); // uses version 3.0
   }
diff --git a/kabc/vcardparser/testread2.cpp b/tdeabc/vcardparser/testread2.cpp
index ba73081e7..bd0922670 100644
--- a/kabc/vcardparser/testread2.cpp
+++ b/tdeabc/vcardparser/testread2.cpp
@@ -1,9 +1,9 @@
 #include "testutils.h"
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <vcardconverter.h>
 #include <kdebug.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 int
 main()
diff --git a/kabc/vcardparser/tests/vcard1.vcf b/tdeabc/vcardparser/tests/vcard1.vcf
index 2c77b094c..2c77b094c 100644
--- a/kabc/vcardparser/tests/vcard1.vcf
+++ b/tdeabc/vcardparser/tests/vcard1.vcf
diff --git a/kabc/vcardparser/tests/vcard1.vcf.ref b/tdeabc/vcardparser/tests/vcard1.vcf.ref
index 073a7f31d..073a7f31d 100644
--- a/kabc/vcardparser/tests/vcard1.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard1.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard2.vcf b/tdeabc/vcardparser/tests/vcard2.vcf
index a4136b1b8..a4136b1b8 100644
--- a/kabc/vcardparser/tests/vcard2.vcf
+++ b/tdeabc/vcardparser/tests/vcard2.vcf
diff --git a/kabc/vcardparser/tests/vcard2.vcf.ref b/tdeabc/vcardparser/tests/vcard2.vcf.ref
index 55151c797..55151c797 100644
--- a/kabc/vcardparser/tests/vcard2.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard2.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard3.vcf b/tdeabc/vcardparser/tests/vcard3.vcf
index f3f649784..f3f649784 100644
--- a/kabc/vcardparser/tests/vcard3.vcf
+++ b/tdeabc/vcardparser/tests/vcard3.vcf
diff --git a/kabc/vcardparser/tests/vcard3.vcf.ref b/tdeabc/vcardparser/tests/vcard3.vcf.ref
index c91351769..c91351769 100644
--- a/kabc/vcardparser/tests/vcard3.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard3.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard4.vcf b/tdeabc/vcardparser/tests/vcard4.vcf
index 7152ceb05..7152ceb05 100644
--- a/kabc/vcardparser/tests/vcard4.vcf
+++ b/tdeabc/vcardparser/tests/vcard4.vcf
diff --git a/kabc/vcardparser/tests/vcard4.vcf.ref b/tdeabc/vcardparser/tests/vcard4.vcf.ref
index fc3b7a500..fc3b7a500 100644
--- a/kabc/vcardparser/tests/vcard4.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard4.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard5.vcf b/tdeabc/vcardparser/tests/vcard5.vcf
index 957a1e552..957a1e552 100644
--- a/kabc/vcardparser/tests/vcard5.vcf
+++ b/tdeabc/vcardparser/tests/vcard5.vcf
diff --git a/kabc/vcardparser/tests/vcard5.vcf.ref b/tdeabc/vcardparser/tests/vcard5.vcf.ref
index 712b49494..712b49494 100644
--- a/kabc/vcardparser/tests/vcard5.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard5.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard6.vcf b/tdeabc/vcardparser/tests/vcard6.vcf
index 92339c798..92339c798 100644
--- a/kabc/vcardparser/tests/vcard6.vcf
+++ b/tdeabc/vcardparser/tests/vcard6.vcf
diff --git a/kabc/vcardparser/tests/vcard6.vcf.ref b/tdeabc/vcardparser/tests/vcard6.vcf.ref
index 3cfde20b9..3cfde20b9 100644
--- a/kabc/vcardparser/tests/vcard6.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard6.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard7.vcf b/tdeabc/vcardparser/tests/vcard7.vcf
index 8b5be8ec7..8b5be8ec7 100644
--- a/kabc/vcardparser/tests/vcard7.vcf
+++ b/tdeabc/vcardparser/tests/vcard7.vcf
diff --git a/kabc/vcardparser/tests/vcard7.vcf.ref b/tdeabc/vcardparser/tests/vcard7.vcf.ref
index 84ed6236b..84ed6236b 100644
--- a/kabc/vcardparser/tests/vcard7.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard7.vcf.ref
diff --git a/kabc/vcardparser/testutils.cpp b/tdeabc/vcardparser/testutils.cpp
index df4b60c9c..6547445e5 100644
--- a/kabc/vcardparser/testutils.cpp
+++ b/tdeabc/vcardparser/testutils.cpp
@@ -1,8 +1,8 @@
 #include <vcardparser.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tqfile.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 Addressee
 vcard1()
diff --git a/tdeabc/vcardparser/testutils.h b/tdeabc/vcardparser/testutils.h
new file mode 100644
index 000000000..830f94332
--- /dev/null
+++ b/tdeabc/vcardparser/testutils.h
@@ -0,0 +1,14 @@
+#ifndef TESTUTILS_H
+#define TESTUTILS_H
+
+#include <tdeabc/addressee.h>
+#include <tqstring.h>
+
+TDEABC::Addressee vcard1();
+TDEABC::Addressee vcard2();
+TDEABC::Addressee vcard3();
+TDEABC::Addressee::List vCardsAsAddresseeList();
+TQString   vCardAsText( const TQString& location );
+TQString   vCardsAsText();
+
+#endif
diff --git a/kabc/vcardparser/testwrite.cpp b/tdeabc/vcardparser/testwrite.cpp
index f6e894f4b..c7df6df08 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/tdeabc/vcardparser/testwrite.cpp
@@ -17,16 +17,16 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/addressee.h>
-#include <kabc/phonenumber.h>
-#include <kabc/address.h>
-#include <kabc/key.h>
-#include <kabc/picture.h>
-#include <kabc/sound.h>
-#include <kabc/secrecy.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/phonenumber.h>
+#include <tdeabc/address.h>
+#include <tdeabc/key.h>
+#include <tdeabc/picture.h>
+#include <tdeabc/sound.h>
+#include <tdeabc/secrecy.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
@@ -35,22 +35,22 @@
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
+  TDEAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
   
 
-  KABC::Addressee addressee;
+  TDEABC::Addressee addressee;
 
   addressee.setNameFromString( "Mr. Tobias Koenig Jr." );
   addressee.setNickName( "tokoe" );
   addressee.setBirthday( TQDate( 1982, 7, 19 ) );
   addressee.setMailer( "mutt1.2" );
-  addressee.setTimeZone( KABC::TimeZone( +2 ) );
+  addressee.setTimeZone( TDEABC::TimeZone( +2 ) );
 
-  KABC::Geo geo;
+  TDEABC::Geo geo;
   geo.setLatitude( 30 );
   geo.setLongitude( 51 );
   addressee.setGeo( geo );
@@ -63,17 +63,17 @@ int main( int argc, char **argv )
   addressee.setRevision( TQDateTime::currentDateTime() );
   addressee.setSortString( "koenig" );
   addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
-  addressee.setSecrecy(  KABC::Secrecy( KABC::Secrecy::Confidential ) );
+  addressee.setSecrecy(  TDEABC::Secrecy( TDEABC::Secrecy::Confidential ) );
 /*
   TQImage img;
   img.load( "testimg.png", "PNG" );
-  KABC::Picture photo;
+  TDEABC::Picture photo;
   photo.setData( img );
   addressee.setPhoto( photo );
 
   TQImage img2;
   img2.load( "testimg.png", "PNG" );
-  KABC::Picture logo;
+  TDEABC::Picture logo;
   logo.setData( img2 );
   addressee.setLogo( logo );
 
@@ -81,26 +81,26 @@ int main( int argc, char **argv )
   soundFile.open( IO_ReadOnly );
   TQByteArray data = soundFile.readAll();
   soundFile.close();
-  KABC::Sound sound;
+  TDEABC::Sound sound;
   sound.setData( data );
   addressee.setSound( sound );
 */
   addressee.insertEmail( "tokoe@kde.org", true );
   addressee.insertEmail( "tokoe82@yahoo.de", true );
 
-  KABC::PhoneNumber phone1( "3541523475", KABC::PhoneNumber::Pref | KABC::PhoneNumber::Home );
-  KABC::PhoneNumber phone2( "+46745673475", KABC::PhoneNumber::Work );
+  TDEABC::PhoneNumber phone1( "3541523475", TDEABC::PhoneNumber::Pref | TDEABC::PhoneNumber::Home );
+  TDEABC::PhoneNumber phone2( "+46745673475", TDEABC::PhoneNumber::Work );
   addressee.insertPhoneNumber( phone1 );
   addressee.insertPhoneNumber( phone2 );
 
-  KABC::Key key( "secret key", KABC::Key::X509 );
+  TDEABC::Key key( "secret key", TDEABC::Key::X509 );
   addressee.insertKey( key );
 
   TQStringList categories;
   categories << "Friends" << "School" << "KDE";
   addressee.setCategories( categories );
 
-  KABC::Address a( KABC::Address::Work | KABC::Address::Postal | KABC::Address::Parcel );
+  TDEABC::Address a( TDEABC::Address::Work | TDEABC::Address::Postal | TDEABC::Address::Parcel );
   a.setStreet( "6544 Battleford Drive" );
   a.setLocality( "Raleigh" );
   a.setRegion( "NC" );
@@ -112,14 +112,14 @@ int main( int argc, char **argv )
   addressee.insertCustom( "2hsdf", "ertuer", "iurt" );
   addressee.insertCustom( "3hsdf", "ertuer", "iurt" );
 
-  KABC::Addressee::List list;
+  TDEABC::Addressee::List list;
   for ( int i = 0; i < 1000; ++i ) {
-    KABC::Addressee addr = addressee;
+    TDEABC::Addressee addr = addressee;
     addr.setUid( TQString::number( i ) );
     list.append( addr );
   }
 
-  KABC::VCardConverter converter;
+  TDEABC::VCardConverter converter;
   TQString txt = converter.createVCards( list );
 
   TQFile file( "out.vcf" );
diff --git a/kabc/vcardparser/vcard.cpp b/tdeabc/vcardparser/vcard.cpp
index 30a8e1c49..f6841cbd9 100644
--- a/kabc/vcardparser/vcard.cpp
+++ b/tdeabc/vcardparser/vcard.cpp
@@ -20,7 +20,7 @@
 
 #include "vcard.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 VCard::VCard()
 {
diff --git a/kabc/vcardparser/vcard.h b/tdeabc/vcardparser/vcard.h
index 6afeeda26..ad50b8657 100644
--- a/kabc/vcardparser/vcard.h
+++ b/tdeabc/vcardparser/vcard.h
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class VCard
 {
diff --git a/kabc/vcardparser/vcardline.cpp b/tdeabc/vcardparser/vcardline.cpp
index 6680cf7d0..22d7f7e52 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/tdeabc/vcardparser/vcardline.cpp
@@ -20,7 +20,7 @@
 
 #include "vcardline.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 class VCardLine::VCardLinePrivate
 {
diff --git a/kabc/vcardparser/vcardline.h b/tdeabc/vcardparser/vcardline.h
index 92fe743f6..78ce2a411 100644
--- a/kabc/vcardparser/vcardline.h
+++ b/tdeabc/vcardparser/vcardline.h
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class VCardLine
 {
diff --git a/kabc/vcardparser/vcardparser.cpp b/tdeabc/vcardparser/vcardparser.cpp
index aed9ebd39..3cc38f5c8 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/tdeabc/vcardparser/vcardparser.cpp
@@ -27,7 +27,7 @@
 
 #define FOLD_WIDTH 75
 
-using namespace KABC;
+using namespace TDEABC;
 
 static TQString backslash( "\\\\" );
 static TQString comma( "\\," );
diff --git a/kabc/vcardparser/vcardparser.h b/tdeabc/vcardparser/vcardparser.h
index da5fdd46e..fc17d116b 100644
--- a/kabc/vcardparser/vcardparser.h
+++ b/tdeabc/vcardparser/vcardparser.h
@@ -23,7 +23,7 @@
 
 #include "vcard.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class VCardParser
 {
diff --git a/kabc/vcardtool.cpp b/tdeabc/vcardtool.cpp
index 295360a03..2dd9752ac 100644
--- a/kabc/vcardtool.cpp
+++ b/tdeabc/vcardtool.cpp
@@ -30,7 +30,7 @@
 
 #include "vcardtool.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static bool needsEncoding( const TQString &value )
 {
@@ -459,8 +459,8 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
             type += mAddressTypeMap[ (*it).lower() ];
 
           bool available = false;
-          KABC::Address::List addressList = addr.addresses();
-          KABC::Address::List::Iterator it;
+          TDEABC::Address::List addressList = addr.addresses();
+          TDEABC::Address::List::Iterator it;
           for ( it = addressList.begin(); it != addressList.end(); ++it ) {
             if ( (*it).type() == type ) {
               (*it).setLabel( (*lineIt).value().asString() );
@@ -471,7 +471,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
           }
 
           if ( !available ) { // a standalone LABEL tag
-            KABC::Address address( type );
+            TDEABC::Address address( type );
             address.setLabel( (*lineIt).value().asString() );
             addr.insertAddress( address );
           }
diff --git a/kabc/vcardtool.h b/tdeabc/vcardtool.h
index fbf959613..0d67605d6 100644
--- a/kabc/vcardtool.h
+++ b/tdeabc/vcardtool.h
@@ -26,7 +26,7 @@
 
 class TQDateTime;
 
-namespace KABC {
+namespace TDEABC {
 
 class Agent;
 class Key;
diff --git a/kcert/CMakeLists.txt b/tdecert/CMakeLists.txt
index b8bf6c84b..2a9c391e3 100644
--- a/kcert/CMakeLists.txt
+++ b/tdecert/CMakeLists.txt
@@ -14,14 +14,14 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
@@ -31,20 +31,20 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kcertpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcertpart.rc DESTINATION ${DATA_INSTALL_DIR}/kcertpart )
+install( FILES tdecertpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdecertpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdecertpart )
 
 
-##### libkcertpart ##############################
+##### libtdecertpart ##############################
 
-set( target libkcertpart )
+set( target libtdecertpart )
 
 set( ${target}_SRCS
-  kcertpart.cc
+  tdecertpart.cc
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared kparts-shared
+  LINK tdeio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
new file mode 100644
index 000000000..2af31ccd2
--- /dev/null
+++ b/tdecert/Makefile.am
@@ -0,0 +1,18 @@
+INCLUDES= -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
+
+kde_module_LTLIBRARIES = libtdecertpart.la
+
+libtdecertpart_la_SOURCES	= tdecertpart.cc
+
+libtdecertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+libtdecertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDECORE)
+libtdecertpart_la_DEPENDENCIES = $(LIB_KPARTS)
+
+libtdecertpart_la_METASOURCES = AUTO
+
+servicedir = $(kde_servicesdir)
+service_DATA = tdecertpart.desktop
+
+rcdir = $(kde_datadir)/tdecertpart
+rc_DATA = tdecertpart.rc
+
diff --git a/kcert/kcertpart.cc b/tdecert/tdecertpart.cc
index 5986bcba0..9a50e6e29 100644
--- a/kcert/kcertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -19,47 +19,47 @@
  */
 
 
-#include "kcertpart.h"
-#include <kparts/genericfactory.h>
+#include "tdecertpart.h"
+#include <tdeparts/genericfactory.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqbutton.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <ksslall.h>
 #include <kopenssl.h>
 #include <ksslpemcallback.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
 #include <tqtabwidget.h>
 #include <kseparator.h>
-#include <klistview.h>
-#include <kio/kmimemagic.h>
+#include <tdelistview.h>
+#include <tdeio/kmimemagic.h>
 #include <tqmultilineedit.h>
 #include <tqregexp.h>
 #include <kcombobox.h>
-#include <kparts/browserextension.h>
-#include <kparts/browserinterface.h>
-#include <kio/kservicetypefactory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/browserinterface.h>
+#include <tdeio/kservicetypefactory.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkcertpart, KParts::GenericFactory<KCertPart> )
+K_EXPORT_COMPONENT_FACTORY( libtdecertpart, KParts::GenericFactory<KCertPart> )
 
 
-KX509Item::KX509Item(KListViewItem *parent, KSSLCertificate *x) :
-			KListViewItem(parent, 0L)
+KX509Item::KX509Item(TDEListViewItem *parent, KSSLCertificate *x) :
+			TDEListViewItem(parent, 0L)
 {
 	setup(x);
 }
 
-KX509Item::KX509Item(KListView *parent, KSSLCertificate *x) :
-			KListViewItem(parent)
+KX509Item::KX509Item(TDEListView *parent, KSSLCertificate *x) :
+			TDEListViewItem(parent)
 {
 	setup(x);
 }
@@ -98,8 +98,8 @@ KX509Item::~KX509Item()
 }
 
 
-KPKCS12Item::KPKCS12Item(KListViewItem *parent, KSSLPKCS12 *x) :
-			KListViewItem(parent, 0L)
+KPKCS12Item::KPKCS12Item(TDEListViewItem *parent, KSSLPKCS12 *x) :
+			TDEListViewItem(parent, 0L)
 {
 	cert = x;
 	if (x) {
@@ -131,7 +131,7 @@ KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName,
                      TQObject *parent, const char *name,
 		     const TQStringList & /*args*/ ) 
           : KParts::ReadWritePart(parent, name) {
-KInstance *instance = new KInstance("KCertPart");
+TDEInstance *instance = new TDEInstance("KCertPart");
 TQGridLayout *grid;
 setInstance(instance);
 
@@ -155,13 +155,13 @@ setWidget(_frame);
 _baseGrid = new TQGridLayout(_frame, 15, 9, KDialog::marginHint(),
 		KDialog::spacingHint());
 
-_sideList = new KListView(_frame);
+_sideList = new TDEListView(_frame);
 _sideList->setRootIsDecorated(true);
 _sideList->addColumn(i18n("Certificates"));
-_parentCA = new KListViewItem(_sideList, i18n("Signers"));
+_parentCA = new TDEListViewItem(_sideList, i18n("Signers"));
 _parentCA->setExpandable(true);
 _sideList->setOpen(_parentCA, true);
-_parentP12 = new KListViewItem(_sideList, i18n("Client"));
+_parentP12 = new TDEListViewItem(_sideList, i18n("Client"));
 _parentP12->setExpandable(true);
 _sideList->setOpen(_parentP12, true);
 
@@ -740,7 +740,7 @@ void KCertPart::slotImport() {
 		if (!_silentImport)
 			KMessageBox::information(_frame, i18n("Certificate has been successfully imported into TDE.\nYou can manage your certificate settings from the TDE Control Center."), i18n("Certificate Import"));
 	} else if (_ca) {
-		KConfig cfg("ksslcalist", true, false);
+		TDEConfig cfg("ksslcalist", true, false);
 		if (cfg.hasGroup(_ca->getSubject())) {
 			TQString msg = _curName + "\n" + i18n("A certificate with that name already exists. Are you sure that you wish to replace it?");
 			int rc= KMessageBox::warningContinueCancel(_frame, msg, i18n("Certificate Import"),i18n("Replace"));
@@ -774,8 +774,8 @@ void KCertPart::slotDone() {
 
 void KCertPart::slotLaunch() {
 KShellProcess p;
-p << "kcmshell" << "crypto";
-p.start(KProcess::DontCare);
+p << "tdecmshell" << "crypto";
+p.start(TDEProcess::DontCare);
 }
 
 
@@ -874,10 +874,10 @@ KMessageBox::information(_frame, i18n("Certificates have been successfully impor
 }
 
 
-KAboutData *KCertPart::createAboutData()
+TDEAboutData *KCertPart::createAboutData()
 {
-    return new KAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
+    return new TDEAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
 }
 
-#include "kcertpart.moc"
+#include "tdecertpart.moc"
 
diff --git a/kcert/kcertpart.desktop b/tdecert/tdecertpart.desktop
index 997b9a050..e4478480d 100644
--- a/kcert/kcertpart.desktop
+++ b/tdecert/tdecertpart.desktop
@@ -95,5 +95,5 @@ Name[ta]=கேசான�றிதழ�பக�தி
 Name[te]=కెసెర�ట� పార�ట�
 Name[ven]=Tshipida tsha cert ya K
 ServiceTypes=KParts/ReadWritePart
-X-TDE-Library=libkcertpart
+X-TDE-Library=libtdecertpart
 InitialPreference=15
diff --git a/kcert/kcertpart.h b/tdecert/tdecertpart.h
index ec011c08d..032ff3001 100644
--- a/kcert/kcertpart.h
+++ b/tdecert/tdecertpart.h
@@ -24,10 +24,10 @@
 #include <config.h>
 #endif
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <tqptrlist.h>
 #include <tqlistview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KSSLCertBox;
 class TQFrame;
@@ -40,14 +40,14 @@ class KSSLPKCS12;
 class KSSLCertificate;
 class TQTabWidget;
 class TQMultiLineEdit;
-class KAboutData;
+class TDEAboutData;
 class TQGridLayout;
 
 
-class KX509Item : public KListViewItem {
+class KX509Item : public TDEListViewItem {
 	public:
-		KX509Item(KListViewItem *parent, KSSLCertificate *x);
-		KX509Item(KListView *parent, KSSLCertificate *x);
+		KX509Item(TDEListViewItem *parent, KSSLCertificate *x);
+		KX509Item(TDEListView *parent, KSSLCertificate *x);
 		void setup(KSSLCertificate *x);
 		~KX509Item();
 		virtual int rtti() const { return 1; }
@@ -56,9 +56,9 @@ class KX509Item : public KListViewItem {
 };
 
 
-class KPKCS12Item : public KListViewItem {
+class KPKCS12Item : public TDEListViewItem {
 	public:
-		KPKCS12Item(KListViewItem *parent, KSSLPKCS12 *x);
+		KPKCS12Item(TDEListViewItem *parent, KSSLPKCS12 *x);
 		~KPKCS12Item();
 	KSSLPKCS12 *cert;
 	TQString _prettyName;
@@ -75,7 +75,7 @@ public:
 
   virtual void setReadWrite(bool readwrite);
 
-  static KAboutData *createAboutData();
+  static TDEAboutData *createAboutData();
 
 protected slots:
   void slotChain(int c);
@@ -94,8 +94,8 @@ protected:
   void displayPKCS12Cert(KSSLCertificate *c);
   void displayCACert(KSSLCertificate *c);
 
-  KListView *_sideList;
-  KListViewItem *_parentCA, *_parentP12;
+  TDEListView *_sideList;
+  TDEListViewItem *_parentCA, *_parentP12;
   TQFrame *_pkcsFrame, *_blankFrame, *_x509Frame, *_frame;
 
   // for the PKCS12 widget
@@ -115,7 +115,7 @@ protected:
 
 
   // The rest
-  KInstance *_instance;
+  TDEInstance *_instance;
   TQButton *_import, *_save, *_done, *_launch, *_importAll;
   // Store the pointer to the current item
   KSSLPKCS12 *_p12;
diff --git a/kcert/kcertpart.rc b/tdecert/tdecertpart.rc
index 4deb2d7c8..4deb2d7c8 100644
--- a/kcert/kcertpart.rc
+++ b/tdecert/tdecertpart.rc
diff --git a/kcmshell/CMakeLists.txt b/tdecmshell/CMakeLists.txt
index fafd6c2b1..2b07bbdcc 100644
--- a/kcmshell/CMakeLists.txt
+++ b/tdecmshell/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 link_directories(
@@ -26,9 +26,9 @@ link_directories(
 )
 
 
-##### kcmshell ##################################
+##### tdecmshell ##################################
 
-set( target kcmshell )
+set( target tdecmshell )
 
 set( ${target}_SRCS
   main.cpp main.skel
@@ -36,6 +36,6 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kutils-shared
+  LINK tdeutils-shared
   DEPENDENCIES dcopidl
 )
diff --git a/kcmshell/Makefile.am b/tdecmshell/Makefile.am
index 6e12d9053..b5e18e1f3 100644
--- a/kcmshell/Makefile.am
+++ b/tdecmshell/Makefile.am
@@ -18,21 +18,21 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # 
 
-AM_CPPFLAGS = -I$(top_srcdir)/kutils $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/tdeutils $(all_includes)
 METASOURCES = AUTO
 
 lib_LTLIBRARIES = 
 bin_PROGRAMS = 
-tdeinit_LTLIBRARIES = kcmshell.la
+tdeinit_LTLIBRARIES = tdecmshell.la
 
-kcmshell_la_SOURCES = main.cpp main.skel
-kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
-kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdecmshell_la_SOURCES = main.cpp main.skel
+tdecmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE)
+tdecmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 noinst_HEADERS = main.h
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kcmshell.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdecmshell.pot
 
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kcmshell/main.cpp b/tdecmshell/main.cpp
index 902b2397f..72f3c66f2 100644
--- a/kcmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -27,22 +27,22 @@
 #include <dcopclient.h>
 #include <qxembed.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kcmoduleinfo.h>
-#include <kcmoduleloader.h>
-#include <kcmoduleproxy.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdecmoduleinfo.h>
+#include <tdecmoduleloader.h>
+#include <tdecmoduleproxy.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <twin.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "main.h"
 #include "main.moc"
@@ -51,7 +51,7 @@ using namespace std;
 
 KService::List m_modules;
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "list", I18N_NOOP("List all possible modules"), 0},
     { "+module", I18N_NOOP("Configuration module to open"), 0 },
@@ -59,7 +59,7 @@ static KCmdLineOptions options[] =
     { "embed <id>", I18N_NOOP("Embeds the module with buttons in window with id <id>"), 0 },
     { "embed-proxy <id>", I18N_NOOP("Embeds the module without buttons in window with id <id>"), 0 },
     { "silent", I18N_NOOP("Do not display main window"), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 static void listModules(const TQString &baseGroup)
@@ -106,7 +106,7 @@ static KService::Ptr locateModule(const TQCString& module)
     if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
         return locateModule( "kde-" + module );
 
-    if(!KCModuleLoader::testModule( module ))
+    if(!TDECModuleLoader::testModule( module ))
     {
         kdDebug(780) << "According to \"" << module << "\"'s test function, it should Not be loaded." << endl;
         return 0;
@@ -120,7 +120,7 @@ bool KCMShell::isRunning()
     if( dcopClient()->appId() == m_dcopName )
         return false; // We are the one and only.
 
-    kdDebug(780) << "kcmshell with modules '" << 
+    kdDebug(780) << "tdecmshell with modules '" << 
         m_dcopName << "' is already running." << endl;
 
     dcopClient()->attach(); // Reregister as anonymous
@@ -152,12 +152,12 @@ void KCMShellMultiDialog::activate( TQCString asn_id )
 {
     kdDebug(780) << k_funcinfo << endl;
 
-    KStartupInfo::setNewStartupId( this, asn_id );
+    TDEStartupInfo::setNewStartupId( this, asn_id );
 }
 
 void KCMShell::setDCOPName(const TQCString &dcopName, bool rootMode )
 {
-    m_dcopName = "kcmshell_";
+    m_dcopName = "tdecmshell_";
     if( rootMode )
         m_dcopName += "rootMode_";
 
@@ -198,10 +198,10 @@ static void setIcon(TQWidget *w, const TQString &iconName)
 
 extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
 {
-    KAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
+    TDEAboutData aboutData( "tdecmshell", I18N_NOOP("TDE Control Module"),
                           0,
                           I18N_NOOP("A tool to start single TDE control modules"),
-                          KAboutData::License_GPL,
+                          TDEAboutData::License_GPL,
                           I18N_NOOP("(c) 1999-2004, The KDE Developers") );
 
     aboutData.addAuthor("Frans Englich", I18N_NOOP("Maintainer"), "frans.englich@kde.org");
@@ -211,17 +211,17 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
     aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
     aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org");
     
-    KGlobal::locale()->setMainCatalogue("kcmshell");
+    TDEGlobal::locale()->setMainCatalogue("tdecmshell");
 
-    KCmdLineArgs::init(_argc, _argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+    TDECmdLineArgs::init(_argc, _argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
     KCMShell app;
 
-    const KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    const TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     const TQCString lang = args->getOption("lang");
     if( !lang.isNull() )
-        KGlobal::locale()->setLanguage(lang);
+        TDEGlobal::locale()->setLanguage(lang);
 
     if (args->isSet("list"))
     {
@@ -283,7 +283,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
     }
 
     //KDialogBase::DialogType dtype = KDialogBase::Plain;      // FIXME
-    KDialogBase::DialogType dtype = KDialogBase::IconList;     // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with kcmshell in the Plain mode
+    KDialogBase::DialogType dtype = KDialogBase::IconList;     // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with tdecmshell in the Plain mode
                                                                // This bug is possibly related to kcmultidialog.cpp:266 [( new TQHBoxLayout( page ) )->setAutoAdd( true );]
                                                                // In fact, this method of display may be preferable to the Plain mode from a UX perspective,
                                                                // as the icon shows the user what the active kcontrol module is called.
@@ -301,7 +301,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
         id = args->getOption( "embed-proxy" ).toInt(&idValid);    
         if( idValid )
         {
-            KCModuleProxy *module = new KCModuleProxy( modules.first()->desktopEntryName() );
+            TDECModuleProxy *module = new TDECModuleProxy( modules.first()->desktopEntryName() );
             module->realModule();
             QXEmbed::embedClientIntoWindow( module, id);
             app.exec();
@@ -318,7 +318,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
             i18n("Configure - %1").arg(kapp->caption()), 0, "", true );
 
     for (KService::List::ConstIterator it = modules.begin(); it != modules.end(); ++it)
-        dlg->addModule(KCModuleInfo(*it));
+        dlg->addModule(TDECModuleInfo(*it));
 
     if ( args->isSet( "embed" ))
     {
@@ -339,7 +339,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
         if (kapp->iconName() != kapp->name())
             setIcon(dlg, kapp->iconName());
         else if ( modules.count() == 1 )
-            setIcon(dlg, KCModuleInfo( modules.first()).icon());
+            setIcon(dlg, TDECModuleInfo( modules.first()).icon());
 
         dlg->exec();
         delete dlg;
diff --git a/kcmshell/main.h b/tdecmshell/main.h
index 6a7c34ee7..e97145a82 100644
--- a/kcmshell/main.h
+++ b/tdecmshell/main.h
@@ -19,18 +19,18 @@
 
 */
 
-#ifndef __kcmshell_h__
-#define __kcmshell_h__
+#ifndef __tdecmshell_h__
+#define __tdecmshell_h__
 
 #include <dcopobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcmultidialog.h>
 
 /**
- * The KApplication instance for kcmshell.
+ * The TDEApplication instance for tdecmshell.
  */
-class KCMShell : public KApplication
+class KCMShell : public TDEApplication
 {
     Q_OBJECT
 
@@ -41,12 +41,12 @@ public:
      * and then registers with DCOP.
      *
      * @param dcopName name to set the DCOP name to
-     * @param rootMode true if the kcmshell is embedding
+     * @param rootMode true if the tdecmshell is embedding
      */
     void setDCOPName(const TQCString &dcopName, bool rootMode );
 
     /**
-     * Waits until the last instance of kcmshell with the same
+     * Waits until the last instance of tdecmshell with the same
      * module as this one exits, and then exits.
      */
     void waitForExit();
@@ -66,7 +66,7 @@ private:
 
     /**
      * The DCOP name which actually is registered.
-     * For example "kcmshell_mouse".
+     * For example "tdecmshell_mouse".
      */
     TQCString m_dcopName;
 
@@ -101,4 +101,4 @@ k_dcop:
 
 
 // vim: sw=4 et sts=4
-#endif //__kcmshell_h__
+#endif //__tdecmshell_h__
diff --git a/kconf_update/CMakeLists.txt b/tdeconf_update/CMakeLists.txt
index 2e25811a7..fffb66e80 100644
--- a/kconf_update/CMakeLists.txt
+++ b/tdeconf_update/CMakeLists.txt
@@ -20,12 +20,12 @@ link_directories(
 )
 
 
-##### kconf_update ##############################
+##### tdeconf_update ##############################
 
-set( target kconf_update )
+set( target tdeconf_update )
 
 set( ${target}_SRCS
-  kconf_update.cpp
+  tdeconf_update.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
diff --git a/kconf_update/Mainpage.dox b/tdeconf_update/Mainpage.dox
index 9db5adb3b..2557fe1c0 100644
--- a/kconf_update/Mainpage.dox
+++ b/tdeconf_update/Mainpage.dox
@@ -1,6 +1,6 @@
-/** @mainpage ./kconf_update
+/** @mainpage ./tdeconf_update
 
-kconf_update is a tool designed to update config files. Over time applications
+tdeconf_update is a tool designed to update config files. Over time applications
 sometimes need to rearrange the way configuration options are stored. Since
 such an update shouldn't influence the configuration options that the user
 has selected, the application must take care that the options stored in the
@@ -13,7 +13,7 @@ several drawbacks:
   needed, resulting in a slower startup.
 - The application becomes bigger with code that will only be used once.
 
-kconf_update addresses these problems by offering a framework to update 
+tdeconf_update addresses these problems by offering a framework to update 
 configuration files without adding code to the application itself.
 
 See the README file for more information.
diff --git a/kconf_update/Makefile.am b/tdeconf_update/Makefile.am
index afe3864d9..9041aad8a 100644
--- a/kconf_update/Makefile.am
+++ b/tdeconf_update/Makefile.am
@@ -20,14 +20,14 @@ INCLUDES= -I../kded $(all_includes)
 
 bin_PROGRAMS = 
 lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = kconf_update.la
+tdeinit_LTLIBRARIES = tdeconf_update.la
 
-kconf_update_la_SOURCES = kconf_update.cpp
-kconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
-kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdeconf_update_la_SOURCES = tdeconf_update.cpp
+tdeconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+tdeconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 METASOURCES = AUTO
 
 # Internal
-# noinst_HEADERS = kconf_update.h
+# noinst_HEADERS = tdeconf_update.h
 
diff --git a/kconf_update/README.kconf_update b/tdeconf_update/README.tdeconf_update
index c8229c735..de274e15c 100644
--- a/kconf_update/README.kconf_update
+++ b/tdeconf_update/README.tdeconf_update
@@ -1,4 +1,4 @@
-README kconf_update
+README tdeconf_update
 
 Version: 1.1
 Author: Waldo Bastian <bastian@kde.org>, <bastian@suse.com>
@@ -6,7 +6,7 @@ Author: Waldo Bastian <bastian@kde.org>, <bastian@suse.com>
 What it does
 ============
 
-kconf_update is a tool designed to update config files. Over time applications
+tdeconf_update is a tool designed to update config files. Over time applications
 sometimes need to rearrange the way configuration options are stored. Since 
 such an update shouldn't influence the configuration options that the user
 has selected, the application must take care that the options stored in the
@@ -19,7 +19,7 @@ several drawbacks:
 needed, resulting in a slower startup.
 * The application becomes bigger with code that will only be used once.
 
-kconf_update addresses these problems by offering a framework to update 
+tdeconf_update addresses these problems by offering a framework to update 
 configuration files without adding code to the application itself.
 
 
@@ -27,7 +27,7 @@ How it works
 ============
 
 Applications can install so called "update files" under 
-$TDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
+$TDEDIR/share/apps/tdeconf_update. An update file has ".upd" as extension and
 contains instructions for transferring/converting configuration information 
 from one place to another.
 
@@ -36,7 +36,7 @@ or when kded detects a new update file in the above mentioned location.
 
 Update files are separated into sections. Each section has an Id. When a 
 section describing a configuration change has been applied, the Id will be 
-stored in the file "kconf_updaterc". This information is used to make sure
+stored in the file "tdeconf_updaterc". This information is used to make sure
 that a configuration update is only performed once.
 
 If you overwrite an existing update file with a new version that contains a 
@@ -76,18 +76,18 @@ is used as new entries for <newfile>. Existing entries can be deleted by
 adding lines with "# DELETE [group]key" in the output of the script.
 To delete a whole group use "# DELETEGROUP [group]".
 
-<script> should be installed into $(kde_datadir)/kconf_update, or
-kconf_update will not be able to find it. It is not portable to install
+<script> should be installed into $(kde_datadir)/tdeconf_update, or
+tdeconf_update will not be able to find it. It is not portable to install
 binary applications in $kde_datadir, so you have to stick with interpreted
 scripts like sh or perl scripts. From KDE 3.2 onwards it's also possible
-to install kconf_update applications in $(kde_bindir)/kconf_update_bin,
-which opens the door to kconf_update applications that are written in C++
+to install tdeconf_update applications in $(kde_bindir)/tdeconf_update_bin,
+which opens the door to tdeconf_update applications that are written in C++
 and use Qt's powerful string API instead.
 
 A workaround for KDE 3.1.x and older is to install a .sh script in
 $(kde_datadir) that contains a simple exec:
 
-    exec "`tde-config --prefix`/bin/kconf_update_bin/my_update_app"
+    exec "`tde-config --prefix`/bin/tdeconf_update_bin/my_update_app"
 
 This is equivalent to what KDE 3.2 can do directly, but of course the .upd
 file now points to the .sh script instead of the binary application.
@@ -167,7 +167,7 @@ Example update file
 
 # This is comment
 Id=kde2.2
-File=kioslaverc,kio_httprc
+File=tdeioslaverc,tdeio_httprc
 Group=Proxy Settings
 Key=NoProxyFor
 Key=UseProxy
@@ -181,69 +181,69 @@ RemoveGroup=KDE
 # End of file
 
 
-The above update file extracts config information from the file "kioslaverc" 
-and stores it into the file "kio_httprc". 
+The above update file extracts config information from the file "tdeioslaverc" 
+and stores it into the file "tdeio_httprc". 
 
 It reads the keys "NoProxyFor", "UseProxy" and "httpProxy" from the group 
-"Proxy Settings" in the "kioslaverc" file. If any of these options are present
+"Proxy Settings" in the "tdeioslaverc" file. If any of these options are present
 they are written to the keys "NoProxyFor", "UseProxy" and "Proxy" (!) in
-the group "Proxy Settings" in the "kio_httprc" file.
+the group "Proxy Settings" in the "tdeio_httprc" file.
 
 It also reads the keys "MaxCacheSize" and "UseCache" from the group 
-"Cache Settings" in the "kioslaverc" file and writes this information to the
+"Cache Settings" in the "tdeioslaverc" file and writes this information to the
 keys "MaxCacheSize" and "UseCache" in the group "Cache" (!) in the 
-"kio_httprc" file.
+"tdeio_httprc" file.
 
-Then it takes all keys in the "UserAgent" group of the file "kioslaverc" 
-and moves then to the "UserAgent" group in the "kio_httprc" file.
+Then it takes all keys in the "UserAgent" group of the file "tdeioslaverc" 
+and moves then to the "UserAgent" group in the "tdeio_httprc" file.
 
-Finally it removes the entire "KDE" group in the kioslaverc file.
+Finally it removes the entire "KDE" group in the tdeioslaverc file.
 
 
 Debugging and testing
 =====================
 
-If you are developing a kconf_update script and want to test or debug it you
-need to make sure kconf_update runs again after each of your changes. There
+If you are developing a tdeconf_update script and want to test or debug it you
+need to make sure tdeconf_update runs again after each of your changes. There
 are a number of ways to achieve this.
 
-The easiest is to not install the kconf_update script in the first place, but
+The easiest is to not install the tdeconf_update script in the first place, but
 manually call it through a pipe. If you want to test the update script for
 your application KHello's config file khellorc, you can test by using
 
     cat ~/.trinity/share/config/khellorc | khello_conf_update.sh
 
-(assuming khello_conf_update.sh is the kconf_update script and ~/.trinity is your
+(assuming khello_conf_update.sh is the tdeconf_update script and ~/.trinity is your
 $TDEHOME). This is easier than making install every time, but has the obvious
 downside that you need to 'parse' your script's output yourself instead of
-letting kconf_update do it and check the resulting output file.
+letting tdeconf_update do it and check the resulting output file.
 
-After 'make install' the kconf_update script is run by kded, but it does so
+After 'make install' the tdeconf_update script is run by kded, but it does so
 only once. This is of course the idea behind it, but while developing it can
 be a problem. You can increase the revision number for each subsequent run
-of 'make install' to force a new kconf_update run, but there's a better
+of 'make install' to force a new tdeconf_update run, but there's a better
 approach that doesn't skyrocket the version number for a mediocre debug
 session.
 
 kded doesn't really ignore scripts that it has already run right away.
 Instead it checks the affected config file every time a .upd file is added
 or changed. The reason it still doesn't run again on your config file lies
-in the traces kconf_update leaves behind: it adds a special config group
-'[$Version]' with a key 'update_info'. This key lists all kconf_update
+in the traces tdeconf_update leaves behind: it adds a special config group
+'[$Version]' with a key 'update_info'. This key lists all tdeconf_update
 scripts that have already been run on this config file. Just remove your
-file's entry, 'make install', and kconf_update will happily run your script
+file's entry, 'make install', and tdeconf_update will happily run your script
 again, without you having to increase the version number.
 
-If you want to know what kconf_update has been up to lately, have a look
-at $TDEHOME/share/apps/kconf_update/update.log
+If you want to know what tdeconf_update has been up to lately, have a look
+at $TDEHOME/share/apps/tdeconf_update/update.log
 
 
 Common Problems
 ===============
 
-* kconf_update refuses to update an entry
+* tdeconf_update refuses to update an entry
 If you change the value of an entry without changing the key or file,
-make sure to tell kconf_update that it should overwrite the old entry
+make sure to tell tdeconf_update that it should overwrite the old entry
 by adding "Options=overwrite". 
 
 
diff --git a/kconf_update/kconf_update.cpp b/tdeconf_update/tdeconf_update.cpp
index 2e7b58238..814e68a16 100644
--- a/kconf_update/kconf_update.cpp
+++ b/tdeconf_update/tdeconf_update.cpp
@@ -28,22 +28,22 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
         { "debug", I18N_NOOP("Keep output results from scripts"), 0 },
 	{ "check <update-file>", I18N_NOOP("Check whether config file itself requires updating"), 0 },
 	{ "+[file]", I18N_NOOP("File to read update instructions from"), 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
 };
 
 class KonfUpdate
@@ -73,11 +73,11 @@ public:
    void gotScriptArguments(const TQString &_arguments);
    void resetOptions();
 
-   void copyGroup(KConfigBase *cfg1, const TQString &grp1, 
-                  KConfigBase *cfg2, const TQString &grp2);
+   void copyGroup(TDEConfigBase *cfg1, const TQString &grp1, 
+                  TDEConfigBase *cfg2, const TQString &grp2);
 
 protected:
-   KConfig *config;
+   TDEConfig *config;
    TQString currentFilename;
    bool skip;
    bool debug;
@@ -86,9 +86,9 @@ protected:
    TQString oldFile;
    TQString newFile;
    TQString newFileName;
-   KConfig *oldConfig1; // Config to read keys from.
-   KConfig *oldConfig2; // Config to delete keys from.
-   KConfig *newConfig;
+   TDEConfig *oldConfig1; // Config to read keys from.
+   TDEConfig *oldConfig2; // Config to delete keys from.
+   TDEConfig *newConfig;
 
    TQString oldGroup;
    TQString newGroup;
@@ -113,10 +113,10 @@ KonfUpdate::KonfUpdate()
    oldConfig2 = 0;
    newConfig = 0;
 
-   config = new KConfig("kconf_updaterc");
+   config = new TDEConfig("tdeconf_updaterc");
 
    TQStringList updateFiles;
-   KCmdLineArgs *args=KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs();
    
    debug = args->isSet("debug");
 
@@ -124,7 +124,7 @@ KonfUpdate::KonfUpdate()
    if (args->isSet("check"))
    {
       m_bUseConfigInfo = true;
-      TQString file = locate("data", "kconf_update/"+TQFile::decodeName(args->getOption("check")));
+      TQString file = locate("data", "tdeconf_update/"+TQFile::decodeName(args->getOption("check")));
       if (file.isEmpty())
       {
          tqWarning("File '%s' not found.", args->getOption("check").data());
@@ -139,7 +139,7 @@ KonfUpdate::KonfUpdate()
       {
          KURL url = args->url(i);
          if (!url.isLocalFile())
-            KCmdLineArgs::usage(i18n("Only local files are supported."));
+            TDECmdLineArgs::usage(i18n("Only local files are supported."));
          updateFiles.append(url.path());
       }
    }
@@ -188,7 +188,7 @@ KonfUpdate::log()
 {
    if (!m_textStream)
    {
-      TQString file = locateLocal("data", "kconf_update/log/update.log");
+      TQString file = locateLocal("data", "tdeconf_update/log/update.log");
       m_file = new TQFile(file);
       if (m_file->open(IO_WriteOnly | IO_Append))
       {
@@ -209,7 +209,7 @@ KonfUpdate::log()
 TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
 {
    TQStringList result;
-   TQStringList list = KGlobal::dirs()->findAllResources("data", "kconf_update/*.upd", false, true);
+   TQStringList list = TDEGlobal::dirs()->findAllResources("data", "tdeconf_update/*.upd", false, true);
    for(TQStringList::ConstIterator it = list.begin();
        it != list.end();
        ++it)
@@ -501,7 +501,7 @@ void KonfUpdate::gotFile(const TQString &_file)
    
    if (!oldFile.isEmpty())
    {
-      oldConfig2 = new KConfig(oldFile, false, false);
+      oldConfig2 = new TDEConfig(oldFile, false, false);
       TQString cfg_id = currentFilename + ":" + id;
       oldConfig2->setGroup("$Version");
       TQStringList ids = oldConfig2->readListEntry("update_info");
@@ -514,7 +514,7 @@ void KonfUpdate::gotFile(const TQString &_file)
 
       if (!newFile.isEmpty())
       {
-         newConfig = new KConfig(newFile, false, false);
+         newConfig = new TDEConfig(newFile, false, false);
          newConfig->setGroup("$Version");
          ids = newConfig->readListEntry("update_info");
          if (ids.contains(cfg_id))
@@ -528,7 +528,7 @@ void KonfUpdate::gotFile(const TQString &_file)
          newConfig = oldConfig2;
       }
 
-      oldConfig1 = new KConfig(oldFile, true, false);
+      oldConfig1 = new TDEConfig(oldFile, true, false);
    }
    else
    {
@@ -703,8 +703,8 @@ void KonfUpdate::gotOptions(const TQString &_options)
    }
 }
 
-void KonfUpdate::copyGroup(KConfigBase *cfg1, const TQString &grp1, 
-                           KConfigBase *cfg2, const TQString &grp2)
+void KonfUpdate::copyGroup(TDEConfigBase *cfg1, const TQString &grp1, 
+                           TDEConfigBase *cfg2, const TQString &grp2)
 {
    cfg1->setGroup(grp1);
    cfg2->setGroup(grp2);
@@ -745,11 +745,11 @@ void KonfUpdate::gotScript(const TQString &_script)
 
 
 
-   TQString path = locate("data","kconf_update/"+script);
+   TQString path = locate("data","tdeconf_update/"+script);
    if (path.isEmpty())
    {
       if (interpreter.isEmpty())
-         path = locate("lib", "kconf_update_bin/"+script);
+         path = locate("lib", "tdeconf_update_bin/"+script);
 
       if (path.isEmpty())
       {
@@ -905,10 +905,10 @@ void KonfUpdate::gotScript(const TQString &_script)
    // Merging in new entries.
    m_bCopy = true;
    {
-     KConfig *saveOldConfig1 = oldConfig1;
+     TDEConfig *saveOldConfig1 = oldConfig1;
      TQString saveOldGroup = oldGroup;
      TQString saveNewGroup = newGroup;
-     oldConfig1 = new KConfig(tmp2.name(), true, false);
+     oldConfig1 = new TDEConfig(tmp2.name(), true, false);
 
      // For all groups...
      TQStringList grpList = oldConfig1->groupList();
@@ -940,18 +940,18 @@ void KonfUpdate::resetOptions()
 
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
-   KAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"),
+   TDEAboutData aboutData("tdeconf_update", I18N_NOOP("KConf Update"),
                         "1.0.2",
                         I18N_NOOP("TDE Tool for updating user configuration files"),
-                        KAboutData::License_GPL,
+                        TDEAboutData::License_GPL,
                         "(c) 2001, Waldo Bastian");
 
    aboutData.addAuthor("Waldo Bastian", 0, "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &aboutData);
-   KCmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs::init(argc, argv, &aboutData);
+   TDECmdLineArgs::addCmdLineOptions(options);
 
-   KInstance instance(&aboutData);
+   TDEInstance instance(&aboutData);
 
    KonfUpdate konfUpdate;
 
diff --git a/tdecore/AUTHORS b/tdecore/AUTHORS
index a76f6be1e..57935fce7 100644
--- a/tdecore/AUTHORS
+++ b/tdecore/AUTHORS
@@ -1,5 +1,5 @@
 Matthias Kalle Dalheimer <kalle@kde.org>:
-classes KConfig, KTextStream, KColorSet, KApplication
+classes TDEConfig, KTextStream, KColorSet, TDEApplication
 automake, autoconf, maintenance
 
 Richard Moore <moorer@cs.man.ac.uk>:
@@ -12,20 +12,20 @@ Steffen Hansen <stefh@dit.ou.dk>:
 KURL class
 
 Torben Weis <weis@stud.uni-frankfurt.de>
-DnD stuff, KSocket and KServerSocket classes, KPixmap
+DnD stuff, TDESocket and TDEServerSocket classes, KPixmap
 
 Alexander Sanda <alex@darkstar.ping.at>
 Read and write numerical config entries, KPanner, KTabControl,
-KPopupMenu, KMessageBox, KEdit widgets. 
+TDEPopupMenu, KMessageBox, KEdit widgets. 
 
 Martin Jones <mjones@powerup.com.au>
-Bugfixes in KPixmap and KURL, KColorDialog, KSelector
+Bugfixes in KPixmap and KURL, KColorDialog, TDESelector
 
 Keith Brown <kbrown@pdq.net>
 KTreeList class
 
 Bernd Johannes Wuebben <wuebben@math.cornell.edu>
-KFontDialog classes
+TDEFontDialog classes
 
 Tim D. Gilman <tdgilman@best.com>
 KDatePicker, KDateTable class
@@ -37,10 +37,10 @@ Michael Will <Michael.Will@student.uni-tuebingen.de>
 loading routine in KPixmap
 
 Christian Czezatke <e9025461@student.tuwien.ac.at>
-KProcess class
+TDEProcess class
 
 Matthias Ettrich <ettrich@kde.org>
-KWM, Changes to KApplication and KIconLoader
+KWM, Changes to TDEApplication and TDEIconLoader
 
 Stephan Kulow <coolo@kde.org>
 heavy modifications to KURL, autoconf and automake stuff
@@ -53,4 +53,4 @@ Thomas Tanner <tanner@gmx.de>
 ltdl.c + ltdl.h
 
 Carsten Pfeiffer <pfeiffer@kde.org>
-KCompletion classes
+TDECompletion classes
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index f0ea3b5b4..b8f512873 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -11,8 +11,9 @@
 
 add_subdirectory( malloc )
 add_subdirectory( network )
-add_subdirectory( kconfig_compiler )
+add_subdirectory( tdeconfig_compiler )
 add_subdirectory( hwlibdata )
+add_subdirectory( hwlibdaemons )
 
 if( NOT DBUS_SYSTEM_BUS )
   set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
@@ -52,7 +53,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libltdl
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${LIBART_INCLUDE_DIRS}
   ${LIBIDN_INCLUDE_DIRS}
   ${GAMIN_INCLUDEDIR}
@@ -68,25 +69,25 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kconfig.h kconfigskeleton.h kconfigdata.h ksimpleconfig.h
-    kconfigdialogmanager.h kconfigbase.h kdesktopfile.h
-    kurl.h ksock.h kaboutdata.h kcmdlineargs.h kconfigbackend.h
-    kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h
+    tdeconfig.h tdeconfigskeleton.h tdeconfigdata.h ksimpleconfig.h
+    tdeconfigdialogmanager.h tdeconfigbase.h kdesktopfile.h
+    kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h
+    kapp.h tdeapplication.h kuniqueapp.h kuniqueapplication.h
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
-    klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
-    twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h
-    kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h
+    tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
+    twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
+    kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
     kregexp.h kcompletion.h kstringhandler.h kstddirs.h
-    kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h
+    kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
     kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
-    kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h
+    kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
-    kdcoppropertyproxy.h netwm.h kaccelmanager.h netwm_def.h
+    kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
     kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
     kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
-    kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h ksycoca.h
-    ksycocaentry.h ksycocatype.h kxmessages.h kstartupinfo.h
-    klargefile.h kmultipledrag.h kgenericfactory.h kgenericfactory.tcc
+    kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
+    tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h
+    klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc
     ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h
     kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h
     kmanagerselection.h kmountpoint.h kuser.h klockfile.h
@@ -109,7 +110,7 @@ install( FILES kdebug.areas kdebugrc language.codes
   DESTINATION ${CONFIG_INSTALL_DIR} )
 
 install( FILES kmdcodec_compat.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio RENAME kmdcodec.h )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio RENAME kmdcodec.h )
 
 install( FILES eventsrc
   DESTINATION ${DATA_INSTALL_DIR}/knotify )
@@ -119,27 +120,27 @@ install( FILES eventsrc
 set( target tdecore )
 
 set( ${target}_SRCS
-  libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
-  kconfigbase.cpp kconfig.cpp ksimpleconfig.cpp kconfigbackend.cpp
+  libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp
+  tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
   kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
-  ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
+  ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp tdelocale.cpp
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
-  kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
-  kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp
-  kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp
-  kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp
+  kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
+  tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp
+  kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
+  kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp
   kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
-  kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
-  kuniqueapplication.cpp kaccelmanager.cpp ksavefile.cpp
+  kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp
+  kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
-  kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
+  tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
   kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp
   kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
   kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp
-  fakes.c vsnprintf.c ksycoca.cpp ksycocadict.cpp ksycoca.skel
-  ksycocafactory.cpp kxmessages.cpp kstartupinfo.cpp
-  kcatalogue.cpp kasyncio.cpp kmultipledrag.cpp kstaticdeleter.cpp
+  fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel
+  tdesycocafactory.cpp kxmessages.cpp tdestartupinfo.cpp
+  kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp
   kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp
   kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp
   kdebugdcopiface.skel kcalendarsystem.cpp kcalendarsystemgregorian.cpp
@@ -147,7 +148,7 @@ set( ${target}_SRCS
   kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp
   ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp
   kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
-  kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp
+  kuser.cpp tdeconfigskeleton.cpp tdeconfigdialogmanager.cpp klockfile.cpp
   kqiodevicegzip_p.cpp ktimezones.cpp tdehardwaredevices.cpp tdenetworkconnections.cpp
   ksimpledirwatch.cpp
   ${TDENM_BACKEND_SOURCES}
diff --git a/tdecore/DESIGN.COLOR b/tdecore/DESIGN.COLOR
index b997a6de0..56ffd1774 100644
--- a/tdecore/DESIGN.COLOR
+++ b/tdecore/DESIGN.COLOR
@@ -25,7 +25,7 @@ contrast at all which can lead to a completely unreadable UI.
 Color schemes are supported by Qt (see TQColorGroup) and can be
 configured on a KDE wide basis from the Control Panel. The settings
 are stored in the global KDE configuration file under the "General"
-setting. The KApplication class takes care that the configured
+setting. The TDEApplication class takes care that the configured
 settings are passed on to Qt. Application developers can just use the
 values provided by TQColorGroup.
 
diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading
index bcfb13c95..a675a8922 100644
--- a/tdecore/DESIGN.iconloading
+++ b/tdecore/DESIGN.iconloading
@@ -58,7 +58,7 @@ can copy this pixmap:
    // p contains now 30x30 pixels of test.png.
 
 The only hard part is then to publish the icons in a way that applications 
-know what to copy. I'm thinking about a ksycoca-sort-of index that 
+know what to copy. I'm thinking about a tdesycoca-sort-of index that 
 applications can map and can use to do fast lookups with. This has no major 
 problems except for the race-condition that might exist when an icon is 
 removed. In that case you will remove it from the index first and then later 
@@ -72,14 +72,14 @@ information and then waiting for a sufficient long period, e.. 5 minutes,
 before actually removing the image data.
 
 I can also imagine a scenario where the index information is only used very 
-temporarily, e.g. during the creation of a KMainWindow (mmap the file in the 
+temporarily, e.g. during the creation of a TDEMainWindow (mmap the file in the 
 constructor, unmap it from the next event loop) that way icons can be removed 
 from the index and after e.g. a timeout of 5 minutes one can be relatively 
 sure that the index will no longer be used.
 
 I think the best way to distribute the index information is through the file 
 system but the update mechanism for this file should probably more complex 
-than the one used in ksycoca. Since ksycoca updates only happen once in a 
+than the one used in tdesycoca. Since tdesycoca updates only happen once in a 
 while, we can afford it to write out a whole new file. For icons this will 
 probably be more difficult since updates will be part of normal operation, if 
 the index file is rather large (no idea about that.. how much icons are in 
@@ -182,6 +182,6 @@ KDE 2.2: We deliver.
 <pmax> oh I see
 <Zogje> to answer you rfirst question: "won't the ipc be a bottleneck?" no, because you don't use ipc in the critical part (the icon loading)
 <pmax> yup I understand how it works now I think
-<Zogje> instead you access an index from disk which is quite fast (as fast as ksycoca)
+<Zogje> instead you access an index from disk which is quite fast (as fast as tdesycoca)
 <pmax> I think this will definitely speed things up on my machine since I have a relatively fast box with slow disks
 <Zogje> that's why I want to use the file-system instaed of X-properties
diff --git a/tdecore/DESIGN.kconfig b/tdecore/DESIGN.tdeconfig
index 4ced76726..a1fb48dbd 100644
--- a/tdecore/DESIGN.kconfig
+++ b/tdecore/DESIGN.tdeconfig
@@ -1,4 +1,4 @@
-kconfigdata.h contains definitions of the data formats used by kconfig.
+tdeconfigdata.h contains definitions of the data formats used by tdeconfig.
 
 Configuration entries are stored as "KEntry". They are indexed with "KEntryKey".
 The primary store is a "KEntryMap" which is defined as a QMap from "KEntryKey"
@@ -70,7 +70,7 @@ When an entry is read with readEntry(key, defaultValue), non-existing
 entries will return "defaultValue" while hasKey(key) will return "false"
 for such entries.
 
-Currently all entries are stored in memory. When KConfig is "sync()'ed"
+Currently all entries are stored in memory. When TDEConfig is "sync()'ed"
 it reads the file that it is about to overwrite (for the second time), it 
 then merges in the entries it has in memory and writes the result back to 
 the file. It does NOT update its map of entries in memory with the entries
@@ -99,12 +99,12 @@ KDE3.0 Changes
 
 ------------------------------------------------------------------------------
 
-KConfig XT
+TDEConfig XT
 ==========
 
-My buzzword picker offered KConfig XT ("eXtended Technology") and KConfig NG 
+My buzzword picker offered TDEConfig XT ("eXtended Technology") and TDEConfig NG 
 ("Next Generation").  Since the planned changes are ment to be evolutionary 
-rather than revolutionary, KConfig NG was dropped.
+rather than revolutionary, TDEConfig NG was dropped.
 
 Goals
 =====
@@ -130,12 +130,12 @@ Type information can be provide by preceding every entry with a formalized
 comment.
 
 Work to be done:
-* KConfig needs to be extended to provide access to the default values provided 
-by the default config files. KConfig already stores this information internally.
+* TDEConfig needs to be extended to provide access to the default values provided 
+by the default config files. TDEConfig already stores this information internally.
 (DONE)
 * A formal comment structure needs to be designed that can convey type-information.
 Preferably in such a way that it is easily parsable by both machine and user.
-* KConfig needs to be extended, or another class created, that is able to parse
+* TDEConfig needs to be extended, or another class created, that is able to parse
 the formalized comments.
 * A tool needs to be developed that can assist developers with the generation
 and verification of default configuration files including type-information.
@@ -170,34 +170,34 @@ Host=wantelbos.zogje.fr
 
 Class overview
 
-                       KConfigBase
+                       TDEConfigBase
                             |
                             v
- KConfigBackend  <-----> KConfig <------> KConfigSkeleton           /--< myapp.kcfg
+ TDEConfigBackend  <-----> TDEConfig <------> TDEConfigSkeleton           /--< myapp.kcfg
        |                    |                    |                 /
        v                    v                    |*---------------<
-KConfigINIBackend      KSimpleConfig             |kconfig_compiler \
+TDEConfigINIBackend      KSimpleConfig             |tdeconfig_compiler \
                                                  |                  \--< myconfig.kcfg-codegen
                                                  v                                                    
-                                             MyConfig <-----KConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui
+                                             MyConfig <-----TDEConfigDialogManager----> MyConfigWidget *---< myconfigwidget.ui
                                                                                                       uic
 
-KConfigBase: defines API for generic config class
+TDEConfigBase: defines API for generic config class
 
-KConfig: functional generic config class that supports merging of cascaded
+TDEConfig: functional generic config class that supports merging of cascaded
          configuration files
 
 KSimpleConfig: functional generic config class without support for cascading
                configuration files.
 
-KConfigBackend: defines API for config backend, t.i. the actual handling
+TDEConfigBackend: defines API for config backend, t.i. the actual handling
                 of the storage method and storage format.
 
-KConfigINIBackend: the standard (and only one so far) class that implements
+TDEConfigINIBackend: the standard (and only one so far) class that implements
                    the config backend using the file-based .INI format
                    for configuration files
 
-KConfigSkeleton: base class for deriving classes that store application
+TDEConfigSkeleton: base class for deriving classes that store application
                  specific options providing type-safety and single-point
                  defaults.
 
@@ -215,9 +215,9 @@ myconfig.kcfg-codegen: Implementation specific code generation instructions
                        just an example name, the application developer
                        choses the actual name.
 
-KConfigDialogManager: Class that links widgets in a dialog up with their
+TDEConfigDialogManager: Class that links widgets in a dialog up with their
                       corresponding confguration options in a configuration
-                      object derived from KConfigSkeleton.
+                      object derived from TDEConfigSkeleton.
 
 MyConfigWidget: Dialog generated from a .ui description file. Widget names
                 in the dialog that start with "kcfg_" refer to configuration
diff --git a/tdecore/KCONFIG_DESIGN b/tdecore/KCONFIG_DESIGN
index dfd9aa151..d0fa141ff 100644
--- a/tdecore/KCONFIG_DESIGN
+++ b/tdecore/KCONFIG_DESIGN
@@ -1,9 +1,9 @@
 
-              The basic design on KConfig for KDE 2.0 and KDE 3.0:
+              The basic design on TDEConfig for KDE 2.0 and KDE 3.0:
               ----------------------------------------
 
-KConfig is a hierarchy of classes for loading and saving configuration
-data in KDE.  KConfigBase is an abstract data type (ADT) with pure
+TDEConfig is a hierarchy of classes for loading and saving configuration
+data in KDE.  TDEConfigBase is an abstract data type (ADT) with pure
 virtual functions which describes the API for accessing configuration
 data.  It cannot be instantiated directly; only subclasses which
 actually implement the API may be created.  The reason for this design
@@ -15,34 +15,34 @@ achieve shared memory config values.  The possibilities are endless,
 and with this design we insure that future designs will not break
 compatibility.
 
-This means that most classes that currently take pointers to KConfig
-objects should be changed to take pointers to KConfigBase objects.
+This means that most classes that currently take pointers to TDEConfig
+objects should be changed to take pointers to TDEConfigBase objects.
 The virtual functions and c++ polymorphism will make sure that the
 correct function in the actual, instantiated object are called, but
-this lets the user/programmer change the type of KConfig that has been
+this lets the user/programmer change the type of TDEConfig that has been
 implemented at runtime without changing other code.
 
-Similarly, there is a abstract data type KConfigBackEnd.  All
+Similarly, there is a abstract data type TDEConfigBackEnd.  All
 reading/writing of the physical, on-disk configuration should be done
-through a subclass of KConfigBackEnd.  The only class that is
-currently implemented right now is KConfigINIBackEnd, which
+through a subclass of TDEConfigBackEnd.  The only class that is
+currently implemented right now is TDEConfigINIBackEnd, which
 reads/writes the standard windows INI-style configuration files that
 KDE has used since KDE 1.x days.  However, it is conceivable that one
 might program an XML backend, or even a database/registry style
 backend.  Again, this abstract data type approach provides flexibility
-for the future.  Currently KConfig and KSimpleConfig hardcode that
-they are using a KConfigINIBackEnd in the constructor.  If more back
+for the future.  Currently TDEConfig and KSimpleConfig hardcode that
+they are using a TDEConfigINIBackEnd in the constructor.  If more back
 ends are implemented, this will have to be changed to use a factory
 method of some sort to create the backend; all they maintain is a
-pointer to a KConfigBackEnd, so the actual type of backend does not
+pointer to a TDEConfigBackEnd, so the actual type of backend does not
 matter.
 
-If you are interested in using KConfig, you need simply to look at the
-public members of KConfigBase.  They will provide you with everything
+If you are interested in using TDEConfig, you need simply to look at the
+public members of TDEConfigBase.  They will provide you with everything
 you need to do to look up data, change and write data, etc.  If you
-are interested in implementing a new KConfig format, look at KConfig
+are interested in implementing a new TDEConfig format, look at TDEConfig
 for ideas.  Likewise if you want to implement a backend, look at
-KConfigINIBackEnd for inspiration.  The KDoc-style API documentation
+TDEConfigINIBackEnd for inspiration.  The KDoc-style API documentation
 should be complete.  If there is anything confusing, please either fix
 it in CVS yourself or mail me with your questions, and we will make
 sure things get clarified.
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 07a996b24..ae94ecd7c 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -6,31 +6,31 @@ When adding yourself as a maintainer, don't be afraid to reorder the files to a
 more logical grouping.
 
 dmalloc.cpp
-kaboutdata.cpp		David Faure <faure@kde.org>
-kaccel.cpp		Ellis Whitehead <ellis@kde.org>
-kaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
-kaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
+tdeaboutdata.cpp		David Faure <faure@kde.org>
+tdeaccel.cpp		Ellis Whitehead <ellis@kde.org>
+tdeaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
+tdeaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
 kallocator.cpp		Waldo Bastian <bastian@kde.org>
 kappdcopiface.cpp
-kapplication.cpp	Waldo Bastian <bastian@kde.org>
+tdeapplication.cpp	Waldo Bastian <bastian@kde.org>
 kaudioplayer.cpp
 kcatalogue.cpp		Hans Petter Bieker <bieker@kde.org>
 kcharsets.cpp		Lars Knoll <knoll@kde.org>
 kckey.cpp
-kcmdlineargs.cpp	Waldo Bastian <bastian@kde.org>
+tdecmdlineargs.cpp	Waldo Bastian <bastian@kde.org>
 kcompletion.cpp		Carsten Pfeiffer <pfeiffer@kde.org>
 kcompletionbase.cpp
-kconfig.cpp		Waldo Bastian <bastian@kde.org>
-kconfigbackend.cpp	Waldo Bastian <bastian@kde.org>
-kconfigbase.cpp		Waldo Bastian <bastian@kde.org>
+tdeconfig.cpp		Waldo Bastian <bastian@kde.org>
+tdeconfigbackend.cpp	Waldo Bastian <bastian@kde.org>
+tdeconfigbase.cpp		Waldo Bastian <bastian@kde.org>
 kcrash.cpp		Waldo Bastian <bastian@kde.org>
 kdcoppropertyproxy.cpp
 kdebug.cpp		Stephan Kulow <coolo@kde.org>
 kdesktopfile.cpp
-kglobal.cpp		Stephan Kulow <coolo@kde.org>
+tdeglobal.cpp		Stephan Kulow <coolo@kde.org>
 kglobalaccel.cpp	Ellis Whitehead <ellis@kde.org>
 kglobalaccel_x11.cpp	Ellis Whitehead <ellis@kde.org>
-kglobalsettings.cpp	David Faure <faure@kde.org>
+tdeglobalsettings.cpp	David Faure <faure@kde.org>
 kiconeffect.cpp
 kiconloader.cpp
 kicontheme.cpp
@@ -41,10 +41,10 @@ kkeynative_x11.cpp	Ellis Whitehead <ellis@kde.org>
 kkeysequence.cpp	Ellis Whitehead <ellis@kde.org>
 kkeysequence_emb.cpp	Ellis Whitehead <ellis@kde.org>
 klibloader.cpp
-klocale.cpp		Hans Petter Bieker <bieker@kde.org>
+tdelocale.cpp		Hans Petter Bieker <bieker@kde.org>
 kmdcodec.cpp
 kmimesourcefactory.cpp
-kmultipledrag.cpp	David Faure <faure@kde.org>
+tdemultipledrag.cpp	David Faure <faure@kde.org>
 knotifyclient.cpp
 kpalette.cpp		Waldo Bastian <bastian@kde.org>
 kpixmapprovider.cpp	Carsten Pfeiffer <pfeiffer@kde.org>
@@ -56,18 +56,18 @@ kregexp.cpp
 krfcdate.cpp		Waldo Bastian <bastian@kde.org>
 krootprop.cpp   	Lubos Lunak <l.lunak@kde.org>
 ksavefile.cpp		Waldo Bastian <bastian@kde.org>
-kshortcut.cpp		Ellis Whitehead <ellis@kde.org>
+tdeshortcut.cpp		Ellis Whitehead <ellis@kde.org>
 ksimpleconfig.cpp	Waldo Bastian <bastian@kde.org>
 ksocks.cpp
 kstandarddirs.cpp	Waldo Bastian <bastian@kde.org>
-kstartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
+tdestartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
 kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
-kstdaccel.cpp		Ellis Whitehead <ellis@kde.org>
+tdestdaccel.cpp		Ellis Whitehead <ellis@kde.org>
 kstringhandler.cpp
-ksycoca.cpp		Waldo Bastian <bastian@kde.org>
-ksycocadict.cpp		Waldo Bastian <bastian@kde.org>
-ksycocafactory.cpp	Waldo Bastian <bastian@kde.org>
-ktempfile.cpp		Waldo Bastian <bastian@kde.org>
+tdesycoca.cpp		Waldo Bastian <bastian@kde.org>
+tdesycocadict.cpp		Waldo Bastian <bastian@kde.org>
+tdesycocafactory.cpp	Waldo Bastian <bastian@kde.org>
+tdetempfile.cpp		Waldo Bastian <bastian@kde.org>
 kuniqueapplication.cpp	Waldo Bastian <bastian@kde.org>
 kurl.cpp		Waldo Bastian <bastian@kde.org>
 kurldrag.cpp		David Faure <faure@kde.org>
@@ -94,8 +94,8 @@ kcalendarsystemhijri.cpp
 kcalendarsystemjalali.cpp	Arash Bijanzadeh  and FarsiKDE Project <www.farsikde.org> (copyright)
 kcheckaccelerators.cpp	Matthias Kalle Dalheimer (kalle@kde.org) (copyright)
 kclipboard.cpp		Carsten Pfeiffer <pfeiffer@kde.org> (copyright)
-kconfigdialogmanager.cpp
-kconfigskeleton.cpp
+tdeconfigdialogmanager.cpp
+tdeconfigskeleton.cpp
 kdebugdcopiface.cpp	Andreas Beckermann (b_mann@gmx.de) (copyright)
 tdeversion.cpp
 kglobalaccel_win.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
@@ -109,7 +109,7 @@ kprotocolinfofactory.cpp	Torben Weis <weis@kde.org> (copyright)
 kprotocolinfofactory.cpp	Waldo Bastian <bastian@kde.org> (copyright)
 kpty.cpp
 kshell.cpp		Oswald Buddenhagen <ossi@kde.org> (copyright)
-kshortcutmenu.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
+tdeshortcutmenu.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
 ktempdir.cpp		Joseph Wenninger <jowenn@kde.org> (copyright)
 kuser.cpp		Tim Jansen <tim@tjansen.de> (copyright)
 kvmallocator.cpp	Waldo Bastian (bastian@kde.org) (copyright)
diff --git a/tdecore/Mainpage.dox b/tdecore/Mainpage.dox
index c0e13a339..cbf8f69d9 100644
--- a/tdecore/Mainpage.dox
+++ b/tdecore/Mainpage.dox
@@ -6,7 +6,7 @@ support, site-independent access to the filesystem and a large number
 of other (but no less important) things.
 <p>
 All Trinity applications should link to the tdecore library. Also, using a
-KApplication derived class instead of TQApplication is almost
+TDEApplication derived class instead of TQApplication is almost
 mandatory if you expect your application to behave nicely within the
 Trinity environment.
 
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index f8856108c..c04ee4c6d 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -27,7 +27,7 @@ SVGICONS=svgicons
 SVGICON_LIB=svgicons/libkdesvgicons.la
 endif
 
-SUBDIRS = malloc network $(SVGICONS) . kconfig_compiler tests
+SUBDIRS = malloc network $(SVGICONS) . tdeconfig_compiler tests
 
 # For the future: examine if condensing the tons of *_LDFLAGS variables
 # into $(all_libraries) isn't better
@@ -36,25 +36,25 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 lib_LTLIBRARIES = libtdefakes.la libtdecore.la
 lib_LIBRARIES = libtdefakes_nonpic.a libtdefakes_pic.a
 
-include_HEADERS = kconfig.h kconfigskeleton.h \
-	kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
-	kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
-	kcmdlineargs.h kconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
+include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
+	tdeconfigdata.h ksimpleconfig.h tdeconfigdialogmanager.h \
+	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \
+	tdecmdlineargs.h tdeconfigbackend.h kapp.h tdeapplication.h kuniqueapp.h \
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
-	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
-	twinmodule.h twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \
-	kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h \
+	kprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \
+	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
+	kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
 	kregexp.h kcompletion.h kstringhandler.h \
-	kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \
+	kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
 	kallocator.h kvmallocator.h kcrash.h krfcdate.h \
-	kinstance.h kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h \
+	kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \
 	krandomsequence.h knotifyclient.h kiconeffect.h \
-	kaudioplayer.h kdcoppropertyproxy.h netwm.h kaccelmanager.h \
+	kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
 	kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
 	kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
-	ksycoca.h ksycocaentry.h ksycocatype.h kxmessages.h kstartupinfo.h \
-	klargefile.h kmultipledrag.h kgenericfactory.h kgenericfactory.tcc \
+	tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h \
+	klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \
 	ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \
 	kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
 	kmanagerselection.h kmountpoint.h kuser.h klockfile.h \
@@ -81,36 +81,36 @@ libtdefakes_pic.a: libtdefakes.la
 	ar cru libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o
 	ranlib libtdefakes_pic.a
 
-noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
+noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
 	kcompletion_private.h netwm_p.h \
 	kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
-	kregpriv.h kshortcutmenu.h ksycocadict.h ksycocafactory.h netsupp.h \
+	kregpriv.h tdeshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
 	kcheckaccelerators.h kcalendarsystemgregorian.h \
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
 
-libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
-	kdebug.cpp netwm.cpp kconfigbase.cpp kconfig.cpp  ksimpleconfig.cpp \
-	kconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
+libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
+	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
+	tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
-	klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
+	tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
-	kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
-	kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp \
-	kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp \
-	kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp \
+	kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
+	tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
+	kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
+	kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \
 	kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
-	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
-	kuniqueapplication.cpp kaccelmanager.cpp \
+	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \
+	kuniqueapplication.cpp tdeaccelmanager.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
-	kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
+	tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
 	kaudioplayer.cpp kdcoppropertyproxy.cpp \
 	ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \
 	kpixmapprovider.cpp kurldrag.cpp \
 	kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \
-	ksycoca.cpp ksycocadict.cpp ksycocafactory.cpp ksycoca.skel \
-	kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
-	kmultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
+	tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \
+	kxmessages.cpp tdestartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
+	tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
 	kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \
 	tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \
 	kcalendarsystem.cpp kcalendarsystemgregorian.cpp \
@@ -118,7 +118,7 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
 	kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \
 	ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp \
 	kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
-	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
+	kuser.cpp tdeconfigskeleton.cpp tdeconfigdialogmanager.cpp klockfile.cpp \
 	kqiodevicegzip_p.cpp ktimezones.cpp
 
 libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
@@ -143,16 +143,16 @@ kckey_h : $(srcdir)/generate_keys.sh $(QNAMESPACE_H)
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kde_locale)
 	$(INSTALL_DATA) $(srcdir)/all_languages.desktop $(DESTDIR)$(kde_locale)/all_languages
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/kio
+	$(mkinstalldirs) $(DESTDIR)$(includedir)/tdeio
 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/knotify
 	$(INSTALL_DATA) $(srcdir)/eventsrc $(DESTDIR)$(kde_datadir)/knotify/eventsrc
-	$(INSTALL_DATA) $(srcdir)/kmdcodec_compat.h $(DESTDIR)$(includedir)/kio/kmdcodec.h
+	$(INSTALL_DATA) $(srcdir)/kmdcodec_compat.h $(DESTDIR)$(includedir)/tdeio/kmdcodec.h
 	rm -f "$(DESTDIR)$(kde_confdir)/colors/40 Colors"
 	rm -f $(DESTDIR)$(kde_confdir)/colors/Web
 	rm -f $(DESTDIR)$(kde_confdir)/colors/Royal
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h
+	-rm -f $(DESTDIR)$(includedir)/tdeio/kmdcodec.h
 
 # If you add a color palette file here, please change tdelibs/tdeui/kcolordialog.cpp too to allow to translate the name
 colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors
@@ -188,7 +188,7 @@ install-exec-hook:
 
 DISTCLEANFILES = tde-config.cpp
 
-DOXYGEN_REFERENCES = dcop tdeui kparts kio
+DOXYGEN_REFERENCES = dcop tdeui tdeparts kio
 DOXYGEN_EXCLUDE = malloc kde_file.h
 DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES
 
diff --git a/tdecore/README.exec b/tdecore/README.exec
index f2065b7ad..d47c808e9 100644
--- a/tdecore/README.exec
+++ b/tdecore/README.exec
@@ -7,9 +7,9 @@ you should or should not use them.
 1. fork + exec
 
 You never want to use this unless you have a very good reason why it is 
-impossible to use KProcess.
+impossible to use TDEProcess.
 
-2. KProcess
+2. TDEProcess
 
 You want to use this if you need to start a new process which needs to be a 
 child of your process, e.g. because you want to catch stdout/stderr or need 
@@ -20,7 +20,7 @@ off with KProcIO
 
 3. KProcIO
 
-Like KProcess. Unlike KProcess, this class actually makes it easy to 
+Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to 
 send data to and receive data from the process.
 
 4. startServiceByDesktopPath
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index 896981d33..54ab60d2d 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -28,7 +28,7 @@ resources provided by the system were located under $TDEDIR and user-
 specific resources were located under $HOME/.trinity.
 
 In KDE2 resource management has been largely abstracted by the introduction
-of the KStandardDirs class and has become much more flexible. The user /
+of the TDEStandardDirs class and has become much more flexible. The user /
 administrator can now specify a variable number of locations where resources
 can be found. A list of locations can either be specified via $TDEDIRS
 (notice the extra 'S'), via /etc/kderc and even via the kdeglobals config 
@@ -64,7 +64,7 @@ that haven't explicitly changed the affected settings to something else.
 Starting with KDE3, configuration entries can be marked "immutable". When a
 configuration entry is immutable it means that configuration files that are
 read later will not be able to override its value. Immutable entries cannot
-be changed via KConfig and if the entry is present under $TDEHOME it will 
+be changed via TDEConfig and if the entry is present under $TDEHOME it will 
 be ignored.
 
 Entries can be marked immutable on 4 different levels:
@@ -331,7 +331,7 @@ Applications may use additional actions that they defined themselves.
 You can get a list of the actions used by a certain applications by using the
 following dcop command:
 
-dcop <dcopid> qt objects | grep KActionCollection/ | cut -d '/' -f 3
+dcop <dcopid> qt objects | grep TDEActionCollection/ | cut -d '/' -f 3
 
 or with
 
@@ -492,11 +492,11 @@ of these actions then the application will not appear in the TDE menu and will n
 be used by KDE for opening files.
 
 IMPORTANT NOTE:
-Changing restrictions may influence the data that is cached in the ksycoca
+Changing restrictions may influence the data that is cached in the tdesycoca
 database. Since changes to .../share/config/kdeglobals do not trigger an
-automatic ksycoca update you need to force an update manually.
-To force an update of the ksycoca database touch the file 
-.../share/services/update_ksycoca. This will force a user's sycoca database
+automatic tdesycoca update you need to force an update manually.
+To force an update of the tdesycoca database touch the file 
+.../share/services/update_tdesycoca. This will force a user's sycoca database
 to be rebuild the next time the user logs in.
 
 KDE3 URL Restrictions
@@ -616,7 +616,7 @@ tde-display.desktop
 tde-proxy.desktop
 tde-screensaver.desktop
 
-See also kcmshell --list for a list of all the base names.
+See also tdecmshell --list for a list of all the base names.
 
 Expansion of environment variables in KDE config files.
 =======================================================
@@ -657,10 +657,10 @@ Host[$e]=$(hostname)
 KDE3 Kiosk Application API
 ==========================
 
-Three new methods have been added to KApplication:
+Three new methods have been added to TDEApplication:
 
 - bool authorize(QString action); // Generic actions
-- bool authorizeKAction(QString action); // For KActions exclusively
+- bool authorizeTDEAction(QString action); // For TDEActions exclusively
 - bool authorizeURLAction(QString, referringURL, destinationURL) // URL Handling
 
 Automatic Logout
diff --git a/tdecore/README.kstartupinfo b/tdecore/README.kstartupinfo
index 496f75ecd..5ece291ea 100644
--- a/tdecore/README.kstartupinfo
+++ b/tdecore/README.kstartupinfo
@@ -30,7 +30,7 @@ ASNs which will stay too long until a timeout ). For improving the quality
 of ASN and reducing the number of ASNs that don't detect when the application
 has started, some .desktop file entries may be helpful ( see below ).
  If you want to start an application in your code, prefer using KRun or
-KApplication::startServiceByXXX() calls. Classes like KProcess don't create
+TDEApplication::startServiceByXXX() calls. Classes like TDEProcess don't create
 ASN, so if you need to use it, you have to send it manually ( only in case
 ASN is useful in this case, it shouldn't be sent e.g. for system processes ).
  
@@ -84,16 +84,16 @@ value, and for apps which need it also X-TDE-WMClass should be set. This
 sometimes gives slightly better behavior than when these entries are not set.
 
 
-The KStartupInfo classes : 
+The TDEStartupInfo classes : 
 --------------------------
 
  In some cases, or if you are interested in getting the ASN information, you
-have to use the KStartupInfo classes in tdelibs/tdecore.
+have to use the TDEStartupInfo classes in tdelibs/tdecore.
 
 Receiving the application startup notification information :
 ------------------------------------------------------------
 
- Create an instance of class KStartupInfo and connect to its slots, they
+ Create an instance of class TDEStartupInfo and connect to its slots, they
 will be emitted whenever a ASN info is received.
  The clean_on_cantdetect argument to the constructor means whether all
 ASN info for non-compliant apps should be removed when a window is mapped
@@ -125,8 +125,8 @@ about the finished process should be sent. Since the application may
 have forked into background, the finish info should include the PID
 and hostname, and the notification will be stopped only if there's
 no other PID for it. On the other hand, if you simply really need
-to stop ASN, send only the identification ( KStartupInfo::sendFinish()
-with only KStartupInfoId argument ).
+to stop ASN, send only the identification ( TDEStartupInfo::sendFinish()
+with only TDEStartupInfoId argument ).
 
 
 
@@ -148,8 +148,8 @@ forks into background, it sends the PID change. That's how compliant
 applications should work, and this support for ASN should be provided
 by toolkits. All KDE application should be compliant by now, since
 tdelibs do all the necessary things. The KDE_STARTUP_ENV variable
-is read and unset in KApplication constructor, and _KDE_STARTUP_ID
-is set on every toplevel window in KApplication::setTopWidget().
+is read and unset in TDEApplication constructor, and _KDE_STARTUP_ID
+is set on every toplevel window in TDEApplication::setTopWidget().
  However, majority of applications aren't compliant now, and even
 if I succeed making this thing a standard ( part of NETWM_SPEC
 or whatever ), there still will be old applications that won't behave
@@ -171,11 +171,11 @@ is 'xemacs', but WM_CLASS is 'emacs', 'Emacs', so its X-TDE-WMClass
 in its .desktop file should be set to 'emacs' - the case doesn't
 matter ).
  The ASN identification string must be a unique string for every ASN.
-In KStartupInfo class, it's created as 'hostname;tm.sec;tm.usec;pid',
+In TDEStartupInfo class, it's created as 'hostname;tm.sec;tm.usec;pid',
 tm being the current time. If the identification string is set to "0",
-it means no ASN should be done ( e.g. for things like kio_uiserver,
+it means no ASN should be done ( e.g. for things like tdeio_uiserver,
 which shouldn't get ASN ). Empty identification string means the same
-like "0", except for the call to KStartupInfoId::initId(), where it means
+like "0", except for the call to TDEStartupInfoId::initId(), where it means
 to create a new one.
 
 
diff --git a/tdecore/hwlibdaemons/CMakeLists.txt b/tdecore/hwlibdaemons/CMakeLists.txt
new file mode 100644
index 000000000..edc853c95
--- /dev/null
+++ b/tdecore/hwlibdaemons/CMakeLists.txt
@@ -0,0 +1,13 @@
+#################################################
+#
+#  (C) 2012 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+
+add_subdirectory( dbus )
diff --git a/tdecore/hwlibdaemons/dbus/CMakeLists.txt b/tdecore/hwlibdaemons/dbus/CMakeLists.txt
new file mode 100644
index 000000000..4d1f4618a
--- /dev/null
+++ b/tdecore/hwlibdaemons/dbus/CMakeLists.txt
@@ -0,0 +1,37 @@
+#################################################
+#
+#  (C) 2012 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${DBUS_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+##### tde_dbus_hardwarecontrol ##################
+
+tde_add_executable( tde_dbus_hardwarecontrol
+  SOURCES tde_dbus_hardwarecontrol.c
+  LINK ${DBUS_LIBRARIES}
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+##### other data ################################
+
+configure_file( org.trinitydesktop.hardwarecontrol.service.cmake org.trinitydesktop.hardwarecontrol.service @ONLY )
+
+install( FILES
+    org.trinitydesktop.hardwarecontrol.conf
+  DESTINATION ${DBUS_SYSTEM_CONF_DIRECTORY} )
+
+install( FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/org.trinitydesktop.hardwarecontrol.service
+  DESTINATION ${DBUS_SERVICE_DIRECTORY} )
diff --git a/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf b/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf
new file mode 100644
index 000000000..a649b969f
--- /dev/null
+++ b/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="org.trinitydesktop.hardwarecontrol"/>
+  </policy>
+
+  <policy at_console="true">
+  <!-- Users with physical access to the machine are allowed access -->
+    <allow send_destination="org.trinitydesktop.hardwarecontrol"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+
+    <allow send_destination="org.trinitydesktop.hardwarecontrol"
+           send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.trinitydesktop.hardwarecontrol.CPUGovernor"
+           send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.trinitydesktop.hardwarecontrol.Brightness"
+           send_interface="org.freedesktop.DBus.Properties"/>
+
+    <allow send_destination="org.trinitydesktop.hardwarecontrol"
+           send_interface="org.trinitydesktop.hardwarecontrol"/>
+    <allow send_destination="org.trinitydesktop.hardwarecontrol"
+           send_interface="org.trinitydesktop.hardwarecontrol.CPUGovernor"/>
+    <allow send_destination="org.trinitydesktop.hardwarecontrol"
+           send_interface="org.trinitydesktop.hardwarecontrol.Brightness"/>
+  </policy>
+
+  <policy context="default">
+    <!-- Everyone else is denied access -->
+    <deny own="org.trinitydesktop.hardwarecontrol"/>
+
+    <deny send_destination="org.trinitydesktop.hardwarecontrol"/>
+  </policy>
+</busconfig>
diff --git a/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake b/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake
new file mode 100644
index 000000000..3be2ebeee
--- /dev/null
+++ b/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.trinitydesktop.hardwarecontrol
+Exec=@BIN_INSTALL_DIR@/tde_dbus_hardwarecontrol
+User=root
\ No newline at end of file
diff --git a/tdecore/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c b/tdecore/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c
new file mode 100644
index 000000000..f7e707522
--- /dev/null
+++ b/tdecore/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c
@@ -0,0 +1,327 @@
+#define DBUS_API_SUBJECT_TO_CHANGE
+#include <dbus/dbus.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+void reply_Bool(DBusMessage* msg, DBusConnection* conn, int value) {
+	DBusMessage* reply;
+	DBusMessageIter args;
+	const char* member = dbus_message_get_member(msg);
+	dbus_uint32_t serial = 0;
+
+	// create a reply from the message
+	reply = dbus_message_new_method_return(msg);
+
+	// add the arguments to the reply
+	dbus_message_iter_init_append(reply, &args);
+	if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &value)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_message_iter_append_basic failed\n", member);
+		return;
+	}
+
+	// send the reply && flush the connection
+	if (!dbus_connection_send(conn, reply, &serial)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_connection_send failed\n", member);
+		return;
+	}
+	dbus_connection_flush(conn);
+
+	// free the reply
+	dbus_message_unref(reply);
+}
+
+void reply_CanSetGivenPath(DBusMessage* msg, DBusConnection* conn, const char* param) {
+	DBusMessage* reply;
+	DBusMessageIter args;
+	const char* member = dbus_message_get_member(msg);
+	dbus_uint32_t serial = 0;
+	int writable = false;
+
+	// check if path is writable
+	int rval = access (param, W_OK);
+	if (rval == 0) {
+		writable = true;
+	}
+
+	// create a reply from the message
+	reply = dbus_message_new_method_return(msg);
+
+	// add the arguments to the reply
+	dbus_message_iter_init_append(reply, &args);
+	if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &writable)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_message_iter_append_basic failed\n", member);
+		return;
+	}
+
+	// send the reply && flush the connection
+	if (!dbus_connection_send(conn, reply, &serial)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_connection_send failed\n", member);
+		return;
+	}
+	dbus_connection_flush(conn);
+
+	// free the reply
+	dbus_message_unref(reply);
+}
+
+void reply_SetGivenPath(DBusMessage* msg, DBusConnection* conn, const char* param, const char* contents) {
+	DBusMessage* reply;
+	DBusMessageIter args;
+	const char* member = dbus_message_get_member(msg);
+	dbus_uint32_t serial = 0;
+	int writable = false;
+	int written = false;
+
+	// check if path is writable
+	int rval = access (param, W_OK);
+	if (rval == 0) {
+		writable = true;
+	}
+
+	if (writable) {
+		FILE *node = fopen(param, "w");
+		if (node != NULL) {
+			if (fputs(contents, node) != EOF) {
+				written = true;
+			}
+			if (fclose(node) == EOF) {
+				// Error!
+			}
+		}
+	}
+
+	// create a reply from the message
+	reply = dbus_message_new_method_return(msg);
+
+	// add the arguments to the reply
+	dbus_message_iter_init_append(reply, &args);
+	if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &written)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_message_iter_append_basic failed\n", member);
+		return;
+	}
+
+	// send the reply && flush the connection
+	if (!dbus_connection_send(conn, reply, &serial)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_connection_send failed\n", member);
+		return;
+	}
+	dbus_connection_flush(conn);
+
+	// free the reply
+	dbus_message_unref(reply);
+}
+
+void reply_CanSetCPUGovernor(DBusMessage* msg, DBusConnection* conn) {
+	DBusMessageIter args;
+	const char* member = dbus_message_get_member(msg);
+	dbus_int32_t cpunum;
+	char path[256];
+
+	// read the arguments
+	if (!dbus_message_iter_init(msg, &args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: no argument supplied\n", member);
+	}
+	else if (DBUS_TYPE_INT32 != dbus_message_iter_get_arg_type(&args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: argument not 32-bit integer\n", member);
+	}
+	else {
+		dbus_message_iter_get_basic(&args, &cpunum);
+	}
+
+	snprintf(path, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor", cpunum);
+	reply_CanSetGivenPath(msg, conn, path);
+}
+
+void reply_SetCPUGovernor(DBusMessage* msg, DBusConnection* conn) {
+	DBusMessageIter args;
+	const char* member = dbus_message_get_member(msg);
+	dbus_int32_t cpunum = -1;
+	char* governor = NULL;
+	char path[256];
+
+	// read the arguments
+	if (!dbus_message_iter_init(msg, &args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: no arguments supplied\n", member);
+	}
+	else if (DBUS_TYPE_INT32 != dbus_message_iter_get_arg_type(&args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: first argument not 32-bit integer\n", member);
+	}
+	else {
+		dbus_message_iter_get_basic(&args, &cpunum);
+	}
+
+	if (!dbus_message_iter_next(&args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: second argument not supplied\n", member);
+	}
+	else if (DBUS_TYPE_STRING != dbus_message_iter_get_arg_type(&args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: second argument not string\n", member);
+	}
+	else {
+		dbus_message_iter_get_basic(&args, &governor);
+	}
+
+	snprintf(path, 256, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor", cpunum);
+	if ((cpunum>-1) && governor) {
+		reply_SetGivenPath(msg, conn, path, governor);
+	}
+	else {
+		reply_Bool(msg, conn, false);
+	}
+}
+
+void reply_CanSetBrightness(DBusMessage* msg, DBusConnection* conn) {
+	DBusMessageIter args;
+	const char* member = dbus_message_get_member(msg);
+	char* rawpath;
+	char* safepath;
+	char path[256];
+
+	// read the arguments
+	if (!dbus_message_iter_init(msg, &args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: no argument supplied\n", member);
+	}
+	else if (DBUS_TYPE_STRING != dbus_message_iter_get_arg_type(&args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: argument not string\n", member);
+	}
+	else {
+		dbus_message_iter_get_basic(&args, &rawpath);
+	}
+
+	safepath = realpath(rawpath, NULL);
+
+	if (safepath &&
+		(strstr(safepath, "/sys/devices") == safepath) &&
+		(strstr(safepath, "/brightness") == (safepath+strlen(safepath)-strlen("/brightness")))
+		) {
+			reply_CanSetGivenPath(msg, conn, safepath);
+	}
+	else {
+		reply_Bool(msg, conn, false);
+	}
+
+	free(safepath);
+}
+
+void reply_SetBrightness(DBusMessage* msg, DBusConnection* conn) {
+	DBusMessageIter args;
+	const char* member = dbus_message_get_member(msg);
+	char* rawpath;
+	char* safepath;
+	char* brightness;
+	char path[256];
+
+	// read the arguments
+	if (!dbus_message_iter_init(msg, &args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: no arguments supplied\n", member);
+	}
+	else if (DBUS_TYPE_STRING != dbus_message_iter_get_arg_type(&args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: first argument not string\n", member);
+	}
+	else {
+		dbus_message_iter_get_basic(&args, &rawpath);
+	}
+
+	if (!dbus_message_iter_next(&args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: second argument not supplied\n", member);
+	}
+	else if (DBUS_TYPE_STRING != dbus_message_iter_get_arg_type(&args)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: second argument not string\n", member);
+	}
+	else {
+		dbus_message_iter_get_basic(&args, &brightness);
+	}
+
+	safepath = realpath(rawpath, NULL);
+
+	if (safepath && brightness &&
+		(strstr(safepath, "/sys/devices") == safepath) &&
+		(strstr(safepath, "/brightness") == (safepath+strlen(safepath)-strlen("/brightness")))
+		) {
+			reply_SetGivenPath(msg, conn, safepath, brightness);
+	}
+	else {
+		reply_Bool(msg, conn, false);
+	}
+
+	free(safepath);
+}
+
+void listen() {
+	DBusMessage* msg;
+	DBusMessage* reply;
+	DBusMessageIter args;
+	DBusConnection* conn;
+	DBusError err;
+	int ret;
+	char* param;
+
+	fprintf(stderr, "[tde_dbus_hardwarecontrol] Listening...\n");
+
+	// initialise the error structure
+	dbus_error_init(&err);
+
+	// connect to the bus and check for errors
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
+	if (dbus_error_is_set(&err)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] Connection failed with error '%s'\n", err.message);
+		dbus_error_free(&err);
+	}
+	if (NULL == conn) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] No connection, exiting!\n");
+		exit(1);
+	}
+
+	// request our name on the bus and check for errors
+	ret = dbus_bus_request_name(conn, "org.trinitydesktop.hardwarecontrol", DBUS_NAME_FLAG_REPLACE_EXISTING , &err);
+	if (dbus_error_is_set(&err)) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] Name request failed with error '%s'\n", err.message);
+		dbus_error_free(&err);
+	}
+	if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
+		fprintf(stderr, "[tde_dbus_hardwarecontrol] Not primary owner (%d), exiting!\n", ret);
+		exit(1);
+	}
+
+	// loop, testing for new messages
+	while (true) {
+		// non blocking read of the next available message
+		dbus_connection_read_write(conn, 1000); // block for up to 1 second
+		msg = dbus_connection_pop_message(conn);
+	
+		// loop again if we haven't got a message
+		if (NULL == msg) {
+			continue;
+		}
+
+		// check this is a method call for the right interface & method
+		if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.CPUGovernor", "CanSetCPUGovernor")) {
+			reply_CanSetCPUGovernor(msg, conn);
+		}
+		else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.CPUGovernor", "SetCPUGovernor")) {
+			reply_SetCPUGovernor(msg, conn);
+		}
+		else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Brightness", "CanSetBrightness")) {
+			reply_CanSetBrightness(msg, conn);
+		}
+		else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Brightness", "SetBrightness")) {
+			reply_SetBrightness(msg, conn);
+		}
+		else {
+			fprintf(stderr, "[tde_dbus_hardwarecontrol] Unknown method '%s' called on interface '%s', ignoring\n", dbus_message_get_member(msg), dbus_message_get_interface(msg));
+		}
+		
+		// free the message
+		dbus_message_unref(msg);
+	}
+
+	// close the connection
+	dbus_connection_close(conn);
+}
+
+int main(int argc, char** argv) {
+	listen();
+	return 0;
+}
diff --git a/tdecore/kallocator.cpp b/tdecore/kallocator.cpp
index e8d2e8692..254088050 100644
--- a/tdecore/kallocator.cpp
+++ b/tdecore/kallocator.cpp
@@ -30,7 +30,7 @@
 #include "kallocator.h"
 #include <kdebug.h>
 
-class KZoneAllocator::MemBlock
+class TDEZoneAllocator::MemBlock
 {
   public:
     MemBlock(size_t s) : size(s), ref(0), older(0), newer(0)
@@ -45,7 +45,7 @@ class KZoneAllocator::MemBlock
     MemBlock *newer;
 };
 
-KZoneAllocator::KZoneAllocator(unsigned long _blockSize)
+TDEZoneAllocator::TDEZoneAllocator(unsigned long _blockSize)
 : currentBlock(0), blockSize(1), blockOffset(0), log2(0), num_blocks(0), 
   hashList(0), hashSize(0), hashDirty(true)
 {
@@ -56,7 +56,7 @@ KZoneAllocator::KZoneAllocator(unsigned long _blockSize)
   blockOffset = blockSize + 1;
 }
 
-KZoneAllocator::~KZoneAllocator()
+TDEZoneAllocator::~TDEZoneAllocator()
 {
   unsigned int count = 0;
   if (hashList) {
@@ -80,7 +80,7 @@ KZoneAllocator::~KZoneAllocator()
 #endif
 }
 
-void KZoneAllocator::insertHash(MemBlock *b)
+void TDEZoneAllocator::insertHash(MemBlock *b)
 {
   unsigned long adr = ((unsigned long)b->begin) & (~(blockSize - 1));
   unsigned long end = ((unsigned long)b->begin) + blockSize;
@@ -99,7 +99,7 @@ void KZoneAllocator::insertHash(MemBlock *b)
     @param b block to add
     @internal
 */
-void KZoneAllocator::addBlock(MemBlock *b)
+void TDEZoneAllocator::addBlock(MemBlock *b)
 {
   b->newer = 0;
   b->older = currentBlock;
@@ -119,7 +119,7 @@ void KZoneAllocator::addBlock(MemBlock *b)
 }
 
 /** Reinitialize hash list. @internal */
-void KZoneAllocator::initHash()
+void TDEZoneAllocator::initHash()
 {
   if (hashList) {
     for (unsigned int i = 0; i < hashSize; i++)
@@ -145,7 +145,7 @@ void KZoneAllocator::initHash()
     @param b block to delete
     @internal
 */
-void KZoneAllocator::delBlock(MemBlock *b)
+void TDEZoneAllocator::delBlock(MemBlock *b)
 {
   /* Update also the hashlists if we aren't going to reconstruct them
      soon.  */
@@ -181,7 +181,7 @@ void KZoneAllocator::delBlock(MemBlock *b)
 }
 
 void *
-KZoneAllocator::allocate(size_t _size)
+TDEZoneAllocator::allocate(size_t _size)
 {
    // Use the size of (void *) as alignment
    const size_t alignment = sizeof(void *) - 1;
@@ -190,7 +190,7 @@ KZoneAllocator::allocate(size_t _size)
    if ((unsigned long) _size + blockOffset > blockSize)
    {
       if (_size > blockSize) {
-	tqDebug("KZoneAllocator: allocating more than %lu bytes", blockSize);
+	tqDebug("TDEZoneAllocator: allocating more than %lu bytes", blockSize);
 	return 0;
       }
       addBlock(new MemBlock(blockSize));
@@ -204,7 +204,7 @@ KZoneAllocator::allocate(size_t _size)
 }
 
 void
-KZoneAllocator::deallocate(void *ptr)
+TDEZoneAllocator::deallocate(void *ptr)
 {
   if (hashDirty)
     initHash();
@@ -237,7 +237,7 @@ KZoneAllocator::deallocate(void *ptr)
 }
 
 void
-KZoneAllocator::free_since(void *ptr)
+TDEZoneAllocator::free_since(void *ptr)
 {
   /* If we have a hashList and it's not yet dirty, see, if we will dirty
      it by removing too many blocks.  This will make the below delBlock()s
diff --git a/tdecore/kallocator.h b/tdecore/kallocator.h
index abc4c4b64..158fd76a8 100644
--- a/tdecore/kallocator.h
+++ b/tdecore/kallocator.h
@@ -29,7 +29,7 @@
 #include <tqvaluelist.h>
 #include "tdelibs_export.h"
 
-class KZoneAllocatorPrivate;
+class TDEZoneAllocatorPrivate;
 
 
 /**
@@ -43,19 +43,19 @@ class KZoneAllocatorPrivate;
  * memory though.
  * @author Waldo Bastian <bastian@kde.org>, Michael Matz <matz@kde.org>
  */
-class TDECORE_EXPORT KZoneAllocator
+class TDECORE_EXPORT TDEZoneAllocator
 {
 public:
     /**
-     * Creates a KZoneAllocator object.
+     * Creates a TDEZoneAllocator object.
      * @param _blockSize Size in bytes of the blocks requested from malloc.
      */
-    KZoneAllocator(unsigned long _blockSize = 8*1024);
+    TDEZoneAllocator(unsigned long _blockSize = 8*1024);
 
     /**
      * Destructs the ZoneAllocator and free all memory allocated by it.
      */
-    ~KZoneAllocator();
+    ~TDEZoneAllocator();
 
     /**
      * Allocates a memory block.
@@ -78,7 +78,7 @@ public:
      * more time then the normal calls, and that after this list is built, i.e.
      * generally if deallocate() is used at all, also allocate() is a
      * little bit slower.  This means, that if you want to squeeze out the last
-     * bit performance you would want to use KZoneAllocator as an obstack, i.e.
+     * bit performance you would want to use TDEZoneAllocator as an obstack, i.e.
      * just use the functions allocate() and free_since().  All the
      * remaining memory is returned to the system if the zone allocator
      * is destroyed.
@@ -93,7 +93,7 @@ public:
      *
      * The intended use is something along the lines of:
      * \code
-     * KZoneAllocator alloc(8192);
+     * TDEZoneAllocator alloc(8192);
      * void *remember_me = alloc.allocate(0);
      * for (int i = 0; i < 1000; i++)
      *   do_something_with (alloc.allocate(12));
@@ -134,7 +134,7 @@ protected:
     /** Flag the hashes as in need of reorganization. @internal */
     bool hashDirty;
 private:
-    KZoneAllocatorPrivate *d;
+    TDEZoneAllocatorPrivate *d;
 };
 
 #endif
diff --git a/tdecore/kapp.h b/tdecore/kapp.h
index c51c463a0..5d48a852f 100644
--- a/tdecore/kapp.h
+++ b/tdecore/kapp.h
@@ -1,6 +1,6 @@
-// kapp.h is the old name. Use #include <kapplication.h> from now on
+// kapp.h is the old name. Use #include <tdeapplication.h> from now on
 #ifdef KDE_NO_COMPAT
-#error include <kapplication.h> instead of <kapp.h>
+#error include <tdeapplication.h> instead of <kapp.h>
 #else
-#include <kapplication.h>
+#include <tdeapplication.h>
 #endif
diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp
index fc0198d87..ed6e26163 100644
--- a/tdecore/kappdcopiface.cpp
+++ b/tdecore/kappdcopiface.cpp
@@ -18,16 +18,16 @@
 */
 
 #include "kappdcopiface.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 
 
-KAppDCOPInterface::KAppDCOPInterface(KApplication * theKApp)
+KAppDCOPInterface::KAppDCOPInterface(TDEApplication * theKApp)
 	: DCOPObject( "MainApplication-Interface")
 {
-	m_KApplication = theKApp;
+	m_TDEApplication = theKApp;
 }
 
 KAppDCOPInterface::~KAppDCOPInterface()
@@ -51,20 +51,20 @@ TQCString KAppDCOPInterface::caption()
 
 void KAppDCOPInterface::quit()
 {
-	m_KApplication->quit();
+	m_TDEApplication->quit();
 }
 
 void KAppDCOPInterface::updateUserTimestamp( ulong time )
 {
-	m_KApplication->updateUserTimestamp( time );
+	m_TDEApplication->updateUserTimestamp( time );
 }
 
 void KAppDCOPInterface::reparseConfiguration()
 {
-	KGlobal::config()->reparseConfiguration();
+	TDEGlobal::config()->reparseConfiguration();
 }
 
 void KAppDCOPInterface::sendFakeKey( unsigned int keyCode) {
-	m_KApplication->broadcastKeyCode(keyCode);
+	m_TDEApplication->broadcastKeyCode(keyCode);
 }
 
diff --git a/tdecore/kappdcopiface.h b/tdecore/kappdcopiface.h
index 187c9f5ae..164c8b115 100644
--- a/tdecore/kappdcopiface.h
+++ b/tdecore/kappdcopiface.h
@@ -26,12 +26,12 @@
 #include <dcopref.h>
 #include "tdelibs_export.h"
 
-class KApplication;
+class TDEApplication;
 
 /**
-This is the main interface to the KApplication.  This will provide a consistant
+This is the main interface to the TDEApplication.  This will provide a consistant
 dcop interface to all KDE applications that use it.
-@short DCOP interface to KApplication.
+@short DCOP interface to TDEApplication.
 @author Ian Reinhart Geiser <geiseri@yahoo.com>
 */
 class TDECORE_EXPORT KAppDCOPInterface : virtual public DCOPObject
@@ -41,10 +41,10 @@ K_DCOP
 public:
 	/**
 	Construct a new interface object.
-	@param theKapp - The parent KApplication object
+	@param theKapp - The parent TDEApplication object
 	    that will provide us with the functional interface.
 	*/
-	KAppDCOPInterface( KApplication * theKapp );
+	KAppDCOPInterface( TDEApplication * theKapp );
 	/**
 	Destructor
 	Cleans up the dcop connection.
@@ -65,14 +65,14 @@ k_dcop:
 
 	void updateUserTimestamp( ulong time );
 	/**
-	Send a fake keypress to all KApplication instances
+	Send a fake keypress to all TDEApplication instances
 	For internal use in connecting insecure function keys to
 	KDE applications while the X keyboard is locked.
 	**/
 	void sendFakeKey( unsigned int keyCode);
 
 private:
-	KApplication *m_KApplication;
+	TDEApplication *m_TDEApplication;
 };
 
 #endif
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp
index abf0694b4..38bafaef8 100644
--- a/tdecore/kapplication_win.cpp
+++ b/tdecore/kapplication_win.cpp
@@ -17,9 +17,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include "kcheckaccelerators.h"
@@ -32,7 +32,7 @@
 #include "shellapi.h"
 
 /**
- * MS Windows-related actions for KApplication startup.
+ * MS Windows-related actions for TDEApplication startup.
  * 
  * - Use Qt translation which will be usable for TQFileDialog 
  *    and other Qt-only GUIs. The "qt_<language>.qm" file should be stored
@@ -40,10 +40,10 @@
  *
  * @internal
 */
-void KApplication_init_windows(bool /*GUIenabled*/)
+void TDEApplication_init_windows(bool /*GUIenabled*/)
 {
-	TQString qt_transl_file = ::locate( "locale", KGlobal::locale()->language() 
-		+ "/LC_MESSAGES/qt_" + KGlobal::locale()->language() + ".qm" );
+	TQString qt_transl_file = ::locate( "locale", TDEGlobal::locale()->language() 
+		+ "/LC_MESSAGES/qt_" + TDEGlobal::locale()->language() + ".qm" );
 	QTranslator *qt_transl = new QTranslator();
 	if (qt_transl->load( qt_transl_file, ""))
 		kapp->installTranslator( qt_transl );
@@ -54,11 +54,11 @@ void KApplication_init_windows(bool /*GUIenabled*/)
 //unsafe; create kapplication_p.h instead!
 typedef void* IceIOErrorHandler;
 
-class KApplicationPrivate
+class TDEApplicationPrivate
 {
 public:
-  KApplicationPrivate();
-  ~KApplicationPrivate();
+  TDEApplicationPrivate();
+  ~TDEApplicationPrivate();
 
   bool actionRestrictions : 1;
   bool guiEnabled : 1;
@@ -74,12 +74,12 @@ public:
   QAssistantClient* qassistantclient;
 };
 
-void KApplication::invokeHelp( const TQString& anchor,
+void TDEApplication::invokeHelp( const TQString& anchor,
 	const TQString& _appname, const TQCString& startup_id ) const
 {
 	if (!d->qassistantclient) {
 		d->qassistantclient = new QAssistantClient(
-			KStandardDirs::findExe( "assistant" ), 0);
+			TDEStandardDirs::findExe( "assistant" ), 0);
 		TQStringList args;
 		args << "-profile";
 		args << TQDir::convertSeparators( locate("html", TQString(name())+"/"+TQString(name())+".adp") );
@@ -90,14 +90,14 @@ void KApplication::invokeHelp( const TQString& anchor,
 
 // on win32, for invoking browser we're using win32 API
 // see kapplication_win.cpp
-void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
+void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
 {
 	TQCString s = url.latin1();
 	const unsigned short *l = (const unsigned short *)s.data();
 	ShellExecuteA(0, "open", s.data(), 0, 0, SW_NORMAL);
 }
 
-void KApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc,
+void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc,
                                 const TQString &subject, const TQString &body,
                                 const TQString & /*messageFile TODO*/, const TQStringList &attachURLs,
                                 const TQCString& startup_id )
diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp
index 951c41244..2424c95e9 100644
--- a/tdecore/kbufferedio.cpp
+++ b/tdecore/kbufferedio.cpp
@@ -29,7 +29,7 @@
 /**
  * @section impldetails Implementation Details
  *
- * The KBufferedIO class has two purposes: first, it defines an API on how
+ * The TDEBufferedIO class has two purposes: first, it defines an API on how
  * that classes providing buffered I/O should provide. Next, it implements on
  * top of that API a generic buffering, that should suffice for most cases.
  *
@@ -86,7 +86,7 @@
  */
 
 // constructor
-KBufferedIO::KBufferedIO() :
+TDEBufferedIO::TDEBufferedIO() :
   inBufIndex(0), outBufIndex(0)
 {
   inBuf.setAutoDelete(true);
@@ -94,14 +94,14 @@ KBufferedIO::KBufferedIO() :
 }
 
 // destructor
-KBufferedIO::~KBufferedIO()
+TDEBufferedIO::~TDEBufferedIO()
 {
 }
 
 // sets the buffer sizes
 // this implementation doesn't support setting the buffer sizes
 // if any parameter is different than -1 or -2, fail
-bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */)
+bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */)
 {
   if (wsize != -2 && wsize != -1)
     return false;
@@ -112,27 +112,27 @@ bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */)
 }
 
 #ifdef USE_QT3
-int KBufferedIO::bytesAvailable() const
+int TDEBufferedIO::bytesAvailable() const
 #endif // USE_QT3
 #ifdef USE_QT4
-qint64 KBufferedIO::bytesAvailable() const
+qint64 TDEBufferedIO::bytesAvailable() const
 #endif // USE_QT4
 {
   return readBufferSize();
 }
 
 #ifdef USE_QT3
-int KBufferedIO::bytesToWrite() const
+int TDEBufferedIO::bytesToWrite() const
 #endif // USE_QT3
 #ifdef USE_QT4
-qint64 KBufferedIO::bytesToWrite() const
+qint64 TDEBufferedIO::bytesToWrite() const
 #endif // USE_QT4
 {
   return writeBufferSize();
 }
 
 // This function will scan the read buffer for a '\n'
-bool KBufferedIO::canReadLine() const
+bool TDEBufferedIO::canReadLine() const
 {
   if (bytesAvailable() == 0)
     return false;		// no new line in here
@@ -140,7 +140,7 @@ bool KBufferedIO::canReadLine() const
   TQByteArray* buf;
 
   // scan each TQByteArray for the occurrence of '\n'
-  TQPtrList<TQByteArray> &buflist = ((KBufferedIO*)this)->inBuf;
+  TQPtrList<TQByteArray> &buflist = ((TDEBufferedIO*)this)->inBuf;
   buf = buflist.first();
   char *p = buf->data() + inBufIndex;
   int n = buf->size() - inBufIndex;
@@ -162,7 +162,7 @@ bool KBufferedIO::canReadLine() const
 
 // unreads the current data
 // that is, writes into the read buffer, at the beginning
-int KBufferedIO::unreadBlock(const char *data, uint len)
+int TDEBufferedIO::unreadBlock(const char *data, uint len)
 {
   return feedReadBuffer(len, data, true);
 }
@@ -171,7 +171,7 @@ int KBufferedIO::unreadBlock(const char *data, uint len)
 // protected member functions
 //
 
-unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard)
+unsigned TDEBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard)
 {
   {
     register unsigned u = readBufferSize();
@@ -221,7 +221,7 @@ unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool
   return copied;
 }
 
-void KBufferedIO::consumeWriteBuffer(unsigned nbytes)
+void TDEBufferedIO::consumeWriteBuffer(unsigned nbytes)
 {
   TQByteArray *buf = outBuf.first();
   if (buf == NULL)
@@ -250,7 +250,7 @@ void KBufferedIO::consumeWriteBuffer(unsigned nbytes)
     }
 }
 
-unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning)
+unsigned TDEBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning)
 {
   if (nbytes == 0)
     return 0;
@@ -266,7 +266,7 @@ unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool a
   return nbytes;
 }
 
-unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer)
+unsigned TDEBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer)
 {
   if (nbytes == 0)
     return 0;
@@ -277,33 +277,33 @@ unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer)
   return nbytes;
 }
 
-unsigned KBufferedIO::readBufferSize() const
+unsigned TDEBufferedIO::readBufferSize() const
 {
   unsigned count = 0;
-  TQByteArray *buf = ((KBufferedIO*)this)->inBuf.first();
+  TQByteArray *buf = ((TDEBufferedIO*)this)->inBuf.first();
   while (buf != NULL)
     {
       count += buf->size();
-      buf = ((KBufferedIO*)this)->inBuf.next();
+      buf = ((TDEBufferedIO*)this)->inBuf.next();
     }
 
   return count - inBufIndex;
 }
 
-unsigned KBufferedIO::writeBufferSize() const
+unsigned TDEBufferedIO::writeBufferSize() const
 {
   unsigned count = 0;
-  TQByteArray *buf = ((KBufferedIO*)this)->outBuf.first();
+  TQByteArray *buf = ((TDEBufferedIO*)this)->outBuf.first();
   while (buf != NULL)
     {
       count += buf->size();
-      buf = (const_cast<KBufferedIO*>(this))->outBuf.next();
+      buf = (const_cast<TDEBufferedIO*>(this))->outBuf.next();
     }
 
   return count - outBufIndex;
 }
 
-void KBufferedIO::virtual_hook( int id, void* data )
+void TDEBufferedIO::virtual_hook( int id, void* data )
 { KAsyncIO::virtual_hook( id, data ); }
 
 #include "kbufferedio.moc"
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index 78bccc9ef..f00ab52b6 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include "kasyncio.h"
 
-class KBufferedIOPrivate;
+class TDEBufferedIOPrivate;
 /**
  * This abstract class implements basic functionality for buffered
  * input/output.
@@ -39,7 +39,7 @@ class KBufferedIOPrivate;
  * written using QSocket's buffering characteristics will be more easily
  * ported to the more powerful KExtendedSocket class.
  *
- * KBufferedIO already provides a powerful internal buffering algorithm. However,
+ * TDEBufferedIO already provides a powerful internal buffering algorithm. However,
  * this does not include the I/O itself, which must be implemented in
  * derived classes. Thus, to implement a class that does some I/O, you must
  * override, in addition to the pure virtual TQIODevice methods, these two:
@@ -53,14 +53,14 @@ class KBufferedIOPrivate;
  * @author Thiago Macieira <thiagom@mail.com>
  * @short Buffered I/O
  */
-class TDECORE_EXPORT KBufferedIO: public KAsyncIO
+class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO
 {
   Q_OBJECT
   
 
 protected:
   // no default public constructor
-  KBufferedIO();
+  TDEBufferedIO();
 
 public:
   /**
@@ -79,7 +79,7 @@ public:
    * Destroys this class. The flushing of the buffers is implementation dependant.
    * The default implementation discards the contents
    */
-  virtual ~KBufferedIO();
+  virtual ~TDEBufferedIO();
 
   /**
    * Closes the stream now, discarding the contents of the
@@ -294,7 +294,7 @@ protected:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KBufferedIOPrivate *d;
+  TDEBufferedIOPrivate *d;
 };
 
 #endif // KBUFFEREDIO_H
diff --git a/tdecore/kcalendarsystem.cpp b/tdecore/kcalendarsystem.cpp
index 57898da84..20d00d181 100644
--- a/tdecore/kcalendarsystem.cpp
+++ b/tdecore/kcalendarsystem.cpp
@@ -22,18 +22,18 @@
 // systems.
 // Also default gregorian and factory classes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kcalendarsystem.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 class KCalendarSystemPrivate
 {
 public:
-  const KLocale * locale;
+  const TDELocale * locale;
 };
 
-KCalendarSystem::KCalendarSystem(const KLocale * locale)
+KCalendarSystem::KCalendarSystem(const TDELocale * locale)
   : d(new KCalendarSystemPrivate)
 {
   d->locale = locale;
@@ -44,12 +44,12 @@ KCalendarSystem::~KCalendarSystem()
   delete d;
 }
 
-const KLocale * KCalendarSystem::locale() const
+const TDELocale * KCalendarSystem::locale() const
 {
   if ( d->locale )
     return d->locale;
 
-  return KGlobal::locale();
+  return TDEGlobal::locale();
 }
 
 TQString KCalendarSystem::dayString(const TQDate & pDate, bool bShort) const
diff --git a/tdecore/kcalendarsystem.h b/tdecore/kcalendarsystem.h
index bd936336c..bd3fbe4ff 100644
--- a/tdecore/kcalendarsystem.h
+++ b/tdecore/kcalendarsystem.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include "tdelibs_export.h"
 
-class KLocale;
+class TDELocale;
 
 class KCalendarSystemPrivate;
 
@@ -47,7 +47,7 @@ public:
    *
    * @param locale It will use this locale for translations, 0 means global.
    */
-  KCalendarSystem(const KLocale * locale = 0);
+  KCalendarSystem(const TDELocale * locale = 0);
 
   /**
    * Descructor.
@@ -348,7 +348,7 @@ protected:
    * Gets the locale the calendar uses for translations. Set in
    * the constructor.
    */
-  const KLocale * locale() const;
+  const TDELocale * locale() const;
 
 private:
   KCalendarSystemPrivate * d;
diff --git a/tdecore/kcalendarsystemfactory.cpp b/tdecore/kcalendarsystemfactory.cpp
index 723873497..d3bd166e0 100644
--- a/tdecore/kcalendarsystemfactory.cpp
+++ b/tdecore/kcalendarsystemfactory.cpp
@@ -41,7 +41,7 @@ KCalendarSystemFactory::~KCalendarSystemFactory()
 }
 
 KCalendarSystem *KCalendarSystemFactory::create( const TQString &calType,
-                                                 const KLocale * locale )
+                                                 const TDELocale * locale )
 {
   if ( calType == "hebrew" )
     return new KCalendarSystemHebrew(locale);
diff --git a/tdecore/kcalendarsystemfactory.h b/tdecore/kcalendarsystemfactory.h
index 6ebba1573..96aef1c4a 100644
--- a/tdecore/kcalendarsystemfactory.h
+++ b/tdecore/kcalendarsystemfactory.h
@@ -26,7 +26,7 @@
 #include "tdelibs_export.h"
 
 class KCalendarSystem;
-class KLocale;
+class TDELocale;
 
 /**
  * Factory class for calendar types
@@ -50,7 +50,7 @@ public:
    * @return a KCalendarSystem object
    */
   static KCalendarSystem *create (const TQString & calType = TQString::fromLatin1("gregorian"),
-                                  const KLocale * locale = 0);
+                                  const TDELocale * locale = 0);
 
   /**
    * Gets list of names of supported calendar systems
diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp
index 38ee1014a..9d4d14661 100644
--- a/tdecore/kcalendarsystemgregorian.cpp
+++ b/tdecore/kcalendarsystemgregorian.cpp
@@ -24,12 +24,12 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemgregorian.h"
 
-KCalendarSystemGregorian::KCalendarSystemGregorian(const KLocale * locale)
+KCalendarSystemGregorian::KCalendarSystemGregorian(const TDELocale * locale)
   : KCalendarSystem(locale)
 {
 }
diff --git a/tdecore/kcalendarsystemgregorian.h b/tdecore/kcalendarsystemgregorian.h
index 98fd10e90..34c9ecde3 100644
--- a/tdecore/kcalendarsystemgregorian.h
+++ b/tdecore/kcalendarsystemgregorian.h
@@ -35,7 +35,7 @@ class KCalendarSystemGregorianPrivate;
  * The Gregorian calender is the most used calendar today. The first year in
  * the calendar is set to the birth of Christ.
  *
- * @see KLocale,KCalendarSystem,KCalendarSystemFactory
+ * @see TDELocale,KCalendarSystem,KCalendarSystemFactory
  *
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
@@ -44,7 +44,7 @@ class TDECORE_EXPORT KCalendarSystemGregorian: public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
-  KCalendarSystemGregorian (const KLocale * locale = 0);
+  KCalendarSystemGregorian (const TDELocale * locale = 0);
   virtual ~KCalendarSystemGregorian ();
 
   virtual int year (const TQDate & date) const;
diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp
index 2824445bb..2f0aa111a 100644
--- a/tdecore/kcalendarsystemhebrew.cpp
+++ b/tdecore/kcalendarsystemhebrew.cpp
@@ -21,7 +21,7 @@
 
 // Derived hebrew kde calendar class
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemhebrew.h"
@@ -259,7 +259,7 @@ static bool is_leap_year(int year)
 }
 
 // Ok
-KCalendarSystemHebrew::KCalendarSystemHebrew(const KLocale * locale)
+KCalendarSystemHebrew::KCalendarSystemHebrew(const TDELocale * locale)
   : KCalendarSystem(locale)
 {
 }
diff --git a/tdecore/kcalendarsystemhebrew.h b/tdecore/kcalendarsystemhebrew.h
index 728954c58..1482c1a80 100644
--- a/tdecore/kcalendarsystemhebrew.h
+++ b/tdecore/kcalendarsystemhebrew.h
@@ -37,7 +37,7 @@ class KCalendarSystemHebrewPrivate;
  * The Hebrew calendar is the traditional Islamic calendar used in the Midle
  * East.
  *
- * @see KLocale,KCalendarSystem,KCalendarSystemFactory
+ * @see TDELocale,KCalendarSystem,KCalendarSystemFactory
  *
  * @author Hans Petter Bieker <bieker@kde.org>
  * @since 3.2
@@ -46,7 +46,7 @@ class TDECORE_EXPORT KCalendarSystemHebrew : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
-  KCalendarSystemHebrew(const KLocale * locale = 0);
+  KCalendarSystemHebrew(const TDELocale * locale = 0);
   virtual ~KCalendarSystemHebrew();
 
   virtual int year (const TQDate & date) const;
diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp
index a6487060e..cc66805e0 100644
--- a/tdecore/kcalendarsystemhijri.cpp
+++ b/tdecore/kcalendarsystemhijri.cpp
@@ -23,7 +23,7 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemhijri.h"
@@ -178,7 +178,7 @@ static void gregorianToHijri(const TQDate & date, int * pYear, int * pMonth,
     *pDay = islamic.getDay();
 }
 
-KCalendarSystemHijri::KCalendarSystemHijri(const KLocale * locale)
+KCalendarSystemHijri::KCalendarSystemHijri(const TDELocale * locale)
   : KCalendarSystem(locale)
 {
 }
diff --git a/tdecore/kcalendarsystemhijri.h b/tdecore/kcalendarsystemhijri.h
index 444f938c7..0ba1e52df 100644
--- a/tdecore/kcalendarsystemhijri.h
+++ b/tdecore/kcalendarsystemhijri.h
@@ -35,7 +35,7 @@ class KCalendarSystemHijriPrivate;
  * The Hijri calendar is the traditional Islamic calendar used in the Midle
  * East.
  *
- * @see KLocale,KCalendarSystem,KCalendarSystemFactory
+ * @see TDELocale,KCalendarSystem,KCalendarSystemFactory
  *
  * @author Carlos Moro <cfmoro@correo.uniovi.es>
  * @since 3.2
@@ -44,7 +44,7 @@ class TDECORE_EXPORT KCalendarSystemHijri : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
-  KCalendarSystemHijri(const KLocale * locale = 0);
+  KCalendarSystemHijri(const TDELocale * locale = 0);
   virtual ~KCalendarSystemHijri();
 
   virtual int year (const TQDate & date) const;
diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp
index 29798a1dd..631693e45 100644
--- a/tdecore/kcalendarsystemjalali.cpp
+++ b/tdecore/kcalendarsystemjalali.cpp
@@ -26,8 +26,8 @@
 #include <tqstringlist.h>
 #include <math.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <stdio.h>
 
@@ -200,7 +200,7 @@ static int hndays(int m,int y)
 }
 
 
-KCalendarSystemJalali::KCalendarSystemJalali(const KLocale * locale)
+KCalendarSystemJalali::KCalendarSystemJalali(const TDELocale * locale)
   : KCalendarSystem(locale)
 {
 }
diff --git a/tdecore/kcalendarsystemjalali.h b/tdecore/kcalendarsystemjalali.h
index e5dd56681..8f9c4ddb9 100644
--- a/tdecore/kcalendarsystemjalali.h
+++ b/tdecore/kcalendarsystemjalali.h
@@ -37,7 +37,7 @@ class TDECORE_EXPORT KCalendarSystemJalali : public KCalendarSystem
 {
 public:
   /** Constructor. Just like KCalendarSystem::KCalendarSystem(). */
-  KCalendarSystemJalali(const KLocale * locale = 0);
+  KCalendarSystemJalali(const TDELocale * locale = 0);
   virtual ~KCalendarSystemJalali();
 
 
diff --git a/tdecore/kcatalogue.h b/tdecore/kcatalogue.h
index be918789d..04ba4594b 100644
--- a/tdecore/kcatalogue.h
+++ b/tdecore/kcatalogue.h
@@ -31,7 +31,7 @@ class KCataloguePrivate;
  * This class abstracts a gettext message catalog. It will take care of
  * opening the file and reading the catalog.
  *
- * @see KLocale
+ * @see TDELocale
  */
 //REVISED: hausmann
 class TDECORE_EXPORT KCatalogue
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index 52cf87849..23786c53e 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -21,10 +21,10 @@
 #include "kqiodevicegzip_p.h"
 #include "kentities.c"
 
-#include <kapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 
 #include <tqfontinfo.h>
 #include <tqstrlist.h>
@@ -535,7 +535,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
         return codec; // cache hit, return
 
     if (n.isEmpty()) {
-        codec = KGlobal::locale()->codecForEncoding();
+        codec = TDEGlobal::locale()->codecForEncoding();
         d->codecForNameDict.replace("->locale<-", codec);
         return codec;
     }
@@ -572,8 +572,8 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
 
     TQString dir;
     {
-    KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" );
-    dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps"));
+    TDEConfigGroupSaver cfgsav( TDEGlobal::config(), "i18n" );
+    dir = TDEGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps"));
     }
 
     // these are codecs not included in Qt. They can be build up if the corresponding charmap
diff --git a/tdecore/kcharsets.h b/tdecore/kcharsets.h
index 2816e4fcd..da96643ff 100644
--- a/tdecore/kcharsets.h
+++ b/tdecore/kcharsets.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KGlobal;
+class TDEGlobal;
 class KCharsetsPrivate;
 
 class TQTextCodec;
@@ -42,11 +42,11 @@ class TQTextCodec;
  */
 class TDECORE_EXPORT KCharsets
 {
-    friend class KGlobal;
+    friend class TDEGlobal;
 
 protected:
     /** Protected constructor. If you need the kcharsets object, use
- KGlobal::charsets() instead.
+ TDEGlobal::charsets() instead.
     */
     KCharsets();
 
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index 06337485c..306591e67 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "kcheckaccelerators.h"
-#include "kaccelmanager.h"
+#include "tdeaccelmanager.h"
 #include <tqpopupmenu.h>
 #include <tqapplication.h>
 #include <tqdialog.h>
@@ -39,11 +39,11 @@
 #include <tqmetaobject.h>
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kshortcut.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeshortcut.h>
+#include <tdelocale.h>
 
 /*
 
@@ -80,15 +80,15 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent )
     : TQObject( parent, "kapp_accel_filter" ), key(0), block( false ), drklash(0)
 {
     parent->installEventFilter( this );
-    KConfigGroupSaver saver( KGlobal::config(), "Development" );
-    TQString sKey = KGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace();
+    TDEConfigGroupSaver saver( TDEGlobal::config(), "Development" );
+    TQString sKey = TDEGlobal::config()->readEntry( "CheckAccelerators" ).stripWhiteSpace();
     if( !sKey.isEmpty() ) {
-      KShortcut cuts( sKey );
+      TDEShortcut cuts( sKey );
       if( cuts.count() > 0 )
         key = int(cuts.seq(0).qt());
     }
-    alwaysShow = KGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false );
-    autoCheck = KGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true );
+    alwaysShow = TDEGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false );
+    autoCheck = TDEGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true );
     connect( &autoCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( autoCheckSlot()));
 }
 
@@ -177,9 +177,9 @@ void KCheckAccelerators::checkAccelerators( bool automatic )
     if ( !actWin )
         return;
 
-    KAcceleratorManager::manage(actWin);
+    TDEAcceleratorManager::manage(actWin);
     TQString a, c, r;
-    KAcceleratorManager::last_manage(a, c,  r);
+    TDEAcceleratorManager::last_manage(a, c,  r);
 
     if (automatic) // for now we only show dialogs on F12 checks
         return;
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 1e3cafbae..8ab23cccc 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -16,9 +16,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 
 #include "kclipboard.h"
 
@@ -38,7 +38,7 @@
  *  especially the second one.
  */
 
-class KClipboardSynchronizer::MimeSource : public TQMimeSource
+class TDEClipboardSynchronizer::MimeSource : public TQMimeSource
 {
 public:
     MimeSource( const TQMimeSource * src )
@@ -89,25 +89,25 @@ private:
 };
 
 
-KClipboardSynchronizer * KClipboardSynchronizer::s_self = 0L;
-bool KClipboardSynchronizer::s_sync = false;
-bool KClipboardSynchronizer::s_reverse_sync = false;
-bool KClipboardSynchronizer::s_blocked = false;
+TDEClipboardSynchronizer * TDEClipboardSynchronizer::s_self = 0L;
+bool TDEClipboardSynchronizer::s_sync = false;
+bool TDEClipboardSynchronizer::s_reverse_sync = false;
+bool TDEClipboardSynchronizer::s_blocked = false;
 
-KClipboardSynchronizer * KClipboardSynchronizer::self()
+TDEClipboardSynchronizer * TDEClipboardSynchronizer::self()
 {
     if ( !s_self )
-        s_self = new KClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" );
+        s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" );
 
     return s_self;
 }
 
-KClipboardSynchronizer::KClipboardSynchronizer( TQObject *parent, const char *name )
+TDEClipboardSynchronizer::TDEClipboardSynchronizer( TQObject *parent, const char *name )
     : TQObject( parent, name )
 {
     s_self = this;
 
-    KConfigGroup config( KGlobal::config(), "General" );
+    TDEConfigGroup config( TDEGlobal::config(), "General" );
     s_sync = config.readBoolEntry( "SynchronizeClipboardAndSelection", s_sync);
     s_reverse_sync = config.readBoolEntry( "ClipboardSetSelection",
                                                 s_reverse_sync );
@@ -115,13 +115,13 @@ KClipboardSynchronizer::KClipboardSynchronizer( TQObject *parent, const char *na
     setupSignals();
 }
 
-KClipboardSynchronizer::~KClipboardSynchronizer()
+TDEClipboardSynchronizer::~TDEClipboardSynchronizer()
 {
     if ( s_self == this )
         s_self = 0L;
 }
 
-void KClipboardSynchronizer::setupSignals()
+void TDEClipboardSynchronizer::setupSignals()
 {
     TQClipboard *clip = TQApplication::clipboard();
     disconnect( clip, NULL, this, NULL );
@@ -133,7 +133,7 @@ void KClipboardSynchronizer::setupSignals()
                  TQT_SLOT( slotClipboardChanged() ));
 }
 
-void KClipboardSynchronizer::slotSelectionChanged()
+void TDEClipboardSynchronizer::slotSelectionChanged()
 {
     TQClipboard *clip = TQApplication::clipboard();
 
@@ -145,7 +145,7 @@ void KClipboardSynchronizer::slotSelectionChanged()
                   TQClipboard::Clipboard );
 }
 
-void KClipboardSynchronizer::slotClipboardChanged()
+void TDEClipboardSynchronizer::slotClipboardChanged()
 {
     TQClipboard *clip = TQApplication::clipboard();
 
@@ -157,7 +157,7 @@ void KClipboardSynchronizer::slotClipboardChanged()
                   TQClipboard::Selection );
 }
 
-void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode mode )
+void TDEClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode mode )
 {
 //     tqDebug("---> setting clipboard: %p", data);
 
@@ -177,20 +177,20 @@ void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode
     s_blocked = false;
 }
 
-void KClipboardSynchronizer::setSynchronizing( bool sync )
+void TDEClipboardSynchronizer::setSynchronizing( bool sync )
 {
     s_sync = sync;
     self()->setupSignals();
 }
 
-void KClipboardSynchronizer::setReverseSynchronizing( bool enable )
+void TDEClipboardSynchronizer::setReverseSynchronizing( bool enable )
 {
     s_reverse_sync = enable;
     self()->setupSignals();
 }
 
-// private, called by KApplication
-void KClipboardSynchronizer::newConfiguration( int config )
+// private, called by TDEApplication
+void TDEClipboardSynchronizer::newConfiguration( int config )
 {
     s_sync = (config & Synchronize);
     self()->setupSignals();
diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h
index 7facc86fd..8ed8dcc91 100644
--- a/tdecore/kclipboard.h
+++ b/tdecore/kclipboard.h
@@ -33,23 +33,23 @@
  * @since 3.1
  * @internal
  */
-class TDECORE_EXPORT KClipboardSynchronizer : public TQObject
+class TDECORE_EXPORT TDEClipboardSynchronizer : public TQObject
 {
     Q_OBJECT
 
 public:
     /** Systray widget for manipulating the clipboard. */
     friend class KlipperWidget;
-    friend class KApplication;
+    friend class TDEApplication;
 
     /**
-     * Returns the KClipboardSynchronizer singleton object.
-     * @return the KClipboardSynchronizer singleton object.
+     * Returns the TDEClipboardSynchronizer singleton object.
+     * @return the TDEClipboardSynchronizer singleton object.
      */
-    static KClipboardSynchronizer *self();
+    static TDEClipboardSynchronizer *self();
 
     /**
-     * Configures KClipboardSynchronizer to synchronize the Selection to Clipboard whenever
+     * Configures TDEClipboardSynchronizer to synchronize the Selection to Clipboard whenever
      * it changes.
      *
      * Default is false.
@@ -69,7 +69,7 @@ public:
     }
 
     /**
-     * Configures KClipboardSynchronizer to copy the Clipboard buffer to the Selection
+     * Configures TDEClipboardSynchronizer to copy the Clipboard buffer to the Selection
      * buffer whenever the Clipboard changes.
      *
      *
@@ -93,19 +93,19 @@ public:
 
 
 protected:
-    ~KClipboardSynchronizer();
+    ~TDEClipboardSynchronizer();
 
 private slots:
     void slotSelectionChanged();
     void slotClipboardChanged();
 
 private:
-    KClipboardSynchronizer( TQObject *parent = 0, const char *name = 0L );
+    TDEClipboardSynchronizer( TQObject *parent = 0, const char *name = 0L );
     void setupSignals();
 
     static void setClipboard( TQMimeSource* data, TQClipboard::Mode mode );
 
-    static KClipboardSynchronizer *s_self;
+    static TDEClipboardSynchronizer *s_self;
     static bool s_sync;
     static bool s_reverse_sync;
     static bool s_blocked;
@@ -115,7 +115,7 @@ private:
 private:
     // needed by klipper
     enum Configuration { Synchronize = 1 };
-    // called by KApplication upon kipc message, invoked by klipper
+    // called by TDEApplication upon kipc message, invoked by klipper
     static void newConfiguration( int config );
 
 };
diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp
index f74c0460c..4a80d85df 100644
--- a/tdecore/kcompletion.cpp
+++ b/tdecore/kcompletion.cpp
@@ -18,11 +18,11 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqptrvector.h>
 
@@ -30,20 +30,20 @@
 #include "kcompletion_private.h"
 
 
-class KCompletionPrivate
+class TDECompletionPrivate
 {
 public:
     // not a member to avoid #including kcompletion_private.h from kcompletion.h
     // list used for nextMatch() and previousMatch()
-    KCompletionMatchesWrapper matches;
+    TDECompletionMatchesWrapper matches;
 };
 
-KCompletion::KCompletion()
+TDECompletion::TDECompletion()
 {
-    d = new KCompletionPrivate;
+    d = new TDECompletionPrivate;
 
-    myCompletionMode = KGlobalSettings::completionMode();
-    myTreeRoot = new KCompTreeNode;
+    myCompletionMode = TDEGlobalSettings::completionMode();
+    myTreeRoot = new TDECompTreeNode;
     myBeep       = true;
     myIgnoreCase = false;
     myHasMultipleMatches = false;
@@ -51,31 +51,31 @@ KCompletion::KCompletion()
     setOrder( Insertion );
 }
 
-KCompletion::~KCompletion()
+TDECompletion::~TDECompletion()
 {
     delete d;
     delete myTreeRoot;
 }
 
-void KCompletion::setOrder( CompOrder order )
+void TDECompletion::setOrder( CompOrder order )
 {
     myOrder = order;
     d->matches.setSorting( order == Weighted );
 }
 
-void KCompletion::setIgnoreCase( bool ignoreCase )
+void TDECompletion::setIgnoreCase( bool ignoreCase )
 {
     myIgnoreCase = ignoreCase;
 }
 
-void KCompletion::setItems( const TQStringList& items )
+void TDECompletion::setItems( const TQStringList& items )
 {
     clear();
     insertItems( items );
 }
 
 
-void KCompletion::insertItems( const TQStringList& items )
+void TDECompletion::insertItems( const TQStringList& items )
 {
     bool weighted = (myOrder == Weighted);
     TQStringList::ConstIterator it;
@@ -89,21 +89,21 @@ void KCompletion::insertItems( const TQStringList& items )
     }
 }
 
-TQStringList KCompletion::items() const
+TQStringList TDECompletion::items() const
 {
-    KCompletionMatchesWrapper list; // unsorted
+    TDECompletionMatchesWrapper list; // unsorted
     bool addWeight = (myOrder == Weighted);
     extractStringsFromNode( myTreeRoot, TQString::null, &list, addWeight );
 
     return list.list();
 }
 
-bool KCompletion::isEmpty() const
+bool TDECompletion::isEmpty() const
 {
   return (myTreeRoot->childrenCount() == 0);
 }
 
-void KCompletion::addItem( const TQString& item )
+void TDECompletion::addItem( const TQString& item )
 {
     d->matches.clear();
     myRotationIndex = 0;
@@ -112,12 +112,12 @@ void KCompletion::addItem( const TQString& item )
     addItem( item, 0 );
 }
 
-void KCompletion::addItem( const TQString& item, uint weight )
+void TDECompletion::addItem( const TQString& item, uint weight )
 {
     if ( item.isEmpty() )
         return;
 
-    KCompTreeNode *node = myTreeRoot;
+    TDECompTreeNode *node = myTreeRoot;
     uint len = item.length();
 
     bool sorted = (myOrder == Sorted);
@@ -139,7 +139,7 @@ void KCompletion::addItem( const TQString& item, uint weight )
 //     tqDebug("*** added: %s (%i)", item.latin1(), node->weight());
 }
 
-void KCompletion::addWeightedItem( const TQString& item )
+void TDECompletion::addWeightedItem( const TQString& item )
 {
     if ( myOrder != Weighted ) {
         addItem( item, 0 );
@@ -165,7 +165,7 @@ void KCompletion::addWeightedItem( const TQString& item )
 }
 
 
-void KCompletion::removeItem( const TQString& item )
+void TDECompletion::removeItem( const TQString& item )
 {
     d->matches.clear();
     myRotationIndex = 0;
@@ -175,23 +175,23 @@ void KCompletion::removeItem( const TQString& item )
 }
 
 
-void KCompletion::clear()
+void TDECompletion::clear()
 {
     d->matches.clear();
     myRotationIndex = 0;
     myLastString = TQString::null;
 
     delete myTreeRoot;
-    myTreeRoot = new KCompTreeNode;
+    myTreeRoot = new TDECompTreeNode;
 }
 
 
-TQString KCompletion::makeCompletion( const TQString& string )
+TQString TDECompletion::makeCompletion( const TQString& string )
 {
-    if ( myCompletionMode == KGlobalSettings::CompletionNone )
+    if ( myCompletionMode == TDEGlobalSettings::CompletionNone )
         return TQString::null;
 
-    //kdDebug(0) << "KCompletion: completing: " << string << endl;
+    //kdDebug(0) << "TDECompletion: completing: " << string << endl;
 
     d->matches.clear();
     myRotationIndex = 0;
@@ -200,7 +200,7 @@ TQString KCompletion::makeCompletion( const TQString& string )
 
     // in Shell-completion-mode, emit all matches when we get the same
     // complete-string twice
-    if ( myCompletionMode == KGlobalSettings::CompletionShell &&
+    if ( myCompletionMode == TDEGlobalSettings::CompletionShell &&
          string == myLastString ) {
         // Don't use d->matches since calling postProcessMatches()
         // on d->matches here would interfere with call to
@@ -219,8 +219,8 @@ TQString KCompletion::makeCompletion( const TQString& string )
 
     TQString completion;
     // in case-insensitive popup mode, we search all completions at once
-    if ( myCompletionMode == KGlobalSettings::CompletionPopup ||
-         myCompletionMode == KGlobalSettings::CompletionPopupAuto ) {
+    if ( myCompletionMode == TDEGlobalSettings::CompletionPopup ||
+         myCompletionMode == TDEGlobalSettings::CompletionPopupAuto ) {
         findAllCompletions( string, &d->matches, myHasMultipleMatches );
         if ( !d->matches.isEmpty() )
             completion = d->matches.first();
@@ -237,7 +237,7 @@ TQString KCompletion::makeCompletion( const TQString& string )
     postProcessMatch( &completion );
 
     if ( !string.isEmpty() ) { // only emit match when string is not empty
-        //kdDebug(0) << "KCompletion: Match: " << completion << endl;
+        //kdDebug(0) << "TDECompletion: Match: " << completion << endl;
         emit match( completion );
     }
 
@@ -248,11 +248,11 @@ TQString KCompletion::makeCompletion( const TQString& string )
 }
 
 
-TQStringList KCompletion::substringCompletion( const TQString& string ) const
+TQStringList TDECompletion::substringCompletion( const TQString& string ) const
 {
     // get all items in the tree, possibly in sorted order
     bool sorted = (myOrder == Weighted);
-    KCompletionMatchesWrapper allItems( sorted );
+    TDECompletionMatchesWrapper allItems( sorted );
     extractStringsFromNode( myTreeRoot, TQString::null, &allItems, false );
 
     TQStringList list = allItems.list();
@@ -288,17 +288,17 @@ TQStringList KCompletion::substringCompletion( const TQString& string ) const
 }
 
 
-void KCompletion::setCompletionMode( KGlobalSettings::Completion mode )
+void TDECompletion::setCompletionMode( TDEGlobalSettings::Completion mode )
 {
     myCompletionMode = mode;
 }
 
-TQStringList KCompletion::allMatches()
+TQStringList TDECompletion::allMatches()
 {
     // Don't use d->matches since calling postProcessMatches()
     // on d->matches here would interfere with call to
     // postProcessMatch() during rotation
-    KCompletionMatchesWrapper matches( myOrder == Weighted );
+    TDECompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
     findAllCompletions( myLastString, &matches, dummy );
     TQStringList l = matches.list();
@@ -306,22 +306,22 @@ TQStringList KCompletion::allMatches()
     return l;
 }
 
-KCompletionMatches KCompletion::allWeightedMatches()
+TDECompletionMatches TDECompletion::allWeightedMatches()
 {
     // Don't use d->matches since calling postProcessMatches()
     // on d->matches here would interfere with call to
     // postProcessMatch() during rotation
-    KCompletionMatchesWrapper matches( myOrder == Weighted );
+    TDECompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
     findAllCompletions( myLastString, &matches, dummy );
-    KCompletionMatches ret( matches );
+    TDECompletionMatches ret( matches );
     postProcessMatches( &ret );
     return ret;
 }
 
-TQStringList KCompletion::allMatches( const TQString &string )
+TQStringList TDECompletion::allMatches( const TQString &string )
 {
-    KCompletionMatchesWrapper matches( myOrder == Weighted );
+    TDECompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
     findAllCompletions( string, &matches, dummy );
     TQStringList l = matches.list();
@@ -329,12 +329,12 @@ TQStringList KCompletion::allMatches( const TQString &string )
     return l;
 }
 
-KCompletionMatches KCompletion::allWeightedMatches( const TQString &string )
+TDECompletionMatches TDECompletion::allWeightedMatches( const TQString &string )
 {
-    KCompletionMatchesWrapper matches( myOrder == Weighted );
+    TDECompletionMatchesWrapper matches( myOrder == Weighted );
     bool dummy;
     findAllCompletions( string, &matches, dummy );
-    KCompletionMatches ret( matches );
+    TDECompletionMatches ret( matches );
     postProcessMatches( &ret );
     return ret;
 }
@@ -343,7 +343,7 @@ KCompletionMatches KCompletion::allWeightedMatches( const TQString &string )
 ///////////////// tree operations ///////////////////
 
 
-TQString KCompletion::nextMatch()
+TQString TDECompletion::nextMatch()
 {
     TQString completion;
     myLastMatch = myCurrentMatch;
@@ -376,7 +376,7 @@ TQString KCompletion::nextMatch()
 
 
 
-TQString KCompletion::previousMatch()
+TQString TDECompletion::previousMatch()
 {
     TQString completion;
     myLastMatch = myCurrentMatch;
@@ -411,11 +411,11 @@ TQString KCompletion::previousMatch()
 
 
 // tries to complete "string" from the tree-root
-TQString KCompletion::findCompletion( const TQString& string )
+TQString TDECompletion::findCompletion( const TQString& string )
 {
     TQChar ch;
     TQString completion;
-    const KCompTreeNode *node = myTreeRoot;
+    const TDECompTreeNode *node = myTreeRoot;
 
     // start at the tree-root and try to find the search-string
     for( uint i = 0; i < string.length(); i++ ) {
@@ -442,7 +442,7 @@ TQString KCompletion::findCompletion( const TQString& string )
     if ( node && node->childrenCount() > 1 ) {
         myHasMultipleMatches = true;
     
-        if ( myCompletionMode == KGlobalSettings::CompletionAuto ) {
+        if ( myCompletionMode == TDEGlobalSettings::CompletionAuto ) {
             myRotationIndex = 1;
             if (myOrder != Weighted) {
                 while ( (node = node->firstChild()) ) {
@@ -456,12 +456,12 @@ TQString KCompletion::findCompletion( const TQString& string )
                 // don't just find the "first" match, but the one with the
                 // highest priority
         
-                const KCompTreeNode* temp_node = 0L;
+                const TDECompTreeNode* temp_node = 0L;
                 while(1) {
                     int count = node->childrenCount();
                     temp_node = node->firstChild();
                     uint weight = temp_node->weight();
-                    const KCompTreeNode* hit = temp_node;
+                    const TDECompTreeNode* hit = temp_node;
                     for( int i = 1; i < count; i++ ) {
                         temp_node = node->childAt(i);
                         if( temp_node->weight() > weight ) {
@@ -487,8 +487,8 @@ TQString KCompletion::findCompletion( const TQString& string )
 }
 
 
-void KCompletion::findAllCompletions(const TQString& string,
-                                     KCompletionMatchesWrapper *matches,
+void TDECompletion::findAllCompletions(const TQString& string,
+                                     TDECompletionMatchesWrapper *matches,
                                      bool& hasMultipleMatches) const
 {
     //kdDebug(0) << "*** finding all completions for " << string << endl;
@@ -504,7 +504,7 @@ void KCompletion::findAllCompletions(const TQString& string,
 
     TQChar ch;
     TQString completion;
-    const KCompTreeNode *node = myTreeRoot;
+    const TDECompTreeNode *node = myTreeRoot;
 
     // start at the tree-root and try to find the search-string
     for( uint i = 0; i < string.length(); i++ ) {
@@ -542,21 +542,21 @@ void KCompletion::findAllCompletions(const TQString& string,
 }
 
 
-void KCompletion::extractStringsFromNode( const KCompTreeNode *node,
+void TDECompletion::extractStringsFromNode( const TDECompTreeNode *node,
                                           const TQString& beginning,
-                                          KCompletionMatchesWrapper *matches,
+                                          TDECompletionMatchesWrapper *matches,
                                           bool addWeight ) const
 {
     if ( !node || !matches )
         return;
 
     // kDebug() << "Beginning: " << beginning << endl;
-    const KCompTreeChildren *list = node->children();
+    const TDECompTreeChildren *list = node->children();
     TQString string;
     TQString w;
 
     // loop thru all children
-    for ( KCompTreeNode *cur = list->begin(); cur ; cur = cur->next) {
+    for ( TDECompTreeNode *cur = list->begin(); cur ; cur = cur->next) {
         string = beginning;
         node = cur;
         if ( !node->isNull() )
@@ -585,10 +585,10 @@ void KCompletion::extractStringsFromNode( const KCompTreeNode *node,
     }
 }
 
-void KCompletion::extractStringsFromNodeCI( const KCompTreeNode *node,
+void TDECompletion::extractStringsFromNodeCI( const TDECompTreeNode *node,
                                             const TQString& beginning,
                                             const TQString& restString,
-                                            KCompletionMatchesWrapper *matches ) const
+                                            TDECompletionMatchesWrapper *matches ) const
 {
     if ( restString.isEmpty() ) {
         extractStringsFromNode( node, beginning, matches, false /*noweight*/ );
@@ -597,7 +597,7 @@ void KCompletion::extractStringsFromNodeCI( const KCompTreeNode *node,
 
     TQChar ch1 = restString.at(0);
     TQString newRest = restString.mid(1);
-    KCompTreeNode *child1, *child2;
+    TDECompTreeNode *child1, *child2;
 
     child1 = node->find( ch1 ); // the correct match
     if ( child1 )
@@ -619,7 +619,7 @@ void KCompletion::extractStringsFromNodeCI( const KCompTreeNode *node,
     }
 }
 
-void KCompletion::doBeep( BeepMode mode ) const
+void TDECompletion::doBeep( BeepMode mode ) const
 {
     if ( !myBeep )
         return;
@@ -632,14 +632,14 @@ void KCompletion::doBeep( BeepMode mode ) const
             text = i18n("You reached the end of the list\nof matching items.\n");
             break;
         case PartialMatch:
-            if ( myCompletionMode == KGlobalSettings::CompletionShell ||
-                 myCompletionMode == KGlobalSettings::CompletionMan ) {
+            if ( myCompletionMode == TDEGlobalSettings::CompletionShell ||
+                 myCompletionMode == TDEGlobalSettings::CompletionMan ) {
                 event = TQString::fromLatin1("Textcompletion: partial match");
                 text = i18n("The completion is ambiguous, more than one\nmatch is available.\n");
             }
             break;
         case NoMatch:
-            if ( myCompletionMode == KGlobalSettings::CompletionShell ) {
+            if ( myCompletionMode == TDEGlobalSettings::CompletionShell ) {
                 event = TQString::fromLatin1("Textcompletion: no match");
                 text = i18n("There is no matching item available.\n");
             }
@@ -660,12 +660,12 @@ void KCompletion::doBeep( BeepMode mode ) const
 // TQChar( 0x0 ) is used as the delimiter of a string; the last child of each
 // inserted string is 0x0.
 
-KCompTreeNode::~KCompTreeNode()
+TDECompTreeNode::~TDECompTreeNode()
 {
     // delete all children
-    KCompTreeNode *cur = myChildren.begin();
+    TDECompTreeNode *cur = myChildren.begin();
     while (cur) {
-        KCompTreeNode * next = cur->next;
+        TDECompTreeNode * next = cur->next;
         delete myChildren.remove(cur);
         cur = next;
     }
@@ -674,16 +674,16 @@ KCompTreeNode::~KCompTreeNode()
 
 // Adds a child-node "ch" to this node. If such a node is already existant,
 // it will not be created. Returns the new/existing node.
-KCompTreeNode * KCompTreeNode::insert( const TQChar& ch, bool sorted )
+TDECompTreeNode * TDECompTreeNode::insert( const TQChar& ch, bool sorted )
 {
-    KCompTreeNode *child = find( ch );
+    TDECompTreeNode *child = find( ch );
     if ( !child ) {
-        child = new KCompTreeNode( ch );
+        child = new TDECompTreeNode( ch );
 
         // FIXME, first (slow) sorted insertion implementation
         if ( sorted ) {
-            KCompTreeNode * prev = 0;
-            KCompTreeNode * cur = myChildren.begin();
+            TDECompTreeNode * prev = 0;
+            TDECompTreeNode * cur = myChildren.begin();
             while ( cur ) {
                 if ( ch > *cur ) {
                     prev = cur;
@@ -711,15 +711,15 @@ KCompTreeNode * KCompTreeNode::insert( const TQChar& ch, bool sorted )
 
 // Iteratively removes a string from the tree. The nicer recursive
 // version apparently was a little memory hungry (see #56757)
-void KCompTreeNode::remove( const TQString& str )
+void TDECompTreeNode::remove( const TQString& str )
 {
     TQString string = str;
     string += TQChar(0x0);
 
-    TQPtrVector<KCompTreeNode> deletables( string.length() + 1 );
+    TQPtrVector<TDECompTreeNode> deletables( string.length() + 1 );
 
-    KCompTreeNode *child = 0L;
-    KCompTreeNode *parent = this;
+    TDECompTreeNode *child = 0L;
+    TDECompTreeNode *parent = this;
     deletables.insert( 0, parent );
     
     uint i = 0;
@@ -743,7 +743,7 @@ void KCompTreeNode::remove( const TQString& str )
     }
 }
 
-TQStringList KCompletionMatchesWrapper::list() const 
+TQStringList TDECompletionMatchesWrapper::list() const 
 {
     if ( sortedList && dirty ) {
         sortedList->sort();
@@ -760,16 +760,16 @@ TQStringList KCompletionMatchesWrapper::list() const
     return stringList;
 }
 
-KCompletionMatches::KCompletionMatches( bool sort_P )
+TDECompletionMatches::TDECompletionMatches( bool sort_P )
     : _sorting( sort_P )
 {
 }
 
-KCompletionMatches::KCompletionMatches( const KCompletionMatchesWrapper& matches )
+TDECompletionMatches::TDECompletionMatches( const TDECompletionMatchesWrapper& matches )
     : _sorting( matches.sorting())
 {
     if( matches.sortedList != 0L )
-        KCompletionMatchesList::operator=( *matches.sortedList );
+        TDECompletionMatchesList::operator=( *matches.sortedList );
     else {
         TQStringList l = matches.list();
         for( TQStringList::ConstIterator it = l.begin();
@@ -779,14 +779,14 @@ KCompletionMatches::KCompletionMatches( const KCompletionMatchesWrapper& matches
     }
 }
 
-KCompletionMatches::~KCompletionMatches()
+TDECompletionMatches::~TDECompletionMatches()
 {
 }
 
-TQStringList KCompletionMatches::list( bool sort_P ) const
+TQStringList TDECompletionMatches::list( bool sort_P ) const
 {
     if( _sorting && sort_P )
-        const_cast< KCompletionMatches* >( this )->sort();
+        const_cast< TDECompletionMatches* >( this )->sort();
     TQStringList stringList;
     // high weight == sorted last -> reverse the sorting here
     for ( ConstIterator it = begin(); it != end(); ++it )
@@ -794,7 +794,7 @@ TQStringList KCompletionMatches::list( bool sort_P ) const
     return stringList;
 }
 
-void KCompletionMatches::removeDuplicates()
+void TDECompletionMatches::removeDuplicates()
 {
     Iterator it1, it2;
     for ( it1 = begin(); it1 != end(); ++it1 ) {
@@ -810,7 +810,7 @@ void KCompletionMatches::removeDuplicates()
     }
 }
 
-void KCompTreeNodeList::append(KCompTreeNode *item)
+void TDECompTreeNodeList::append(TDECompTreeNode *item)
 {
     m_count++;
     if (!last) {
@@ -824,7 +824,7 @@ void KCompTreeNodeList::append(KCompTreeNode *item)
     last = item;
 }
 
-void KCompTreeNodeList::prepend(KCompTreeNode *item)
+void TDECompTreeNodeList::prepend(TDECompTreeNode *item)
 {
     m_count++;
     if (!last) {
@@ -837,7 +837,7 @@ void KCompTreeNodeList::prepend(KCompTreeNode *item)
     first = item;
 }
 
-void KCompTreeNodeList::insert(KCompTreeNode *after, KCompTreeNode *item)
+void TDECompTreeNodeList::insert(TDECompTreeNode *after, TDECompTreeNode *item)
 {
     if (!after) {
         append(item);
@@ -853,11 +853,11 @@ void KCompTreeNodeList::insert(KCompTreeNode *after, KCompTreeNode *item)
         last = item;
 }
 
-KCompTreeNode *KCompTreeNodeList::remove(KCompTreeNode *item)
+TDECompTreeNode *TDECompTreeNodeList::remove(TDECompTreeNode *item)
 {
     if (!first || !item)
         return 0;
-    KCompTreeNode *cur = 0;
+    TDECompTreeNode *cur = 0;
 
     if (item == first)
         first = first->next;
@@ -874,19 +874,19 @@ KCompTreeNode *KCompTreeNodeList::remove(KCompTreeNode *item)
     return item;
 }
 
-KCompTreeNode *KCompTreeNodeList::at(uint index) const
+TDECompTreeNode *TDECompTreeNodeList::at(uint index) const
 {
-    KCompTreeNode *cur = first;
+    TDECompTreeNode *cur = first;
     while (index-- && cur) cur = cur->next;
     return cur;
 }
 
-KZoneAllocator KCompTreeNode::alloc(8192);
+TDEZoneAllocator TDECompTreeNode::alloc(8192);
 
-void KCompletion::virtual_hook( int, void* )
+void TDECompletion::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KCompletionBase::virtual_hook( int, void* )
+void TDECompletionBase::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 #include "kcompletion.moc"
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index c0ba02d34..2bce648fb 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -28,15 +28,15 @@
 #include <tqguardedptr.h>
 
 #include "tdelibs_export.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksortablevaluelist.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
-class KCompTreeNode;
-class KCompletionPrivate;
-class KCompletionBasePrivate;
-class KCompletionMatchesWrapper;
-class KCompletionMatches;
+class TDECompTreeNode;
+class TDECompletionPrivate;
+class TDECompletionBasePrivate;
+class TDECompletionMatchesWrapper;
+class TDECompletionMatches;
 class TQPopupMenu;
 
 /**
@@ -49,13 +49,13 @@ class TQPopupMenu;
  * The user should be able to complete email-addresses, telephone-numbers,
  * commands, SQL queries, ...
  * Every time your program knows what the user can type into an edit-field, you
- * should offer completion. With KCompletion, this is very easy, and if you are
+ * should offer completion. With TDECompletion, this is very easy, and if you are
  * using a line edit widget ( KLineEdit), it is even more easy.
- * Basically, you tell a KCompletion object what strings should be completable
+ * Basically, you tell a TDECompletion object what strings should be completable
  * and whenever completion should be invoked, you call makeCompletion().
  * KLineEdit and (an editable) KComboBox even do this automatically for you.
  *
- * KCompletion offers the completed string via the signal match() and
+ * TDECompletion offers the completed string via the signal match() and
  * all matching strings (when the result is ambiguous) via the method
  * allMatches().
  *
@@ -75,11 +75,11 @@ class TQPopupMenu;
  *     subtle difference is, that it isn't invoked automatically while the user
  *     is typing, but only when the user presses a special key. The difference
  *     of manual and auto-completion is therefore only visible in UI classes,
- *     KCompletion needs to know whether to deliver partial matches
+ *     TDECompletion needs to know whether to deliver partial matches
  *     (shell completion) or whole matches (auto/manual completion), therefore
- * KGlobalSettings::CompletionMan and
- * KGlobalSettings::CompletionAuto have the exact same effect in
- *     KCompletion.
+ * TDEGlobalSettings::CompletionMan and
+ * TDEGlobalSettings::CompletionAuto have the exact same effect in
+ *     TDECompletion.
  *
  * @li shell completion works like how shells complete filenames:
  *     when multiple matches are available, the longest possible string of all
@@ -87,15 +87,15 @@ class TQPopupMenu;
  *     Iterating over all matching items (complete, not partial) is possible
  *     via nextMatch() and previousMatch().
  *
- * You don't have to worry much about that though, KCompletion handles
+ * You don't have to worry much about that though, TDECompletion handles
  * that for you, according to the setting setCompletionMode().
  * The default setting is globally configured by the user and read
- * from KGlobalSettings::completionMode().
+ * from TDEGlobalSettings::completionMode().
  *
  * A short example:
  * \code
- * KCompletion completion;
- * completion.setOrder( KCompletion::Sorted );
+ * TDECompletion completion;
+ * completion.setOrder( TDECompletion::Sorted );
  * completion.addItem( "pfeiffer@kde.org" );
  * completion.addItem( "coolo@kde.org" );
  * completion.addItem( "carpdjih@sp.zrz.tu-berlin.de" );
@@ -113,23 +113,23 @@ class TQPopupMenu;
  *
  * You can dynamically update the completable items by removing and adding them
  * whenever you want.
- * For advanced usage, you could even use multiple KCompletion objects. E.g.
+ * For advanced usage, you could even use multiple TDECompletion objects. E.g.
  * imagine an editor like kwrite with multiple open files. You could store
- * items of each file in a different KCompletion object, so that you know (and
+ * items of each file in a different TDECompletion object, so that you know (and
  * tell the user) where a completion comes from.
  *
- * Note: KCompletion does not work with strings that contain 0x0 characters
+ * Note: TDECompletion does not work with strings that contain 0x0 characters
  *       (unicode nul), as this is used internally as a delimiter.
  *
- * You may inherit from KCompletion and override makeCompletion() in
+ * You may inherit from TDECompletion and override makeCompletion() in
  * special cases (like reading directories/urls and then supplying the
- * contents to KCompletion, as KURLCompletion does), but generally, this is
+ * contents to TDECompletion, as KURLCompletion does), but generally, this is
  * not necessary.
  *
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class TDECORE_EXPORT KCompletion : public TQObject
+class TDECORE_EXPORT TDECompletion : public TQObject
 {
     TQ_ENUMS( CompOrder )
     TQ_PROPERTY( CompOrder order READ order WRITE setOrder )
@@ -139,7 +139,7 @@ class TDECORE_EXPORT KCompletion : public TQObject
 
 public:
     /**
-     * Constants that represent the order in which KCompletion performs
+     * Constants that represent the order in which TDECompletion performs
      * completion-lookups.
      */
     enum CompOrder { Sorted,    ///< Use alphabetically sorted order
@@ -150,14 +150,14 @@ public:
     /**
      * Constructor, nothing special here :)
      */
-    KCompletion();
+    TDECompletion();
 
     // FIXME: copy constructor, assignment operator...
 
     /**
      * Destructor, nothing special here, either.
      */
-    virtual ~KCompletion();
+    virtual ~TDECompletion();
 
     /**
      * Attempts to find an item in the list of available completions,
@@ -224,8 +224,8 @@ public:
     virtual const TQString& lastMatch() const { return myLastMatch; }
 
     /**
-     * Returns a list of all items inserted into KCompletion. This is useful
-     * if you need to save the state of a KCompletion object and restore it
+     * Returns a list of all items inserted into TDECompletion. This is useful
+     * if you need to save the state of a TDECompletion object and restore it
      * later.
      *
      * Important note: when order() == Weighted, then every item in the
@@ -235,7 +235,7 @@ public:
      * This is necessary so that you can save the items along with its
      * weighting on disk and load them back with setItems(), restoring its
      * weight as well. If you really don't want the appended weightings, call
-     * setOrder( KCompletion::Insertion )
+     * setOrder( TDECompletion::Insertion )
      * before calling items().
      *
      * @return a list of all items
@@ -251,32 +251,32 @@ public:
     /**
      * Sets the completion mode to Auto/Manual, Shell or None.
      * If you don't set the mode explicitly, the global default value
-     * KGlobalSettings::completionMode() is used.
-     * KGlobalSettings::CompletionNone disables completion.
+     * TDEGlobalSettings::completionMode() is used.
+     * TDEGlobalSettings::CompletionNone disables completion.
      * @param mode the completion mode
      * @see completionMode
-     * @see KGlobalSettings::completionMode
+     * @see TDEGlobalSettings::completionMode
      */
-    virtual void setCompletionMode( KGlobalSettings::Completion mode );
+    virtual void setCompletionMode( TDEGlobalSettings::Completion mode );
 
     /**
      * Return the current completion mode.
-     * May be different from KGlobalSettings::completionMode(), if you
+     * May be different from TDEGlobalSettings::completionMode(), if you
      * explicitly called setCompletionMode().
      * @return the current completion mode
      * @see setCompletionMode
      */
-    KGlobalSettings::Completion completionMode() const {
+    TDEGlobalSettings::Completion completionMode() const {
         return myCompletionMode;
     }
 
     /**
-     * KCompletion offers three different ways in which it offers its items:
+     * TDECompletion offers three different ways in which it offers its items:
      * @li in the order of insertion
      * @li sorted alphabetically
      * @li weighted
      *
-     * Choosing weighted makes KCompletion perform an implicit weighting based
+     * Choosing weighted makes TDECompletion perform an implicit weighting based
      * on how often an item is inserted. Imagine a web browser with a location
      * bar, where the user enters URLs. The more often a URL is entered, the
      * higher priority it gets.
@@ -300,7 +300,7 @@ public:
     CompOrder order() const { return myOrder; }
 
     /**
-     * Setting this to true makes KCompletion behave case insensitively.
+     * Setting this to true makes TDECompletion behave case insensitively.
      * E.g. makeCompletion( "CA" ); might return "carp\@cs.tu-berlin.de".
      * Default is false (case sensitive).
      * @param ignoreCase true to ignore the case
@@ -309,7 +309,7 @@ public:
     virtual void setIgnoreCase( bool ignoreCase );
 
     /**
-     * Return whether KCompletion acts case insensitively or not.
+     * Return whether TDECompletion acts case insensitively or not.
      * Default is false (case sensitive).
      * @return true if the case will be ignored
      * @see setIgnoreCase
@@ -334,7 +334,7 @@ public:
     /**
      * Returns a list of all items matching the last completed string.
      * Might take some time, when you have LOTS of items.
-     * The matches are returned as KCompletionMatches, which also
+     * The matches are returned as TDECompletionMatches, which also
      * keeps the weight of the matches, allowing
      * you to modify some matches or merge them with matches
      * from another call to allWeightedMatches(), and sort the matches
@@ -343,14 +343,14 @@ public:
      * @return a list of all completion matches
      * @see substringCompletion
      */
-    KCompletionMatches allWeightedMatches();
+    TDECompletionMatches allWeightedMatches();
 
     /**
      * Returns a list of all items matching @p string.
      * @param string the string to match
      * @return a list of all matches
      */
-    KCompletionMatches allWeightedMatches( const TQString& string );
+    TDECompletionMatches allWeightedMatches( const TQString& string );
 
     /**
      * Enables/disables playing a sound when
@@ -368,7 +368,7 @@ public:
     virtual void setEnableSounds( bool enable ) { myBeep = enable; }
 
     /**
-     * Tells you whether KCompletion will play sounds on certain occasions.
+     * Tells you whether TDECompletion will play sounds on certain occasions.
      * Default is enabled.
      * @return true if sounds are enabled
      * @see enableSounds
@@ -444,7 +444,7 @@ public slots:
      * where number is an unsigned integer, specifying the weighting.
      *
      * If you don't like this, call
-     * setOrder( KCompletion::Insertion )
+     * setOrder( TDECompletion::Insertion )
      * before calling setItems().
      *
      * @param list the list of items that are available for completion
@@ -518,7 +518,7 @@ protected:
      * string that will be emitted.
      * This is necessary e.g. in KURLCompletion(), where files with spaces
      * in their names are shown escaped ("filename\ with\ spaces"), but stored
-     * unescaped inside KCompletion.
+     * unescaped inside TDECompletion.
      * Never delete that pointer!
      *
      * Default implementation does nothing.
@@ -549,34 +549,34 @@ protected:
      * @param matches the matches to process
      * @see postProcessMatch
      */
-    virtual void postProcessMatches( KCompletionMatches * matches ) const {Q_UNUSED(matches)}
+    virtual void postProcessMatches( TDECompletionMatches * matches ) const {Q_UNUSED(matches)}
 
 private:
     void            addWeightedItem( const TQString& );
     TQString         findCompletion( const TQString& string );
     void            findAllCompletions( const TQString&,
-                                        KCompletionMatchesWrapper *matches,
+                                        TDECompletionMatchesWrapper *matches,
                                         bool& hasMultipleMatches ) const;
 
-    void extractStringsFromNode( const KCompTreeNode *,
+    void extractStringsFromNode( const TDECompTreeNode *,
                                  const TQString& beginning,
-                                 KCompletionMatchesWrapper *matches,
+                                 TDECompletionMatchesWrapper *matches,
                                  bool addWeight = false ) const;
-    void extractStringsFromNodeCI( const KCompTreeNode *,
+    void extractStringsFromNodeCI( const TDECompTreeNode *,
                                    const TQString& beginning,
                                    const TQString& restString,
-                                   KCompletionMatchesWrapper *matches) const;
+                                   TDECompletionMatchesWrapper *matches) const;
 
     enum        BeepMode { NoMatch, PartialMatch, Rotation };
     void        doBeep( BeepMode ) const;
 
-    KGlobalSettings::Completion myCompletionMode;
+    TDEGlobalSettings::Completion myCompletionMode;
 
     CompOrder       myOrder;
     TQString         myLastString;
     TQString         myLastMatch;
     TQString         myCurrentMatch;
-    KCompTreeNode * myTreeRoot;
+    TDECompTreeNode * myTreeRoot;
     TQStringList     myRotations;
     bool            myBeep;
     bool            myIgnoreCase;
@@ -587,15 +587,15 @@ private:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    KCompletionPrivate *d;
+    TDECompletionPrivate *d;
 };
 
 // some more helper stuff
-typedef KSortableValueList<TQString> KCompletionMatchesList;
-class KCompletionMatchesPrivate;
+typedef KSortableValueList<TQString> TDECompletionMatchesList;
+class TDECompletionMatchesPrivate;
 
 /**
- * This structure is returned by KCompletion::allWeightedMatches .
+ * This structure is returned by TDECompletion::allWeightedMatches .
  * It also keeps the weight of the matches, allowing
  * you to modify some matches or merge them with matches
  * from another call to allWeightedMatches(), and sort the matches
@@ -603,24 +603,24 @@ class KCompletionMatchesPrivate;
  *
  * Example (a simplified example of what Konqueror's completion does):
  * \code
- * KCompletionMatches matches = completion->allWeightedMatches( location );
+ * TDECompletionMatches matches = completion->allWeightedMatches( location );
  * if( !location.startsWith( "www." ))
  matches += completion->allWeightedmatches( "www." + location" );
  * matches.removeDuplicates();
  * TQStringList list = matches.list();
  * \endcode
  *
- * @short List for keeping matches returned from KCompletion
+ * @short List for keeping matches returned from TDECompletion
  */
-class TDECORE_EXPORT KCompletionMatches : public KCompletionMatchesList
+class TDECORE_EXPORT TDECompletionMatches : public TDECompletionMatchesList
 {
 public:
-    KCompletionMatches( bool sort );
+    TDECompletionMatches( bool sort );
     /**
      * @internal
      */
-    KCompletionMatches( const KCompletionMatchesWrapper& matches );
-    ~KCompletionMatches();
+    TDECompletionMatches( const TDECompletionMatchesWrapper& matches );
+    ~TDECompletionMatches();
     /**
      * Removes duplicate matches. Needed only when you merged several matches
      * results and there's a possibility of duplicates.
@@ -643,7 +643,7 @@ public:
     }
 private:
     bool _sorting;
-    KCompletionMatchesPrivate* d;
+    TDECompletionMatchesPrivate* d;
 };
 
 /**
@@ -660,13 +660,13 @@ private:
  * @short An abstract class for adding text completion support to widgets.
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class TDECORE_EXPORT KCompletionBase
+class TDECORE_EXPORT TDECompletionBase
 {
 public:
     /**
      * Constants that represent the items whose short-cut
      * key-binding is programmable.  The default key-bindings
-     * for these items are defined in KStdAccel.
+     * for these items are defined in TDEStdAccel.
      */
     enum KeyBindingType {
         /**
@@ -689,17 +689,17 @@ public:
 
 
     // Map for the key binding types mentioned above.
-    typedef TQMap<KeyBindingType, KShortcut> KeyBindingMap;
+    typedef TQMap<KeyBindingType, TDEShortcut> KeyBindingMap;
 
     /**
      * Default constructor.
      */
-    KCompletionBase();
+    TDECompletionBase();
 
     /**
      * Destructor.
      */
-    virtual ~KCompletionBase();
+    virtual ~TDECompletionBase();
     
     /**
      * Returns a pointer to the current completion object.
@@ -716,7 +716,7 @@ public:
      * @param hsig if true, handles completion signals internally.
      * @return a pointer the completion object.
      */
-    KCompletion* completionObject( bool hsig = true );
+    TDECompletion* completionObject( bool hsig = true );
     
     /**
      * Sets up the completion object to be used.
@@ -731,10 +731,10 @@ public:
      * after calling this method. Be sure to set the bool argument to false, if
      * you want to handle the completion signals yourself.
      *
-     * @param compObj a KCompletion() or a derived child object.
+     * @param compObj a TDECompletion() or a derived child object.
      * @param hsig if true, handles completion signals internally.
      */
-    virtual void setCompletionObject( KCompletion* compObj, bool hsig = true );
+    virtual void setCompletionObject( TDECompletion* compObj, bool hsig = true );
 
     /**
      * Enables this object to handle completion and rotation
@@ -825,7 +825,7 @@ public:
      * Sets the type of completion to be used.
      *
      * The completion modes supported are those defined in
-     * KGlobalSettings().  See below.
+     * TDEGlobalSettings().  See below.
      *
      * @param mode Completion type:
      *   @li CompletionNone:  Disables completion feature.
@@ -841,17 +841,17 @@ public:
      *   @li CompletionPopup: Shows all available completions at once,
      *                        in a listbox popping up.
      */
-    virtual void setCompletionMode( KGlobalSettings::Completion mode );
+    virtual void setCompletionMode( TDEGlobalSettings::Completion mode );
 
     /**
      * Returns the current completion mode.
      *
-     * The return values are of type KGlobalSettings::Completion.
+     * The return values are of type TDEGlobalSettings::Completion.
      * See setCompletionMode() for details.
      *
      * @return the completion mode.
      */
-    KGlobalSettings::Completion completionMode() const {
+    TDEGlobalSettings::Completion completionMode() const {
         return m_delegate ? m_delegate->completionMode() : m_iCompletionMode;
     }
 
@@ -885,7 +885,7 @@ public:
      * @return true if key-binding can successfully be set.
      * @see getKeyBinding
      */
-    bool setKeyBinding( KeyBindingType item , const KShortcut& key );
+    bool setKeyBinding( KeyBindingType item , const TDEShortcut& key );
 
     /**
      * Returns the key-binding used for the specified item.
@@ -899,7 +899,7 @@ public:
      * @return the key-binding used for the feature given by @p item.
      * @see setKeyBinding
      */
-    const KShortcut& getKeyBinding( KeyBindingType item ) const {
+    const TDEShortcut& getKeyBinding( KeyBindingType item ) const {
         return m_delegate ? m_delegate->getKeyBinding( item ) : m_keyMap[ item ];
     }
 
@@ -908,7 +908,7 @@ public:
      *
      * This method changes the values of the key bindings for
      * rotation and completion features to the default values
-     * provided in KGlobalSettings.
+     * provided in TDEGlobalSettings.
      *
      * NOTE: By default inheriting widgets should uses the
      * global key-bindings so that there will be no need to
@@ -924,7 +924,7 @@ public:
      * implementations to set completed text appropriately.  It
      * is mostly relevant when the completion mode is set to
      * CompletionAuto and CompletionManual modes. See
-     * KCompletionBase::setCompletedText.
+     * TDECompletionBase::setCompletedText.
      * Does nothing in CompletionPopup mode, as all available
      * matches will be shown in the popup.
      *
@@ -943,14 +943,14 @@ public:
      * Returns a pointer to the completion object.
      *
      * This method is only different from completionObject()
-     * in that it does not create a new KCompletion object even if
+     * in that it does not create a new TDECompletion object even if
      * the internal pointer is @p NULL. Use this method to get the
      * pointer to a completion object when inheriting so that you
      * won't inadvertently create it!!
      *
      * @return the completion object or NULL if one does not exist.
      */
-    KCompletion* compObj() const { return m_delegate ? m_delegate->compObj() : (KCompletion*) m_pCompObj; }
+    TDECompletion* compObj() const { return m_delegate ? m_delegate->compObj() : (TDECompletion*) m_pCompObj; }
 
 protected:
     /**
@@ -968,14 +968,14 @@ protected:
      * set, all function calls will be forwarded to the delegation object.
      * @param delegate the delegation object, or 0 to remove it
      */
-    void setDelegate( KCompletionBase *delegate );
+    void setDelegate( TDECompletionBase *delegate );
 
     /**
      * Returns the delegation object.
      * @return the delegation object, or 0 if there is none
      * @see setDelegate()
      */
-    KCompletionBase *delegate() const { return m_delegate; }
+    TDECompletionBase *delegate() const { return m_delegate; }
 
 private:
     // This method simply sets the autodelete boolean for
@@ -992,19 +992,19 @@ private:
     // Determines whether this widget fires rotation signals
     bool m_bEmitSignals;
     // Stores the completion mode locally.
-    KGlobalSettings::Completion m_iCompletionMode;
+    TDEGlobalSettings::Completion m_iCompletionMode;
     // Pointer to Completion object.
-    TQGuardedPtr<KCompletion> m_pCompObj;
+    TQGuardedPtr<TDECompletion> m_pCompObj;
     // Keybindings
     KeyBindingMap m_keyMap;
-    // we may act as a proxy to another KCompletionBase object
-    KCompletionBase *m_delegate;
+    // we may act as a proxy to another TDECompletionBase object
+    TDECompletionBase *m_delegate;
 
     // BCI
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    KCompletionBasePrivate *d;
+    TDECompletionBasePrivate *d;
 };
 
 #endif // KCOMPLETION_H
diff --git a/tdecore/kcompletion_private.h b/tdecore/kcompletion_private.h
index 3d72586f3..3d956f29d 100644
--- a/tdecore/kcompletion_private.h
+++ b/tdecore/kcompletion_private.h
@@ -24,36 +24,36 @@
 #include <tqstring.h>
 #include <ksortablevaluelist.h>
 
-class KCompTreeNode;
+class TDECompTreeNode;
 
 #include <kallocator.h>
 
 /**
  * @internal
  */
-class TDECORE_EXPORT KCompTreeNodeList
+class TDECORE_EXPORT TDECompTreeNodeList
 {
 public:
-    KCompTreeNodeList() : first(0), last(0), m_count(0) {}
-    KCompTreeNode *begin() const { return first; }
-    KCompTreeNode *end() const { return last; }
-
-    KCompTreeNode *at(uint index) const;
-    void append(KCompTreeNode *item); 
-    void prepend(KCompTreeNode *item); 
-    void insert(KCompTreeNode *after, KCompTreeNode *item);
-    KCompTreeNode *remove(KCompTreeNode *item);
+    TDECompTreeNodeList() : first(0), last(0), m_count(0) {}
+    TDECompTreeNode *begin() const { return first; }
+    TDECompTreeNode *end() const { return last; }
+
+    TDECompTreeNode *at(uint index) const;
+    void append(TDECompTreeNode *item); 
+    void prepend(TDECompTreeNode *item); 
+    void insert(TDECompTreeNode *after, TDECompTreeNode *item);
+    TDECompTreeNode *remove(TDECompTreeNode *item);
     uint count() const { return m_count; }
 
 private:
-    KCompTreeNode *first, *last;
+    TDECompTreeNode *first, *last;
     uint m_count;
 };
 
-typedef KCompTreeNodeList KCompTreeChildren;
+typedef TDECompTreeNodeList TDECompTreeChildren;
 
 /**
- * A helper class for KCompletion. Implements a tree of TQChar.
+ * A helper class for TDECompletion. Implements a tree of TQChar.
  *
  * The tree looks like this (containing the items "kde", "kde-ui",
  * "kde-core" and "pfeiffer". Every item is delimited with TQChar( 0x0 )
@@ -81,14 +81,14 @@ typedef KCompTreeNodeList KCompTreeChildren;
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @internal
  */
-class TDECORE_EXPORT KCompTreeNode : public TQChar
+class TDECORE_EXPORT TDECompTreeNode : public TQChar
 {
 public:
-    KCompTreeNode() : TQChar(), myWeight(0) {}
-    KCompTreeNode( const TQChar& ch, uint weight = 0 )
+    TDECompTreeNode() : TQChar(), myWeight(0) {}
+    TDECompTreeNode( const TQChar& ch, uint weight = 0 )
         : TQChar( ch ),
           myWeight( weight ) {}
-    ~KCompTreeNode();
+    ~TDECompTreeNode();
 
     void * operator new( size_t s ) {
       return alloc.allocate( s );
@@ -99,12 +99,12 @@ public:
 
     // Returns a child of this node matching ch, if available.
     // Otherwise, returns 0L
-    inline KCompTreeNode * find( const TQChar& ch ) const {
-      KCompTreeNode * cur = myChildren.begin();
+    inline TDECompTreeNode * find( const TQChar& ch ) const {
+      TDECompTreeNode * cur = myChildren.begin();
       while (cur && (*cur != ch)) cur = cur->next;
       return cur;
     }
-    KCompTreeNode *	insert( const TQChar&, bool sorted );
+    TDECompTreeNode *	insert( const TQChar&, bool sorted );
     void 		remove( const TQString& );
 
     inline int		childrenCount() const { return myChildren.count(); }
@@ -115,51 +115,51 @@ public:
     inline void decline() 	{ myWeight--; 		}
     inline uint weight() const 	{ return myWeight; 	}
 
-    inline const KCompTreeChildren * children() const {
+    inline const TDECompTreeChildren * children() const {
 	return &myChildren;
     }
-    inline const KCompTreeNode * childAt(int index) const {
+    inline const TDECompTreeNode * childAt(int index) const {
 	return myChildren.at(index);
     }
-    inline const KCompTreeNode * firstChild() const {
+    inline const TDECompTreeNode * firstChild() const {
 	return myChildren.begin();
     }
-    inline const KCompTreeNode * lastChild()  const {
+    inline const TDECompTreeNode * lastChild()  const {
 	return myChildren.end();
     }
 
-    /* We want to handle a list of KCompTreeNodes on our own, to not
+    /* We want to handle a list of TDECompTreeNodes on our own, to not
        need to use TQValueList<>.  And to make it even more fast we don't
        use an accessor, but just a public member.  */
-    KCompTreeNode *next;
+    TDECompTreeNode *next;
 private:
     uint myWeight;
-    KCompTreeNodeList	myChildren;
-    static KZoneAllocator alloc;
+    TDECompTreeNodeList	myChildren;
+    static TDEZoneAllocator alloc;
 };
 
 
 
 // some more helper stuff
-typedef KSortableValueList<TQString> KCompletionMatchesList;
+typedef KSortableValueList<TQString> TDECompletionMatchesList;
 
 /**
  * @internal
  */
-class TDECORE_EXPORT KCompletionMatchesWrapper
+class TDECORE_EXPORT TDECompletionMatchesWrapper
 {
 public:
-    KCompletionMatchesWrapper( bool sort = false )
-        : sortedList( sort ? new KCompletionMatchesList : 0L ),
+    TDECompletionMatchesWrapper( bool sort = false )
+        : sortedList( sort ? new TDECompletionMatchesList : 0L ),
           dirty( false )
     {}
-    ~KCompletionMatchesWrapper() {
+    ~TDECompletionMatchesWrapper() {
         delete sortedList;
     }
 
     void setSorting( bool sort ) {
         if ( sort && !sortedList )
-            sortedList = new KCompletionMatchesList;
+            sortedList = new TDECompletionMatchesList;
         else if ( !sort ) {
             delete sortedList;
             sortedList = 0L;
@@ -208,7 +208,7 @@ public:
     TQStringList list() const;
 
     mutable TQStringList stringList;
-    KCompletionMatchesList *sortedList;
+    TDECompletionMatchesList *sortedList;
     mutable bool dirty;
 };
 
diff --git a/tdecore/kcompletionbase.cpp b/tdecore/kcompletionbase.cpp
index 9e7f6d746..8a67f4647 100644
--- a/tdecore/kcompletionbase.cpp
+++ b/tdecore/kcompletionbase.cpp
@@ -22,11 +22,11 @@
 
 #include <kcompletion.h>
 
-KCompletionBase::KCompletionBase()
+TDECompletionBase::TDECompletionBase()
 {
     m_delegate = 0L;
     // Assign the default completion type to use.
-    m_iCompletionMode = KGlobalSettings::completionMode();
+    m_iCompletionMode = TDEGlobalSettings::completionMode();
 
     // Initialize all key-bindings to 0 by default so that
     // the event filter will use the global settings.
@@ -38,7 +38,7 @@ KCompletionBase::KCompletionBase()
     setup( false, false, false );
 }
 
-KCompletionBase::~KCompletionBase()
+TDECompletionBase::~TDECompletionBase()
 {
     if( m_bAutoDelCompObj && m_pCompObj )
     {
@@ -46,7 +46,7 @@ KCompletionBase::~KCompletionBase()
     }
 }
 
-void KCompletionBase::setDelegate( KCompletionBase *delegate )
+void TDECompletionBase::setDelegate( TDECompletionBase *delegate )
 {
     m_delegate = delegate;
 
@@ -59,20 +59,20 @@ void KCompletionBase::setDelegate( KCompletionBase *delegate )
     }
 }
 
-KCompletion* KCompletionBase::completionObject( bool hsig )
+TDECompletion* TDECompletionBase::completionObject( bool hsig )
 {
     if ( m_delegate )
         return m_delegate->completionObject( hsig );
     
     if ( !m_pCompObj )
     {
-        setCompletionObject( new KCompletion(), hsig );
+        setCompletionObject( new TDECompletion(), hsig );
 	m_bAutoDelCompObj = true;
     }
     return m_pCompObj;
 }
 
-void KCompletionBase::setCompletionObject( KCompletion* compObj, bool hsig )
+void TDECompletionBase::setCompletionObject( TDECompletion* compObj, bool hsig )
 {
     if ( m_delegate ) {
         m_delegate->setCompletionObject( compObj, hsig );
@@ -90,7 +90,7 @@ void KCompletionBase::setCompletionObject( KCompletion* compObj, bool hsig )
 }
 
 // BC: Inline this function and possibly rename it to setHandleEvents??? (DA)
-void KCompletionBase::setHandleSignals( bool handle )
+void TDECompletionBase::setHandleSignals( bool handle )
 {
     if ( m_delegate )
         m_delegate->setHandleSignals( handle );
@@ -98,7 +98,7 @@ void KCompletionBase::setHandleSignals( bool handle )
         m_bHandleSignals = handle;
 }
 
-void KCompletionBase::setCompletionMode( KGlobalSettings::Completion mode )
+void TDECompletionBase::setCompletionMode( TDEGlobalSettings::Completion mode )
 {
     if ( m_delegate ) {
         m_delegate->setCompletionMode( mode );
@@ -106,13 +106,13 @@ void KCompletionBase::setCompletionMode( KGlobalSettings::Completion mode )
     }
     
     m_iCompletionMode = mode;
-    // Always sync up KCompletion mode with ours as long as we
+    // Always sync up TDECompletion mode with ours as long as we
     // are performing completions.
-    if( m_pCompObj && m_iCompletionMode != KGlobalSettings::CompletionNone )
+    if( m_pCompObj && m_iCompletionMode != TDEGlobalSettings::CompletionNone )
         m_pCompObj->setCompletionMode( m_iCompletionMode );
 }
 
-bool KCompletionBase::setKeyBinding( KeyBindingType item, const KShortcut& cut )
+bool TDECompletionBase::setKeyBinding( KeyBindingType item, const TDEShortcut& cut )
 {
     if ( m_delegate )
         return m_delegate->setKeyBinding( item, cut );
@@ -127,7 +127,7 @@ bool KCompletionBase::setKeyBinding( KeyBindingType item, const KShortcut& cut )
     return true;
 }
 
-void KCompletionBase::useGlobalKeyBindings()
+void TDECompletionBase::useGlobalKeyBindings()
 {
     if ( m_delegate ) {
         m_delegate->useGlobalKeyBindings();
@@ -141,7 +141,7 @@ void KCompletionBase::useGlobalKeyBindings()
     m_keyMap.insert( SubstringCompletion, 0 );
 }
 
-void KCompletionBase::setup( bool autodel, bool hsig, bool esig )
+void TDECompletionBase::setup( bool autodel, bool hsig, bool esig )
 {
     if ( m_delegate ) {
         m_delegate->setup( autodel, hsig, esig );
diff --git a/tdecore/kconfig_compiler/Makefile.am b/tdecore/kconfig_compiler/Makefile.am
deleted file mode 100644
index 5a3b0f2e8..000000000
--- a/tdecore/kconfig_compiler/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = example tests
-
-AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
-
-bin_PROGRAMS = kconfig_compiler
-
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kconfig_compiler_LDADD = $(LIB_TDECORE)
-kconfig_compiler_SOURCES = kconfig_compiler.cpp
-
-TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
-
-check-local:
-	for i in $(TESTFILES); \
-	  do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
-	  perl $(top_srcdir)/tdecore/kconfig_compiler/checkkcfg.pl \
-          $(top_srcdir)/tdecore/kconfig_compiler/tests/$$i; done
-	  
diff --git a/tdecore/kconfig_compiler/tests/myprefs.h b/tdecore/kconfig_compiler/tests/myprefs.h
deleted file mode 100644
index ebef89c08..000000000
--- a/tdecore/kconfig_compiler/tests/myprefs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <kconfigskeleton.h>
-
-class MyPrefs : public KConfigSkeleton
-{
-  public:
-    MyPrefs( const TQString &a ) : KConfigSkeleton( a ) {}
-};
diff --git a/tdecore/kconfig_compiler/tests/test1.cpp.ref b/tdecore/kconfig_compiler/tests/test1.cpp.ref
deleted file mode 100644
index b3050921e..000000000
--- a/tdecore/kconfig_compiler/tests/test1.cpp.ref
+++ /dev/null
@@ -1,72 +0,0 @@
-// This file is generated by kconfig_compiler from test1.kcfg.
-// All changes you do to this file will be lost.
-
-#include "test1.h"
-
-Test1::Test1(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
-  , mParamtransport(transport)
-  , mParamfolder(folder)
-{
-  setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
-
-  KConfigSkeleton::ItemBool  *itemOneOption;
-  itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
-  addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) );
-  KConfigSkeleton::ItemInt  *itemAnotherOption;
-  itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
-  addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption;
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "One" );
-    valuesListOption.append( choice );
-  }
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "Two" );
-    valuesListOption.append( choice );
-  }
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "Three" );
-    valuesListOption.append( choice );
-  }
-  KConfigSkeleton::ItemEnum  *itemListOption;
-  itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
-  addItem( itemListOption, TQString::fromLatin1( "ListOption" ) );
-
-  setCurrentGroup( TQString::fromLatin1( "MyOptions" ) );
-
-  KConfigSkeleton::ItemString  *itemMyString;
-  itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
-  addItem( itemMyString, TQString::fromLatin1( "MyString" ) );
-  KConfigSkeleton::ItemPath  *itemMyPath;
-  itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
-  addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) );
-  KConfigSkeleton::ItemInt  *itemAnotherOption2;
-  itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
-  addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) );
-  TQStringList defaultMyStringList;
-  defaultMyStringList.append( TQString::fromUtf8( "up" ) );
-  defaultMyStringList.append( TQString::fromUtf8( "down" ) );
-
-  KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
-  addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
-  TQStringList defaultMyStringListHidden;
-  defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) );
-  defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) );
-
-  KConfigSkeleton::ItemStringList  *itemMyStringListHidden;
-  itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
-  addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) );
-  KConfigSkeleton::ItemInt  *itemMyNumber;
-  itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
-  addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) );
-}
-
-Test1::~Test1()
-{
-}
-
diff --git a/tdecore/kconfig_compiler/tests/test3.cpp.ref b/tdecore/kconfig_compiler/tests/test3.cpp.ref
deleted file mode 100644
index 11fe6b38f..000000000
--- a/tdecore/kconfig_compiler/tests/test3.cpp.ref
+++ /dev/null
@@ -1,29 +0,0 @@
-// This file is generated by kconfig_compiler from test3.kcfg.
-// All changes you do to this file will be lost.
-
-#include "test3.h"
-
-using namespace TestNameSpace;
-
-Test3::Test3(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
-{
-  setCurrentGroup( TQString::fromLatin1( "General" ) );
-
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
-  addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
-
-  setCurrentGroup( TQString::fromLatin1( "Blah" ) );
-
-  mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
-  addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) );
-  mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
-  addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) );
-  mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
-  addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) );
-}
-
-Test3::~Test3()
-{
-}
-
diff --git a/tdecore/kconfig_compiler/tests/test4.cpp.ref b/tdecore/kconfig_compiler/tests/test4.cpp.ref
deleted file mode 100644
index 6918a8c8a..000000000
--- a/tdecore/kconfig_compiler/tests/test4.cpp.ref
+++ /dev/null
@@ -1,82 +0,0 @@
-// This file is generated by kconfig_compiler from test4.kcfg.
-// All changes you do to this file will be lost.
-
-#include "test4.h"
-
-#include <kstaticdeleter.h>
-
-Test4 *Test4::mSelf = 0;
-static KStaticDeleter<Test4> staticTest4Deleter;
-
-Test4 *Test4::self()
-{
-  if ( !mSelf ) {
-    staticTest4Deleter.setObject( mSelf, new Test4() );
-    mSelf->readConfig();
-  }
-
-  return mSelf;
-}
-
-const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" };
-
-Test4::Test4(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
-{
-  mSelf = this;
-  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
-
-TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
-  KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
-  addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
-  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
-  addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
-  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "Encrypt" );
-    valuesMouseAction.append( choice );
-  }
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "Decrypt" );
-    valuesMouseAction.append( choice );
-  }
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "CrashNBurn" );
-    valuesMouseAction.append( choice );
-  }
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "PumpNDump" );
-    valuesMouseAction.append( choice );
-  }
-  KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
-  addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
-  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
-  addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
-  itemAge->setMinValue(8);
-  itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::fromLatin1( "Age" ) );
-}
-
-Test4::~Test4()
-{
-  if ( mSelf == this )
-    staticTest4Deleter.setObject( mSelf, 0, false );
-}
-
diff --git a/tdecore/kconfig_compiler/tests/test5.cpp.ref b/tdecore/kconfig_compiler/tests/test5.cpp.ref
deleted file mode 100644
index 8373eb3f6..000000000
--- a/tdecore/kconfig_compiler/tests/test5.cpp.ref
+++ /dev/null
@@ -1,82 +0,0 @@
-// This file is generated by kconfig_compiler from test5.kcfg.
-// All changes you do to this file will be lost.
-
-#include "test5.h"
-
-#include <kstaticdeleter.h>
-
-Test5 *Test5::mSelf = 0;
-static KStaticDeleter<Test5> staticTest5Deleter;
-
-Test5 *Test5::self()
-{
-  if ( !mSelf ) {
-    staticTest5Deleter.setObject( mSelf, new Test5() );
-    mSelf->readConfig();
-  }
-
-  return mSelf;
-}
-
-const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" };
-
-Test5::Test5(  )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
-{
-  mSelf = this;
-  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
-
-TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
-  KConfigSkeleton::ItemColor  *itemColor[4];
-  itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
-  addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
-  itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
-  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
-  itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
-  addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
-  itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
-  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "Encrypt" );
-    valuesMouseAction.append( choice );
-  }
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "Decrypt" );
-    valuesMouseAction.append( choice );
-  }
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "CrashNBurn" );
-    valuesMouseAction.append( choice );
-  }
-  {
-    KConfigSkeleton::ItemEnum::Choice choice;
-    choice.name = TQString::fromLatin1( "PumpNDump" );
-    valuesMouseAction.append( choice );
-  }
-  KConfigSkeleton::ItemEnum  *itemMouseAction[3];
-  itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
-  addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
-  itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
-  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
-  itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
-  addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
-  itemAge->setMinValue(8);
-  itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::fromLatin1( "Age" ) );
-}
-
-Test5::~Test5()
-{
-  if ( mSelf == this )
-    staticTest5Deleter.setObject( mSelf, 0, false );
-}
-
diff --git a/tdecore/kconfig_compiler/tests/test6.cpp.ref b/tdecore/kconfig_compiler/tests/test6.cpp.ref
deleted file mode 100644
index 51b96d4c4..000000000
--- a/tdecore/kconfig_compiler/tests/test6.cpp.ref
+++ /dev/null
@@ -1,31 +0,0 @@
-// This file is generated by kconfig_compiler from test6.kcfg.
-// All changes you do to this file will be lost.
-
-#include "test6.h"
-
-Test6::Test6(  const TQString & Number )
-  : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
-  , mParamNumber(Number)
-{
-  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
-
-  KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
-  addItem( itemColor, TQString::fromLatin1( "Color" ) );
-
-  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
-
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
-  itemAge->setMinValue(8);
-  itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::fromLatin1( "Age" ) );
-}
-
-Test6::~Test6()
-{
-}
-
diff --git a/tdecore/kconfig_compiler/tests/test7.cpp.ref b/tdecore/kconfig_compiler/tests/test7.cpp.ref
deleted file mode 100644
index 91a22e036..000000000
--- a/tdecore/kconfig_compiler/tests/test7.cpp.ref
+++ /dev/null
@@ -1,31 +0,0 @@
-// This file is generated by kconfig_compiler from test7.kcfg.
-// All changes you do to this file will be lost.
-
-#include "test7.h"
-
-Test7::Test7(  int Number )
-  : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
-  , mParamNumber(Number)
-{
-  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
-
-  KConfigSkeleton::ItemColor  *itemColor;
-  itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
-  addItem( itemColor, TQString::fromLatin1( "Color" ) );
-
-  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
-
-  KConfigSkeleton::ItemString  *itemFooBar;
-  itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
-  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
-  KConfigSkeleton::ItemInt  *itemAge;
-  itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
-  itemAge->setMinValue(8);
-  itemAge->setMaxValue(88);
-  addItem( itemAge, TQString::fromLatin1( "Age" ) );
-}
-
-Test7::~Test7()
-{
-}
-
diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
deleted file mode 100644
index f89b7c133..000000000
--- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ /dev/null
@@ -1,22 +0,0 @@
-// This file is generated by kconfig_compiler from test8a.kcfg.
-// All changes you do to this file will be lost.
-
-#include "test8a.h"
-
-Test8a::Test8a(  KSharedConfig::Ptr config  )
-  : KConfigSkeleton( config )
-{
-  setCurrentGroup( TQString::fromLatin1( "Group" ) );
-
-  KConfigSkeleton::ItemFont  *itemFont;
-  itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
-  addItem( itemFont, TQString::fromLatin1( "Font" ) );
-  KConfigSkeleton::ItemFont  *itemTitleFont;
-  itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
-  addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
-}
-
-Test8a::~Test8a()
-{
-}
-
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index af9cc6dd7..08abe75c7 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -44,30 +44,30 @@
 #include <errno.h>
 
 #include <tqwindowdefs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
-#include <../kinit/klauncher_cmds.h>
+#include <../kinit/tdelauncher_cmds.h>
 
 #if defined Q_WS_X11
 #include <X11/Xlib.h>
 #endif
 
-KCrash::HandlerType KCrash::_emergencySaveFunction = 0;
-KCrash::HandlerType KCrash::_crashHandler = 0;
-const char *KCrash::appName = 0;
-const char *KCrash::appPath = 0;
-bool KCrash::safer = false;
+TDECrash::HandlerType TDECrash::_emergencySaveFunction = 0;
+TDECrash::HandlerType TDECrash::_crashHandler = 0;
+const char *TDECrash::appName = 0;
+const char *TDECrash::appPath = 0;
+bool TDECrash::safer = false;
 
 // This function sets the function which should be called when the
 // application crashes and the
 // application is asked to try to save its data.
 void
-KCrash::setEmergencySaveFunction (HandlerType saveFunction)
+TDECrash::setEmergencySaveFunction (HandlerType saveFunction)
 {
   _emergencySaveFunction = saveFunction;
 
@@ -83,7 +83,7 @@ KCrash::setEmergencySaveFunction (HandlerType saveFunction)
 // This function sets the function which should be responsible for
 // the application crash handling.
 void
-KCrash::setCrashHandler (HandlerType handler)
+TDECrash::setCrashHandler (HandlerType handler)
 {
 #ifdef Q_OS_UNIX
   if (!handler)
@@ -116,7 +116,7 @@ KCrash::setCrashHandler (HandlerType handler)
 }
 
 void
-KCrash::defaultCrashHandler (int sig)
+TDECrash::defaultCrashHandler (int sig)
 {
 #ifdef Q_OS_UNIX
   // WABA: Do NOT use kdDebug() in this function because it is much too risky!
@@ -148,10 +148,10 @@ KCrash::defaultCrashHandler (int sig)
       if (appName)
       {
 #ifndef NDEBUG
-        fprintf(stderr, "[kcrash] KCrash: crashing... crashRecursionCounter = %d\n", crashRecursionCounter);
-        fprintf(stderr, "[kcrash] KCrash: Application Name = %s path = %s pid = %d\n", appName ? appName : "<unknown>" , appPath ? appPath : "<unknown>", getpid());
+        fprintf(stderr, "[kcrash] TDECrash: crashing... crashRecursionCounter = %d\n", crashRecursionCounter);
+        fprintf(stderr, "[kcrash] TDECrash: Application Name = %s path = %s pid = %d\n", appName ? appName : "<unknown>" , appPath ? appPath : "<unknown>", getpid());
 #else
-        fprintf(stderr, "[kcrash] KCrash: Application '%s' crashing...\n", appName ? appName : "<unknown>");
+        fprintf(stderr, "[kcrash] TDECrash: Application '%s' crashing...\n", appName ? appName : "<unknown>");
 #endif
 
           const char * argv[24]; // don't forget to update this
@@ -176,7 +176,7 @@ KCrash::defaultCrashHandler (int sig)
           // we have already tested this
           argv[i++] = "--appname";
           argv[i++] = appName;
-          if (KApplication::loadedByKdeinit)
+          if (TDEApplication::loadedByKdeinit)
             argv[i++] = "--tdeinit";
 
           // only add apppath if it's not NULL
@@ -196,8 +196,8 @@ KCrash::defaultCrashHandler (int sig)
           argv[i++] = "--pid";
           argv[i++] = pidtxt;
 
-          const KInstance *instance = KGlobal::_instance;
-          const KAboutData *about = instance ? instance->aboutData() : 0;
+          const TDEInstance *instance = TDEGlobal::_instance;
+          const TDEAboutData *about = instance ? instance->aboutData() : 0;
           if (about) {
             if (about->internalVersion()) {
               argv[i++] = "--appversion";
@@ -254,7 +254,7 @@ static int write_socket(int sock, char *buffer, int len);
 static int read_socket(int sock, char *buffer, int len);
 static int openSocket();
 
-void KCrash::startDrKonqi( const char* argv[], int argc )
+void TDECrash::startDrKonqi( const char* argv[], int argc )
 {
   int socket = openSocket();
   if( socket < -1 )
@@ -262,7 +262,7 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
     startDirectly( argv, argc );
     return;
   }
-  klauncher_header header;
+  tdelauncher_header header;
   header.cmd = LAUNCHER_EXEC_NEW;
   const int BUFSIZE = 8192; // make sure this is big enough
   char buffer[ BUFSIZE + 10 ];
@@ -277,7 +277,7 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
     int len = strlen( argv[ i ] ) + 1; // include terminating \0
     if( pos + len > BUFSIZE )
     {
-      fprintf( stderr, "[kcrash] BUFSIZE in KCrash not big enough!\n" );
+      fprintf( stderr, "[kcrash] BUFSIZE in TDECrash not big enough!\n" );
       startDirectly( argv, argc );
       return;
     }
@@ -315,9 +315,9 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
 }
 
 // If we can't reach tdeinit we can still at least try to fork()
-void KCrash::startDirectly( const char* argv[], int )
+void TDECrash::startDirectly( const char* argv[], int )
 {
-  fprintf( stderr, "[kcrash] KCrash cannot reach tdeinit, launching directly.\n" );
+  fprintf( stderr, "[kcrash] TDECrash cannot reach tdeinit, launching directly.\n" );
   pid_t pid = fork();
   if (pid <= 0)
   {
diff --git a/tdecore/kcrash.h b/tdecore/kcrash.h
index d6941b825..0ea938bfe 100644
--- a/tdecore/kcrash.h
+++ b/tdecore/kcrash.h
@@ -34,7 +34,7 @@
  * be called by the default crash handler, giving the application a chance
  * to save its data.
  */
-class TDECORE_EXPORT KCrash
+class TDECORE_EXPORT TDECrash
 {
  private: // ;o)
   static const char *appName;
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index df38ff422..5653a9a03 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -5,69 +5,69 @@
 #
 #Format : number<tab>description
 
-125        tdecore (KAccel)
+125        tdecore (TDEAccel)
 126        tdecore (KURL)
 127        kio (KProtocolInfo)
 128        tdecore (KRegExp)
-129        tdecore (KAction)
+129        tdecore (TDEAction)
 130        kio (KPasswdServer)
-131        tdecore (KAcceleratorManager)
+131        tdecore (TDEAcceleratorManager)
 150        tdecore (KLibLoader)
 160        tdecore (KNotifyClient)
 170        tdecore (KNetwork socket)
 171        tdecore (KSocks)
-172        tdecore (KStartupInfo)
-173        tdecore (KLocale)
+172        tdecore (TDEStartupInfo)
+173        tdecore (TDELocale)
 174        tdecore (KProcIO)
-175        tdecore (KProcess)
+175        tdecore (TDEProcess)
 176        tdecore (KWin)
-177        tdecore (KConfigSkeleton)
-178        tdecore (KConfigDialogManager)
+177        tdecore (TDEConfigSkeleton)
+178        tdecore (TDEConfigDialogManager)
 179        tdecore (KNetwork resolver)
 180        tdecore (tdelibs)
-200        tdeui (KMainWindow)
-220        tdeui (KToolBar)
+200        tdeui (TDEMainWindow)
+220        tdeui (TDEToolBar)
 230        tdeui (KCommand)
 240        tdeui (tdelibs)
-250        kfile (tdelibs)
-264        tdecore (KIconLoader)
-265        tdecore (KIconEffect)
+250        tdefile (tdelibs)
+264        tdecore (TDEIconLoader)
+265        tdecore (TDEIconEffect)
 270        tdeui (KRootPixmap)
-280        tdeui (KSharedPixmap)
-281        tdeui (KCModule)
+280        tdeui (TDESharedPixmap)
+281        tdeui (TDECModule)
 282        tdeui (KDockWidget)
 290        tdeui (KPixmapIO)
-291        tdeui (KAboutDialog)
+291        tdeui (TDEAboutDialog)
 292        tdeui (KComboBox)
 293        tdeui (KLineEdit)
 294        tdeui (KEdit)
 295        tdeui (KMenuBar)
-296        tdeui (KPopupMenu)
+296        tdeui (TDEPopupMenu)
 298        tdeui (KDatePicker)
 399        kimgio
 400        artskde
 500        tdeprint
-700        kutils (KSettings::Dialog)
-701        kutils (KSettings::Dispatcher)
-702        kutils (KPluginSelector)
-703        kutils (KPluginInfo)
-704        kutils (KSettings::ComponentsDialog)
-710        kutils (KCMultiDialog)
-711        kutils (KCModuleProxy)
-712        kutils (KCModuleInfo)
-713        kutils (KCModuleContainer)
-750        kspell (tdelibs)
-760        kmdi
-780        kcmshell (tdelibs)
-790        kimproxy (tdelibs)
+700        tdeutils (KSettings::Dialog)
+701        tdeutils (KSettings::Dispatcher)
+702        tdeutils (KPluginSelector)
+703        tdeutils (KPluginInfo)
+704        tdeutils (KSettings::ComponentsDialog)
+710        tdeutils (KCMultiDialog)
+711        tdeutils (TDECModuleProxy)
+712        tdeutils (TDECModuleInfo)
+713        tdeutils (TDECModuleContainer)
+750        tdespell (tdelibs)
+760        tdemdi
+780        tdecmshell (tdelibs)
+790        tdeimproxy (tdelibs)
 800        kabapi (tdelibs)
 900        tdesu (tdelibs)
 912        ksmartcard (tdelibs)
 
 
-1000        kparts
-1001        kparts (mainwindow)
-1002        kparts (factory)
+1000        tdeparts
+1001        tdeparts (mainwindow)
+1002        tdeparts (factory)
 
 # tdebase
 1201        konqtree
@@ -87,15 +87,15 @@
 1216        twin (client errors)
 1217        khotkeys
 1218        ksmserver
-1219        media kioslave
-1220        remote kioslave
+1219        media tdeioslave
+1220        remote tdeioslave
 
 1400        khelpcenter (tdebase)
 1401        kcmhelpcenter
 1402        khc_indexbuilder
 
 1420        kikbd
-1421        ki18b_keys (kcmodule)
+1421        ki18b_keys (tdecmodule)
 
 1430        nspluginviewer (Qt/Xt)
 1431        nspluginviewer (plugin)
@@ -116,7 +116,7 @@
 2003        ksim
 2100	    kgpg
 2200	    kdf
-2300        kwallet
+2300        tdewallet
 
 # 2500-2999 Reserved for private use
 
@@ -182,9 +182,9 @@
 5600        kontact (core)
 5601        kontact (interfaces)
 5602        kontact (plugins)
-5650        kresources
+5650        tderesources
 5700        kabc
-5710        kabc/vcard
+5710        tdeabc/vcard
 5720        kaddressbook
 5800        libkcal
 5850        korganizer
@@ -197,30 +197,30 @@
 5960        kandy
 5970        karm
 
-# libkhtml
-6000        khtml
-6005        khtml (encoding)
-6010        khtml (dom)
-6020        khtml (xml)
-6030        khtml (html)
-6031        khtml (frames & objects)
-6035        khtml (parser)
-6036        khtml (tokenizer)
-6040        khtml (render)
-6041        khtml (bidi)
-6045        khtml (rendering tree)
-6050        khtml (part)
-6060        khtml (cache)
-6061        khtml (cache-expiredates)
-6070        khtml (jscript)
-6080        khtml (css)
-6090        khtml (memory)
+# libtdehtml
+6000        tdehtml
+6005        tdehtml (encoding)
+6010        tdehtml (dom)
+6020        tdehtml (xml)
+6030        tdehtml (html)
+6031        tdehtml (frames & objects)
+6035        tdehtml (parser)
+6036        tdehtml (tokenizer)
+6040        tdehtml (render)
+6041        tdehtml (bidi)
+6045        tdehtml (rendering tree)
+6050        tdehtml (part)
+6060        tdehtml (cache)
+6061        tdehtml (cache-expiredates)
+6070        tdehtml (jscript)
+6080        tdehtml (css)
+6090        tdehtml (memory)
 6100        kjas
-6200        khtml (caret)
-6201        khtml (caret table)
-6210        khtml (editor)
+6200        tdehtml (caret)
+6201        tdehtml (caret table)
+6210        tdehtml (editor)
 
-# libkio
+# libtdeio
 7000        kio
 7001        kio (KDirWatch)
 7002        kio (Slave)
@@ -228,20 +228,20 @@
 7004        kio (KDirListerCache)
 7005        kio (Filter)
 7006        kio (Scheduler)
-7007        kio (KIOJob)
+7007        kio (TDEIOJob)
 7009        kio (KMimeType)
 7010        kio (KRun)
 7011        kio (KSycoca)
 7012        kio (KService*)
 7013        kio (KPing)
-7014        kio (KTrader)
+7014        kio (TDETrader)
 7015        kio (KAutoMount)
-7016        kio (KLauncher)
+7016        kio (TDELauncher)
 7017        kio (KIOConnection)
 7018        kio (KMimeMagic)
-7019        kio (kioslave)
+7019        kio (tdeioslave)
 7020        kded
-7021        kbuildsycoca
+7021        tdebuildsycoca
 7022        kurifilter
 7023        kurifilter (plugins)
 7024        kio (UIServer)
@@ -260,35 +260,35 @@
 7042        KAr
 7043        kio (bookmarks)
 
-# 71xx      are for kioslaves
-7101        kio_file
-7102        kio_ftp
-7103        kio_http
+# 71xx      are for tdeioslaves
+7101        tdeio_file
+7102        tdeio_ftp
+7103        tdeio_http
 7104        kcookiejar
-7105        kio_pop3
-7106        kio_smb
-7107        kio_man
-7108        kio_info
-7109        kio_tar
-7110        kio_gzip
-7111        kio_sql
-7112        kio_smtp
-7113        kio_http_debug
-7114        kio_nntp
-7115        kio_thumbnail
-7116        kio_imap
-7117        kio_audiocd
-7118        kio_bzip2
-7119        kio_help
-7120        kio_sftp
-7121        kio_nfs
-7122        kio_sieve
-7123        kio_kamera
-7124        kio_cgi
-7125        kio_ldap
-7126        kio_devices
-7127        kio_fish
-7128        kio_svn
+7105        tdeio_pop3
+7106        tdeio_smb
+7107        tdeio_man
+7108        tdeio_info
+7109        tdeio_tar
+7110        tdeio_gzip
+7111        tdeio_sql
+7112        tdeio_smtp
+7113        tdeio_http_debug
+7114        tdeio_nntp
+7115        tdeio_thumbnail
+7116        tdeio_imap
+7117        tdeio_audiocd
+7118        tdeio_bzip2
+7119        tdeio_help
+7120        tdeio_sftp
+7121        tdeio_nfs
+7122        tdeio_sieve
+7123        tdeio_kamera
+7124        tdeio_cgi
+7125        tdeio_ldap
+7126        tdeio_devices
+7127        tdeio_fish
+7128        tdeio_svn
 
 # tdesdk
 8100        kompare
@@ -427,8 +427,8 @@
 20011        KDB (Connection)
 20012        KDB (plugin)
 
-#kfilereplace
-23000 	     KFileReplace (kfilereplacepart)
+#tdefilereplace
+23000 	     KFileReplace (tdefilereplacepart)
 
 #klinkstatus
 23100        KLinkStatus
@@ -556,7 +556,7 @@
 66666	noatun
 67000	kscd
 67100	kmix
-67200	kmid
+67200	tdemid
 
 # tdebindings
 70001	dcoppython
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 9f2d1458c..656edf6f9 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -27,13 +27,13 @@
 
 #include "kdebugdcopiface.h"
 
-#include "kapplication.h"
-#include "kglobal.h"
+#include "tdeapplication.h"
+#include "tdeglobal.h"
 #include "kinstance.h"
 #include "kstandarddirs.h"
 
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqintdict.h>
 #include <tqstring.h>
@@ -55,7 +55,7 @@
 #include <syslog.h>
 #include <errno.h>
 #include <string.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kstaticdeleter.h"
 #include <config.h>
 
@@ -81,8 +81,8 @@ static TQCString getDescrFromNum(unsigned int _num)
 {
   if (!KDebugCache) {
     kdd.setObject(KDebugCache, new TQIntDict<KDebugEntry>( 601 ));
-    // Do not call this deleter from ~KApplication
-    KGlobal::unregisterStaticDeleter(&kdd);
+    // Do not call this deleter from ~TDEApplication
+    TDEGlobal::unregisterStaticDeleter(&kdd);
     KDebugCache->setAutoDelete(true);
   }
 
@@ -162,7 +162,7 @@ struct kDebugPrivate {
 
   TQCString aAreaName;
   unsigned int oldarea;
-  KConfig *config;
+  TDEConfig *config;
 };
 
 static kDebugPrivate *kDebug_data = 0;
@@ -175,8 +175,8 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
   if ( !kDebug_data )
   {
       pcd.setObject(kDebug_data, new kDebugPrivate());
-      // Do not call this deleter from ~KApplication
-      KGlobal::unregisterStaticDeleter(&pcd);
+      // Do not call this deleter from ~TDEApplication
+      TDEGlobal::unregisterStaticDeleter(&pcd);
 
       // create the dcop interface if it has not been created yet
       if (!kDebugDCOPIface)
@@ -185,25 +185,25 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
       }
   }
 
-  if (!kDebug_data->config && KGlobal::_instance )
+  if (!kDebug_data->config && TDEGlobal::_instance )
   {
-      kDebug_data->config = new KConfig("kdebugrc", false, false);
+      kDebug_data->config = new TDEConfig("kdebugrc", false, false);
       kDebug_data->config->setGroup("0");
 
       //AB: this is necessary here, otherwise all output with area 0 won't be
       //prefixed with anything, unless something with area != 0 is called before
-      if ( KGlobal::_instance )
-        kDebug_data->aAreaName = KGlobal::instance()->instanceName();
+      if ( TDEGlobal::_instance )
+        kDebug_data->aAreaName = TDEGlobal::instance()->instanceName();
   }
 
   if (kDebug_data->config && kDebug_data->oldarea != nArea) {
     kDebug_data->config->setGroup( TQString::number(static_cast<int>(nArea)) );
     kDebug_data->oldarea = nArea;
-    if ( nArea > 0 && KGlobal::_instance )
+    if ( nArea > 0 && TDEGlobal::_instance )
       kDebug_data->aAreaName = getDescrFromNum(nArea);
     if ((nArea == 0) || kDebug_data->aAreaName.isEmpty())
-      if ( KGlobal::_instance )
-        kDebug_data->aAreaName = KGlobal::instance()->instanceName();
+      if ( TDEGlobal::_instance )
+        kDebug_data->aAreaName = TDEGlobal::instance()->instanceName();
   }
 
   int nPriority = 0;
diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h
index 1121d3679..d8a1998f9 100644
--- a/tdecore/kdebug.h
+++ b/tdecore/kdebug.h
@@ -422,7 +422,7 @@ kdbgstream &kdbgstream::operator<<( const TQValueList<T> &list )
 }
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Prints an "\n".
  * @param s the debug stream to write to
  * @return the debug stream (@p s)
@@ -430,7 +430,7 @@ kdbgstream &kdbgstream::operator<<( const TQValueList<T> &list )
 inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Flushes the stream.
  * @param s the debug stream to write to
  * @return the debug stream (@p s)
@@ -440,7 +440,7 @@ inline kdbgstream &flush( kdbgstream &s) { s.flush(); return s; }
 TDECORE_EXPORT kdbgstream &perror( kdbgstream &s);
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * kndbgstream is a dummy variant of kdbgstream. All functions do
  * nothing.
  * @see kndDebug()
@@ -590,7 +590,7 @@ inline kndbgstream &flush( kndbgstream & s) { return s; }
 inline kndbgstream &perror( kndbgstream & s) { return s; }
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Returns a debug stream. You can use it to print debug
  * information.
  * @param area an id to identify the output, 0 for default
@@ -599,13 +599,13 @@ inline kndbgstream &perror( kndbgstream & s) { return s; }
 TDECORE_EXPORT kdbgstream kdDebug(int area = 0);
 TDECORE_EXPORT kdbgstream kdDebug(bool cond, int area = 0);
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Returns a backtrace.
  * @return a backtrace
  */
 TDECORE_EXPORT TQString kdBacktrace();
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Returns a backtrace.
  * @param levels the number of levels of the backtrace
  * @return a backtrace
@@ -623,7 +623,7 @@ inline TQString kndBacktrace() { return TQString::null; }
 inline TQString kndBacktrace(int) { return TQString::null; }
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Returns a warning stream. You can use it to print warning
  * information.
  * @param area an id to identify the output, 0 for default
@@ -631,7 +631,7 @@ inline TQString kndBacktrace(int) { return TQString::null; }
 TDECORE_EXPORT kdbgstream kdWarning(int area = 0);
 TDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0);
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Returns an error stream. You can use it to print error
  * information.
  * @param area an id to identify the output, 0 for default
@@ -639,7 +639,7 @@ TDECORE_EXPORT kdbgstream kdWarning(bool cond, int area = 0);
 TDECORE_EXPORT kdbgstream kdError(int area = 0);
 TDECORE_EXPORT kdbgstream kdError(bool cond, int area = 0);
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Returns a fatal error stream. You can use it to print fatal error
  * information.
  * @param area an id to identify the output, 0 for default
@@ -648,7 +648,7 @@ TDECORE_EXPORT kdbgstream kdFatal(int area = 0);
 TDECORE_EXPORT kdbgstream kdFatal(bool cond, int area = 0);
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Deletes the kdebugrc cache and therefore forces KDebug to reread the
  * config file
  */
diff --git a/tdecore/kdebugrc b/tdecore/kdebugrc
index 10032a633..dbf3ed53f 100644
--- a/tdecore/kdebugrc
+++ b/tdecore/kdebugrc
@@ -32,7 +32,7 @@
 # AbortFatal=1
 #
 
-# KAccel debug info off
+# TDEAccel debug info off
 [125]
 InfoOutput=4
 
@@ -40,19 +40,19 @@ InfoOutput=4
 [131]
 InfoOutput=4
 
-# KAction debug info off
+# TDEAction debug info off
 [129]
 InfoOutput=4
 
-# KStartupInfo debug info off
+# TDEStartupInfo debug info off
 [172]
 InfoOutput=4
 
-# KLocale debug info off
+# TDELocale debug info off
 [173]
 InfoOutput=4
 
-# KMainWindow debug info off
+# TDEMainWindow debug info off
 [200]
 InfoOutput=4
 
@@ -60,7 +60,7 @@ InfoOutput=4
 [250]
 InfoOutput=4
 
-# KIconloader debug info off
+# TDEIconloader debug info off
 [264]
 InfoOutput=4
 
@@ -96,7 +96,7 @@ InfoOutput=4
 [5400]
 InfoOutput=4
 
-# kabc/vcard
+# tdeabc/vcard
 [5710]
 InfoOutput=4
 
@@ -112,7 +112,7 @@ InfoOutput=4
 [5901]
 InfoOutput=4
 
-# kio_http_debug debug info off
+# tdeio_http_debug debug info off
 [7113]
 InfoOutput=4
 
@@ -120,7 +120,7 @@ InfoOutput=4
 [7118]
 InfoOutput=4
 
-# kio_nntp debug info off
+# tdeio_nntp debug info off
 [7114]
 InfoOutput=4
 
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index 02dfb1d5f..b385eeb18 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -30,21 +30,21 @@
 
 #include <kdebug.h>
 #include "kurl.h"
-#include "kconfigbackend.h"
-#include "kapplication.h"
+#include "tdeconfigbackend.h"
+#include "tdeapplication.h"
 #include "kstandarddirs.h"
 #include "kmountpoint.h"
 #include "kcatalogue.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "kdesktopfile.h"
 #include "kdesktopfile.moc"
 
 KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly,
 			   const char * resType)
-  : KConfig(TQString::fromLatin1(""), bReadOnly, false)
+  : TDEConfig(TQString::fromLatin1(""), bReadOnly, false)
 {
-  // KConfigBackEnd will try to locate the filename that is provided
+  // TDEConfigBackEnd will try to locate the filename that is provided
   // based on the resource type specified, _only_ if the filename
   // is not an absolute path.
   backEnd->changeFileName(fileName, resType, false);
@@ -67,7 +67,7 @@ TQString KDesktopFile::locateLocal(const TQString &path)
     if (!TQDir::isRelativePath(local))
     {
       // Relative wrt apps?
-      local = KGlobal::dirs()->relativeLocation("apps", path);
+      local = TDEGlobal::dirs()->relativeLocation("apps", path);
     }
 
     if (TQDir::isRelativePath(local))
@@ -78,7 +78,7 @@ TQString KDesktopFile::locateLocal(const TQString &path)
     {
       // XDG Desktop menu items come with absolute paths, we need to 
       // extract their relative path and then build a local path.
-      local = KGlobal::dirs()->relativeLocation("xdgdata-dirs", local);
+      local = TDEGlobal::dirs()->relativeLocation("xdgdata-dirs", local);
       if (!TQDir::isRelativePath(local))
       {
         // Hm, that didn't work...
@@ -98,7 +98,7 @@ TQString KDesktopFile::locateLocal(const TQString &path)
     {
       // XDG Desktop menu items come with absolute paths, we need to 
       // extract their relative path and then build a local path.
-      local = KGlobal::dirs()->relativeLocation("xdgdata-apps", path);
+      local = TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path);
       if (!TQDir::isRelativePath(local))
       {
         // What now? Use filename only and hope for the best.
@@ -133,7 +133,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const TQString& path)
   if (TQDir::isRelativePath(path))
      return true; // Relative paths are ok.
      
-  KStandardDirs *dirs = KGlobal::dirs();
+  TDEStandardDirs *dirs = TDEGlobal::dirs();
   if (TQDir::isRelativePath( dirs->relativeLocation("apps", path) ))
      return true;
   if (TQDir::isRelativePath( dirs->relativeLocation("xdgdata-apps", path) ))
@@ -157,7 +157,7 @@ TQString KDesktopFile::translatedEntry(const char* key) const
     TQString fName = fileName();
     fName = fName.mid(fName.findRev('/')+1);
     TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value;
-    TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data());
+    TQString po_value = TDEGlobal::locale()->translate(po_lookup_key.utf8().data());
 
     if (po_value == po_lookup_key)
       return value;
@@ -346,7 +346,7 @@ KDesktopFile::sortOrder() const
 }
 
 void KDesktopFile::virtual_hook( int id, void* data )
-{ KConfig::virtual_hook( id, data ); }
+{ TDEConfig::virtual_hook( id, data ); }
 
 TQString KDesktopFile::readDocPath() const
 {
@@ -361,7 +361,7 @@ TQString KDesktopFile::readDocPath() const
 KDesktopFile* KDesktopFile::copyTo(const TQString &file) const
 {
   KDesktopFile *config = new KDesktopFile(TQString::null, false);
-  KConfig::copyTo(file, config);
+  TDEConfig::copyTo(file, config);
   config->setDesktopGroup();
   return config;
 }
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index ff19981cd..60e9fc096 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -19,7 +19,7 @@
 #ifndef _KDESKTOPFILE_H
 #define _KDESKTOPFILE_H
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "tdelibs_export.h"
 
 class KDesktopFilePrivate;
@@ -28,10 +28,10 @@ class KDesktopFilePrivate;
  * KDE Desktop File Management.
  *
  * @author Pietro Iglio <iglio@kde.org>
- * @see  KConfigBase  KConfig
+ * @see  TDEConfigBase  TDEConfig
  * @short KDE Desktop File Management class
  */
-class TDECORE_EXPORT KDesktopFile : public KConfig
+class TDECORE_EXPORT KDesktopFile : public TDEConfig
 {
   Q_OBJECT
 
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index 8b9b4804e..964cd49be 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -21,12 +21,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <pwd.h>
 #include <signal.h>
@@ -36,22 +36,22 @@ static const char description[] =
 
 static const char version[] = "0.1";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
 {
-    KAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description,
-		     KAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net");
+    TDEAboutData about("kdetcompmgr", I18N_NOOP("kdetcompmgr"), version, description,
+		     TDEAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net");
     about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
-    KConfig config("twinrc", true);
+    TDEConfig config("twinrc", true);
     config.setGroup( "Notification Messages" );
     if (!config.readBoolEntry("UseTranslucency",false)) {
         // Attempt to load the kompmgr pid file
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
     }
 
      if (app.detectCompositionManagerAvailable(false, false)) {		// Perform a shallow check for the composite extension (a deep check would cause noticeable flicker)
-	KConfig config2("twinrc", true);
+	TDEConfig config2("twinrc", true);
 	config2.setGroup( "Notification Messages" );
 	if (config2.readBoolEntry("UseTranslucency",false)) {
 		app.detectCompositionManagerAvailable(true, true);
diff --git a/tdecore/kentities.c b/tdecore/kentities.c
index 8181e5a6c..141ed9db0 100644
--- a/tdecore/kentities.c
+++ b/tdecore/kentities.c
@@ -53,7 +53,7 @@
   
     kentities.gperf: input file to generate a hash table for entities
     kentities.c: DO NOT EDIT! generated by the command
-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
+    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 tdehtmlentities.gperf > entities.c"
     from kentities.gperf
 
     $Id$     
diff --git a/tdecore/kentities.gperf b/tdecore/kentities.gperf
index 08f712707..5d848b837 100644
--- a/tdecore/kentities.gperf
+++ b/tdecore/kentities.gperf
@@ -22,7 +22,7 @@
   
     kentities.gperf: input file to generate a hash table for entities
     kentities.c: DO NOT EDIT! generated by the command
-    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c"
+    "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 tdehtmlentities.gperf > entities.c"
     from kentities.gperf
 
     $Id$     
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index cd74f9ad0..de1735382 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -72,8 +72,8 @@ public:
   KResolver resLocal;		// binding resolution
   unsigned current;		// used by the asynchronous connection
 
-  ::KSocketAddress *local;	// local socket address
-  ::KSocketAddress *peer;	// peer socket address
+  ::TDESocketAddress *local;	// local socket address
+  ::TDESocketAddress *peer;	// peer socket address
 
   TQSocketNotifier *qsnIn, *qsnOut;
   int inMaxSize, outMaxSize;
@@ -718,7 +718,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
  * if we have done this already, we return it. Otherwise, we'll have
  * to find the socket name
  */
-const ::KSocketAddress *KExtendedSocket::localAddress()
+const ::TDESocketAddress *KExtendedSocket::localAddress()
 {
   if (d->local != NULL)
     return d->local;
@@ -733,7 +733,7 @@ const ::KSocketAddress *KExtendedSocket::localAddress()
  * passiveSocket and that we require to be connected already. Also note that
  * the behavior on connectionless sockets is not defined here.
  */
-const ::KSocketAddress* KExtendedSocket::peerAddress()
+const ::TDESocketAddress* KExtendedSocket::peerAddress()
 {
   if (d->peer != NULL)
     return d->peer;
@@ -1570,7 +1570,7 @@ qint64 KExtendedSocket::bytesAvailable() const
   // as of now, we don't do any extra processing
   // we only work in input-buffered sockets
   if (d->flags & inputBufferedSocket)
-    return KBufferedIO::bytesAvailable();
+    return TDEBufferedIO::bytesAvailable();
 
   return 0;			// TODO: FIONREAD ioctl
 }
@@ -2002,7 +2002,7 @@ int KExtendedSocket::resolve(sockaddr *sock, ksocklen_t len, TQString &host,
   return err;
 }
 
-int KExtendedSocket::resolve(::KSocketAddress *sock, TQString &host, TQString &port,
+int KExtendedSocket::resolve(::TDESocketAddress *sock, TQString &host, TQString &port,
 			     int flags)
 {
   return resolve(sock->data, sock->datasize, host, port, flags);
@@ -2058,7 +2058,7 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
 	  ai->ai->ai_addr = 0;
 	}
 
-      ai->addr = ::KSocketAddress::newAddress(ai->ai->ai_addr, ai->ai->ai_addrlen);
+      ai->addr = ::TDESocketAddress::newAddress(ai->ai->ai_addr, ai->ai->ai_addrlen);
 
       l.append(ai);
     }
@@ -2069,9 +2069,9 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
   return l;
 }
 
-::KSocketAddress *KExtendedSocket::localAddress(int fd)
+::TDESocketAddress *KExtendedSocket::localAddress(int fd)
 {
-  ::KSocketAddress *local;
+  ::TDESocketAddress *local;
   struct sockaddr static_sa, *sa = &static_sa;
   ksocklen_t len = sizeof(static_sa);
 
@@ -2106,20 +2106,20 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
 	  return NULL;
 	}
 
-      local = ::KSocketAddress::newAddress(sa, len);
+      local = ::TDESocketAddress::newAddress(sa, len);
       free(sa);
     }
   else
-    local = ::KSocketAddress::newAddress(sa, len);
+    local = ::TDESocketAddress::newAddress(sa, len);
 
   return local;
 }
 
 /* This is exactly the same code as localAddress, except
  * we call getpeername here */
-::KSocketAddress *KExtendedSocket::peerAddress(int fd)
+::TDESocketAddress *KExtendedSocket::peerAddress(int fd)
 {
-  ::KSocketAddress *peer;
+  ::TDESocketAddress *peer;
   struct sockaddr static_sa, *sa = &static_sa;
   ksocklen_t len = sizeof(static_sa);
 
@@ -2154,11 +2154,11 @@ TQPtrList<KAddressInfo> KExtendedSocket::lookup(const TQString& host, const TQSt
 	  return NULL;
 	}
 
-      peer = ::KSocketAddress::newAddress(sa, len);
+      peer = ::TDESocketAddress::newAddress(sa, len);
       free(sa);
     }
   else
-    peer = ::KSocketAddress::newAddress(sa, len);
+    peer = ::TDESocketAddress::newAddress(sa, len);
 
   return peer;
 }
@@ -2204,7 +2204,7 @@ KAddressInfo::KAddressInfo(addrinfo *p)
       ai->ai_addrlen = 0;
    }
 
-   addr = ::KSocketAddress::newAddress(ai->ai_addr, ai->ai_addrlen);
+   addr = ::TDESocketAddress::newAddress(ai->ai_addr, ai->ai_addrlen);
 }
 #endif
 KAddressInfo::~KAddressInfo()
@@ -2246,6 +2246,6 @@ const char* KAddressInfo::canonname() const
 }
 
 void KExtendedSocket::virtual_hook( int id, void* data )
-{ KBufferedIO::virtual_hook( id, data ); }
+{ TDEBufferedIO::virtual_hook( id, data ); }
 
 #include "kextsock.moc"
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 080898443..fad502c04 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -58,8 +58,8 @@ class KExtendedSocketPrivate;
 /**
  * The extended socket class.
  *
- * This class should be used instead of KSocket whenever the user needs
- * fine-grained control over the socket being created. Unlike KSocket, which
+ * This class should be used instead of TDESocket whenever the user needs
+ * fine-grained control over the socket being created. Unlike TDESocket, which
  * does everything at once, without much intervention, KExtendedSocket allows
  * intervention at every step of the process and the setting of parameters.
  *
@@ -87,12 +87,12 @@ class KExtendedSocketPrivate;
  * @deprecated
  *	This class is now deprecated. Please use the classes in KNetwork for
  *	new programs. In particular, this class is replaced by KNetwork::KStreamSocket
- *	and @ref KNetwork::KServerSocket.
+ *	and @ref KNetwork::TDEServerSocket.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an extended socket
  */
-class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice
+class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice
 {
   Q_OBJECT
   
@@ -491,7 +491,7 @@ public:
    * @return the local socket address, can be 0 if the connection has not been established
    *         yet
    */
-  const ::KSocketAddress *localAddress();
+  const ::TDESocketAddress *localAddress();
 
   /**
    * Returns the peer socket address. Use KExtendedSocket::resolve() to
@@ -499,7 +499,7 @@ public:
    * @return the peer address, can be 0 if the connection has not been established yet
    *         or the socket is passive
    */
-  const ::KSocketAddress *peerAddress();
+  const ::TDESocketAddress *peerAddress();
 
   /**
    * Returns the file descriptor
@@ -582,7 +582,7 @@ public:
    * @li #closed() will only be sent if we are indeed reading from the input
    *    stream. That is, if this socket is buffering the input. See setBufferSize
    *
-   * Note that, in general, functions inherited/overridden from KBufferedIO will only
+   * Note that, in general, functions inherited/overridden from TDEBufferedIO will only
    * work on buffered sockets, like bytesAvailable and bytesToWrite.
    * @return    The return values are:
    * @li 0: success
@@ -964,7 +964,7 @@ public:
    * @param flags	the same flags as getnameinfo()
    * @returns 0 on success, nonzero otherwise.
    */
-  static int resolve(::KSocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED;
+  static int resolve(::TDESocketAddress* sock, TQString& host, TQString& port, int flags = 0) KDE_DEPRECATED;
 
   /** @deprecated
    * This function is now deprecated. Please use @ref KNetwork::KResolver::resolve.
@@ -994,7 +994,7 @@ public:
    * @param fd		the file descriptor
    * @return the local socket address or 0 if an error occurred. Delete after use.
    */
-  static ::KSocketAddress *localAddress(int fd) KDE_DEPRECATED;
+  static ::TDESocketAddress *localAddress(int fd) KDE_DEPRECATED;
 
   /**
    * Returns the peer socket address. Use KExtendedSocket::resolve() to
@@ -1003,7 +1003,7 @@ public:
    * @param fd		the file descriptor
    * @return the peer socket address or 0 if an error occurred. Delete after use.
    */
-  static ::KSocketAddress *peerAddress(int fd) KDE_DEPRECATED;
+  static ::TDESocketAddress *peerAddress(int fd) KDE_DEPRECATED;
 
   /**
    * Returns the representing text of this error code
@@ -1029,8 +1029,8 @@ protected:
 private:
   KExtendedSocketPrivate *d;
 
-  friend class KSocket;
-  friend class KServerSocket;
+  friend class TDESocket;
+  friend class TDEServerSocket;
 };
 
 /** @deprecated
@@ -1043,7 +1043,7 @@ class TDECORE_EXPORT KAddressInfo
 {
 private:
   addrinfo *ai;
-  ::KSocketAddress *addr;
+  ::TDESocketAddress *addr;
 
   inline KAddressInfo() : ai(0), addr(0)
   { }
@@ -1056,10 +1056,10 @@ public:
   ~KAddressInfo();
 
   /**
-   * Returns the KAddressInfo's KSocketAddress.
+   * Returns the KAddressInfo's TDESocketAddress.
    * Only valid as long as the KAddressInfo exists.
    */
-  inline KDE_DEPRECATED operator const ::KSocketAddress*() const 
+  inline KDE_DEPRECATED operator const ::TDESocketAddress*() const 
   { return addr; }
 
   /**
@@ -1076,11 +1076,11 @@ public:
   { return ai; }
 
   /**
-   * Returns the KAddressInfo's KSocketAddress.
+   * Returns the KAddressInfo's TDESocketAddress.
    * Only valid as long as the KAddressInfo exists.
-   * @return the KAddressInfo's KSocketAddress.
+   * @return the KAddressInfo's TDESocketAddress.
    */
-  inline KDE_DEPRECATED const ::KSocketAddress* address() const
+  inline KDE_DEPRECATED const ::TDESocketAddress* address() const
   { return addr; }
 
   /**
@@ -1116,8 +1116,8 @@ public:
   const char* canonname() const KDE_DEPRECATED;
 
   /**
-   * Returns the length of the KSocketAddress.
-   * @return the KSocketAddress's length
+   * Returns the length of the TDESocketAddress.
+   * @return the TDESocketAddress's length
    */
   inline int length() const
   { if (addr) return addr->size(); return 0; }
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index 3faaae7bf..7f2b7b453 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -23,8 +23,8 @@
 #include <ktypelist.h>
 #include <kinstance.h>
 #include <kgenericfactory.tcc>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 /* @internal */
@@ -39,7 +39,7 @@ public:
         s_self = this;
         m_catalogueInitialized = false;
     }
-    KGenericFactoryBase( const KAboutData *data )
+    KGenericFactoryBase( const TDEAboutData *data )
         : m_aboutData(data)
     {
         s_self = this;
@@ -49,30 +49,30 @@ public:
     virtual ~KGenericFactoryBase()
     {
         if ( s_instance )
-            KGlobal::locale()->removeCatalogue( TQString::fromAscii( s_instance->instanceName() ) );
+            TDEGlobal::locale()->removeCatalogue( TQString::fromAscii( s_instance->instanceName() ) );
         delete s_instance;
         s_instance = 0;
         s_self = 0;
     }
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
 protected:
-    virtual KInstance *createInstance()
+    virtual TDEInstance *createInstance()
     {
         if ( m_aboutData )
-            return new KInstance( m_aboutData );
+            return new TDEInstance( m_aboutData );
         if ( m_instanceName.isEmpty() ) {
             kdWarning() << "KGenericFactory: instance requested but no instance name or about data passed to the constructor!" << endl;
             return 0;
         }
-        return new KInstance( m_instanceName );
+        return new TDEInstance( m_instanceName );
     }
 
     virtual void setupTranslations( void )
     {
         if ( instance() )
-            KGlobal::locale()->insertCatalogue( TQString::fromAscii( instance()->instanceName() ) );
+            TDEGlobal::locale()->insertCatalogue( TQString::fromAscii( instance()->instanceName() ) );
     }
 
     void initializeMessageCatalogue()
@@ -86,16 +86,16 @@ protected:
 
 private:
     TQCString m_instanceName;
-    const KAboutData *m_aboutData;
+    const TDEAboutData *m_aboutData;
     bool m_catalogueInitialized;
 
-    static KInstance *s_instance;
+    static TDEInstance *s_instance;
     static KGenericFactoryBase<T> *s_self;
 };
 
 /* @internal */
 template <class T>
-KInstance *KGenericFactoryBase<T>::s_instance = 0;
+TDEInstance *KGenericFactoryBase<T>::s_instance = 0;
 
 /* @internal */
 template <class T>
@@ -103,7 +103,7 @@ KGenericFactoryBase<T> *KGenericFactoryBase<T>::s_self = 0;
 
 /* @internal */
 template <class T>
-KInstance *KGenericFactoryBase<T>::instance()
+TDEInstance *KGenericFactoryBase<T>::instance()
 {
     if ( !s_instance && s_self )
         s_instance = s_self->createInstance();
@@ -141,17 +141,17 @@ KInstance *KGenericFactoryBase<T>::instance()
  * that the caller passed to KLibFactory's create method.
  *
  * In addition upon instantiation this template provides a central
- * KInstance object for your component, accessible through the
+ * TDEInstance object for your component, accessible through the
  * static instance() method. The instanceName argument of the
- * KGenericFactory constructor is passed to the KInstance object.
+ * KGenericFactory constructor is passed to the TDEInstance object.
  *
- * The creation of the KInstance object can be customized by inheriting
+ * The creation of the TDEInstance object can be customized by inheriting
  * from this template class and re-implementing the virtual createInstance
  * method. For example it could look like this:
  * \code
- *     KInstance *MyFactory::createInstance()
+ *     TDEInstance *MyFactory::createInstance()
  *     {
- *         return new KInstance( myAboutData );
+ *         return new TDEInstance( myAboutData );
  *     }
  * \endcode
  *
@@ -180,7 +180,7 @@ public:
     /**
      * @since 3.3
 	*/
-    KGenericFactory( const KAboutData *data )
+    KGenericFactory( const TDEAboutData *data )
         : KGenericFactoryBase<Product>( data )
     {}
 
@@ -224,17 +224,17 @@ protected:
  * that the caller passed to KLibFactory's create method.
  *
  * In addition upon instantiation this template provides a central
- * KInstance object for your component, accessible through the
+ * TDEInstance object for your component, accessible through the
  * static instance() method. The instanceName argument of the
- * KGenericFactory constructor is passed to the KInstance object.
+ * KGenericFactory constructor is passed to the TDEInstance object.
  *
- * The creation of the KInstance object can be customized by inheriting
+ * The creation of the TDEInstance object can be customized by inheriting
  * from this template class and re-implementing the virtual createInstance
  * method. For example it could look like this:
  * \code
- *     KInstance *MyFactory::createInstance()
+ *     TDEInstance *MyFactory::createInstance()
  *     {
- *         return new KInstance( myAboutData );
+ *         return new TDEInstance( myAboutData );
  *     }
  * \endcode
  *
@@ -275,7 +275,7 @@ public:
     /**
      * @since 3.3
 	*/
-    KGenericFactory( const KAboutData *data )
+    KGenericFactory( const TDEAboutData *data )
         : KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data )
     {}
 
@@ -319,17 +319,17 @@ protected:
  * that the caller passed to KLibFactory's create method.
  *
  * In addition upon instantiation this template provides a central
- * KInstance object for your component, accessible through the
+ * TDEInstance object for your component, accessible through the
  * static instance() method. The instanceName argument of the
- * KGenericFactory constructor is passed to the KInstance object.
+ * KGenericFactory constructor is passed to the TDEInstance object.
  *
- * The creation of the KInstance object can be customized by inheriting
+ * The creation of the TDEInstance object can be customized by inheriting
  * from this template class and re-implementing the virtual createInstance
  * method. For example it could look like this:
  * \code
- *     KInstance *MyFactory::createInstance()
+ *     TDEInstance *MyFactory::createInstance()
  *     {
- *         return new KInstance( myAboutData );
+ *         return new TDEInstance( myAboutData );
  *     }
  * \endcode
  *
@@ -371,7 +371,7 @@ public:
 	/**
 	* @since 3.3
 	*/
-    KGenericFactory( const KAboutData *data )
+    KGenericFactory( const TDEAboutData *data )
         : KGenericFactoryBase< KTypeList<Product, ProductListTail> >( data )
     {}
 
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index 32ed04f3f..746721e40 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -29,53 +29,53 @@
 #endif
 
 #include <tqstring.h>
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include <kdebug.h>
-#include <kshortcut.h>
-#include <klocale.h>
+#include <tdeshortcut.h>
+#include <tdelocale.h>
 
 //----------------------------------------------------
 
-KGlobalAccel::KGlobalAccel( TQObject* pParent, const char* psName )
+TDEGlobalAccel::TDEGlobalAccel( TQObject* pParent, const char* psName )
 : TQObject( pParent, psName )
 {
-	kdDebug(125) << "KGlobalAccel(): this = " << this << endl;
-	d = new KGlobalAccelPrivate();
+	kdDebug(125) << "TDEGlobalAccel(): this = " << this << endl;
+	d = new TDEGlobalAccelPrivate();
 }
 
-KGlobalAccel::~KGlobalAccel()
+TDEGlobalAccel::~TDEGlobalAccel()
 {
-	kdDebug(125) << "~KGlobalAccel(): this = " << this << endl;
+	kdDebug(125) << "~TDEGlobalAccel(): this = " << this << endl;
 	delete d;
 }
 
 /*
-void KGlobalAccel::clear()
+void TDEGlobalAccel::clear()
 	{ d->clearActions(); }
 */
-KAccelActions& KGlobalAccel::actions()
-	{ return d->KAccelBase::actions(); }
+TDEAccelActions& TDEGlobalAccel::actions()
+	{ return d->TDEAccelBase::actions(); }
 
-const KAccelActions& KGlobalAccel::actions() const
-	{ return d->KAccelBase::actions(); }
+const TDEAccelActions& TDEGlobalAccel::actions() const
+	{ return d->TDEAccelBase::actions(); }
 
-bool KGlobalAccel::isEnabled()
-	{ return ((KAccelBase*)d)->isEnabled(); }
+bool TDEGlobalAccel::isEnabled()
+	{ return ((TDEAccelBase*)d)->isEnabled(); }
 
-void KGlobalAccel::setEnabled( bool bEnabled )
+void TDEGlobalAccel::setEnabled( bool bEnabled )
 	{ d->setEnabled( bEnabled ); }
 
-void KGlobalAccel::suspend( bool s )
+void TDEGlobalAccel::suspend( bool s )
 	{ d->suspend( s ); }
 
-void KGlobalAccel::blockShortcuts( bool block )
-        { KGlobalAccelPrivate::blockShortcuts( block ); }
+void TDEGlobalAccel::blockShortcuts( bool block )
+        { TDEGlobalAccelPrivate::blockShortcuts( block ); }
 
-void KGlobalAccel::disableBlocking( bool disable )
+void TDEGlobalAccel::disableBlocking( bool disable )
         { d->disableBlocking( disable ); }
 
-KAccelAction* KGlobalAccel::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
-		const KShortcut& cutDef3, const KShortcut& cutDef4,
+TDEAccelAction* TDEGlobalAccel::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
+		const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 		const TQObject* pObjSlot, const char* psMethodSlot,
 		bool bConfigurable, bool bEnabled )
 {
@@ -85,55 +85,55 @@ KAccelAction* KGlobalAccel::insert( const TQString& sAction, const TQString& sDe
 		bConfigurable, bEnabled );
 }
 
-KAccelAction* KGlobalAccel::insert( const TQString& sName, const TQString& sDesc )
+TDEAccelAction* TDEGlobalAccel::insert( const TQString& sName, const TQString& sDesc )
 	{ return d->insert( sName, sDesc ); }
-bool KGlobalAccel::updateConnections()
+bool TDEGlobalAccel::updateConnections()
 	{ return d->updateConnections(); }
 
-bool KGlobalAccel::remove( const TQString& sAction )
+bool TDEGlobalAccel::remove( const TQString& sAction )
         { return d->remove( sAction ); }
 
-const KShortcut& KGlobalAccel::shortcut( const TQString& sAction ) const
+const TDEShortcut& TDEGlobalAccel::shortcut( const TQString& sAction ) const
 {
-	const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction );
-	return (pAction) ? pAction->shortcut() : KShortcut::null();
+	const TDEAccelAction* pAction = d->TDEAccelBase::actions().actionPtr( sAction );
+	return (pAction) ? pAction->shortcut() : TDEShortcut::null();
 }
 
-bool KGlobalAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
+bool TDEGlobalAccel::setShortcut( const TQString& sAction, const TDEShortcut& cut )
 	{ return d->setShortcut( sAction, cut ); }
-bool KGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
+bool TDEGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
 	{ return d->setActionSlot( sAction, pObjSlot, psMethodSlot ); }
-TQString KGlobalAccel::label( const TQString& sAction ) const
+TQString TDEGlobalAccel::label( const TQString& sAction ) const
 {
-	const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction );
+	const TDEAccelAction* pAction = d->TDEAccelBase::actions().actionPtr( sAction );
 	return (pAction) ? pAction->label() : TQString();
 }
-bool KGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable )
+bool TDEGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable )
 {
         return d->setActionEnabled( sAction, bEnable );
 }
 
-const TQString& KGlobalAccel::configGroup() const
+const TQString& TDEGlobalAccel::configGroup() const
 	{ return d->configGroup(); }
 // for tdemultimedia/kmix
-void KGlobalAccel::setConfigGroup( const TQString& s )
+void TDEGlobalAccel::setConfigGroup( const TQString& s )
 	{ d->setConfigGroup( s ); }
 
-bool KGlobalAccel::readSettings( KConfigBase* pConfig )
+bool TDEGlobalAccel::readSettings( TDEConfigBase* pConfig )
 	{ d->readSettings( pConfig ); return true; }
-bool KGlobalAccel::writeSettings( KConfigBase* pConfig ) const
+bool TDEGlobalAccel::writeSettings( TDEConfigBase* pConfig ) const
 	{ d->writeSettings( pConfig ); return true; }
-bool KGlobalAccel::writeSettings( KConfigBase* pConfig, bool bGlobal ) const
+bool TDEGlobalAccel::writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const
 {
 	d->setConfigGlobal( bGlobal );
 	d->writeSettings( pConfig );
 	return true;
 }
 
-bool KGlobalAccel::useFourModifierKeys()
-	{ return KAccelAction::useFourModifierKeys(); }
+bool TDEGlobalAccel::useFourModifierKeys()
+	{ return TDEAccelAction::useFourModifierKeys(); }
 
-void KGlobalAccel::virtual_hook( int, void* )
+void TDEGlobalAccel::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 #include "kglobalaccel.moc"
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index 7fb44a021..a8ed8a955 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -21,49 +21,49 @@
 #define _KGLOBALACCEL_H_
 
 #include <tqobject.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 class TQPopupMenu;
 class TQWidget;
-class KAccelAction;
-class KAccelActions;
-class KConfigBase;
+class TDEAccelAction;
+class TDEAccelActions;
+class TDEConfigBase;
 
-class KGlobalAccelPrivate;
+class TDEGlobalAccelPrivate;
 
 /**
-* KGlobalAccel allows you to have global accelerators that are independent of
-* the focused window. Unlike KAccel it does not matter which window is 
+* TDEGlobalAccel allows you to have global accelerators that are independent of
+* the focused window. Unlike TDEAccel it does not matter which window is 
 * currently active.
 *
-* @see KAccel
-* @see KAccelShortcutList
+* @see TDEAccel
+* @see TDEAccelShortcutList
 * @see KKeyChooser
 * @see KKeyDialog
 * @short Configurable global shortcut support
 */
-class TDECORE_EXPORT KGlobalAccel : public TQObject
+class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 {
 	Q_OBJECT
  public:
 	/**
-	 * Creates a new KGlobalAccel object with the given pParent and
+	 * Creates a new TDEGlobalAccel object with the given pParent and
 	 * psName.
 	 * @param pParent the parent of the QObject
 	 * @param psName the name of the QObject
 	 */
-	KGlobalAccel( TQObject* pParent, const char* psName = 0 );
-	virtual ~KGlobalAccel();
+	TDEGlobalAccel( TQObject* pParent, const char* psName = 0 );
+	virtual ~TDEGlobalAccel();
 
 	/**
 	 * Checks whether the accelerators are enabled.
-	 * @return true if the KGlobalAccel is enabled
+	 * @return true if the TDEGlobalAccel is enabled
 	 */
 	bool isEnabled();
 	
 	/**
-	 * Enables or disables the KGlobalAccel
-	 * @param bEnabled true if the KGlobalAccel should be enabled, false if it
+	 * Enables or disables the TDEGlobalAccel
+	 * @param bEnabled true if the TDEGlobalAccel should be enabled, false if it
 	 *  should be disabled.
 	 */
 	void setEnabled( bool bEnabled );
@@ -90,8 +90,8 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject
 	 * @param bConfigurable Allow the user to change this shortcut if set to 'true'.
 	 * @param bEnabled The action will be activated by the shortcut if set to 'true'.
 	 */
-	KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-	                 const KShortcut& cutDef3, const KShortcut& cutDef4,
+	TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+	                 const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 	                 const TQObject* pObjSlot, const char* psMethodSlot,
 	                 bool bConfigurable = true, bool bEnabled = true );
 
@@ -108,9 +108,9 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject
 	 * displayed when the user configures shortcuts.
 	 * @param sName of the of the action to insert
 	 * @param sLabel a user-readable (i18n!) name for the action
-	 * @return the KAccelAction of the action
+	 * @return the TDEAccelAction of the action
 	 */
-	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
+	TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
 
 	/**
 	 * Updates the connections of the accelerations after changing them. 
@@ -123,14 +123,14 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject
 	 * @param sAction the name of the action
 	 * @return the shortcut. If the action does not exist a null shortcut will be returned.
 	 */
-	const KShortcut& shortcut( const TQString& sAction ) const;
+	const TDEShortcut& shortcut( const TQString& sAction ) const;
 	/**
 	 * Set the shortcut to be associated with the action named by @p sAction.
 	 * @param sAction the name of the action
 	 * @param shortcut the shortcut for the action
 	 * @return true if successful, false otherwise
 	 */
-	bool setShortcut( const TQString& sAction, const KShortcut &shortcut );
+	bool setShortcut( const TQString& sAction, const TDEShortcut &shortcut );
 	/**
 	 * Set the slot to be called when the shortcut of the action named
 	 * by @p sAction is pressed.
@@ -157,26 +157,26 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject
 	/**
 	 * Returns the configuration group that is used to save the accelerators.
 	 * @return the configuration group
-	 * @see KConfig
+	 * @see TDEConfig
 	 */
 	const TQString& configGroup() const;
 
 	/**
 	 * Sets the configuration group that is used to save the accelerators.
 	 * @param cg the configuration group
-	 * @see KConfig
+	 * @see TDEConfig
 	 */
 	void setConfigGroup( const TQString &cg );
 
 	/**
 	 * Read all shortcuts from @p pConfig, or (if @p pConfig
 	 * is zero) from the application's configuration file
-	 * KGlobal::config().
+	 * TDEGlobal::config().
 	 * @param pConfig the configuration file to read from, or 0 for the application
 	 *                 configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool readSettings( KConfigBase* pConfig = 0 );
+	bool readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current shortcuts to @p pConfig,
@@ -187,7 +187,7 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject
 	 * @return true if successful, false otherwise
 	 * @since 3.1
 	 */
-	bool writeSettings( KConfigBase* pConfig = 0 ) const;
+	bool writeSettings( TDEConfigBase* pConfig = 0 ) const;
 	// BCI: merge these two writeSettings methods in KDE 4.0
 	/**
 	 * Write the current shortcuts to @p pConfig,
@@ -199,11 +199,11 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject
 	 * @param bGlobal if true write the configuration to the kde global settings
 	 * @return true if successful, false otherwise
 	 */
-	bool writeSettings( KConfigBase* pConfig, bool bGlobal ) const;
+	bool writeSettings( TDEConfigBase* pConfig, bool bGlobal ) const;
 
 	/**
 	 * @internal -- this a wrapper function to
-	 * KAccelActions::useFourModifierKeys().
+	 * TDEAccelActions::useFourModifierKeys().
 	 */
 	static bool useFourModifierKeys();
         
@@ -219,21 +219,21 @@ class TDECORE_EXPORT KGlobalAccel : public TQObject
         /**
          * @internal
          */
-        // like setEnabled(), but doesn't ungrab (see in KGlobalAccelPrivate)
+        // like setEnabled(), but doesn't ungrab (see in TDEGlobalAccelPrivate)
         void suspend( bool s );
 
 private:
 
-	KAccelActions& actions();
-	const KAccelActions& actions() const;
+	TDEAccelActions& actions();
+	const TDEAccelActions& actions() const;
 
-	friend class KGlobalAccelPrivate;
-	friend class KAccelShortcutList;
+	friend class TDEGlobalAccelPrivate;
+	friend class TDEAccelShortcutList;
 protected:
 	/** \internal */
 	virtual void virtual_hook( int id, void* data );
 private:
-	class KGlobalAccelPrivate* d;
+	class TDEGlobalAccelPrivate* d;
 };
 
 #endif // _KGLOBALACCEL_H_
diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/kglobalaccel_emb.h
index 859a53362..5e5145d66 100644
--- a/tdecore/kglobalaccel_emb.h
+++ b/tdecore/kglobalaccel_emb.h
@@ -1,18 +1,18 @@
 #ifndef _KGLOBALACCEL_EMB_H
 #define _KGLOBALACCEL_EMB_H
 
-#include "kaccelbase.h"
-#include "kshortcut.h"
+#include "tdeaccelbase.h"
+#include "tdeshortcut.h"
 
-class KGlobalAccelPrivate
+class TDEGlobalAccelPrivate
 {
 public:
-	KGlobalAccelPrivate();
+	TDEGlobalAccelPrivate();
 
 	virtual void setEnabled( bool bEnabled );
 
-	virtual bool connectKey( KAccelAction&, KKeySequence );
-	virtual bool disconnectKey( KAccelAction&, KKeySequence );
+	virtual bool connectKey( TDEAccelAction&, KKeySequence );
+	virtual bool disconnectKey( TDEAccelAction&, KKeySequence );
 };
 
 #endif // _KGLOBALACCEL_EMB_H
diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/kglobalaccel_mac.h
index 1bed4f3cc..b2803b0c0 100644
--- a/tdecore/kglobalaccel_mac.h
+++ b/tdecore/kglobalaccel_mac.h
@@ -3,14 +3,14 @@
 
 #include <tqwidget.h>
 
-#include "kshortcut.h"
-#include "kaccelbase.h"
+#include "tdeshortcut.h"
+#include "tdeaccelbase.h"
 
-class KGlobalAccelPrivate: public KAccelBase
+class TDEGlobalAccelPrivate: public TDEAccelBase
 {
 public:
-    KGlobalAccelPrivate()
-        : KAccelBase(KAccelBase::NATIVE_KEYS)
+    TDEGlobalAccelPrivate()
+        : TDEAccelBase(TDEAccelBase::NATIVE_KEYS)
     {}
 
     // reimplemented pure virtuals
@@ -18,11 +18,11 @@ public:
     { Q_UNUSED(bEnabled); }
     bool emitSignal( Signal signal )
     { Q_UNUSED(signal); return false; }
-    bool connectKey( KAccelAction& action, const KKeyServer::Key& key)
+    bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key)
     { Q_UNUSED(action); Q_UNUSED(key); return false; }
     bool connectKey( const KKeyServer::Key& key)
     { Q_UNUSED(key); return false; }
-    bool disconnectKey( KAccelAction&, const KKeyServer::Key& key)
+    bool disconnectKey( TDEAccelAction&, const KKeyServer::Key& key)
     { Q_UNUSED(key); return false; }
     bool disconnectKey( const KKeyServer::Key& )
     { return false; }
diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp
index 4323320bc..09c216b99 100644
--- a/tdecore/kglobalaccel_win.cpp
+++ b/tdecore/kglobalaccel_win.cpp
@@ -31,27 +31,27 @@
 #include <tqwidget.h>
 #include <tqmetaobject.h>
 #include <private/qucomextra_p.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kkeynative.h>
 
 //----------------------------------------------------
 
-static TQValueList< KGlobalAccelPrivate* >* all_accels = 0;
+static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0;
 
-KGlobalAccelPrivate::KGlobalAccelPrivate()
-: KAccelBase( KAccelBase::NATIVE_KEYS )
+TDEGlobalAccelPrivate::TDEGlobalAccelPrivate()
+: TDEAccelBase( TDEAccelBase::NATIVE_KEYS )
 , m_blocked( false )
 , m_blockingDisabled( false )
 {
         if( all_accels == NULL )
-            all_accels = new TQValueList< KGlobalAccelPrivate* >;
+            all_accels = new TQValueList< TDEGlobalAccelPrivate* >;
         all_accels->append( this );
 	m_sConfigGroup = "Global Shortcuts";
 //	kapp->installX11EventFilter( this );
 }
 
-KGlobalAccelPrivate::~KGlobalAccelPrivate()
+TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate()
 {
 	// TODO: Need to release all grabbed keys if the main window is not shutting down.
 	//for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
@@ -64,17 +64,17 @@ KGlobalAccelPrivate::~KGlobalAccelPrivate()
         }
 }
 
-void KGlobalAccelPrivate::setEnabled( bool bEnable )
+void TDEGlobalAccelPrivate::setEnabled( bool bEnable )
 {
 	m_bEnabled = bEnable;
 	//updateConnections();
 }
 
-void KGlobalAccelPrivate::blockShortcuts( bool block )
+void TDEGlobalAccelPrivate::blockShortcuts( bool block )
 {
         if( all_accels == NULL )
             return;
-        for( TQValueList< KGlobalAccelPrivate* >::ConstIterator it = all_accels->begin();
+        for( TQValueList< TDEGlobalAccelPrivate* >::ConstIterator it = all_accels->begin();
              it != all_accels->end();
              ++it ) {
             if( (*it)->m_blockingDisabled )
@@ -84,35 +84,35 @@ void KGlobalAccelPrivate::blockShortcuts( bool block )
         }
 }
 
-void KGlobalAccelPrivate::disableBlocking( bool block )
+void TDEGlobalAccelPrivate::disableBlocking( bool block )
 {
         m_blockingDisabled = block;
 }
 
-bool KGlobalAccelPrivate::isEnabledInternal() const
+bool TDEGlobalAccelPrivate::isEnabledInternal() const
 {
-        return KAccelBase::isEnabled() && !m_blocked;
+        return TDEAccelBase::isEnabled() && !m_blocked;
 }
 
-bool KGlobalAccelPrivate::emitSignal( Signal )
+bool TDEGlobalAccelPrivate::emitSignal( Signal )
 {
 	return false;
 }
 
-bool KGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& key )
 	{ return grabKey( key, true, &action ); }
-bool KGlobalAccelPrivate::connectKey( const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key )
 	{ return grabKey( key, true, 0 ); }
-bool KGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key )
 	{ return grabKey( key, false, &action ); }
-bool KGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key )
 	{ return grabKey( key, false, 0 ); }
 
-bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction )
+bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDEAccelAction* pAction )
 {
 	/*
 	if( !key.code() ) {
-		kdWarning(125) << "KGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl;
+		kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl;
 		return false;
 	}
 
@@ -190,7 +190,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 	return false;
 }
 
-/*bool KGlobalAccelPrivate::x11Event( XEvent* pEvent )
+/*bool TDEGlobalAccelPrivate::x11Event( XEvent* pEvent )
 {
 	//kdDebug(125) << "x11EventFilter( type = " << pEvent->type << " )" << endl;
 	switch( pEvent->type ) {
@@ -206,9 +206,9 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 	}
 }
 
-void KGlobalAccelPrivate::x11MappingNotify()
+void TDEGlobalAccelPrivate::x11MappingNotify()
 {
-	kdDebug(125) << "KGlobalAccelPrivate::x11MappingNotify()" << endl;
+	kdDebug(125) << "TDEGlobalAccelPrivate::x11MappingNotify()" << endl;
 	if( m_bEnabled ) {
 		// Maybe the X modifier map has been changed.
 		KKeyServer::initializeMods();
@@ -218,7 +218,7 @@ void KGlobalAccelPrivate::x11MappingNotify()
 	}
 }
 
-bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
+bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 {
 	// do not change this line unless you really really know what you are doing (Matthias)
 	if ( !TQWidget::keyboardGrabber() && !TQApplication::activePopupWidget() ) {
@@ -268,7 +268,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
-			KAccelAction* pAction = *it;
+			TDEAccelAction* pAction = *it;
 			kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16)
 				<< (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString::null)
 				<< endl;
@@ -276,7 +276,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 #endif
 		return false;
 	}
-	KAccelAction* pAction = m_rgCodeModToAction[codemod];
+	TDEAccelAction* pAction = m_rgCodeModToAction[codemod];
 
 	if( !pAction ) {
                 static bool recursion_block = false;
@@ -297,9 +297,9 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 	return true;
 }*/
 
-void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq )
+void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequence& seq )
 {
-	kdDebug(125) << "KGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl;
+	kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl;
 
 	TQRegExp rexPassIndex( "([ ]*int[ ]*)" );
 	TQRegExp rexPassInfo( " TQString" );
@@ -333,9 +333,9 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
 	}
 }
 
-void KGlobalAccelPrivate::slotActivated( int iAction )
+void TDEGlobalAccelPrivate::slotActivated( int iAction )
 {
-	KAccelAction* pAction = actions().actionPtr( iAction );
+	TDEAccelAction* pAction = actions().actionPtr( iAction );
 	if( pAction )
 		activate( pAction, KKeySequence() );
 }
diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h
index 414254881..e60fed8ee 100644
--- a/tdecore/kglobalaccel_win.h
+++ b/tdecore/kglobalaccel_win.h
@@ -23,27 +23,27 @@
 #include <tqmap.h>
 #include <tqwidget.h>
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include "kkeyserver.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 /**
  * @internal
  */
-class KGlobalAccelPrivate : public TQWidget, public KAccelBase
+class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
 {
-	friend class KGlobalAccel;
+	friend class TDEGlobalAccel;
 	Q_OBJECT
  public:
-	KGlobalAccelPrivate();
-	virtual ~KGlobalAccelPrivate();
+	TDEGlobalAccelPrivate();
+	virtual ~TDEGlobalAccelPrivate();
 
 	virtual void setEnabled( bool bEnabled );
 
 	virtual bool emitSignal( Signal signal );
-	virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key );
+	virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key );
 	virtual bool connectKey( const KKeyServer::Key& key );
-	virtual bool disconnectKey( KAccelAction& action, const KKeyServer::Key& key );
+	virtual bool disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key );
 	virtual bool disconnectKey( const KKeyServer::Key& key );
 
  protected:
@@ -51,7 +51,7 @@ class KGlobalAccelPrivate : public TQWidget, public KAccelBase
 	/**
 	 * @param bGrab Set to true to grab key, false to ungrab key.
 	 */
-	bool grabKey( const KKeyServer::Key&, bool bGrab, KAccelAction* );
+	bool grabKey( const KKeyServer::Key&, bool bGrab, TDEAccelAction* );
 
 	/**
 	 * Filters X11 events ev for key bindings in the accelerator dictionary.
@@ -63,7 +63,7 @@ class KGlobalAccelPrivate : public TQWidget, public KAccelBase
 //	virtual bool x11Event( XEvent* );
 //	void x11MappingNotify();
 //	bool x11KeyPress( const XEvent *pEvent );
-	void activate( KAccelAction* pAction, const KKeySequence& seq );
+	void activate( TDEAccelAction* pAction, const KKeySequence& seq );
 	virtual bool isEnabledInternal() const;
 	static void blockShortcuts( bool block );
 	void disableBlocking( bool disable );
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index 260bc39e1..2a67c73b5 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -31,7 +31,7 @@
 #include <tqwidget.h>
 #include <tqmetaobject.h>
 #include <tqucomextra_p.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kkeynative.h>
 
@@ -77,23 +77,23 @@ static void calculateGrabMasks()
 
 //----------------------------------------------------
 
-static TQValueList< KGlobalAccelPrivate* >* all_accels = 0;
+static TQValueList< TDEGlobalAccelPrivate* >* all_accels = 0;
 
-KGlobalAccelPrivate::KGlobalAccelPrivate()
-: KAccelBase( KAccelBase::NATIVE_KEYS )
+TDEGlobalAccelPrivate::TDEGlobalAccelPrivate()
+: TDEAccelBase( TDEAccelBase::NATIVE_KEYS )
 , m_blocked( false )
 , m_blockingDisabled( false )
 , m_suspended( false )
 {
         if( all_accels == NULL )
-            all_accels = new TQValueList< KGlobalAccelPrivate* >;
+            all_accels = new TQValueList< TDEGlobalAccelPrivate* >;
         all_accels->append( this );
 	m_sConfigGroup = "Global Shortcuts";
 	kapp->installX11EventFilter( this );
 	connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int)));
 }
 
-KGlobalAccelPrivate::~KGlobalAccelPrivate()
+TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate()
 {
 	// TODO: Need to release all grabbed keys if the main window is not shutting down.
 	//for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
@@ -106,17 +106,17 @@ KGlobalAccelPrivate::~KGlobalAccelPrivate()
         }
 }
 
-void KGlobalAccelPrivate::setEnabled( bool bEnable )
+void TDEGlobalAccelPrivate::setEnabled( bool bEnable )
 {
 	m_bEnabled = bEnable;
 	updateConnections();
 }
 
-void KGlobalAccelPrivate::blockShortcuts( bool block )
+void TDEGlobalAccelPrivate::blockShortcuts( bool block )
 {
         if( all_accels == NULL )
             return;
-        for( TQValueList< KGlobalAccelPrivate* >::ConstIterator it = all_accels->begin();
+        for( TQValueList< TDEGlobalAccelPrivate* >::ConstIterator it = all_accels->begin();
              it != all_accels->end();
              ++it ) {
             if( (*it)->m_blockingDisabled )
@@ -126,41 +126,41 @@ void KGlobalAccelPrivate::blockShortcuts( bool block )
         }
 }
 
-void KGlobalAccelPrivate::disableBlocking( bool block )
+void TDEGlobalAccelPrivate::disableBlocking( bool block )
 {
         m_blockingDisabled = block;
 }
 
-bool KGlobalAccelPrivate::isEnabledInternal() const
+bool TDEGlobalAccelPrivate::isEnabledInternal() const
 {
-        return KAccelBase::isEnabled() && !m_blocked;
+        return TDEAccelBase::isEnabled() && !m_blocked;
 }
 
 // see #117169 - the bug is hard to reproduce, probably somewhere in X, testcase would be probably
 // difficult to make, and so on - just don't release the grabs and only ignore the events instead
-void KGlobalAccelPrivate::suspend( bool s )
+void TDEGlobalAccelPrivate::suspend( bool s )
 {
 	m_suspended = s;
 }
 
-bool KGlobalAccelPrivate::emitSignal( Signal )
+bool TDEGlobalAccelPrivate::emitSignal( Signal )
 {
 	return false;
 }
 
-bool KGlobalAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& key )
 	{ return grabKey( key, true, &action ); }
-bool KGlobalAccelPrivate::connectKey( const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::connectKey( const KKeyServer::Key& key )
 	{ return grabKey( key, true, 0 ); }
-bool KGlobalAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key )
 	{ return grabKey( key, false, &action ); }
-bool KGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key )
+bool TDEGlobalAccelPrivate::disconnectKey( const KKeyServer::Key& key )
 	{ return grabKey( key, false, 0 ); }
 
-bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAccelAction* pAction )
+bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDEAccelAction* pAction )
 {
 	if( !key.code() ) {
-		kdWarning(125) << "KGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl;
+		kdWarning(125) << "TDEGlobalAccelPrivate::grabKey( " << key.key().toStringInternal() << ", " << bGrab << ", \"" << (pAction ? pAction->name().latin1() : "(null)") << "\" ): Tried to grab key with null code." << endl;
 		return false;
 	}
 
@@ -245,7 +245,7 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce
 	return !failed;
 }
 
-bool KGlobalAccelPrivate::x11Event( XEvent* pEvent )
+bool TDEGlobalAccelPrivate::x11Event( XEvent* pEvent )
 {
 	//kdDebug(125) << "x11EventFilter( type = " << pEvent->type << " )" << endl;
 	switch( pEvent->type ) {
@@ -261,9 +261,9 @@ bool KGlobalAccelPrivate::x11Event( XEvent* pEvent )
 	}
 }
 
-void KGlobalAccelPrivate::x11MappingNotify()
+void TDEGlobalAccelPrivate::x11MappingNotify()
 {
-	kdDebug(125) << "KGlobalAccelPrivate::x11MappingNotify()" << endl;
+	kdDebug(125) << "TDEGlobalAccelPrivate::x11MappingNotify()" << endl;
 	// Maybe the X modifier map has been changed.
 	KKeyServer::initializeMods();
 	calculateGrabMasks();
@@ -271,7 +271,7 @@ void KGlobalAccelPrivate::x11MappingNotify()
 	updateConnections();
 }
 
-void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
+void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
 	CodeMod codemod;
 	codemod.code = keyCode;
 	codemod.mod = 0;
@@ -286,7 +286,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
 	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
-			KAccelAction* pAction = *it;
+			TDEAccelAction* pAction = *it;
 			kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16)
 				<< (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString())
 				<< endl;
@@ -295,7 +295,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
 		return;
 	}
         
-	KAccelAction* pAction = m_rgCodeModToAction[codemod];
+	TDEAccelAction* pAction = m_rgCodeModToAction[codemod];
 
 	if( !pAction ) {
                 static bool recursion_block = false;
@@ -314,7 +314,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
 		activate( pAction, KKeySequence(key) );
 }
 
-bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
+bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 {
 	// do not change this line unless you really really know what you are doing (Matthias)
 	if ( !TQWidget::keyboardGrabber() && !TQApplication::activePopupWidget() ) {
@@ -364,7 +364,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 	if( !m_rgCodeModToAction.contains( codemod ) ) {
 #ifndef NDEBUG
 		for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) {
-			KAccelAction* pAction = *it;
+			TDEAccelAction* pAction = *it;
 			kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16)
 				<< (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString())
 				<< endl;
@@ -373,7 +373,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 		return false;
 	}
         
-	KAccelAction* pAction = m_rgCodeModToAction[codemod];
+	TDEAccelAction* pAction = m_rgCodeModToAction[codemod];
 
 	if( !pAction ) {
                 static bool recursion_block = false;
@@ -394,9 +394,9 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
 	return true;
 }
 
-void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& seq )
+void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequence& seq )
 {
-	kdDebug(125) << "KGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl;
+	kdDebug(125) << "TDEGlobalAccelPrivate::activate( \"" << pAction->name() << "\" ) " << endl;
 
 	TQRegExp rexPassIndex( "([ ]*int[ ]*)" );
 	TQRegExp rexPassInfo( " TQString" );
@@ -430,9 +430,9 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
 	}
 }
 
-void KGlobalAccelPrivate::slotActivated( int iAction )
+void TDEGlobalAccelPrivate::slotActivated( int iAction )
 {
-	KAccelAction* pAction = KAccelBase::actions().actionPtr( iAction );
+	TDEAccelAction* pAction = TDEAccelBase::actions().actionPtr( iAction );
 	if( pAction )
 		activate( pAction, KKeySequence() );
 }
diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h
index 3022e0d90..b22363926 100644
--- a/tdecore/kglobalaccel_x11.h
+++ b/tdecore/kglobalaccel_x11.h
@@ -23,27 +23,27 @@
 #include <tqmap.h>
 #include <tqwidget.h>
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 #include "kkeyserver_x11.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 /**
  * @internal
  */
-class KGlobalAccelPrivate : public TQWidget, public KAccelBase
+class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
 {
-	friend class KGlobalAccel;
+	friend class TDEGlobalAccel;
 	Q_OBJECT
  public:
-	KGlobalAccelPrivate();
-	virtual ~KGlobalAccelPrivate();
+	TDEGlobalAccelPrivate();
+	virtual ~TDEGlobalAccelPrivate();
 
 	virtual void setEnabled( bool bEnabled );
 
 	virtual bool emitSignal( Signal signal );
-	virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key );
+	virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key );
 	virtual bool connectKey( const KKeyServer::Key& key );
-	virtual bool disconnectKey( KAccelAction& action, const KKeyServer::Key& key );
+	virtual bool disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key );
 	virtual bool disconnectKey( const KKeyServer::Key& key );
 
  protected:
@@ -73,14 +73,14 @@ class KGlobalAccelPrivate : public TQWidget, public KAccelBase
 			return false;
 		}
 	};
-	typedef TQMap<CodeMod, KAccelAction*> CodeModMap;
+	typedef TQMap<CodeMod, TDEAccelAction*> CodeModMap;
 
 	CodeModMap m_rgCodeModToAction;
 
 	/**
 	 * @param bGrab Set to true to grab key, false to ungrab key.
 	 */
-	bool grabKey( const KKeyServer::Key&, bool bGrab, KAccelAction* );
+	bool grabKey( const KKeyServer::Key&, bool bGrab, TDEAccelAction* );
 
 	/**
 	 * Filters X11 events ev for key bindings in the accelerator dictionary.
@@ -92,7 +92,7 @@ class KGlobalAccelPrivate : public TQWidget, public KAccelBase
 	virtual bool x11Event( XEvent* );
 	void x11MappingNotify();
 	bool x11KeyPress( const XEvent *pEvent );
-	void activate( KAccelAction* pAction, const KKeySequence& seq );
+	void activate( TDEAccelAction* pAction, const KKeySequence& seq );
 	virtual bool isEnabledInternal() const;
 	static void blockShortcuts( bool block );
 	void disableBlocking( bool disable );
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index 7525e6760..c1a4a8ca5 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -29,9 +29,9 @@
 #include <tqrect.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobalsettings.h>
 #include <kicontheme.h>
 #include "kiconeffect.h"
 
@@ -42,28 +42,28 @@ static bool tqt_has_xft=true;
 extern bool tqt_use_xrender;
 extern bool tqt_has_xft;
 #endif
-class KIconEffectPrivate
+class TDEIconEffectPrivate
 {
 public:
 	TQString mKey[6][3];
 	TQColor  mColor2[6][3];
 };
 
-KIconEffect::KIconEffect()
+TDEIconEffect::TDEIconEffect()
 {
-    d = new KIconEffectPrivate;
+    d = new TDEIconEffectPrivate;
     init();
 }
 
-KIconEffect::~KIconEffect()
+TDEIconEffect::~TDEIconEffect()
 {
     delete d;
     d = 0L;
 }
 
-void KIconEffect::init()
+void TDEIconEffect::init()
 {
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     int i, j, effect=-1;
     TQStringList groups;
@@ -86,7 +86,7 @@ void KIconEffect::init()
     TQString _none("none");
     TQString _tomonochrome("tomonochrome");
 
-    KConfigGroupSaver cs(config, "default");
+    TDEConfigGroupSaver cs(config, "default");
 
     for (it=groups.begin(), i=0; it!=groups.end(); it++, i++)
     {
@@ -137,14 +137,14 @@ void KIconEffect::init()
     }    
 }
 
-bool KIconEffect::hasEffect(int group, int state) const
+bool TDEIconEffect::hasEffect(int group, int state) const
 {
     return mEffect[group][state] != NoEffect;
 }
 
-TQString KIconEffect::fingerprint(int group, int state) const
+TQString TDEIconEffect::fingerprint(int group, int state) const
 {
-    if ( group >= KIcon::LastGroup ) return "";
+    if ( group >= TDEIcon::LastGroup ) return "";
     TQString cached = d->mKey[group][state];
     if (cached.isEmpty())
     {
@@ -172,14 +172,14 @@ TQString KIconEffect::fingerprint(int group, int state) const
     return cached;
 }
 
-TQImage KIconEffect::apply(TQImage image, int group, int state) const
+TQImage TDEIconEffect::apply(TQImage image, int group, int state) const
 {
-    if (state >= KIcon::LastState)
+    if (state >= TDEIcon::LastState)
     {
 	kdDebug(265) << "Illegal icon state: " << state << "\n";
 	return image;
     }
-    if (group >= KIcon::LastGroup)
+    if (group >= TDEIcon::LastGroup)
     {
 	kdDebug(265) << "Illegal icon group: " << group << "\n";
 	return image;
@@ -188,12 +188,12 @@ TQImage KIconEffect::apply(TQImage image, int group, int state) const
 	    mColor[group][state], d->mColor2[group][state], mTrans[group][state]);
 }
 
-TQImage KIconEffect::apply(TQImage image, int effect, float value, const TQColor col, bool trans) const
+TQImage TDEIconEffect::apply(TQImage image, int effect, float value, const TQColor col, bool trans) const
 {
-    return apply (image, effect, value, col, KGlobalSettings::baseColor(), trans);
+    return apply (image, effect, value, col, TDEGlobalSettings::baseColor(), trans);
 }
 
-TQImage KIconEffect::apply(TQImage image, int effect, float value, const TQColor col, const TQColor col2, bool trans) const
+TQImage TDEIconEffect::apply(TQImage image, int effect, float value, const TQColor col, const TQColor col2, bool trans) const
 {
     if (effect >= LastEffect )
     {
@@ -229,14 +229,14 @@ TQImage KIconEffect::apply(TQImage image, int effect, float value, const TQColor
     return image;
 }
 
-TQPixmap KIconEffect::apply(TQPixmap pixmap, int group, int state) const
+TQPixmap TDEIconEffect::apply(TQPixmap pixmap, int group, int state) const
 {
-    if (state >= KIcon::LastState)
+    if (state >= TDEIcon::LastState)
     {
 	kdDebug(265) << "Illegal icon state: " << state << "\n";
 	return pixmap;
     }
-    if (group >= KIcon::LastGroup)
+    if (group >= TDEIcon::LastGroup)
     {
 	kdDebug(265) << "Illegal icon group: " << group << "\n";
 	return pixmap;
@@ -245,13 +245,13 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int group, int state) const
 	    mColor[group][state], d->mColor2[group][state], mTrans[group][state]);
 }
 
-TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value,
+TQPixmap TDEIconEffect::apply(TQPixmap pixmap, int effect, float value,
 	const TQColor col, bool trans) const
 {
-    return apply (pixmap, effect, value, col, KGlobalSettings::baseColor(), trans);
+    return apply (pixmap, effect, value, col, TDEGlobalSettings::baseColor(), trans);
 }
 
-TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value,
+TQPixmap TDEIconEffect::apply(TQPixmap pixmap, int effect, float value,
 	const TQColor col, const TQColor col2, bool trans) const
 {
     TQPixmap result;
@@ -282,7 +282,7 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value,
 // Taken from KImageEffect. We don't want to link tdecore to tdeui! As long
 // as this code is not too big, it doesn't seem much of a problem to me.
 
-void KIconEffect::toGray(TQImage &img, float value)
+void TDEIconEffect::toGray(TQImage &img, float value)
 {
     int pixels = (img.depth() > 8) ? img.width()*img.height()
 	    : img.numColors();
@@ -304,7 +304,7 @@ void KIconEffect::toGray(TQImage &img, float value)
     }
 }
 
-void KIconEffect::colorize(TQImage &img, const TQColor &col, float value)
+void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value)
 {
     int pixels = (img.depth() > 8) ? img.width()*img.height()
 	    : img.numColors();
@@ -345,7 +345,7 @@ void KIconEffect::colorize(TQImage &img, const TQColor &col, float value)
     }
 }
 
-void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor &white, float value) {
+void TDEIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor &white, float value) {
    int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors();
    unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits()
          : (unsigned int *) img.tqcolorTable();
@@ -395,7 +395,7 @@ void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor
    }
 }
 
-void KIconEffect::deSaturate(TQImage &img, float value)
+void TDEIconEffect::deSaturate(TQImage &img, float value)
 {
     int pixels = (img.depth() > 8) ? img.width()*img.height()
 	    : img.numColors();
@@ -413,7 +413,7 @@ void KIconEffect::deSaturate(TQImage &img, float value)
     }
 }
 
-void KIconEffect::toGamma(TQImage &img, float value)
+void TDEIconEffect::toGamma(TQImage &img, float value)
 {
     int pixels = (img.depth() > 8) ? img.width()*img.height()
 	    : img.numColors();
@@ -435,7 +435,7 @@ void KIconEffect::toGamma(TQImage &img, float value)
     }
 }
 
-void KIconEffect::semiTransparent(TQImage &img)
+void TDEIconEffect::semiTransparent(TQImage &img)
 {
     img.setAlphaBuffer(true);
 
@@ -509,7 +509,7 @@ void KIconEffect::semiTransparent(TQImage &img)
     }
 }
 
-void KIconEffect::semiTransparent(TQPixmap &pix)
+void TDEIconEffect::semiTransparent(TQPixmap &pix)
 {
     if ( tqt_use_xrender && tqt_has_xft )
     {
@@ -540,7 +540,7 @@ void KIconEffect::semiTransparent(TQPixmap &pix)
     pix.setMask(mask);
 }
 
-TQImage KIconEffect::doublePixels(TQImage src) const
+TQImage TDEIconEffect::doublePixels(TQImage src) const
 {
     TQImage dst;
     if (src.depth() == 1)
@@ -589,7 +589,7 @@ TQImage KIconEffect::doublePixels(TQImage src) const
     return dst;
 }
 
-void KIconEffect::overlay(TQImage &src, TQImage &overlay)
+void TDEIconEffect::overlay(TQImage &src, TQImage &overlay)
 {
     if (src.depth() != overlay.depth())
     {
@@ -704,12 +704,12 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay)
 }
 
     void
-KIconEffect::visualActivate(TQWidget * widget, TQRect rect)
+TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect)
 {
-    if (!KGlobalSettings::visualActivate())
+    if (!TDEGlobalSettings::visualActivate())
         return;
 
-    uint actSpeed = KGlobalSettings::visualActivateSpeed();
+    uint actSpeed = TDEGlobalSettings::visualActivateSpeed();
 
     uint actCount = QMIN(rect.width(), rect.height()) / 2;
 
@@ -772,9 +772,9 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect)
 }
 
 void
-KIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap)
+TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap)
 {
-    if (!KGlobalSettings::visualActivate())
+    if (!TDEGlobalSettings::visualActivate())
         return;
 
     // Image too big to display smoothly
@@ -783,7 +783,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap)
 	return;
     }
 
-    uint actSpeed = KGlobalSettings::visualActivateSpeed();
+    uint actSpeed = TDEGlobalSettings::visualActivateSpeed();
     uint actCount = TQMIN(rect.width(), rect.height()) / 4;
 
 
diff --git a/tdecore/kiconeffect.h b/tdecore/kiconeffect.h
index 299be3d2e..06deb0d4c 100644
--- a/tdecore/kiconeffect.h
+++ b/tdecore/kiconeffect.h
@@ -10,8 +10,8 @@
  * exact licensing terms.
  */
 
-#ifndef __KIconEffect_h_Included__
-#define __KIconEffect_h_Included__
+#ifndef __TDEIconEffect_h_Included__
+#define __TDEIconEffect_h_Included__
 
 #include <tqimage.h>
 #include <tqpixmap.h>
@@ -21,7 +21,7 @@
 
 class TQWidget;
 
-class KIconEffectPrivate;
+class TDEIconEffectPrivate;
 
 /**
  * Applies effects to icons.
@@ -29,16 +29,16 @@ class KIconEffectPrivate;
  * This class applies effects to icons depending on their state and
  * group. For example, it can be used to make all disabled icons
  * in a toolbar gray.
- * @see KIcon
+ * @see TDEIcon
  */
-class TDECORE_EXPORT KIconEffect
+class TDECORE_EXPORT TDEIconEffect
 {
 public:
   /**
-   * Create a new KIconEffect.
+   * Create a new TDEIconEffect.
    */
-    KIconEffect();
-    ~KIconEffect();
+    TDEIconEffect();
+    ~TDEIconEffect();
 
     /**
      * This is the enumeration of all possible icon effects.
@@ -63,12 +63,12 @@ public:
 
     /**
      * Tests whether an effect has been configured for the given icon group.
-     * @param group the group to check, see KIcon::Group
-     * @param state the state to check, see KIcon::States
+     * @param group the group to check, see TDEIcon::Group
+     * @param state the state to check, see TDEIcon::States
      * @returns true if an effect is configured for the given @p group
      * in @p state, otherwise false.
-     * @see KIcon::Group
-     * KIcon::States
+     * @see TDEIcon::Group
+     * TDEIcon::States
      */
     bool hasEffect(int group, int state) const;
 
@@ -76,8 +76,8 @@ public:
      * Returns a fingerprint for the effect by encoding
      * the given @p group and @p state into a TQString. This
      * is useful for caching.
-     * @param group the group, see KIcon::Group
-     * @param state the state, see KIcon::States
+     * @param group the group, see TDEIcon::Group
+     * @param state the state, see TDEIcon::States
      * @return the fingerprint of the given @p group+@p state
      */
      TQString fingerprint(int group, int state) const;
@@ -86,8 +86,8 @@ public:
      * Applies an effect to an image. The effect to apply depends on the
      * @p group and @p state parameters, and is configured by the user.
      * @param src The image.
-     * @param group The group for the icon, see KIcon::Group
-     * @param state The icon's state, see KIcon::States
+     * @param group The group for the icon, see TDEIcon::Group
+     * @param state The icon's state, see TDEIcon::States
      * @return An image with the effect applied.
      */
     TQImage apply(TQImage src, int group, int state) const;
@@ -95,7 +95,7 @@ public:
     /**
      * Applies an effect to an image.
      * @param src The image.
-     * @param effect The effect to apply, one of KIconEffect::Effects.
+     * @param effect The effect to apply, one of TDEIconEffect::Effects.
      * @param value Strength of the effect. 0 <= @p value <= 1.
      * @param rgb Color parameter for effects that need one.
      * @param trans Add Transparency if trans = true.
@@ -111,8 +111,8 @@ public:
     /**
      * Applies an effect to a pixmap.
      * @param src The pixmap.
-     * @param group The group for the icon, see KIcon::Group
-     * @param state The icon's state, see KIcon::States
+     * @param group The group for the icon, see TDEIcon::Group
+     * @param state The icon's state, see TDEIcon::States
      * @return A pixmap with the effect applied.
      */
     TQPixmap apply(TQPixmap src, int group, int state) const;
@@ -120,7 +120,7 @@ public:
     /**
      * Applies an effect to a pixmap.
      * @param src The pixmap.
-     * @param effect The effect to apply, one of KIconEffect::Effects.
+     * @param effect The effect to apply, one of TDEIconEffect::Effects.
      * @param value Strength of the effect. 0 <= @p value <= 1.
      * @param rgb Color parameter for effects that need one.
      * @param trans Add Transparency if trans = true.
@@ -225,7 +225,7 @@ private:
     float mValue[6][3];
     TQColor mColor[6][3];
     bool mTrans[6][3];
-    KIconEffectPrivate *d;
+    TDEIconEffectPrivate *d;
 };
 
 #endif
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index d3d8d5239..e81293986 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -26,12 +26,12 @@
 #include <tqmovie.h>
 #include <tqbitmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
 
@@ -55,19 +55,19 @@
 
 #include "kiconloader_p.h"
 
-/*** KIconThemeNode: A node in the icon theme dependancy tree. ***/
+/*** TDEIconThemeNode: A node in the icon theme dependancy tree. ***/
 
-KIconThemeNode::KIconThemeNode(KIconTheme *_theme)
+TDEIconThemeNode::TDEIconThemeNode(TDEIconTheme *_theme)
 {
     theme = _theme;
 }
 
-KIconThemeNode::~KIconThemeNode()
+TDEIconThemeNode::~TDEIconThemeNode()
 {
     delete theme;
 }
 
-void KIconThemeNode::printTree(TQString& dbgString) const
+void TDEIconThemeNode::printTree(TQString& dbgString) const
 {
     /* This method doesn't have much sense anymore, so maybe it should
        be removed in the (near?) future */
@@ -76,30 +76,30 @@ void KIconThemeNode::printTree(TQString& dbgString) const
     dbgString += ")";
 }
 
-void KIconThemeNode::queryIcons(TQStringList *result,
-				int size, KIcon::Context context) const
+void TDEIconThemeNode::queryIcons(TQStringList *result,
+				int size, TDEIcon::Context context) const
 {
     // add the icons of this theme to it
     *result += theme->queryIcons(size, context);
 }
 
-void KIconThemeNode::queryIconsByContext(TQStringList *result,
-				int size, KIcon::Context context) const
+void TDEIconThemeNode::queryIconsByContext(TQStringList *result,
+				int size, TDEIcon::Context context) const
 {
     // add the icons of this theme to it
     *result += theme->queryIconsByContext(size, context);
 }
 
-KIcon KIconThemeNode::findIcon(const TQString& name, int size,
-			       KIcon::MatchType match) const
+TDEIcon TDEIconThemeNode::findIcon(const TQString& name, int size,
+			       TDEIcon::MatchType match) const
 {
     return theme->iconPath(name, size, match);
 }
 
 
-/*** KIconGroup: Icon type description. ***/
+/*** TDEIconGroup: Icon type description. ***/
 
-struct KIconGroup
+struct TDEIconGroup
 {
     int size;
     bool dblPixels;
@@ -108,33 +108,33 @@ struct KIconGroup
 
 #define KICONLOADER_CHECKS
 #ifdef KICONLOADER_CHECKS
-// Keep a list of recently created and destroyed KIconLoader instances in order
+// Keep a list of recently created and destroyed TDEIconLoader instances in order
 // to detect bugs like #68528.
-struct KIconLoaderDebug
+struct TDEIconLoaderDebug
     {
-    KIconLoaderDebug( KIconLoader* l, const TQString& a )
+    TDEIconLoaderDebug( TDEIconLoader* l, const TQString& a )
         : loader( l ), appname( a ), valid( true )
         {}
-    KIconLoaderDebug() {}; // this TQValueList feature annoys me
-    KIconLoader* loader;
+    TDEIconLoaderDebug() {}; // this TQValueList feature annoys me
+    TDEIconLoader* loader;
     TQString appname;
     bool valid;
     TQString delete_bt;
     };
 
-static TQValueList< KIconLoaderDebug > *kiconloaders;
+static TQValueList< TDEIconLoaderDebug > *kiconloaders;
 #endif
 
-/*** KIconLoader: the icon loader ***/
+/*** TDEIconLoader: the icon loader ***/
 
-KIconLoader::KIconLoader(const TQString& _appname, KStandardDirs *_dirs)
+TDEIconLoader::TDEIconLoader(const TQString& _appname, TDEStandardDirs *_dirs)
 {
 #ifdef KICONLOADER_CHECKS
     if( kiconloaders == NULL )
-        kiconloaders = new TQValueList< KIconLoaderDebug>();
-    // check for the (very unlikely case) that new KIconLoader gets allocated
+        kiconloaders = new TQValueList< TDEIconLoaderDebug>();
+    // check for the (very unlikely case) that new TDEIconLoader gets allocated
     // at exactly same address like some previous one
-    for( TQValueList< KIconLoaderDebug >::Iterator it = kiconloaders->begin();
+    for( TQValueList< TDEIconLoaderDebug >::Iterator it = kiconloaders->begin();
          it != kiconloaders->end();
          )
         {
@@ -143,9 +143,9 @@ KIconLoader::KIconLoader(const TQString& _appname, KStandardDirs *_dirs)
         else
             ++it;
         }
-    kiconloaders->append( KIconLoaderDebug( this, _appname ));
+    kiconloaders->append( TDEIconLoaderDebug( this, _appname ));
 #endif
-    d = new KIconLoaderPrivate;
+    d = new TDEIconLoaderPrivate;
     d->q = this;
     d->mpGroups = 0L;
     d->imgDict.setAutoDelete(true);
@@ -159,7 +159,7 @@ KIconLoader::KIconLoader(const TQString& _appname, KStandardDirs *_dirs)
     init( _appname, _dirs );
 }
 
-void KIconLoader::reconfigure( const TQString& _appname, KStandardDirs *_dirs )
+void TDEIconLoader::reconfigure( const TQString& _appname, TDEStandardDirs *_dirs )
 {
     d->links.clear();
     d->imgDict.clear();
@@ -171,7 +171,7 @@ void KIconLoader::reconfigure( const TQString& _appname, KStandardDirs *_dirs )
     init( _appname, _dirs );
 }
 
-void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
+void TDEIconLoader::init( const TQString& _appname, TDEStandardDirs *_dirs )
 {
     // If this is unequal to 0, the iconloader is initialized
     // successfully.
@@ -184,42 +184,42 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
     if (_dirs)
         d->mpDirs = _dirs;
     else
-        d->mpDirs = KGlobal::dirs();
+        d->mpDirs = TDEGlobal::dirs();
 
     TQString appname = _appname;
     if (appname.isEmpty())
-        appname = KGlobal::instance()->instanceName();
+        appname = TDEGlobal::instance()->instanceName();
 
     // Add the default theme and its base themes to the theme tree
-    KIconTheme *def = new KIconTheme(KIconTheme::current(), appname);
+    TDEIconTheme *def = new TDEIconTheme(TDEIconTheme::current(), appname);
     if (!def->isValid())
     {
         delete def;
         // warn, as this is actually a small penalty hit
         kdDebug(264) << "Couldn't find current icon theme, falling back to default." << endl;
-	def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
+	def = new TDEIconTheme(TDEIconTheme::defaultThemeName(), appname);
         if (!def->isValid())
         {
             kdError(264) << "Error: standard icon theme"
-                         << " \"" << KIconTheme::defaultThemeName() << "\" "
+                         << " \"" << TDEIconTheme::defaultThemeName() << "\" "
                          << " not found!" << endl;
             d->mpGroups=0L;
             return;
         }
     }
-    d->mpThemeRoot = new KIconThemeNode(def);
+    d->mpThemeRoot = new TDEIconThemeNode(def);
     d->links.append(d->mpThemeRoot);
-    d->mThemesInTree += KIconTheme::current();
+    d->mThemesInTree += TDEIconTheme::current();
     addBaseThemes(d->mpThemeRoot, appname);
 
     // These have to match the order in kicontheme.h
     static const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", "Panel", 0L };
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver cs(config, "dummy");
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs(config, "dummy");
 
     // loading config and default sizes
-    d->mpGroups = new KIconGroup[(int) KIcon::LastGroup];
-    for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
+    d->mpGroups = new TDEIconGroup[(int) TDEIcon::LastGroup];
+    for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
     {
 	if (groups[i] == 0L)
 	    break;
@@ -236,10 +236,10 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
     }
 
     // Insert application specific themes at the top.
-    d->mpDirs->addResourceType("appicon", KStandardDirs::kde_default("data") +
+    d->mpDirs->addResourceType("appicon", TDEStandardDirs::kde_default("data") +
 		appname + "/pics/");
     // ################## KDE4: consider removing the toolbar directory
-    d->mpDirs->addResourceType("appicon", KStandardDirs::kde_default("data") +
+    d->mpDirs->addResourceType("appicon", TDEStandardDirs::kde_default("data") +
 		appname + "/toolbar/");
 
     // Add legacy icon dirs.
@@ -260,10 +260,10 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
 #endif
 }
 
-KIconLoader::~KIconLoader()
+TDEIconLoader::~TDEIconLoader()
 {
 #ifdef KICONLOADER_CHECKS
-    for( TQValueList< KIconLoaderDebug >::Iterator it = kiconloaders->begin();
+    for( TQValueList< TDEIconLoaderDebug >::Iterator it = kiconloaders->begin();
          it != kiconloaders->end();
          ++it )
         {
@@ -282,34 +282,34 @@ KIconLoader::~KIconLoader()
     delete d;
 }
 
-void KIconLoader::enableDelayedIconSetLoading( bool enable )
+void TDEIconLoader::enableDelayedIconSetLoading( bool enable )
 {
     d->delayedLoading = enable;
 }
 
-bool KIconLoader::isDelayedIconSetLoadingEnabled() const
+bool TDEIconLoader::isDelayedIconSetLoadingEnabled() const
 {
     return d->delayedLoading;
 }
 
-void KIconLoader::addAppDir(const TQString& appname)
+void TDEIconLoader::addAppDir(const TQString& appname)
 {
-    d->mpDirs->addResourceType("appicon", KStandardDirs::kde_default("data") +
+    d->mpDirs->addResourceType("appicon", TDEStandardDirs::kde_default("data") +
 		appname + "/pics/");
     // ################## KDE4: consider removing the toolbar directory
-    d->mpDirs->addResourceType("appicon", KStandardDirs::kde_default("data") +
+    d->mpDirs->addResourceType("appicon", TDEStandardDirs::kde_default("data") +
 		appname + "/toolbar/");
     addAppThemes(appname);
 }
 
-void KIconLoader::addAppThemes(const TQString& appname)
+void TDEIconLoader::addAppThemes(const TQString& appname)
 {
-    if ( KIconTheme::current() != KIconTheme::defaultThemeName() )
+    if ( TDEIconTheme::current() != TDEIconTheme::defaultThemeName() )
     {
-        KIconTheme *def = new KIconTheme(KIconTheme::current(), appname);
+        TDEIconTheme *def = new TDEIconTheme(TDEIconTheme::current(), appname);
         if (def->isValid())
         {
-            KIconThemeNode* node = new KIconThemeNode(def);
+            TDEIconThemeNode* node = new TDEIconThemeNode(def);
             d->links.append(node);
             addBaseThemes(node, appname);
         }
@@ -317,13 +317,13 @@ void KIconLoader::addAppThemes(const TQString& appname)
             delete def;
     }
 
-    KIconTheme *def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
-    KIconThemeNode* node = new KIconThemeNode(def);
+    TDEIconTheme *def = new TDEIconTheme(TDEIconTheme::defaultThemeName(), appname);
+    TDEIconThemeNode* node = new TDEIconThemeNode(def);
     d->links.append(node);
     addBaseThemes(node, appname);
 }
 
-void KIconLoader::addBaseThemes(KIconThemeNode *node, const TQString &appname)
+void TDEIconLoader::addBaseThemes(TDEIconThemeNode *node, const TQString &appname)
 {
     TQStringList lst = node->theme->inherits();
     TQStringList::ConstIterator it;
@@ -332,24 +332,24 @@ void KIconLoader::addBaseThemes(KIconThemeNode *node, const TQString &appname)
     {
 	if( d->mThemesInTree.contains(*it) && (*it) != "hicolor")
 	    continue;
-	KIconTheme *theme = new KIconTheme(*it,appname);
+	TDEIconTheme *theme = new TDEIconTheme(*it,appname);
 	if (!theme->isValid()) {
 	    delete theme;
 	    continue;
 	}
-        KIconThemeNode *n = new KIconThemeNode(theme);
+        TDEIconThemeNode *n = new TDEIconThemeNode(theme);
 	d->mThemesInTree.append(*it);
 	d->links.append(n);
 	addBaseThemes(n, appname);
     }
 }
 
-void KIconLoader::addExtraDesktopThemes()
+void TDEIconLoader::addExtraDesktopThemes()
 {
     if ( d->extraDesktopIconsLoaded ) return;
 
     TQStringList list;
-    TQStringList icnlibs = KGlobal::dirs()->resourceDirs("icon");
+    TQStringList icnlibs = TDEGlobal::dirs()->resourceDirs("icon");
     TQStringList::ConstIterator it;
     char buf[1000];
     int r;
@@ -362,8 +362,8 @@ void KIconLoader::addExtraDesktopThemes()
 	TQStringList::ConstIterator it2;
 	for (it2=lst.begin(); it2!=lst.end(); ++it2)
 	{
-	    if (!KStandardDirs::exists(*it + *it2 + "/index.desktop")
-		&& !KStandardDirs::exists(*it + *it2 + "/index.theme"))
+	    if (!TDEStandardDirs::exists(*it + *it2 + "/index.desktop")
+		&& !TDEStandardDirs::exists(*it + *it2 + "/index.theme"))
 		continue;
 	    r=readlink( TQFile::encodeName(*it + *it2) , buf, sizeof(buf)-1);
 	    if ( r>0 )
@@ -384,8 +384,8 @@ void KIconLoader::addExtraDesktopThemes()
 		continue;
 	if ( *it == TQString("default.tde") ) continue;
 
-	KIconTheme *def = new KIconTheme( *it, "" );
-	KIconThemeNode* node = new KIconThemeNode(def);
+	TDEIconTheme *def = new TDEIconTheme( *it, "" );
+	TDEIconThemeNode* node = new TDEIconThemeNode(def);
 	d->mThemesInTree.append(*it);
 	d->links.append(node);
 	addBaseThemes(node, "" );
@@ -395,26 +395,26 @@ void KIconLoader::addExtraDesktopThemes()
 
 }
 
-bool KIconLoader::extraDesktopThemesAdded() const
+bool TDEIconLoader::extraDesktopThemesAdded() const
 {
     return d->extraDesktopIconsLoaded;
 }
 
-TQString KIconLoader::removeIconExtension(const TQString &name) const
+TQString TDEIconLoader::removeIconExtension(const TQString &name) const
 {
     int extensionLength=0;
 
     TQString ext = name.right(4);
 
-    static const TQString &png_ext = KGlobal::staticQString(".png");
-    static const TQString &xpm_ext = KGlobal::staticQString(".xpm");
+    static const TQString &png_ext = TDEGlobal::staticQString(".png");
+    static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm");
     if (ext == png_ext || ext == xpm_ext)
       extensionLength=4;
 #ifdef HAVE_LIBART
     else
     {
-	static const TQString &svgz_ext = KGlobal::staticQString(".svgz");
-	static const TQString &svg_ext = KGlobal::staticQString(".svg");
+	static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz");
+	static const TQString &svg_ext = TDEGlobal::staticQString(".svg");
 
 	if (name.right(5) == svgz_ext)
 	    extensionLength=5;
@@ -430,14 +430,14 @@ TQString KIconLoader::removeIconExtension(const TQString &name) const
     return name;
 }
 
-TQString KIconLoader::removeIconExtensionInternal(const TQString &name) const
+TQString TDEIconLoader::removeIconExtensionInternal(const TQString &name) const
 {
     TQString name_noext = removeIconExtension(name);
 
 #ifndef NDEBUG
     if (name != name_noext)
     {
-	kdDebug(264) << "Application " << KGlobal::instance()->instanceName()
+	kdDebug(264) << "Application " << TDEGlobal::instance()->instanceName()
 		     << " loads icon " << name << " with extension." << endl;
     }
 #endif
@@ -445,21 +445,21 @@ TQString KIconLoader::removeIconExtensionInternal(const TQString &name) const
     return name_noext;
 }
 
-KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const
+TDEIcon TDEIconLoader::findMatchingIcon(const TQString& name, int size) const
 {
-    KIcon icon;
+    TDEIcon icon;
 
     const TQString *ext[4];
     int count=0;
-    static const TQString &png_ext = KGlobal::staticQString(".png");
+    static const TQString &png_ext = TDEGlobal::staticQString(".png");
     ext[count++]=&png_ext;
 #ifdef HAVE_LIBART
-    static const TQString &svgz_ext = KGlobal::staticQString(".svgz");
+    static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz");
     ext[count++]=&svgz_ext;
-    static const TQString &svg_ext = KGlobal::staticQString(".svg");
+    static const TQString &svg_ext = TDEGlobal::staticQString(".svg");
     ext[count++]=&svg_ext;
 #endif
-    static const TQString &xpm_ext = KGlobal::staticQString(".xpm");
+    static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm");
     ext[count++]=&xpm_ext;
 
     /* JRT: To follow the XDG spec, the order in which we look for an
@@ -474,18 +474,18 @@ KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const
        and so on
 
        */
-    for ( KIconThemeNode *themeNode = d->links.first() ; themeNode ;
+    for ( TDEIconThemeNode *themeNode = d->links.first() ; themeNode ;
 	themeNode = d->links.next() )
     {
 	for (int i = 0 ; i < count ; i++)
 	{
-	    icon = themeNode->theme->iconPath(name + *ext[i], size, KIcon::MatchExact);
+	    icon = themeNode->theme->iconPath(name + *ext[i], size, TDEIcon::MatchExact);
 	    if (icon.isValid()) goto icon_found ;
 	}
 
 	for (int i = 0 ; i < count ; i++)
 	{
-	    icon = themeNode->theme->iconPath(name + *ext[i], size, KIcon::MatchBest);
+	    icon = themeNode->theme->iconPath(name + *ext[i], size, TDEIcon::MatchBest);
 	    if (icon.isValid()) goto icon_found;	
 	}
     }
@@ -493,11 +493,11 @@ KIcon KIconLoader::findMatchingIcon(const TQString& name, int size) const
     return icon;
 }
 
-inline TQString KIconLoader::unknownIconPath( int size ) const
+inline TQString TDEIconLoader::unknownIconPath( int size ) const
 {
-    static const TQString &str_unknown = KGlobal::staticQString("unknown");
+    static const TQString &str_unknown = TDEGlobal::staticQString("unknown");
 
-    KIcon icon = findMatchingIcon(str_unknown, size);
+    TDEIcon icon = findMatchingIcon(str_unknown, size);
     if (!icon.isValid())
     {
         kdDebug(264) << "Warning: could not find \"Unknown\" icon for size = "
@@ -509,7 +509,7 @@ inline TQString KIconLoader::unknownIconPath( int size ) const
 
 // Finds the absolute path to an icon.
 
-TQString KIconLoader::iconPath(const TQString& _name, int group_or_size,
+TQString TDEIconLoader::iconPath(const TQString& _name, int group_or_size,
 			      bool canReturnNull) const
 {
     if (d->mpThemeRoot == 0L)
@@ -521,15 +521,15 @@ TQString KIconLoader::iconPath(const TQString& _name, int group_or_size,
     TQString name = removeIconExtensionInternal( _name );
 
     TQString path;
-    if (group_or_size == KIcon::User)
+    if (group_or_size == TDEIcon::User)
     {
-	static const TQString &png_ext = KGlobal::staticQString(".png");
-	static const TQString &xpm_ext = KGlobal::staticQString(".xpm");
+	static const TQString &png_ext = TDEGlobal::staticQString(".png");
+	static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm");
 	path = d->mpDirs->findResource("appicon", name + png_ext);
 
 #ifdef HAVE_LIBART
-	static const TQString &svgz_ext = KGlobal::staticQString(".svgz");
-	static const TQString &svg_ext = KGlobal::staticQString(".svg");
+	static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz");
+	static const TQString &svg_ext = TDEGlobal::staticQString(".svg");
 	if (path.isEmpty())
 	    path = d->mpDirs->findResource("appicon", name + svgz_ext);
 	if (path.isEmpty())
@@ -540,7 +540,7 @@ TQString KIconLoader::iconPath(const TQString& _name, int group_or_size,
 	return path;
     }
 
-    if (group_or_size >= KIcon::LastGroup)
+    if (group_or_size >= TDEIcon::LastGroup)
     {
 	kdDebug(264) << "Illegal icon group: " << group_or_size << endl;
 	return path;
@@ -559,12 +559,12 @@ TQString KIconLoader::iconPath(const TQString& _name, int group_or_size,
             return unknownIconPath(size);
     }
 
-    KIcon icon = findMatchingIcon(name, size);
+    TDEIcon icon = findMatchingIcon(name, size);
 
     if (!icon.isValid())
     {
 	// Try "User" group too.
-	path = iconPath(name, KIcon::User, true);
+	path = iconPath(name, TDEIcon::User, true);
 	if (!path.isEmpty() || canReturnNull)
 	    return path;
 
@@ -576,7 +576,7 @@ TQString KIconLoader::iconPath(const TQString& _name, int group_or_size,
     return icon.path;
 }
 
-TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int size,
+TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, int size,
                               int state, TQString *path_store, bool canReturnNull) const
 {
     TQString name = _name;
@@ -595,10 +595,10 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
     }
     if (!TQDir::isRelativePath(name)) absolutePath=true;
 
-    static const TQString &str_unknown = KGlobal::staticQString("unknown");
+    static const TQString &str_unknown = TDEGlobal::staticQString("unknown");
 
     // Special case for "User" icons.
-    if (group == KIcon::User)
+    if (group == TDEIcon::User)
     {
 	key = "$kicou_";
         key += TQString::number(size); key += '_';
@@ -608,13 +608,13 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
 	    return pix;
 
 	TQString path = (absolutePath) ? name :
-			iconPath(name, KIcon::User, canReturnNull);
+			iconPath(name, TDEIcon::User, canReturnNull);
 	if (path.isEmpty())
 	{
 	    if (canReturnNull)
 		return pix;
 	    // We don't know the desired size: use small
-	    path = iconPath(str_unknown, KIcon::Small, true);
+	    path = iconPath(str_unknown, TDEIcon::Small, true);
 	    if (path.isEmpty())
 	    {
 		kdDebug(264) << "Warning: Cannot find \"unknown\" icon." << endl;
@@ -637,24 +637,24 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
 
     // Regular case: Check parameters
 
-    if ((group < -1) || (group >= KIcon::LastGroup))
+    if ((group < -1) || (group >= TDEIcon::LastGroup))
     {
 	kdDebug(264) << "Illegal icon group: " << group << endl;
-	group = KIcon::Desktop;
+	group = TDEIcon::Desktop;
     }
 
-    int overlay = (state & KIcon::OverlayMask);
-    state &= ~KIcon::OverlayMask;
-    if ((state < 0) || (state >= KIcon::LastState))
+    int overlay = (state & TDEIcon::OverlayMask);
+    state &= ~TDEIcon::OverlayMask;
+    if ((state < 0) || (state >= TDEIcon::LastState))
     {
 	kdDebug(264) << "Illegal icon state: " << state << endl;
-	state = KIcon::DefaultState;
+	state = TDEIcon::DefaultState;
     }
 
     if (size == 0 && group < 0)
     {
 	kdDebug(264) << "Neither size nor group specified!" << endl;
-	group = KIcon::Desktop;
+	group = TDEIcon::Desktop;
     }
 
     if (!absolutePath)
@@ -705,11 +705,11 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
          noEffectKey != d->lastImageKey )
     {
         // No? load it.
-        KIcon icon;
+        TDEIcon icon;
         if (absolutePath && !favIconOverlay)
         {
-            icon.context=KIcon::Any;
-            icon.type=KIcon::Scalable;
+            icon.context=TDEIcon::Any;
+            icon.type=TDEIcon::Scalable;
             icon.path=name;
         }
         else
@@ -721,7 +721,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
             {
                 // Try "User" icon too. Some apps expect this.
                 if (!name.isEmpty())
-                    pix = loadIcon(name, KIcon::User, size, state, path_store, true);
+                    pix = loadIcon(name, TDEIcon::User, size, state, path_store, true);
                 if (!pix.isNull() || canReturnNull) {
                     TQPixmapCache::insert(key, pix);
                     return pix;
@@ -789,20 +789,20 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
     if (overlay)
     {
 	TQImage *ovl;
-	KIconTheme *theme = d->mpThemeRoot->theme;
-	if ((overlay & KIcon::LockOverlay) &&
+	TDEIconTheme *theme = d->mpThemeRoot->theme;
+	if ((overlay & TDEIcon::LockOverlay) &&
 		((ovl = loadOverlay(theme->lockOverlay(), size)) != 0L))
-	    KIconEffect::overlay(*img, *ovl);
-	if ((overlay & KIcon::LinkOverlay) &&
+	    TDEIconEffect::overlay(*img, *ovl);
+	if ((overlay & TDEIcon::LinkOverlay) &&
 		((ovl = loadOverlay(theme->linkOverlay(), size)) != 0L))
-	    KIconEffect::overlay(*img, *ovl);
-	if ((overlay & KIcon::ZipOverlay) &&
+	    TDEIconEffect::overlay(*img, *ovl);
+	if ((overlay & TDEIcon::ZipOverlay) &&
 		((ovl = loadOverlay(theme->zipOverlay(), size)) != 0L))
-	    KIconEffect::overlay(*img, *ovl);
-	if ((overlay & KIcon::ShareOverlay) &&
+	    TDEIconEffect::overlay(*img, *ovl);
+	if ((overlay & TDEIcon::ShareOverlay) &&
 	    ((ovl = loadOverlay(theme->shareOverlay(), size)) != 0L))
-	  KIconEffect::overlay(*img, *ovl);
-        if (overlay & KIcon::HiddenOverlay)
+	  TDEIconEffect::overlay(*img, *ovl);
+        if (overlay & TDEIcon::HiddenOverlay)
         {
 	    if (img->depth() != 32)
 	        *img = img->convertDepth(32);
@@ -816,11 +816,11 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
     }
 
     // Scale the icon and apply effects if necessary
-    if (iconType == KIcon::Scalable && size != img->width())
+    if (iconType == TDEIcon::Scalable && size != img->width())
     {
         *img = img->smoothScale(size, size);
     }
-    if (iconType == KIcon::Threshold && size != img->width())
+    if (iconType == TDEIcon::Threshold && size != img->width())
     {
 	if ( abs(size-img->width())>iconThreshold )
 	    *img = img->smoothScale(size, size);
@@ -868,14 +868,14 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
     return pix;
 }
 
-TQImage *KIconLoader::loadOverlay(const TQString &name, int size) const
+TQImage *TDEIconLoader::loadOverlay(const TQString &name, int size) const
 {
     TQString key = name + '_' + TQString::number(size);
     TQImage *image = d->imgDict.find(key);
     if (image != 0L)
 	return image;
 
-    KIcon icon = findMatchingIcon(name, size);
+    TDEIcon icon = findMatchingIcon(name, size);
     if (!icon.isValid())
     {
 	kdDebug(264) << "Overlay " << name << "not found." << endl;
@@ -892,7 +892,7 @@ TQImage *KIconLoader::loadOverlay(const TQString &name, int size) const
 
 
 
-TQMovie KIconLoader::loadMovie(const TQString& name, KIcon::Group group, int size) const
+TQMovie TDEIconLoader::loadMovie(const TQString& name, TDEIcon::Group group, int size) const
 {
     TQString file = moviePath( name, group, size );
     if (file.isEmpty())
@@ -904,23 +904,23 @@ TQMovie KIconLoader::loadMovie(const TQString& name, KIcon::Group group, int siz
     return TQMovie(file);
 }
 
-TQString KIconLoader::moviePath(const TQString& name, KIcon::Group group, int size) const
+TQString TDEIconLoader::moviePath(const TQString& name, TDEIcon::Group group, int size) const
 {
     if (!d->mpGroups) return TQString::null;
 
-    if ( (group < -1 || group >= KIcon::LastGroup) && group != KIcon::User )
+    if ( (group < -1 || group >= TDEIcon::LastGroup) && group != TDEIcon::User )
     {
 	kdDebug(264) << "Illegal icon group: " << group << endl;
-	group = KIcon::Desktop;
+	group = TDEIcon::Desktop;
     }
     if (size == 0 && group < 0)
     {
 	kdDebug(264) << "Neither size nor group specified!" << endl;
-	group = KIcon::Desktop;
+	group = TDEIcon::Desktop;
     }
 
     TQString file = name + ".mng";
-    if (group == KIcon::User)
+    if (group == TDEIcon::User)
     {
 	file = d->mpDirs->findResource("appicon", file);
     }
@@ -929,15 +929,15 @@ TQString KIconLoader::moviePath(const TQString& name, KIcon::Group group, int si
 	if (size == 0)
 	    size = d->mpGroups[group].size;
 
-        KIcon icon;
+        TDEIcon icon;
 
-	for ( KIconThemeNode *themeNode = d->links.first() ; themeNode ;
+	for ( TDEIconThemeNode *themeNode = d->links.first() ; themeNode ;
 		themeNode = d->links.next() )
 	{
-	    icon = themeNode->theme->iconPath(file, size, KIcon::MatchExact);
+	    icon = themeNode->theme->iconPath(file, size, TDEIcon::MatchExact);
 	    if (icon.isValid()) goto icon_found ;
 
-		icon = themeNode->theme->iconPath(file, size, KIcon::MatchBest);
+		icon = themeNode->theme->iconPath(file, size, TDEIcon::MatchBest);
 	    if (icon.isValid()) goto icon_found ;
 	}
 
@@ -948,32 +948,32 @@ TQString KIconLoader::moviePath(const TQString& name, KIcon::Group group, int si
 }
 
 
-TQStringList KIconLoader::loadAnimated(const TQString& name, KIcon::Group group, int size) const
+TQStringList TDEIconLoader::loadAnimated(const TQString& name, TDEIcon::Group group, int size) const
 {
     TQStringList lst;
 
     if (!d->mpGroups) return lst;
 
-    if ((group < -1) || (group >= KIcon::LastGroup))
+    if ((group < -1) || (group >= TDEIcon::LastGroup))
     {
 	kdDebug(264) << "Illegal icon group: " << group << endl;
-	group = KIcon::Desktop;
+	group = TDEIcon::Desktop;
     }
     if ((size == 0) && (group < 0))
     {
 	kdDebug(264) << "Neither size nor group specified!" << endl;
-	group = KIcon::Desktop;
+	group = TDEIcon::Desktop;
     }
 
     TQString file = name + "/0001";
-    if (group == KIcon::User)
+    if (group == TDEIcon::User)
     {
 	file = d->mpDirs->findResource("appicon", file + ".png");
     } else
     {
 	if (size == 0)
 	    size = d->mpGroups[group].size;
-	KIcon icon = findMatchingIcon(file, size);
+	TDEIcon icon = findMatchingIcon(file, size);
 	file = icon.isValid() ? icon.path : TQString::null;
 
     }
@@ -999,17 +999,17 @@ TQStringList KIconLoader::loadAnimated(const TQString& name, KIcon::Group group,
     return lst;
 }
 
-KIconTheme *KIconLoader::theme() const
+TDEIconTheme *TDEIconLoader::theme() const
 {
     if (d->mpThemeRoot) return d->mpThemeRoot->theme;
     return 0L;
 }
 
-int KIconLoader::currentSize(KIcon::Group group) const
+int TDEIconLoader::currentSize(TDEIcon::Group group) const
 {
     if (!d->mpGroups) return -1;
 
-    if (group < 0 || group >= KIcon::LastGroup)
+    if (group < 0 || group >= TDEIcon::LastGroup)
     {
 	kdDebug(264) << "Illegal icon group: " << group << endl;
 	return -1;
@@ -1017,7 +1017,7 @@ int KIconLoader::currentSize(KIcon::Group group) const
     return d->mpGroups[group].size;
 }
 
-TQStringList KIconLoader::queryIconsByDir( const TQString& iconsDir ) const
+TQStringList TDEIconLoader::queryIconsByDir( const TQString& iconsDir ) const
 {
   TQDir dir(iconsDir);
   TQStringList lst = dir.entryList("*.png;*.xpm", TQDir::Files);
@@ -1028,11 +1028,11 @@ TQStringList KIconLoader::queryIconsByDir( const TQString& iconsDir ) const
   return result;
 }
 
-TQStringList KIconLoader::queryIconsByContext(int group_or_size,
-					    KIcon::Context context) const
+TQStringList TDEIconLoader::queryIconsByContext(int group_or_size,
+					    TDEIcon::Context context) const
 {
     TQStringList result;
-    if (group_or_size >= KIcon::LastGroup)
+    if (group_or_size >= TDEIcon::LastGroup)
     {
 	kdDebug(264) << "Illegal icon group: " << group_or_size << endl;
 	return result;
@@ -1043,7 +1043,7 @@ TQStringList KIconLoader::queryIconsByContext(int group_or_size,
     else
 	size = -group_or_size;
 
-    for ( KIconThemeNode *themeNode = d->links.first() ; themeNode ;
+    for ( TDEIconThemeNode *themeNode = d->links.first() ; themeNode ;
             themeNode = d->links.next() )
        themeNode->queryIconsByContext(&result, size, context);
 
@@ -1069,10 +1069,10 @@ TQStringList KIconLoader::queryIconsByContext(int group_or_size,
 
 }
 
-TQStringList KIconLoader::queryIcons(int group_or_size, KIcon::Context context) const
+TQStringList TDEIconLoader::queryIcons(int group_or_size, TDEIcon::Context context) const
 {
     TQStringList result;
-    if (group_or_size >= KIcon::LastGroup)
+    if (group_or_size >= TDEIcon::LastGroup)
     {
 	kdDebug(264) << "Illegal icon group: " << group_or_size << endl;
 	return result;
@@ -1083,7 +1083,7 @@ TQStringList KIconLoader::queryIcons(int group_or_size, KIcon::Context context)
     else
 	size = -group_or_size;
 
-    for ( KIconThemeNode *themeNode = d->links.first() ; themeNode ;
+    for ( TDEIconThemeNode *themeNode = d->links.first() ; themeNode ;
             themeNode = d->links.next() )
        themeNode->queryIcons(&result, size, context);
 
@@ -1108,26 +1108,26 @@ TQStringList KIconLoader::queryIcons(int group_or_size, KIcon::Context context)
     return res2;
 }
 
-// used by KIconDialog to find out which contexts to offer in a combobox
-bool KIconLoader::hasContext(KIcon::Context context) const
+// used by TDEIconDialog to find out which contexts to offer in a combobox
+bool TDEIconLoader::hasContext(TDEIcon::Context context) const
 {
-    for ( KIconThemeNode *themeNode = d->links.first() ; themeNode ;
+    for ( TDEIconThemeNode *themeNode = d->links.first() ; themeNode ;
             themeNode = d->links.next() )
        if( themeNode->theme->hasContext( context ))
            return true;
     return false;
 }
 
-KIconEffect * KIconLoader::iconEffect() const
+TDEIconEffect * TDEIconLoader::iconEffect() const
 {
     return &d->mpEffect;
 }
 
-bool KIconLoader::alphaBlending(KIcon::Group group) const
+bool TDEIconLoader::alphaBlending(TDEIcon::Group group) const
 {
     if (!d->mpGroups) return false;
 
-    if (group < 0 || group >= KIcon::LastGroup)
+    if (group < 0 || group >= TDEIcon::LastGroup)
     {
 	kdDebug(264) << "Illegal icon group: " << group << endl;
 	return false;
@@ -1135,103 +1135,103 @@ bool KIconLoader::alphaBlending(KIcon::Group group) const
     return d->mpGroups[group].alphaBlending;
 }
 
-TQIconSet KIconLoader::loadIconSet(const TQString& name, KIcon::Group group, int size, bool canReturnNull)
+TQIconSet TDEIconLoader::loadIconSet(const TQString& name, TDEIcon::Group group, int size, bool canReturnNull)
 {
     return loadIconSet( name, group, size, canReturnNull, true );
 }
 
-TQIconSet KIconLoader::loadIconSet(const TQString& name, KIcon::Group group, int size)
+TQIconSet TDEIconLoader::loadIconSet(const TQString& name, TDEIcon::Group group, int size)
 {
     return loadIconSet( name, group, size, false );
 }
 
 /*** class for delayed icon loading for TQIconSet ***/
 
-class KIconFactory
+class TDEIconFactory
     : public TQIconFactory
     {
     public:
-        KIconFactory( const TQString& iconName_P, KIcon::Group group_P,
-            int size_P, KIconLoader* loader_P );
-        KIconFactory( const TQString& iconName_P, KIcon::Group group_P,
-            int size_P, KIconLoader* loader_P, bool canReturnNull );
+        TDEIconFactory( const TQString& iconName_P, TDEIcon::Group group_P,
+            int size_P, TDEIconLoader* loader_P );
+        TDEIconFactory( const TQString& iconName_P, TDEIcon::Group group_P,
+            int size_P, TDEIconLoader* loader_P, bool canReturnNull );
         virtual TQPixmap* createPixmap( const TQIconSet&, TQIconSet::Size, TQIconSet::Mode, TQIconSet::State );
     private:
         TQString iconName;
-        KIcon::Group group;
+        TDEIcon::Group group;
         int size;
-        KIconLoader* loader;
+        TDEIconLoader* loader;
         bool canReturnNull;
     };
 
 
-TQIconSet KIconLoader::loadIconSet( const TQString& name, KIcon::Group g, int s,
+TQIconSet TDEIconLoader::loadIconSet( const TQString& name, TDEIcon::Group g, int s,
     bool canReturnNull, bool immediateExistenceCheck)
 {
     if ( !d->delayedLoading )
         return loadIconSetNonDelayed( name, g, s, canReturnNull );
 
     if (g < -1 || g > 6) {
-        kdDebug() << "KIconLoader::loadIconSet " << name << " " << (int)g << " " << s << endl;
+        kdDebug() << "TDEIconLoader::loadIconSet " << name << " " << (int)g << " " << s << endl;
         tqDebug("%s", kdBacktrace().latin1());
         abort();
     }
 
     if(canReturnNull && immediateExistenceCheck)
     { // we need to find out if the icon actually exists
-        TQPixmap pm = loadIcon( name, g, s, KIcon::DefaultState, NULL, true );
+        TQPixmap pm = loadIcon( name, g, s, TDEIcon::DefaultState, NULL, true );
         if( pm.isNull())
             return TQIconSet();
 
         TQIconSet ret( pm );
-        ret.installIconFactory( new KIconFactory( name, g, s, this ));
+        ret.installIconFactory( new TDEIconFactory( name, g, s, this ));
         return ret;
     }
 
     TQIconSet ret;
-    ret.installIconFactory( new KIconFactory( name, g, s, this, canReturnNull ));
+    ret.installIconFactory( new TDEIconFactory( name, g, s, this, canReturnNull ));
     return ret;
 }
 
-TQIconSet KIconLoader::loadIconSetNonDelayed( const TQString& name,
-                                             KIcon::Group g,
+TQIconSet TDEIconLoader::loadIconSetNonDelayed( const TQString& name,
+                                             TDEIcon::Group g,
                                              int s, bool canReturnNull )
 {
     TQIconSet iconset;
-    TQPixmap tmp = loadIcon(name, g, s, KIcon::ActiveState, NULL, canReturnNull);
+    TQPixmap tmp = loadIcon(name, g, s, TDEIcon::ActiveState, NULL, canReturnNull);
     iconset.setPixmap( tmp, TQIconSet::Small, TQIconSet::Active );
     // we don't use QIconSet's resizing anyway
     iconset.setPixmap( tmp, TQIconSet::Large, TQIconSet::Active );
-    tmp = loadIcon(name, g, s, KIcon::DisabledState, NULL, canReturnNull);
+    tmp = loadIcon(name, g, s, TDEIcon::DisabledState, NULL, canReturnNull);
     iconset.setPixmap( tmp, TQIconSet::Small, TQIconSet::Disabled );
     iconset.setPixmap( tmp, TQIconSet::Large, TQIconSet::Disabled );
-    tmp = loadIcon(name, g, s, KIcon::DefaultState, NULL, canReturnNull);
+    tmp = loadIcon(name, g, s, TDEIcon::DefaultState, NULL, canReturnNull);
     iconset.setPixmap( tmp, TQIconSet::Small, TQIconSet::Normal );
     iconset.setPixmap( tmp, TQIconSet::Large, TQIconSet::Normal );
     return iconset;
 }
 
-KIconFactory::KIconFactory( const TQString& iconName_P, KIcon::Group group_P,
-    int size_P, KIconLoader* loader_P )
+TDEIconFactory::TDEIconFactory( const TQString& iconName_P, TDEIcon::Group group_P,
+    int size_P, TDEIconLoader* loader_P )
     : iconName( iconName_P ), group( group_P ), size( size_P ), loader( loader_P )
 {
     canReturnNull = false;
     setAutoDelete( true );
 }
 
-KIconFactory::KIconFactory( const TQString& iconName_P, KIcon::Group group_P,
-    int size_P, KIconLoader* loader_P, bool canReturnNull_P )
+TDEIconFactory::TDEIconFactory( const TQString& iconName_P, TDEIcon::Group group_P,
+    int size_P, TDEIconLoader* loader_P, bool canReturnNull_P )
     : iconName( iconName_P ), group( group_P ), size( size_P ),
       loader( loader_P ), canReturnNull( canReturnNull_P)
 {
     setAutoDelete( true );
 }
 
-TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconSet::Mode mode_P, TQIconSet::State )
+TQPixmap* TDEIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconSet::Mode mode_P, TQIconSet::State )
     {
 #ifdef KICONLOADER_CHECKS
     bool found = false;
-    for( TQValueList< KIconLoaderDebug >::Iterator it = kiconloaders->begin();
+    for( TQValueList< TDEIconLoaderDebug >::Iterator it = kiconloaders->begin();
          it != kiconloaders->end();
          ++it )
         {
@@ -1241,10 +1241,10 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS
             if( !(*it).valid )
                 {
 #ifdef NDEBUG
-                loader = KGlobal::iconLoader();
+                loader = TDEGlobal::iconLoader();
                 iconName = "no_way_man_you_will_get_broken_icon";
 #else
-                kdWarning() << "Using already destroyed KIconLoader for loading an icon!" << endl;
+                kdWarning() << "Using already destroyed TDEIconLoader for loading an icon!" << endl;
                 kdWarning() << "Appname:" << (*it).appname << ", icon:" << iconName << endl;
                 kdWarning() << "Deleted at:" << endl;
                 kdWarning() << (*it).delete_bt << endl;
@@ -1260,10 +1260,10 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS
     if( !found )
         {
 #ifdef NDEBUG
-        loader = KGlobal::iconLoader();
+        loader = TDEGlobal::iconLoader();
         iconName = "no_way_man_you_will_get_broken_icon";
 #else
-        kdWarning() << "Using unknown KIconLoader for loading an icon!" << endl;
+        kdWarning() << "Using unknown TDEIconLoader for loading an icon!" << endl;
         kdWarning() << "Icon:" << iconName << endl;
         kdWarning() << kdBacktrace() << endl;
         abort();
@@ -1271,15 +1271,15 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS
 #endif
         }
 #endif
-    // TQIconSet::Mode to KIcon::State conversion
-    static const KIcon::States tbl[] = { KIcon::DefaultState, KIcon::DisabledState, KIcon::ActiveState };
-    int state = KIcon::DefaultState;
+    // TQIconSet::Mode to TDEIcon::State conversion
+    static const TDEIcon::States tbl[] = { TDEIcon::DefaultState, TDEIcon::DisabledState, TDEIcon::ActiveState };
+    int state = TDEIcon::DefaultState;
     if( mode_P <= TQIconSet::Active )
         state = tbl[ mode_P ];
-    if( group >= 0 && state == KIcon::ActiveState )
+    if( group >= 0 && state == TDEIcon::ActiveState )
     { // active and normal icon are usually the same
-	if( loader->iconEffect()->fingerprint(group, KIcon::ActiveState )
-            == loader->iconEffect()->fingerprint(group, KIcon::DefaultState ))
+	if( loader->iconEffect()->fingerprint(group, TDEIcon::ActiveState )
+            == loader->iconEffect()->fingerprint(group, TDEIcon::DefaultState ))
             return 0; // so let TQIconSet simply duplicate it
     }
     // ignore passed size
@@ -1291,107 +1291,107 @@ TQPixmap* KIconFactory::createPixmap( const TQIconSet&, TQIconSet::Size, TQIconS
 // Easy access functions
 
 TQPixmap DesktopIcon(const TQString& name, int force_size, int state,
-	KInstance *instance)
+	TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIcon(name, KIcon::Desktop, force_size, state);
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIcon(name, TDEIcon::Desktop, force_size, state);
 }
 
-TQPixmap DesktopIcon(const TQString& name, KInstance *instance)
+TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance)
 {
-    return DesktopIcon(name, 0, KIcon::DefaultState, instance);
+    return DesktopIcon(name, 0, TDEIcon::DefaultState, instance);
 }
 
-TQIconSet DesktopIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet DesktopIconSet(const TQString& name, int force_size, TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIconSet( name, KIcon::Desktop, force_size );
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIconSet( name, TDEIcon::Desktop, force_size );
 }
 
 TQPixmap BarIcon(const TQString& name, int force_size, int state,
-	KInstance *instance)
+	TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIcon(name, KIcon::Toolbar, force_size, state);
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIcon(name, TDEIcon::Toolbar, force_size, state);
 }
 
-TQPixmap BarIcon(const TQString& name, KInstance *instance)
+TQPixmap BarIcon(const TQString& name, TDEInstance *instance)
 {
-    return BarIcon(name, 0, KIcon::DefaultState, instance);
+    return BarIcon(name, 0, TDEIcon::DefaultState, instance);
 }
 
-TQIconSet BarIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet BarIconSet(const TQString& name, int force_size, TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIconSet( name, KIcon::Toolbar, force_size );
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIconSet( name, TDEIcon::Toolbar, force_size );
 }
 
 TQPixmap SmallIcon(const TQString& name, int force_size, int state,
-	KInstance *instance)
+	TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIcon(name, KIcon::Small, force_size, state);
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIcon(name, TDEIcon::Small, force_size, state);
 }
 
-TQPixmap SmallIcon(const TQString& name, KInstance *instance)
+TQPixmap SmallIcon(const TQString& name, TDEInstance *instance)
 {
-    return SmallIcon(name, 0, KIcon::DefaultState, instance);
+    return SmallIcon(name, 0, TDEIcon::DefaultState, instance);
 }
 
-TQIconSet SmallIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet SmallIconSet(const TQString& name, int force_size, TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIconSet( name, KIcon::Small, force_size );
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIconSet( name, TDEIcon::Small, force_size );
 }
 
 TQPixmap MainBarIcon(const TQString& name, int force_size, int state,
-	KInstance *instance)
+	TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIcon(name, KIcon::MainToolbar, force_size, state);
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIcon(name, TDEIcon::MainToolbar, force_size, state);
 }
 
-TQPixmap MainBarIcon(const TQString& name, KInstance *instance)
+TQPixmap MainBarIcon(const TQString& name, TDEInstance *instance)
 {
-    return MainBarIcon(name, 0, KIcon::DefaultState, instance);
+    return MainBarIcon(name, 0, TDEIcon::DefaultState, instance);
 }
 
-TQIconSet MainBarIconSet(const TQString& name, int force_size, KInstance *instance)
+TQIconSet MainBarIconSet(const TQString& name, int force_size, TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIconSet( name, KIcon::MainToolbar, force_size );
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIconSet( name, TDEIcon::MainToolbar, force_size );
 }
 
-TQPixmap UserIcon(const TQString& name, int state, KInstance *instance)
+TQPixmap UserIcon(const TQString& name, int state, TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIcon(name, KIcon::User, 0, state);
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIcon(name, TDEIcon::User, 0, state);
 }
 
-TQPixmap UserIcon(const TQString& name, KInstance *instance)
+TQPixmap UserIcon(const TQString& name, TDEInstance *instance)
 {
-    return UserIcon(name, KIcon::DefaultState, instance);
+    return UserIcon(name, TDEIcon::DefaultState, instance);
 }
 
-TQIconSet UserIconSet(const TQString& name, KInstance *instance)
+TQIconSet UserIconSet(const TQString& name, TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
-    return loader->loadIconSet( name, KIcon::User );
+    TDEIconLoader *loader = instance->iconLoader();
+    return loader->loadIconSet( name, TDEIcon::User );
 }
 
-int IconSize(KIcon::Group group, KInstance *instance)
+int IconSize(TDEIcon::Group group, TDEInstance *instance)
 {
-    KIconLoader *loader = instance->iconLoader();
+    TDEIconLoader *loader = instance->iconLoader();
     return loader->currentSize(group);
 }
 
-TQPixmap KIconLoader::unknown()
+TQPixmap TDEIconLoader::unknown()
 {
     TQPixmap pix;
     if ( TQPixmapCache::find("unknown", pix) )
             return pix;
 
-    TQString path = KGlobal::iconLoader()->iconPath("unknown", KIcon::Small, true);
+    TQString path = TDEGlobal::iconLoader()->iconPath("unknown", TDEIcon::Small, true);
     if (path.isEmpty())
     {
 	kdDebug(264) << "Warning: Cannot find \"unknown\" icon." << endl;
@@ -1405,7 +1405,7 @@ TQPixmap KIconLoader::unknown()
     return pix;
 }
 
-void KIconLoaderPrivate::reconfigure()
+void TDEIconLoaderPrivate::reconfigure()
 {
   q->reconfigure(appname, mpDirs);
 }
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index db5a8ff5a..434a3d976 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -9,8 +9,8 @@
  * exact licensing terms.
  */
 
-#ifndef __KIconLoader_h_Included__
-#define __KIconLoader_h_Included__
+#ifndef __TDEIconLoader_h_Included__
+#define __TDEIconLoader_h_Included__
 
 #include <tqstring.h>
 #include <tqpixmap.h>
@@ -18,31 +18,31 @@
 
 // Grmbl, X headers.....
 #ifdef Status
-#define KIconLoaderXStatus Status
+#define TDEIconLoaderXStatus Status
 #undef Status
 #endif
 #include <tqmovie.h>
-#ifdef KIconLoaderXStatus
+#ifdef TDEIconLoaderXStatus
 #define Status int
-#undef KIconLoaderXStatus
+#undef TDEIconLoaderXStatus
 #endif
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kicontheme.h>
 
-struct KIconGroup;
-class KIconThemeNode;
-class KConfig;
-struct KIconLoaderPrivate;
-class KStandardDirs;
-class KIconEffect;
+struct TDEIconGroup;
+class TDEIconThemeNode;
+class TDEConfig;
+struct TDEIconLoaderPrivate;
+class TDEStandardDirs;
+class TDEIconEffect;
 
 
 /**
  * Iconloader for KDE.
  *
- * KIconLoader will load the current icon theme and all its base themes.
+ * TDEIconLoader will load the current icon theme and all its base themes.
  * Icons will be searched in any of these themes. Additionally, it caches
  * icons and applies effects according the the user's preferences.
  *
@@ -55,12 +55,12 @@ class KIconEffect;
  *
  * The standard groups are defined below.
  *
- * @li KIcon::Desktop: Icons in the iconview of konqueror, kdesktop and similar apps.
- * @li KIcon::Toolbar: Icons in toolbars.
- * @li KIcon::MainToolbar: Icons in the main toolbars.
- * @li KIcon::Small: Various small (typical 16x16) places: titlebars, listviews
+ * @li TDEIcon::Desktop: Icons in the iconview of konqueror, kdesktop and similar apps.
+ * @li TDEIcon::Toolbar: Icons in toolbars.
+ * @li TDEIcon::MainToolbar: Icons in the main toolbars.
+ * @li TDEIcon::Small: Various small (typical 16x16) places: titlebars, listviews
  * and menu entries.
- * @li KIcon::Panel: Icons in kicker's panel
+ * @li TDEIcon::Panel: Icons in kicker's panel
  *
  * The icons are stored on disk in an icon theme or in a standalone
  * directory. The icon theme directories contain multiple sizes and/or
@@ -74,7 +74,7 @@ class KIconEffect;
  * "User".
  *
  */
-class TDECORE_EXPORT KIconLoader
+class TDECORE_EXPORT TDEIconLoader
 {
 public:
 
@@ -83,21 +83,21 @@ public:
      * @param appname Add the data directories of this application to the
      * icon search path for the "User" group. The default argument adds the
      * directories of the current application.
-     * @param dirs the KStandardDirs object to use. If null the global one is used
+     * @param dirs the TDEStandardDirs object to use. If null the global one is used
      *
      * Usually, you use the default iconloader, which can be accessed via
-     * KGlobal::iconLoader(), so you hardly ever have to create an
-     * iconloader object yourself. That one is the current KInstance's
-     * (typically KApplication's) iconloader.
-     * @see KGlobal::iconLoader()
-     * @see KInstance::iconLoader()
+     * TDEGlobal::iconLoader(), so you hardly ever have to create an
+     * iconloader object yourself. That one is the current TDEInstance's
+     * (typically TDEApplication's) iconloader.
+     * @see TDEGlobal::iconLoader()
+     * @see TDEInstance::iconLoader()
      */
-    KIconLoader(const TQString& appname=TQString::null, KStandardDirs *dirs = 0);
+    TDEIconLoader(const TQString& appname=TQString::null, TDEStandardDirs *dirs = 0);
 
     /**
      * Cleanup
      */
-    ~KIconLoader();
+    ~TDEIconLoader();
 
     /**
      * Adds @p appname to the list of application specific directories.
@@ -116,7 +116,7 @@ public:
      * @param group The icon group. This will specify the size of and effects to
      * be applied to the icon.
      * @param size If nonzero, this overrides the size specified by @p group.
-     *             See KIcon::StdSizes.
+     *             See TDEIcon::StdSizes.
      * @param state The icon state: @p DefaultState, @p ActiveState or
      * @p DisabledState. Depending on the user's preferences, the iconloader
      * may apply a visual effect to hint about its state.
@@ -126,8 +126,8 @@ public:
      * @return the TQPixmap. Can be null when not found, depending on
      *         @p canReturnNull.
      */
-    TQPixmap loadIcon(const TQString& name, KIcon::Group group, int size=0,
-		     int state=KIcon::DefaultState, TQString *path_store=0L,
+    TQPixmap loadIcon(const TQString& name, TDEIcon::Group group, int size=0,
+		     int state=TDEIcon::DefaultState, TQString *path_store=0L,
 		     bool canReturnNull=false) const;
 
     /**
@@ -138,7 +138,7 @@ public:
      * @param group The icon group. This will specify the size of and effects to
      * be applied to the icon.
      * @param size If nonzero, this overrides the size specified by @p group.
-     *             See KIcon::StdSizes.
+     *             See TDEIcon::StdSizes.
      * @param canReturnNull Can return a null iconset? If false, iconset
      * containing the "unknown" pixmap is returned when no appropriate icon has
      * been found.
@@ -148,10 +148,10 @@ public:
      *          @p canReturnNull.
      * @since 3.5
      */
-    TQIconSet loadIconSet(const TQString& name, KIcon::Group group, int size,
+    TQIconSet loadIconSet(const TQString& name, TDEIcon::Group group, int size,
                          bool canReturnNull, bool immediateExistenceCheck);
 
-    // KDE4 merge as (const TQString&,KIcon::Group,int=0,bool=false,bool=true);
+    // KDE4 merge as (const TQString&,TDEIcon::Group,int=0,bool=false,bool=true);
     /**
      * Creates an icon set, that will do on-demand loading of the icon.
      * Loading itself is done by calling loadIcon .
@@ -160,7 +160,7 @@ public:
      * @param group The icon group. This will specify the size of and effects to
      * be applied to the icon.
      * @param size If nonzero, this overrides the size specified by @p group.
-     *             See KIcon::StdSizes.
+     *             See TDEIcon::StdSizes.
      * @param canReturnNull Can return a null iconset? If false, iconset
      * containing the "unknown" pixmap is returned when no appropriate icon has
      * been found.
@@ -168,10 +168,10 @@ public:
      *          @p canReturnNull.
      * @since 3.1
      */
-    TQIconSet loadIconSet(const TQString& name, KIcon::Group group, int size,
+    TQIconSet loadIconSet(const TQString& name, TDEIcon::Group group, int size,
                          bool canReturnNull);
 
-    // KDE4 merge as (const TQString&,KIcon::Group,int=0,bool=false,bool=true);
+    // KDE4 merge as (const TQString&,TDEIcon::Group,int=0,bool=false,bool=true);
     /**
      * Creates an icon set, that will do on-demand loading of the icon.
      * Loading itself is done by calling loadIcon .
@@ -180,10 +180,10 @@ public:
      * @param group The icon group. This will specify the size of and effects to
      * be applied to the icon.
      * @param size If nonzero, this overrides the size specified by @p group.
-     *             See KIcon::StdSizes.
+     *             See TDEIcon::StdSizes.
      * @return the icon set. Can be null when not found
      */
-    TQIconSet loadIconSet(const TQString& name, KIcon::Group group, int size=0);
+    TQIconSet loadIconSet(const TQString& name, TDEIcon::Group group, int size=0);
 
     /**
      * Returns the path of an icon.
@@ -193,7 +193,7 @@ public:
      * @param group_or_size If positive, search icons whose size is
      * specified by the icon group @p group_or_size. If negative, search
      * icons whose size is - @p group_or_size.
-     *             See KIcon::Group and KIcon::StdSizes
+     *             See TDEIcon::Group and TDEIcon::StdSizes
      * @param canReturnNull Can return a null string? If not, a path to the
      *                      "unknown" icon will be returned.
      * @return the path of an icon, can be null or the "unknown" icon when
@@ -207,21 +207,21 @@ public:
      * @param name The name of the icon.
      * @param group The icon group. See loadIcon().
      * @param size Override the default size for @p group.
-     *             See KIcon::StdSizes.
+     *             See TDEIcon::StdSizes.
      * @return A TQMovie object. Can be null if not found.
      */
-    TQMovie loadMovie(const TQString& name, KIcon::Group group, int size=0) const;
+    TQMovie loadMovie(const TQString& name, TDEIcon::Group group, int size=0) const;
 
     /**
      * Returns the path to an animated icon.
      * @param name The name of the icon.
      * @param group The icon group. See loadIcon().
      * @param size Override the default size for @p group.
-     *             See KIcon::StdSizes.
+     *             See TDEIcon::StdSizes.
      * @return the full path to the movie, ready to be passed to QMovie's constructor.
      * Empty string if not found.
      */
-    TQString moviePath(const TQString& name, KIcon::Group group, int size=0) const;
+    TQString moviePath(const TQString& name, TDEIcon::Group group, int size=0) const;
 
     /**
      * Loads an animated icon as a series of still frames. If you want to load
@@ -229,11 +229,11 @@ public:
      * @param name The name of the icon.
      * @param group The icon group. See loadIcon().
      * @param size Override the default size for @p group.
-     *             See KIcon::StdSizes.
+     *             See TDEIcon::StdSizes.
      * @return A TQStringList containing the absolute path of all the frames
      * making up the animation.
      */
-    TQStringList loadAnimated(const TQString& name, KIcon::Group group, int size=0) const;
+    TQStringList loadAnimated(const TQString& name, TDEIcon::Group group, int size=0) const;
 
     /**
      * Queries all available icons for a specific group, having a specific
@@ -241,30 +241,30 @@ public:
      * @param group_or_size If positive, search icons whose size is
      * specified by the icon group @p group_or_size. If negative, search
      * icons whose size is - @p group_or_size.
-     *             See KIcon::Group and KIcon::StdSizes
+     *             See TDEIcon::Group and TDEIcon::StdSizes
      * @param context The icon context.
      * @return a list of all icons
      */
-    TQStringList queryIcons(int group_or_size, KIcon::Context context=KIcon::Any) const;
+    TQStringList queryIcons(int group_or_size, TDEIcon::Context context=TDEIcon::Any) const;
 
     /**
      * Queries all available icons for a specific context.
      * @param group_or_size The icon preferred group or size. If available
      * at this group or size, those icons will be returned, in other case,
      * icons of undefined size will be returned. Positive numbers are groups,
-     * negative numbers are negated sizes. See KIcon::Group and
-     * KIcon::StdSizes
+     * negative numbers are negated sizes. See TDEIcon::Group and
+     * TDEIcon::StdSizes
      * @param context The icon context.
      * @return A TQStringList containing the icon names
      * available for that context
      */
     TQStringList queryIconsByContext(int group_or_size,
-				    KIcon::Context context=KIcon::Any) const;
+				    TDEIcon::Context context=TDEIcon::Any) const;
 
     /**
      * @internal
      */
-    bool hasContext( KIcon::Context context ) const;
+    bool hasContext( TDEIcon::Context context ) const;
 
     /**
      * Returns a list of all icons (*.png or *.xpm extension) in the
@@ -280,28 +280,28 @@ public:
      * @param group the group to check.
      * @return the current size for an icon group.
      */
-    int currentSize(KIcon::Group group) const;
+    int currentSize(TDEIcon::Group group) const;
 
     /**
      * Returns a pointer to the current theme. Can be used to query
      * available and default sizes for groups.
      * @return a pointer to the current theme. 0 if no theme set.
      */
-    KIconTheme *theme() const;
+    TDEIconTheme *theme() const;
 
     /**
-     * Returns a pointer to the KIconEffect object used by the icon loader.
-     * @return the KIconEffect.
+     * Returns a pointer to the TDEIconEffect object used by the icon loader.
+     * @return the TDEIconEffect.
      */
-    KIconEffect *iconEffect() const;
+    TDEIconEffect *iconEffect() const;
 
     /**
-     * Called by KInstance::newIconLoader to reconfigure the icon loader.
+     * Called by TDEInstance::newIconLoader to reconfigure the icon loader.
      * @param _appname the new application name
      * @param _dirs the new standard directories. If 0, the directories
-     *              from KGlobal will be taken.
+     *              from TDEGlobal will be taken.
      */
-    void reconfigure( const TQString& _appname, KStandardDirs *_dirs );
+    void reconfigure( const TQString& _appname, TDEStandardDirs *_dirs );
 
     /**
      * Returns the unknown icon. An icon that is used when no other icon
@@ -317,7 +317,7 @@ public:
      * @return true if alpha blending is desired
      * @obsolete
      */
-    bool alphaBlending( KIcon::Group group ) const;
+    bool alphaBlending( TDEIcon::Group group ) const;
 
     /**
      * Adds all the default themes from other desktops at the end of
@@ -344,8 +344,8 @@ public:
      * The default is disabled, as the iconloader object must not be
      * destroyed before all those iconsets are destroyed.
      *
-     * (Some broken applications use temporary KIconLoader objects).
-     * Every KInstance 's iconloader has this feature enabled.
+     * (Some broken applications use temporary TDEIconLoader objects).
+     * Every TDEInstance 's iconloader has this feature enabled.
      *
      * @param enable true to enable delayed icon loading, false to disable
      * @see isDelayedIconSetLoadingEnabled()
@@ -368,14 +368,14 @@ public:
     /**
      * @internal
      */
-    void init( const TQString& _appname, KStandardDirs *_dirs );
+    void init( const TQString& _appname, TDEStandardDirs *_dirs );
 
     /**
      * @internal
      * tries to find an icon with the name. It tries some extension and
      * match strategies
      */
-    KIcon findMatchingIcon(const TQString& name, int size) const;
+    TDEIcon findMatchingIcon(const TQString& name, int size) const;
 
     /**
      * @internal
@@ -394,7 +394,7 @@ public:
      * below (the fallbacks of the theme) in the tree.
      * @internal
      */
-    void addBaseThemes(KIconThemeNode *node, const TQString &appname);
+    void addBaseThemes(TDEIconThemeNode *node, const TQString &appname);
 
     /**
      * @internal
@@ -434,120 +434,120 @@ public:
     /**
      * Loads all the different sizes for an iconset.
      */
-    TQIconSet loadIconSetNonDelayed( const TQString& name, KIcon::Group group,
+    TQIconSet loadIconSetNonDelayed( const TQString& name, TDEIcon::Group group,
                                     int size, bool canReturnNull );
 
     // @internal the data object
-    KIconLoaderPrivate *d;
+    TDEIconLoaderPrivate *d;
 };
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a desktop icon.
  */
 TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, int size=0,
-		    int state=KIcon::DefaultState,
-		    KInstance *instance=KGlobal::instance());
+		    int state=TDEIcon::DefaultState,
+		    TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a desktop icon.
  */
-TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap DesktopIcon(const TQString& name, TDEInstance *instance);
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a desktop icon, and apply the necessary effects to get an IconSet.
  */
 TDECORE_EXPORT TQIconSet DesktopIconSet(const TQString& name, int size=0,
-		    KInstance *instance=KGlobal::instance());
+		    TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a toolbar icon.
  */
-TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=KIcon::DefaultState,
-	KInstance *instance=KGlobal::instance());
+TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, int size=0, int state=TDEIcon::DefaultState,
+	TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a toolbar icon.
  */
-TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap BarIcon(const TQString& name, TDEInstance *instance);
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a toolbar icon, and apply the necessary effects to get an IconSet.
  */
 TDECORE_EXPORT TQIconSet BarIconSet(const TQString& name, int size=0,
-		    KInstance *instance=KGlobal::instance());
+		    TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a small icon.
  */
 TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, int size=0,
-		  int state=KIcon::DefaultState,
-		  KInstance *instance=KGlobal::instance());
+		  int state=TDEIcon::DefaultState,
+		  TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a small icon.
  */
-TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap SmallIcon(const TQString& name, TDEInstance *instance);
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a small icon, and apply the necessary effects to get an IconSet.
  */
 TDECORE_EXPORT TQIconSet SmallIconSet(const TQString& name, int size=0,
-		    KInstance *instance=KGlobal::instance());
+		    TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a main toolbar icon.
  */
 TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, int size=0,
-		    int state=KIcon::DefaultState,
-		    KInstance *instance=KGlobal::instance());
+		    int state=TDEIcon::DefaultState,
+		    TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a main toolbar icon.
  */
-TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap MainBarIcon(const TQString& name, TDEInstance *instance);
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a main toolbar icon, and apply the effects to get an IconSet.
  */
 TDECORE_EXPORT TQIconSet MainBarIconSet(const TQString& name, int size=0,
-		    KInstance *instance=KGlobal::instance());
+		    TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a user icon. User icons are searched in $appdir/pics.
  */
-TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=KIcon::DefaultState,
-	KInstance *instance=KGlobal::instance());
+TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, int state=TDEIcon::DefaultState,
+	TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a user icon. User icons are searched in $appdir/pics.
  */
-TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, KInstance *instance);
+TDECORE_EXPORT TQPixmap UserIcon(const TQString& name, TDEInstance *instance);
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Load a user icon, and apply the effects to get an IconSet.
  */
 TDECORE_EXPORT TQIconSet UserIconSet(const TQString& name,
-	KInstance *instance=KGlobal::instance());
+	TDEInstance *instance=TDEGlobal::instance());
 
 /**
- * \relates KIconLoader
+ * \relates TDEIconLoader
  * Returns the current icon size for a specific group.
  */
-TDECORE_EXPORT int IconSize(KIcon::Group group, KInstance *instance=KGlobal::instance());
+TDECORE_EXPORT int IconSize(TDEIcon::Group group, TDEInstance *instance=TDEGlobal::instance());
 
-#endif // __KIconLoader_h_Included__
+#endif // __TDEIconLoader_h_Included__
diff --git a/tdecore/kiconloader_p.h b/tdecore/kiconloader_p.h
index 4a7695390..82ff9dbe8 100644
--- a/tdecore/kiconloader_p.h
+++ b/tdecore/kiconloader_p.h
@@ -9,8 +9,8 @@
  * exact licensing terms.
  */
 
-#ifndef __KIconLoader_p_h_Included__
-#define __KIconLoader_p_h_Included__
+#ifndef __TDEIconLoader_p_h_Included__
+#define __TDEIconLoader_p_h_Included__
 
 #include <tqobject.h>
 #include <tqstringlist.h>
@@ -19,37 +19,37 @@
 #include <kiconeffect.h>
 #include <tqdict.h>
 
-class KIconThemeNode
+class TDEIconThemeNode
 {
 public:
-    KIconThemeNode(KIconTheme *_theme);
-    ~KIconThemeNode();
+    TDEIconThemeNode(TDEIconTheme *_theme);
+    ~TDEIconThemeNode();
 
-    void queryIcons(TQStringList *lst, int size, KIcon::Context context) const;
-    void queryIconsByContext(TQStringList *lst, int size, KIcon::Context context) const;
-    KIcon findIcon(const TQString& name, int size, KIcon::MatchType match) const;
+    void queryIcons(TQStringList *lst, int size, TDEIcon::Context context) const;
+    void queryIconsByContext(TQStringList *lst, int size, TDEIcon::Context context) const;
+    TDEIcon findIcon(const TQString& name, int size, TDEIcon::MatchType match) const;
     void printTree(TQString& dbgString) const;
 
-    KIconTheme *theme;
+    TDEIconTheme *theme;
 };
 
-class KIconLoaderPrivate : public TQObject
+class TDEIconLoaderPrivate : public TQObject
 {
     Q_OBJECT
 public:
     TQStringList mThemesInTree;
-    KIconGroup *mpGroups;
-    KIconThemeNode *mpThemeRoot;
-    KStandardDirs *mpDirs;
-    KIconLoader *q;
-    KIconEffect mpEffect;
+    TDEIconGroup *mpGroups;
+    TDEIconThemeNode *mpThemeRoot;
+    TDEStandardDirs *mpDirs;
+    TDEIconLoader *q;
+    TDEIconEffect mpEffect;
     TQDict<TQImage> imgDict;
     TQImage lastImage; // last loaded image without effect applied
     TQString lastImageKey; // key for icon without effect
     TQString appname;
-    int lastIconType; // see KIcon::type
-    int lastIconThreshold; // see KIcon::threshold
-    TQPtrList<KIconThemeNode> links;
+    int lastIconType; // see TDEIcon::type
+    int lastIconThreshold; // see TDEIcon::threshold
+    TQPtrList<TDEIconThemeNode> links;
     bool extraDesktopIconsLoaded;
     bool delayedLoading;
 
@@ -57,4 +57,4 @@ public slots:
     void reconfigure();
 };
 
-#endif // __KIconLoader_p_h_Included__
+#endif // __TDEIconLoader_p_h_Included__
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index d30e254d0..544eefe01 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -30,37 +30,37 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
 
 #include "kicontheme.h"
 
-class KIconThemePrivate
+class TDEIconThemePrivate
 {
 public:
     TQString example, screenshot;
     TQString linkOverlay, lockOverlay, zipOverlay, shareOverlay;
     bool hidden;
-    KSharedConfig::Ptr sharedConfig;
+    TDESharedConfig::Ptr sharedConfig;
 };
 
 /**
  * A subdirectory in an icon theme.
  */
-class KIconThemeDir
+class TDEIconThemeDir
 {
 public:
-    KIconThemeDir(const TQString& dir, const KConfigBase *config);
+    TDEIconThemeDir(const TQString& dir, const TDEConfigBase *config);
 
     bool isValid() const { return mbValid; }
     TQString iconPath(const TQString& name) const;
     TQStringList iconList() const;
     TQString dir() const { return mDir; }
 
-    KIcon::Context context() const { return mContext; }
-    KIcon::Type type() const { return mType; }
+    TDEIcon::Context context() const { return mContext; }
+    TDEIcon::Type type() const { return mType; }
     int size() const { return mSize; }
     int minSize() const { return mMinSize; }
     int maxSize() const { return mMaxSize; }
@@ -68,8 +68,8 @@ public:
 
 private:
     bool mbValid;
-    KIcon::Type mType;
-    KIcon::Context mContext;
+    TDEIcon::Type mType;
+    TDEIcon::Context mContext;
     int mSize, mMinSize, mMaxSize;
     int mThreshold;
 
@@ -77,11 +77,11 @@ private:
 };
 
 
-/*** KIconTheme ***/
+/*** TDEIconTheme ***/
 
-KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
+TDEIconTheme::TDEIconTheme(const TQString& name, const TQString& appName)
 {
-    d = new KIconThemePrivate;
+    d = new TDEIconThemePrivate;
 
     TQStringList icnlibs;
     TQStringList::ConstIterator it, itDir;
@@ -95,7 +95,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
     if (!appName.isEmpty() &&
        ( name == "crystalsvg" || name== "hicolor" || name == "locolor" ) )
     {
-	icnlibs = KGlobal::dirs()->resourceDirs("data");
+	icnlibs = TDEGlobal::dirs()->resourceDirs("data");
 	for (it=icnlibs.begin(); it!=icnlibs.end(); ++it)
 	{
 	    cDir = *it + appName + "/icons/" + name;
@@ -105,19 +105,19 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
     }
     // Find the theme description file. These are always global.
 
-    icnlibs = KGlobal::dirs()->resourceDirs("icon");
-    icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-icon");
+    icnlibs = TDEGlobal::dirs()->resourceDirs("icon");
+    icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-icon");
     icnlibs += "/usr/share/pixmaps";
     // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
-    icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap");
+    icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-pixmap");
     for (it=icnlibs.begin(); it!=icnlibs.end(); ++it)
     {
         cDir = *it + name + "/";
-        if (KStandardDirs::exists(cDir))
+        if (TDEStandardDirs::exists(cDir))
         {
             themeDirs += cDir;
 	    if (mDir.isEmpty()
-		    && (KStandardDirs::exists( cDir + "index.desktop") || KStandardDirs::exists( cDir + "index.theme")))
+		    && (TDEStandardDirs::exists( cDir + "index.desktop") || TDEStandardDirs::exists( cDir + "index.theme")))
 		mDir = cDir;
         }
     }
@@ -136,10 +136,10 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
 	fileName = mDir + "index.theme";
 	mainSection="Icon Theme";
     }
-    // Use KSharedConfig to avoid parsing the file many times, from each kinstance.
+    // Use TDESharedConfig to avoid parsing the file many times, from each kinstance.
     // Need to keep a ref to it to make this useful
-    d->sharedConfig = KSharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ );
-    KConfig& cfg = *d->sharedConfig;
+    d->sharedConfig = TDESharedConfig::openConfig( fileName, true /*readonly*/, false /*useKDEGlobals*/ );
+    TDEConfig& cfg = *d->sharedConfig;
     //was: KSimpleConfig cfg(fileName);
 
     cfg.setGroup(mainSection);
@@ -166,9 +166,9 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
 	cfg.setGroup(*it);
 	for (itDir=themeDirs.begin(); itDir!=themeDirs.end(); ++itDir)
 	{
-	    if (KStandardDirs::exists(*itDir + *it + "/"))
+	    if (TDEStandardDirs::exists(*itDir + *it + "/"))
 	    {
-	        KIconThemeDir *dir = new KIconThemeDir(*itDir + *it, &cfg);
+	        TDEIconThemeDir *dir = new TDEIconThemeDir(*itDir + *it, &cfg);
 	        if (!dir->isValid())
 	        {
 	            kdDebug(264) << "Icon directory " << *itDir << " group " << *it << " not valid.\n";
@@ -183,9 +183,9 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
     // Expand available sizes for scalable icons to their full range
     int i;
     TQMap<int,TQValueList<int> > scIcons;
-    for (KIconThemeDir *dir=mDirs.first(); dir!=0L; dir=mDirs.next())
+    for (TDEIconThemeDir *dir=mDirs.first(); dir!=0L; dir=mDirs.next())
     {
-        if ((dir->type() == KIcon::Scalable) && !scIcons.contains(dir->size()))
+        if ((dir->type() == TDEIcon::Scalable) && !scIcons.contains(dir->size()))
         {
             TQValueList<int> lst;
             for (i=dir->minSize(); i<=dir->maxSize(); i++)
@@ -219,31 +219,31 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName)
 
 }
 
-KIconTheme::~KIconTheme()
+TDEIconTheme::~TDEIconTheme()
 {
     delete d;
 }
 
-bool KIconTheme::isValid() const
+bool TDEIconTheme::isValid() const
 {
     return !mDirs.isEmpty();
 }
 
-bool KIconTheme::isHidden() const
+bool TDEIconTheme::isHidden() const
 {
     return d->hidden;
 }
 
-TQString KIconTheme::example() const { return d->example; }
-TQString KIconTheme::screenshot() const { return d->screenshot; }
-TQString KIconTheme::linkOverlay() const { return d->linkOverlay; }
-TQString KIconTheme::lockOverlay() const { return d->lockOverlay; }
-TQString KIconTheme::zipOverlay() const { return d->zipOverlay; }
-TQString KIconTheme::shareOverlay() const { return d->shareOverlay; }
+TQString TDEIconTheme::example() const { return d->example; }
+TQString TDEIconTheme::screenshot() const { return d->screenshot; }
+TQString TDEIconTheme::linkOverlay() const { return d->linkOverlay; }
+TQString TDEIconTheme::lockOverlay() const { return d->lockOverlay; }
+TQString TDEIconTheme::zipOverlay() const { return d->zipOverlay; }
+TQString TDEIconTheme::shareOverlay() const { return d->shareOverlay; }
 
-int KIconTheme::defaultSize(KIcon::Group group) const
+int TDEIconTheme::defaultSize(TDEIcon::Group group) const
 {
-    if ((group < 0) || (group >= KIcon::LastGroup))
+    if ((group < 0) || (group >= TDEIcon::LastGroup))
     {
         kdDebug(264) << "Illegal icon group: " << group << "\n";
         return -1;
@@ -251,10 +251,10 @@ int KIconTheme::defaultSize(KIcon::Group group) const
     return mDefSize[group];
 }
 
-TQValueList<int> KIconTheme::querySizes(KIcon::Group group) const
+TQValueList<int> TDEIconTheme::querySizes(TDEIcon::Group group) const
 {
     TQValueList<int> empty;
-    if ((group < 0) || (group >= KIcon::LastGroup))
+    if ((group < 0) || (group >= TDEIcon::LastGroup))
     {
         kdDebug(264) << "Illegal icon group: " << group << "\n";
         return empty;
@@ -262,32 +262,32 @@ TQValueList<int> KIconTheme::querySizes(KIcon::Group group) const
     return mSizes[group];
 }
 
-TQStringList KIconTheme::queryIcons(int size, KIcon::Context context) const
+TQStringList TDEIconTheme::queryIcons(int size, TDEIcon::Context context) const
 {
     int delta = 1000, dw;
 
-    TQPtrListIterator<KIconThemeDir> dirs(mDirs);
-    KIconThemeDir *dir;
+    TQPtrListIterator<TDEIconThemeDir> dirs(mDirs);
+    TDEIconThemeDir *dir;
 
     // Try to find exact match
     TQStringList result;
     for ( ; dirs.current(); ++dirs)
     {
         dir = dirs.current();
-        if ((context != KIcon::Any) && (context != dir->context()))
+        if ((context != TDEIcon::Any) && (context != dir->context()))
             continue;
-        if ((dir->type() == KIcon::Fixed) && (dir->size() == size))
+        if ((dir->type() == TDEIcon::Fixed) && (dir->size() == size))
         {
             result += dir->iconList();
             continue;
         }
-        if ((dir->type() == KIcon::Scalable) &&
+        if ((dir->type() == TDEIcon::Scalable) &&
             (size >= dir->minSize()) && (size <= dir->maxSize()))
         {
             result += dir->iconList();
             continue;
         }
-	if ((dir->type() == KIcon::Threshold) &&
+	if ((dir->type() == TDEIcon::Threshold) &&
             (abs(size-dir->size())<dir->threshold()))
             result+=dir->iconList();
     }
@@ -297,11 +297,11 @@ TQStringList KIconTheme::queryIcons(int size, KIcon::Context context) const
     dirs.toFirst();
 
     // Find close match
-    KIconThemeDir *best = 0L;
+    TDEIconThemeDir *best = 0L;
     for ( ; dirs.current(); ++dirs)
     {
         dir = dirs.current();
-        if ((context != KIcon::Any) && (context != dir->context()))
+        if ((context != TDEIcon::Any) && (context != dir->context()))
             continue;
         dw = dir->size() - size;
         if ((dw > 6) || (abs(dw) >= abs(delta)))
@@ -315,11 +315,11 @@ TQStringList KIconTheme::queryIcons(int size, KIcon::Context context) const
     return best->iconList();
 }
 
-TQStringList KIconTheme::queryIconsByContext(int size, KIcon::Context context) const
+TQStringList TDEIconTheme::queryIconsByContext(int size, TDEIcon::Context context) const
 {
-    TQPtrListIterator<KIconThemeDir> dirs(mDirs);
+    TQPtrListIterator<TDEIconThemeDir> dirs(mDirs);
     int dw;
-    KIconThemeDir *dir;
+    TDEIconThemeDir *dir;
 
     // We want all the icons for a given context, but we prefer icons
     // of size size . Note that this may (will) include duplicate icons
@@ -332,7 +332,7 @@ TQStringList KIconTheme::queryIconsByContext(int size, KIcon::Context context) c
     for ( ; dirs.current(); ++dirs)
     {
         dir = dirs.current();
-        if ((context != KIcon::Any) && (context != dir->context()))
+        if ((context != TDEIcon::Any) && (context != dir->context()))
             continue;
         dw = abs(dir->size() - size);
         iconlist[(dw<127)?dw:127]+=dir->iconList();
@@ -344,50 +344,50 @@ TQStringList KIconTheme::queryIconsByContext(int size, KIcon::Context context) c
     return iconlistResult;
 }
 
-bool KIconTheme::hasContext(KIcon::Context context) const
+bool TDEIconTheme::hasContext(TDEIcon::Context context) const
 {
-    TQPtrListIterator<KIconThemeDir> dirs(mDirs);
-    KIconThemeDir *dir;
+    TQPtrListIterator<TDEIconThemeDir> dirs(mDirs);
+    TDEIconThemeDir *dir;
 
     for ( ; dirs.current(); ++dirs)
     {
         dir = dirs.current();
-        if ((context == KIcon::Any) || (context == dir->context()))
+        if ((context == TDEIcon::Any) || (context == dir->context()))
             return true;
     }
     return false;
 }
 
-KIcon KIconTheme::iconPath(const TQString& name, int size, KIcon::MatchType match) const
+TDEIcon TDEIconTheme::iconPath(const TQString& name, int size, TDEIcon::MatchType match) const
 {
-    KIcon icon;
+    TDEIcon icon;
     TQString path;
     int delta = -1000, dw;
-    KIconThemeDir *dir;
+    TDEIconThemeDir *dir;
 
     dw = 1000; // shut up, gcc
-    TQPtrListIterator<KIconThemeDir> dirs(mDirs);
+    TQPtrListIterator<TDEIconThemeDir> dirs(mDirs);
     for ( ; dirs.current(); ++dirs)
     {
         dir = dirs.current();
 
-        if (match == KIcon::MatchExact)
+        if (match == TDEIcon::MatchExact)
         {
-            if ((dir->type() == KIcon::Fixed) && (dir->size() != size))
+            if ((dir->type() == TDEIcon::Fixed) && (dir->size() != size))
                 continue;
-            if ((dir->type() == KIcon::Scalable) &&
+            if ((dir->type() == TDEIcon::Scalable) &&
                 ((size < dir->minSize()) || (size > dir->maxSize())))
               continue;
-            if ((dir->type() == KIcon::Threshold) &&
+            if ((dir->type() == TDEIcon::Threshold) &&
 		(abs(dir->size()-size) > dir->threshold()))
                 continue;
         } else
         {
           // dw < 0 means need to scale up to get an icon of the requested size
-          if (dir->type() == KIcon::Fixed)
+          if (dir->type() == TDEIcon::Fixed)
           {
             dw = dir->size() - size;
-          } else if (dir->type() == KIcon::Scalable)
+          } else if (dir->type() == TDEIcon::Scalable)
           {
             if (size < dir->minSize())
               dw = dir->minSize() - size;
@@ -395,7 +395,7 @@ KIcon KIconTheme::iconPath(const TQString& name, int size, KIcon::MatchType matc
               dw = dir->maxSize() - size;
             else
               dw = 0;
-          } else if (dir->type() == KIcon::Threshold)
+          } else if (dir->type() == TDEIcon::Threshold)
           {
             if (size < dir->size() - dir->threshold())
               dw = dir->size() - dir->threshold() - size;
@@ -423,7 +423,7 @@ KIcon KIconTheme::iconPath(const TQString& name, int size, KIcon::MatchType matc
         icon.context = dir->context();
 
         // if we got in MatchExact that far, we find no better
-        if (match == KIcon::MatchExact)
+        if (match == TDEIcon::MatchExact)
             return icon;
 	else
         {
@@ -435,21 +435,21 @@ KIcon KIconTheme::iconPath(const TQString& name, int size, KIcon::MatchType matc
 }
 
 // static
-TQString *KIconTheme::_theme = 0L;
+TQString *TDEIconTheme::_theme = 0L;
 
 // static
-TQStringList *KIconTheme::_theme_list = 0L;
+TQStringList *TDEIconTheme::_theme_list = 0L;
 
 // static
-TQString KIconTheme::current()
+TQString TDEIconTheme::current()
 {
     // Static pointer because of unloading problems wrt DSO's.
     if (_theme != 0L)
         return *_theme;
 
     _theme = new TQString();
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver saver(config, "Icons");
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver saver(config, "Icons");
     *_theme = config->readEntry("Theme",defaultThemeName());
     if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
@@ -463,18 +463,18 @@ TQString KIconTheme::current()
 }
 
 // static
-TQStringList KIconTheme::list()
+TQStringList TDEIconTheme::list()
 {
     // Static pointer because of unloading problems wrt DSO's.
     if (_theme_list != 0L)
         return *_theme_list;
 
     _theme_list = new TQStringList();
-    TQStringList icnlibs = KGlobal::dirs()->resourceDirs("icon");
-    icnlibs += (KGlobal::dirs()->resourceDirs("xdgdata-icon"));
+    TQStringList icnlibs = TDEGlobal::dirs()->resourceDirs("icon");
+    icnlibs += (TDEGlobal::dirs()->resourceDirs("xdgdata-icon"));
     icnlibs += "/usr/share/pixmaps";
     // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
-    icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap");
+    icnlibs += TDEGlobal::dirs()->resourceDirs("xdgdata-pixmap");
     TQStringList::ConstIterator it;
     for (it=icnlibs.begin(); it!=icnlibs.end(); ++it)
     {
@@ -487,9 +487,9 @@ TQStringList KIconTheme::list()
         {
             if ((*it2 == ".") || (*it2 == "..") || (*it2).startsWith("default.") )
                 continue;
-            if (!KStandardDirs::exists(*it + *it2 + "/index.desktop") && !KStandardDirs::exists(*it + *it2 + "/index.theme"))
+            if (!TDEStandardDirs::exists(*it + *it2 + "/index.desktop") && !TDEStandardDirs::exists(*it + *it2 + "/index.theme"))
                 continue;
-		KIconTheme oink(*it2);
+		TDEIconTheme oink(*it2);
 	    if (!oink.isValid()) continue;
 
 	    if (!_theme_list->contains(*it2))
@@ -500,7 +500,7 @@ TQStringList KIconTheme::list()
 }
 
 // static
-void KIconTheme::reconfigure()
+void TDEIconTheme::reconfigure()
 {
     delete _theme;
     _theme=0L;
@@ -509,75 +509,75 @@ void KIconTheme::reconfigure()
 }
 
 // static
-TQString KIconTheme::defaultThemeName()
+TQString TDEIconTheme::defaultThemeName()
 {
     return TQString::fromLatin1("crystalsvg");
 }
 
-/*** KIconThemeDir ***/
+/*** TDEIconThemeDir ***/
 
-KIconThemeDir::KIconThemeDir(const TQString& dir, const KConfigBase *config)
+TDEIconThemeDir::TDEIconThemeDir(const TQString& dir, const TDEConfigBase *config)
 {
     mbValid = false;
     mDir = dir;
     mSize = config->readNumEntry("Size");
     mMinSize = 1;    // just set the variables to something
     mMaxSize = 50;   // meaningful in case someone calls minSize or maxSize
-    mType = KIcon::Fixed;
+    mType = TDEIcon::Fixed;
 
     if (mSize == 0)
         return;
 
     TQString tmp = config->readEntry("Context");
     if (tmp == "Devices")
-        mContext = KIcon::Device;
+        mContext = TDEIcon::Device;
     else if (tmp == "MimeTypes")
-        mContext = KIcon::MimeType;
+        mContext = TDEIcon::MimeType;
     else if (tmp == "FileSystems")
-        mContext = KIcon::FileSystem;
+        mContext = TDEIcon::FileSystem;
     else if (tmp == "Applications")
-        mContext = KIcon::Application;
+        mContext = TDEIcon::Application;
     else if (tmp == "Actions")
-        mContext = KIcon::Action;
+        mContext = TDEIcon::Action;
     else if (tmp == "Animations")
-        mContext = KIcon::Animation;
+        mContext = TDEIcon::Animation;
     else if (tmp == "Categories")
-        mContext = KIcon::Category;
+        mContext = TDEIcon::Category;
     else if (tmp == "Emblems")
-        mContext = KIcon::Emblem;
+        mContext = TDEIcon::Emblem;
     else if (tmp == "Emotes")
-        mContext = KIcon::Emote;
+        mContext = TDEIcon::Emote;
     else if (tmp == "International")
-        mContext = KIcon::International;
+        mContext = TDEIcon::International;
     else if (tmp == "Places")
-        mContext = KIcon::Place;
+        mContext = TDEIcon::Place;
     else if (tmp == "Status")
-        mContext = KIcon::StatusIcon;
+        mContext = TDEIcon::StatusIcon;
     else {
         kdDebug(264) << "Invalid Context= line for icon theme: " << mDir << "\n";
         return;
     }
     tmp = config->readEntry("Type");
     if (tmp == "Fixed")
-        mType = KIcon::Fixed;
+        mType = TDEIcon::Fixed;
     else if (tmp == "Scalable")
-        mType = KIcon::Scalable;
+        mType = TDEIcon::Scalable;
     else if (tmp == "Threshold")
-        mType = KIcon::Threshold;
+        mType = TDEIcon::Threshold;
     else {
         kdDebug(264) << "Invalid Type= line for icon theme: " <<  mDir << "\n";
         return;
     }
-    if (mType == KIcon::Scalable)
+    if (mType == TDEIcon::Scalable)
     {
         mMinSize = config->readNumEntry("MinSize", mSize);
         mMaxSize = config->readNumEntry("MaxSize", mSize);
-    } else if (mType == KIcon::Threshold)
+    } else if (mType == TDEIcon::Threshold)
 	mThreshold = config->readNumEntry("Threshold", 2);
     mbValid = true;
 }
 
-TQString KIconThemeDir::iconPath(const TQString& name) const
+TQString TDEIconThemeDir::iconPath(const TQString& name) const
 {
     if (!mbValid)
         return TQString::null;
@@ -589,7 +589,7 @@ TQString KIconThemeDir::iconPath(const TQString& name) const
     return TQString::null;
 }
 
-TQStringList KIconThemeDir::iconList() const
+TQStringList TDEIconThemeDir::iconList() const
 {
     TQDir dir(mDir);
 #ifdef HAVE_LIBART
diff --git a/tdecore/kicontheme.h b/tdecore/kicontheme.h
index 9aa4d8e32..9079eff0c 100644
--- a/tdecore/kicontheme.h
+++ b/tdecore/kicontheme.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __KIconTheme_h_Included__
-#define __KIconTheme_h_Included__
+#ifndef __TDEIconTheme_h_Included__
+#define __TDEIconTheme_h_Included__
 
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -19,24 +19,24 @@
 #include <tqvaluelist.h>
 #include "tdelibs_export.h"
 
-class KConfig;
-class KIconThemeDir;
+class TDEConfig;
+class TDEIconThemeDir;
 
-class KIconThemePrivate;
+class TDEIconThemePrivate;
 
-class KIconPrivate;
+class TDEIconPrivate;
 
 /**
- * One icon as found by KIconTheme. Also serves as a namespace containing
+ * One icon as found by TDEIconTheme. Also serves as a namespace containing
  * icon related constants.
- * @see KIconEffect
- * @see KIconTheme
- * @see KIconLoader
+ * @see TDEIconEffect
+ * @see TDEIconTheme
+ * @see TDEIconLoader
  */
-class TDECORE_EXPORT KIcon
+class TDECORE_EXPORT TDEIcon
 {
 public:
-    KIcon() { size = 0; }
+    TDEIcon() { size = 0; }
 
     /**
      * Return true if this icon is valid, false otherwise.
@@ -81,7 +81,7 @@ public:
     };
 
     // if you add a group here, make sure to change the config reading in
-    // KIconLoader too
+    // TDEIconLoader too
     /**
      * The group of the icon.
      */
@@ -173,18 +173,18 @@ public:
     TQString path;
 
 private:
-    KIconPrivate *d;
+    TDEIconPrivate *d;
 };
 
-inline KIcon::Group& operator++(KIcon::Group& group) { group = static_cast<KIcon::Group>(group+1); return group; }
-inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = group; ++group; return ret; }
+inline TDEIcon::Group& operator++(TDEIcon::Group& group) { group = static_cast<TDEIcon::Group>(group+1); return group; }
+inline TDEIcon::Group operator++(TDEIcon::Group& group,int) { TDEIcon::Group ret = group; ++group; return ret; }
 
 /**
  * Class to use/access icon themes in KDE. This class is used by the
  * iconloader but can be used by others too.
- * @see KIconLoader
+ * @see TDEIconLoader
  */
-class TDECORE_EXPORT KIconTheme
+class TDECORE_EXPORT TDEIconTheme
 {
 public:
     /**
@@ -193,8 +193,8 @@ public:
      * @param appName the name of the application. Can be null. This argument
      *        allows applications to have themed application icons.
      */
-    KIconTheme(const TQString& name, const TQString& appName=TQString::null);
-    ~KIconTheme();
+    TDEIconTheme(const TQString& name, const TQString& appName=TQString::null);
+    ~TDEIconTheme();
 
     /**
      * The stylized name of the icon theme.
@@ -281,17 +281,17 @@ public:
 
     /**
      * The default size of this theme for a certain icon group.
-     * @param group The icon group. See KIcon::Group.
+     * @param group The icon group. See TDEIcon::Group.
      * @return The default size in pixels for the given icon group.
      */
-    int defaultSize(KIcon::Group group) const;
+    int defaultSize(TDEIcon::Group group) const;
 
     /**
      * Query available sizes for a group.
-     * @param group The icon group. See KIcon::Group.
+     * @param group The icon group. See TDEIcon::Group.
      * @return a list of available sized for the given group
      */
-    TQValueList<int> querySizes(KIcon::Group group) const;
+    TQValueList<int> querySizes(TDEIcon::Group group) const;
 
     /**
      * Query available icons for a size and context.
@@ -299,7 +299,7 @@ public:
      * @param context the context of the icons
      * @return the list of icon names
      */
-    TQStringList queryIcons(int size, KIcon::Context context = KIcon::Any) const;
+    TQStringList queryIcons(int size, TDEIcon::Context context = TDEIcon::Any) const;
 
     /**
      * Query available icons for a context and preferred size.
@@ -307,26 +307,26 @@ public:
      * @param context the context of the icons
      * @return the list of icon names
      */
-    TQStringList queryIconsByContext(int size, KIcon::Context context = KIcon::Any) const;
+    TQStringList queryIconsByContext(int size, TDEIcon::Context context = TDEIcon::Any) const;
 
 
     /**
      * Lookup an icon in the theme.
      * @param name The name of the icon, without extension.
      * @param size The desired size of the icon.
-     * @param match The matching mode. KIcon::MatchExact returns an icon
-     * only if matches exactly. KIcon::MatchBest returns the best matching
+     * @param match The matching mode. TDEIcon::MatchExact returns an icon
+     * only if matches exactly. TDEIcon::MatchBest returns the best matching
      * icon.
-     * @return A KIcon class that describes the icon. If an icon is found,
-     * @see KIcon::isValid will return true, and false otherwise.
+     * @return A TDEIcon class that describes the icon. If an icon is found,
+     * @see TDEIcon::isValid will return true, and false otherwise.
      */
-    KIcon iconPath(const TQString& name, int size, KIcon::MatchType match) const;
+    TDEIcon iconPath(const TQString& name, int size, TDEIcon::MatchType match) const;
     
     /**
      * Returns true if the theme has any icons for the given context.
      * @since 3.5.5
      */
-    bool hasContext( KIcon::Context context ) const;
+    bool hasContext( TDEIcon::Context context ) const;
 
     /**
      * List all icon themes installed on the system, global and local.
@@ -359,8 +359,8 @@ private:
     int mDepth;
     TQString mDir, mName, mDesc;
     TQStringList mInherits;
-    TQPtrList<KIconThemeDir> mDirs;
-    KIconThemePrivate *d;
+    TQPtrList<TDEIconThemeDir> mDirs;
+    TDEIconThemePrivate *d;
 
     static TQString *_theme;
     static TQStringList *_theme_list;
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 721864e5a..6760c95a0 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -20,16 +20,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "kconfig.h"
-#include "klocale.h"
+#include "tdeconfig.h"
+#include "tdelocale.h"
 #include "kcharsets.h"
 #include "kiconloader.h"
 #include "tdehardwaredevices.h"
 #include "tdenetworkconnections.h"
-#include "kaboutdata.h"
+#include "tdeaboutdata.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kmimesourcefactory.h"
 
 #include <tqfont.h>
@@ -38,26 +38,26 @@
 #ifndef NDEBUG
   #include <assert.h>
   #include <tqptrdict.h>
-  static TQPtrList<KInstance> *allInstances = 0;
+  static TQPtrList<TDEInstance> *allInstances = 0;
   static TQPtrDict<TQCString> *allOldInstances = 0;
-  #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<KInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
+  #define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<TDEInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
   #define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false);
-  #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((KInstance*)this)) { TQCString *old = allOldInstances->find((KInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
+  #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((TDEInstance*)this)) { TQCString *old = allOldInstances->find((TDEInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
 #else
   #define DEBUG_ADD
   #define DEBUG_REMOVE
   #define DEBUG_CHECK_ALIVE
 #endif
 
-class KInstancePrivate
+class TDEInstancePrivate
 {
 public:
-    KInstancePrivate ()
+    TDEInstancePrivate ()
     {
         mimeSourceFactory = 0L;
     }
 
-    ~KInstancePrivate ()
+    ~TDEInstancePrivate ()
     {
         delete mimeSourceFactory;
     }
@@ -65,30 +65,30 @@ public:
     KMimeSourceFactory* mimeSourceFactory;
     TQString configName;
     bool ownAboutdata;
-    KSharedConfig::Ptr sharedConfig;
+    TDESharedConfig::Ptr sharedConfig;
 };
 
-KInstance::KInstance( const TQCString& name)
+TDEInstance::TDEInstance( const TQCString& name)
   : _dirs (0L),
     _config (0L),
     _iconLoader (0L),
     _hardwaredevices (0L),
     _networkmanager (0L),
-    _name( name ), _aboutData( new KAboutData( name, "", 0 ) ), m_configReadOnly(false)
+    _name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false)
 {
     DEBUG_ADD
     Q_ASSERT(!name.isEmpty());
-    if (!KGlobal::_instance)
+    if (!TDEGlobal::_instance)
     {
-      KGlobal::_instance = this;
-      KGlobal::setActiveInstance(this);
+      TDEGlobal::_instance = this;
+      TDEGlobal::setActiveInstance(this);
     }
 
-    d = new KInstancePrivate ();
+    d = new TDEInstancePrivate ();
     d->ownAboutdata = true;
 }
 
-KInstance::KInstance( const KAboutData * aboutData )
+TDEInstance::TDEInstance( const TDEAboutData * aboutData )
   : _dirs (0L),
     _config (0L),
     _iconLoader (0L),
@@ -99,17 +99,17 @@ KInstance::KInstance( const KAboutData * aboutData )
     DEBUG_ADD
     Q_ASSERT(!_name.isEmpty());
 
-    if (!KGlobal::_instance)
+    if (!TDEGlobal::_instance)
     {
-      KGlobal::_instance = this;
-      KGlobal::setActiveInstance(this);
+      TDEGlobal::_instance = this;
+      TDEGlobal::setActiveInstance(this);
     }
 
-    d = new KInstancePrivate ();
+    d = new TDEInstancePrivate ();
     d->ownAboutdata = false;
 }
 
-KInstance::KInstance( KInstance* src )
+TDEInstance::TDEInstance( TDEInstance* src )
   : _dirs ( src->_dirs ),
     _config ( src->_config ),
     _iconLoader ( src->_iconLoader ),
@@ -120,13 +120,13 @@ KInstance::KInstance( KInstance* src )
     DEBUG_ADD
     Q_ASSERT(!_name.isEmpty());
 
-    if (!KGlobal::_instance || KGlobal::_instance == src )
+    if (!TDEGlobal::_instance || TDEGlobal::_instance == src )
     {
-      KGlobal::_instance = this;
-      KGlobal::setActiveInstance(this);
+      TDEGlobal::_instance = this;
+      TDEGlobal::setActiveInstance(this);
     }
 
-    d = new KInstancePrivate ();
+    d = new TDEInstancePrivate ();
     d->ownAboutdata = src->d->ownAboutdata;
     d->sharedConfig = src->d->sharedConfig;
 
@@ -139,7 +139,7 @@ KInstance::KInstance( KInstance* src )
     delete src;
 }
 
-KInstance::~KInstance()
+TDEInstance::~TDEInstance()
 {
     DEBUG_CHECK_ALIVE
 
@@ -164,19 +164,19 @@ KInstance::~KInstance()
     delete _dirs;
     _dirs = 0;
 
-    if (KGlobal::_instance == this)
-        KGlobal::_instance = 0;
-    if (KGlobal::activeInstance() == this)
-        KGlobal::setActiveInstance(0);
+    if (TDEGlobal::_instance == this)
+        TDEGlobal::_instance = 0;
+    if (TDEGlobal::activeInstance() == this)
+        TDEGlobal::setActiveInstance(0);
     DEBUG_REMOVE
 }
 
 
-KStandardDirs *KInstance::dirs() const
+TDEStandardDirs *TDEInstance::dirs() const
 {
     DEBUG_CHECK_ALIVE
     if( _dirs == 0 ) {
-	_dirs = new KStandardDirs( );
+	_dirs = new TDEStandardDirs( );
         if (_config) {
             if (_dirs->addCustomized(_config))
                 _config->reparseConfiguration();
@@ -190,18 +190,18 @@ KStandardDirs *KInstance::dirs() const
 extern bool kde_kiosk_exception;
 extern bool kde_kiosk_admin;
 
-void KInstance::setConfigReadOnly(bool ro)
+void TDEInstance::setConfigReadOnly(bool ro)
 {
     m_configReadOnly = ro;
 }
 
-KConfig	*KInstance::config() const
+TDEConfig	*TDEInstance::config() const
 {
     DEBUG_CHECK_ALIVE
     if( _config == 0 ) {
         if ( !d->configName.isEmpty() )
         {
-            d->sharedConfig = KSharedConfig::openConfig( d->configName );
+            d->sharedConfig = TDESharedConfig::openConfig( d->configName );
 
             // Check whether custom config files are allowed.
             d->sharedConfig->setGroup( "KDE Action Restrictions" );
@@ -220,10 +220,10 @@ KConfig	*KInstance::config() const
         if ( d->sharedConfig == 0 )
         {
 	    if ( !_name.isEmpty() ) {
-	        d->sharedConfig = KSharedConfig::openConfig( _name + "rc", m_configReadOnly );
+	        d->sharedConfig = TDESharedConfig::openConfig( _name + "rc", m_configReadOnly );
 	    }
 	    else {
-	        d->sharedConfig = KSharedConfig::openConfig( TQString::null );
+	        d->sharedConfig = TDESharedConfig::openConfig( TQString::null );
 	    }
 	}
 
@@ -244,7 +244,7 @@ KConfig	*KInstance::config() const
     return _config;
 }
 
-KSharedConfig *KInstance::sharedConfig() const
+TDESharedConfig *TDEInstance::sharedConfig() const
 {
     DEBUG_CHECK_ALIVE
     if (_config == 0)
@@ -253,24 +253,24 @@ KSharedConfig *KInstance::sharedConfig() const
     return d->sharedConfig;
 }
 
-void KInstance::setConfigName(const TQString &configName)
+void TDEInstance::setConfigName(const TQString &configName)
 {
     DEBUG_CHECK_ALIVE
     d->configName = configName;
 }
 
-KIconLoader *KInstance::iconLoader() const
+TDEIconLoader *TDEInstance::iconLoader() const
 {
     DEBUG_CHECK_ALIVE
     if( _iconLoader == 0 ) {
-	_iconLoader = new KIconLoader( _name, dirs() );
+	_iconLoader = new TDEIconLoader( _name, dirs() );
     	_iconLoader->enableDelayedIconSetLoading( true );
     }
 
     return _iconLoader;
 }
 
-TDEHardwareDevices *KInstance::hardwareDevices() const
+TDEHardwareDevices *TDEInstance::hardwareDevices() const
 {
     DEBUG_CHECK_ALIVE
     if( _hardwaredevices == 0 ) {
@@ -280,7 +280,7 @@ TDEHardwareDevices *KInstance::hardwareDevices() const
     return _hardwaredevices;
 }
 
-TDEGlobalNetworkManager *KInstance::networkManager() const
+TDEGlobalNetworkManager *TDEInstance::networkManager() const
 {
     DEBUG_CHECK_ALIVE
     if( _networkmanager == 0 ) {
@@ -290,37 +290,37 @@ TDEGlobalNetworkManager *KInstance::networkManager() const
     return _networkmanager;
 }
 
-void KInstance::newIconLoader() const
+void TDEInstance::newIconLoader() const
 {
     DEBUG_CHECK_ALIVE
-    KIconTheme::reconfigure();
+    TDEIconTheme::reconfigure();
     _iconLoader->reconfigure( _name, dirs() );
 }
 
-const KAboutData * KInstance::aboutData() const
+const TDEAboutData * TDEInstance::aboutData() const
 {
     DEBUG_CHECK_ALIVE
     return _aboutData;
 }
 
-TQCString KInstance::instanceName() const
+TQCString TDEInstance::instanceName() const
 {
     DEBUG_CHECK_ALIVE
     return _name;
 }
 
-KMimeSourceFactory* KInstance::mimeSourceFactory () const
+KMimeSourceFactory* TDEInstance::mimeSourceFactory () const
 {
   DEBUG_CHECK_ALIVE
   if (!d->mimeSourceFactory)
   {
     d->mimeSourceFactory = new KMimeSourceFactory(_iconLoader);
-    d->mimeSourceFactory->setInstance(const_cast<KInstance *>(this));
+    d->mimeSourceFactory->setInstance(const_cast<TDEInstance *>(this));
   }
 
   return d->mimeSourceFactory;
 }
 
-void KInstance::virtual_hook( int, void* )
+void TDEInstance::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 5d1dbdce0..be60c943c 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -18,15 +18,15 @@
 #ifndef _KINSTANCE_H
 #define _KINSTANCE_H
 
-class KStandardDirs;
-class KAboutData;
-class KConfig;
-class KIconLoader;
+class TDEStandardDirs;
+class TDEAboutData;
+class TDEConfig;
+class TDEIconLoader;
 class KCharsets;
 class TQFont;
-class KInstancePrivate;
+class TDEInstancePrivate;
 class KMimeSourceFactory;
-class KSharedConfig;
+class TDESharedConfig;
 class TDEHardwareDevices;
 class TDEGlobalNetworkManager;
 
@@ -38,32 +38,32 @@ class TDEGlobalNetworkManager;
  * Access to KDE global objects for use in shared libraries.  In
  * practical terms, this class is used in KDE components.  This allows
  * components to store things that normally would be accessed by
- * KGlobal.
+ * TDEGlobal.
  *
  * @author Torben Weis
  */
-class TDECORE_EXPORT KInstance
+class TDECORE_EXPORT TDEInstance
 {
-    friend class KStandardDirs;
+    friend class TDEStandardDirs;
 
  public:
     /**
      *  Constructor.
      *  @param instanceName the name of the instance
      */
-    KInstance( const TQCString& instanceName) ;
+    TDEInstance( const TQCString& instanceName) ;
 
     /**
      *  Constructor.
-     *  When building a KInstance that is not your KApplication,
-     *  make sure that the KAboutData and the KInstance have the same life time.
+     *  When building a TDEInstance that is not your TDEApplication,
+     *  make sure that the TDEAboutData and the TDEInstance have the same life time.
      *  You have to destroy both, since the instance doesn't own the about data.
-     *  Don't build a KAboutData on the stack in this case !
-     *  Building a KAboutData on the stack is only ok for usage with
-     *  KCmdLineArgs and KApplication (not destroyed until the app exits).
-     *  @param aboutData data about this instance (see KAboutData)
+     *  Don't build a TDEAboutData on the stack in this case !
+     *  Building a TDEAboutData on the stack is only ok for usage with
+     *  TDECmdLineArgs and TDEApplication (not destroyed until the app exits).
+     *  @param aboutData data about this instance (see TDEAboutData)
      */
-    KInstance( const KAboutData * aboutData );
+    TDEInstance( const TDEAboutData * aboutData );
 
     /*
      * @internal
@@ -71,30 +71,30 @@ class TDECORE_EXPORT KInstance
      * Initialize from src and delete it.
      */
 
-    KInstance( KInstance* src );
+    TDEInstance( TDEInstance* src );
 
     /**
      * Destructor.
      */
-    virtual ~KInstance();
+    virtual ~TDEInstance();
 
     /**
      * Returns the application standard dirs object.
-     * @return The KStandardDirs of the application.
+     * @return The TDEStandardDirs of the application.
      */
-    KStandardDirs	*dirs() const;
+    TDEStandardDirs	*dirs() const;
 
     /**
      * Returns the general config object ("appnamerc").
-     * @return the KConfig object for the instance.
+     * @return the TDEConfig object for the instance.
      */
-    KConfig            *config() const;
+    TDEConfig            *config() const;
 
     /**
      * Returns the general config object ("appnamerc").
-     * @return the KConfig object for the instance.
+     * @return the TDEConfig object for the instance.
      */
-    KSharedConfig      *sharedConfig() const;
+    TDESharedConfig      *sharedConfig() const;
 
     /**
      * Set a read-only flag on the configuration files
@@ -108,7 +108,7 @@ class TDECORE_EXPORT KInstance
      *  Returns an iconloader object.
      * @return the iconloader object.
      */
-    KIconLoader	       *iconLoader() const;
+    TDEIconLoader	       *iconLoader() const;
 
     /**
      *  Returns a TDEHardwareDevices object.
@@ -133,11 +133,11 @@ class TDECORE_EXPORT KInstance
      * @return the about data of the instance, or 0 if it has 
      *         not been set yet
      */
-    const KAboutData *aboutData() const;
+    const TDEAboutData *aboutData() const;
 
     /**
      * Returns the name of the instance
-     * @return the instance name, can be null if the KInstance has been 
+     * @return the instance name, can be null if the TDEInstance has been 
      *         created with a null name
      */
     TQCString          instanceName() const;
@@ -153,7 +153,7 @@ protected:
     /**
      *  Copy Constructor is not allowed
      */
-    KInstance( const KInstance& );
+    TDEInstance( const TDEInstance& );
 
     /**
      * Set name of default config file.
@@ -163,22 +163,22 @@ protected:
     void setConfigName(const TQString &name);
 
 private:
-    mutable KStandardDirs       *_dirs;
+    mutable TDEStandardDirs       *_dirs;
 
-    mutable KConfig             *_config;
-    mutable KIconLoader         *_iconLoader;
+    mutable TDEConfig             *_config;
+    mutable TDEIconLoader         *_iconLoader;
 
     mutable TDEHardwareDevices  *_hardwaredevices;
     mutable TDEGlobalNetworkManager  *_networkmanager;
     mutable void                *_placeholder;
 
     TQCString                     _name;
-    const KAboutData            *_aboutData;
+    const TDEAboutData            *_aboutData;
 
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    KInstancePrivate *d;
+    TDEInstancePrivate *d;
     bool m_configReadOnly;
 };
 
diff --git a/tdecore/kipc.h b/tdecore/kipc.h
index 45e96f194..82bf22748 100644
--- a/tdecore/kipc.h
+++ b/tdecore/kipc.h
@@ -37,13 +37,13 @@
  * Communications Protocol.
  *
  * Messages with id code < 32 are called "System Messages". These are
- * directly handled by KApplication. Examples are: PaletteChanged and
- * StyleChanged. Messages with id code >= 32 are user messages. KApplication
+ * directly handled by TDEApplication. Examples are: PaletteChanged and
+ * StyleChanged. Messages with id code >= 32 are user messages. TDEApplication
  * emits the signal kipcMessage(id,arg) for each user message it receives.
  *
  * KIPC is implemented using X11 ClientMessage events.
  *
- * @see KApplication::kipcMessage()
+ * @see TDEApplication::kipcMessage()
  * @author Geert Jansen <jansen@kde.org>
  */
 class TDECORE_EXPORT KIPC
diff --git a/tdecore/kkeynative.h b/tdecore/kkeynative.h
index cf29fcabc..e2774417d 100644
--- a/tdecore/kkeynative.h
+++ b/tdecore/kkeynative.h
@@ -23,7 +23,7 @@
 #ifndef __KKEYNATIVE_H
 #define __KKEYNATIVE_H
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #ifdef Q_WS_X11
 typedef union _XEvent XEvent;
diff --git a/tdecore/kkeynative_x11.cpp b/tdecore/kkeynative_x11.cpp
index 64635acc3..a44305dad 100644
--- a/tdecore/kkeynative_x11.cpp
+++ b/tdecore/kkeynative_x11.cpp
@@ -32,7 +32,7 @@
 #include <tqstringlist.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef Q_WS_X11
 #define XK_MISCELLANY
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index c12cde7e6..64bfe383d 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -29,12 +29,12 @@
 
 #include "kkeyserver_x11.h"
 #include "kkeynative.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #ifdef Q_WS_X11
 # define XK_MISCELLANY
@@ -361,7 +361,7 @@ bool initializeMods()
 
 	XFreeModifiermap( xmk );
 
-	//KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
+	//TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
 	// read in mod that win should be attached to
 
 	g_bInitializedMods = true;
@@ -380,11 +380,11 @@ static void initializeVariations()
 
 static void intializeKKeyLabels()
 {
-	KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
-	g_rgModInfo[0].sLabel = KGlobal::config()->readEntry( "Label Shift", i18n(g_rgModInfo[0].psName) );
-	g_rgModInfo[1].sLabel = KGlobal::config()->readEntry( "Label Ctrl", i18n(g_rgModInfo[1].psName) );
-	g_rgModInfo[2].sLabel = KGlobal::config()->readEntry( "Label Alt", i18n(g_rgModInfo[2].psName) );
-	g_rgModInfo[3].sLabel = KGlobal::config()->readEntry( "Label Win", i18n(g_rgModInfo[3].psName) );
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	g_rgModInfo[0].sLabel = TDEGlobal::config()->readEntry( "Label Shift", i18n(g_rgModInfo[0].psName) );
+	g_rgModInfo[1].sLabel = TDEGlobal::config()->readEntry( "Label Ctrl", i18n(g_rgModInfo[1].psName) );
+	g_rgModInfo[2].sLabel = TDEGlobal::config()->readEntry( "Label Alt", i18n(g_rgModInfo[2].psName) );
+	g_rgModInfo[3].sLabel = TDEGlobal::config()->readEntry( "Label Win", i18n(g_rgModInfo[3].psName) );
 	g_bMacLabels = (g_rgModInfo[2].sLabel == "Command");
 	g_bInitializedKKeyLabels = true;
 }
@@ -1020,7 +1020,7 @@ void Variations::init( const KKey& key, bool bQt )
 
 } // end of namespace KKeyServer block
 
-// FIXME: This needs to be moved to kshortcut.cpp, and create a 
+// FIXME: This needs to be moved to tdeshortcut.cpp, and create a 
 //  KKeyServer::method which it will call.
 // Alt+SysReq => Alt+Print
 // Ctrl+Shift+Plus => Ctrl+Plus (en)
diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h
index ce3fa2fed..90330911b 100644
--- a/tdecore/kkeyserver_x11.h
+++ b/tdecore/kkeyserver_x11.h
@@ -23,7 +23,7 @@
 #ifndef _KKEYSERVER_X11_H
 #define _KKEYSERVER_X11_H
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 
 /**
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 2c75989d3..aed2c06af 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -25,11 +25,11 @@
 #include <tqtimer.h>
 #include <tqobjectdict.h>
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "klibloader.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "ltdl.h"
 
@@ -346,7 +346,7 @@ static inline TQCString makeLibName( const char* name )
 }
 
 //static
-TQString KLibLoader::findLibrary( const char * name, const KInstance * instance )
+TQString KLibLoader::findLibrary( const char * name, const TDEInstance * instance )
 {
     TQCString libname = makeLibName( name );
 
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index aa88db925..d9e632184 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -23,11 +23,11 @@
 #include <tqstringlist.h>
 #include <tqasciidict.h>
 #include <tqptrlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <stdlib.h> // For backwards compatibility
 
-class KInstance;
+class TDEInstance;
 class TQTimer;
 class KLibrary;
 class KLibFactory;
@@ -255,7 +255,7 @@ public:
 
     /**
      * @internal
-     * Internal Method, called by the KApplication destructor.
+     * Internal Method, called by the TDEApplication destructor.
      * Do not call it.
      * This is what makes it possible to rely on ~KLibFactory
      * being called in all cases, whether the library is unloaded
@@ -271,9 +271,9 @@ public:
      * @param name of the library. If it is not a path, the function searches in
      *             the "module" and "lib" resources. If there is no extension,
      *             ".la" will be appended.
-     * @param instance a KInstance used to get the standard paths
+     * @param instance a TDEInstance used to get the standard paths
      */
-    static TQString findLibrary( const char * name, const KInstance * instance = KGlobal::instance() );
+    static TQString findLibrary( const char * name, const TDEInstance * instance = TDEGlobal::instance() );
 
 protected:
     KLibLoader( TQObject* parent = 0, const char* name = 0 );
@@ -306,12 +306,12 @@ private:
  * NOTE: you probably want to use KGenericFactory<PluginClassName>
  * instead of writing your own factory.
  *
- * In the constructor of your factory you should create an instance of KInstance
+ * In the constructor of your factory you should create an instance of TDEInstance
  * like this:
  * \code
- *     s_global = new KInstance( "kspread" );
+ *     s_global = new TDEInstance( "kspread" );
  * \endcode
- * This KInstance is comparable to KGlobal used by normal applications.
+ * This TDEInstance is comparable to TDEGlobal used by normal applications.
  * It allows you to find resource files (images, XML, sound etc.) belonging
  * to the library.
  *
diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp
index bc2175d0d..1f4f8337e 100644
--- a/tdecore/klockfile.cpp
+++ b/tdecore/klockfile.cpp
@@ -37,15 +37,15 @@
 #include <tqtextstream.h>
 
 #include <kde_file.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
-#include <ktempfile.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
+#include <tdetempfile.h>
 
 // TODO: http://www.spinnaker.de/linux/nfs-locking.html
 // TODO: Make regression test
 
-class KLockFile::KLockFilePrivate {
+class TDELockFile::TDELockFilePrivate {
 public:
    TQString file;
    int staleTime;
@@ -62,9 +62,9 @@ public:
 
 
 // 30 seconds
-KLockFile::KLockFile(const TQString &file)
+TDELockFile::TDELockFile(const TQString &file)
 {
-  d = new KLockFilePrivate();
+  d = new TDELockFilePrivate();
   d->file = file;
   d->staleTime = 30;
   d->isLocked = false;
@@ -72,21 +72,21 @@ KLockFile::KLockFile(const TQString &file)
   d->linkCountSupport = true;
 }
 
-KLockFile::~KLockFile()
+TDELockFile::~TDELockFile()
 {
   unlock();
   delete d;
 }
 
 int 
-KLockFile::staleTime() const
+TDELockFile::staleTime() const
 {
   return d->staleTime;
 }
 
 
 void
-KLockFile::setStaleTime(int _staleTime)
+TDELockFile::setStaleTime(int _staleTime)
 {
   d->staleTime = _staleTime;
 }
@@ -109,23 +109,23 @@ static bool testLinkCountSupport(const TQCString &fileName)
    return ((result == 0) && (st_buf.st_nlink == 2));
 }
 
-static KLockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat &st_buf, bool &linkCountSupport)
+static TDELockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat &st_buf, bool &linkCountSupport)
 {
   TQCString lockFileName = TQFile::encodeName( lockFile );
   int result = KDE_lstat( lockFileName, &st_buf );
   if (result == 0)
-     return KLockFile::LockFail;
+     return TDELockFile::LockFail;
   
   KTempFile uniqueFile(lockFile, TQString::null, 0644);
   uniqueFile.setAutoDelete(true);
   if (uniqueFile.status() != 0)
-     return KLockFile::LockError;
+     return TDELockFile::LockError;
 
   char hostname[256];
   hostname[0] = 0;
   gethostname(hostname, 255);
   hostname[255] = 0;
-  TQCString instanceName = KCmdLineArgs::appName();
+  TQCString instanceName = TDECmdLineArgs::appName();
 
   (*(uniqueFile.textStream())) << TQString::number(getpid()) << endl
       << instanceName << endl
@@ -138,23 +138,23 @@ static KLockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat
   // Create lock file
   result = ::link( uniqueName, lockFileName );
   if (result != 0)
-     return KLockFile::LockError;
+     return TDELockFile::LockError;
      
   if (!linkCountSupport)
-     return KLockFile::LockOK;
+     return TDELockFile::LockOK;
 #else
   //TODO for win32
-  return KLockFile::LockOK;
+  return TDELockFile::LockOK;
 #endif
 
   KDE_struct_stat st_buf2;
   result = KDE_lstat( uniqueName, &st_buf2 );
   if (result != 0)
-     return KLockFile::LockError;
+     return TDELockFile::LockError;
 
   result = KDE_lstat( lockFileName, &st_buf );
   if (result != 0)
-     return KLockFile::LockError;
+     return TDELockFile::LockError;
 
   if (!statResultIsEqual(st_buf, st_buf2) || S_ISLNK(st_buf.st_mode) || S_ISLNK(st_buf2.st_mode))
   {
@@ -163,15 +163,15 @@ static KLockFile::LockResult lockFile(const TQString &lockFile, KDE_struct_stat
      {
         linkCountSupport = testLinkCountSupport(uniqueName);
         if (!linkCountSupport)
-           return KLockFile::LockOK; // Link count support is missing... assume everything is OK.
+           return TDELockFile::LockOK; // Link count support is missing... assume everything is OK.
      }
-     return KLockFile::LockFail;
+     return TDELockFile::LockFail;
   }
 
-  return KLockFile::LockOK;
+  return TDELockFile::LockOK;
 }
 
-static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struct_stat &st_buf, bool &linkCountSupport)
+static TDELockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struct_stat &st_buf, bool &linkCountSupport)
 {
    // This is dangerous, we could be deleting a new lock instead of
    // the old stale one, let's be very careful
@@ -179,7 +179,7 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
    // Create temp file
    KTempFile ktmpFile(lockFile);
    if (ktmpFile.status() != 0)
-      return KLockFile::LockError;
+      return TDELockFile::LockError;
               
    TQCString lckFile = TQFile::encodeName(lockFile);
    TQCString tmpFile = TQFile::encodeName(ktmpFile.name());
@@ -189,10 +189,10 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
 #ifdef Q_OS_UNIX
    // link to lock file
    if (::link(lckFile, tmpFile) != 0)
-      return KLockFile::LockFail; // Try again later
+      return TDELockFile::LockFail; // Try again later
 #else
    //TODO for win32
-   return KLockFile::LockOK;
+   return TDELockFile::LockOK;
 #endif
 
    // check if link count increased with exactly one
@@ -209,7 +209,7 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
          tqWarning("WARNING: deleting stale lockfile %s", lckFile.data());
          ::unlink(lckFile);
          ::unlink(tmpFile);
-         return KLockFile::LockOK;
+         return TDELockFile::LockOK;
       }
    }
    
@@ -227,34 +227,34 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
       tqWarning("WARNING: deleting stale lockfile %s", lckFile.data());
       ::unlink(lckFile);
       ::unlink(tmpFile);
-      return KLockFile::LockOK;
+      return TDELockFile::LockOK;
    }
    
    // Failed to delete stale lock file
    tqWarning("WARNING: Problem deleting stale lockfile %s", lckFile.data());
    ::unlink(tmpFile);
-   return KLockFile::LockFail;
+   return TDELockFile::LockFail;
 }
 
 
-KLockFile::LockResult KLockFile::lock(int options)
+TDELockFile::LockResult TDELockFile::lock(int options)
 {
   if (d->isLocked)
-     return KLockFile::LockOK;
+     return TDELockFile::LockOK;
 
-  KLockFile::LockResult result;     
+  TDELockFile::LockResult result;     
   int hardErrors = 5;
   int n = 5;
   while(true)
   {
      KDE_struct_stat st_buf;
      result = lockFile(d->file, st_buf, d->linkCountSupport);
-     if (result == KLockFile::LockOK)
+     if (result == TDELockFile::LockOK)
      {
         d->staleTimer = TQTime();
         break;
      }
-     else if (result == KLockFile::LockError)
+     else if (result == TDELockFile::LockError)
      {
         d->staleTimer = TQTime();
         if (--hardErrors == 0)
@@ -262,7 +262,7 @@ KLockFile::LockResult KLockFile::lock(int options)
            break;
         }
      }
-     else // KLockFile::Fail
+     else // TDELockFile::Fail
      {
         if (!d->staleTimer.isNull() && !statResultIsEqual(d->statBuf, st_buf))
            d->staleTimer = TQTime();
@@ -292,17 +292,17 @@ KLockFile::LockResult KLockFile::lock(int options)
            if (isStale)
            {
               if ((options & LockForce) == 0)
-                 return KLockFile::LockStale;
+                 return TDELockFile::LockStale;
                  
               result = deleteStaleLock(d->file, d->statBuf, d->linkCountSupport);
 
-              if (result == KLockFile::LockOK)
+              if (result == TDELockFile::LockOK)
               {
                  // Lock deletion successful
                  d->staleTimer = TQTime();
                  continue; // Now try to get the new lock
               }
-              else if (result != KLockFile::LockFail)
+              else if (result != TDELockFile::LockFail)
               {
                  return result;
               }
@@ -336,7 +336,7 @@ KLockFile::LockResult KLockFile::lock(int options)
      
      struct timeval tv;
      tv.tv_sec = 0;
-     tv.tv_usec = n*((KApplication::random() % 200)+100);
+     tv.tv_usec = n*((TDEApplication::random() % 200)+100);
      if (n < 2000)
         n = n * 2;
      
@@ -351,12 +351,12 @@ KLockFile::LockResult KLockFile::lock(int options)
   return result;
 }
    
-bool KLockFile::isLocked() const
+bool TDELockFile::isLocked() const
 {
   return d->isLocked;
 }
    
-void KLockFile::unlock()
+void TDELockFile::unlock()
 {
   if (d->isLocked)
   {
@@ -365,7 +365,7 @@ void KLockFile::unlock()
   }
 }
 
-bool KLockFile::getLockInfo(int &pid, TQString &hostname, TQString &appname)
+bool TDELockFile::getLockInfo(int &pid, TQString &hostname, TQString &appname)
 {
   if (d->pid == -1)
      return false;
diff --git a/tdecore/klockfile.h b/tdecore/klockfile.h
index 61968bf0f..d0bfc5785 100644
--- a/tdecore/klockfile.h
+++ b/tdecore/klockfile.h
@@ -25,22 +25,22 @@
 
 #include <ksharedptr.h>
 /**
- * The KLockFile class provides NFS safe lockfiles.
+ * The TDELockFile class provides NFS safe lockfiles.
  *
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.3
  */
-class TDECORE_EXPORT KLockFile : public KShared
+class TDECORE_EXPORT TDELockFile : public TDEShared
 {
 public:
-   typedef KSharedPtr<KLockFile> Ptr;
+   typedef TDESharedPtr<TDELockFile> Ptr;
 
-   KLockFile(const TQString &file);
+   TDELockFile(const TQString &file);
 
    /**
     * Destroys the object, releasing the lock if held
     **/
-   ~KLockFile();
+   ~TDELockFile();
 
    /**
     * Possible return values of the lock function.
@@ -116,8 +116,8 @@ public:
    bool getLockInfo(int &pid, TQString &hostname, TQString &appname);
 
 private:
-   class KLockFilePrivate;
-   KLockFilePrivate *d;
+   class TDELockFilePrivate;
+   TDELockFilePrivate *d;
 };
 
 #endif
diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp
index 75dde5c9c..2e019f73e 100644
--- a/tdecore/kmanagerselection.cpp
+++ b/tdecore/kmanagerselection.cpp
@@ -47,61 +47,61 @@ DEALINGS IN THE SOFTWARE.
 
 #include <kdebug.h>
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kxerrorhandler.h>
 #include <X11/Xatom.h>
 
-class KSelectionOwnerPrivate
+class TDESelectionOwnerPrivate
     : public QWidget
     {
     public:
-        KSelectionOwnerPrivate( KSelectionOwner* owner );
+        TDESelectionOwnerPrivate( TDESelectionOwner* owner );
     protected:
         virtual bool x11Event( XEvent* ev );
     private:
-        KSelectionOwner* owner;
+        TDESelectionOwner* owner;
     };
     
-KSelectionOwnerPrivate::KSelectionOwnerPrivate( KSelectionOwner* owner_P )
+TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P )
     :   owner( owner_P )
     {
     kapp->installX11EventFilter( TQT_TQWIDGET(this) );
     }
     
-bool KSelectionOwnerPrivate::x11Event( XEvent* ev_P )
+bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P )
     {
     return owner->filterEvent( ev_P );
     }
     
-KSelectionOwner::KSelectionOwner( Atom selection_P, int screen_P, TQObject* parent_P )
+TDESelectionOwner::TDESelectionOwner( Atom selection_P, int screen_P, TQObject* parent_P )
     :   TQObject( parent_P ),
         selection( selection_P ),
         screen( screen_P >= 0 ? screen_P : DefaultScreen( tqt_xdisplay())),
         window( None ),
         timestamp( CurrentTime ),
         extra1( 0 ), extra2( 0 ),
-        d( new KSelectionOwnerPrivate( this ))
+        d( new TDESelectionOwnerPrivate( this ))
     {
     }
     
-KSelectionOwner::KSelectionOwner( const char* selection_P, int screen_P, TQObject* parent_P )
+TDESelectionOwner::TDESelectionOwner( const char* selection_P, int screen_P, TQObject* parent_P )
     :   TQObject( parent_P ),
         selection( XInternAtom( tqt_xdisplay(), selection_P, False )),
         screen( screen_P >= 0 ? screen_P : DefaultScreen( tqt_xdisplay())),
         window( None ),
         timestamp( CurrentTime ),
         extra1( 0 ), extra2( 0 ),
-        d( new KSelectionOwnerPrivate( this ))
+        d( new TDESelectionOwnerPrivate( this ))
     {
     }
 
-KSelectionOwner::~KSelectionOwner()
+TDESelectionOwner::~TDESelectionOwner()
     {
     release();
     delete d;
     }
         
-bool KSelectionOwner::claim( bool force_P, bool force_kill_P )
+bool TDESelectionOwner::claim( bool force_P, bool force_kill_P )
     {
     if( manager_atom == None )
         getAtoms();
@@ -179,7 +179,7 @@ bool KSelectionOwner::claim( bool force_P, bool force_kill_P )
     }
 
 // destroy resource first
-void KSelectionOwner::release()
+void TDESelectionOwner::release()
     {
     if( timestamp == CurrentTime )
         return;
@@ -188,20 +188,20 @@ void KSelectionOwner::release()
     timestamp = CurrentTime;
     }
 
-Window KSelectionOwner::ownerWindow() const
+Window TDESelectionOwner::ownerWindow() const
     {
     if( timestamp == CurrentTime )
         return None;
     return window;
     }
 
-void KSelectionOwner::setData( long extra1_P, long extra2_P )
+void TDESelectionOwner::setData( long extra1_P, long extra2_P )
     {
     extra1 = extra1_P;
     extra2 = extra2_P;
     }
     
-bool KSelectionOwner::filterEvent( XEvent* ev_P )
+bool TDESelectionOwner::filterEvent( XEvent* ev_P )
     {
     if( timestamp != CurrentTime && ev_P->xany.window == window )
         {
@@ -244,12 +244,12 @@ bool KSelectionOwner::filterEvent( XEvent* ev_P )
     return false;
     }
 
-bool KSelectionOwner::handleMessage( XEvent* )
+bool TDESelectionOwner::handleMessage( XEvent* )
     {
     return false;
     }
 
-void KSelectionOwner::filter_selection_request( XSelectionRequestEvent& ev_P )
+void TDESelectionOwner::filter_selection_request( XSelectionRequestEvent& ev_P )
     {
     if( timestamp == CurrentTime || ev_P.selection != selection )
         return;
@@ -311,7 +311,7 @@ void KSelectionOwner::filter_selection_request( XSelectionRequestEvent& ev_P )
     XSendEvent( tqt_xdisplay(), ev_P.requestor, False, 0, &ev );
     }
 
-bool KSelectionOwner::handle_selection( Atom target_P, Atom property_P, Window requestor_P )
+bool TDESelectionOwner::handle_selection( Atom target_P, Atom property_P, Window requestor_P )
     {
     if( target_P == xa_timestamp )
         {
@@ -328,7 +328,7 @@ bool KSelectionOwner::handle_selection( Atom target_P, Atom property_P, Window r
     return true;
     }
 
-void KSelectionOwner::replyTargets( Atom property_P, Window requestor_P )
+void TDESelectionOwner::replyTargets( Atom property_P, Window requestor_P )
     {
     Atom atoms[ 3 ] = { xa_multiple, xa_timestamp, xa_targets };
 //    kdDebug() << "Handling targets request" << endl;
@@ -336,12 +336,12 @@ void KSelectionOwner::replyTargets( Atom property_P, Window requestor_P )
         reinterpret_cast< unsigned char* >( atoms ), 3 );
     }
 
-bool KSelectionOwner::genericReply( Atom, Atom, Window )
+bool TDESelectionOwner::genericReply( Atom, Atom, Window )
     {
     return false;
     }
 
-void KSelectionOwner::getAtoms()
+void TDESelectionOwner::getAtoms()
     {
     if( manager_atom == None )
         {
@@ -356,66 +356,66 @@ void KSelectionOwner::getAtoms()
         }
     }
 
-Atom KSelectionOwner::manager_atom = None;
-Atom KSelectionOwner::xa_multiple = None;
-Atom KSelectionOwner::xa_targets = None;
-Atom KSelectionOwner::xa_timestamp = None;
+Atom TDESelectionOwner::manager_atom = None;
+Atom TDESelectionOwner::xa_multiple = None;
+Atom TDESelectionOwner::xa_targets = None;
+Atom TDESelectionOwner::xa_timestamp = None;
 
 //*******************************************
-// KSelectionWatcher
+// TDESelectionWatcher
 //*******************************************
 
 
-class KSelectionWatcherPrivate
+class TDESelectionWatcherPrivate
     : public QWidget
     {
     public:
-        KSelectionWatcherPrivate( KSelectionWatcher* watcher );
+        TDESelectionWatcherPrivate( TDESelectionWatcher* watcher );
     protected:
         virtual bool x11Event( XEvent* ev );
     private:
-        KSelectionWatcher* watcher;
+        TDESelectionWatcher* watcher;
     };
     
-KSelectionWatcherPrivate::KSelectionWatcherPrivate( KSelectionWatcher* watcher_P )
+TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P )
     :   watcher( watcher_P )
     {
     kapp->installX11EventFilter( TQT_TQWIDGET(this) );
     }
     
-bool KSelectionWatcherPrivate::x11Event( XEvent* ev_P )
+bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P )
     {
     watcher->filterEvent( ev_P );
     return false;
     }
     
 
-KSelectionWatcher::KSelectionWatcher( Atom selection_P, int screen_P, TQObject* parent_P )
+TDESelectionWatcher::TDESelectionWatcher( Atom selection_P, int screen_P, TQObject* parent_P )
     :   TQObject( parent_P ),
         selection( selection_P ),
         screen( screen_P >= 0 ? screen_P : DefaultScreen( tqt_xdisplay())),
         selection_owner( None ),
-        d( new KSelectionWatcherPrivate( this ))
+        d( new TDESelectionWatcherPrivate( this ))
     {
     init();
     }
     
-KSelectionWatcher::KSelectionWatcher( const char* selection_P, int screen_P, TQObject* parent_P )
+TDESelectionWatcher::TDESelectionWatcher( const char* selection_P, int screen_P, TQObject* parent_P )
     :   TQObject( parent_P ),
         selection( XInternAtom( tqt_xdisplay(), selection_P, False )),
         screen( screen_P >= 0 ? screen_P : DefaultScreen( tqt_xdisplay())),
         selection_owner( None ),
-        d( new KSelectionWatcherPrivate( this ))
+        d( new TDESelectionWatcherPrivate( this ))
     {
     init();
     }
 
-KSelectionWatcher::~KSelectionWatcher()
+TDESelectionWatcher::~TDESelectionWatcher()
     {
     delete d;
     }
     
-void KSelectionWatcher::init()
+void TDESelectionWatcher::init()
     {
     if( manager_atom == None )
         {
@@ -429,7 +429,7 @@ void KSelectionWatcher::init()
         }
     }    
 
-Window KSelectionWatcher::owner()
+Window TDESelectionWatcher::owner()
     {
     Display* const dpy = tqt_xdisplay();
     KXErrorHandler handler;
@@ -451,7 +451,7 @@ Window KSelectionWatcher::owner()
     }
 
 // void return value in order to allow more watchers in one process
-void KSelectionWatcher::filterEvent( XEvent* ev_P )
+void TDESelectionWatcher::filterEvent( XEvent* ev_P )
     {
     if( ev_P->type == ClientMessage )
         {
@@ -478,12 +478,12 @@ void KSelectionWatcher::filterEvent( XEvent* ev_P )
     return;
     }
 
-Atom KSelectionWatcher::manager_atom = None;
+Atom TDESelectionWatcher::manager_atom = None;
 
-void KSelectionOwner::virtual_hook( int, void* )
+void TDESelectionOwner::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KSelectionWatcher::virtual_hook( int, void* )
+void TDESelectionWatcher::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 #include "kmanagerselection.moc"
diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h
index 5b46488ab..de294187d 100644
--- a/tdecore/kmanagerselection.h
+++ b/tdecore/kmanagerselection.h
@@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <X11/Xlib.h>
 
-class KSelectionOwnerPrivate;
+class TDESelectionOwnerPrivate;
 
 /**
  This class implements claiming and owning manager selections, as described
@@ -47,7 +47,7 @@ class KSelectionOwnerPrivate;
  @since 3.2
  @short ICCCM manager selection owner
 */
-class TDECORE_EXPORT KSelectionOwner
+class TDECORE_EXPORT TDESelectionOwner
     : public TQObject
     {
     Q_OBJECT
@@ -60,7 +60,7 @@ class TDECORE_EXPORT KSelectionOwner
          * @param screen X screen, or -1 for default
          * @param parent parent object, or NULL if there is none
          */
-        KSelectionOwner( Atom selection, int screen = -1, TQObject* parent = NULL );
+        TDESelectionOwner( Atom selection, int screen = -1, TQObject* parent = NULL );
         /**
          * @overload
          * This constructor accepts the selection name and creates the appropriate atom
@@ -70,11 +70,11 @@ class TDECORE_EXPORT KSelectionOwner
          * @param screen X screen, or -1 for default
          * @param parent parent object, or NULL if there is none
          */
-        KSelectionOwner( const char* selection, int screen = -1, TQObject* parent = NULL );
+        TDESelectionOwner( const char* selection, int screen = -1, TQObject* parent = NULL );
         /**
          * Destructor. Calls release().
          */
-	virtual ~KSelectionOwner();
+	virtual ~TDESelectionOwner();
         /**
          * This function attemps to claim ownership of the manager selection, using
          * the current X timestamp. If @p force is false, and the selection is already
@@ -157,10 +157,10 @@ class TDECORE_EXPORT KSelectionOwner
     protected:
         virtual void virtual_hook( int id, void* data );
     private:
-        KSelectionOwnerPrivate* d;
+        TDESelectionOwnerPrivate* d;
     };
 
-class KSelectionWatcherPrivate;
+class TDESelectionWatcherPrivate;
 
 /**
  This class implements watching manager selections, as described in the ICCCM
@@ -170,7 +170,7 @@ class KSelectionWatcherPrivate;
  @since 3.2
  @short ICCCM manager selection watching
 */
-class TDECORE_EXPORT KSelectionWatcher
+class TDECORE_EXPORT TDESelectionWatcher
     : public TQObject
     {
     Q_OBJECT
@@ -183,7 +183,7 @@ class TDECORE_EXPORT KSelectionWatcher
          * @param screen X screen, or -1 for default
          * @param parent parent object, or NULL if there is none
          */
-        KSelectionWatcher( Atom selection, int screen = -1, TQObject* parent = NULL );
+        TDESelectionWatcher( Atom selection, int screen = -1, TQObject* parent = NULL );
         /**
          * @overload
          * This constructor accepts the selection name and creates the appropriate atom
@@ -193,8 +193,8 @@ class TDECORE_EXPORT KSelectionWatcher
          * @param screen X screen, or -1 for default
          * @param parent parent object, or NULL if there is none
          */
-        KSelectionWatcher( const char* selection, int screen = -1, TQObject* parent = NULL );
-	virtual ~KSelectionWatcher();
+        TDESelectionWatcher( const char* selection, int screen = -1, TQObject* parent = NULL );
+	virtual ~TDESelectionWatcher();
         /**
          * Return the current owner of the manager selection, if any.
          */
@@ -226,7 +226,7 @@ class TDECORE_EXPORT KSelectionWatcher
     protected:
         virtual void virtual_hook( int id, void* data );
     private:
-        KSelectionWatcherPrivate* d;
+        TDESelectionWatcherPrivate* d;
     };
 
 #endif
diff --git a/tdecore/kmdcodec_compat.h b/tdecore/kmdcodec_compat.h
index f2ed3b580..80da5356b 100644
--- a/tdecore/kmdcodec_compat.h
+++ b/tdecore/kmdcodec_compat.h
@@ -1,4 +1,4 @@
 #ifdef __GNUC__
-#warning #include <kio/kmdcodec.h> is deprecated, use #include <kmdcodec.h> instead. 
+#warning #include <tdeio/kmdcodec.h> is deprecated, use #include <kmdcodec.h> instead. 
 #endif
 #include "../kmdcodec.h"
diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp
index 37745d398..8ed02941e 100644
--- a/tdecore/kmimesourcefactory.cpp
+++ b/tdecore/kmimesourcefactory.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kiconloader.h>
 
@@ -28,8 +28,8 @@
 class KMimeSourceFactoryPrivate
 {
 public:
-  inline KMimeSourceFactoryPrivate (KIconLoader* loader) : m_iconLoader(loader), m_instance(0L) {}
-  inline KIconLoader *iconLoader()
+  inline KMimeSourceFactoryPrivate (TDEIconLoader* loader) : m_iconLoader(loader), m_instance(0L) {}
+  inline TDEIconLoader *iconLoader()
   {
     // If we don't have either of these, things are looking grim.
     Q_ASSERT(m_instance || m_iconLoader);
@@ -40,11 +40,11 @@ public:
     return m_instance->iconLoader();
   }
 
-  KIconLoader *m_iconLoader;
-  KInstance *m_instance;
+  TDEIconLoader *m_iconLoader;
+  TDEInstance *m_instance;
 };
 
-KMimeSourceFactory::KMimeSourceFactory (KIconLoader* loader)
+KMimeSourceFactory::KMimeSourceFactory (TDEIconLoader* loader)
   : TQMimeSourceFactory (),
 	d (new KMimeSourceFactoryPrivate (loader))
 {
@@ -71,23 +71,23 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T
 
   if (myContext == "desktop")
 	{
-	  result = d->iconLoader()->iconPath (myName, KIcon::Desktop);
+	  result = d->iconLoader()->iconPath (myName, TDEIcon::Desktop);
 	}
   else if (myContext == "toolbar")
 	{	 
-	  result = d->iconLoader()->iconPath (myName, KIcon::Toolbar);
+	  result = d->iconLoader()->iconPath (myName, TDEIcon::Toolbar);
 	}
   else if (myContext == "maintoolbar")
 	{
-	  result = d->iconLoader()->iconPath (myName, KIcon::MainToolbar);
+	  result = d->iconLoader()->iconPath (myName, TDEIcon::MainToolbar);
 	}
   else if (myContext == "small")
 	{
-	  result = d->iconLoader()->iconPath (myName, KIcon::Small);
+	  result = d->iconLoader()->iconPath (myName, TDEIcon::Small);
 	}
   else if (myContext == "user")
 	{	  
-	  result = d->iconLoader()->iconPath (myName, KIcon::User);
+	  result = d->iconLoader()->iconPath (myName, TDEIcon::User);
 	}
 
   if (result.isEmpty())
@@ -96,7 +96,7 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T
   return result;
 }
 
-void KMimeSourceFactory::setInstance(KInstance *instance)
+void KMimeSourceFactory::setInstance(TDEInstance *instance)
 {
   d->m_instance = instance;
 }
diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h
index bf5b67d4c..8292cda42 100644
--- a/tdecore/kmimesourcefactory.h
+++ b/tdecore/kmimesourcefactory.h
@@ -23,16 +23,16 @@
 #define KMIMESOURCEFACTORY_H
 
 #include <tqmime.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class KMimeSourceFactoryPrivate;
-class KInstance;
+class TDEInstance;
 
 /**
- * An extension to TQMimeSourceFactory that uses KIconLoader to
+ * An extension to TQMimeSourceFactory that uses TDEIconLoader to
  * find images.
  *
- * Normally you don't have to instantiate this class at all, KApplication does that for
+ * Normally you don't have to instantiate this class at all, TDEApplication does that for
  * you automagically and sets TQMimeSourceFactory::setDefaultFactory().
  *
  * @author Peter Putzer <putzer@kde.org>
@@ -46,7 +46,7 @@ public:
    *
    * @param loader is the iconloader used to find images.
    */
-  KMimeSourceFactory (KIconLoader* loader = KGlobal::iconLoader());
+  KMimeSourceFactory (TDEIconLoader* loader = TDEGlobal::iconLoader());
 
   /**
    * Destructor.
@@ -74,10 +74,10 @@ protected:
 private:
   /**
    * @internal
-   * Associate with a KInstance so we can pull its iconLoader() when need arises.
+   * Associate with a TDEInstance so we can pull its iconLoader() when need arises.
    */
-  friend class KInstance;
-  void setInstance(KInstance *);
+  friend class TDEInstance;
+  void setInstance(TDEInstance *);
 
   KMimeSourceFactoryPrivate* d;
 };
diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp
index 764f085a0..a9be89e76 100644
--- a/tdecore/kmountpoint.cpp
+++ b/tdecore/kmountpoint.cpp
@@ -158,7 +158,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(int infoNeeded)
       if (infoNeeded & NeedRealDeviceName)
       {
          if (mp->m_mountedFrom.startsWith("/"))
-            mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+            mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
       }
       // TODO: Strip trailing '/' ?
       result.append(mp);
@@ -209,7 +209,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(int infoNeeded)
       if (infoNeeded & NeedRealDeviceName)
       {
          if (mp->m_mountedFrom.startsWith("/"))
-            mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+            mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
       }
       // TODO: Strip trailing '/' ?
       result.append(mp);
@@ -256,7 +256,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
       if (infoNeeded & NeedRealDeviceName)
       {
          if (mp->m_mountedFrom.startsWith("/"))
-            mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+            mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
       }
       // TODO: Strip trailing '/' ?
       result.append(mp);
@@ -320,7 +320,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
             if (infoNeeded & NeedRealDeviceName)
             {
                if (mp->m_mountedFrom.startsWith("/"))
-                  mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+                  mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
             }
             
             result.append(mp);
@@ -363,7 +363,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
       if (infoNeeded & NeedRealDeviceName)
       {
          if (mp->m_mountedFrom.startsWith("/"))
-            mp->m_device = KStandardDirs::realPath(mp->m_mountedFrom);
+            mp->m_device = TDEStandardDirs::realPath(mp->m_mountedFrom);
       }
       // TODO: Strip trailing '/' ?
       result.append(mp);
diff --git a/tdecore/kmountpoint.h b/tdecore/kmountpoint.h
index e68fb23ab..e35b042e6 100644
--- a/tdecore/kmountpoint.h
+++ b/tdecore/kmountpoint.h
@@ -32,11 +32,11 @@
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.2
  */
-class TDECORE_EXPORT KMountPoint : public KShared
+class TDECORE_EXPORT KMountPoint : public TDEShared
 {
    typedef signed long long int filesize_t;
 public:
-  typedef KSharedPtr<KMountPoint> Ptr;
+  typedef TDESharedPtr<KMountPoint> Ptr;
   typedef TQValueList<Ptr> List;
 public:
    enum { NeedMountOptions = 1, NeedRealDeviceName = 2 };
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index bfde017af..b6f70bd23 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -23,10 +23,10 @@
 #include <tqdatastream.h>
 #include <tqptrstack.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
@@ -51,12 +51,12 @@ static bool canAvoidStartupEvent( const TQString& event, const TQString& appname
         return false;
     }
     // starttde event is in global events file
-    static KConfig* configfile = appname != "ksmserver"
-        ? new KConfig( appname + ".eventsrc", true, false )
-        : new KConfig( "knotify.eventsrc", true, false );
-    static KConfig* eventsfile = appname != "ksmserver"
-        ? new KConfig( appname + "/eventsrc", true, false, "data" )
-        : new KConfig( "knotify/eventsrc", true, false, "data" );
+    static TDEConfig* configfile = appname != "ksmserver"
+        ? new TDEConfig( appname + ".eventsrc", true, false )
+        : new TDEConfig( "knotify.eventsrc", true, false );
+    static TDEConfig* eventsfile = appname != "ksmserver"
+        ? new TDEConfig( appname + "/eventsrc", true, false, "data" )
+        : new TDEConfig( "knotify/eventsrc", true, false, "data" );
     configfile->setGroup( event );
     eventsfile->setGroup( event );
     int ev1 = configfile->readNumEntry( "presentation", -2 );
@@ -178,7 +178,7 @@ int KNotifyClient::getPresentation(const TQString &eventname)
 	int present;
 	if (eventname.isEmpty()) return Default;
 
-	KConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false);
+	TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false);
 	eventsfile.setGroup(eventname);
 
 	present=eventsfile.readNumEntry("presentation", -1);
@@ -190,7 +190,7 @@ TQString KNotifyClient::getFile(const TQString &eventname, int present)
 {
 	if (eventname.isEmpty()) return TQString::null;
 
-	KConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false);
+	TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+".eventsrc", true, false);
 	eventsfile.setGroup(eventname);
 
 	switch (present)
@@ -209,7 +209,7 @@ int KNotifyClient::getDefaultPresentation(const TQString &eventname)
 	int present;
 	if (eventname.isEmpty()) return Default;
 
-	KConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data");
+	TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data");
 	eventsfile.setGroup(eventname);
 
 	present=eventsfile.readNumEntry("default_presentation", -1);
@@ -221,7 +221,7 @@ TQString KNotifyClient::getDefaultFile(const TQString &eventname, int present)
 {
 	if (eventname.isEmpty()) return TQString::null;
 
-	KConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data");
+	TDEConfig eventsfile( KNotifyClient::instance()->instanceName()+"/eventsrc", true, false, "data");
 	eventsfile.setGroup(eventname);
 
 	switch (present)
@@ -241,7 +241,7 @@ bool KNotifyClient::startDaemon()
   if (!kapp->dcopClient()->isApplicationRegistered(daemonName)) {
     if( firstTry ) {
       firstTry = false;
-      return KApplication::startServiceByDesktopName(daemonName) == 0;
+      return TDEApplication::startServiceByDesktopName(daemonName) == 0;
     }
     return false;
   }
@@ -277,7 +277,7 @@ void KNotifyClient::beep(const TQString& reason)
 }
 
 
-KInstance * KNotifyClient::instance() {
+TDEInstance * KNotifyClient::instance() {
     return KNotifyClient::Instance::current();
 }
 
@@ -296,7 +296,7 @@ public:
 		else if (!m_instances.isEmpty())
 		{
 			kdWarning(160) << "Tried to remove an Instance that is not the current," << endl;
-			kdWarning(160) << "Resetting to the main KApplication." << endl;
+			kdWarning(160) << "Resetting to the main TDEApplication." << endl;
 			m_instances.clear();
 		}
 		else
@@ -322,18 +322,18 @@ static KStaticDeleter<KNotifyClient::InstanceStack > instancesDeleter;
 
 struct KNotifyClient::InstancePrivate
 {
-    KInstance *instance;
+    TDEInstance *instance;
     bool useSystemBell;
 };
 
-KNotifyClient::Instance::Instance(KInstance *instance)
+KNotifyClient::Instance::Instance(TDEInstance *instance)
 {
     d = new InstancePrivate;
     d->instance = instance;
     instances()->push(this);
 
-    KConfig *config = instance->config();
-    KConfigGroupSaver cs( config, "General" );
+    TDEConfig *config = instance->config();
+    TDEConfigGroupSaver cs( config, "General" );
     d->useSystemBell = config->readBoolEntry( "UseSystemBell", false );
 }
 
@@ -360,7 +360,7 @@ bool KNotifyClient::Instance::useSystemBell() const
 // static methods
 
 // We always return a valid KNotifyClient::Instance here. If no special one
-// is available, we have a default-instance with kapp as KInstance.
+// is available, we have a default-instance with kapp as TDEInstance.
 // We make sure to always have that default-instance in the stack, because
 // the stack might have gotten cleared in the destructor.
 // We can't use QStack::setAutoDelete( true ), because no instance besides
@@ -370,7 +370,7 @@ KNotifyClient::Instance * KNotifyClient::Instance::currentInstance()
 	return instances()->currentInstance();
 }
 
-KInstance *KNotifyClient::Instance::current()
+TDEInstance *KNotifyClient::Instance::current()
 {
     return currentInstance()->d->instance;
 }
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index 1eeebbb0a..ff96b020a 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -20,7 +20,7 @@
 #include <tqstring.h>
 #include "tdelibs_export.h"
 
-class KInstance;
+class TDEInstance;
 #undef None // X11 headers...
 
 /**
@@ -82,7 +82,7 @@ namespace KNotifyClient
 	class InstanceStack;
 
     /**
-     * Makes it possible to use KNotifyClient with a KInstance
+     * Makes it possible to use KNotifyClient with a TDEInstance
      * that is not the application.
      *
      * Use like this:
@@ -91,20 +91,20 @@ namespace KNotifyClient
      * KNotifyClient::event("MyEvent");
      * \endcode
      *
-     * @short Enables KNotifyClient to use a different KInstance
+     * @short Enables KNotifyClient to use a different TDEInstance
      */
     class TDECORE_EXPORT Instance
     {
     public:
         /**
          * Constructs a KNotifyClient::Instance to make KNotifyClient use
-         * the specified KInstance for the event configuration.
+         * the specified TDEInstance for the event configuration.
 	 * @param instance the instance for the event configuration
          */
-        Instance(KInstance *instance);
+        Instance(TDEInstance *instance);
         /**
          * Destructs the KNotifyClient::Instance and resets KNotifyClient
-         * to the previously used KInstance.
+         * to the previously used TDEInstance.
          */
         ~Instance();
 	/**
@@ -114,13 +114,13 @@ namespace KNotifyClient
 	 */
 	bool useSystemBell() const;
         /**
-         * Returns the currently active KInstance.
-	 * @return the active KInstance
+         * Returns the currently active TDEInstance.
+	 * @return the active TDEInstance
          */
-        static KInstance *current();
+        static TDEInstance *current();
 
 	/**
-	 * Returns the current KNotifyClient::Instance (not the KInstance).
+	 * Returns the current KNotifyClient::Instance (not the TDEInstance).
 	 * @return the active Instance
 	 */
 	static Instance *currentInstance();
@@ -217,7 +217,7 @@ namespace KNotifyClient
 	 * placed appropriately.
 	 *
 	 * Call it by KNotifyClient::event(widget->winId(), "EventName");
-	 * It will use KApplication::kApplication->dcopClient() to communicate to
+	 * It will use TDEApplication::kApplication->dcopClient() to communicate to
 	 * the server
 	 * @param winId The winId() of the widget where the event originates
 	 * @param message The name of the event
@@ -317,9 +317,9 @@ namespace KNotifyClient
 
 	/**
 	 * Shortcut to KNotifyClient::Instance::current() :)
-	 * @returns the current KInstance.
+	 * @returns the current TDEInstance.
 	 */
-	TDECORE_EXPORT KInstance * instance();
+	TDECORE_EXPORT TDEInstance * instance();
 }
 
 #endif
diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp
index 073dff626..7335e8e14 100644
--- a/tdecore/kpalette.cpp
+++ b/tdecore/kpalette.cpp
@@ -24,7 +24,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ksavefile.h>
 #include <kstringhandler.h>
 
@@ -34,7 +34,7 @@ TQStringList
 KPalette::getPaletteList()
 {
   TQStringList paletteList;
-  KGlobal::dirs()->findAllResources("config", "colors/*", false, true, paletteList);
+  TDEGlobal::dirs()->findAllResources("config", "colors/*", false, true, paletteList);
 
   int strip = strlen("colors/");
   for(TQStringList::Iterator it = paletteList.begin();
diff --git a/tdecore/kpixmapprovider.h b/tdecore/kpixmapprovider.h
index 009f1ed75..f01466315 100644
--- a/tdecore/kpixmapprovider.h
+++ b/tdecore/kpixmapprovider.h
@@ -43,7 +43,7 @@ public:
      * You may subclass this and return a pixmap of size @p size for @p text.
      * @param text the text that is associated with the pixmap
      * @param size the size of the icon in pixels, 0 for defaylt size.
-     *             See KIcon::StdSize.
+     *             See TDEIcon::StdSize.
      * @return the pixmap for the arguments, or null if there is none
      */
     virtual TQPixmap pixmapFor( const TQString& text, int size = 0 ) = 0;
diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp
index d8170c0a8..76ad0b167 100644
--- a/tdecore/kprocctrl.cpp
+++ b/tdecore/kprocctrl.cpp
@@ -33,29 +33,29 @@
 
 #include <tqsocketnotifier.h>
 
-KProcessController *KProcessController::theKProcessController;
-int KProcessController::refCount;
+TDEProcessController *TDEProcessController::theTDEProcessController;
+int TDEProcessController::refCount;
 
-void KProcessController::ref()
+void TDEProcessController::ref()
 {
   if( !refCount ) {
-    theKProcessController = new KProcessController;
+    theTDEProcessController = new TDEProcessController;
     setupHandlers();
   }
   refCount++;
 }
 
-void KProcessController::deref()
+void TDEProcessController::deref()
 {
   refCount--;
   if( !refCount ) {
     resetHandlers();
-    delete theKProcessController;
-    theKProcessController = 0;
+    delete theTDEProcessController;
+    theTDEProcessController = 0;
   }
 }
 
-KProcessController::KProcessController()
+TDEProcessController::TDEProcessController()
   : needcheck( false )
 {
   if( pipe( fd ) )
@@ -75,7 +75,7 @@ KProcessController::KProcessController()
                     TQT_SLOT(slotDoHousekeeping()));
 }
 
-KProcessController::~KProcessController()
+TDEProcessController::~TDEProcessController()
 {
   delete notifier;
 
@@ -87,16 +87,16 @@ KProcessController::~KProcessController()
 extern "C" {
 static void theReaper( int num )
 {
-  KProcessController::theSigCHLDHandler( num );
+  TDEProcessController::theSigCHLDHandler( num );
 }
 }
 
 #ifdef Q_OS_UNIX
-struct sigaction KProcessController::oldChildHandlerData;
+struct sigaction TDEProcessController::oldChildHandlerData;
 #endif
-bool KProcessController::handlerSet = false;
+bool TDEProcessController::handlerSet = false;
 
-void KProcessController::setupHandlers()
+void TDEProcessController::setupHandlers()
 {
   if( handlerSet )
       return;
@@ -127,7 +127,7 @@ void KProcessController::setupHandlers()
 #endif
 }
 
-void KProcessController::resetHandlers()
+void TDEProcessController::resetHandlers()
 {
   if( !handlerSet )
       return;
@@ -144,12 +144,12 @@ void KProcessController::resetHandlers()
 // the pipe is needed to sync the child reaping with our event processing,
 // as otherwise there are race conditions, locking requirements, and things
 // generally get harder
-void KProcessController::theSigCHLDHandler( int arg )
+void TDEProcessController::theSigCHLDHandler( int arg )
 {
   int saved_errno = errno;
 
   char dummy = 0;
-  ::write( theKProcessController->fd[1], &dummy, 1 );
+  ::write( theTDEProcessController->fd[1], &dummy, 1 );
 
 #ifdef Q_OS_UNIX
   if( oldChildHandlerData.sa_handler != SIG_IGN &&
@@ -162,12 +162,12 @@ void KProcessController::theSigCHLDHandler( int arg )
   errno = saved_errno;
 }
 
-int KProcessController::notifierFd() const
+int TDEProcessController::notifierFd() const
 {
   return fd[0];
 }
 
-void KProcessController::unscheduleCheck()
+void TDEProcessController::unscheduleCheck()
 {
   char dummy[16]; // somewhat bigger - just in case several have queued up
   if( ::read( fd[0], dummy, sizeof(dummy) ) > 0 )
@@ -175,7 +175,7 @@ void KProcessController::unscheduleCheck()
 }
 
 void
-KProcessController::rescheduleCheck()
+TDEProcessController::rescheduleCheck()
 {
   if( needcheck )
   {
@@ -185,23 +185,23 @@ KProcessController::rescheduleCheck()
   }
 }
 
-void KProcessController::slotDoHousekeeping()
+void TDEProcessController::slotDoHousekeeping()
 {
   char dummy[16]; // somewhat bigger - just in case several have queued up
   ::read( fd[0], dummy, sizeof(dummy) );
 
   int status;
  again:
-  TQValueListIterator<KProcess*> it( kProcessList.begin() );
-  TQValueListIterator<KProcess*> eit( kProcessList.end() );
+  TQValueListIterator<TDEProcess*> it( kProcessList.begin() );
+  TQValueListIterator<TDEProcess*> eit( kProcessList.end() );
   while( it != eit )
   {
-    KProcess *prc = *it;
+    TDEProcess *prc = *it;
     if( prc->runs && waitpid( prc->pid_, &status, WNOHANG ) > 0 )
     {
       prc->processHasExited( status );
       // the callback can nuke the whole process list and even 'this'
-      if (!theKProcessController)
+      if (!theTDEProcessController)
         return;
       goto again;
     }
@@ -220,7 +220,7 @@ void KProcessController::slotDoHousekeeping()
   }
 }
 
-bool KProcessController::waitForProcessExit( int timeout )
+bool TDEProcessController::waitForProcessExit( int timeout )
 {
 #ifdef Q_OS_UNIX
   for(;;)
@@ -258,20 +258,20 @@ bool KProcessController::waitForProcessExit( int timeout )
 #endif
 }
 
-void KProcessController::addKProcess( KProcess* p )
+void TDEProcessController::addTDEProcess( TDEProcess* p )
 {
   kProcessList.append( p );
 }
 
-void KProcessController::removeKProcess( KProcess* p )
+void TDEProcessController::removeTDEProcess( TDEProcess* p )
 {
   kProcessList.remove( p );
 }
 
-void KProcessController::addProcess( int pid )
+void TDEProcessController::addProcess( int pid )
 {
   unixProcessList.append( pid );
-  ref(); // make sure we stay around when the KProcess goes away
+  ref(); // make sure we stay around when the TDEProcess goes away
 }
 
 #include "kprocctrl.moc"
diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h
index 9a596334b..1cb6cc302 100644
--- a/tdecore/kprocctrl.h
+++ b/tdecore/kprocctrl.h
@@ -27,29 +27,29 @@
 class TQSocketNotifier;
 
 /**
- * @short Used internally by KProcess
+ * @short Used internally by TDEProcess
  * @internal
  * @author Christian Czezatke <e9025461@student.tuwien.ac.at>
  *
- *  A class for internal use by KProcess only. -- Exactly one instance
- *  of this class is created by KApplication.
+ *  A class for internal use by TDEProcess only. -- Exactly one instance
+ *  of this class is created by TDEApplication.
  *
  * This class takes care of the actual (UN*X) signal handling.
  */
-class TDECORE_EXPORT KProcessController : public TQObject
+class TDECORE_EXPORT TDEProcessController : public TQObject
 {
   Q_OBJECT
 
 public:
   /**
    * Create an instance if none exists yet.
-   * Called by KApplication::KApplication()
+   * Called by TDEApplication::TDEApplication()
    */
   static void ref();
 
   /**
    * Destroy the instance if one exists and it is not referenced any more.
-   * Called by KApplication::~KApplication()
+   * Called by TDEApplication::~TDEApplication()
    */
   static void deref();
 
@@ -57,7 +57,7 @@ public:
    * Only a single instance of this class is allowed at a time,
    * and this static variable is used to track the one instance.
    */
-  static KProcessController *theKProcessController; // kde4: rename: instance
+  static TDEProcessController *theTDEProcessController; // kde4: rename: instance
 
   /**
    * Automatically called upon SIGCHLD. Never call it directly.
@@ -71,7 +71,7 @@ public:
   /**
    * Wait for any process to exit and handle their exit without
    * starting an event loop.
-   * This function may cause KProcess to emit any of its signals.
+   * This function may cause TDEProcess to emit any of its signals.
    *
    * @param timeout the timeout in seconds. -1 means no timeout.
    * @return true if a process exited, false
@@ -95,7 +95,7 @@ public:
   void rescheduleCheck();
 
   /*
-   * Obtain the file descriptor KProcessController uses to get notified
+   * Obtain the file descriptor TDEProcessController uses to get notified
    * about process exits. select() or poll() on it if you create a custom
    * event loop that needs to act upon SIGCHLD.
    * @return the file descriptor of the reading end of the notification pipe
@@ -106,11 +106,11 @@ public:
   /**
    * @internal
    */
-  void addKProcess( KProcess* );
+  void addTDEProcess( TDEProcess* );
   /**
    * @internal
    */
-  void removeKProcess( KProcess* );
+  void removeTDEProcess( TDEProcess* );
   /**
    * @internal
    */
@@ -125,7 +125,7 @@ private:
   int fd[2];
   bool needcheck;
   TQSocketNotifier *notifier;
-  TQValueList<KProcess*> kProcessList;
+  TQValueList<TDEProcess*> kProcessList;
   TQValueList<int> unixProcessList;
 
   static void setupHandlers();
@@ -136,12 +136,12 @@ private:
   static int refCount;
 
   // Disallow instantiation
-  KProcessController();
-  ~KProcessController();
+  TDEProcessController();
+  ~TDEProcessController();
 
   // Disallow assignment and copy-construction
-  KProcessController( const KProcessController& );
-  KProcessController& operator= ( const KProcessController& );
+  TDEProcessController( const TDEProcessController& );
+  TDEProcessController& operator= ( const TDEProcessController& );
 };
 
 
diff --git a/tdecore/kprocess.cpp b/tdecore/kprocess.cpp
index 3658116ab..b899c637f 100644
--- a/tdecore/kprocess.cpp
+++ b/tdecore/kprocess.cpp
@@ -85,10 +85,10 @@
 // private data //
 //////////////////
 
-class KProcessPrivate {
+class TDEProcessPrivate {
 public:
-   KProcessPrivate() : 
-     usePty(KProcess::NoCommunication),
+   TDEProcessPrivate() : 
+     usePty(TDEProcess::NoCommunication),
      addUtmp(false), useShell(false),
 #ifdef Q_OS_UNIX
      pty(0),
@@ -97,7 +97,7 @@ public:
    {
    }
 
-   KProcess::Communication usePty;
+   TDEProcess::Communication usePty;
    bool addUtmp : 1;
    bool useShell : 1;
 
@@ -117,7 +117,7 @@ public:
 // public member functions //
 /////////////////////////////
 
-KProcess::KProcess( TQObject* parent, const char *name )
+TDEProcess::TDEProcess( TQObject* parent, const char *name )
   : TQObject( parent, name ),
     run_mode(NotifyOnExit),
     runs(false),
@@ -132,17 +132,17 @@ KProcess::KProcess( TQObject* parent, const char *name )
     input_sent(0),
     input_total(0)
 {
-  KProcessController::ref();
-  KProcessController::theKProcessController->addKProcess(this);
+  TDEProcessController::ref();
+  TDEProcessController::theTDEProcessController->addTDEProcess(this);
 
-  d = new KProcessPrivate;
+  d = new TDEProcessPrivate;
 
   out[0] = out[1] = -1;
   in[0] = in[1] = -1;
   err[0] = err[1] = -1;
 }
 
-KProcess::KProcess()
+TDEProcess::TDEProcess()
   : TQObject(),
     run_mode(NotifyOnExit),
     runs(false),
@@ -157,10 +157,10 @@ KProcess::KProcess()
     input_sent(0),
     input_total(0)
 {
-  KProcessController::ref();
-  KProcessController::theKProcessController->addKProcess(this);
+  TDEProcessController::ref();
+  TDEProcessController::theTDEProcessController->addTDEProcess(this);
 
-  d = new KProcessPrivate;
+  d = new TDEProcessPrivate;
 
   out[0] = out[1] = -1;
   in[0] = in[1] = -1;
@@ -168,19 +168,19 @@ KProcess::KProcess()
 }
 
 void
-KProcess::setEnvironment(const TQString &name, const TQString &value)
+TDEProcess::setEnvironment(const TQString &name, const TQString &value)
 {
    d->env.insert(name, value);
 }
 
 void
-KProcess::setWorkingDirectory(const TQString &dir)
+TDEProcess::setWorkingDirectory(const TQString &dir)
 {
    d->wd = dir;   
 } 
 
 void 
-KProcess::setupEnvironment()
+TDEProcess::setupEnvironment()
 {
    TQMap<TQString,TQString>::Iterator it;
    for(it = d->env.begin(); it != d->env.end(); ++it)
@@ -195,19 +195,19 @@ KProcess::setupEnvironment()
 }
 
 void
-KProcess::setRunPrivileged(bool keepPrivileges)
+TDEProcess::setRunPrivileged(bool keepPrivileges)
 {
    keepPrivs = keepPrivileges;
 }
 
 bool
-KProcess::runPrivileged() const
+TDEProcess::runPrivileged() const
 {
    return keepPrivs;
 }
 
 bool
-KProcess::setPriority(int prio)
+TDEProcess::setPriority(int prio)
 {
 #ifdef Q_OS_UNIX
     if (runs) {
@@ -222,7 +222,7 @@ KProcess::setPriority(int prio)
     return true;
 }
 
-KProcess::~KProcess()
+TDEProcess::~TDEProcess()
 {
   if (run_mode != DontCare)
     kill(SIGKILL);
@@ -233,26 +233,26 @@ KProcess::~KProcess()
 #endif
   delete d;
 
-  KProcessController::theKProcessController->removeKProcess(this);
-  KProcessController::deref();
+  TDEProcessController::theTDEProcessController->removeTDEProcess(this);
+  TDEProcessController::deref();
 }
 
-void KProcess::detach()
+void TDEProcess::detach()
 {
   if (runs) {
-    KProcessController::theKProcessController->addProcess(pid_);
+    TDEProcessController::theTDEProcessController->addProcess(pid_);
     runs = false;
     pid_ = 0; // close without draining
     commClose(); // Clean up open fd's and socket notifiers.
   }
 }
 
-void KProcess::setBinaryExecutable(const char *filename)
+void TDEProcess::setBinaryExecutable(const char *filename)
 {
    d->executable = filename;
 }
 
-bool KProcess::setExecutable(const TQString& proc)
+bool TDEProcess::setExecutable(const TQString& proc)
 {
   if (runs) return false;
 
@@ -265,7 +265,7 @@ bool KProcess::setExecutable(const TQString& proc)
   return true;
 }
 
-KProcess &KProcess::operator<<(const TQStringList& args)
+TDEProcess &TDEProcess::operator<<(const TQStringList& args)
 {
   TQStringList::ConstIterator it = args.begin();
   for ( ; it != args.end() ; ++it )
@@ -273,29 +273,29 @@ KProcess &KProcess::operator<<(const TQStringList& args)
   return *this;
 }
 
-KProcess &KProcess::operator<<(const TQCString& arg)
+TDEProcess &TDEProcess::operator<<(const TQCString& arg)
 {
   return operator<< (arg.data());
 }
 
-KProcess &KProcess::operator<<(const char* arg)
+TDEProcess &TDEProcess::operator<<(const char* arg)
 {
   arguments.append(arg);
   return *this;
 }
 
-KProcess &KProcess::operator<<(const TQString& arg)
+TDEProcess &TDEProcess::operator<<(const TQString& arg)
 {
   arguments.append(TQFile::encodeName(arg));
   return *this;
 }
 
-void KProcess::clearArguments()
+void TDEProcess::clearArguments()
 {
   arguments.clear();
 }
 
-bool KProcess::start(RunMode runmode, Communication comm)
+bool TDEProcess::start(RunMode runmode, Communication comm)
 {
   if (runs) {
     kdDebug(175) << "Attempted to start an already running process" << endl;
@@ -454,11 +454,11 @@ bool KProcess::start(RunMode runmode, Communication comm)
       if (!runs)
       {
         // commClose detected data on the process exit notifification pipe
-        KProcessController::theKProcessController->unscheduleCheck();
+        TDEProcessController::theTDEProcessController->unscheduleCheck();
         if (waitpid(pid_, &status, WNOHANG) != 0) // error finishes, too
         {
           commClose(); // this time for real (runs is false)
-          KProcessController::theKProcessController->rescheduleCheck();
+          TDEProcessController::theTDEProcessController->rescheduleCheck();
           break;
         }
         runs = true; // for next commClose() iteration
@@ -490,7 +490,7 @@ bool KProcess::start(RunMode runmode, Communication comm)
 
 
 
-bool KProcess::kill(int signo)
+bool TDEProcess::kill(int signo)
 {
 #ifdef Q_OS_UNIX
   if (runs && pid_ > 0 && !::kill(run_mode == OwnGroup ? -pid_ : pid_, signo))
@@ -501,14 +501,14 @@ bool KProcess::kill(int signo)
 
 
 
-bool KProcess::isRunning() const
+bool TDEProcess::isRunning() const
 {
   return runs;
 }
 
 
 
-pid_t KProcess::pid() const
+pid_t TDEProcess::pid() const
 {
   return pid_;
 }
@@ -525,7 +525,7 @@ pid_t KProcess::pid() const
   } while (0)
 #endif
 
-bool KProcess::wait(int timeout)
+bool TDEProcess::wait(int timeout)
 {
   if (!runs)
     return true;
@@ -549,7 +549,7 @@ bool KProcess::wait(int timeout)
   }
 
 #ifdef Q_OS_UNIX
-  int fd = KProcessController::theKProcessController->notifierFd();
+  int fd = TDEProcessController::theTDEProcessController->notifierFd();
   for(;;)
   {
     fd_set fds;
@@ -573,14 +573,14 @@ bool KProcess::wait(int timeout)
         break;
       // fall through; should happen if tvp->tv_sec < 0
     case 0:
-      KProcessController::theKProcessController->rescheduleCheck();
+      TDEProcessController::theTDEProcessController->rescheduleCheck();
       return false;
     default:
-      KProcessController::theKProcessController->unscheduleCheck();
+      TDEProcessController::theTDEProcessController->unscheduleCheck();
       if (waitpid(pid_, &status, WNOHANG) != 0) // error finishes, too
       {
         processHasExited(status);
-        KProcessController::theKProcessController->rescheduleCheck();
+        TDEProcessController::theTDEProcessController->rescheduleCheck();
         return true;
       }
     }
@@ -591,19 +591,19 @@ bool KProcess::wait(int timeout)
 
 
 
-bool KProcess::normalExit() const
+bool TDEProcess::normalExit() const
 {
   return (pid_ != 0) && !runs && WIFEXITED(status);
 }
 
 
-bool KProcess::signalled() const
+bool TDEProcess::signalled() const
 {
   return (pid_ != 0) && !runs && WIFSIGNALED(status);
 }
 
 
-bool KProcess::coreDumped() const
+bool TDEProcess::coreDumped() const
 {
 #ifdef WCOREDUMP
   return signalled() && WCOREDUMP(status);
@@ -613,19 +613,19 @@ bool KProcess::coreDumped() const
 }
 
 
-int KProcess::exitStatus() const
+int TDEProcess::exitStatus() const
 {
   return WEXITSTATUS(status);
 }
 
 
-int KProcess::exitSignal() const
+int TDEProcess::exitSignal() const
 {
   return WTERMSIG(status);
 }
 
 
-bool KProcess::writeStdin(const char *buffer, int buflen)
+bool TDEProcess::writeStdin(const char *buffer, int buflen)
 {
   // if there is still data pending, writing new data
   // to stdout is not allowed (since it could also confuse
@@ -645,19 +645,19 @@ bool KProcess::writeStdin(const char *buffer, int buflen)
     return false;
 }
 
-void KProcess::suspend()
+void TDEProcess::suspend()
 {
   if (outnot)
      outnot->setEnabled(false);
 }
 
-void KProcess::resume()
+void TDEProcess::resume()
 {
   if (outnot)
      outnot->setEnabled(true);
 }
 
-bool KProcess::closeStdin()
+bool TDEProcess::closeStdin()
 {
   if (communication & Stdin) {
     communication = (Communication) (communication & ~Stdin);
@@ -671,7 +671,7 @@ bool KProcess::closeStdin()
     return false;
 }
 
-bool KProcess::closeStdout()
+bool TDEProcess::closeStdout()
 {
   if (communication & Stdout) {
     communication = (Communication) (communication & ~Stdout);
@@ -685,7 +685,7 @@ bool KProcess::closeStdout()
     return false;
 }
 
-bool KProcess::closeStderr()
+bool TDEProcess::closeStderr()
 {
   if (communication & Stderr) {
     communication = (Communication) (communication & ~Stderr);
@@ -699,7 +699,7 @@ bool KProcess::closeStderr()
     return false;
 }
 
-bool KProcess::closePty()
+bool TDEProcess::closePty()
 {
 #ifdef Q_OS_UNIX
   if (d->pty && d->pty->masterFd() >= 0) {
@@ -714,7 +714,7 @@ bool KProcess::closePty()
 #endif
 }
 
-void KProcess::closeAll()
+void TDEProcess::closeAll()
 {
   closeStdin();
   closeStdout();
@@ -728,21 +728,21 @@ void KProcess::closeAll()
 
 
 
-void KProcess::slotChildOutput(int fdno)
+void TDEProcess::slotChildOutput(int fdno)
 {
   if (!childOutput(fdno))
      closeStdout();
 }
 
 
-void KProcess::slotChildError(int fdno)
+void TDEProcess::slotChildError(int fdno)
 {
   if (!childError(fdno))
      closeStderr();
 }
 
 
-void KProcess::slotSendData(int)
+void TDEProcess::slotSendData(int)
 {
   if (input_sent == input_total) {
     innot->setEnabled(false);
@@ -762,7 +762,7 @@ void KProcess::slotSendData(int)
   }
 }
 
-void KProcess::setUseShell(bool useShell, const char *shell)
+void TDEProcess::setUseShell(bool useShell, const char *shell)
 {
   d->useShell = useShell;
   if (shell && *shell)
@@ -787,7 +787,7 @@ void KProcess::setUseShell(bool useShell, const char *shell)
 }
 
 #ifdef Q_OS_UNIX
-void KProcess::setUsePty(Communication usePty, bool addUtmp)
+void TDEProcess::setUsePty(Communication usePty, bool addUtmp)
 {
   d->usePty = usePty;
   d->addUtmp = addUtmp;
@@ -800,13 +800,13 @@ void KProcess::setUsePty(Communication usePty, bool addUtmp)
   }
 }
 
-KPty *KProcess::pty() const
+KPty *TDEProcess::pty() const
 {
   return d->pty;
 }
 #endif //Q_OS_UNIX
 
-TQString KProcess::quote(const TQString &arg)
+TQString TDEProcess::quote(const TQString &arg)
 {
     TQChar q('\'');
     return TQString(arg).replace(q, "'\\''").prepend(q).append(q);
@@ -818,7 +818,7 @@ TQString KProcess::quote(const TQString &arg)
 //////////////////////////////
 
 
-void KProcess::processHasExited(int state)
+void TDEProcess::processHasExited(int state)
 {
     // only successfully run NotifyOnExit processes ever get here
 
@@ -833,7 +833,7 @@ void KProcess::processHasExited(int state)
 
 
 
-int KProcess::childOutput(int fdno)
+int TDEProcess::childOutput(int fdno)
 {
   if (communication & NoRead) {
      int len = -1;
@@ -856,7 +856,7 @@ int KProcess::childOutput(int fdno)
   }
 }
 
-int KProcess::childError(int fdno)
+int TDEProcess::childError(int fdno)
 {
   char buffer[1025];
   int len;
@@ -871,7 +871,7 @@ int KProcess::childError(int fdno)
 }
 
 
-int KProcess::setupCommunication(Communication comm)
+int TDEProcess::setupCommunication(Communication comm)
 {
 #ifdef Q_OS_UNIX
   // PTY stuff //
@@ -939,7 +939,7 @@ int KProcess::setupCommunication(Communication comm)
 
 
 
-int KProcess::commSetupDoneP()
+int TDEProcess::commSetupDoneP()
 {
   int rcomm = communication & ~d->usePty;
   if (rcomm & Stdin)
@@ -984,7 +984,7 @@ int KProcess::commSetupDoneP()
 
 
 
-int KProcess::commSetupDoneC()
+int TDEProcess::commSetupDoneC()
 {
   int ok = 1;
 #ifdef Q_OS_UNIX
@@ -1034,7 +1034,7 @@ int KProcess::commSetupDoneC()
 
 
 
-void KProcess::commClose()
+void TDEProcess::commClose()
 {
   closeStdin();
 
@@ -1044,7 +1044,7 @@ void KProcess::commClose()
     // buffer doesn't fill up whilst we are waiting for data on the other
     // (causing a deadlock). Hence we need to use select.
 
-    int notfd = KProcessController::theKProcessController->notifierFd();
+    int notfd = TDEProcessController::theTDEProcessController->notifierFd();
 
     while ((communication & (Stdout | Stderr)) || runs) {
       fd_set rfds;
@@ -1104,7 +1104,7 @@ void KProcess::commClose()
 }
 
 
-void KProcess::virtual_hook( int, void* )
+void TDEProcess::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 
@@ -1113,7 +1113,7 @@ void KProcess::virtual_hook( int, void* )
 ///////////////////////////
 
 KShellProcess::KShellProcess(const char *shellname):
-  KProcess()
+  TDEProcess()
 {
   setUseShell( true, shellname ? shellname : getenv("SHELL") );
 }
@@ -1123,15 +1123,15 @@ KShellProcess::~KShellProcess() {
 
 TQString KShellProcess::quote(const TQString &arg)
 {
-    return KProcess::quote(arg);
+    return TDEProcess::quote(arg);
 }
 
 bool KShellProcess::start(RunMode runmode, Communication comm)
 {
-  return KProcess::start(runmode, comm);
+  return TDEProcess::start(runmode, comm);
 }
 
 void KShellProcess::virtual_hook( int id, void* data )
-{ KProcess::virtual_hook( id, data ); }
+{ TDEProcess::virtual_hook( id, data ); }
 
 #include "kprocess.moc"
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index 7e9941717..ae4a25af6 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -30,7 +30,7 @@
 #include "tdelibs_export.h"
 
 class TQSocketNotifier;
-class KProcessPrivate;
+class TDEProcessPrivate;
 
 #ifdef Q_OS_UNIX
 #include <kpty.h>
@@ -60,15 +60,15 @@ class KPty;
  * @li  NotifyOnExit -- The child process is invoked and both the
  * child and the parent process run concurrently.
  *
- * When the child process exits, the KProcess instance
+ * When the child process exits, the TDEProcess instance
  * corresponding to it emits the Qt signal processExited().
  * Since this signal is @em not emitted from within a UN*X
  * signal handler, arbitrary function calls can be made.
  *
- * Be aware: When the KProcess object gets destructed, the child
+ * Be aware: When the TDEProcess object gets destructed, the child
  * process will be killed if it is still running!
  * This means in particular, that it usually makes no sense to use
- * a KProcess on the stack with NotifyOnExit.
+ * a TDEProcess on the stack with NotifyOnExit.
  *
  * @li  OwnGroup -- like NotifyOnExit, but the child process is started
  * in an own process group (and an own session, FWIW). The behavior of
@@ -84,7 +84,7 @@ class KPty;
  * In this mode the parent can read the child's output, but can't send it any
  * input.
  *
- * KProcess also provides several functions for determining the exit status
+ * TDEProcess also provides several functions for determining the exit status
  * and the pid of the child process it represents.
  *
  * Furthermore it is possible to supply command-line arguments to the process
@@ -92,12 +92,12 @@ class KPty;
  *
  * A small usage example:
  * \code
- *   KProcess *proc = new KProcess;
+ *   TDEProcess *proc = new TDEProcess;
  *
  *   *proc << "my_executable";
  *   *proc << "These" << "are" << "the" << "command" << "line" << "args";
- *   TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- *                         pointer_to_my_object, TQT_SLOT(my_objects_slot(KProcess *)));
+ *   TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ *                         pointer_to_my_object, TQT_SLOT(my_objects_slot(TDEProcess *)));
  *   proc->start();
  * \endcode
  *
@@ -107,7 +107,7 @@ class KPty;
  *
  * <b>Communication with the child process:</b>\n
  *
- * KProcess supports communication with the child process through
+ * TDEProcess supports communication with the child process through
  * stdin/stdout/stderr.
  *
  * The following functions are provided for getting data from the child
@@ -127,7 +127,7 @@ class KPty;
  * @author Christian Czezatke e9025461@student.tuwien.ac.at
  *
  **/
-class TDECORE_EXPORT KProcess : public TQObject
+class TDECORE_EXPORT TDEProcess : public TQObject
 {
   Q_OBJECT
 
@@ -191,12 +191,12 @@ public:
    * Constructor
    * @since 3.2
    */
-  KProcess( TQObject* parent, const char *name = 0 );
+  TDEProcess( TQObject* parent, const char *name = 0 );
 
   /**
    * Constructor
    */ // KDE4 merge with the above
-  KProcess();
+  TDEProcess();
 
   /**
    *Destructor:
@@ -206,13 +206,13 @@ public:
    *  only if the run mode is not of type @p DontCare.
    *  Processes started as @p DontCare keep running anyway.
   */
-  virtual ~KProcess();
+  virtual ~TDEProcess();
 
   /**
      @deprecated
      Use operator<<() instead.
 
-	 Sets the executable to be started with this KProcess object.
+	 Sets the executable to be started with this TDEProcess object.
 	 Returns false if the process is currently running (in that
 	 case the executable remains unchanged).
 
@@ -227,33 +227,33 @@ public:
    *
    * For example, doing an "ls -l /usr/local/bin" can be achieved by:
    *  \code
-   *  KProcess p;
+   *  TDEProcess p;
    *  ...
    *  p << "ls" << "-l" << "/usr/local/bin"
    *  \endcode
    *
    * @param arg the argument to add
-   * @return a reference to this KProcess
+   * @return a reference to this TDEProcess
    **/
-  KProcess &operator<<(const TQString& arg);
+  TDEProcess &operator<<(const TQString& arg);
   /**
    * Similar to previous method, takes a char *, supposed to be in locale 8 bit already.
    */
-  KProcess &operator<<(const char * arg);
+  TDEProcess &operator<<(const char * arg);
   /**
    * Similar to previous method, takes a TQCString, supposed to be in locale 8 bit already.
    * @param arg the argument to add
-   * @return a reference to this KProcess
+   * @return a reference to this TDEProcess
    */
-  KProcess &operator<<(const TQCString & arg);
+  TDEProcess &operator<<(const TQCString & arg);
 
   /**
    * Sets the executable and the command line argument list for this process,
    * in a single method call, or add a list of arguments.
    * @param args the arguments to add
-   * @return a reference to this KProcess
+   * @return a reference to this TDEProcess
    **/
-  KProcess &operator<<(const TQStringList& args);
+  TDEProcess &operator<<(const TQStringList& args);
 
   /**
    * Clear a command line argument list that has been set by using
@@ -265,7 +265,7 @@ public:
    *  Starts the process.
    *  For a detailed description of the
    *  various run modes and communication semantics, have a look at the
-   *  general description of the KProcess class. Note that if you use
+   *  general description of the TDEProcess class. Note that if you use
    * setUsePty( Stdout | Stderr, \<bool\> ), you cannot use Stdout | Stderr
    *  here - instead, use Stdout only to receive the mixed output.
    *
@@ -308,10 +308,10 @@ public:
    *
    * If it is called after
    * the process has exited, it returns the process id of the last
-   *  child process that was created by this instance of KProcess.
+   *  child process that was created by this instance of TDEProcess.
    *
    *  Calling it before any child process has been started by this
-   *  KProcess instance causes pid() to return 0.
+   *  TDEProcess instance causes pid() to return 0.
    * @return the pid of the process or 0 if no process has been started yet.
    **/
   pid_t pid() const;
@@ -535,9 +535,9 @@ public:
   static TQString quote(const TQString &arg);
 
   /**
-   * Detaches KProcess from child process. All communication is closed.
+   * Detaches TDEProcess from child process. All communication is closed.
    * No exit notification is emitted any more for the child process.
-   * Deleting the KProcess will no longer kill the child process.
+   * Deleting the TDEProcess will no longer kill the child process.
    * Note that the current process remains the parent process of the
    * child process.
    */
@@ -588,7 +588,7 @@ signals:
    * start() ) or the Block mode.
    * @param proc a pointer to the process that has exited
    **/
-  void processExited(KProcess *proc);
+  void processExited(TDEProcess *proc);
 
 
   /**
@@ -609,7 +609,7 @@ signals:
    *     TQString myBuf = TQString::fromLatin1(buffer, buflen);
    * \endcode
    **/
-  void receivedStdout(KProcess *proc, char *buffer, int buflen);
+  void receivedStdout(TDEProcess *proc, char *buffer, int buflen);
 
   /**
    * Emitted when output from the child process has
@@ -646,7 +646,7 @@ signals:
    * @param buffer The data received.
    * @param buflen The number of bytes that are available.
    **/
-  void receivedStderr(KProcess *proc, char *buffer, int buflen);
+  void receivedStderr(TDEProcess *proc, char *buffer, int buflen);
 
   /**
    * Emitted after all the data that has been
@@ -654,7 +654,7 @@ signals:
    * written to the child process.
    * @param proc a pointer to the process
    **/
-  void wroteStdin(KProcess *proc);
+  void wroteStdin(TDEProcess *proc);
 
 
 protected slots:
@@ -703,7 +703,7 @@ protected:
    * true if the process is currently running. You should not
    * modify this data member directly from derived classes. Please use
    * isRunning() for reading the value of this data member since it
-   * will probably be made private in later versions of KProcess.
+   * will probably be made private in later versions of TDEProcess.
    */
   bool runs;
 
@@ -712,7 +712,7 @@ protected:
    * You should not modify this data member in derived classes.
    * Please use pid() instead of directly accessing this
    * member since it will probably be made private in
-   * later versions of KProcess.
+   * later versions of TDEProcess.
    */
   pid_t pid_;
 
@@ -721,7 +721,7 @@ protected:
    * modify the value of this data member from derived classes. You should
    * rather use exitStatus() than accessing this data member directly
    * since it will probably be made private in further versions of
-   * KProcess.
+   * TDEProcess.
    */
   int status;
 
@@ -736,7 +736,7 @@ protected:
   /**
    * This function is called from start() right before a fork() takes
    * place. According to the @p comm parameter this function has to initialize
-   * the in, out and err data members of KProcess.
+   * the in, out and err data members of TDEProcess.
    *
    * This function should return 1 if setting the needed communication channels
    * was successful.
@@ -754,7 +754,7 @@ protected:
    *
    * Furthermore, it must also create the TQSocketNotifiers innot,
    * outnot and errnot and connect their Qt signals to the respective
-   * KProcess slots.
+   * TDEProcess slots.
    *
    * For a more detailed explanation, it is best to have a look at the default
    * implementation in kprocess.cpp.
@@ -788,12 +788,12 @@ protected:
    *  before closing them.
    * @li if pid() returns non-zero and runs is true, the communication
    *  links should be monitored for data until the file handle returned by
-   *  KProcessController::theKProcessController->notifierFd() becomes ready
+   *  TDEProcessController::theTDEProcessController->notifierFd() becomes ready
    *  for reading - when it triggers, runs should be reset to false, and
    *  the function should be immediately left without closing anything.
    *
    * The previous semantics of this function are forward-compatible, but should
-   * be avoided, as they are prone to race conditions and can cause KProcess
+   * be avoided, as they are prone to race conditions and can cause TDEProcess
    * (and thus the whole program) to lock up under certain circumstances. At the
    * end the function closes the communication links in any case. Additionally
    * @li if runs is true, the communication links are monitored for data
@@ -879,15 +879,15 @@ protected:
   int input_total;
 
   /**
-   * KProcessController is a friend of KProcess because it has to have
+   * TDEProcessController is a friend of TDEProcess because it has to have
    * access to various data members.
    */
-  friend class KProcessController;
+  friend class TDEProcessController;
 
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KProcessPrivate *d;
+  TDEProcessPrivate *d;
 };
 
 class KShellProcessPrivate;
@@ -895,13 +895,13 @@ class KShellProcessPrivate;
 /**
 * @obsolete
 *
-* Use KProcess and KProcess::setUseShell(true) instead.
+* Use TDEProcess and TDEProcess::setUseShell(true) instead.
 *
-*   @short A class derived from KProcess to start child
+*   @short A class derived from TDEProcess to start child
 *   	processes through a shell.
 *   @author Christian Czezatke <e9025461@student.tuwien.ac.at>
 */
-class TDECORE_EXPORT KShellProcess: public KProcess
+class TDECORE_EXPORT KShellProcess: public TDEProcess
 {
   Q_OBJECT
 
diff --git a/tdecore/kprocio.cpp b/tdecore/kprocio.cpp
index 9159edab5..7157662df 100644
--- a/tdecore/kprocio.cpp
+++ b/tdecore/kprocio.cpp
@@ -31,8 +31,8 @@
 
 class KProcIOPrivate {
 public:
-  KProcIOPrivate() : comm(KProcess::All) {}
-  KProcess::Communication comm;
+  KProcIOPrivate() : comm(TDEProcess::All) {}
+  TDEProcess::Communication comm;
 };
 
 KProcIO::KProcIO ( TQTextCodec *_codec)
@@ -67,14 +67,14 @@ KProcIO::resetAll ()
   rbi=0;
   readsignalon=writeready=true;
 
-  disconnect (this, TQT_SIGNAL (receivedStdout (KProcess *, char *, int)),
-	   this, TQT_SLOT (received (KProcess *, char *, int)));
+  disconnect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
 
-  disconnect (this, TQT_SIGNAL (receivedStderr (KProcess *, char *, int)),
-	   this, TQT_SLOT (received (KProcess *, char *, int)));
+  disconnect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
 
-  disconnect (this, TQT_SIGNAL (wroteStdin(KProcess *)),
-	   this, TQT_SLOT (sent (KProcess *)));
+  disconnect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)),
+	   this, TQT_SLOT (sent (TDEProcess *)));
 
   outbuffer.clear();
 
@@ -87,19 +87,19 @@ void KProcIO::setComm (Communication comm)
 
 bool KProcIO::start (RunMode runmode, bool includeStderr)
 {
-  connect (this, TQT_SIGNAL (receivedStdout (KProcess *, char *, int)),
-	   this, TQT_SLOT (received (KProcess *, char *, int)));
+  connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
   
   if (includeStderr)
   {
-     connect (this, TQT_SIGNAL (receivedStderr (KProcess *, char *, int)),
-              this, TQT_SLOT (received (KProcess *, char *, int)));
+     connect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+              this, TQT_SLOT (received (TDEProcess *, char *, int)));
   }
 
-  connect (this, TQT_SIGNAL (wroteStdin(KProcess *)),
-	   this, TQT_SLOT (sent (KProcess *)));
+  connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)),
+	   this, TQT_SLOT (sent (TDEProcess *)));
            
-  return KProcess::start (runmode, d->comm);
+  return TDEProcess::start (runmode, d->comm);
 }
 
 bool KProcIO::writeStdin (const TQString &line, bool appendnewline)
@@ -131,7 +131,7 @@ bool KProcIO::writeStdin (const TQCString &line, bool appendnewline)
   if (writeready)
   {
      writeready=false;
-     return KProcess::writeStdin( b->data(), b->size() );
+     return TDEProcess::writeStdin( b->data(), b->size() );
   }
   return true;
 }
@@ -146,7 +146,7 @@ bool KProcIO::writeStdin(const TQByteArray &data)
   if (writeready)
   {
      writeready=false;
-     return KProcess::writeStdin( b->data(), b->size() );
+     return TDEProcess::writeStdin( b->data(), b->size() );
   }
   return true;
 }
@@ -163,7 +163,7 @@ void KProcIO::closeWhenDone()
   return;
 }
 
-void KProcIO::sent(KProcess *)
+void KProcIO::sent(TDEProcess *)
 {
   outbuffer.removeFirst();
 
@@ -180,13 +180,13 @@ void KProcIO::sent(KProcess *)
      }
      else
      {
-        KProcess::writeStdin(b->data(), b->size());
+        TDEProcess::writeStdin(b->data(), b->size());
      }
   }
 
 }
 
-void KProcIO::received (KProcess *, char *buffer, int buflen)
+void KProcIO::received (TDEProcess *, char *buffer, int buflen)
 {
   recvbuffer += TQCString(buffer, buflen+1);
 
@@ -270,7 +270,7 @@ int KProcIO::readln (TQString &line, bool autoAck, bool *partial)
 }
 
 void KProcIO::virtual_hook( int id, void* data )
-{ KProcess::virtual_hook( id, data ); }
+{ TDEProcess::virtual_hook( id, data ); }
 
 #include "kprocio.moc"
 
diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h
index 3dceb9c1b..4e42ee533 100644
--- a/tdecore/kprocio.h
+++ b/tdecore/kprocio.h
@@ -30,7 +30,7 @@ class TQTextCodec;
  * KProcIO
  *
  * This class provides a slightly simpler interface to the communication
- *  functions provided by KProcess.  The simplifications are:
+ *  functions provided by TDEProcess.  The simplifications are:
  *    @li The buffer for a write is copied to an internal KProcIO
  *        buffer and maintained/freed appropriately.  There is no need
  *        to be concerned with wroteStdin() signals _at_all_.
@@ -40,14 +40,14 @@ class TQTextCodec;
  * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs().
  *
  * Aside from these, and the fact that start() takes different
- * parameters, use this class just like KProcess.
+ * parameters, use this class just like TDEProcess.
  *
  * @author David Sweet
- * @short A slightly simpler interface to KProcess
+ * @short A slightly simpler interface to TDEProcess
  **/
 
 
-class TDECORE_EXPORT KProcIO : public KProcess
+class TDECORE_EXPORT KProcIO : public TDEProcess
 {
   Q_OBJECT
 
@@ -63,10 +63,10 @@ public:
   ~KProcIO();
 
   /**
-   * Sets the communication mode to be passed to KProcess::start()
-   * by start(). The default communication mode is KProcess::All.
+   * Sets the communication mode to be passed to TDEProcess::start()
+   * by start(). The default communication mode is TDEProcess::All.
    * You probably want to use this function in conjunction with
-   * KProcess::setUsePty().
+   * TDEProcess::setUsePty().
    * @param comm the communication mode
    */
   void setComm (Communication comm);
@@ -80,7 +80,7 @@ public:
    *
    *  @param runmode For a detailed description of the
    *  various run modes, have a look at the
-   *  general description of the KProcess class.
+   *  general description of the TDEProcess class.
    *  @param includeStderr If true, data from both stdout and stderr is
    *  listened to. If false, only stdout is listened to.
    *  @return true on success, false on error.
@@ -204,8 +204,8 @@ protected:
   void controlledEmission ();
 
 protected slots:
-  void received (KProcess *proc, char *buffer, int buflen);
-  void sent (KProcess *);
+  void received (TDEProcess *proc, char *buffer, int buflen);
+  void sent (TDEProcess *);
 
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 943ad1b9a..86a9a6fcc 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -17,8 +17,8 @@
 */
 
 #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
-#undef KIO_EXPORT
-#define KIO_EXPORT KDE_EXPORT
+#undef TDEIO_EXPORT
+#define TDEIO_EXPORT KDE_EXPORT
 #endif
 
 #define KPROTOCOLINFO_TDECORE
@@ -26,11 +26,11 @@
 #include "kprotocolinfofactory.h"
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kapplication.h>
+#include <tdeglobal.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 
 class KProtocolInfo::KProtocolInfoPrivate
@@ -150,7 +150,7 @@ void
 KProtocolInfo::load( TQDataStream& _str)
 {
    // You may add new fields at the end. Make sure to update the version
-   // number in ksycoca.h
+   // number in tdesycoca.h
    TQ_INT32 i_inputType, i_outputType;
    TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
           i_supportsListing, i_supportsReading,
@@ -205,7 +205,7 @@ KProtocolInfo::save( TQDataStream& _str)
    KSycocaEntry::save( _str );
 
    // You may add new fields at the end. Make sure to update the version
-   // number in ksycoca.h
+   // number in tdesycoca.h
    TQ_INT32 i_inputType, i_outputType;
    TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
           i_supportsListing, i_supportsReading,
@@ -403,7 +403,7 @@ TQString KProtocolInfo::config( const TQString& _protocol )
   if ( !prot )
     return TQString::null;
 
-  return TQString("kio_%1rc").arg(prot->m_config);
+  return TQString("tdeio_%1rc").arg(prot->m_config);
 }
 
 int KProtocolInfo::maxSlaves( const TQString& _protocol )
@@ -555,7 +555,7 @@ TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& fiel
   return s;
 }
 
-// KURL based static functions are implemented in ../kio/kio/kprotocolinfo.cpp
+// KURL based static functions are implemented in ../tdeio/tdeio/kprotocolinfo.cpp
 
 void KProtocolInfo::virtual_hook( int id, void* data )
 { KSycocaEntry::virtual_hook( id, data ); }
diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp
index e47cbb881..115a44f25 100644
--- a/tdecore/kprotocolinfofactory.cpp
+++ b/tdecore/kprotocolinfofactory.cpp
@@ -18,11 +18,11 @@
 */
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kapplication.h>
+#include <tdeglobal.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <ksycoca.h>
-#include <ksycocadict.h>
+#include <tdesycoca.h>
+#include <tdesycocadict.h>
 
 #include "kprotocolinfofactory.h"
 
diff --git a/tdecore/kprotocolinfofactory.h b/tdecore/kprotocolinfofactory.h
index 6a10ac1e3..89ba330a9 100644
--- a/tdecore/kprotocolinfofactory.h
+++ b/tdecore/kprotocolinfofactory.h
@@ -20,13 +20,13 @@
 #ifndef __kprotocolinfofactory_h__
 #define __kprotocolinfofactory_h__
 
-#include "../kio/kio/kprotocolinfo.h"
+#include "../tdeio/tdeio/kprotocolinfo.h"
 
 #include <tqmap.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kurl.h>
-#include <ksycocafactory.h>
+#include <tdesycocafactory.h>
 
 class KProtocolInfoPrivate;
 
diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp
index f6fc9d5cd..e13540e19 100644
--- a/tdecore/kpty.cpp
+++ b/tdecore/kpty.cpp
@@ -144,7 +144,7 @@ extern "C" {
 ///////////////////////
 
 #ifdef HAVE_UTEMPTER
-class KProcess_Utmp : public KProcess
+class TDEProcess_Utmp : public TDEProcess
 {
 public:
    int commSetupDoneC()
@@ -440,12 +440,12 @@ void KPty::setCTty()
 void KPty::login(const char *user, const char *remotehost)
 {
 #ifdef HAVE_UTEMPTER
-    KProcess_Utmp utmp;
+    TDEProcess_Utmp utmp;
     utmp.cmdFd = d->masterFd;
     utmp << "/usr/lib/utempter/utempter" << "add";
     if (remotehost)
       utmp << remotehost;
-    utmp.start(KProcess::Block);
+    utmp.start(TDEProcess::Block);
     Q_UNUSED(user);
     Q_UNUSED(remotehost);
 #elif defined(USE_LOGIN)
@@ -485,10 +485,10 @@ void KPty::login(const char *user, const char *remotehost)
 void KPty::logout()
 {
 #ifdef HAVE_UTEMPTER
-    KProcess_Utmp utmp;
+    TDEProcess_Utmp utmp;
     utmp.cmdFd = d->masterFd;
     utmp << "/usr/lib/utempter/utempter" << "del";
-    utmp.start(KProcess::Block);
+    utmp.start(TDEProcess::Block);
 #elif defined(USE_LOGIN)
     const char *str_ptr = d->ttyName.data();
     if (!memcmp(str_ptr, "/dev/", 5))
@@ -572,8 +572,8 @@ int KPty::slaveFd() const
 // private
 bool KPty::chownpty(bool grant)
 {
-  KProcess proc;
+  TDEProcess proc;
   proc << locate("exe", BASE_CHOWN) << (grant?"--grant":"--revoke") << TQString::number(d->masterFd);
-  return proc.start(KProcess::Block) && proc.normalExit() && !proc.exitStatus();
+  return proc.start(TDEProcess::Block) && proc.normalExit() && !proc.exitStatus();
 }
 
diff --git a/tdecore/krandomsequence.cpp b/tdecore/krandomsequence.cpp
index 04240733f..8896db70b 100644
--- a/tdecore/krandomsequence.cpp
+++ b/tdecore/krandomsequence.cpp
@@ -21,7 +21,7 @@
 #include <tqptrlist.h>
 
 #include "krandomsequence.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 const int    KRandomSequence::m_nShuffleTableSize = 32;
 
@@ -78,7 +78,7 @@ void KRandomSequence::setSeed( long lngSeed1 )
   }
   else if (lngSeed1 == 0)
   {
-    m_lngSeed1 = -((KApplication::random() & ~1)+1);
+    m_lngSeed1 = -((TDEApplication::random() & ~1)+1);
   }
   else
   {
diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h
index 8fa6e3c29..256d03f17 100644
--- a/tdecore/krandomsequence.h
+++ b/tdecore/krandomsequence.h
@@ -50,7 +50,7 @@ public:
    * 
    * @param lngSeed Seed to initialize the sequence with.
    * If lngSeed is 0, the sequence is initialized with a value from
-   * KApplication::random().
+   * TDEApplication::random().
    */
   KRandomSequence( long lngSeed = 0 );
 
@@ -73,7 +73,7 @@ public:
    * Restart the sequence based on lngSeed.
    * @param lngSeed Seed to initialize the sequence with.
    * If lngSeed is 0, the sequence is initialized with a value from
-   * KApplication::random().
+   * TDEApplication::random().
    */
   void setSeed( long lngSeed = 0 );
 
diff --git a/tdecore/krootprop.cpp b/tdecore/krootprop.cpp
index cb0200c99..c717a1823 100644
--- a/tdecore/krootprop.cpp
+++ b/tdecore/krootprop.cpp
@@ -23,10 +23,10 @@
 #ifdef Q_WS_X11 // not needed anyway :-)
 
 #include "krootprop.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 #include "kcharsets.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <tqtextstream.h>
 
 #include <X11/Xlib.h>
diff --git a/tdecore/krootprop.h b/tdecore/krootprop.h
index 002790ca4..f1a72d265 100644
--- a/tdecore/krootprop.h
+++ b/tdecore/krootprop.h
@@ -33,14 +33,14 @@ class KRootPropPrivate;
 /**
 * Access KDE desktop resources stored on the root window.
 *
-* A companion to the KConfig class.
+* A companion to the TDEConfig class.
 *
 * The KRootProp class is used for reading and writing configuration entries
 * to properties on the root window.
 *
 * All configuration entries are of the form "key=value".
 *
-* @see  KConfig::KConfig
+* @see  TDEConfig::TDEConfig
 * @author Mark Donohoe (donohe@kde.org)
 */
 class TDECORE_EXPORT KRootProp
diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp
index cddf44bc5..4ad96c0f2 100644
--- a/tdecore/ksavefile.cpp
+++ b/tdecore/ksavefile.cpp
@@ -36,7 +36,7 @@
 #include <tqdir.h>
 
 #include <kde_file.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "ksavefile.h"
 #include "kstandarddirs.h"
 
@@ -44,7 +44,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode)
  : mTempFile(true)
 {
    // follow symbolic link, if any
-   TQString real_filename = KStandardDirs::realFilePath(filename);
+   TQString real_filename = TDEStandardDirs::realFilePath(filename);
 
    // we only check here if the directory can be written to
    // the actual filename isn't written to, but replaced later
diff --git a/tdecore/ksavefile.h b/tdecore/ksavefile.h
index e035115a9..282652dea 100644
--- a/tdecore/ksavefile.h
+++ b/tdecore/ksavefile.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <stdio.h>
 #include <errno.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 class KSaveFilePrivate;
 
diff --git a/tdecore/ksharedptr.h b/tdecore/ksharedptr.h
index 16ece722c..60a06a55f 100644
--- a/tdecore/ksharedptr.h
+++ b/tdecore/ksharedptr.h
@@ -15,132 +15,132 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KSharedPTR_H
-#define KSharedPTR_H
+#ifndef TDESharedPTR_H
+#define TDESharedPTR_H
 
 #include "tdelibs_export.h"
 
 /**
  * Reference counting for shared objects.  If you derive your object
  * from this class, then you may use it in conjunction with
- * KSharedPtr to control the lifetime of your object.
+ * TDESharedPtr to control the lifetime of your object.
  *
- * Specifically, all classes that derive from KShared have an internal
+ * Specifically, all classes that derive from TDEShared have an internal
  * counter keeping track of how many other objects have a reference to
- * their object.  If used with KSharedPtr, then your object will
+ * their object.  If used with TDESharedPtr, then your object will
  * not be deleted until all references to the object have been
  * released.
  *
  * You should probably not ever use any of the methods in this class
- * directly -- let the KSharedPtr take care of that.  Just derive
- * your class from KShared and forget about it.
+ * directly -- let the TDESharedPtr take care of that.  Just derive
+ * your class from TDEShared and forget about it.
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class TDECORE_EXPORT KShared {
+class TDECORE_EXPORT TDEShared {
 public:
    /**
     * Standard constructor.  This will initialize the reference count
     * on this object to 0.
     */
-   KShared() : count(0) { }
+   TDEShared() : count(0) { }
 
    /**
     * Copy constructor.  This will @em not actually copy the objects
     * but it will initialize the reference count on this object to 0.
     */
-   KShared( const KShared & ) : count(0) { }
+   TDEShared( const TDEShared & ) : count(0) { }
 
    /**
     * Overloaded assignment operator.
     */
-   KShared &operator=(const KShared & ) { return *this; }
+   TDEShared &operator=(const TDEShared & ) { return *this; }
 
    /**
     * Increases the reference count by one.
     */
-   void _KShared_ref() const { count++; }
+   void _TDEShared_ref() const { count++; }
 
    /**
     * Releases a reference (decreases the reference count by one).  If
     * the count goes to 0, this object will delete itself.
     */
-   void _KShared_unref() const { if (!--count) delete this; }
+   void _TDEShared_unref() const { if (!--count) delete this; }
 
    /**
     * Return the current number of references held.
     *
     * @return Number of references
     */
-   int _KShared_count() const { return count; }
+   int _TDEShared_count() const { return count; }
 
 protected:
-   virtual ~KShared() { }
+   virtual ~TDEShared() { }
 private:
    mutable int count;
 };
 
 /**
  * Can be used to control the lifetime of an object that has derived
- * KShared. As long a someone holds a KSharedPtr on some KShared
+ * TDEShared. As long a someone holds a TDESharedPtr on some TDEShared
  * object it won't become deleted but is deleted once its reference
  * count is 0.  This struct emulates C++ pointers virtually perfectly.
  * So just use it like a simple C++ pointer.
  *
- * KShared and KSharedPtr are preferred over QShared / QSharedPtr
+ * TDEShared and TDESharedPtr are preferred over QShared / QSharedPtr
  * since they are more safe.
  *
  * WARNING: Please note that this class template provides an implicit
  * conversion to T*. Do *not* change this pointer or the pointee (don't
- * call delete on it, for instance) behind KSharedPtr's back.
+ * call delete on it, for instance) behind TDESharedPtr's back.
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
 template< class T >
-class KSharedPtr
+class TDESharedPtr
 {
 public:
 /**
  * Creates a null pointer.
  */
-  KSharedPtr()
+  TDESharedPtr()
     : ptr(0) { }
   /**
    * Creates a new pointer.
    * @param t the pointer
    */
-  KSharedPtr( T* t )
-    : ptr(t) { if ( ptr ) ptr->_KShared_ref(); }
+  TDESharedPtr( T* t )
+    : ptr(t) { if ( ptr ) ptr->_TDEShared_ref(); }
 
   /**
    * Copies a pointer.
    * @param p the pointer to copy
    */
-  KSharedPtr( const KSharedPtr& p )
-    : ptr(p.ptr) { if ( ptr ) ptr->_KShared_ref(); }
+  TDESharedPtr( const TDESharedPtr& p )
+    : ptr(p.ptr) { if ( ptr ) ptr->_TDEShared_ref(); }
 
   /**
    * Unreferences the object that this pointer points to. If it was
    * the last reference, the object will be deleted.
    */
-  ~KSharedPtr() { if ( ptr ) ptr->_KShared_unref(); }
+  ~TDESharedPtr() { if ( ptr ) ptr->_TDEShared_unref(); }
 
-  KSharedPtr<T>& operator= ( const KSharedPtr<T>& p ) {
+  TDESharedPtr<T>& operator= ( const TDESharedPtr<T>& p ) {
     if ( ptr == p.ptr ) return *this;
-    if ( ptr ) ptr->_KShared_unref();
+    if ( ptr ) ptr->_TDEShared_unref();
     ptr = p.ptr;
-    if ( ptr ) ptr->_KShared_ref();
+    if ( ptr ) ptr->_TDEShared_ref();
     return *this;
   }
-  KSharedPtr<T>& operator= ( T* p ) {
+  TDESharedPtr<T>& operator= ( T* p ) {
     if ( ptr == p ) return *this;
-    if ( ptr ) ptr->_KShared_unref();
+    if ( ptr ) ptr->_TDEShared_unref();
     ptr = p;
-    if ( ptr ) ptr->_KShared_ref();
+    if ( ptr ) ptr->_TDEShared_ref();
     return *this;
   }
-  bool operator== ( const KSharedPtr<T>& p ) const { return ( ptr == p.ptr ); }
-  bool operator!= ( const KSharedPtr<T>& p ) const { return ( ptr != p.ptr ); }
+  bool operator== ( const TDESharedPtr<T>& p ) const { return ( ptr == p.ptr ); }
+  bool operator!= ( const TDESharedPtr<T>& p ) const { return ( ptr != p.ptr ); }
   bool operator== ( const T* p ) const { return ( ptr == p ); }
   bool operator!= ( const T* p ) const { return ( ptr != p ); }
   bool operator!() const { return ( ptr == 0 ); }
@@ -167,7 +167,7 @@ public:
    * Returns the number of references.
    * @return the number of references
    */
-  int count() const { return ptr->_KShared_count(); } // for debugging purposes
+  int count() const { return ptr->_TDEShared_count(); } // for debugging purposes
 private:
   T* ptr;
 };
diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp
index 6b4e13a14..dc359f17e 100644
--- a/tdecore/ksimpleconfig.cpp
+++ b/tdecore/ksimpleconfig.cpp
@@ -31,19 +31,19 @@
 #include <tqfileinfo.h>
 #include <tqdir.h>
 
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
-#include "kconfigbackend.h"
+#include "tdeconfigbackend.h"
 
 #include "ksimpleconfig.h"
 
 KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly)
-  : KConfig(TQString::fromLatin1(""), bReadOnly, false)
+  : TDEConfig(TQString::fromLatin1(""), bReadOnly, false)
 {
-  // the difference between KConfig and KSimpleConfig is just that
+  // the difference between TDEConfig and KSimpleConfig is just that
   // for KSimpleConfig an absolute filename is guaranteed
   if (!fileName.isNull() && TQDir::isRelativePath(fileName)) {
-     backEnd->changeFileName( KGlobal::dirs()->
+     backEnd->changeFileName( TDEGlobal::dirs()->
 	saveLocation("config", TQString::null, !bReadOnly)+fileName, "config", false);
   } else {
      backEnd->changeFileName(fileName, "config", false);
@@ -52,16 +52,16 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly)
   reparseConfiguration();
 }
 
-KSimpleConfig::KSimpleConfig(KConfigBackEnd *backEnd, bool bReadOnly)
-  : KConfig(backEnd, bReadOnly)
+KSimpleConfig::KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly)
+  : TDEConfig(backEnd, bReadOnly)
 {}
 
 KSimpleConfig::~KSimpleConfig()
 {
   // we need to call the KSimpleConfig version of sync.  Relying on the
-  // regular KConfig sync is bad, because the KSimpleConfig sync has
+  // regular TDEConfig sync is bad, because the KSimpleConfig sync has
   // different behavior.  Syncing here will insure that the sync() call
-  // in the KConfig destructor doesn't actually do anything.
+  // in the TDEConfig destructor doesn't actually do anything.
   sync();
 }
 
@@ -76,6 +76,6 @@ void KSimpleConfig::sync()
 }
 
 void KSimpleConfig::virtual_hook( int id, void* data )
-{ KConfig::virtual_hook( id, data ); }
+{ TDEConfig::virtual_hook( id, data ); }
 
 #include "ksimpleconfig.moc"
diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h
index c7efeecfa..541117500 100644
--- a/tdecore/ksimpleconfig.h
+++ b/tdecore/ksimpleconfig.h
@@ -21,24 +21,24 @@
 #ifndef _KSIMPLECONFIG_H
 #define _KSIMPLECONFIG_H
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 
 class KSimpleConfigPrivate;
 
 /**
  * KDE Configuration entries
  *
- * This is a trivial extension of KConfig for applications that need
+ * This is a trivial extension of TDEConfig for applications that need
  * only one configuration file and no default system.
- * A difference with KConfig is that when the data in memory is written back
+ * A difference with TDEConfig is that when the data in memory is written back
  * it is not merged with what is on disk.
  * Whatever is in memory simply replaces what is on disk entirely.
  *
  * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org>
- * @see KConfigBase KConfig
+ * @see TDEConfigBase TDEConfig
  * @short KDE Configuration Management class with deletion ability
  */
-class TDECORE_EXPORT KSimpleConfig : public KConfig
+class TDECORE_EXPORT KSimpleConfig : public TDEConfig
 {
   Q_OBJECT
 
@@ -55,7 +55,7 @@ public:
    */
   KSimpleConfig( const TQString &fileName, bool bReadOnly = false);
 
-  KSimpleConfig(KConfigBackEnd *backEnd, bool bReadOnly = false);
+  KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false);
 
   /**
    * Destructor.
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index cad0345ab..835566268 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -43,10 +43,10 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
 
@@ -184,7 +184,7 @@ void KSimpleDirWatchPrivate::dnotify_sigio_handler(int sig, siginfo_t *si, void
  * are supported:
  * - Polling: All files to be watched are polled regularly
  *   using stat (more precise: TQFileInfo.lastModified()).
- *   The polling frequency is determined from global kconfig
+ *   The polling frequency is determined from global tdeconfig
  *   settings, defaulting to 500 ms for local directories
  *   and 5000 ms for remote mounts
  * - FAM (File Alternation Monitor): first used on IRIX, SGI
@@ -214,7 +214,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
   delayRemove = false;
   m_ref = 0;
 
-  KConfigGroup config(KGlobal::config(), TQCString("DirWatch"));
+  TDEConfigGroup config(TDEGlobal::config(), TQCString("DirWatch"));
   m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000);
   m_PollInterval = config.readNumEntry("PollInterval", 500);
 
@@ -1377,7 +1377,7 @@ bool KSimpleDirWatchPrivate::isNoisyFile( const char * filename )
     if (strncmp(filename, ".X.err", 6) == 0) return true;
     if (strncmp(filename, ".xsession-errors", 16) == 0) return true;
     // fontconfig updates the cache on every KDE app start
-    // (inclusive kio_thumbnail slaves)
+    // (inclusive tdeio_thumbnail slaves)
     if (strncmp(filename, ".fonts.cache", 12) == 0) return true;
   }
 
diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h
index 36ceafba6..4dcae30b7 100644
--- a/tdecore/ksimpledirwatch.h
+++ b/tdecore/ksimpledirwatch.h
@@ -63,7 +63,7 @@ class KSimpleDirWatchPrivate;
   * @short Class for watching directory and file changes.
   * @author Sven Radej <sven@lisa.exp.univie.ac.at>
   */
-class KIO_EXPORT KSimpleDirWatch : public TQObject
+class TDEIO_EXPORT KSimpleDirWatch : public TQObject
 {
   Q_OBJECT
     
diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp
index 10c694512..96526463a 100644
--- a/tdecore/ksock.cpp
+++ b/tdecore/ksock.cpp
@@ -89,21 +89,21 @@ extern "C" {
 #include "tqwindowdefs.h"
 #endif 
 
-class KSocketPrivate
+class TDESocketPrivate
 {
 public:
   TQSocketNotifier *readNotifier;
   TQSocketNotifier *writeNotifier;
 
-  KSocketPrivate() :
+  TDESocketPrivate() :
     readNotifier(0), writeNotifier(0)
   { }
 };
 
 // I moved this into here so we could accurately detect the domain, for
 // posterity.  Really.
-KSocket::KSocket( int _sock)
-  : sock(_sock), d(new KSocketPrivate)
+TDESocket::TDESocket( int _sock)
+  : sock(_sock), d(new TDESocketPrivate)
 {
   struct sockaddr_in sin;
   ksocklen_t len = sizeof(sin);
@@ -116,19 +116,19 @@ KSocket::KSocket( int _sock)
   KSocks::self()->getsockname(_sock, (struct sockaddr *)&sin, &len);
 }
 
-KSocket::KSocket( const char *_host, unsigned short int _port, int _timeout ) :
-  sock( -1 ), d(new KSocketPrivate)
+TDESocket::TDESocket( const char *_host, unsigned short int _port, int _timeout ) :
+  sock( -1 ), d(new TDESocketPrivate)
 {
     connect( _host, _port, _timeout );
 }
 
-KSocket::KSocket( const char *_path ) :
-  sock( -1 ), d(new KSocketPrivate)
+TDESocket::TDESocket( const char *_path ) :
+  sock( -1 ), d(new TDESocketPrivate)
 {
   connect( _path );
 }
 
-void KSocket::enableRead( bool _state )
+void TDESocket::enableRead( bool _state )
 {
   if ( _state )
     {
@@ -144,7 +144,7 @@ void KSocket::enableRead( bool _state )
 	d->readNotifier->setEnabled( false );
 }
 
-void KSocket::enableWrite( bool _state )
+void TDESocket::enableWrite( bool _state )
 {
   if ( _state )
     {
@@ -161,7 +161,7 @@ void KSocket::enableWrite( bool _state )
 	d->writeNotifier->setEnabled( false );
 }
 
-void KSocket::slotRead( int )
+void TDESocket::slotRead( int )
 {
   char buffer[2];
 
@@ -172,7 +172,7 @@ void KSocket::slotRead( int )
 	emit readEvent( this );
 }
 
-void KSocket::slotWrite( int )
+void TDESocket::slotWrite( int )
 {
   emit writeEvent( this );
 }
@@ -180,7 +180,7 @@ void KSocket::slotWrite( int )
 /*
  * Connects the PF_UNIX domain socket to _path.
  */
-bool KSocket::connect( const char *_path )
+bool TDESocket::connect( const char *_path )
 {
   KExtendedSocket ks(TQString::null, _path, KExtendedSocket::unixSocket);
 
@@ -194,7 +194,7 @@ bool KSocket::connect( const char *_path )
 /*
  * Connects the socket to _host, _port.
  */
-bool KSocket::connect( const TQString& _host, unsigned short int _port, int _timeout )
+bool TDESocket::connect( const TQString& _host, unsigned short int _port, int _timeout )
 {
   KExtendedSocket ks(_host, _port, KExtendedSocket::inetSocket);
   ks.setTimeout(_timeout, 0);
@@ -208,10 +208,10 @@ bool KSocket::connect( const TQString& _host, unsigned short int _port, int _tim
 
 // only for doxygen - the define is always true as defined above
 #ifdef KSOCK_NO_BROKEN
-unsigned long KSocket::ipv4_addr()
+unsigned long TDESocket::ipv4_addr()
 {
   unsigned long retval = 0;
-  KSocketAddress *sa = KExtendedSocket::peerAddress(sock);
+  TDESocketAddress *sa = KExtendedSocket::peerAddress(sock);
   if (sa == NULL)
     return 0;
 
@@ -230,12 +230,12 @@ unsigned long KSocket::ipv4_addr()
   return retval;
 }
 
-bool KSocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain)
+bool TDESocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, unsigned short int port, int domain)
 {
   // This function is now IPv4 only
   // if you want something better, you should use KExtendedSocket::lookup yourself
 
-  kdWarning(170) << "deprecated KSocket::initSockaddr called" << endl;
+  kdWarning(170) << "deprecated TDESocket::initSockaddr called" << endl;
 
   if (domain != PF_INET)
     return false;
@@ -255,13 +255,13 @@ bool KSocket::initSockaddr (ksockaddr_in *server_name, const char *hostname, uns
     return false;
 
   memcpy(server_name, sin->addressV4(), sizeof(*server_name));
-  kdDebug(170) << "KSocket::initSockaddr: returning " << sin->pretty() << endl;
+  kdDebug(170) << "TDESocket::initSockaddr: returning " << sin->pretty() << endl;
   return true;
 }
 
 #endif
 
-KSocket::~KSocket()
+TDESocket::~TDESocket()
 {
   // Coolo says delete 0 is ok :) -thiago
   delete d->readNotifier;
@@ -274,7 +274,7 @@ KSocket::~KSocket()
   }
 }
 
-class KServerSocketPrivate
+class TDEServerSocketPrivate
 {
 public:
    bool bind;
@@ -284,25 +284,25 @@ public:
 };
 
 
-KServerSocket::KServerSocket( const char *_path, bool _bind ) :
+TDEServerSocket::TDEServerSocket( const char *_path, bool _bind ) :
   sock( -1 )
 {
-  d = new KServerSocketPrivate();
+  d = new TDEServerSocketPrivate();
   d->bind = _bind;
 
   init ( _path );
 }
 
-KServerSocket::KServerSocket( unsigned short int _port, bool _bind ) :
+TDEServerSocket::TDEServerSocket( unsigned short int _port, bool _bind ) :
   sock( -1 )
 {
-  d = new KServerSocketPrivate();
+  d = new TDEServerSocketPrivate();
   d->bind = _bind;
 
   init ( _port );
 }
 
-bool KServerSocket::init( const char *_path )
+bool TDEServerSocket::init( const char *_path )
 {
   unlink(_path );
   d->path = _path;
@@ -317,7 +317,7 @@ bool KServerSocket::init( const char *_path )
 }
 
 
-bool KServerSocket::init( unsigned short int _port )
+bool TDEServerSocket::init( unsigned short int _port )
 {
   d->port = _port;
   KExtendedSocket *ks;
@@ -330,7 +330,7 @@ bool KServerSocket::init( unsigned short int _port )
   return true;
 }
 
-bool KServerSocket::bindAndListen()
+bool TDEServerSocket::bindAndListen()
 {
   if (d == NULL || d->ks == NULL)
     return false;
@@ -354,11 +354,11 @@ bool KServerSocket::bindAndListen()
 }
 
 
-unsigned short int KServerSocket::port()
+unsigned short int TDEServerSocket::port()
 {
   if (d == NULL || d->ks == NULL || sock == -1)
     return 0;
-  const KSocketAddress *sa = d->ks->localAddress();
+  const TDESocketAddress *sa = d->ks->localAddress();
   if (sa == NULL)
     return 0;
 
@@ -378,11 +378,11 @@ unsigned short int KServerSocket::port()
   return 0;			// not a port we know
 }
 
-unsigned long KServerSocket::ipv4_addr()
+unsigned long TDEServerSocket::ipv4_addr()
 {
   if (d == NULL || d->ks == NULL || sock == -1)
     return 0;
-  const KSocketAddress *sa = d->ks->localAddress();
+  const TDESocketAddress *sa = d->ks->localAddress();
 
   const sockaddr_in *sin = (sockaddr_in*)sa->address();
 
@@ -401,7 +401,7 @@ unsigned long KServerSocket::ipv4_addr()
   return 0;			// this is dumb, isn't it?
 }
 
-void KServerSocket::slotAccept( int )
+void TDEServerSocket::slotAccept( int )
 {
   if (d == NULL || d->ks == NULL || sock == -1)
     return;			// nothing!
@@ -417,10 +417,10 @@ void KServerSocket::slotAccept( int )
   s->release();			// we're getting rid of the KExtendedSocket
   delete s;
 
-  emit accepted( new KSocket( new_sock ) );
+  emit accepted( new TDESocket( new_sock ) );
 }
 
-KServerSocket::~KServerSocket()
+TDEServerSocket::~TDEServerSocket()
 {
   if (d != NULL)
     {
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index d6e4515ea..cdf4ad1ac 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -65,8 +65,8 @@ typedef sockaddr_in ksockaddr_in;
 
 #define KSOCK_DEFAULT_DOMAIN PF_INET
 
-class KSocketPrivate;
-class KServerSocketPrivate;
+class TDESocketPrivate;
+class TDEServerSocketPrivate;
 
 /** @deprecated
  * You can connect this socket to any Internet address.
@@ -79,7 +79,7 @@ class KServerSocketPrivate;
  * Using socket() you get a file descriptor
  * which you can use with the usual UNIX function like write() or
  * read().
- * If you have already such a socket identifier you can construct a KSocket
+ * If you have already such a socket identifier you can construct a TDESocket
  * on this identifier.
  *
  * If socket() delivers a value of -1 or less, the connection
@@ -88,33 +88,33 @@ class KServerSocketPrivate;
  * @author Torben Weis <weis@uni-frankfurt.de>
  * @short A TCP/IP client socket.
  */
-class TDECORE_EXPORT KSocket : public TQObject
+class TDECORE_EXPORT TDESocket : public TQObject
 {
     Q_OBJECT
 public:
     /**
-     * Constructs a KSocket with the provided file descriptor.
+     * Constructs a TDESocket with the provided file descriptor.
      * @param _sock	The file descriptor to use.
      */
-    KSocket( int _sock ) KDE_DEPRECATED;
+    TDESocket( int _sock ) KDE_DEPRECATED;
     /**
      * Creates a socket and connects to a host.
      * @param _host	The remote host to which to connect.
      * @param _port	The port on the remote host.
      * @param timeOut	The number of seconds waiting for connect (default 30).
      */
-    KSocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED;
+    TDESocket( const char *_host, unsigned short int _port, int timeOut = 30) KDE_DEPRECATED;
 
     /**
      * Connects to a UNIX domain socket.
      * @param _path    The filename of the socket.
      */
-    KSocket( const char * _path ) KDE_DEPRECATED;
+    TDESocket( const char * _path ) KDE_DEPRECATED;
 
     /**
      * Destructor. Closes the socket if it is still open.
      */
-    virtual ~KSocket();
+    virtual ~TDESocket();
 
     /**
      * Returns a file descriptor for this socket.
@@ -171,9 +171,9 @@ signals:
      *
      * This signal will only be raised if enableRead( @p true ) was called
      * first.
-     * @param s the KSocket that triggered the event
+     * @param s the TDESocket that triggered the event
      */
-    void readEvent( KSocket *s );
+    void readEvent( TDESocket *s );
 
     /**
      * Socket is ready for writing.
@@ -184,15 +184,15 @@ signals:
      * Warning: If you forget to call enableWrite(false) when you are
      * not ready to send data, you will get lots of writeEvent() signals,
      * in the order of thousands a second !
-     * @param s the KSocket that triggered the event
+     * @param s the TDESocket that triggered the event
      */
-    void writeEvent( KSocket *s );
+    void writeEvent( TDESocket *s );
 
     /**
      * Raised when the connection is broken.
-     * @param s the KSocket that triggered the event
+     * @param s the TDESocket that triggered the event
      */
-    void closeEvent( KSocket *s );
+    void closeEvent( TDESocket *s );
 
 public slots:
     /**
@@ -224,10 +224,10 @@ protected:
     int sock;
 
 private:
-    KSocket(const KSocket&);
-    KSocket& operator=(const KSocket&);
+    TDESocket(const TDESocket&);
+    TDESocket& operator=(const TDESocket&);
 
-    KSocketPrivate *d;
+    TDESocketPrivate *d;
 
 };
 
@@ -239,19 +239,19 @@ private:
  * This class is deprecated and will be removed in the future.
  * Please use the classes in KNetwork for new programs. 
  * In special, this class is replaced by KNetwork::KStreamSocket
- * and KNetwork::KServerSocket. 
+ * and KNetwork::TDEServerSocket. 
  *
- * You can use a KServerSocket to listen on a port for incoming
- * connections. When a connection arrived in the port, a KSocket
+ * You can use a TDEServerSocket to listen on a port for incoming
+ * connections. When a connection arrived in the port, a TDESocket
  * is created and the signal accepted is raised. Make sure you
  * always connect to this signal. If you don't the ServerSocket will
- * create new KSocket's and no one will delete them!
+ * create new TDESocket's and no one will delete them!
  *
  * If socket() is -1 or less the socket was not created properly.
  *
  * @author Torben Weis <weis@stud.uni-frankfurt.de>
 */
-class TDECORE_EXPORT KServerSocket : public TQObject
+class TDECORE_EXPORT TDEServerSocket : public TQObject
 {
     Q_OBJECT
 public:
@@ -262,7 +262,7 @@ public:
      *                  This gives you the opportunity to set options on the
      *                  socket.
      */
-    KServerSocket( unsigned short int _port, bool _bind = true );
+    TDEServerSocket( unsigned short int _port, bool _bind = true );
 
     /**
      * Creates a UNIX domain server socket.
@@ -271,12 +271,12 @@ public:
      *                  This gives you the opportunity to set options on the
      *                  socket.
      */
-    KServerSocket( const char *_path, bool _bind = true);
+    TDEServerSocket( const char *_path, bool _bind = true);
 
     /**
      * Destructor. Closes the socket if it was not already closed.
      */
-    virtual ~KServerSocket();
+    virtual ~TDEServerSocket();
 
     /**
      * Binds the socket and start listening. This should only be called
@@ -319,14 +319,14 @@ public slots:
 signals:
     /**
      * A connection has been accepted.
-     * It is your task to delete the KSocket if it is no longer needed.
+     * It is your task to delete the TDESocket if it is no longer needed.
      *
      * WARNING: this signal is always emitted, even if you don't connect
-     * anything to it. That would mean memory loss, because the KSockets
+     * anything to it. That would mean memory loss, because the TDESockets
      * created go to oblivion.
      * @param s the socket that accepted
      */
-    void accepted( KSocket*s );
+    void accepted( TDESocket*s );
 
 protected:
     bool init( unsigned short int );
@@ -339,10 +339,10 @@ protected:
     int sock;
 
 private:
-    KServerSocket(const KServerSocket&);
-    KServerSocket& operator=(const KServerSocket&);
+    TDEServerSocket(const TDEServerSocket&);
+    TDEServerSocket& operator=(const TDEServerSocket&);
 
-    KServerSocketPrivate *d;
+    TDEServerSocketPrivate *d;
 };
 
 #endif //Q_OS_UNIX
diff --git a/tdecore/ksockaddr.cpp b/tdecore/ksockaddr.cpp
index 899f32dba..a645b3aa9 100644
--- a/tdecore/ksockaddr.cpp
+++ b/tdecore/ksockaddr.cpp
@@ -38,7 +38,7 @@
 #include <tqfile.h>
 
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 //#include "kextsock.h"
 
 #ifndef HAVE_STRUCT_SOCKADDR_IN6
@@ -77,10 +77,10 @@
 
 
 /**
- * Class KSocketAddress
+ * Class TDESocketAddress
  */
 
-KSocketAddress::KSocketAddress(const sockaddr* sa, ksocklen_t size)
+TDESocketAddress::TDESocketAddress(const sockaddr* sa, ksocklen_t size)
 {
     if ( !sa )
         init();
@@ -94,44 +94,44 @@ KSocketAddress::KSocketAddress(const sockaddr* sa, ksocklen_t size)
     }
 }
 
-void KSocketAddress::init()
+void TDESocketAddress::init()
 {
   data = NULL;
   datasize = 0;
   owndata = false;
 }
 
-KSocketAddress::~KSocketAddress()
+TDESocketAddress::~TDESocketAddress()
 {
   if (owndata && data != NULL)
     free(data);
 }
 
-TQString KSocketAddress::pretty() const
+TQString TDESocketAddress::pretty() const
 {
   return i18n("<unknown socket>");
 }
 
-int KSocketAddress::family() const
+int TDESocketAddress::family() const
 {
   if (data != NULL)
     return data->sa_family;
   return AF_UNSPEC;
 }
 
-// This creates a new KSocketAddress with given sockaddr
-KSocketAddress* KSocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t size)
+// This creates a new TDESocketAddress with given sockaddr
+TDESocketAddress* TDESocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t size)
 {
   if (size == 0)
     {
-      kdWarning() << "KSocketAddress::newAddress called with size = 0!\n";
+      kdWarning() << "TDESocketAddress::newAddress called with size = 0!\n";
       return NULL;
     }
 
   // make sure we have the right stuff
   if (size < MIN_SOCKADDR_LEN)
     {
-      kdWarning() << "KSocketAddress::newAddress called with invalid size\n";
+      kdWarning() << "TDESocketAddress::newAddress called with invalid size\n";
       return NULL;
     }
 
@@ -153,10 +153,10 @@ KSocketAddress* KSocketAddress::newAddress(const struct sockaddr* sa, ksocklen_t
       return new KUnixSocketAddress((const sockaddr_un*)sa, size);
     }
 
-  return new KSocketAddress(sa, size);
+  return new TDESocketAddress(sa, size);
 }
 
-bool KSocketAddress::isEqual(const KSocketAddress& other) const
+bool TDESocketAddress::isEqual(const TDESocketAddress& other) const
 {
   switch(family())
   {
@@ -176,7 +176,7 @@ bool KSocketAddress::isEqual(const KSocketAddress& other) const
   return memcmp(data, other.data, datasize) == 0;
 }
 
-bool KSocketAddress::isCoreEqual(const KSocketAddress& other) const
+bool TDESocketAddress::isCoreEqual(const TDESocketAddress& other) const
 {
   switch(family())
   {
@@ -193,17 +193,17 @@ bool KSocketAddress::isCoreEqual(const KSocketAddress& other) const
   return false;
 }
 
-TQString KSocketAddress::nodeName() const
+TQString TDESocketAddress::nodeName() const
 {
   return TQString::null;
 }
 
-TQString KSocketAddress::serviceName() const
+TQString TDESocketAddress::serviceName() const
 {
   return TQString::null;
 }
 
-int KSocketAddress::ianaFamily(int af)
+int TDESocketAddress::ianaFamily(int af)
 {
   switch (af)
     {
@@ -218,7 +218,7 @@ int KSocketAddress::ianaFamily(int af)
     }
 }
 
-int KSocketAddress::fromIanaFamily(int iana)
+int TDESocketAddress::fromIanaFamily(int iana)
 {
   switch (iana)
     {
@@ -274,7 +274,7 @@ KInetSocketAddress::KInetSocketAddress() :
 }
 
 KInetSocketAddress::KInetSocketAddress(const KInetSocketAddress &other) :
-  KSocketAddress(), d(new KInetSocketAddressPrivate)
+  TDESocketAddress(), d(new KInetSocketAddressPrivate)
 {
   setAddress(other);
 }
@@ -313,7 +313,7 @@ KInetSocketAddress::~KInetSocketAddress()
 {
   delete d;
 
-  //  KSocketAddress::~KSocketAddress();
+  //  TDESocketAddress::~TDESocketAddress();
 }
 
 bool KInetSocketAddress::setAddress(const KInetSocketAddress &other)
@@ -626,7 +626,7 @@ ksocklen_t KInetSocketAddress::size() const
     return 0;
 }
 
-bool KInetSocketAddress::areEqualInet(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly)
+bool KInetSocketAddress::areEqualInet(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly)
 {
    if (s1.family() != s2.family())
       return false;
@@ -643,7 +643,7 @@ bool KInetSocketAddress::areEqualInet(const KSocketAddress &s1, const KSocketAdd
              (memcmp(&sin1->sin_addr, &sin2->sin_addr, sizeof(struct in_addr))  == 0);
 }
 
-bool KInetSocketAddress::areEqualInet6(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly)
+bool KInetSocketAddress::areEqualInet6(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly)
 {
 #ifdef AF_INET6
    if (s1.family() != s2.family())
@@ -688,7 +688,7 @@ void KInetSocketAddress::fromV4()
 # endif
 #endif
 
-  // data == KSocketAddress::data
+  // data == TDESocketAddress::data
   data = (sockaddr*)&d->sin;
   datasize = sizeof( sockaddr_in );	
 }
@@ -864,7 +864,7 @@ const sockaddr_un* KUnixSocketAddress::address() const
   return d->m_sun;
 }
 
-bool KUnixSocketAddress::areEqualUnix(const KSocketAddress &s1, const KSocketAddress &s2, bool /* coreOnly */)
+bool KUnixSocketAddress::areEqualUnix(const TDESocketAddress &s1, const TDESocketAddress &s2, bool /* coreOnly */)
 {
    if (s1.family() != s2.family())
       return false;   
@@ -881,14 +881,14 @@ bool KUnixSocketAddress::areEqualUnix(const KSocketAddress &s1, const KSocketAdd
    return (strcmp(sun1->sun_path, sun2->sun_path) == 0);
 }
 
-void KSocketAddress::virtual_hook( int, void* )
+void TDESocketAddress::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KInetSocketAddress::virtual_hook( int id, void* data )
-{ KSocketAddress::virtual_hook( id, data ); }
+{ TDESocketAddress::virtual_hook( id, data ); }
 
 void KUnixSocketAddress::virtual_hook( int id, void* data )
-{ KSocketAddress::virtual_hook( id, data ); }
+{ TDESocketAddress::virtual_hook( id, data ); }
 
 
 #include "ksockaddr.moc"
diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h
index fd73e722a..d3eb62d0d 100644
--- a/tdecore/ksockaddr.h
+++ b/tdecore/ksockaddr.h
@@ -34,7 +34,7 @@ struct sockaddr;
 
 class KExtendedSocket;		// No need to define it fully
 
-class KSocketAddressPrivate;
+class TDESocketAddressPrivate;
 /**
  * A socket address.
  *
@@ -43,27 +43,27 @@ class KSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a socket address.
  */
-class TDECORE_EXPORT KSocketAddress: public TQObject
+class TDECORE_EXPORT TDESocketAddress: public TQObject
 {
   Q_OBJECT
 protected:
   /**
    * Creates an empty class
    */
-  KSocketAddress() { init(); }
+  TDESocketAddress() { init(); }
 
   /**
    * Creates with given data
    * @param sa a sockaddr structure
    * @param size the size of @p sa
    */
-  KSocketAddress(const sockaddr* sa, ksocklen_t size);
+  TDESocketAddress(const sockaddr* sa, ksocklen_t size);
 
 public:
   /**
    * Destructor.
    */
-  virtual ~KSocketAddress();
+  virtual ~TDESocketAddress();
 
   /**
    * Returns a string representation of this socket.
@@ -112,15 +112,15 @@ public:
    * @param other	the other socket
    * @return true if both sockets are equal
    */
-  virtual bool isEqual(const KSocketAddress& other) const;
-  bool isEqual(const KSocketAddress* other) const
+  virtual bool isEqual(const TDESocketAddress& other) const;
+  bool isEqual(const TDESocketAddress* other) const
   { return isEqual(*other); }
 
   /**
    * Overloaded == operator.
    * @see isEqual()
    */
-  bool operator==(const KSocketAddress& other) const
+  bool operator==(const TDESocketAddress& other) const
   { return isEqual(other); }
 
   /**
@@ -133,7 +133,7 @@ public:
    * @param other	the other socket
    * @return true if the code part is equal
    */
-  bool isCoreEqual(const KSocketAddress& other) const;
+  bool isCoreEqual(const TDESocketAddress& other) const;
 
   /**
    * Some sockets may differ in such things as services or port numbers,
@@ -145,7 +145,7 @@ public:
    * @param other	the other socket
    * @return true if the code part is equal
    */
-  bool isCoreEqual(const KSocketAddress* other) const
+  bool isCoreEqual(const TDESocketAddress* other) const
   { return isCoreEqual(*other); }
 
   /**
@@ -174,18 +174,18 @@ protected:
 private:
   void init();
   /* No copy constructor */
-  KSocketAddress(KSocketAddress&);
-  KSocketAddress& operator=(KSocketAddress&);
+  TDESocketAddress(TDESocketAddress&);
+  TDESocketAddress& operator=(TDESocketAddress&);
 
 public:
   /**
-   * Creates a new KSocketAddress or descendant class from given
+   * Creates a new TDESocketAddress or descendant class from given
    * raw socket address.
    * @param sa		new socket address
    * @param size	new socket address's length
-   * @return the new KSocketAddress, or 0 if the function failed
+   * @return the new TDESocketAddress, or 0 if the function failed
    */
-  static KSocketAddress* newAddress(const struct sockaddr *sa, ksocklen_t size);
+  static TDESocketAddress* newAddress(const struct sockaddr *sa, ksocklen_t size);
 
   /**
    * Returns the IANA family number of the given address family.
@@ -206,7 +206,7 @@ public:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KSocketAddressPrivate* d;
+  TDESocketAddressPrivate* d;
 };
 
 /*
@@ -224,13 +224,13 @@ class KInetSocketAddressPrivate;
  *
  * This is an IPv4 or IPv6 address of the Internet
  *
- * This class inherits most of the functionality from KSocketAddress, but
+ * This class inherits most of the functionality from TDESocketAddress, but
  * is targeted specifically to Internet addresses
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an Internet socket address
  */
-class TDECORE_EXPORT KInetSocketAddress: public ::KSocketAddress
+class TDECORE_EXPORT KInetSocketAddress: public ::TDESocketAddress
 {
   Q_OBJECT
 public:
@@ -485,10 +485,10 @@ public:
    *                 the address)
    * @return true if the given addresses are equal.
    * @see areEqualInet6()
-   * @see KSocketAddress::isEqual()
-   * @see KSocketAddress::isCoreEqual()
+   * @see TDESocketAddress::isEqual()
+   * @see TDESocketAddress::isCoreEqual()
    */
-  static bool areEqualInet(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly);
+  static bool areEqualInet(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly);
 
   /**
    * Compares two IPv6 addresses.
@@ -498,10 +498,10 @@ public:
    *                 the address)
    * @return true if the given addresses are equal.
    * @see areEqualInet()
-   * @see KSocketAddress::isEqual()
-   * @see KSocketAddress::isCoreEqual()
+   * @see TDESocketAddress::isEqual()
+   * @see TDESocketAddress::isCoreEqual()
    */
-  static bool areEqualInet6(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly);
+  static bool areEqualInet6(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly);
 
   /* operators */
 
@@ -581,7 +581,7 @@ class KUnixSocketAddressPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short a Unix socket address
  */
-class TDECORE_EXPORT KUnixSocketAddress: public ::KSocketAddress
+class TDECORE_EXPORT KUnixSocketAddress: public ::TDESocketAddress
 {
   Q_OBJECT
 public:
@@ -665,10 +665,10 @@ public:
    * @param coreOnly true if only core parts should be compared (currently
    *                 unused)
    * @return true if the given addresses are equal.
-   * @see KSocketAddress::isEqual()
-   * @see KSocketAddress::isCoreEqual()
+   * @see TDESocketAddress::isEqual()
+   * @see TDESocketAddress::isCoreEqual()
    */
-  static bool areEqualUnix(const KSocketAddress &s1, const KSocketAddress &s2, bool coreOnly);
+  static bool areEqualUnix(const TDESocketAddress &s1, const TDESocketAddress &s2, bool coreOnly);
 
 private:
   void init();
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp
index 3de74bd88..a6ecc37d2 100644
--- a/tdecore/ksocks.cpp
+++ b/tdecore/ksocks.cpp
@@ -26,11 +26,11 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "klibloader.h"
-#include <kconfig.h>
-#include <kapplication.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -213,7 +213,7 @@ KSocks *KSocks::self() {
   // Note that we don't use a static deleter here. It makes no sense and tends to cause crashes.
   if (!_me) {
      if (kapp) {
-        KConfigGroup cfg(kapp->config(), "Socks");
+        TDEConfigGroup cfg(kapp->config(), "Socks");
         _me = new KSocks(&cfg);
      } else {
         _disabled = true;
@@ -223,7 +223,7 @@ KSocks *KSocks::self() {
   return _me;
 }
 
-void KSocks::setConfig(KConfigBase *config)
+void KSocks::setConfig(TDEConfigBase *config)
 {
   // We can change the config from disabled to enabled
   // but not the other way around.
@@ -239,7 +239,7 @@ void KSocks::setConfig(KConfigBase *config)
 bool KSocks::activated() { return (_me != 0L); }
 
 
-KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) {
+KSocks::KSocks(TDEConfigBase *config) : _socksLib(0L), _st(0L) {
    _hasSocks = false;
    _useSocks = false;
 
diff --git a/tdecore/ksocks.h b/tdecore/ksocks.h
index 14067c0f3..b55829941 100644
--- a/tdecore/ksocks.h
+++ b/tdecore/ksocks.h
@@ -29,7 +29,7 @@
 class KSocksTable;
 class KSocksPrivate;
 class KLibrary;
-class KConfigBase;
+class TDEConfigBase;
 struct sockaddr;
 
 typedef unsigned ksocklen_t;
@@ -185,10 +185,10 @@ public:
     *  Set this before the first call to KSocks::self() and it will use
     *  @p config to read its configuration from.
     */
-   static void setConfig(KConfigBase *config);
+   static void setConfig(TDEConfigBase *config);
 
 private:
-   KSocks(KConfigBase *config);
+   KSocks(TDEConfigBase *config);
    ~KSocks();
 
    void stopSocks();
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index a7cdd3659..dc9ca909a 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -47,7 +47,7 @@
 #include <tqstringlist.h>
 
 #include "kstandarddirs.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kinstance.h"
 #include "kshell.h"
 #include "ksimpleconfig.h"
@@ -57,10 +57,10 @@
 
 template class TQDict<TQStringList>;
 
-class KStandardDirs::KStandardDirsPrivate
+class TDEStandardDirs::TDEStandardDirsPrivate
 {
 public:
-   KStandardDirsPrivate()
+   TDEStandardDirsPrivate()
     : restrictionsActive(false),
       dataRestrictionActive(false),
       checkRestrictions(true)
@@ -76,20 +76,20 @@ public:
 
 // Singleton, with data shared by all kstandarddirs instances.
 // Used in static methods like findExe()
-class KStandardDirsSingleton
+class TDEStandardDirsSingleton
 {
 public:
    TQString defaultprefix;
    TQString defaultbindir;
-   static KStandardDirsSingleton* self();
+   static TDEStandardDirsSingleton* self();
 private:
-   static KStandardDirsSingleton* s_self;
+   static TDEStandardDirsSingleton* s_self;
 };
-static KStaticDeleter<KStandardDirsSingleton> kstds_sd;
-KStandardDirsSingleton* KStandardDirsSingleton::s_self = 0;
-KStandardDirsSingleton* KStandardDirsSingleton::self() {
+static KStaticDeleter<TDEStandardDirsSingleton> kstds_sd;
+TDEStandardDirsSingleton* TDEStandardDirsSingleton::s_self = 0;
+TDEStandardDirsSingleton* TDEStandardDirsSingleton::self() {
     if ( !s_self )
-        kstds_sd.setObject( s_self, new KStandardDirsSingleton );
+        kstds_sd.setObject( s_self, new TDEStandardDirsSingleton );
     return s_self;
 }
 
@@ -105,9 +105,9 @@ static const char* const types[] = {"html", "html-bundle", "icon", "apps", "soun
 static int tokenize( TQStringList& token, const TQString& str,
 		const TQString& delim );
 
-KStandardDirs::KStandardDirs( ) : addedCustoms(false)
+TDEStandardDirs::TDEStandardDirs( ) : addedCustoms(false)
 {
-    d = new KStandardDirsPrivate;
+    d = new TDEStandardDirsPrivate;
     dircache.setAutoDelete(true);
     relatives.setAutoDelete(true);
     absolutes.setAutoDelete(true);
@@ -115,12 +115,12 @@ KStandardDirs::KStandardDirs( ) : addedCustoms(false)
     addKDEDefaults();
 }
 
-KStandardDirs::~KStandardDirs()
+TDEStandardDirs::~TDEStandardDirs()
 {
     delete d;
 }
 
-bool KStandardDirs::isRestrictedResource(const char *type, const TQString& relPath) const
+bool TDEStandardDirs::isRestrictedResource(const char *type, const TQString& relPath) const
 {
    if (!d || !d->restrictionsActive)
       return false;
@@ -140,7 +140,7 @@ bool KStandardDirs::isRestrictedResource(const char *type, const TQString& relPa
    return false;
 }
 
-void KStandardDirs::applyDataRestrictions(const TQString &relPath) const
+void TDEStandardDirs::applyDataRestrictions(const TQString &relPath) const
 {
    TQString key;
    int i = relPath.find(QChar('/'));
@@ -154,7 +154,7 @@ void KStandardDirs::applyDataRestrictions(const TQString &relPath) const
 }
 
 
-TQStringList KStandardDirs::allTypes() const
+TQStringList TDEStandardDirs::allTypes() const
 {
     TQStringList list;
     for (int i = 0; types[i] != 0; ++i)
@@ -177,12 +177,12 @@ static void priorityAdd(TQStringList &prefixes, const TQString& dir, bool priori
     }
 }
 
-void KStandardDirs::addPrefix( const TQString& _dir )
+void TDEStandardDirs::addPrefix( const TQString& _dir )
 {
     addPrefix(_dir, false);
 }
 
-void KStandardDirs::addPrefix( const TQString& _dir, bool priority )
+void TDEStandardDirs::addPrefix( const TQString& _dir, bool priority )
 {
     if (_dir.isEmpty())
 	return;
@@ -197,12 +197,12 @@ void KStandardDirs::addPrefix( const TQString& _dir, bool priority )
     }
 }
 
-void KStandardDirs::addXdgConfigPrefix( const TQString& _dir )
+void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir )
 {
     addXdgConfigPrefix(_dir, false);
 }
 
-void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
+void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
 {
     if (_dir.isEmpty())
 	return;
@@ -217,12 +217,12 @@ void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
     }
 }
 
-void KStandardDirs::addXdgDataPrefix( const TQString& _dir )
+void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir )
 {
     addXdgDataPrefix(_dir, false);
 }
 
-void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
+void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
 {
     if (_dir.isEmpty())
 	return;
@@ -237,27 +237,27 @@ void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
     }
 }
 
-TQString KStandardDirs::kfsstnd_prefixes()
+TQString TDEStandardDirs::kfsstnd_prefixes()
 {
    return prefixes.join(TQChar(KPATH_SEPARATOR));
 }
 
-TQString KStandardDirs::kfsstnd_xdg_conf_prefixes()
+TQString TDEStandardDirs::kfsstnd_xdg_conf_prefixes()
 {
    return d->xdgconf_prefixes.join(TQChar(KPATH_SEPARATOR));
 }
 
-TQString KStandardDirs::kfsstnd_xdg_data_prefixes()
+TQString TDEStandardDirs::kfsstnd_xdg_data_prefixes()
 {
    return d->xdgdata_prefixes.join(TQChar(KPATH_SEPARATOR));
 }
 
-bool KStandardDirs::addResourceType( const char *type,
+bool TDEStandardDirs::addResourceType( const char *type,
 				     const TQString& relativename )
 {
     return addResourceType(type, relativename, true);
 }
-bool KStandardDirs::addResourceType( const char *type,
+bool TDEStandardDirs::addResourceType( const char *type,
 				     const TQString& relativename,
 				     bool priority )
 {
@@ -283,14 +283,14 @@ bool KStandardDirs::addResourceType( const char *type,
     return false;
 }
 
-bool KStandardDirs::addResourceDir( const char *type,
+bool TDEStandardDirs::addResourceDir( const char *type,
 				    const TQString& absdir)
 {
     // KDE4: change priority to bring in line with addResourceType
     return addResourceDir(type, absdir, false);
 }
 
-bool KStandardDirs::addResourceDir( const char *type,
+bool TDEStandardDirs::addResourceDir( const char *type,
 				    const TQString& absdir,
 				    bool priority)
 {
@@ -314,7 +314,7 @@ bool KStandardDirs::addResourceDir( const char *type,
     return false;
 }
 
-TQString KStandardDirs::findResource( const char *type,
+TQString TDEStandardDirs::findResource( const char *type,
 				     const TQString& filename ) const
 {
 	if (!TQDir::isRelativePath(filename))
@@ -349,7 +349,7 @@ static TQ_UINT32 updateHash(const TQString &file, TQ_UINT32 hash)
     return hash;
 }
 
-TQ_UINT32 KStandardDirs::calcResourceHash( const char *type,
+TQ_UINT32 TDEStandardDirs::calcResourceHash( const char *type,
 			      const TQString& filename, bool deep) const
 {
     TQ_UINT32 hash = 0;
@@ -375,7 +375,7 @@ TQ_UINT32 KStandardDirs::calcResourceHash( const char *type,
 }
 
 
-TQStringList KStandardDirs::findDirs( const char *type,
+TQStringList TDEStandardDirs::findDirs( const char *type,
                                      const TQString& reldir ) const
 {
     TQDir testdir;
@@ -409,12 +409,12 @@ TQStringList KStandardDirs::findDirs( const char *type,
     return list;
 }
 
-TQString KStandardDirs::findResourceDir( const char *type,
+TQString TDEStandardDirs::findResourceDir( const char *type,
 					const TQString& filename) const
 {
 #ifndef NDEBUG
     if (filename.isEmpty()) {
-      fprintf(stderr, "filename for type %s in KStandardDirs::findResourceDir is not supposed to be empty!!", type);
+      fprintf(stderr, "filename for type %s in TDEStandardDirs::findResourceDir is not supposed to be empty!!", type);
       return TQString::null;
     }
 #endif
@@ -430,7 +430,7 @@ TQString KStandardDirs::findResourceDir( const char *type,
 #ifdef Q_WS_WIN //this ensures we're using installed .la files
           if ((*it).isEmpty() && filename.right(3)==".la") {
 #ifndef NDEBUG
-              fprintf(stderr, "KStandardDirs::findResourceDir() found .la in cwd: skipping. (fname=%s)\n", filename.ascii());
+              fprintf(stderr, "TDEStandardDirs::findResourceDir() found .la in cwd: skipping. (fname=%s)\n", filename.ascii());
 #endif
               continue;
           }
@@ -447,7 +447,7 @@ TQString KStandardDirs::findResourceDir( const char *type,
     return TQString::null;
 }
 
-bool KStandardDirs::exists(const TQString &fullPath)
+bool TDEStandardDirs::exists(const TQString &fullPath)
 {
     KDE_struct_stat buff;
     if ((access(TQFile::encodeName(fullPath), R_OK) == 0) && (KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)) {
@@ -620,7 +620,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 }
 
 TQStringList
-KStandardDirs::findAllResources( const char *type,
+TDEStandardDirs::findAllResources( const char *type,
 			         const TQString& filter,
 				 bool recursive,
 			         bool unique,
@@ -676,7 +676,7 @@ KStandardDirs::findAllResources( const char *type,
 }
 
 TQStringList
-KStandardDirs::findAllResources( const char *type,
+TDEStandardDirs::findAllResources( const char *type,
 			         const TQString& filter,
 				 bool recursive,
 			         bool unique) const
@@ -686,7 +686,7 @@ KStandardDirs::findAllResources( const char *type,
 }
 
 TQString
-KStandardDirs::realPath(const TQString &dirname)
+TDEStandardDirs::realPath(const TQString &dirname)
 {
     char realpath_buffer[MAXPATHLEN + 1];
     memset(realpath_buffer, 0, MAXPATHLEN + 1);
@@ -704,7 +704,7 @@ KStandardDirs::realPath(const TQString &dirname)
 }
 
 TQString
-KStandardDirs::realFilePath(const TQString &filename)
+TDEStandardDirs::realFilePath(const TQString &filename)
 {
     char realpath_buffer[MAXPATHLEN + 1];
     memset(realpath_buffer, 0, MAXPATHLEN + 1);
@@ -718,7 +718,7 @@ KStandardDirs::realFilePath(const TQString &filename)
     return filename;
 }
 
-void KStandardDirs::createSpecialResource(const char *type)
+void TDEStandardDirs::createSpecialResource(const char *type)
 {
    char hostname[256];
    hostname[0] = 0;
@@ -792,17 +792,17 @@ void KStandardDirs::createSpecialResource(const char *type)
    addResourceDir(type, dir+QChar('/'));
 }
 
-TQStringList KStandardDirs::resourceDirs(const char *type) const
+TQStringList TDEStandardDirs::resourceDirs(const char *type) const
 {
     TQStringList *candidates = dircache.find(type);
 
     if (!candidates) { // filling cache
         if (strcmp(type, "socket") == 0)
-           const_cast<KStandardDirs *>(this)->createSpecialResource(type);
+           const_cast<TDEStandardDirs *>(this)->createSpecialResource(type);
         else if (strcmp(type, "tmp") == 0)
-           const_cast<KStandardDirs *>(this)->createSpecialResource(type);
+           const_cast<TDEStandardDirs *>(this)->createSpecialResource(type);
         else if (strcmp(type, "cache") == 0)
-           const_cast<KStandardDirs *>(this)->createSpecialResource(type);
+           const_cast<TDEStandardDirs *>(this)->createSpecialResource(type);
 
         TQDir testdir;
 
@@ -883,7 +883,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const
   return *candidates;
 }
 
-TQStringList KStandardDirs::systemPaths( const TQString& pstr )
+TQStringList TDEStandardDirs::systemPaths( const TQString& pstr )
 {
     TQStringList tokens;
     TQString p = pstr;
@@ -929,7 +929,7 @@ TQStringList KStandardDirs::systemPaths( const TQString& pstr )
 }
 
 
-TQString KStandardDirs::findExe( const TQString& appname,
+TQString TDEStandardDirs::findExe( const TQString& appname,
 				const TQString& pstr, bool ignore)
 {
 #ifdef Q_WS_WIN
@@ -978,7 +978,7 @@ TQString KStandardDirs::findExe( const TQString& appname,
     return TQString::null;
 }
 
-int KStandardDirs::findAllExe( TQStringList& list, const TQString& appname,
+int TDEStandardDirs::findAllExe( TQStringList& list, const TQString& appname,
 			const TQString& pstr, bool ignore )
 {
 #ifdef Q_WS_WIN
@@ -1033,7 +1033,7 @@ static int tokenize( TQStringList& tokens, const TQString& str,
     return tokens.count();
 }
 
-TQString KStandardDirs::kde_default(const char *type) {
+TQString TDEStandardDirs::kde_default(const char *type) {
     if (!strcmp(type, "data"))
 	return "share/apps/";
     if (!strcmp(type, "html-bundle"))
@@ -1096,7 +1096,7 @@ TQString KStandardDirs::kde_default(const char *type) {
     return TQString::null;
 }
 
-TQString KStandardDirs::saveLocation(const char *type,
+TQString TDEStandardDirs::saveLocation(const char *type,
 				    const TQString& suffix,
 				    bool create) const
 {
@@ -1127,7 +1127,7 @@ TQString KStandardDirs::saveLocation(const char *type,
        else {
           dirs = absolutes.find(type);
           if (!dirs)
-             tqFatal("KStandardDirs: The resource type %s is not registered", type);
+             tqFatal("TDEStandardDirs: The resource type %s is not registered", type);
           pPath = new TQString(realPath(dirs->last()));
        }
 
@@ -1151,7 +1151,7 @@ TQString KStandardDirs::saveLocation(const char *type,
     return fullPath;
 }
 
-TQString KStandardDirs::relativeLocation(const char *type, const TQString &absPath)
+TQString TDEStandardDirs::relativeLocation(const char *type, const TQString &absPath)
 {
     TQString fullPath = absPath;
     int i = absPath.findRev('/');
@@ -1173,7 +1173,7 @@ TQString KStandardDirs::relativeLocation(const char *type, const TQString &absPa
 }
 
 
-bool KStandardDirs::makeDir(const TQString& dir, int mode)
+bool TDEStandardDirs::makeDir(const TQString& dir, int mode)
 {
     // we want an absolute path
     if (TQDir::isRelativePath(dir))
@@ -1254,9 +1254,9 @@ static TQString executablePrefix()
 }
 #endif
 
-TQString KStandardDirs::kfsstnd_defaultprefix()
+TQString TDEStandardDirs::kfsstnd_defaultprefix()
 {
-   KStandardDirsSingleton* s = KStandardDirsSingleton::self();
+   TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self();
    if (!s->defaultprefix.isEmpty())
       return s->defaultprefix;
 #ifdef Q_WS_WIN
@@ -1269,14 +1269,14 @@ TQString KStandardDirs::kfsstnd_defaultprefix()
    s->defaultprefix = TDEDIR;
 #endif
    if (s->defaultprefix.isEmpty()) {
-      fprintf(stderr, "KStandardDirs::kfsstnd_defaultprefix(): default TDE prefix not found!\n");
+      fprintf(stderr, "TDEStandardDirs::kfsstnd_defaultprefix(): default TDE prefix not found!\n");
    }
    return s->defaultprefix;
 }
 
-TQString KStandardDirs::kfsstnd_defaultbindir()
+TQString TDEStandardDirs::kfsstnd_defaultbindir()
 {
-   KStandardDirsSingleton* s = KStandardDirsSingleton::self();
+   TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self();
    if (!s->defaultbindir.isEmpty())
       return s->defaultbindir;
 #ifdef Q_WS_WIN
@@ -1287,12 +1287,12 @@ TQString KStandardDirs::kfsstnd_defaultbindir()
       s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #endif
    if (s->defaultbindir.isEmpty()) {
-      fprintf(stderr, "KStandardDirs::kfsstnd_defaultbindir(): default binary TDE dir not found!\n");
+      fprintf(stderr, "TDEStandardDirs::kfsstnd_defaultbindir(): default binary TDE dir not found!\n");
    }
   return s->defaultbindir;
 }
 
-void KStandardDirs::addKDEDefaults()
+void TDEStandardDirs::addKDEDefaults()
 {
     TQStringList tdedirList;
 
@@ -1459,10 +1459,10 @@ void KStandardDirs::addKDEDefaults()
     addResourceDir("locale", "/usr/share/locale-langpack/", true);
 }
 
-void KStandardDirs::checkConfig() const
+void TDEStandardDirs::checkConfig() const
 {
-    if (!addedCustoms && KGlobal::_instance && KGlobal::_instance->_config)
-        const_cast<KStandardDirs*>(this)->addCustomized(KGlobal::_instance->_config);
+    if (!addedCustoms && TDEGlobal::_instance && TDEGlobal::_instance->_config)
+        const_cast<TDEStandardDirs*>(this)->addCustomized(TDEGlobal::_instance->_config);
 }
 
 static TQStringList lookupProfiles(const TQString &mapFile)
@@ -1534,13 +1534,13 @@ static TQStringList lookupProfiles(const TQString &mapFile)
 
 extern bool kde_kiosk_admin;
 
-bool KStandardDirs::addCustomized(KConfig *config)
+bool TDEStandardDirs::addCustomized(TDEConfig *config)
 {
     if (addedCustoms && !d->checkRestrictions) // there are already customized entries
         return false; // we just quit and hope they are the right ones
 
     // save the numbers of config directories. If this changes,
-    // we will return true to give KConfig a chance to reparse
+    // we will return true to give TDEConfig a chance to reparse
     uint configdirs = resourceDirs("config").count();
 
     // Remember original group
@@ -1666,19 +1666,19 @@ bool KStandardDirs::addCustomized(KConfig *config)
     return configDirsChanged;
 }
 
-TQString KStandardDirs::localtdedir() const
+TQString TDEStandardDirs::localtdedir() const
 {
     // Return the prefix to use for saving
     return prefixes.first();
 }
 
-TQString KStandardDirs::localxdgdatadir() const
+TQString TDEStandardDirs::localxdgdatadir() const
 {
     // Return the prefix to use for saving
     return d->xdgdata_prefixes.first();
 }
 
-TQString KStandardDirs::localxdgconfdir() const
+TQString TDEStandardDirs::localxdgconfdir() const
 {
     // Return the prefix to use for saving
     return d->xdgconf_prefixes.first();
@@ -1687,19 +1687,19 @@ TQString KStandardDirs::localxdgconfdir() const
 
 // just to make code more readable without macros
 TQString locate( const char *type,
-		const TQString& filename, const KInstance* inst )
+		const TQString& filename, const TDEInstance* inst )
 {
     return inst->dirs()->findResource(type, filename);
 }
 
 TQString locateLocal( const char *type,
-	             const TQString& filename, const KInstance* inst )
+	             const TQString& filename, const TDEInstance* inst )
 {
     return locateLocal(type, filename, true, inst);
 }
 
 TQString locateLocal( const char *type,
-	             const TQString& filename, bool createDir, const KInstance* inst )
+	             const TQString& filename, bool createDir, const TDEInstance* inst )
 {
     // try to find slashes. If there are some, we have to
     // create the subdir first
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 77fec4efd..7cdf44e37 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -26,10 +26,10 @@
 #include <tqstring.h>
 #include <tqdict.h>
 #include <tqstringlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
-class KConfig;
-class KStandardDirsPrivate;
+class TDEConfig;
+class TDEStandardDirsPrivate;
 
 /**
  * @short Site-independent access to standard KDE directories.
@@ -45,12 +45,12 @@ class KStandardDirsPrivate;
  * and applications always refer to a file with a resource type
  * (e.g. icon) and a filename (e.g. khexdit.xpm). In an ideal world
  * the application would make no assumption where this file is and
- * leave it up to KStandardDirs::findResource("apps", "Home.desktop")
+ * leave it up to TDEStandardDirs::findResource("apps", "Home.desktop")
  * to apply this knowledge to return /opt/kde/share/applnk/Home.desktop
  * or ::locate("data", "kgame/background.jpg") to return
  * /opt/kde/share/apps/kgame/background.jpg
  *
- * The main idea behind KStandardDirs is that there are several
+ * The main idea behind TDEStandardDirs is that there are several
  * toplevel prefixes below which the files lie. One of these prefixes is
  * the one where the user installed tdelibs, one is where the
  * application was installed, and one is $HOME/.trinity, but there
@@ -61,7 +61,7 @@ class KStandardDirsPrivate;
  * So the search algorithm basically appends to each prefix each registered
  * suffix and tries to locate the file there.
  * To make the thing even more complex, it's also possible to register
- * absolute paths that KStandardDirs looks up after not finding anything
+ * absolute paths that TDEStandardDirs looks up after not finding anything
  * in the former steps. They can be useful if the user wants to provide
  * specific directories that aren't in his $HOME/.trinity directory for,
  * for example, icons.
@@ -75,9 +75,9 @@ class KStandardDirsPrivate;
  * @li data - Where applications store data.
  * @li exe - Executables in $prefix/bin. findExe() for a function that takes $PATH into account.
  * @li html - HTML documentation.
- * @li icon - Icons, see KIconLoader.
+ * @li icon - Icons, see TDEIconLoader.
  * @li lib - Libraries.
- * @li locale - Translation files for KLocale.
+ * @li locale - Translation files for TDELocale.
  * @li mime - Mime types.
  * @li module - Module (dynamically loaded library).
  * @li qtplugins - Qt plugins (dynamically loaded objects for Qt)
@@ -91,19 +91,19 @@ class KStandardDirsPrivate;
  * @li socket - UNIX Sockets (specific for both current host and current user)
  * @li emoticons - Emoticons themes  (Since KDE 3.4)
  *
- * A type that is added by the class KApplication if you use it, is
+ * A type that is added by the class TDEApplication if you use it, is
  * appdata. This one makes the use of the type data a bit easier as it
  * appends the name of the application.
  * So while you had to ::locate("data", "appname/filename") so you can
- * also write ::locate("appdata", "filename") if your KApplication instance
- * is called "appname" (as set via KApplication's constructor or KAboutData, if
- * you use the global KStandardDirs object KGlobal::dirs()).
+ * also write ::locate("appdata", "filename") if your TDEApplication instance
+ * is called "appname" (as set via TDEApplication's constructor or TDEAboutData, if
+ * you use the global TDEStandardDirs object TDEGlobal::dirs()).
  * Please note though that you cannot use the "appdata"
  * type if you intend to use it in an applet for Kicker because 'appname' would
  * be "Kicker" instead of the applet's name. Therefore, for applets, you've got
  * to work around this by using ::locate("data", "appletname/filename").
  *
- * <b>KStandardDirs supports the following environment variables:</b>
+ * <b>TDEStandardDirs supports the following environment variables:</b>
  *
  * @li TDEDIRS: This may set an additional number of directory prefixes to
  *          search for resources. The directories should be separated
@@ -120,20 +120,20 @@ class KStandardDirsPrivate;
  *          home directory of root, usually "/root/.trinity".
  *          Note that the setting of $HOME is ignored in this case.
  *
- * @see KGlobalSettings
+ * @see TDEGlobalSettings
  */
-class TDECORE_EXPORT KStandardDirs
+class TDECORE_EXPORT TDEStandardDirs
 {
 public:
         /**
-	 * KStandardDirs' constructor. It just initializes the caches.
+	 * TDEStandardDirs' constructor. It just initializes the caches.
 	 **/
-	KStandardDirs( );
+	TDEStandardDirs( );
 
 	/**
-	 * KStandardDirs' destructor.
+	 * TDEStandardDirs' destructor.
 	 */
-	virtual ~KStandardDirs();
+	virtual ~TDEStandardDirs();
 
 	/**
 	 * Adds another search dir to front of the @p fsstnd list.
@@ -175,7 +175,7 @@ public:
 	 * The later a suffix is added, the higher its priority. Note, that the
 	 * suffix should end with / but doesn't have to start with one (as prefixes
 	 * should end with one). So adding a suffix for app_pics would look
-	 * like KGlobal::dirs()->addResourceType("app_pics", "share/app/pics");
+	 * like TDEGlobal::dirs()->addResourceType("app_pics", "share/app/pics");
 	 *
 	 * @param type Specifies a short descriptive string to access
 	 * files of this type.
@@ -211,7 +211,7 @@ public:
 	 *
 	 * The filename should be a filename relative to the base dir
 	 * for resources. So is a way to get the path to libtdecore.la
-	 * to findResource("lib", "libtdecore.la"). KStandardDirs will
+	 * to findResource("lib", "libtdecore.la"). TDEStandardDirs will
 	 * then look into the subdir lib of all elements of all prefixes
 	 * ($TDEDIRS) for a file libtdecore.la and return the path to
 	 * the first one it finds (e.g. /opt/kde/lib/libtdecore.la)
@@ -414,7 +414,7 @@ public:
 	 * It's a series of addResourceTypes()
 	 * and addPrefix() calls.
 	 * You normally wouldn't call this function because it's called
-	 * for you from KGlobal.
+	 * for you from TDEGlobal.
 	 */
 	void addKDEDefaults();
 
@@ -427,7 +427,7 @@ public:
 	 * @return true if new config paths have been added
 	 * from @p config.
 	 **/
-	bool addCustomized(KConfig *config);
+	bool addCustomized(TDEConfig *config);
 
 	/**
 	 * This function is used internally by almost all other function as
@@ -443,7 +443,7 @@ public:
 	TQStringList resourceDirs(const char *type) const;
 
 	/**
-	 * This function will return a list of all the types that KStandardDirs
+	 * This function will return a list of all the types that TDEStandardDirs
 	 * supports.
 	 *
 	 * @return All types that KDE supports
@@ -545,7 +545,7 @@ public:
 	TQString kfsstnd_xdg_data_prefixes();
 
 	/**
-	 * Returns the toplevel directory in which KStandardDirs
+	 * Returns the toplevel directory in which TDEStandardDirs
 	 * will store things. Most likely $HOME/.trinity
 	 * Don't use this function if you can use locateLocal
 	 * @return the toplevel directory
@@ -617,13 +617,13 @@ public:
 	mutable TQDict<TQString> savelocations;
 
 	// Disallow assignment and copy-construction
-	KStandardDirs( const KStandardDirs& );
-	KStandardDirs& operator= ( const KStandardDirs& );
+	TDEStandardDirs( const TDEStandardDirs& );
+	TDEStandardDirs& operator= ( const TDEStandardDirs& );
 
 	bool addedCustoms;
 
-	class KStandardDirsPrivate;
-	KStandardDirsPrivate *d;
+	class TDEStandardDirsPrivate;
+	TDEStandardDirsPrivate *d;
 
 	void checkConfig() const;
 	void applyDataRestrictions(const TQString &) const;
@@ -696,14 +696,14 @@ public:
  **/
 
 /*!
- * \relates KStandardDirs
+ * \relates TDEStandardDirs
  * This function is just for convenience. It simply calls
- *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename).
+ *instance->dirs()->\link TDEStandardDirs::findResource() findResource\endlink(type, filename).
  **/
-TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() );
 
 /*!
- * \relates KStandardDirs
+ * \relates TDEStandardDirs
  * This function is much like locate. However it returns a
  * filename suitable for writing to. No check is made if the
  * specified filename actually exists. Missing directories
@@ -711,10 +711,10 @@ TDECORE_EXPORT TQString locate( const char *type, const TQString& filename, cons
  * specific file, filename must have a trailing slash.
  *
  **/
-TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, const TDEInstance* instance = TDEGlobal::instance() );
 
 /*!
- * \relates KStandardDirs
+ * \relates TDEStandardDirs
  * This function is much like locate. No check is made if the
  * specified filename actually exists. Missing directories
  * are created if @p createDir is true. If filename is only
@@ -722,7 +722,7 @@ TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename,
  * filename must have a trailing slash.
  *
  **/
-TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const KInstance* instance = KGlobal::instance() );
+TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, bool createDir, const TDEInstance* instance = TDEGlobal::instance() );
 
 /*! @} */
 
diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h
index 61b4a8e4a..b6967268c 100644
--- a/tdecore/kstaticdeleter.h
+++ b/tdecore/kstaticdeleter.h
@@ -23,18 +23,18 @@
 #ifndef _KSTATIC_DELETER_H_
 #define _KSTATIC_DELETER_H_
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 /**
  * Static deleters are used to manage static resources. They can register
- * themselves with KGlobal. KGlobal will call destructObject() when
- * KGlobal::deleteStaticDeleters() is called or when it the process
+ * themselves with TDEGlobal. TDEGlobal will call destructObject() when
+ * TDEGlobal::deleteStaticDeleters() is called or when it the process
  * finishes.
  *
  * @see KStaticDeleter
- * @see KGlobal::registerStaticDeleter()
- * @see KGlobal::unregisterStaticDeleter()
- * @see KGlobal::deleteStaticDeleters()
+ * @see TDEGlobal::registerStaticDeleter()
+ * @see TDEGlobal::unregisterStaticDeleter()
+ * @see TDEGlobal::deleteStaticDeleters()
  */
 class TDECORE_EXPORT KStaticDeleterBase {
 public:
@@ -42,7 +42,7 @@ public:
     /**
      * Should destruct the resources managed by this KStaticDeleterBase.
      * Usually you also want to call it in your destructor.
-     * @see KGlobal::deleteStaticDeleters()
+     * @see TDEGlobal::deleteStaticDeleters()
      */
     virtual void destructObject();
 };
@@ -76,7 +76,7 @@ public:
     KStaticDeleter() { deleteit = 0; globalReference = 0; array = false; }
     /**
      * Sets the object to delete and registers the object to be
-     * deleted to KGlobal. If the given object is 0, the former
+     * deleted to TDEGlobal. If the given object is 0, the former
      * registration is unregistered.
      * @param obj the object to delete
      * @param isArray tells the destructor to delete an array instead of an object
@@ -87,14 +87,14 @@ public:
         globalReference = 0;
 	array = isArray;
 	if (obj)
-            KGlobal::registerStaticDeleter(this);
+            TDEGlobal::registerStaticDeleter(this);
 	else
-	    KGlobal::unregisterStaticDeleter(this);
+	    TDEGlobal::unregisterStaticDeleter(this);
         return obj;
     }
     /**
      * Sets the object to delete and registers the object to be
-     * deleted to KGlobal. If the given object is 0, the former
+     * deleted to TDEGlobal. If the given object is 0, the former
      * registration is unregistered.
      * @param globalRef the static pointer where this object is stored
      * This pointer will be reset to 0 after deletion of the object.
@@ -106,9 +106,9 @@ public:
         deleteit = obj;
 	array = isArray;
 	if (obj)
-            KGlobal::registerStaticDeleter(this);
+            TDEGlobal::registerStaticDeleter(this);
 	else
-	    KGlobal::unregisterStaticDeleter(this);
+	    TDEGlobal::unregisterStaticDeleter(this);
         globalRef = obj;
 	return obj;
     }
@@ -127,7 +127,7 @@ public:
     	deleteit = 0;
     }
     virtual ~KStaticDeleter() {
-    	KGlobal::unregisterStaticDeleter(this);
+    	TDEGlobal::unregisterStaticDeleter(this);
 	destructObject();
     }
 private:
diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp
index d33c3c924..b19c5b875 100644
--- a/tdecore/kstringhandler.cpp
+++ b/tdecore/kstringhandler.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "kstringhandler.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 
 static void parsePythonRange( const TQCString &range, uint &start, uint &end )
 {
@@ -654,7 +654,7 @@ TQString KStringHandler::from8Bit( const char *str )
   if (!str)
     return TQString::null;
   if (!*str) {
-    static const TQString &emptyString = KGlobal::staticQString("");
+    static const TQString &emptyString = TDEGlobal::staticQString("");
     return emptyString;
   }
   return KStringHandler::isUtf8( str ) ?
diff --git a/tdecore/kstringhandler.h b/tdecore/kstringhandler.h
index 40cfa3617..f20963d63 100644
--- a/tdecore/kstringhandler.h
+++ b/tdecore/kstringhandler.h
@@ -350,8 +350,8 @@ public:
      *
      * Example:
      * \code
-     * perlSplit(' ', "kparts reaches the parts other parts can't", 3)
-     * TQStringList contains: "kparts", "reaches", "the parts other parts can't"
+     * perlSplit(' ', "tdeparts reaches the parts other parts can't", 3)
+     * TQStringList contains: "tdeparts", "reaches", "the parts other parts can't"
      * \endcode
      *
      * @param sep is the character to use to delimit s.
diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp
index c134914c1..d16d2e185 100644
--- a/tdecore/ktempdir.cpp
+++ b/tdecore/ktempdir.cpp
@@ -47,8 +47,8 @@
 #include <tqdatetime.h>
 #include <tqdir.h>
 
-#include "kglobal.h"
-#include "kapplication.h"
+#include "tdeglobal.h"
+#include "tdeapplication.h"
 #include "kinstance.h"
 #include "ktempdir.h"
 #include "kstandarddirs.h"
@@ -63,7 +63,7 @@ KTempDir::KTempDir(TQString directoryPrefix, int mode)
    mError=0;
    if (directoryPrefix.isEmpty())
    {
-      directoryPrefix = locateLocal("tmp", KGlobal::instance()->instanceName());
+      directoryPrefix = locateLocal("tmp", TDEGlobal::instance()->instanceName());
    }
    (void) create(directoryPrefix , mode);
 }
@@ -72,7 +72,7 @@ bool
 KTempDir::create(const TQString &directoryPrefix, int mode)
 {
    // make sure the random seed is randomized
-   (void) KApplication::random();
+   (void) TDEApplication::random();
 
    TQCString nme = TQFile::encodeName(directoryPrefix) + "XXXXXX";
    char *realName;
diff --git a/tdecore/ktempdir.h b/tdecore/ktempdir.h
index f5b2f8026..33bb825d0 100644
--- a/tdecore/ktempdir.h
+++ b/tdecore/ktempdir.h
@@ -45,7 +45,7 @@ class KTempDirPrivate;
  *
  * KTempFile does not create any missing directories, but locateLocal() does.
  *
- * See also KStandardDirs
+ * See also TDEStandardDirs
  *
  * @since 3.2
  * @author Joseph Wenninger <jowenn@kde.org>
@@ -133,7 +133,7 @@ public:
     *
     * @note This function is more meant for removing a directory
     * not created by the user. For user-created directories,
-    * using KIO::NetAccess::del is recommended instead,
+    * using TDEIO::NetAccess::del is recommended instead,
     * especially as it has user feedback for long operations.
     *
     * @param path Path of the directory to delete
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp
index 77a0cca0f..3436cdabb 100644
--- a/tdecore/ktimezones.cpp
+++ b/tdecore/ktimezones.cpp
@@ -24,7 +24,7 @@
 #include <kmdcodec.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqdatetime.h>
 #include <tqfile.h>
@@ -203,7 +203,7 @@ bool KTimezone::isValidLongitude(float longitude)
 }
 
 KTimezone::KTimezone(
-    KSharedPtr<KTimezoneSource> db, const TQString& name,
+    TDESharedPtr<KTimezoneSource> db, const TQString& name,
     const TQString &countryCode, float latitude, float longitude,
     const TQString &comment) :
     m_db(db),
@@ -400,7 +400,7 @@ const KTimezones::ZoneMap KTimezones::allZones()
                     "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'";
                 // Note the use of blocking here...it is a trivial amount of data!
                 temp.close();
-                reader.start(KProcess::Block);
+                reader.start(TDEProcess::Block);
                 f.setName(temp.name());
                 if (!temp.status() || !f.open(IO_ReadOnly))
                 {
@@ -415,7 +415,7 @@ const KTimezones::ZoneMap KTimezones::allZones()
     TQTextStream str(&f);
     TQRegExp lineSeparator("[ \t]");
     TQRegExp ordinateSeparator("[+-]");
-    KSharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir));
+    TDESharedPtr<KTimezoneSource> db(new KTimezoneSource(m_zoneinfoDir));
     while (!str.atEnd())
     {
         TQString line = str.readLine();
diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h
index d24e8ec10..339cbf5bf 100644
--- a/tdecore/ktimezones.h
+++ b/tdecore/ktimezones.h
@@ -49,7 +49,7 @@ class KTimezonesPrivate;
  * @author S.R.Haque <srhaque@iee.org>.
  */
 class TDECORE_EXPORT KTimezoneSource :
-    public KShared
+    public TDEShared
 {
 public:
     KTimezoneSource(const TQString &db);
@@ -114,7 +114,7 @@ public:
      * @param comment description of the timezone, if any.
      */
     KTimezone(
-        KSharedPtr<KTimezoneSource> db, const TQString &name,
+        TDESharedPtr<KTimezoneSource> db, const TQString &name,
         const TQString &countryCode = TQString(), float latitude = UNKNOWN, float longitude = UNKNOWN,
         const TQString &comment = TQString());
     ~KTimezone();
@@ -191,7 +191,7 @@ private:
     KTimezone(const KTimezone&);
     KTimezone& operator=(const KTimezone&);
 
-    KSharedPtr<KTimezoneSource> m_db;
+    TDESharedPtr<KTimezoneSource> m_db;
     TQString m_name;
     TQString m_countryCode;
     float m_latitude;
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 5f7087313..0a3a0962a 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -34,16 +34,16 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #if defined Q_WS_X11
 #include <twin.h> 
-#include <kstartupinfo.h> 
+#include <tdestartupinfo.h> 
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kdebug.h"
 #include "kuniqueapplication.h"
 
@@ -64,10 +64,10 @@ bool KUniqueApplication::s_multipleInstances = false;
 bool KUniqueApplication::s_uniqueTestDone = false;
 bool KUniqueApplication::s_handleAutoStarted = false;
 
-static KCmdLineOptions kunique_options[] =
+static TDECmdLineOptions kunique_options[] =
 {
   { "nofork", "Don't run in the background.", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 struct DCOPRequest {
@@ -86,7 +86,7 @@ public:
 void
 KUniqueApplication::addCmdLineOptions()
 {
-  KCmdLineArgs::addCmdLineOptions(kunique_options, 0, "kuniqueapp", "tde" );
+  TDECmdLineArgs::addCmdLineOptions(kunique_options, 0, "kuniqueapp", "tde" );
 }
 
 bool
@@ -99,12 +99,12 @@ KUniqueApplication::start()
 #ifdef Q_WS_WIN
   s_nofork = true;
 #else
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs("kuniqueapp");
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("kuniqueapp");
   s_nofork = !args->isSet("fork");
   delete args;
 #endif
 
-  TQCString appName = KCmdLineArgs::about->appName();
+  TQCString appName = TDECmdLineArgs::about->appName();
 
   if (s_nofork)
   {
@@ -186,17 +186,17 @@ KUniqueApplication::start()
 #if 0
 #ifdef Q_WS_X11
            // say we're up and running ( probably no new window will appear )
-           KStartupInfoId id;
-           if( kapp != NULL ) // KApplication constructor unsets the env. variable
+           TDEStartupInfoId id;
+           if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
                id.initId( kapp->startupId());
            else
-               id = KStartupInfo::currentStartupIdEnv();
+               id = TDEStartupInfo::currentStartupIdEnv();
            if( !id.none())
            {
                Display* disp = XOpenDisplay( NULL );
                if( disp != NULL ) // use extra X connection
                {
-                   KStartupInfo::sendFinishX( disp, id );
+                   TDEStartupInfo::sendFinishX( disp, id );
                    XCloseDisplay( disp );
                }
            }
@@ -210,19 +210,19 @@ KUniqueApplication::start()
 
      {
 #ifdef Q_WS_X11
-         KStartupInfoId id;
-         if( kapp != NULL ) // KApplication constructor unsets the env. variable
+         TDEStartupInfoId id;
+         if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
              id.initId( kapp->startupId());
          else
-             id = KStartupInfo::currentStartupIdEnv();
+             id = TDEStartupInfo::currentStartupIdEnv();
          if( !id.none())
          { // notice about pid change
             Display* disp = XOpenDisplay( NULL );
             if( disp != NULL ) // use extra X connection
                {
-               KStartupInfoData data;
+               TDEStartupInfoData data;
                data.addPid( getpid());
-               KStartupInfo::sendChangeX( disp, id, data );
+               TDEStartupInfo::sendChangeX( disp, id, data );
                XCloseDisplay( disp );
                }
          }
@@ -273,11 +273,11 @@ KUniqueApplication::start()
 
      TQCString new_asn_id;
 #if defined Q_WS_X11
-     KStartupInfoId id;
-     if( kapp != NULL ) // KApplication constructor unsets the env. variable
+     TDEStartupInfoId id;
+     if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
          id.initId( kapp->startupId());
      else
-         id = KStartupInfo::currentStartupIdEnv();
+         id = TDEStartupInfo::currentStartupIdEnv();
      if( !id.none())
          new_asn_id = id.id();
 #endif
@@ -285,14 +285,14 @@ KUniqueApplication::start()
      TQByteArray data, reply;
      TQDataStream ds(data, IO_WriteOnly);
 
-     KCmdLineArgs::saveAppArgs(ds);
+     TDECmdLineArgs::saveAppArgs(ds);
      ds << new_asn_id;
 
      dc->setPriorityCall(true);
      TQCString replyType;
-     if (!dc->call(appName, KCmdLineArgs::about->appName(), "newInstance()", data, replyType, reply))
+     if (!dc->call(appName, TDECmdLineArgs::about->appName(), "newInstance()", data, replyType, reply))
      {
-        kdError() << "Communication problem with " << KCmdLineArgs::about->appName() << ", it probably crashed." << endl;
+        kdError() << "Communication problem with " << TDECmdLineArgs::about->appName() << ", it probably crashed." << endl;
         delete dc;	// Clean up DCOP commmunication
         ::exit(255);
      }
@@ -315,8 +315,8 @@ KUniqueApplication::start()
 
 
 KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool configUnique)
-  : KApplication( allowStyles, GUIenabled, initHack( configUnique )),
-    DCOPObject(KCmdLineArgs::about->appName())
+  : TDEApplication( allowStyles, GUIenabled, initHack( configUnique )),
+    DCOPObject(TDECmdLineArgs::about->appName())
 {
   d = new KUniqueApplicationPrivate;
   d->processingRequest = false;
@@ -331,8 +331,8 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c
 #ifdef Q_WS_X11
 KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual,
 		Qt::HANDLE colormap, bool allowStyles, bool configUnique)
-  : KApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
-    DCOPObject(KCmdLineArgs::about->appName())
+  : TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
+    DCOPObject(TDECmdLineArgs::about->appName())
 {
   d = new KUniqueApplicationPrivate;
   d->processingRequest = false;
@@ -351,12 +351,12 @@ KUniqueApplication::~KUniqueApplication()
 }
 
 // this gets called before even entering TQApplication::TQApplication()
-KInstance* KUniqueApplication::initHack( bool configUnique )
+TDEInstance* KUniqueApplication::initHack( bool configUnique )
 {
-  KInstance* inst = new KInstance( KCmdLineArgs::about );
+  TDEInstance* inst = new TDEInstance( TDECmdLineArgs::about );
   if (configUnique)
   {
-    KConfigGroupSaver saver( inst->config(), "KDE" );
+    TDEConfigGroupSaver saver( inst->config(), "KDE" );
     s_multipleInstances = inst->config()->readBoolEntry("MultipleInstances", false);
   }
   if( !start())
@@ -381,11 +381,11 @@ void KUniqueApplication::newInstanceNoFork()
   // KDE4 remove
   // A hack to make startup notification stop for apps which override newInstance()
   // and reuse an already existing window there, but use KWin::activateWindow()
-  // instead of KStartupInfo::setNewStartupId(). Therefore KWin::activateWindow()
+  // instead of TDEStartupInfo::setNewStartupId(). Therefore KWin::activateWindow()
   // for now sets this flag. Automatically ending startup notification always
   // would cause problem if the new window would show up with a small delay.
   if( s_handleAutoStarted )
-      KStartupInfo::handleAutoAppStartedSending();
+      TDEStartupInfo::handleAutoAppStartedSending();
 #endif
   // What to do with the return value ?
 }
@@ -433,7 +433,7 @@ KUniqueApplication::processDelayed()
      if (request->fun == "newInstance()") {
        dcopClient()->setPriorityCall(false);
        TQDataStream ds(request->data, IO_ReadOnly);
-       KCmdLineArgs::loadAppArgs(ds);
+       TDECmdLineArgs::loadAppArgs(ds);
        if( !ds.atEnd()) // backwards compatibility
        {
            TQCString asn_id;
@@ -445,7 +445,7 @@ KUniqueApplication::processDelayed()
        d->firstInstance = false;
 #if defined Q_WS_X11
        if( s_handleAutoStarted )
-           KStartupInfo::handleAutoAppStartedSending(); // KDE4 remove?
+           TDEStartupInfo::handleAutoAppStartedSending(); // KDE4 remove?
 #endif
        TQDataStream rs(replyData, IO_WriteOnly);
        rs << exitCode;
@@ -476,7 +476,7 @@ int KUniqueApplication::newInstance()
     // and what's important, it does it properly. If you reimplement newInstance(),
     // and don't call the inherited one, use this (but NOT when newInstance()
     // is called for the first time, like here).
-      KStartupInfo::setNewStartupId( mainWidget(), kapp->startupId());
+      TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId());
 #endif
     }
   }
@@ -489,7 +489,7 @@ void KUniqueApplication::setHandleAutoStarted()
 }
 
 void KUniqueApplication::virtual_hook( int id, void* data )
-{ KApplication::virtual_hook( id, data );
+{ TDEApplication::virtual_hook( id, data );
   DCOPObject::virtual_hook( id, data ); }
 
 #include "kuniqueapplication.moc"
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index b4ad50129..3b7bd8d6e 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -21,7 +21,7 @@
 #ifndef _KUNIQUEAPP_H
 #define _KUNIQUEAPP_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopobject.h>
 
 class KUniqueApplicationPrivate;
@@ -36,27 +36,27 @@ class KUniqueApplicationPrivate;
  * the information to the first instance and then quit.
  *
  * The .desktop file for the application should state X-DCOP-ServiceType=Unique,
- * see kapplication.h
+ * see tdeapplication.h
  *
  * If your application is used to open files, it should also support the --tempfile
- * option (see KCmdLineArgs::addTempFileOption()), to delete tempfiles after use.
+ * option (see TDECmdLineArgs::addTempFileOption()), to delete tempfiles after use.
  * Add X-TDE-HasTempFileOption=true to the .desktop file to indicate this.
  *
- * @see KApplication DCOPObject
+ * @see TDEApplication DCOPObject
  * @author Preston Brown <pbrown@kde.org>
  */
-class TDECORE_EXPORT KUniqueApplication : public KApplication, public DCOPObject
+class TDECORE_EXPORT KUniqueApplication : public TDEApplication, public DCOPObject
 {
   Q_OBJECT
 public:
   /**
-   * Constructor. Takes command line arguments from KCmdLineArgs
+   * Constructor. Takes command line arguments from TDECmdLineArgs
    *
    * @param allowStyles Set to false to disable the loading on plugin based
    * styles. This is only useful to applications that do not display a GUI
    * normally. If you do create an application with @p allowStyles set to false
    * it normally runs in the background but under special circumstances
-   * displays widgets.  Call KApplication::enableStyles() before 
+   * displays widgets.  Call TDEApplication::enableStyles() before 
    * displaying any widgets.
    * @param GUIenabled Set to false to disable all GUI stuff. This implies
    * no styles either.
@@ -70,7 +70,7 @@ public:
 
 #ifdef Q_WS_X11
   /**
-   * Constructor. Takes command line arguments from KCmdLineArgs
+   * Constructor. Takes command line arguments from TDECmdLineArgs
    *
    * @param display Will be passed to Qt as the X display. The display
    * must be valid and already opened.
@@ -82,7 +82,7 @@ public:
    * styles. This is only useful to applications that do not display a GUI
    * normally. If you do create an application with @p allowStyles set to false
    * it normally runs in the background but under special circumstances
-   * displays widgets.  Call KApplication::enableStyles() before 
+   * displays widgets.  Call TDEApplication::enableStyles() before 
    * displaying any widgets.
    * @param configUnique If true, the uniqueness of the application will
    *                 depend on the value of the "MultipleInstances"
@@ -113,9 +113,9 @@ public:
    * Typically this is used like:
    * \code
    * int main(int argc, char **argv) {
-   *    KAboutData about("myappname", "myAppName", .....);
-   *    KCmdLineArgs::init(argc, argv, &about);
-   *    KCmdLineArgs::addCmdLineOptions( myCmdOptions );
+   *    TDEAboutData about("myappname", "myAppName", .....);
+   *    TDECmdLineArgs::init(argc, argv, &about);
+   *    TDECmdLineArgs::addCmdLineOptions( myCmdOptions );
    *    KUniqueApplication::addCmdLineOptions();
    *
    *    if (!KUniqueApplication::start()) {
@@ -162,7 +162,7 @@ public:
    * application asking for a new window to be created, possibly with
    * some data already loaded based on the arguments received.
    *
-   * Command line arguments have been passed to KCmdLineArgs before this
+   * Command line arguments have been passed to TDECmdLineArgs before this
    * function is called and can be checked in the usual way.
    *
    * The default implementation ensures the mainwindow of the already
@@ -204,7 +204,7 @@ private slots:
 
   void newInstanceNoFork();
   
-  static KInstance* initHack( bool configUnique );
+  static TDEInstance* initHack( bool configUnique );
  
 private:
   static bool s_nofork;
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index 7817742bc..2079c050b 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -27,7 +27,7 @@
 // KDE_QT_ONLY is first used for dcop/client (e.g. marshalling)
 #ifndef KDE_QT_ONLY
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kidna.h>
 #include <kprotocolinfo.h>
 #endif
@@ -334,14 +334,14 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de
   if (decodeDots)
   {
 #ifndef KDE_QT_ONLY
-     static const TQString &encodedDot = KGlobal::staticQString("%2e");
+     static const TQString &encodedDot = TDEGlobal::staticQString("%2e");
 #else
      TQString encodedDot("%2e");
 #endif
      if (path.find(encodedDot, 0, false) != -1)
      {
 #ifndef KDE_QT_ONLY
-        static const TQString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase!
+        static const TQString &encodedDOT = TDEGlobal::staticQString("%2E"); // Uppercase!
 #else
         TQString encodedDOT("%2E");
 #endif
@@ -2340,7 +2340,7 @@ KURL::URIMode KURL::uriModeForProtocol(const TQString& protocol)
     KURL::URIMode mode = Auto;
     if (protocol == fileProt)
         return URL;
-    if (KGlobal::_instance)
+    if (TDEGlobal::_instance)
         mode = KProtocolInfo::uriParseMode(protocol);
     if (mode == Auto ) {
 #else
diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp
index 2b07c2580..5e64d09b2 100644
--- a/tdecore/kurldrag.cpp
+++ b/tdecore/kurldrag.cpp
@@ -24,8 +24,8 @@
 #include <unistd.h>
 
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 class KURLDragPrivate
@@ -253,7 +253,7 @@ TQByteArray KURLDrag::encodedData( const char* mime ) const
 KURL KURLDrag::stringToUrl(const TQCString &s)
 {
     if (strncmp(s.data(), "file:", 5) == 0)
-       return KURL(s, KGlobal::locale()->fileEncodingMib());
+       return KURL(s, TDEGlobal::locale()->fileEncodingMib());
 
     return KURL(s, 106); // 106 is mib enum for utf8 codec;
 }
@@ -263,12 +263,12 @@ TQString KURLDrag::urlToString(const KURL &url)
     if (url.isLocalFile())
     {
 #if 1
-        return url.url(0, KGlobal::locale()->fileEncodingMib());
+        return url.url(0, TDEGlobal::locale()->fileEncodingMib());
 #else
         // According to the XDND spec, file:/ URLs for DND must have
         // the hostname part. But in really it just breaks many apps,
         // so it's disabled for now.
-        TQString s = url.url(0, KGlobal::locale()->fileEncodingMib());
+        TQString s = url.url(0, TDEGlobal::locale()->fileEncodingMib());
         if( !s.startsWith( "file://" ))
         {
             char hostname[257];
diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h
index 45a0e5945..ccaf86e1a 100644
--- a/tdecore/kurldrag.h
+++ b/tdecore/kurldrag.h
@@ -95,7 +95,7 @@ public:
    * This is an alternative way of setting the metadata:
    * either use the constructor to pass it all at once, or use
    * drag->metaData()["key"] = data;
-   * @see KIO::TransferJob
+   * @see TDEIO::TransferJob
    */
   TQMap<TQString, TQString> &metaData() { return m_metaData; }
 
diff --git a/tdecore/kuser.cpp b/tdecore/kuser.cpp
index 3fffddf4f..6bad14bd0 100644
--- a/tdecore/kuser.cpp
+++ b/tdecore/kuser.cpp
@@ -32,7 +32,7 @@
 #include <grp.h>
 
 
-class KUserPrivate : public KShared
+class KUserPrivate : public TDEShared
 {
 public:
 	bool valid;
@@ -271,7 +271,7 @@ TQStringList KUser::allUserNames() {
 KUser::~KUser() {
 }
 
-class KUserGroupPrivate : public KShared
+class KUserGroupPrivate : public TDEShared
 {
 public:
   bool valid;
diff --git a/tdecore/kuser.h b/tdecore/kuser.h
index 12b511f9f..a48cf124d 100644
--- a/tdecore/kuser.h
+++ b/tdecore/kuser.h
@@ -233,7 +233,7 @@ public:
   static TQStringList allUserNames();
 
 private:
-  KSharedPtr<KUserPrivate> d;
+  TDESharedPtr<KUserPrivate> d;
   void fillPasswd(struct passwd* p);
   void fillName(const char* name);
 };
@@ -375,7 +375,7 @@ public:
   static TQStringList allGroupNames();
   
 private:
-  KSharedPtr<KUserGroupPrivate> d;
+  TDESharedPtr<KUserGroupPrivate> d;
   void fillGroup(struct group* g);
   void fillName(const char* name);
 };
diff --git a/tdecore/kvmallocator.cpp b/tdecore/kvmallocator.cpp
index 996d55791..3b887eeee 100644
--- a/tdecore/kvmallocator.cpp
+++ b/tdecore/kvmallocator.cpp
@@ -31,7 +31,7 @@
 #include <tqintdict.h>
 #include <tqmap.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "kvmallocator.h"
diff --git a/tdecore/kxmessages.cpp b/tdecore/kxmessages.cpp
index 52781188f..116c74d1c 100644
--- a/tdecore/kxmessages.cpp
+++ b/tdecore/kxmessages.cpp
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "kxmessages.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #ifdef Q_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E
 
diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h
index 261dc6fdf..5caec19fc 100644
--- a/tdecore/kxmessages.h
+++ b/tdecore/kxmessages.h
@@ -43,12 +43,12 @@ class KXMessagesPrivate;
 /**
  * Sending string messages to other applications using the X Client Messages.
  *
- * Used internally by KStartupInfo. You usually don't want to use this, use DCOP
+ * Used internally by TDEStartupInfo. You usually don't want to use this, use DCOP
  * instead.
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-// KDE4 - make this internal for KStartupInfo only?
+// KDE4 - make this internal for TDEStartupInfo only?
 class TDECORE_EXPORT KXMessages
     : public TQWidget
     {
diff --git a/tdecore/libtdecore_weak.nmcheck b/tdecore/libtdecore_weak.nmcheck
index dc43acb6b..a72cebff4 100644
--- a/tdecore/libtdecore_weak.nmcheck
+++ b/tdecore/libtdecore_weak.nmcheck
@@ -1,7 +1,7 @@
 # KDE namespace check file
 
 # tdelibs classes
-KApplication::*
+TDEApplication::*
 
 # these should preferably go in some namespace in KDE4
 kDebugPrivate::*
diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp
index c7e968c16..0c072752c 100644
--- a/tdecore/netsupp.cpp
+++ b/tdecore/netsupp.cpp
@@ -37,7 +37,7 @@
 
 #include "config.h"
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #ifndef IN6_IS_ADDR_V4MAPPED
 #define NEED_IN6_TESTS
diff --git a/tdecore/network/CMakeLists.txt b/tdecore/network/CMakeLists.txt
index addc3633b..b68b9266f 100644
--- a/tdecore/network/CMakeLists.txt
+++ b/tdecore/network/CMakeLists.txt
@@ -24,9 +24,9 @@ install( FILES
     kresolver.h kreverseresolver.h tdesocketaddress.h
     tdesocketbase.h tdesocketdevice.h kclientsocketbase.h
     kstreamsocket.h kserversocket.h kdatagramsocket.h
-    kmulticastsocketdevice.h kmulticastsocket.h
+    tdemulticastsocketdevice.h tdemulticastsocket.h
     knetworkinterface.h khttpproxysocketdevice.h
-    ksockssocketdevice.h kbufferedsocket.h kiobuffer.h
+    ksockssocketdevice.h kbufferedsocket.h tdeiobuffer.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
diff --git a/tdecore/network/Makefile.am b/tdecore/network/Makefile.am
index 768180d1b..621e5fab2 100644
--- a/tdecore/network/Makefile.am
+++ b/tdecore/network/Makefile.am
@@ -38,13 +38,13 @@ include_HEADERS = kresolver.h \
 	kstreamsocket.h \
 	kserversocket.h \
 	kdatagramsocket.h \
-	kmulticastsocketdevice.h \
-	kmulticastsocket.h \
+	tdemulticastsocketdevice.h \
+	tdemulticastsocket.h \
 	knetworkinterface.h \
 	khttpproxysocketdevice.h \
 	ksockssocketdevice.h \
 	kbufferedsocket.h \
-	kiobuffer.h
+	tdeiobuffer.h
 noinst_HEADERS = kresolver_p.h \
 	kresolverworkerbase.h \
 	kresolverstandardworkers_p.h \
diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp
index 3566bde93..3e9462922 100644
--- a/tdecore/network/kbufferedsocket.cpp
+++ b/tdecore/network/kbufferedsocket.cpp
@@ -35,28 +35,28 @@
 using namespace KNetwork;
 using namespace KNetwork::Internal;
 
-class KNetwork::KBufferedSocketPrivate
+class KNetwork::TDEBufferedSocketPrivate
 {
 public:
-  mutable KSocketBuffer *input, *output;
+  mutable TDESocketBuffer *input, *output;
 
-  KBufferedSocketPrivate()
+  TDEBufferedSocketPrivate()
   {
     input = 0L;
     output = 0L;
   }
 };
 
-KBufferedSocket::KBufferedSocket(const TQString& host, const TQString& service,
+TDEBufferedSocket::TDEBufferedSocket(const TQString& host, const TQString& service,
 				 TQObject *parent, const char *name)
   : KStreamSocket(host, service, parent, name),
-    d(new KBufferedSocketPrivate)
+    d(new TDEBufferedSocketPrivate)
 {
   setInputBuffering(true);
   setOutputBuffering(true);
 }
 
-KBufferedSocket::~KBufferedSocket()
+TDEBufferedSocket::~TDEBufferedSocket()
 {
   closeNow();
   delete d->input;
@@ -64,13 +64,13 @@ KBufferedSocket::~KBufferedSocket()
   delete d;
 }
 
-void KBufferedSocket::setSocketDevice(KSocketDevice* device)
+void TDEBufferedSocket::setSocketDevice(TDESocketDevice* device)
 {
   KStreamSocket::setSocketDevice(device);
   device->setBlocking(false);
 }
 
-bool KBufferedSocket::setSocketOptions(int opts)
+bool TDEBufferedSocket::setSocketOptions(int opts)
 {
   if (opts == Blocking)
     return false;
@@ -79,7 +79,7 @@ bool KBufferedSocket::setSocketOptions(int opts)
   return KStreamSocket::setSocketOptions(opts);
 }
 
-void KBufferedSocket::close()
+void TDEBufferedSocket::close()
 {
   if (!d->output || d->output->isEmpty())
     closeNow();
@@ -94,10 +94,10 @@ void KBufferedSocket::close()
 }
 
 #ifdef USE_QT3
-TQ_LONG KBufferedSocket::bytesAvailable() const
+TQ_LONG TDEBufferedSocket::bytesAvailable() const
 #endif
 #ifdef USE_QT4
-qint64 KBufferedSocket::bytesAvailable() const
+qint64 TDEBufferedSocket::bytesAvailable() const
 #endif
 {
   if (!d->input)
@@ -106,7 +106,7 @@ qint64 KBufferedSocket::bytesAvailable() const
   return d->input->length();
 }
 
-TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
+TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout)
 {
   TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout);
   if (d->input)
@@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
 {
   if (d->input)
     {
@@ -134,13 +134,13 @@ TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return KStreamSocket::tqreadBlock(data, maxlen);
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from)
+TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
 {
   from = peerAddress();
   return tqreadBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
+TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
 {
   if (d->input)
     {
@@ -156,13 +156,13 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
   return KStreamSocket::peekBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   from = peerAddress();
   return peekBlock(data, maxlen);
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
 {
   if (state() != Connected)
     {
@@ -192,14 +192,14 @@ TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len
   return KStreamSocket::tqwriteBlock(data, len);
 }
 
-TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen,
-				   const KSocketAddress&)
+TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen,
+				   const TDESocketAddress&)
 {
   // ignore the third parameter
   return tqwriteBlock(data, maxlen);
 }
 
-void KBufferedSocket::enableRead(bool enable)
+void TDEBufferedSocket::enableRead(bool enable)
 {
   KStreamSocket::enableRead(enable);
   if (!enable && d->input)
@@ -216,7 +216,7 @@ void KBufferedSocket::enableRead(bool enable)
     TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity()));
 }
 
-void KBufferedSocket::enableWrite(bool enable)
+void TDEBufferedSocket::enableWrite(bool enable)
 {
   KStreamSocket::enableWrite(enable);
   if (!enable && d->output && !d->output->isEmpty())
@@ -228,7 +228,7 @@ void KBufferedSocket::enableWrite(bool enable)
     }
 }
 
-void KBufferedSocket::stateChanging(SocketState newState)
+void TDEBufferedSocket::stateChanging(SocketState newState)
 {
   if (newState == Connecting || newState == Connected)
     {
@@ -246,7 +246,7 @@ void KBufferedSocket::stateChanging(SocketState newState)
   KStreamSocket::stateChanging(newState);
 }
 
-void KBufferedSocket::setInputBuffering(bool enable)
+void TDEBufferedSocket::setInputBuffering(bool enable)
 {
   TQMutexLocker locker(mutex());
   if (!enable)
@@ -256,16 +256,16 @@ void KBufferedSocket::setInputBuffering(bool enable)
     }
   else if (d->input == 0L)
     {
-      d->input = new KSocketBuffer;
+      d->input = new TDESocketBuffer;
     }
 }
 
-KIOBufferBase* KBufferedSocket::inputBuffer()
+TDEIOBufferBase* TDEBufferedSocket::inputBuffer()
 {
   return d->input;
 }
 
-void KBufferedSocket::setOutputBuffering(bool enable)
+void TDEBufferedSocket::setOutputBuffering(bool enable)
 {
   TQMutexLocker locker(mutex());
   if (!enable)
@@ -275,20 +275,20 @@ void KBufferedSocket::setOutputBuffering(bool enable)
     }
   else if (d->output == 0L)
     {
-      d->output = new KSocketBuffer;
+      d->output = new TDESocketBuffer;
     }
 }
 
-KIOBufferBase* KBufferedSocket::outputBuffer()
+TDEIOBufferBase* TDEBufferedSocket::outputBuffer()
 {
   return d->output;
 }
 
 #ifdef USE_QT3
-TQ_ULONG KBufferedSocket::bytesToWrite() const
+TQ_ULONG TDEBufferedSocket::bytesToWrite() const
 #endif
 #ifdef USE_QT4
-qint64 KBufferedSocket::bytesToWrite() const
+qint64 TDEBufferedSocket::bytesToWrite() const
 #endif
 {
   if (!d->output)
@@ -297,14 +297,14 @@ qint64 KBufferedSocket::bytesToWrite() const
   return d->output->length();
 }
 
-void KBufferedSocket::closeNow()
+void TDEBufferedSocket::closeNow()
 {
   KStreamSocket::close();
   if (d->output)
     d->output->clear();
 }
 
-bool KBufferedSocket::canReadLine() const
+bool TDEBufferedSocket::canReadLine() const
 {
   if (!d->input)
     return false;
@@ -312,12 +312,12 @@ bool KBufferedSocket::canReadLine() const
   return d->input->canReadLine();
 }
 
-TQCString KBufferedSocket::readLine()
+TQCString TDEBufferedSocket::readLine()
 {
   return d->input->readLine();
 }
 
-void KBufferedSocket::waitForConnect()
+void TDEBufferedSocket::waitForConnect()
 {
   if (state() != Connecting)
     return;			// nothing to be waited on
@@ -327,7 +327,7 @@ void KBufferedSocket::waitForConnect()
   KStreamSocket::setSocketOptions(socketOptions() & ~Blocking);
 }
 
-void KBufferedSocket::slotReadActivity()
+void TDEBufferedSocket::slotReadActivity()
 {
   if (d->input && state() == Connected)
     {
@@ -374,7 +374,7 @@ void KBufferedSocket::slotReadActivity()
     }
 }
 
-void KBufferedSocket::slotWriteActivity()
+void TDEBufferedSocket::slotWriteActivity()
 {
   if (d->output && !d->output->isEmpty() &&
       (state() == Connected || state() == Closing))
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index 93bee08f3..60ad3e81d 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -31,12 +31,12 @@
 #include "kstreamsocket.h"
 #include <tdelibs_export.h>
 
-class KIOBufferBase;
+class TDEIOBufferBase;
 
 namespace KNetwork {
 
-class KBufferedSocketPrivate;
-/** @class KBufferedSocket kbufferedsocket.h kbufferedsocket.h
+class TDEBufferedSocketPrivate;
+/** @class TDEBufferedSocket kbufferedsocket.h kbufferedsocket.h
  *  @brief Buffered stream sockets.
  *
  * This class allows the user to create and operate buffered stream sockets
@@ -52,10 +52,10 @@ class KBufferedSocketPrivate;
  *       imposed by Qt's TQSocketNotifier. If you want to use a socket
  *       in an auxiliary thread, please use KStreamSocket.
  *
- * @see KNetwork::KStreamSocket, KNetwork::KServerSocket
+ * @see KNetwork::KStreamSocket, KNetwork::TDEServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class TDECORE_EXPORT KBufferedSocket: public KStreamSocket
+class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket
 {
   Q_OBJECT
   
@@ -68,18 +68,18 @@ public:
    * @param parent      the parent object for this object
    * @param name        the internal name for this object
    */
-  KBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null,
+  TDEBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null,
 		  TQObject* parent = 0L, const char *name = 0L);
 
   /**
    * Destructor.
    */
-  virtual ~KBufferedSocket();
+  virtual ~TDEBufferedSocket();
 
   /**
    * Be sure to catch new devices.
    */
-  virtual void setSocketDevice(KSocketDevice* device);
+  virtual void setSocketDevice(TDESocketDevice* device);
 
 protected:
   /**
@@ -122,7 +122,7 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Peeks data from the socket.
@@ -135,7 +135,7 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from);
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from);
 
   /**
    * Writes data to the socket.
@@ -148,7 +148,7 @@ public:
    *
    * The @p to parameter is discarded.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
 
   /**
    * Catch changes.
@@ -168,7 +168,7 @@ public:
   /**
    * Retrieves the input buffer object.
    */
-  KIOBufferBase* inputBuffer();
+  TDEIOBufferBase* inputBuffer();
 
   /**
    * Sets the use of output buffering.
@@ -178,7 +178,7 @@ public:
   /**
    * Retrieves the output buffer object.
    */
-  KIOBufferBase* outputBuffer();
+  TDEIOBufferBase* outputBuffer();
 
   /**
    * Returns the length of the output buffer.
@@ -240,10 +240,10 @@ signals:
   void bytesWritten(int bytes);
 
 private:
-  KBufferedSocket(const KBufferedSocket&);
-  KBufferedSocket& operator=(const KBufferedSocket&);
+  TDEBufferedSocket(const TDEBufferedSocket&);
+  TDEBufferedSocket& operator=(const TDEBufferedSocket&);
 
-  KBufferedSocketPrivate *d;
+  TDEBufferedSocketPrivate *d;
 
 public:
   // KDE4: remove this function
@@ -253,7 +253,7 @@ public:
    *
    * This function is provided to ease porting from KExtendedSocket,
    * which required a call to reset() in order to be able to connect again
-   * using the same device. This is not necessary in KBufferedSocket any more.
+   * using the same device. This is not necessary in TDEBufferedSocket any more.
    */
 #ifdef USE_QT3
   inline void reset()
diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp
index 780a5ec71..eb8e4883b 100644
--- a/tdecore/network/kclientsocketbase.cpp
+++ b/tdecore/network/kclientsocketbase.cpp
@@ -83,7 +83,7 @@ void KClientSocketBase::setState(SocketState state)
 bool KClientSocketBase::setSocketOptions(int opts)
 {
   TQMutexLocker locker(mutex());
-  KSocketBase::setSocketOptions(opts); // call parent
+  TDESocketBase::setSocketOptions(opts); // call parent
 
   // don't create the device unnecessarily
   if (hasDevice())
@@ -323,7 +323,7 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from)
+TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
   TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from);
@@ -347,7 +347,7 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
   TQ_LONG retval = socketDevice()->peekBlock(data, maxlen, from);
@@ -371,7 +371,7 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to)
+TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to)
 {
   resetError();
   TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to);
@@ -383,12 +383,12 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
   return retval;
 }
 
-KSocketAddress KClientSocketBase::localAddress() const
+TDESocketAddress KClientSocketBase::localAddress() const
 {
   return socketDevice()->localAddress();
 }
 
-KSocketAddress KClientSocketBase::peerAddress() const
+TDESocketAddress KClientSocketBase::peerAddress() const
 {
   return socketDevice()->peerAddress();
 }
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 59da43511..27da219a9 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -46,7 +46,7 @@ class KClientSocketBasePrivate;
  * such as, and especially, name resolution and signals.
  *
  * @note This class is abstract. If you're looking for a normal,
- *       client socket class, see @ref KStreamSocket and KBufferedSocket
+ *       client socket class, see @ref KStreamSocket and TDEBufferedSocket
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
@@ -115,7 +115,7 @@ public:
 
 protected:
   /**
-   * Sets the socket options. Reimplemented from KSocketBase.
+   * Sets the socket options. Reimplemented from TDESocketBase.
    */
   virtual bool setSocketOptions(int opts);
 
@@ -160,7 +160,7 @@ public:
    *
    * This is useful, for instance, when IP addresses are in
    * their string representation (such as "1.2.3.4") or come
-   * from other sources like @ref KSocketAddress.
+   * from other sources like @ref TDESocketAddress.
    *
    * @param enable	whether to enable
    */
@@ -186,7 +186,7 @@ public:
    * emitted (only once, even if we're doing a double lookup).
    * If the lookup failed (for any of the two lookups) the 
    * @ref gotError signal will be emitted with the appropriate
-   * error condition (see @ref KSocketBase::SocketError).
+   * error condition (see @ref TDESocketBase::SocketError).
    *
    * This function returns true on success and false on error. Note that
    * this is not the lookup result!
@@ -216,7 +216,7 @@ public:
 		    const TQString& service = TQString::null) = 0;
 
   /**
-   * Reimplemented from KSocketBase. Connect this socket to this
+   * Reimplemented from TDESocketBase. Connect this socket to this
    * specific address.
    *
    * Unlike @ref bind(const TQString&, const TQString&) above, this function
@@ -258,7 +258,7 @@ public:
 
   /**
    * @overload
-   * Reimplemented from KSocketBase.
+   * Reimplemented from TDESocketBase.
    */
   virtual bool connect(const KResolverEntry& address);
 
@@ -300,7 +300,7 @@ public:
 
   /**
    * Returns the number of bytes available on this socket.
-   * Reimplemented from KSocketBase.
+   * Reimplemented from TDESocketBase.
    */
 #ifdef USE_QT3
   virtual TQ_LONG bytesAvailable() const;
@@ -310,52 +310,52 @@ public:
 #endif
 
   /**
-   * Waits for more data. Reimplemented from KSocketBase.
+   * Waits for more data. Reimplemented from TDESocketBase.
    */
   virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L);
 
   /**
-   * Reads data from a socket. Reimplemented from KSocketBase.
+   * Reads data from a socket. Reimplemented from TDESocketBase.
    */
   virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
 
   /**
    * @overload
-   * Reads data from a socket. Reimplemented from KSocketBase.
+   * Reads data from a socket. Reimplemented from TDESocketBase.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
 
   /**
-   * Peeks data from the socket. Reimplemented from KSocketBase.
+   * Peeks data from the socket. Reimplemented from TDESocketBase.
    */
   virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
 
   /**
    * @overload
-   * Peeks data from the socket. Reimplemented from KSocketBase.
+   * Peeks data from the socket. Reimplemented from TDESocketBase.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from);
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from);
 
   /**
-   * Writes data to the socket. Reimplemented from KSocketBase.
+   * Writes data to the socket. Reimplemented from TDESocketBase.
    */
   virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
 
   /**
    * @overload
-   * Writes data to the socket. Reimplemented from KSocketBase.
+   * Writes data to the socket. Reimplemented from TDESocketBase.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
 
   /**
-   * Returns the local socket address. Reimplemented from KSocketBase.
+   * Returns the local socket address. Reimplemented from TDESocketBase.
    */
-  virtual KSocketAddress localAddress() const;
+  virtual TDESocketAddress localAddress() const;
 
   /**
-   * Returns the peer socket address. Reimplemented from KSocketBase.
+   * Returns the peer socket address. Reimplemented from TDESocketBase.
    */
-  virtual KSocketAddress peerAddress() const;
+  virtual TDESocketAddress peerAddress() const;
 
   /**
    * Returns true if the readyRead signal is set to be emitted.
diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp
index c5a1562a4..ac8e526ee 100644
--- a/tdecore/network/kdatagramsocket.cpp
+++ b/tdecore/network/kdatagramsocket.cpp
@@ -153,7 +153,7 @@ KDatagramPacket KDatagramSocket::receive()
     }
 
   TQByteArray data(size);
-  KSocketAddress address;
+  TDESocketAddress address;
   
   // now do the reading
   size = tqreadBlock(data.data(), size, address);
@@ -170,7 +170,7 @@ TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet)
   return tqwriteBlock(packet.data(), packet.size(), packet.address());
 }
 
-TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   if (to.family() != AF_UNSPEC)
     {
diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h
index c51fea1ef..fd12a0d97 100644
--- a/tdecore/network/kdatagramsocket.h
+++ b/tdecore/network/kdatagramsocket.h
@@ -51,7 +51,7 @@ class KResolverEntry;
 class TDECORE_EXPORT KDatagramPacket
 {
   TQByteArray m_data;
-  KSocketAddress m_address;
+  TDESocketAddress m_address;
 
 public:
   /**
@@ -78,14 +78,14 @@ public:
   /**
    * Constructs the datagram with the specified content and address.
    */
-  KDatagramPacket(const TQByteArray& content, const KSocketAddress& addr)
+  KDatagramPacket(const TQByteArray& content, const TDESocketAddress& addr)
     : m_data(content), m_address(addr)
   { }
 
   /**
    * Constructs the datagram with the specified content and address.
    */
-  KDatagramPacket(const char *content, uint length, const KSocketAddress& addr)
+  KDatagramPacket(const char *content, uint length, const TDESocketAddress& addr)
     : m_address(addr)
   { setData(content, length); }
 
@@ -134,13 +134,13 @@ public:
   /**
    * Returns the socket address
    */
-  const KSocketAddress& address() const
+  const TDESocketAddress& address() const
   { return m_address; }
 
   /**
    * Sets the address stored to the given value.
    */
-  void setAddress(const KSocketAddress& addr)
+  void setAddress(const TDESocketAddress& addr)
   { m_address = addr; }
 
   /**
@@ -241,7 +241,7 @@ public:
   /**
    * Writes data to the socket. Reimplemented from KClientSocketBase.
    */
-  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Receives one datagram from the stream. The reading process is guaranteed
diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp
index 42d65326b..e4529f28a 100644
--- a/tdecore/network/khttpproxysocketdevice.cpp
+++ b/tdecore/network/khttpproxysocketdevice.cpp
@@ -45,15 +45,15 @@ public:
   KResolverEntry proxy;
   TQCString request;
   TQCString reply;
-  KSocketAddress peer;
+  TDESocketAddress peer;
 
   KHttpProxySocketDevicePrivate()
     : proxy(KHttpProxySocketDevice::defaultProxy)
   { }
 };
 
-KHttpProxySocketDevice::KHttpProxySocketDevice(const KSocketBase* parent)
-  : KSocketDevice(parent), d(new KHttpProxySocketDevicePrivate)
+KHttpProxySocketDevice::KHttpProxySocketDevice(const TDESocketBase* parent)
+  : TDESocketDevice(parent), d(new KHttpProxySocketDevicePrivate)
 {
 }
 
@@ -66,7 +66,7 @@ KHttpProxySocketDevice::KHttpProxySocketDevice(const KResolverEntry& proxy)
 KHttpProxySocketDevice::~KHttpProxySocketDevice()
 {
   // nothing special to be done during closing
-  // KSocketDevice::~KSocketDevice closes the socket
+  // TDESocketDevice::~TDESocketDevice closes the socket
 
   delete d;
 }
@@ -90,27 +90,27 @@ void KHttpProxySocketDevice::setProxyServer(const KResolverEntry& proxy)
 void KHttpProxySocketDevice::close()
 {
   d->reply = d->request = TQCString();
-  d->peer = KSocketAddress();
-  KSocketDevice::close();
+  d->peer = TDESocketAddress();
+  TDESocketDevice::close();
 }
 
-KSocketAddress KHttpProxySocketDevice::peerAddress() const
+TDESocketAddress KHttpProxySocketDevice::peerAddress() const
 {
   if (isOpen())
     return d->peer;
-  return KSocketAddress();
+  return TDESocketAddress();
 }
 
-KSocketAddress KHttpProxySocketDevice::externalAddress() const
+TDESocketAddress KHttpProxySocketDevice::externalAddress() const
 {
-  return KSocketAddress();
+  return TDESocketAddress();
 }
 
 bool KHttpProxySocketDevice::connect(const KResolverEntry& address)
 {
   if (d->proxy.family() == AF_UNSPEC)
     // no proxy server set !
-    return KSocketDevice::connect(address);
+    return TDESocketDevice::connect(address);
 
   if (isOpen())
     {
@@ -148,7 +148,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi
   if (m_sockfd == -1)
     {
       // must create the socket
-      if (!KSocketDevice::connect(d->proxy))
+      if (!TDESocketDevice::connect(d->proxy))
 	return false;		// also unable to contact proxy server
       setState(0);		// unset open flag
 
@@ -170,7 +170,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi
 bool KHttpProxySocketDevice::parseServerReply()
 {
   // make sure we're connected
-  if (!KSocketDevice::connect(d->proxy))
+  if (!TDESocketDevice::connect(d->proxy))
     if (error() == InProgress)
       return true;
     else if (error() != NoError)
diff --git a/tdecore/network/khttpproxysocketdevice.h b/tdecore/network/khttpproxysocketdevice.h
index 903d7aa6f..dc5faef93 100644
--- a/tdecore/network/khttpproxysocketdevice.h
+++ b/tdecore/network/khttpproxysocketdevice.h
@@ -35,18 +35,18 @@ class KHttpProxySocketDevicePrivate;
  * @class KHttpProxySocketDevice khttpproxysocketdevice.h khttproxysocketdevice.h
  * @brief The low-level backend for HTTP proxying.
  *
- * This class derives from @ref KSocketDevice and implements the necessary
+ * This class derives from @ref TDESocketDevice and implements the necessary
  * calls to make a connection through an HTTP proxy.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KHttpProxySocketDevice: public KSocketDevice
+class TDECORE_EXPORT KHttpProxySocketDevice: public TDESocketDevice
 {
 public:
   /**
    * Constructor.
    */
-  KHttpProxySocketDevice(const KSocketBase* = 0L);
+  KHttpProxySocketDevice(const TDESocketBase* = 0L);
 
   /**
    * Constructor with proxy server's address.
@@ -92,13 +92,13 @@ public:
   /**
    * Return the peer address.
    */
-  virtual KSocketAddress peerAddress() const;
+  virtual TDESocketAddress peerAddress() const;
 
   /**
    * Return the externally visible address. We can't tell what that address is,
    * so this function always returns an empty object.
    */
-  virtual KSocketAddress externalAddress() const;
+  virtual TDESocketAddress externalAddress() const;
 
 private:
   /**
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index a6ca8e45c..b9ac605c0 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -54,7 +54,7 @@
 #endif
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Us
 #include "kresolver.h"
@@ -75,7 +75,7 @@ using namespace KNetwork::Internal;
 class KNetwork::KResolverEntryPrivate: public TQShared
 {
 public:
-  KSocketAddress addr;
+  TDESocketAddress addr;
   int socktype;
   int protocol;
   TQString canonName;
@@ -93,7 +93,7 @@ KResolverEntry::KResolverEntry() :
 }
 
 // constructor with stuff
-KResolverEntry::KResolverEntry(const KSocketAddress& addr, int socktype, int protocol,
+KResolverEntry::KResolverEntry(const TDESocketAddress& addr, int socktype, int protocol,
 			       const TQString& canonName, const TQCString& encodedName) :
   d(new KResolverEntryPrivate)
 {
@@ -110,7 +110,7 @@ KResolverEntry::KResolverEntry(const struct sockaddr* sa, TQ_UINT16 salen, int s
 			       const TQCString& encodedName) :
   d(new KResolverEntryPrivate)
 {
-  d->addr = KSocketAddress(sa, salen);
+  d->addr = TDESocketAddress(sa, salen);
   d->socktype = socktype;
   d->protocol = protocol;
   d->canonName = canonName;
@@ -135,9 +135,9 @@ KResolverEntry::~KResolverEntry()
 }
 
 // returns the socket address
-KSocketAddress KResolverEntry::address() const
+TDESocketAddress KResolverEntry::address() const
 {
-  return d ? d->addr : KSocketAddress();
+  return d ? d->addr : TDESocketAddress();
 }
 
 // returns the length
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index 5e20e174a..3de19acd3 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -73,10 +73,10 @@ public:
   KResolverEntry();
 
   /**
-   * Constructs a new KResolverEntry from a KSocketAddress
+   * Constructs a new KResolverEntry from a TDESocketAddress
    * and other data.
    *
-   * The KSocketAddress @p addr parameter will be deep-copied.
+   * The TDESocketAddress @p addr parameter will be deep-copied.
    *
    * @param addr	the address that was resolved
    * @param socktype	the socket type of the resolved address
@@ -84,7 +84,7 @@ public:
    * @param canonName	the canonical name of the resolved hostname
    * @param encodedName	the ASCII-compatible encoding of the hostname
    */
-  KResolverEntry(const KSocketAddress& addr, int socktype, int protocol,
+  KResolverEntry(const TDESocketAddress& addr, int socktype, int protocol,
 		const TQString& canonName = TQString::null,
 		const TQCString& encodedName = TQCString());
 
@@ -92,7 +92,7 @@ public:
    * Constructs a new KResolverEntry from raw forms of
    * socket addresses and other data.
    *
-   * This constructor instead creates an internal KSocketAddress object.
+   * This constructor instead creates an internal TDESocketAddress object.
    *
    * @param sa		the sockaddr structure containing the raw address
    * @param salen	the length of the sockaddr structure
@@ -123,7 +123,7 @@ public:
   /**
    * Retrieves the socket address associated with this entry.
    */
-  KSocketAddress address() const;
+  TDESocketAddress address() const;
 
   /**
    * Retrieves the length of the socket address structure.
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index 77c085e08..96519d1aa 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -44,9 +44,9 @@
 #include <tqfile.h>
 
 #include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include "kresolver.h"
 #include "tdesocketaddress.h"
@@ -84,7 +84,7 @@ void KBlacklistWorker::init()
   // HACK!
   // FIXME KDE4: How do I detect there is an instance, without triggering
   // its creation or an assertion fault?
-  if (!KGlobal::_instance)
+  if (!TDEGlobal::_instance)
     return;
 
   static bool beenhere = false;
@@ -99,7 +99,7 @@ void KBlacklistWorker::init()
 void KBlacklistWorker::loadBlacklist()
 {
   TQMutexLocker locker(&blacklistMutex);
-  TQStringList filelist = KGlobal::dirs()->findAllResources("config", "ipv6blacklist");
+  TQStringList filelist = TDEGlobal::dirs()->findAllResources("config", "ipv6blacklist");
 
   TQStringList::ConstIterator it = filelist.constBegin(),
     end = filelist.constEnd();
@@ -317,7 +317,7 @@ namespace
   {
     if (herrno)
       {
-	tqDebug("KStandardWorker::processResults: got error %d", herrno);
+	tqDebug("TDEStandardWorker::processResults: got error %d", herrno);
 	switch (herrno)
 	  {
 	  case HOST_NOT_FOUND:
@@ -368,9 +368,9 @@ namespace
       {
 	sa.setHost(KIpAddress(he->h_addr_list[i], he->h_addrtype == AF_INET ? 4 : 6));
 	results.prepend(KResolverEntry(sa, socktype, proto, canon, m_hostname));
-	// tqDebug("KStandardWorker::processResults: adding %s", sa.toString().latin1());
+	// tqDebug("TDEStandardWorker::processResults: adding %s", sa.toString().latin1());
       }
-    //  tqDebug("KStandardWorker::processResults: added %d entries", i);
+    //  tqDebug("TDEStandardWorker::processResults: added %d entries", i);
   }
 
 #else  // HAVE_GETADDRINFO
@@ -540,7 +540,7 @@ namespace
 #endif // HAVE_GETADDRINFO
 } // namespace
 
-bool KStandardWorker::sanityCheck()
+bool TDEStandardWorker::sanityCheck()
 {
   // check that the requested values are sensible
 
@@ -580,7 +580,7 @@ bool KStandardWorker::sanityCheck()
   return true;			// it's sane
 }
 
-bool KStandardWorker::resolveScopeId()
+bool TDEStandardWorker::resolveScopeId()
 {
   // we must test the original name, not the encoded one
   scopeid = 0;
@@ -606,7 +606,7 @@ bool KStandardWorker::resolveScopeId()
   return true;
 }
 
-bool KStandardWorker::resolveService()
+bool TDEStandardWorker::resolveService()
 {
   // find the service first
   bool ok;
@@ -656,7 +656,7 @@ bool KStandardWorker::resolveService()
   return true;
 }
 
-KResolver::ErrorCodes KStandardWorker::addUnix()
+KResolver::ErrorCodes TDEStandardWorker::addUnix()
 {
   // before trying to add, see if the user wants Unix sockets
   if ((familyMask() & KResolver::UnixFamily) == 0)
@@ -691,7 +691,7 @@ KResolver::ErrorCodes KStandardWorker::addUnix()
   return KResolver::NoError;
 }
 
-bool KStandardWorker::resolveNumerically()
+bool TDEStandardWorker::resolveNumerically()
 {
   // if the NoResolve flag is active, our result from this point forward
   // will always be true, even if the resolution failed.
@@ -793,7 +793,7 @@ bool KStandardWorker::resolveNumerically()
   return ok || (flags() & KResolver::NoResolve);
 }
 
-bool KStandardWorker::preprocess()
+bool TDEStandardWorker::preprocess()
 {
   // check sanity
   if (!sanityCheck())
@@ -841,7 +841,7 @@ bool KStandardWorker::preprocess()
   return true;			// it's ok
 }
 
-bool KStandardWorker::run()
+bool TDEStandardWorker::run()
 {
 #ifndef HAVE_GETADDRINFO
   // check the scope id first
@@ -900,7 +900,7 @@ bool KStandardWorker::run()
   return true;
 }
 
-bool KStandardWorker::postprocess()
+bool TDEStandardWorker::postprocess()
 {
   if (results.count())
     return true;		// no need
@@ -1020,7 +1020,7 @@ bool KGetAddrinfoWorker::wantThis(int family)
 void KNetwork::Internal::initStandardWorkers()
 {
   //KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KBlacklistWorker>);
-  KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KStandardWorker>);
+  KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<TDEStandardWorker>);
 
 #ifdef HAVE_GETADDRINFO
   KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KGetAddrinfoWorker>);
diff --git a/tdecore/network/kresolverstandardworkers_p.h b/tdecore/network/kresolverstandardworkers_p.h
index 2db460bef..95d21bbc0 100644
--- a/tdecore/network/kresolverstandardworkers_p.h
+++ b/tdecore/network/kresolverstandardworkers_p.h
@@ -62,7 +62,7 @@ namespace KNetwork { namespace Internal
   /** @internal
    * Standard worker.
    */
-  class KStandardWorker: public KNetwork::KResolverWorkerBase
+  class TDEStandardWorker: public KNetwork::KResolverWorkerBase
   {
   protected:
     mutable TQCString m_encodedName;
@@ -90,7 +90,7 @@ namespace KNetwork { namespace Internal
    *
    * This class does not do post-processing.
    */
-  class KGetAddrinfoWorker: public KStandardWorker
+  class KGetAddrinfoWorker: public TDEStandardWorker
   {
   public:
     KGetAddrinfoWorker()
diff --git a/tdecore/network/kreverseresolver.cpp b/tdecore/network/kreverseresolver.cpp
index 20ec41b1d..fc172c2ff 100644
--- a/tdecore/network/kreverseresolver.cpp
+++ b/tdecore/network/kreverseresolver.cpp
@@ -55,7 +55,7 @@ namespace
   class ReverseThread: public KResolverWorkerBase
   {
   public:
-    ReverseThread(const KSocketAddress& addr, int flags)
+    ReverseThread(const TDESocketAddress& addr, int flags)
       : m_addr(addr), m_flags(flags), m_parent(0L)
     { }
 
@@ -68,7 +68,7 @@ namespace
     virtual bool postprocess();
 
     // input:
-    KSocketAddress m_addr;
+    TDESocketAddress m_addr;
     int m_flags;
     KReverseResolver *m_parent;
 
@@ -99,18 +99,18 @@ class KNetwork::KReverseResolverPrivate
 public:
   TQString node;
   TQString service;
-  KSocketAddress addr;
+  TDESocketAddress addr;
   int flags;
 
   ReverseThread* worker;
   bool success;
 
-  inline KReverseResolverPrivate(const KSocketAddress& _addr)
+  inline KReverseResolverPrivate(const TDESocketAddress& _addr)
     : addr(_addr), worker(0L), success(false)
   { }
 };
 
-KReverseResolver::KReverseResolver(const KSocketAddress& addr, int flags,
+KReverseResolver::KReverseResolver(const TDESocketAddress& addr, int flags,
 				   TQObject *parent, const char* name)
   : TQObject(parent, name), d(new KReverseResolverPrivate(addr))
 {
@@ -148,7 +148,7 @@ TQString KReverseResolver::service() const
   return d->service;
 }
 
-const KSocketAddress& KReverseResolver::address() const
+const TDESocketAddress& KReverseResolver::address() const
 {
   return d->addr;
 }
@@ -190,7 +190,7 @@ bool KReverseResolver::event(TQEvent *e)
   return true;
 }
 
-bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node,
+bool KReverseResolver::resolve(const TDESocketAddress& addr, TQString& node,
 			       TQString& serv, int flags)
 {
   ReverseThread th(addr, flags);
@@ -206,7 +206,7 @@ bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node,
 bool KReverseResolver::resolve(const struct sockaddr* sa, TQ_UINT16 salen,
 			       TQString& node, TQString& serv, int flags)
 {
-  return resolve(KSocketAddress(sa, salen), node, serv, flags);
+  return resolve(TDESocketAddress(sa, salen), node, serv, flags);
 }
 
 bool ReverseThread::run()
diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h
index 21a17b0a5..4a3fa4bdd 100644
--- a/tdecore/network/kreverseresolver.h
+++ b/tdecore/network/kreverseresolver.h
@@ -88,7 +88,7 @@ public:
    * @param addr	the address to resolve
    * @param flags	the flags to use, see @ref Flags
    */
-  KReverseResolver(const KSocketAddress& addr, int flags = 0,
+  KReverseResolver(const TDESocketAddress& addr, int flags = 0,
 		   TQObject * = 0L, const char * = 0L);
 
   /**
@@ -128,7 +128,7 @@ public:
   /**
    * Returns the socket address which was subject to resolution.
    */
-  const KSocketAddress& address() const;
+  const TDESocketAddress& address() const;
 
   /**
    * Starts the resolution. This function returns 'true'
@@ -165,7 +165,7 @@ public:
    * @return true if the resolution succeeded, false if not
    * @see ReverseFlags for the possible values for @p flags
    */
-  static bool resolve(const KSocketAddress& addr, TQString& node, 
+  static bool resolve(const TDESocketAddress& addr, TQString& node, 
 		      TQString& serv, int flags = 0);
 
   /**
diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp
index 007258f6b..16a48cdf2 100644
--- a/tdecore/network/kserversocket.cpp
+++ b/tdecore/network/kserversocket.cpp
@@ -37,7 +37,7 @@
 
 using namespace KNetwork;
 
-class KNetwork::KServerSocketPrivate
+class KNetwork::TDEServerSocketPrivate
 {
 public:
   KResolver resolver;
@@ -47,67 +47,67 @@ public:
   int backlog;
   int timeout;
 
-  bool bindWhenFound : 1, listenWhenBound : 1, useKBufferedSocket : 1;
+  bool bindWhenFound : 1, listenWhenBound : 1, useTDEBufferedSocket : 1;
 
-  KServerSocketPrivate()
+  TDEServerSocketPrivate()
     : state(None), timeout(0), bindWhenFound(false), listenWhenBound(false),
-      useKBufferedSocket(true)
+      useTDEBufferedSocket(true)
   { 
     resolver.setFlags(KResolver::Passive);
     resolver.setFamily(KResolver::KnownFamily);
   }
 };
 
-KServerSocket::KServerSocket(TQObject* parent, const char *name)
-  : TQObject(parent, name), d(new KServerSocketPrivate)
+TDEServerSocket::TDEServerSocket(TQObject* parent, const char *name)
+  : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
   TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
 		   this, TQT_SLOT(lookupFinishedSlot()));
 }
 
-KServerSocket::KServerSocket(const TQString& service, TQObject* parent, const char *name)
-  : TQObject(parent, name), d(new KServerSocketPrivate)
+TDEServerSocket::TDEServerSocket(const TQString& service, TQObject* parent, const char *name)
+  : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
   TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
 		   this, TQT_SLOT(lookupFinishedSlot()));
   d->resolver.setServiceName(service);
 }
 
-KServerSocket::KServerSocket(const TQString& node, const TQString& service,
+TDEServerSocket::TDEServerSocket(const TQString& node, const TQString& service,
 			     TQObject* parent, const char* name)
-  : TQObject(parent, name), d(new KServerSocketPrivate)
+  : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
   TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
 		   this, TQT_SLOT(lookupFinishedSlot()));
   setAddress(node, service);
 }
 
-KServerSocket::~KServerSocket()
+TDEServerSocket::~TDEServerSocket()
 {
   close();
   delete d;
 }
 
-bool KServerSocket::setSocketOptions(int opts)
+bool TDEServerSocket::setSocketOptions(int opts)
 {
   TQMutexLocker locker(mutex());
-  KSocketBase::setSocketOptions(opts); // call parent
+  TDESocketBase::setSocketOptions(opts); // call parent
   bool result = socketDevice()->setSocketOptions(opts); // and set the implementation
   copyError();
   return result;
 }
 
-KResolver& KServerSocket::resolver() const
+KResolver& TDEServerSocket::resolver() const
 {
   return d->resolver;
 }
 
-const KResolverResults& KServerSocket::resolverResults() const
+const KResolverResults& TDEServerSocket::resolverResults() const
 {
   return d->resolverResults;
 }
 
-void KServerSocket::setResolutionEnabled(bool enable)
+void TDEServerSocket::setResolutionEnabled(bool enable)
 {
   if (enable)
     d->resolver.setFlags(d->resolver.flags() & ~KResolver::NoResolve);
@@ -115,41 +115,41 @@ void KServerSocket::setResolutionEnabled(bool enable)
     d->resolver.setFlags(d->resolver.flags() | KResolver::NoResolve);
 }
 
-void KServerSocket::setFamily(int families)
+void TDEServerSocket::setFamily(int families)
 {
   d->resolver.setFamily(families);
 }
 
-void KServerSocket::setAddress(const TQString& service)
+void TDEServerSocket::setAddress(const TQString& service)
 {
   d->resolver.setNodeName(TQString::null);
   d->resolver.setServiceName(service);
   d->resolverResults.empty();
-  if (d->state <= KServerSocketPrivate::LookupDone)
-    d->state = KServerSocketPrivate::None;
+  if (d->state <= TDEServerSocketPrivate::LookupDone)
+    d->state = TDEServerSocketPrivate::None;
 }
 
-void KServerSocket::setAddress(const TQString& node, const TQString& service)
+void TDEServerSocket::setAddress(const TQString& node, const TQString& service)
 {
   d->resolver.setNodeName(node);
   d->resolver.setServiceName(service);
   d->resolverResults.empty();
-  if (d->state <= KServerSocketPrivate::LookupDone)
-    d->state = KServerSocketPrivate::None;
+  if (d->state <= TDEServerSocketPrivate::LookupDone)
+    d->state = TDEServerSocketPrivate::None;
 }
 
-void KServerSocket::setTimeout(int msec)
+void TDEServerSocket::setTimeout(int msec)
 {
   d->timeout = msec;
 }
 
-bool KServerSocket::lookup()
+bool TDEServerSocket::lookup()
 {
   setError(NoError);
   if (d->resolver.isRunning() && !blocking())
     return true;		// already doing lookup
 
-  if (d->state >= KServerSocketPrivate::LookupDone)
+  if (d->state >= TDEServerSocketPrivate::LookupDone)
     return true;		// results are already available
 
   // make sure we have at least one parameter for lookup
@@ -179,13 +179,13 @@ bool KServerSocket::lookup()
   return true;
 }
 
-bool KServerSocket::bind(const KResolverEntry& address)
+bool TDEServerSocket::bind(const KResolverEntry& address)
 {
   if (socketDevice()->bind(address))
     {
       setError(NoError);
 
-      d->state = KServerSocketPrivate::Bound;
+      d->state = TDEServerSocketPrivate::Bound;
       emit bound(address);
       return true;
     }
@@ -193,30 +193,30 @@ bool KServerSocket::bind(const KResolverEntry& address)
   return false;
 }
 
-bool KServerSocket::bind(const TQString& node, const TQString& service)
+bool TDEServerSocket::bind(const TQString& node, const TQString& service)
 {
   setAddress(node, service);
   return bind();
 }
 
-bool KServerSocket::bind(const TQString& service)
+bool TDEServerSocket::bind(const TQString& service)
 {
   setAddress(service);
   return bind();
 }
 
-bool KServerSocket::bind()
+bool TDEServerSocket::bind()
 {
-  if (d->state >= KServerSocketPrivate::Bound)
+  if (d->state >= TDEServerSocketPrivate::Bound)
     return true;
 
-  if (d->state < KServerSocketPrivate::LookupDone)
+  if (d->state < TDEServerSocketPrivate::LookupDone)
     {
       if (!blocking())
 	{
 	  d->bindWhenFound = true;
 	  bool ok = lookup();	// will call doBind
-	  if (d->state >= KServerSocketPrivate::Bound)
+	  if (d->state >= TDEServerSocketPrivate::Bound)
 	    d->bindWhenFound = false;
 	  return ok;
 	}
@@ -229,19 +229,19 @@ bool KServerSocket::bind()
   return doBind();
 }
 
-bool KServerSocket::listen(int backlog)
+bool TDEServerSocket::listen(int backlog)
 {
   // WARNING
   // this function has to be reentrant
   // due to the mechanisms used for binding, this function might
   // end up calling itself
 
-  if (d->state == KServerSocketPrivate::Listening)
+  if (d->state == TDEServerSocketPrivate::Listening)
     return true;		// already listening
 
   d->backlog = backlog;
 
-  if (d->state < KServerSocketPrivate::Bound)
+  if (d->state < TDEServerSocketPrivate::Bound)
     {
       // we must bind
       // note that we can end up calling ourselves here
@@ -252,7 +252,7 @@ bool KServerSocket::listen(int backlog)
 	  return false;
 	}
 
-      if (d->state < KServerSocketPrivate::Bound)
+      if (d->state < TDEServerSocketPrivate::Bound)
 	// asynchronous lookup in progress...
 	// we can't be blocking here anyways
 	return true;
@@ -260,29 +260,29 @@ bool KServerSocket::listen(int backlog)
       d->listenWhenBound = false;
     }
 
-  if (d->state < KServerSocketPrivate::Listening)
+  if (d->state < TDEServerSocketPrivate::Listening)
     return doListen();
 
   return true;
 }
 
-void KServerSocket::close()
+void TDEServerSocket::close()
 {
   socketDevice()->close();
   if (d->resolver.isRunning())
     d->resolver.cancel(false);
-  d->state = KServerSocketPrivate::None;
+  d->state = TDEServerSocketPrivate::None;
   emit closed();
 }
 
-void KServerSocket::setAcceptBuffered(bool enable)
+void TDEServerSocket::setAcceptBuffered(bool enable)
 {
-  d->useKBufferedSocket = enable;
+  d->useTDEBufferedSocket = enable;
 }
 
-KActiveSocketBase* KServerSocket::accept()
+KActiveSocketBase* TDEServerSocket::accept()
 {
-  if (d->state < KServerSocketPrivate::Listening)
+  if (d->state < TDEServerSocketPrivate::Listening)
     {
       if (!blocking())
 	{
@@ -310,7 +310,7 @@ KActiveSocketBase* KServerSocket::accept()
     }
 
   // we're listening here
-  KSocketDevice* accepted = socketDevice()->accept();
+  TDESocketDevice* accepted = socketDevice()->accept();
   if (!accepted)
     {
       // error happened during accept
@@ -319,8 +319,8 @@ KActiveSocketBase* KServerSocket::accept()
     }
 
   KStreamSocket* streamsocket;
-  if (d->useKBufferedSocket)
-    streamsocket = new KBufferedSocket();
+  if (d->useTDEBufferedSocket)
+    streamsocket = new TDEBufferedSocket();
   else
     streamsocket = new KStreamSocket();
   streamsocket->setSocketDevice(accepted);
@@ -334,19 +334,19 @@ KActiveSocketBase* KServerSocket::accept()
   return streamsocket;
 }
 
-KSocketAddress KServerSocket::localAddress() const
+TDESocketAddress TDEServerSocket::localAddress() const
 {
   return socketDevice()->localAddress();
 }
 
-KSocketAddress KServerSocket::externalAddress() const
+TDESocketAddress TDEServerSocket::externalAddress() const
 {
   return socketDevice()->externalAddress();
 }
 
-void KServerSocket::lookupFinishedSlot()
+void TDEServerSocket::lookupFinishedSlot()
 {
-  if (d->resolver.isRunning() || d->state > KServerSocketPrivate::LookupDone)
+  if (d->resolver.isRunning() || d->state > TDEServerSocketPrivate::LookupDone)
     return;
 
   if (d->resolver.status() < 0)
@@ -354,25 +354,25 @@ void KServerSocket::lookupFinishedSlot()
       setError(LookupFailure);
       emit gotError(LookupFailure);
       d->bindWhenFound = d->listenWhenBound = false;
-      d->state = KServerSocketPrivate::None;
+      d->state = TDEServerSocketPrivate::None;
       return;
     }
 
   // lookup succeeded
   d->resolverResults = d->resolver.results();
-  d->state = KServerSocketPrivate::LookupDone;
+  d->state = TDEServerSocketPrivate::LookupDone;
   emit hostFound();
 
   if (d->bindWhenFound)
     doBind();
 }
 
-void KServerSocket::copyError()
+void TDEServerSocket::copyError()
 {
   setError(socketDevice()->error());
 }
 
-bool KServerSocket::doBind()
+bool TDEServerSocket::doBind()
 {
   d->bindWhenFound = false;
   // loop through the results and bind to the first that works
@@ -393,7 +393,7 @@ bool KServerSocket::doBind()
   return false;
 }
 
-bool KServerSocket::doListen()
+bool TDEServerSocket::doListen()
 {
   if (!socketDevice()->listen(d->backlog))
     {
@@ -405,7 +405,7 @@ bool KServerSocket::doListen()
   // set up ready accept signal
   TQObject::connect(socketDevice()->readNotifier(), TQT_SIGNAL(activated(int)),
 		   this, TQT_SIGNAL(readyAccept()));
-  d->state = KServerSocketPrivate::Listening;
+  d->state = TDEServerSocketPrivate::Listening;
   return true;
 }
 
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index 4f1af33b9..edb86d0b2 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -30,14 +30,14 @@
 
 namespace KNetwork {
 
-class KSocketDevice;
+class TDESocketDevice;
 class KStreamSocket; 
 class KResolver;
 class KResolverResults;
 
-class KServerSocketPrivate;
+class TDEServerSocketPrivate;
 /**
- * @class KServerSocket kserversocket.h kserversocket.h
+ * @class TDEServerSocket kserversocket.h kserversocket.h
  * @brief A server socket for accepting connections.
  *
  * This class provides functionality for creating a socket to
@@ -49,7 +49,7 @@ class KServerSocketPrivate;
  * A typical example would look like:
  * \code
  *   TQString service = "http";
- *   KServerSocket *ss = new KServerSocket(service);
+ *   TDEServerSocket *ss = new TDEServerSocket(service);
  *   connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
  *   connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
  *   ss->listen();
@@ -70,14 +70,14 @@ class KServerSocketPrivate;
  *
  * For another example of usage, this below code attempts to make a connection on any port within a range:
  * \code
- *   KServerSocket *ss = new KServerSocket();
+ *   TDEServerSocket *ss = new TDEServerSocket();
  *   ss->setFamily(KResolver::InetFamily);
  *   bool found = false;
  *   for( unsigned int port = firstport; port <= lastport; ++port) {
  *     ss->setAddress( TQString::number( port ) );
  *     bool success = ss->listen();
  *     if( found = ( success && ss->error() == 
- *                              KSocketBase::NoError ) )
+ *                              TDESocketBase::NoError ) )
  *       break;
  *     ss->close();
  *   }
@@ -95,16 +95,16 @@ class KServerSocketPrivate;
  *
  * It is important to note that @ref accept can return either an
  * object of type KNetwork::KStreamSocket or
- * KNetwork::KBufferedSocket (default). If you want to accept a
+ * KNetwork::TDEBufferedSocket (default). If you want to accept a
  * non-buffered socket, you must first call setAcceptBuffered.
  *
- * @warning If you use KServerSocket in an auxiliary (non-GUI) thread,
+ * @warning If you use TDEServerSocket in an auxiliary (non-GUI) thread,
  *          you need to accept only KNetwork::KStreamSocket objects.
  *
- * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket
+ * @see KNetwork::KStreamSocket, KNetwork::TDEBufferedSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
-class TDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase
+class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase
 {
   Q_OBJECT
   
@@ -119,7 +119,7 @@ public:
    * @param parent		the parent TQObject object
    * @param name		the name of this object
    */
-  KServerSocket(TQObject* parent = 0L, const char *name = 0L);
+  TDEServerSocket(TQObject* parent = 0L, const char *name = 0L);
 
   /**
    * Construct this object specifying the service to listen on.
@@ -138,7 +138,7 @@ public:
    * @param parent		the parent TQObject object
    * @param name		the name of this object
    */
-  KServerSocket(const TQString& service, TQObject* parent = 0L, const char *name = 0L);
+  TDEServerSocket(const TQString& service, TQObject* parent = 0L, const char *name = 0L);
 
   /**
    * Construct this object specifying the node and service names to listen on.
@@ -158,7 +158,7 @@ public:
    * @param parent		the parent TQObject object
    * @param name		the name of this object
    */
-  KServerSocket(const TQString& node, const TQString& service,
+  TDEServerSocket(const TQString& node, const TQString& service,
 		TQObject* parent = 0L, const char *name = 0L);
 
   /**
@@ -167,11 +167,11 @@ public:
    * Note, however, that accepted sockets do not get closed when this
    * object closes.
    */
-  ~KServerSocket();
+  ~TDEServerSocket();
 
 protected:
   /**
-   * Sets the socket options. Reimplemented from KSocketBase.
+   * Sets the socket options. Reimplemented from TDESocketBase.
    */
   virtual bool setSocketOptions(int opts);
 
@@ -201,7 +201,7 @@ public:
    *
    * This is useful, for instance, when IP addresses are in
    * their string representation (such as "1.2.3.4") or come
-   * from other sources like @ref KSocketAddress.
+   * from other sources like @ref TDESocketAddress.
    *
    * @param enable	whether to enable
    */
@@ -268,7 +268,7 @@ public:
    * emitted (only once, even if we're doing a double lookup).
    * If the lookup failed (for any of the two lookups) the 
    * @ref gotError signal will be emitted with the appropriate
-   * error condition (see @ref KSocketBase::SocketError).
+   * error condition (see @ref TDESocketBase::SocketError).
    *
    * This function returns true on success and false on error. Note that
    * this is not the lookup result!
@@ -306,7 +306,7 @@ public:
   virtual bool bind();
 
   /**
-   * Connect this socket to this specific address. Reimplemented from KSocketBase.
+   * Connect this socket to this specific address. Reimplemented from TDESocketBase.
    *
    * Unlike @ref bind(const TQString&, const TQString&) above, this function
    * really does bind the socket. No lookup is performed. The @ref bound signal
@@ -338,7 +338,7 @@ public:
    * Toggles whether the accepted socket will be buffered or not.
    * That is, the @ref accept function will always return a KStreamSocket
    * object or descended from it. If buffering is enabled, the class
-   * to be returned will be KBufferedSocket.
+   * to be returned will be TDEBufferedSocket.
    *
    * By default, this flag is set to true.
    *
@@ -361,7 +361,7 @@ public:
    *       the base class for active sockets, but it is guaranteed
    *       that the object will be a KStreamSocket or derived from it.
    *
-   * @sa KBufferedSocket
+   * @sa TDEBufferedSocket
    * @sa setAcceptBuffered
    */
   virtual KActiveSocketBase* accept();
@@ -369,12 +369,12 @@ public:
   /**
    * Returns this socket's local address.
    */
-  virtual KSocketAddress localAddress() const;
+  virtual TDESocketAddress localAddress() const;
 
   /**
    * Returns this socket's externally-visible address if know.
    */
-  virtual KSocketAddress externalAddress() const;
+  virtual TDESocketAddress externalAddress() const;
 
 private slots:
   void lookupFinishedSlot();
@@ -425,10 +425,10 @@ private:
   bool doListen();
 
 private:
-  KServerSocket(const KServerSocket&);
-  KServerSocket& operator=(const KServerSocket&);
+  TDEServerSocket(const TDEServerSocket&);
+  TDEServerSocket& operator=(const TDEServerSocket&);
 
-  KServerSocketPrivate *d;
+  TDEServerSocketPrivate *d;
 };
 
 }				// namespace KNetwork
diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp
index a3c975d94..69c674438 100644
--- a/tdecore/network/ksockssocketdevice.cpp
+++ b/tdecore/network/ksockssocketdevice.cpp
@@ -32,7 +32,7 @@
 #define kde_socklen_t ksocklen_t 
 #endif 
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include "ksocks.h"
 #include "tdesocketaddress.h"
@@ -43,15 +43,15 @@ using namespace KNetwork;
 
 // constructor
 // nothing to do
-KSocksSocketDevice::KSocksSocketDevice(const KSocketBase* obj)
-  : KSocketDevice(obj)
+KSocksSocketDevice::KSocksSocketDevice(const TDESocketBase* obj)
+  : TDESocketDevice(obj)
 {
 }
 
 // constructor with argument
 // nothing to do
 KSocksSocketDevice::KSocksSocketDevice(int fd)
-  : KSocketDevice(fd)
+  : TDESocketDevice(fd)
 {
 }
 
@@ -67,7 +67,7 @@ int KSocksSocketDevice::capabilities() const
   return 0;			// can do everything!
 }
 
-// From here on, the code is almost exactly a copy of KSocketDevice
+// From here on, the code is almost exactly a copy of TDESocketDevice
 // the differences are the use of KSocks where appropriate
 
 bool KSocksSocketDevice::bind(const KResolverEntry& address)
@@ -190,7 +190,7 @@ KSocksSocketDevice* KSocksSocketDevice::accept()
   return new KSocksSocketDevice(newfd);
 }
 
-static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
+static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddress* from, ssize_t &retval, bool peek = false)
 {
   kde_socklen_t len;
   if (from)
@@ -204,9 +204,9 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAdd
   if (retval == -1)
     {
       if (errno == EAGAIN || errno == EWOULDBLOCK)
-	return KSocketDevice::WouldBlock;
+	return TDESocketDevice::WouldBlock;
       else
-	return KSocketDevice::UnknownError;
+	return TDESocketDevice::UnknownError;
     }
 
   if (from)
@@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -277,7 +277,7 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -300,10 +300,10 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddres
 
 TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len)
 {
-  return tqwriteBlock(data, len, KSocketAddress());
+  return tqwriteBlock(data, len, TDESocketAddress());
 }
 
-TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
@@ -325,17 +325,17 @@ TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const K
   return retval;
 }
 
-KSocketAddress KSocksSocketDevice::localAddress() const
+TDESocketAddress KSocksSocketDevice::localAddress() const
 {
   if (m_sockfd == -1)
-    return KSocketAddress();	// not open, empty value
+    return TDESocketAddress();	// not open, empty value
 
   kde_socklen_t len;
-  KSocketAddress localAddress;
+  TDESocketAddress localAddress;
   localAddress.setLength(len = 32);	// arbitrary value
   if (KSocks::self()->getsockname(m_sockfd, localAddress.address(), &len) == -1)
     // error!
-    return KSocketAddress();
+    return TDESocketAddress();
 
   if (len <= localAddress.length())
     {
@@ -349,22 +349,22 @@ KSocketAddress KSocksSocketDevice::localAddress() const
   localAddress.setLength(len);
   if (KSocks::self()->getsockname(m_sockfd, localAddress.address(), &len) == -1)
     // error!
-    return KSocketAddress();
+    return TDESocketAddress();
 
   return localAddress;
 }
 
-KSocketAddress KSocksSocketDevice::peerAddress() const
+TDESocketAddress KSocksSocketDevice::peerAddress() const
 {
   if (m_sockfd == -1)
-    return KSocketAddress();	// not open, empty value
+    return TDESocketAddress();	// not open, empty value
 
   kde_socklen_t len;
-  KSocketAddress peerAddress;
+  TDESocketAddress peerAddress;
   peerAddress.setLength(len = 32);	// arbitrary value
   if (KSocks::self()->getpeername(m_sockfd, peerAddress.address(), &len) == -1)
     // error!
-    return KSocketAddress();
+    return TDESocketAddress();
 
   if (len <= peerAddress.length())
     {
@@ -378,15 +378,15 @@ KSocketAddress KSocksSocketDevice::peerAddress() const
   peerAddress.setLength(len);
   if (KSocks::self()->getpeername(m_sockfd, peerAddress.address(), &len) == -1)
     // error!
-    return KSocketAddress();
+    return TDESocketAddress();
 
   return peerAddress;
 }
 
-KSocketAddress KSocksSocketDevice::externalAddress() const
+TDESocketAddress KSocksSocketDevice::externalAddress() const
 {
   // return empty, indicating unknown external address
-  return KSocketAddress();
+  return TDESocketAddress();
 }
 
 bool KSocksSocketDevice::poll(bool *input, bool *output, bool *exception,
@@ -468,19 +468,19 @@ void KSocksSocketDevice::initSocks()
     return;
 
   if (kapp == 0L)
-    return;			// no KApplication, so don't initialise
-                                // this should, however, test for KInstance
+    return;			// no TDEApplication, so don't initialise
+                                // this should, however, test for TDEInstance
 
   init = true;
 
   if (KSocks::self()->hasSocks())
-    delete KSocketDevice::setDefaultImpl(new KSocketDeviceFactory<KSocksSocketDevice>);
+    delete TDESocketDevice::setDefaultImpl(new TDESocketDeviceFactory<KSocksSocketDevice>);
 }
 
 #if 0
 static bool register()
 {
-  KSocketDevice::addNewImpl(new KSocketDeviceFactory<KSocksSocketDevice>, 0);
+  TDESocketDevice::addNewImpl(new TDESocketDeviceFactory<KSocksSocketDevice>, 0);
 }
 
 static bool register = registered();
diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h
index 5c93b6d8c..2a83c0adc 100644
--- a/tdecore/network/ksockssocketdevice.h
+++ b/tdecore/network/ksockssocketdevice.h
@@ -28,7 +28,7 @@ namespace KNetwork {
  * @class KSocksSocketDevice ksockssocketdevice.h ksockssocketdevice.h
  * @brief The low-level class for SOCKS proxying.
  *
- * This class reimplements several functions from @ref KSocketDevice in order
+ * This class reimplements several functions from @ref TDESocketDevice in order
  * to implement SOCKS support.
  *
  * This works by using KSocks.
@@ -37,13 +37,13 @@ namespace KNetwork {
  *
  * @warning This code is untested!
  */
-class TDECORE_EXPORT KSocksSocketDevice: public KSocketDevice
+class TDECORE_EXPORT KSocksSocketDevice: public TDESocketDevice
 {
 public:
   /** 
    * Constructor.
    */
-  KSocksSocketDevice(const KSocketBase* = 0L);
+  KSocksSocketDevice(const TDESocketBase* = 0L);
 
   /**
    * Construct from a file descriptor.
@@ -84,34 +84,34 @@ public:
    * Overrides reading.
    */
   virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Overrides peeking.
    */
   virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Overrides writing.
    */
   virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len);
-  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Overrides getting socket address.
    */
-  virtual KSocketAddress localAddress() const;
+  virtual TDESocketAddress localAddress() const;
 
   /**
    * Overrides getting peer address.
    */
-  virtual KSocketAddress peerAddress() const;
+  virtual TDESocketAddress peerAddress() const;
 
   /**
    * Overrides getting external address.
    */
-  virtual KSocketAddress externalAddress() const;
+  virtual TDESocketAddress externalAddress() const;
 
   /**
    * Overrides polling.
@@ -121,7 +121,7 @@ public:
 
 private:
   static void initSocks();
-  friend class KSocketDevice;
+  friend class TDESocketDevice;
 };
 
 }				// namespace KNetwork
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index ab90e923a..c1f9e5848 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -34,8 +34,8 @@ namespace KNetwork {
 
 class KResolverEntry;
 class KResolverResults;
-class KServerSocket;
-class KBufferedSocket;
+class TDEServerSocket;
+class TDEBufferedSocket;
 
 class KStreamSocketPrivate;
 /** @class KStreamSocket kstreamsocket.h kstreamsocket.h
@@ -50,7 +50,7 @@ class KStreamSocketPrivate;
  *
  * KStreamSocket objects are thread-safe and can be used in auxiliary
  * threads (i.e., not the thread in which the Qt event loop runs in).
- * Note that KBufferedSocket cannot be used reliably in an auxiliary thread.
+ * Note that TDEBufferedSocket cannot be used reliably in an auxiliary thread.
  *
  * Sample usage:
  * \code
@@ -91,7 +91,7 @@ class KStreamSocketPrivate;
  *  }
  * \endcode
  *
- * @see KNetwork::KBufferedSocket, KNetwork::KServerSocket
+ * @see KNetwork::TDEBufferedSocket, KNetwork::TDEServerSocket
  * @author Thiago Macieira <thiago@kde.org>
  */
 class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
@@ -241,8 +241,8 @@ private:
 
   KStreamSocketPrivate *d;
 
-  friend class KServerSocket;
-  friend class KBufferedSocket;
+  friend class TDEServerSocket;
+  friend class TDEBufferedSocket;
 };
 
 } 				// namespace KNetwork
diff --git a/tdecore/network/kiobuffer.h b/tdecore/network/tdeiobuffer.h
index ac1352a4d..88b1db4e7 100644
--- a/tdecore/network/kiobuffer.h
+++ b/tdecore/network/tdeiobuffer.h
@@ -32,41 +32,41 @@
 class TQIODevice;
 
 /**
- * @class KIOBufferBase kiobuffer.h kiobuffer.h
+ * @class TDEIOBufferBase tdeiobuffer.h tdeiobuffer.h
  * @brief base for I/O buffer implementation
  *
  * This class declares the base methods to interface with an I/O buffer.
  * Most applications will not need to access this class directly, since
- * it is all handled by @ref KNetwork::KBufferedSocket and other buffering
+ * it is all handled by @ref KNetwork::TDEBufferedSocket and other buffering
  * classes.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KIOBufferBase
+class TDEIOBufferBase
 {
 public:
   /**
    * Default constructor. Does nothing.
    */
-  KIOBufferBase()
+  TDEIOBufferBase()
   { }
 
   /**
    * Copy constructor. Does nothing here.
    */
-  KIOBufferBase(const KIOBufferBase& )
+  TDEIOBufferBase(const TDEIOBufferBase& )
   { }
 
   /**
    * Virtual destructor. Does nothing.
    */
-  virtual ~KIOBufferBase()
+  virtual ~TDEIOBufferBase()
   { }
 
   /**
    * Assignment operator. Does nothing.
    */
-  KIOBufferBase& operator=(const KIOBufferBase& )
+  TDEIOBufferBase& operator=(const TDEIOBufferBase& )
   { return *this; }
 
   /**
diff --git a/tdecore/network/kmulticastsocket.h b/tdecore/network/tdemulticastsocket.h
index 848e64491..15d3a28ea 100644
--- a/tdecore/network/kmulticastsocket.h
+++ b/tdecore/network/tdemulticastsocket.h
@@ -26,13 +26,13 @@
 #define KMULTICASTSOCKET_H
 
 #include "kdatagramsocket.h"
-#include "kmulticastsocketdevice.h"
+#include "tdemulticastsocketdevice.h"
 
 namespace KNetwork {
 
 class KMulticastSocketPrivate;
 /**
- * @class KMulticastSocket kmulticastsocket.h kmulticastsocket.h
+ * @class KMulticastSocket tdemulticastsocket.h tdemulticastsocket.h
  * @brief A multicast-capable datagram socket class
  *
  * This class derives from @ref KDatagramSocket adding methods to it to
@@ -78,14 +78,14 @@ public:
    * @param group	the multicast group to join
    * @returns true on success
    */
-  virtual bool joinGroup(const KSocketAddress& group);
+  virtual bool joinGroup(const TDESocketAddress& group);
 
   /**
    * @overload
    * Joins a multicast group. This function also specifies the network interface
    * to be used.
    */
-  virtual bool joinGroup(const KSocketAddress& group, 
+  virtual bool joinGroup(const TDESocketAddress& group, 
 			 const KNetworkInterface& iface);
 
   /**
@@ -95,13 +95,13 @@ public:
    * @param group	the group to leave
    * @returns true on successful leaving the group
    */
-  virtual bool leaveGroup(const KSocketAddress& group);
+  virtual bool leaveGroup(const TDESocketAddress& group);
 
   /**
    * @overload
    * Leaves a multicast group.
    */
-  virtual bool leaveGroup(const KSocketAddress& group,
+  virtual bool leaveGroup(const TDESocketAddress& group,
 			  const KNetworkInterface& iface);
 
 private:
diff --git a/tdecore/network/kmulticastsocketdevice.h b/tdecore/network/tdemulticastsocketdevice.h
index ffb567ff1..bddb048a8 100644
--- a/tdecore/network/kmulticastsocketdevice.h
+++ b/tdecore/network/tdemulticastsocketdevice.h
@@ -34,7 +34,7 @@ namespace KNetwork {
 class KMulticastSocketImplPrivate;
 
 /**
- * @class KMulticastSocketImpl kmulticastsocketdevice.h kmulticastsocketdevice.h
+ * @class KMulticastSocketImpl tdemulticastsocketdevice.h tdemulticastsocketdevice.h
  * @brief The low-level backend for multicasting sockets.
  *
  * This class is an interface providing methods for handling multicast 
@@ -42,13 +42,13 @@ class KMulticastSocketImplPrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KMulticastSocketImpl: public KSocketDevice
+class KMulticastSocketImpl: public TDESocketDevice
 {
 public:
   /**
    * Constructor.
    */
-  KMulticastSocketImpl(const KSocketBase* = 0L);
+  KMulticastSocketImpl(const TDESocketBase* = 0L);
 
   /**
    * Destructor
@@ -117,14 +117,14 @@ public:
    * @param group	the multicast group to join
    * @returns true on success
    */
-  virtual bool joinGroup(const KSocketAddress& group);
+  virtual bool joinGroup(const TDESocketAddress& group);
 
   /**
    * @overload
    * Joins a multicast group. This function also specifies the network interface
    * to be used.
    */
-  virtual bool joinGroup(const KSocketAddress& group, 
+  virtual bool joinGroup(const TDESocketAddress& group, 
 			 const KNetworkInterface& iface);
 
   /**
@@ -134,13 +134,13 @@ public:
    * @param group	the group to leave
    * @returns true on successful leaving the group
    */
-  virtual bool leaveGroup(const KSocketAddress& group);
+  virtual bool leaveGroup(const TDESocketAddress& group);
 
   /**
    * @overload
    * Leaves a multicast group.
    */
-  virtual bool leaveGroup(const KSocketAddress& group,
+  virtual bool leaveGroup(const TDESocketAddress& group,
 			  const KNetworkInterface& iface);
 private:
   KMulticastSocketImplPrivate *d;
diff --git a/tdecore/network/tdesocketaddress.cpp b/tdecore/network/tdesocketaddress.cpp
index d1234044b..a6da5f7c0 100644
--- a/tdecore/network/tdesocketaddress.cpp
+++ b/tdecore/network/tdesocketaddress.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tdesocketaddress.h"
 
 #include "netsupp.h"
@@ -238,7 +238,7 @@ struct our_sockaddr_in6
 #define MIN_SOCKADDR_UN_LEN	(sizeof(TQ_UINT16) + sizeof(char))
 
 
-class KNetwork::KSocketAddressData
+class KNetwork::TDESocketAddressData
 {
 public:
   /*
@@ -249,7 +249,7 @@ public:
   class QMixSocketAddressRef : public KInetSocketAddress, public KUnixSocketAddress
   {
   public:
-    QMixSocketAddressRef(KSocketAddressData* d)
+    QMixSocketAddressRef(TDESocketAddressData* d)
       : KInetSocketAddress(d), KUnixSocketAddress(d)
     {
     }
@@ -265,7 +265,7 @@ public:
   } addr;
   TQ_UINT16 curlen, reallen;
 
-  KSocketAddressData()
+  TDESocketAddressData()
     : ref(this)
   {
     addr.generic = 0L;
@@ -273,7 +273,7 @@ public:
     invalidate();
   }
 
-  ~KSocketAddressData()
+  ~TDESocketAddressData()
   {
     if (addr.generic != 0L)
       free(addr.generic);
@@ -343,7 +343,7 @@ public:
 };
 
 // create duplicates of
-void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
+void TDESocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
 {
   if (len < MIN_SOCKADDR_LEN)
     {
@@ -405,30 +405,30 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear)
 }
 
 // default constructor
-KSocketAddress::KSocketAddress()
-  : d(new KSocketAddressData)
+TDESocketAddress::TDESocketAddress()
+  : d(new TDESocketAddressData)
 {
 }
 
 // constructor from binary data
-KSocketAddress::KSocketAddress(const sockaddr *sa, TQ_UINT16 len)
-  : d(new KSocketAddressData)
+TDESocketAddress::TDESocketAddress(const sockaddr *sa, TQ_UINT16 len)
+  : d(new TDESocketAddressData)
 {
   setAddress(sa, len);
 }
 
-KSocketAddress::KSocketAddress(const KSocketAddress& other)
-  : d(new(KSocketAddressData))
+TDESocketAddress::TDESocketAddress(const TDESocketAddress& other)
+  : d(new(TDESocketAddressData))
 {
   *this = other;
 }
 
-KSocketAddress::KSocketAddress(KSocketAddressData *d2)
+TDESocketAddress::TDESocketAddress(TDESocketAddressData *d2)
   : d(d2)
 {
 }
 
-KSocketAddress::~KSocketAddress()
+TDESocketAddress::~TDESocketAddress()
 {
   // prevent double-deletion, since we're already being deleted
   if (d)
@@ -439,7 +439,7 @@ KSocketAddress::~KSocketAddress()
     }
 }
 
-KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other)
+TDESocketAddress& TDESocketAddress::operator =(const TDESocketAddress& other)
 {
   if (other.d && !other.d->invalid())
     d->dup(other.d->addr.generic, other.d->reallen);
@@ -448,21 +448,21 @@ KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other)
   return *this;
 }
 
-const sockaddr* KSocketAddress::address() const
+const sockaddr* TDESocketAddress::address() const
 {
   if (d->invalid())
     return 0L;
   return d->addr.generic;
 }
 
-sockaddr* KSocketAddress::address()
+sockaddr* TDESocketAddress::address()
 {
   if (d->invalid())
     return 0L;
   return d->addr.generic;
 }
 
-KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len)
+TDESocketAddress& TDESocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len)
 {
   if (sa != 0L && len >= MIN_SOCKADDR_LEN)
     d->dup(sa, len);
@@ -472,28 +472,28 @@ KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len)
   return *this;
 }
 
-TQ_UINT16 KSocketAddress::length() const
+TQ_UINT16 TDESocketAddress::length() const
 {
   if (d->invalid())
     return 0;
   return d->reallen;
 }
 
-KSocketAddress& KSocketAddress::setLength(TQ_UINT16 len)
+TDESocketAddress& TDESocketAddress::setLength(TQ_UINT16 len)
 {
   d->dup((sockaddr*)0L, len, false);
 
   return *this;
 }
 
-int KSocketAddress::family() const
+int TDESocketAddress::family() const
 {
   if (d->invalid())
     return AF_UNSPEC;
   return d->addr.generic->sa_family;
 }
 
-KSocketAddress& KSocketAddress::setFamily(int family)
+TDESocketAddress& TDESocketAddress::setFamily(int family)
 {
   if (d->invalid())
     d->dup((sockaddr*)0L, MIN_SOCKADDR_LEN);
@@ -502,7 +502,7 @@ KSocketAddress& KSocketAddress::setFamily(int family)
   return *this;
 }
 
-bool KSocketAddress::operator ==(const KSocketAddress& other) const
+bool TDESocketAddress::operator ==(const TDESocketAddress& other) const
 {
   // if this is invalid, it's only equal if the other one is invalid as well
   if (d->invalid())
@@ -559,7 +559,7 @@ bool KSocketAddress::operator ==(const KSocketAddress& other) const
   return false;		// not equal in any other case
 }
 
-TQString KSocketAddress::nodeName() const
+TQString TDESocketAddress::nodeName() const
 {
   if (d->invalid())
     return TQString::null;
@@ -585,7 +585,7 @@ TQString KSocketAddress::nodeName() const
   return TQString::null;
 }
 
-TQString KSocketAddress::serviceName() const
+TQString TDESocketAddress::serviceName() const
 {
   if (d->invalid())
     return TQString::null;
@@ -605,7 +605,7 @@ TQString KSocketAddress::serviceName() const
   return TQString::null;
 }
 
-TQString KSocketAddress::toString() const
+TQString TDESocketAddress::toString() const
 {
   if (d->invalid())
     return TQString::null;
@@ -627,27 +627,27 @@ TQString KSocketAddress::toString() const
   return fmt.arg(nodeName()).arg(serviceName());
 }
 
-KInetSocketAddress& KSocketAddress::asInet()
+KInetSocketAddress& TDESocketAddress::asInet()
 {
   return d->ref;
 }
 
-KInetSocketAddress KSocketAddress::asInet() const
+KInetSocketAddress TDESocketAddress::asInet() const
 {
   return d->ref;
 }
 
-KUnixSocketAddress& KSocketAddress::asUnix()
+KUnixSocketAddress& TDESocketAddress::asUnix()
 {
   return d->ref;
 }
 
-KUnixSocketAddress KSocketAddress::asUnix() const
+KUnixSocketAddress TDESocketAddress::asUnix() const
 {
   return d->ref;
 }
 
-int KSocketAddress::ianaFamily(int af)
+int TDESocketAddress::ianaFamily(int af)
 {
   switch (af)
     {
@@ -664,7 +664,7 @@ int KSocketAddress::ianaFamily(int af)
     }
 }
 
-int KSocketAddress::fromIanaFamily(int iana)
+int TDESocketAddress::fromIanaFamily(int iana)
 {
   switch (iana)
     {
@@ -688,7 +688,7 @@ KInetSocketAddress::KInetSocketAddress()
 
 // binary data constructor
 KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len)
-  : KSocketAddress(sa, len)
+  : TDESocketAddress(sa, len)
 {
   if (!d->invalid())
     update();
@@ -703,21 +703,21 @@ KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port)
 
 // copy constructor
 KInetSocketAddress::KInetSocketAddress(const KInetSocketAddress& other)
-  : KSocketAddress(other)
+  : TDESocketAddress(other)
 {
 }
 
 // special copy constructor
-KInetSocketAddress::KInetSocketAddress(const KSocketAddress& other)
-  : KSocketAddress(other)
+KInetSocketAddress::KInetSocketAddress(const TDESocketAddress& other)
+  : TDESocketAddress(other)
 {
   if (!d->invalid())
     update();
 }
 
 // special constructor
-KInetSocketAddress::KInetSocketAddress(KSocketAddressData *d)
-  : KSocketAddress(d)
+KInetSocketAddress::KInetSocketAddress(TDESocketAddressData *d)
+  : TDESocketAddress(d)
 {
 }
 
@@ -730,7 +730,7 @@ KInetSocketAddress::~KInetSocketAddress()
 // copy operator
 KInetSocketAddress& KInetSocketAddress::operator =(const KInetSocketAddress& other)
 {
-  KSocketAddress::operator =(other);
+  TDESocketAddress::operator =(other);
   return *this;
 }
 
@@ -905,14 +905,14 @@ KUnixSocketAddress::KUnixSocketAddress()
 }
 
 KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len)
-  : KSocketAddress(sa, len)
+  : TDESocketAddress(sa, len)
 {
   if (!d->invalid() && d->addr.un->sun_family != AF_UNIX)
     d->invalidate();
 }
 
 KUnixSocketAddress::KUnixSocketAddress(const KUnixSocketAddress& other)
-  : KSocketAddress(other)
+  : TDESocketAddress(other)
 {
 }
 
@@ -921,8 +921,8 @@ KUnixSocketAddress::KUnixSocketAddress(const TQString& pathname)
   setPathname(pathname);
 }
 
-KUnixSocketAddress::KUnixSocketAddress(KSocketAddressData* d)
-  : KSocketAddress(d)
+KUnixSocketAddress::KUnixSocketAddress(TDESocketAddressData* d)
+  : TDESocketAddress(d)
 {
 }
 
@@ -932,7 +932,7 @@ KUnixSocketAddress::~KUnixSocketAddress()
 
 KUnixSocketAddress& KUnixSocketAddress::operator =(const KUnixSocketAddress& other)
 {
-  KSocketAddress::operator =(other);
+  TDESocketAddress::operator =(other);
   return *this;
 }
 
diff --git a/tdecore/network/tdesocketaddress.h b/tdecore/network/tdesocketaddress.h
index 885bb77cb..100e05fb2 100644
--- a/tdecore/network/tdesocketaddress.h
+++ b/tdecore/network/tdesocketaddress.h
@@ -38,7 +38,7 @@ struct sockaddr_un;
 namespace KNetwork {
 
 class KIpAddress;
-class KSocketAddress;
+class TDESocketAddress;
 class KInetSocketAddress;
 class KUnixSocketAddress;
 
@@ -412,15 +412,15 @@ public:
 };
 
 
-class KSocketAddressData;
-/** @class KSocketAddress tdesocketaddress.h tdesocketaddress.h
+class TDESocketAddressData;
+/** @class TDESocketAddress tdesocketaddress.h tdesocketaddress.h
  *  @brief A generic socket address.
  *
  * This class holds one generic socket address.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KSocketAddress
+class TDECORE_EXPORT TDESocketAddress
 {
 public:
   /**
@@ -428,7 +428,7 @@ public:
    *
    * Creates an empty object
    */
-  KSocketAddress();
+  TDESocketAddress();
 
   /**
    * Creates this object with the given data.
@@ -437,7 +437,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the socket address length
    */
-  KSocketAddress(const sockaddr* sa, TQ_UINT16 len);
+  TDESocketAddress(const sockaddr* sa, TQ_UINT16 len);
 
   /**
    * Copy constructor. This creates a copy of the other
@@ -447,12 +447,12 @@ public:
    *
    * @param other	the object to copy from
    */
-  KSocketAddress(const KSocketAddress& other);
+  TDESocketAddress(const TDESocketAddress& other);
 
   /**
    * Destructor. Frees any associated resources.
    */
-  virtual ~KSocketAddress();
+  virtual ~TDESocketAddress();
 
   /**
    * Performs a shallow copy of the other object into this one.
@@ -460,7 +460,7 @@ public:
    *
    * @param other	the object to copy from
    */
-  KSocketAddress& operator =(const KSocketAddress& other);
+  TDESocketAddress& operator =(const TDESocketAddress& other);
 
   /**
    * Returns the socket address structure, to be passed down to
@@ -490,7 +490,7 @@ public:
    * @param sa		the socket address structure
    * @param len		the socket address length
    */
-  KSocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len);
+  TDESocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len);
 
   /**
    * Returns the socket address structure, to be passed down to
@@ -517,14 +517,14 @@ public:
    * the family:
    *
    * \code
-   *   KSocketAddress qsa;
+   *   TDESocketAddress qsa;
    *   [...]
    *   qsa.setFamily(AF_UNSPEC).setLength(newlen);
    * \endcode
    *
    * @param len		the new length
    */
-  KSocketAddress& setLength(TQ_UINT16 len);
+  TDESocketAddress& setLength(TQ_UINT16 len);
 
   /**
    * Returns the family of this address.
@@ -540,7 +540,7 @@ public:
    *
    * @param family	the new family to set
    */
-  virtual KSocketAddress& setFamily(int family);
+  virtual TDESocketAddress& setFamily(int family);
 
   /**
    * Returns the IANA family number of this address.
@@ -558,7 +558,7 @@ public:
    * @param other	the other socket
    * @return true if both sockets are equal
    */
-  bool operator ==(const KSocketAddress& other) const;
+  bool operator ==(const TDESocketAddress& other) const;
 
   /**
    * Returns the node name of this socket.
@@ -615,11 +615,11 @@ public:
 protected:
   /// @internal
   /// private data
-  KSocketAddressData *d;
+  TDESocketAddressData *d;
 
   /// @internal
   /// extra constructor
-  KSocketAddress(KSocketAddressData* d);
+  TDESocketAddress(TDESocketAddressData* d);
 
 public:				// static
   /**
@@ -648,9 +648,9 @@ public:				// static
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KInetSocketAddress: public KSocketAddress
+class TDECORE_EXPORT KInetSocketAddress: public TDESocketAddress
 {
-  friend class KSocketAddress;
+  friend class TDESocketAddress;
 public:
   /**
    * Public constructor. Creates an empty object.
@@ -693,7 +693,7 @@ public:
    *
    * @param other	the other object
    */
-  KInetSocketAddress(const KSocketAddress& other);
+  KInetSocketAddress(const TDESocketAddress& other);
 
   /**
    * Destroys this object.
@@ -817,7 +817,7 @@ public:
 protected:
   /// @internal
   /// extra constructor
-  KInetSocketAddress(KSocketAddressData* d);
+  KInetSocketAddress(TDESocketAddressData* d);
 
 private:
   void update();
@@ -837,9 +837,9 @@ private:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KUnixSocketAddress: public KSocketAddress
+class TDECORE_EXPORT KUnixSocketAddress: public TDESocketAddress
 {
-  friend class KSocketAddress;
+  friend class TDESocketAddress;
 public:
   /**
    * Default constructor. Creates an empty object.
@@ -904,7 +904,7 @@ public:
 protected:
   /// @internal
   /// extra constructor
-  KUnixSocketAddress(KSocketAddressData* d);
+  KUnixSocketAddress(TDESocketAddressData* d);
 };
 
 }				// namespace KNetwork
diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp
index 9be0d6e52..66decb15d 100644
--- a/tdecore/network/tdesocketbase.cpp
+++ b/tdecore/network/tdesocketbase.cpp
@@ -24,31 +24,31 @@
 
 #include <config.h>
 #include <tqmutex.h>
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "tdesocketbase.h"
 #include "tdesocketdevice.h"
 
 using namespace KNetwork;
 
-class KNetwork::KSocketBasePrivate
+class KNetwork::TDESocketBasePrivate
 {
 public:
   int socketOptions;
   int socketError;
   int capabilities;
 
-  mutable KSocketDevice* device;
+  mutable TDESocketDevice* device;
 
   TQMutex mutex;
 
-  KSocketBasePrivate()
+  TDESocketBasePrivate()
     : mutex(true)		// create recursive
   { }
 };
 
-KSocketBase::KSocketBase()
-  : d(new KSocketBasePrivate)
+TDESocketBase::TDESocketBase()
+  : d(new TDESocketBasePrivate)
 {
   d->socketOptions = Blocking;
   d->socketError = 0;
@@ -56,64 +56,64 @@ KSocketBase::KSocketBase()
   d->capabilities = 0;
 }
 
-KSocketBase::~KSocketBase()
+TDESocketBase::~TDESocketBase()
 {
   delete d->device;
   delete d;
 }
 
-bool KSocketBase::setSocketOptions(int opts)
+bool TDESocketBase::setSocketOptions(int opts)
 {
   d->socketOptions = opts;
   return true;
 }
 
-int KSocketBase::socketOptions() const
+int TDESocketBase::socketOptions() const
 {
   return d->socketOptions;
 }
 
-bool KSocketBase::setBlocking(bool enable)
+bool TDESocketBase::setBlocking(bool enable)
 {
   return setSocketOptions((socketOptions() & ~Blocking) | (enable ? Blocking : 0));
 }
 
-bool KSocketBase::blocking() const
+bool TDESocketBase::blocking() const
 {
   return socketOptions() & Blocking;
 }
 
-bool KSocketBase::setAddressReuseable(bool enable)
+bool TDESocketBase::setAddressReuseable(bool enable)
 {
   return setSocketOptions((socketOptions() & ~AddressReuseable) | (enable ? AddressReuseable : 0));
 }
 
-bool KSocketBase::addressReuseable() const
+bool TDESocketBase::addressReuseable() const
 {
   return socketOptions() & AddressReuseable;
 }
 
-bool KSocketBase::setIPv6Only(bool enable)
+bool TDESocketBase::setIPv6Only(bool enable)
 {
   return setSocketOptions((socketOptions() & ~IPv6Only) | (enable ? IPv6Only : 0));
 }
 
-bool KSocketBase::isIPv6Only() const
+bool TDESocketBase::isIPv6Only() const
 {
   return socketOptions() & IPv6Only;
 }
 
-bool KSocketBase::setBroadcast(bool enable)
+bool TDESocketBase::setBroadcast(bool enable)
 {
   return setSocketOptions((socketOptions() & ~Broadcast) | (enable ? Broadcast : 0));
 }
 
-bool KSocketBase::broadcast() const
+bool TDESocketBase::broadcast() const
 {
   return socketOptions() & Broadcast;
 }
 
-KSocketDevice* KSocketBase::socketDevice() const
+TDESocketDevice* TDESocketBase::socketDevice() const
 {
   if (d->device)
     return d->device;
@@ -123,47 +123,47 @@ KSocketDevice* KSocketBase::socketDevice() const
   if (d->device)
     return d->device;
 
-  KSocketBase* that = const_cast<KSocketBase*>(this);
-  KSocketDevice* dev = 0;
+  TDESocketBase* that = const_cast<TDESocketBase*>(this);
+  TDESocketDevice* dev = 0;
   if (d->capabilities)
-    dev = KSocketDevice::createDefault(that, d->capabilities);
+    dev = TDESocketDevice::createDefault(that, d->capabilities);
   if (!dev)
-    dev = KSocketDevice::createDefault(that);
+    dev = TDESocketDevice::createDefault(that);
   that->setSocketDevice(dev);
   return d->device;
 }
 
-void KSocketBase::setSocketDevice(KSocketDevice* device)
+void TDESocketBase::setSocketDevice(TDESocketDevice* device)
 {
   TQMutexLocker locker(mutex());
   if (d->device == 0L)
     d->device = device;
 }
 
-int KSocketBase::setRequestedCapabilities(int add, int remove)
+int TDESocketBase::setRequestedCapabilities(int add, int remove)
 {
   d->capabilities |= add;
   d->capabilities &= ~remove;
   return d->capabilities;
 }
 
-bool KSocketBase::hasDevice() const
+bool TDESocketBase::hasDevice() const
 {
   return d->device != 0L;
 }
 
-void KSocketBase::setError(SocketError error)
+void TDESocketBase::setError(SocketError error)
 {
   d->socketError = error;
 }
 
-KSocketBase::SocketError KSocketBase::error() const
+TDESocketBase::SocketError TDESocketBase::error() const
 {
-  return static_cast<KSocketBase::SocketError>(d->socketError);
+  return static_cast<TDESocketBase::SocketError>(d->socketError);
 }
 
 // static
-TQString KSocketBase::errorString(KSocketBase::SocketError code)
+TQString TDESocketBase::errorString(TDESocketBase::SocketError code)
 {
   TQString reason;
   switch (code)
@@ -256,7 +256,7 @@ TQString KSocketBase::errorString(KSocketBase::SocketError code)
 }
 
 // static
-bool KSocketBase::isFatalError(int code)
+bool TDESocketBase::isFatalError(int code)
 {
   switch (code)
     {
@@ -270,12 +270,12 @@ bool KSocketBase::isFatalError(int code)
   return true;
 }
 
-void KSocketBase::unsetSocketDevice()
+void TDESocketBase::unsetSocketDevice()
 {
   d->device = 0L;
 }
 
-TQMutex* KSocketBase::mutex() const
+TQMutex* TDESocketBase::mutex() const
 {
   return &d->mutex;
 }
@@ -308,13 +308,13 @@ int KActiveSocketBase::putch(int ch)
 
 void KActiveSocketBase::setError(int status, SocketError error)
 {
-  KSocketBase::setError(error);
+  TDESocketBase::setError(error);
   setStatus(status);
 }
 
 void KActiveSocketBase::resetError()
 {
-  KSocketBase::setError(NoError);
+  TDESocketBase::setError(NoError);
   resetStatus();
 }
 
diff --git a/tdecore/network/tdesocketbase.h b/tdecore/network/tdesocketbase.h
index 48ae15e05..bd0828408 100644
--- a/tdecore/network/tdesocketbase.h
+++ b/tdecore/network/tdesocketbase.h
@@ -80,10 +80,10 @@ class TQMutex;
 namespace KNetwork {
 
 class KResolverEntry;
-class KSocketDevice;
+class TDESocketDevice;
 
-class KSocketBasePrivate;
-/** @class KSocketBase tdesocketbase.h tdesocketbase.h
+class TDESocketBasePrivate;
+/** @class TDESocketBase tdesocketbase.h tdesocketbase.h
  *  @brief Basic socket functionality.
  *
  * This class provides the basic socket functionlity for descended classes.
@@ -94,7 +94,7 @@ class KSocketBasePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KSocketBase
+class TDECORE_EXPORT TDESocketBase
 {
 public:
   /**
@@ -175,12 +175,12 @@ public:
   /**
    * Default constructor.
    */
-  KSocketBase();
+  TDESocketBase();
 
   /**
    * Destructor.
    */
-  virtual ~KSocketBase();
+  virtual ~TDESocketBase();
 
   /*
    * The following functions are shared by all descended classes and will have
@@ -316,7 +316,7 @@ public:
    * This function creates the device if none has been set
    * using the default factory.
    */
-  KSocketDevice* socketDevice() const;
+  TDESocketDevice* socketDevice() const;
 
   /**
    * Sets the socket implementation to be used on this socket.
@@ -331,7 +331,7 @@ public:
    * This function is called by @ref socketDevice above when the socket is
    * first created.
    */
-  virtual void setSocketDevice(KSocketDevice* device);
+  virtual void setSocketDevice(TDESocketDevice* device);
 
   /**
    * Sets the internally requested capabilities for a socket device.
@@ -341,16 +341,16 @@ public:
    * implementation. By using this function, derived classes can request
    * that a backend with those capabilities be created when necessary.
    *
-   * For the possible flags, see @ref KSocketDevice::Capabilities. However, note
+   * For the possible flags, see @ref TDESocketDevice::Capabilities. However, note
    * that only the Can* flags make sense in this context.
    *
    * @note Since socketDevice must always return a valid backend object, it
    *       is is possible that the created device does not conform to all
    *       requirements requested. Implementations sensitive to this fact
    *       should test the object returned by @ref socketDevice (through
-   *       @ref KSocketDevice::capabilities, for instance) the availability.
+   *       @ref TDESocketDevice::capabilities, for instance) the availability.
    *
-   * @param add		mask of @ref KSocketDevice::Capabilities to add
+   * @param add		mask of @ref TDESocketDevice::Capabilities to add
    * @param remove	mask of bits to remove from the requirements
    * @return the current mask of requested capabilities
    */
@@ -420,15 +420,15 @@ public:
 
 private:
   /// @internal
-  /// called by KSocketDevice
+  /// called by TDESocketDevice
   void unsetSocketDevice();
 
-  KSocketBase(const KSocketBase&);
-  KSocketBase& operator =(const KSocketBase&);
+  TDESocketBase(const TDESocketBase&);
+  TDESocketBase& operator =(const TDESocketBase&);
 
-  KSocketBasePrivate *d;
+  TDESocketBasePrivate *d;
 
-  friend class KSocketDevice;
+  friend class TDESocketDevice;
 };
 
 /**
@@ -440,7 +440,7 @@ private:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public KSocketBase
+class TDECORE_EXPORT KActiveSocketBase: public TQIODevice, virtual public TDESocketBase
 {
 public:
   /**
@@ -575,7 +575,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes read
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) = 0;
 
   /**
    * Peeks the data in the socket.
@@ -602,7 +602,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes copied into @p data
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) = 0;
 
   /**
    * Writes the given data to the socket.
@@ -623,7 +623,7 @@ public:
    * @param to			the address to send to
    * @returns the number of bytes actually sent
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to) = 0;
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) = 0;
 
   /**
    * Reads one character from the socket.
@@ -647,14 +647,14 @@ public:
   /**
    * Returns this socket's local address.
    */
-  virtual KSocketAddress localAddress() const = 0;
+  virtual TDESocketAddress localAddress() const = 0;
 
   /**
    * Return this socket's peer address, if we are connected.
    * If the address cannot be retrieved, the returned object will contain
    * an invalid address.
    */
-  virtual KSocketAddress peerAddress() const = 0;
+  virtual TDESocketAddress peerAddress() const = 0;
 
   // FIXME KDE 4.0:
   // enable this function
@@ -662,7 +662,7 @@ public:
   /**
    * Returns this socket's externally-visible address, if known.
    */
-  virtual KSocketAddress externalAddress() const = 0;
+  virtual TDESocketAddress externalAddress() const = 0;
 #endif
 
 protected:
@@ -689,7 +689,7 @@ protected:
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KPassiveSocketBase: virtual public KSocketBase
+class TDECORE_EXPORT KPassiveSocketBase: virtual public TDESocketBase
 {
 public:
   /**
@@ -754,12 +754,12 @@ public:
   /**
    * Returns this socket's local address.
    */
-  virtual KSocketAddress localAddress() const = 0;
+  virtual TDESocketAddress localAddress() const = 0;
 
   /**
    * Returns this socket's externally-visible address if known.
    */
-  virtual KSocketAddress externalAddress() const = 0;
+  virtual TDESocketAddress externalAddress() const = 0;
 
 private:
   KPassiveSocketBase(const KPassiveSocketBase&);
diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp
index 0ba18b77b..33b8fe776 100644
--- a/tdecore/network/tdesocketbuffer.cpp
+++ b/tdecore/network/tdesocketbuffer.cpp
@@ -33,28 +33,28 @@
 using namespace KNetwork;
 using namespace KNetwork::Internal;
 
-KSocketBuffer::KSocketBuffer(TQ_LONG size)
+TDESocketBuffer::TDESocketBuffer(TQ_LONG size)
   : m_mutex(true), m_offset(0), m_size(size), m_length(0)
 {
 }
 
-KSocketBuffer::KSocketBuffer(const KSocketBuffer& other)
-  : KIOBufferBase(other), m_mutex(true)
+TDESocketBuffer::TDESocketBuffer(const TDESocketBuffer& other)
+  : TDEIOBufferBase(other), m_mutex(true)
 {
   *this = other;
 }
 
-KSocketBuffer::~KSocketBuffer()
+TDESocketBuffer::~TDESocketBuffer()
 {
   // TQValueList takes care of deallocating memory
 }
 
-KSocketBuffer& KSocketBuffer::operator=(const KSocketBuffer& other)
+TDESocketBuffer& TDESocketBuffer::operator=(const TDESocketBuffer& other)
 {
   TQMutexLocker locker1(&m_mutex);
   TQMutexLocker locker2(&other.m_mutex);
 
-  KIOBufferBase::operator=(other);
+  TDEIOBufferBase::operator=(other);
 
   m_list = other.m_list;	// copy-on-write
   m_offset = other.m_offset;
@@ -64,7 +64,7 @@ KSocketBuffer& KSocketBuffer::operator=(const KSocketBuffer& other)
   return *this;
 }
 
-bool KSocketBuffer::canReadLine() const
+bool TDESocketBuffer::canReadLine() const
 {
   TQMutexLocker locker(&m_mutex);
 
@@ -85,7 +85,7 @@ bool KSocketBuffer::canReadLine() const
   return false;			// not found
 }
 
-TQCString KSocketBuffer::readLine()
+TQCString TDESocketBuffer::readLine()
 {
   if (!canReadLine())
     return TQCString();		// empty
@@ -120,17 +120,17 @@ TQCString KSocketBuffer::readLine()
   return result;
 }
 
-TQ_LONG KSocketBuffer::length() const
+TQ_LONG TDESocketBuffer::length() const
 {
   return m_length;
 }
 
-TQ_LONG KSocketBuffer::size() const
+TQ_LONG TDESocketBuffer::size() const
 {
   return m_size;
 }
 
-bool KSocketBuffer::setSize(TQ_LONG size)
+bool TDESocketBuffer::setSize(TQ_LONG size)
 {
   m_size = size;
   if (size == -1 || m_length < m_size)
@@ -147,7 +147,7 @@ bool KSocketBuffer::setSize(TQ_LONG size)
   return (m_length - m_size) == consumeBuffer(0L, m_length - m_size, true);
 }
 
-TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len)
+TQ_LONG TDESocketBuffer::feedBuffer(const char *data, TQ_LONG len)
 {
   if (data == 0L || len == 0)
     return 0;			// nothing to write
@@ -168,7 +168,7 @@ TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len)
   return len;
 }
 
-TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard)
+TQ_LONG TDESocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard)
 {
   if (maxlen == 0 || isEmpty())
     return 0;
@@ -220,7 +220,7 @@ TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool disc
   return copied;
 }
 
-void KSocketBuffer::clear()
+void TDESocketBuffer::clear()
 {
   TQMutexLocker locker(&m_mutex);
   m_list.clear();
@@ -228,7 +228,7 @@ void KSocketBuffer::clear()
   m_length = 0;
 }
 
-TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
+TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
 {
   if (len == 0 || isEmpty())
     return 0;
@@ -293,7 +293,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
   return written;
 }
 
-TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
+TQ_LONG TDESocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
 {
   if (len == 0 || isFull())
     return 0;
diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h
index b2c5dc6b2..2f8e4fa75 100644
--- a/tdecore/network/tdesocketbuffer_p.h
+++ b/tdecore/network/tdesocketbuffer_p.h
@@ -28,7 +28,7 @@
 #include <tqmutex.h>
 #include <tqcstring.h>
 #include <tqvaluelist.h>
-#include "kiobuffer.h"
+#include "tdeiobuffer.h"
 
 namespace KNetwork {
 
@@ -38,14 +38,14 @@ class KActiveSocketBase;
 
 /**
  * @internal
- * @class KSocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h
+ * @class TDESocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h
  * @brief generic socket buffering code
  *
- * This class implements generic buffering used by @ref KBufferedSocket.
+ * This class implements generic buffering used by @ref TDEBufferedSocket.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class KSocketBuffer: public KIOBufferBase
+class TDESocketBuffer: public TDEIOBufferBase
 {
 public:
   /**
@@ -53,22 +53,22 @@ public:
    *
    * @param size	the maximum size of the buffer
    */
-  KSocketBuffer(TQ_LONG size = -1);
+  TDESocketBuffer(TQ_LONG size = -1);
 
   /**
    * Copy constructor.
    */
-  KSocketBuffer(const KSocketBuffer& other);
+  TDESocketBuffer(const TDESocketBuffer& other);
 
   /**
    * Virtual destructor. Frees the buffer and discards its contents.
    */
-  virtual ~KSocketBuffer();
+  virtual ~TDESocketBuffer();
 
   /**
    * Assignment operator.
    */
-  KSocketBuffer& operator=(const KSocketBuffer& other);
+  TDESocketBuffer& operator=(const TDESocketBuffer& other);
 
   /**
    * Returns true if a line can be read from the buffer.
diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp
index 064b66b08..e4802bb7c 100644
--- a/tdecore/network/tdesocketdevice.cpp
+++ b/tdecore/network/tdesocketdevice.cpp
@@ -60,14 +60,14 @@
 
 using namespace KNetwork;
 
-class KNetwork::KSocketDevicePrivate
+class KNetwork::TDESocketDevicePrivate
 {
 public:
   mutable TQSocketNotifier *input, *output, *exception;
-  KSocketAddress local, peer;
+  TDESocketAddress local, peer;
   int af;
 
-  inline KSocketDevicePrivate()
+  inline TDESocketDevicePrivate()
   {
     input = output = exception = 0L;
     af = 0;
@@ -75,16 +75,16 @@ public:
 };
 
 
-KSocketDevice::KSocketDevice(const KSocketBase* parent)
-  : m_sockfd(-1), d(new KSocketDevicePrivate)
+TDESocketDevice::TDESocketDevice(const TDESocketBase* parent)
+  : m_sockfd(-1), d(new TDESocketDevicePrivate)
 {
   setSocketDevice(this);
   if (parent)
     setSocketOptions(parent->socketOptions());
 }
 
-KSocketDevice::KSocketDevice(int fd)
-  : m_sockfd(fd), d(new KSocketDevicePrivate)
+TDESocketDevice::TDESocketDevice(int fd)
+  : m_sockfd(fd), d(new TDESocketDevicePrivate)
 {
   setState(IO_Open);
   setFlags(IO_Sequential | IO_Raw | IO_ReadWrite);
@@ -92,26 +92,26 @@ KSocketDevice::KSocketDevice(int fd)
   d->af = localAddress().family();
 }
 
-KSocketDevice::KSocketDevice(bool, const KSocketBase* parent)
-  : m_sockfd(-1), d(new KSocketDevicePrivate)
+TDESocketDevice::TDESocketDevice(bool, const TDESocketBase* parent)
+  : m_sockfd(-1), d(new TDESocketDevicePrivate)
 {
   // do not set parent
   if (parent)
     setSocketOptions(parent->socketOptions());
 }
 
-KSocketDevice::~KSocketDevice()
+TDESocketDevice::~TDESocketDevice()
 {
   close();			// deletes the notifiers
   unsetSocketDevice(); 		// prevent double deletion
   delete d;
 }
 
-bool KSocketDevice::setSocketOptions(int opts)
+bool TDESocketDevice::setSocketOptions(int opts)
 {
   // must call parent
   TQMutexLocker locker(mutex());
-  KSocketBase::setSocketOptions(opts);
+  TDESocketBase::setSocketOptions(opts);
 
   if (m_sockfd == -1)
     return true;		// flags are stored
@@ -171,13 +171,13 @@ bool KSocketDevice::setSocketOptions(int opts)
   return true;			// all went well
 }
 
-bool KSocketDevice::open(TQ_OpenMode)
+bool TDESocketDevice::open(TQ_OpenMode)
 {
   resetError();
   return false;
 }
 
-void KSocketDevice::close()
+void TDESocketDevice::close()
 {
   resetError();
   if (m_sockfd != -1)
@@ -198,7 +198,7 @@ void KSocketDevice::close()
   m_sockfd = -1;
 }
 
-bool KSocketDevice::create(int family, int type, int protocol)
+bool TDESocketDevice::create(int family, int type, int protocol)
 {
   resetError();
 
@@ -224,12 +224,12 @@ bool KSocketDevice::create(int family, int type, int protocol)
   return true;		// successfully created
 }
 
-bool KSocketDevice::create(const KResolverEntry& address)
+bool TDESocketDevice::create(const KResolverEntry& address)
 {
   return create(address.family(), address.socketType(), address.protocol());
 }
 
-bool KSocketDevice::bind(const KResolverEntry& address)
+bool TDESocketDevice::bind(const KResolverEntry& address)
 {
   resetError();
 
@@ -252,7 +252,7 @@ bool KSocketDevice::bind(const KResolverEntry& address)
   return true;
 }
 
-bool KSocketDevice::listen(int backlog)
+bool TDESocketDevice::listen(int backlog)
 {
   if (m_sockfd != -1)
     {
@@ -273,7 +273,7 @@ bool KSocketDevice::listen(int backlog)
   return false;
 }
 
-bool KSocketDevice::connect(const KResolverEntry& address)
+bool TDESocketDevice::connect(const KResolverEntry& address)
 {
   resetError();
 
@@ -306,7 +306,7 @@ bool KSocketDevice::connect(const KResolverEntry& address)
   return true;			// all is well
 }
 
-KSocketDevice* KSocketDevice::accept()
+TDESocketDevice* TDESocketDevice::accept()
 {
   if (m_sockfd == -1)
     {
@@ -327,17 +327,17 @@ KSocketDevice* KSocketDevice::accept()
       return NULL;
     }
 
-  return new KSocketDevice(newfd);
+  return new TDESocketDevice(newfd);
 }
 
-bool KSocketDevice::disconnect()
+bool TDESocketDevice::disconnect()
 {
   resetError();
 
   if (m_sockfd == -1)
     return false;		// can't create
 
-  KSocketAddress address;
+  TDESocketAddress address;
   address.setFamily(AF_UNSPEC);
   if (kde_connect(m_sockfd, address.address(), address.length()) == -1)
     {
@@ -365,10 +365,10 @@ bool KSocketDevice::disconnect()
 }
 
 #ifdef USE_QT3
-TQ_LONG KSocketDevice::bytesAvailable() const
+TQ_LONG TDESocketDevice::bytesAvailable() const
 #endif
 #ifdef USE_QT4
-qint64 KSocketDevice::bytesAvailable() const
+qint64 TDESocketDevice::bytesAvailable() const
 #endif
 {
   if (m_sockfd == -1)
@@ -381,7 +381,7 @@ qint64 KSocketDevice::bytesAvailable() const
   return nchars;
 }
 
-TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
+TQ_LONG TDESocketDevice::waitForMore(int msecs, bool *timeout)
 {
   if (m_sockfd == -1)
     return -1;			// there won't ever be anything to read...
@@ -393,7 +393,7 @@ TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout)
   return bytesAvailable();
 }
 
-static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
+static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddress* from, ssize_t &retval, bool peek = false)
 {
   socklen_t len;
   if (from)
@@ -407,19 +407,19 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddres
   if (retval == -1)
     {
       if (errno == EAGAIN || errno == EWOULDBLOCK)
-	return KSocketDevice::WouldBlock;
+	return TDESocketDevice::WouldBlock;
       else
-	return KSocketDevice::UnknownError;
+	return TDESocketDevice::UnknownError;
     }
   if (retval == 0)
-    return KSocketDevice::RemotelyDisconnected;
+    return TDESocketDevice::RemotelyDisconnected;
 
   if (from)
     from->setLength(len);
   return 0;
 }
 
-TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -440,7 +440,7 @@ TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return retval;
 }
 
-TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress &from)
+TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -461,7 +461,7 @@ TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSoc
   return retval;
 }
 
-TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
+TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -482,7 +482,7 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -503,12 +503,12 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& fr
   return retval;
 }
 
-TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
 {
-  return tqwriteBlock(data, len, KSocketAddress());
+  return tqwriteBlock(data, len, TDESocketAddress());
 }
 
-TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to)
+TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
@@ -532,20 +532,20 @@ TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len,
   return retval;
 }
 
-KSocketAddress KSocketDevice::localAddress() const
+TDESocketAddress TDESocketDevice::localAddress() const
 {
   if (m_sockfd == -1)
-    return KSocketAddress();	// not open, empty value
+    return TDESocketAddress();	// not open, empty value
 
   if (d->local.family() != AF_UNSPEC)
     return d->local;
 
   socklen_t len;
-  KSocketAddress localAddress;
+  TDESocketAddress localAddress;
   localAddress.setLength(len = 32);	// arbitrary value
   if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
     // error!
-    return d->local = KSocketAddress();
+    return d->local = TDESocketAddress();
 
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
   len = localAddress.address()->sa_len;
@@ -563,25 +563,25 @@ KSocketAddress KSocketDevice::localAddress() const
   localAddress.setLength(len);
   if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
     // error!
-    return d->local = KSocketAddress();
+    return d->local = TDESocketAddress();
 
   return d->local = localAddress;
 }
 
-KSocketAddress KSocketDevice::peerAddress() const
+TDESocketAddress TDESocketDevice::peerAddress() const
 {
   if (m_sockfd == -1)
-    return KSocketAddress();	// not open, empty value
+    return TDESocketAddress();	// not open, empty value
 
   if (d->peer.family() != AF_UNSPEC)
     return d->peer;
 
   socklen_t len;
-  KSocketAddress peerAddress;
+  TDESocketAddress peerAddress;
   peerAddress.setLength(len = 32);	// arbitrary value
   if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
     // error!
-    return d->peer = KSocketAddress();
+    return d->peer = TDESocketAddress();
 
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
   len = peerAddress.address()->sa_len;
@@ -599,19 +599,19 @@ KSocketAddress KSocketDevice::peerAddress() const
   peerAddress.setLength(len);
   if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
     // error!
-    return d->peer = KSocketAddress();
+    return d->peer = TDESocketAddress();
 
   return d->peer = peerAddress;
 }
 
-KSocketAddress KSocketDevice::externalAddress() const
+TDESocketAddress TDESocketDevice::externalAddress() const
 {
   // for normal sockets, the externally visible address is the same
   // as the local address
   return localAddress();
 }
 
-TQSocketNotifier* KSocketDevice::readNotifier() const
+TQSocketNotifier* TDESocketDevice::readNotifier() const
 {
   if (d->input)
     return d->input;
@@ -629,7 +629,7 @@ TQSocketNotifier* KSocketDevice::readNotifier() const
   return d->input = createNotifier(TQSocketNotifier::Read);
 }
 
-TQSocketNotifier* KSocketDevice::writeNotifier() const
+TQSocketNotifier* TDESocketDevice::writeNotifier() const
 {
   if (d->output)
     return d->output;
@@ -647,7 +647,7 @@ TQSocketNotifier* KSocketDevice::writeNotifier() const
   return d->output = createNotifier(TQSocketNotifier::Write);
 }
 
-TQSocketNotifier* KSocketDevice::exceptionNotifier() const
+TQSocketNotifier* TDESocketDevice::exceptionNotifier() const
 {
   if (d->exception)
     return d->exception;
@@ -665,7 +665,7 @@ TQSocketNotifier* KSocketDevice::exceptionNotifier() const
   return d->exception = createNotifier(TQSocketNotifier::Exception);
 }
 
-bool KSocketDevice::poll(bool *input, bool *output, bool *exception,
+bool TDESocketDevice::poll(bool *input, bool *output, bool *exception,
 			 int timeout, bool* timedout)
 {
   if (m_sockfd == -1)
@@ -787,13 +787,13 @@ bool KSocketDevice::poll(bool *input, bool *output, bool *exception,
 #endif
 }
 
-bool KSocketDevice::poll(int timeout, bool *timedout)
+bool TDESocketDevice::poll(int timeout, bool *timedout)
 {
   bool input, output, exception;
   return poll(&input, &output, &exception, timeout, timedout);
 }
 
-TQSocketNotifier* KSocketDevice::createNotifier(TQSocketNotifier::Type type) const
+TQSocketNotifier* TDESocketDevice::createNotifier(TQSocketNotifier::Type type) const
 {
   if (m_sockfd == -1)
     return 0L;
@@ -836,14 +836,14 @@ namespace
   };
 }
 
-static KSocketDeviceFactoryBase* defaultImplFactory;
+static TDESocketDeviceFactoryBase* defaultImplFactory;
 static TQMutex defaultImplFactoryMutex;
-typedef TQMap<int, KSocketDeviceFactoryBase* > factoryMap;
+typedef TQMap<int, TDESocketDeviceFactoryBase* > factoryMap;
 static factoryMap factories;
  
-KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent)
+TDESocketDevice* TDESocketDevice::createDefault(TDESocketBase* parent)
 {
-  KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
+  TDESocketDevice* device = dynamic_cast<TDESocketDevice*>(parent);
   if (device != 0L)
     return device;
 
@@ -853,12 +853,12 @@ KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent)
     return defaultImplFactory->create(parent);
 
   // the really default
-  return new KSocketDevice(parent);
+  return new TDESocketDevice(parent);
 }
 
-KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilities)
+TDESocketDevice* TDESocketDevice::createDefault(TDESocketBase* parent, int capabilities)
 {
-  KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
+  TDESocketDevice* device = dynamic_cast<TDESocketDevice*>(parent);
   if (device != 0L)
     return device;
 
@@ -872,16 +872,16 @@ KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilitie
   return 0L;			// no default
 }
 
-KSocketDeviceFactoryBase*
-KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
+TDESocketDeviceFactoryBase*
+TDESocketDevice::setDefaultImpl(TDESocketDeviceFactoryBase* factory)
 {
   TQMutexLocker locker(&defaultImplFactoryMutex);
-  KSocketDeviceFactoryBase* old = defaultImplFactory;
+  TDESocketDeviceFactoryBase* old = defaultImplFactory;
   defaultImplFactory = factory;
   return old;
 }
 
-void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
+void TDESocketDevice::addNewImpl(TDESocketDeviceFactoryBase* factory, int capabilities)
 {
   TQMutexLocker locker(&defaultImplFactoryMutex);
   if (factories.contains(capabilities))
diff --git a/tdecore/network/tdesocketdevice.h b/tdecore/network/tdesocketdevice.h
index 10856716d..52fe18709 100644
--- a/tdecore/network/tdesocketdevice.h
+++ b/tdecore/network/tdesocketdevice.h
@@ -30,32 +30,32 @@
 
 namespace KNetwork {
 
-class KSocketDevice;
-class KSocketDeviceFactoryBase;
+class TDESocketDevice;
+class TDESocketDeviceFactoryBase;
 
-class KSocketDevicePrivate;
-/** @class KSocketDevice tdesocketdevice.h tdesocketdevice.h
+class TDESocketDevicePrivate;
+/** @class TDESocketDevice tdesocketdevice.h tdesocketdevice.h
  *  @brief Low-level socket functionality.
  *
  * This class provides low-level socket functionality. 
  *
  * Most users will prefer "cooked" interfaces like those of @ref KStreamSocket or
- * @ref KServerSocket.
+ * @ref TDEServerSocket.
  *
  * Descended classes from this one provide some other kinds of socket functionality,
  * like proxying or specific socket types.
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KSocketDevice: public KActiveSocketBase, public KPassiveSocketBase
+class TDECORE_EXPORT TDESocketDevice: public KActiveSocketBase, public KPassiveSocketBase
 {
 public:
   /**
    * Capabilities for the socket implementation.
    *
-   * KSocketDevice-derived classes can implement certain capabilities that are not
+   * TDESocketDevice-derived classes can implement certain capabilities that are not
    * available in the default class. These capabilities are described by these flags.
-   * The default KSocketDevice class has none of these capabilities.
+   * The default TDESocketDevice class has none of these capabilities.
    *
    * For the negative capabilities (inabilities, the CanNot* forms), when a capability 
    * is not present, the implementation will default to the original behaviour.
@@ -101,7 +101,7 @@ public:
    * The parameter is used to specify which socket this object is used as
    * a device for.
    */
-  explicit KSocketDevice(const KSocketBase* = 0L);
+  explicit TDESocketDevice(const TDESocketBase* = 0L);
 
   /**
    * Constructs a new object around an already-open socket.
@@ -109,12 +109,12 @@ public:
    * Note: you should write programs that create sockets through
    * the classes whenever possible.
    */
-  explicit KSocketDevice(int fd);
+  explicit TDESocketDevice(int fd);
 
   /**
    * Destructor. This closes the socket if it's open.
    */
-  virtual ~KSocketDevice();
+  virtual ~TDESocketDevice();
 
   /**
    * Returns the file descriptor for this socket.
@@ -186,9 +186,9 @@ public:
 
   /**
    * Accepts a new incoming connection.
-   * Note: this function returns a socket of type KSocketDevice.
+   * Note: this function returns a socket of type TDESocketDevice.
    */
-  virtual KSocketDevice* accept();
+  virtual TDESocketDevice* accept();
 
   /**
    * Disconnects this socket.
@@ -221,7 +221,7 @@ public:
   /**
    * Reads data and the source address from this socket.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Peeks data in the socket.
@@ -231,7 +231,7 @@ public:
   /**
    * Peeks the data in the socket and the source address.
    */
-  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Writes data to the socket.
@@ -241,18 +241,18 @@ public:
   /**
    * Writes the given data to the given destination address.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
 
   /**
    * Returns this socket's local address.
    */
-  virtual KSocketAddress localAddress() const;
+  virtual TDESocketAddress localAddress() const;
 
   /**
    * Returns this socket's peer address. If this implementation does proxying
    * of some sort, this is the real external address, not the proxy's address.
    */
-  virtual KSocketAddress peerAddress() const;
+  virtual TDESocketAddress peerAddress() const;
 
   /**
    * Returns this socket's externally visible local address.
@@ -265,10 +265,10 @@ public:
    * addresses different from the local socket values. The default implementation
    * returns the same value as @ref localAddress.
    *
-   * @note This function may return an empty KSocketAddress. In that case, the
+   * @note This function may return an empty TDESocketAddress. In that case, the
    *       externally visible address could/can not be determined.
    */
-  virtual KSocketAddress externalAddress() const;
+  virtual TDESocketAddress externalAddress() const;
 
   /**
    * Returns a socket notifier for input on this socket.
@@ -337,7 +337,7 @@ protected:
    *
    * @param parent	the parent, if any
    */
-  KSocketDevice(bool, const KSocketBase* parent = 0L);
+  TDESocketDevice(bool, const TDESocketBase* parent = 0L);
 
   /**
    * Creates a socket notifier of the given type.
@@ -358,16 +358,16 @@ protected:
 
 public:
   /**
-   * Creates a new default KSocketDevice object given
+   * Creates a new default TDESocketDevice object given
    * the parent object.
    *
    * The capabilities flag indicates the desired capabilities the object being
    * created should possess. Those capabilities are not guaranteed: if no factory
    * can provide such an object, a default object will be created.
    *
-   * @param parent	the KSocketBase parent
+   * @param parent	the TDESocketBase parent
    */
-  static KSocketDevice* createDefault(KSocketBase* parent);
+  static TDESocketDevice* createDefault(TDESocketBase* parent);
 
   /**
    * @overload
@@ -377,40 +377,40 @@ public:
    * @param parent		the parent
    * @param capabilities	the requested capabilities
    */
-  static KSocketDevice* createDefault(KSocketBase* parent, int capabilities);
+  static TDESocketDevice* createDefault(TDESocketBase* parent, int capabilities);
 
   /**
-   * Sets the default KSocketDevice implementation to use and
+   * Sets the default TDESocketDevice implementation to use and
    * return the old factory.
    *
    * @param factory	the factory object for the implementation
    */
-  static KSocketDeviceFactoryBase* setDefaultImpl(KSocketDeviceFactoryBase* factory);
+  static TDESocketDeviceFactoryBase* setDefaultImpl(TDESocketDeviceFactoryBase* factory);
 
   /**
-   * Adds a factory of KSocketDevice objects to the list, along with its
+   * Adds a factory of TDESocketDevice objects to the list, along with its
    * capabilities flag.
    */
-  static void addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities);
+  static void addNewImpl(TDESocketDeviceFactoryBase* factory, int capabilities);
 
 private:
-  KSocketDevice(const KSocketDevice&);
-  KSocketDevice& operator=(const KSocketDevice&);
+  TDESocketDevice(const TDESocketDevice&);
+  TDESocketDevice& operator=(const TDESocketDevice&);
 
-  KSocketDevicePrivate *d;
+  TDESocketDevicePrivate *d;
 };
 
 /** @internal
  * This class provides functionality for creating and registering
  *  socket implementations.
  */
-class KSocketDeviceFactoryBase
+class TDESocketDeviceFactoryBase
 {
 public:
-  KSocketDeviceFactoryBase() {}
-  virtual ~KSocketDeviceFactoryBase() {}
+  TDESocketDeviceFactoryBase() {}
+  virtual ~TDESocketDeviceFactoryBase() {}
 
-  virtual KSocketDevice* create(KSocketBase*) const = 0;
+  virtual TDESocketDevice* create(TDESocketBase*) const = 0;
 };
 
 /**
@@ -418,13 +418,13 @@ public:
  * socket implementations.
  */
 template<class Impl>
-class KSocketDeviceFactory: public KSocketDeviceFactoryBase
+class TDESocketDeviceFactory: public TDESocketDeviceFactoryBase
 {
 public:
-  KSocketDeviceFactory() {}
-  virtual ~KSocketDeviceFactory() {}
+  TDESocketDeviceFactory() {}
+  virtual ~TDESocketDeviceFactory() {}
 
-  virtual KSocketDevice* create(KSocketBase* parent) const
+  virtual TDESocketDevice* create(TDESocketBase* parent) const
   { return new Impl(parent); }
 };
 
diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp
index 8dc501590..d747b61ae 100644
--- a/tdecore/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/networkbackends/network-manager/network-manager.cpp
@@ -20,7 +20,7 @@
 
 #include <tqdbusmessage.h>
 
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "tdehardwaredevices.h"
 
 #include "network-manager.h"
@@ -1299,7 +1299,7 @@ TQString macAddressForGenericDevice(TQT_DBusObjectPath path) {
 }
 
 TQString tdeDeviceUUIDForMACAddress(TQString macAddress) {
-	TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	if (!hwdevices) {
 		return TQString::null;
 	}
@@ -4828,10 +4828,10 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes()
 		// read in all available Services
 		for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) {
 			TQString service = NM_PLUGIN_SERVICE_DIR + TQString ("/") + *i;
-			KConfig* kconfig = new KConfig (service, true, true, "config");
-			kconfig->setGroup ("VPN Connection");
+			TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config");
+			tdeconfig->setGroup ("VPN Connection");
 
-			TQString serviceName = kconfig->readEntry("name", TQString());
+			TQString serviceName = tdeconfig->readEntry("name", TQString());
 			serviceName = serviceName.lower();
 
 			if (serviceName == "openvpn") {
@@ -4847,7 +4847,7 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes()
 				ret.append(TDENetworkVPNType::VPNC);
 			}
 
-			delete kconfig;
+			delete tdeconfig;
 		}
 	}
 
diff --git a/tdecore/networkbackends/network-manager/network-manager_p.h b/tdecore/networkbackends/network-manager/network-manager_p.h
index 474f628bb..0e1fe4de8 100644
--- a/tdecore/networkbackends/network-manager/network-manager_p.h
+++ b/tdecore/networkbackends/network-manager/network-manager_p.h
@@ -27,7 +27,7 @@
 
 /* TDE headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 0afbd9422..36e752f33 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -1,19 +1,19 @@
 // -*- c++ -*-
 
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <stdio.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <config.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static const char *description = I18N_NOOP("A little program to output installation paths");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "expandvars", I18N_NOOP("expand ${prefix} and ${exec_prefix} in output"), 0 },
     { "prefix",	   I18N_NOOP("Compiled in prefix for TDE libraries"), 0 },
@@ -113,19 +113,19 @@ void printResult(const TQString &s)
 
 int main(int argc, char **argv)
 {
-    KLocale::setMainCatalogue("tdelibs");
-    KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
-    KCmdLineArgs::init( argc, argv, &about);
+    TDELocale::setMainCatalogue("tdelibs");
+    TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow");
+    TDECmdLineArgs::init( argc, argv, &about);
 
-    KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+    TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
-    KInstance a("tde-config");
+    TDEInstance a("tde-config");
     a.setConfigReadOnly(TRUE);
-    (void)KGlobal::dirs(); // trigger the creation
-    (void)KGlobal::config();
+    (void)TDEGlobal::dirs(); // trigger the creation
+    (void)TDEGlobal::config();
 
     // Get application specific arguments
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     _expandvars = args->isSet("expandvars");
 
@@ -151,7 +151,7 @@ int main(int argc, char **argv)
 
     if (args->isSet("localprefix"))
     {
-        printResult(KGlobal::dirs()->localtdedir());
+        printResult(TDEGlobal::dirs()->localtdedir());
         return 0;
     }
 
@@ -163,7 +163,7 @@ int main(int argc, char **argv)
 
     if (args->isSet("types"))
     {
-        TQStringList types = KGlobal::dirs()->allTypes();
+        TQStringList types = TDEGlobal::dirs()->allTypes();
         types.sort();
         const char *helptexts[] = {
             "apps", I18N_NOOP("Applications menu (.desktop files)"),
@@ -176,7 +176,7 @@ int main(int argc, char **argv)
             "kcfg", I18N_NOOP("Configuration description files"),
             "lib", I18N_NOOP("Libraries"),
             "include", I18N_NOOP("Includes/Headers"),
-            "locale", I18N_NOOP("Translation files for KLocale"),
+            "locale", I18N_NOOP("Translation files for TDELocale"),
             "mime", I18N_NOOP("Mime types"),
             "module", I18N_NOOP("Loadable modules"),
             "qtplugins", I18N_NOOP("Qt plugins"),
@@ -211,7 +211,7 @@ int main(int argc, char **argv)
     TQString type = args->getOption("path");
     if (!type.isEmpty())
     {
-        printResult(KGlobal::dirs()->resourceDirs(type.latin1()).join(":"));
+        printResult(TDEGlobal::dirs()->resourceDirs(type.latin1()).join(":"));
         return 0;
     }
 
@@ -219,13 +219,13 @@ int main(int argc, char **argv)
     if (!type.isEmpty())
     {
         if ( type == "desktop" )
-            printResult(KGlobalSettings::desktopPath());
+            printResult(TDEGlobalSettings::desktopPath());
         else if ( type == "autostart" )
-            printResult(KGlobalSettings::autostartPath());
+            printResult(TDEGlobalSettings::autostartPath());
         else if ( type == "trash" )
-            printResult(KGlobalSettings::trashPath());
+            printResult(TDEGlobalSettings::trashPath());
         else if ( type == "document" )
-            printResult(KGlobalSettings::documentPath());
+            printResult(TDEGlobalSettings::documentPath());
         else
             fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").arg(type).local8Bit().data() );
         return 0;
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index c988b000e..f86e5f5db 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -1,19 +1,19 @@
 // -*- c++ -*-
 
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <stdio.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <config.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static const char *description = I18N_NOOP("A little program to output installation paths");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "expandvars", I18N_NOOP("expand ${prefix} and ${exec_prefix} in output"), 0 },
     { "prefix",	   I18N_NOOP("Compiled in prefix for TDE libraries"), 0 },
@@ -113,19 +113,19 @@ void printResult(const TQString &s)
 
 int main(int argc, char **argv)
 {
-    KLocale::setMainCatalogue("tdelibs");
-    KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
-    KCmdLineArgs::init( argc, argv, &about);
+    TDELocale::setMainCatalogue("tdelibs");
+    TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow");
+    TDECmdLineArgs::init( argc, argv, &about);
 
-    KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+    TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
-    KInstance a("tde-config");
+    TDEInstance a("tde-config");
     a.setConfigReadOnly(TRUE);
-    (void)KGlobal::dirs(); // trigger the creation
-    (void)KGlobal::config();
+    (void)TDEGlobal::dirs(); // trigger the creation
+    (void)TDEGlobal::config();
 
     // Get application specific arguments
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     _expandvars = args->isSet("expandvars");
 
@@ -151,7 +151,7 @@ int main(int argc, char **argv)
 
     if (args->isSet("localprefix"))
     {
-        printResult(KGlobal::dirs()->localtdedir());
+        printResult(TDEGlobal::dirs()->localtdedir());
         return 0;
     }
 
@@ -163,7 +163,7 @@ int main(int argc, char **argv)
 
     if (args->isSet("types"))
     {
-        TQStringList types = KGlobal::dirs()->allTypes();
+        TQStringList types = TDEGlobal::dirs()->allTypes();
         types.sort();
         const char *helptexts[] = {
             "apps", I18N_NOOP("Applications menu (.desktop files)"),
@@ -176,7 +176,7 @@ int main(int argc, char **argv)
             "kcfg", I18N_NOOP("Configuration description files"),
             "lib", I18N_NOOP("Libraries"),
             "include", I18N_NOOP("Includes/Headers"),
-            "locale", I18N_NOOP("Translation files for KLocale"),
+            "locale", I18N_NOOP("Translation files for TDELocale"),
             "mime", I18N_NOOP("Mime types"),
             "module", I18N_NOOP("Loadable modules"),
             "qtplugins", I18N_NOOP("Qt plugins"),
@@ -210,7 +210,7 @@ int main(int argc, char **argv)
     TQString type = args->getOption("path");
     if (!type.isEmpty())
     {
-        printResult(KGlobal::dirs()->resourceDirs(type.latin1()).join(":"));
+        printResult(TDEGlobal::dirs()->resourceDirs(type.latin1()).join(":"));
         return 0;
     }
 
@@ -218,13 +218,13 @@ int main(int argc, char **argv)
     if (!type.isEmpty())
     {
         if ( type == "desktop" )
-            printResult(KGlobalSettings::desktopPath());
+            printResult(TDEGlobalSettings::desktopPath());
         else if ( type == "autostart" )
-            printResult(KGlobalSettings::autostartPath());
+            printResult(TDEGlobalSettings::autostartPath());
         else if ( type == "trash" )
-            printResult(KGlobalSettings::trashPath());
+            printResult(TDEGlobalSettings::trashPath());
         else if ( type == "document" )
-            printResult(KGlobalSettings::documentPath());
+            printResult(TDEGlobalSettings::documentPath());
         else
             fprintf(stderr, "%s", TQString(i18n("%1 - unknown type of userpath\n").arg(type)).local8Bit().data() );
         return 0;
diff --git a/tdecore/kaboutdata.cpp b/tdecore/tdeaboutdata.cpp
index 00d75225b..bf8538152 100644
--- a/tdecore/kaboutdata.cpp
+++ b/tdecore/tdeaboutdata.cpp
@@ -20,19 +20,19 @@
  */
 
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 
 TQString
-KAboutPerson::name() const
+TDEAboutPerson::name() const
 {
    return TQString::fromUtf8(mName);
 }
 
 TQString
-KAboutPerson::task() const
+TDEAboutPerson::task() const
 {
    if (mTask && *mTask)
       return i18n(mTask);
@@ -41,40 +41,40 @@ KAboutPerson::task() const
 }
 
 TQString
-KAboutPerson::emailAddress() const
+TDEAboutPerson::emailAddress() const
 {
    return TQString::fromUtf8(mEmailAddress);
 }
 
 
 TQString
-KAboutPerson::webAddress() const
+TDEAboutPerson::webAddress() const
 {
    return TQString::fromUtf8(mWebAddress);
 }
 
 
-KAboutTranslator::KAboutTranslator(const TQString & name,
+TDEAboutTranslator::TDEAboutTranslator(const TQString & name,
                 const TQString & emailAddress)
 {
     mName=name;
     mEmail=emailAddress;
 }
 
-TQString KAboutTranslator::name() const
+TQString TDEAboutTranslator::name() const
 {
     return mName;
 }
 
-TQString KAboutTranslator::emailAddress() const
+TQString TDEAboutTranslator::emailAddress() const
 {
     return mEmail;
 }
 
-class KAboutDataPrivate
+class TDEAboutDataPrivate
 {
 public:
-    KAboutDataPrivate()
+    TDEAboutDataPrivate()
         : translatorName("_: NAME OF TRANSLATORS\nYour names")
         , translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails")
         , productName(0)
@@ -82,7 +82,7 @@ public:
         , customAuthorTextEnabled(false)
         , mTranslatedProgramName( 0 )
         {}
-    ~KAboutDataPrivate()
+    ~TDEAboutDataPrivate()
         {
              delete programLogo;
              delete[] mTranslatedProgramName;
@@ -96,9 +96,9 @@ public:
     const char *mTranslatedProgramName;
 };
 
-const char *KAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org";
+const char *TDEAboutData::defaultBugTracker = "http://bugs.trinitydesktop.org";
 
-KAboutData::KAboutData( const char *appName,
+TDEAboutData::TDEAboutData( const char *appName,
                         const char *programName,
                         const char *version,
                         const char *shortDescription,
@@ -118,7 +118,7 @@ KAboutData::KAboutData( const char *appName,
   mBugEmailAddress( (bugsEmailAddress!=0)?bugsEmailAddress:defaultBugTracker ),
   mLicenseText (0)
 {
-   d = new KAboutDataPrivate;
+   d = new TDEAboutDataPrivate;
 
    if( appName ) {
      const char *p = strrchr(appName, '/');
@@ -130,7 +130,7 @@ KAboutData::KAboutData( const char *appName,
      mAppName = 0;
 }
 
-KAboutData::~KAboutData()
+TDEAboutData::~TDEAboutData()
 {
     if (mLicenseKey == License_File)
         delete [] mLicenseText;
@@ -138,109 +138,109 @@ KAboutData::~KAboutData()
 }
 
 void
-KAboutData::addAuthor( const char *name, const char *task,
+TDEAboutData::addAuthor( const char *name, const char *task,
 		    const char *emailAddress, const char *webAddress )
 {
-  mAuthorList.append(KAboutPerson(name,task,emailAddress,webAddress));
+  mAuthorList.append(TDEAboutPerson(name,task,emailAddress,webAddress));
 }
 
 void
-KAboutData::addCredit( const char *name, const char *task,
+TDEAboutData::addCredit( const char *name, const char *task,
 		    const char *emailAddress, const char *webAddress )
 {
-  mCreditList.append(KAboutPerson(name,task,emailAddress,webAddress));
+  mCreditList.append(TDEAboutPerson(name,task,emailAddress,webAddress));
 }
 
 void
-KAboutData::setTranslator( const char *name, const char *emailAddress)
+TDEAboutData::setTranslator( const char *name, const char *emailAddress)
 {
   d->translatorName=name;
   d->translatorEmail=emailAddress;
 }
 
 void
-KAboutData::setLicenseText( const char *licenseText )
+TDEAboutData::setLicenseText( const char *licenseText )
 {
   mLicenseText = licenseText;
   mLicenseKey = License_Custom;
 }
 
 void
-KAboutData::setLicenseTextFile( const TQString &file )
+TDEAboutData::setLicenseTextFile( const TQString &file )
 {
   mLicenseText = tqstrdup(TQFile::encodeName(file));
   mLicenseKey = License_File;
 }
 
 void
-KAboutData::setAppName( const char *appName )
+TDEAboutData::setAppName( const char *appName )
 {
   mAppName = appName;
 }
 
 void
-KAboutData::setProgramName( const char* programName )
+TDEAboutData::setProgramName( const char* programName )
 {
   mProgramName = programName;
   translateInternalProgramName();
 }
 
 void
-KAboutData::setVersion( const char* version )
+TDEAboutData::setVersion( const char* version )
 {
   mVersion = version;
 }
 
 void
-KAboutData::setShortDescription( const char *shortDescription )
+TDEAboutData::setShortDescription( const char *shortDescription )
 {
   mShortDescription = shortDescription;
 }
 
 void
-KAboutData::setLicense( LicenseKey licenseKey)
+TDEAboutData::setLicense( LicenseKey licenseKey)
 {
   mLicenseKey = licenseKey;
 }
 
 void
-KAboutData::setCopyrightStatement( const char *copyrightStatement )
+TDEAboutData::setCopyrightStatement( const char *copyrightStatement )
 {
   mCopyrightStatement = copyrightStatement;
 }
 
 void
-KAboutData::setOtherText( const char *otherText )
+TDEAboutData::setOtherText( const char *otherText )
 {
   mOtherText = otherText;
 }
 
 void
-KAboutData::setHomepage( const char *homepage )
+TDEAboutData::setHomepage( const char *homepage )
 {
   mHomepageAddress = homepage;
 }
 
 void
-KAboutData::setBugAddress( const char *bugAddress )
+TDEAboutData::setBugAddress( const char *bugAddress )
 {
   mBugEmailAddress = bugAddress;
 }
 
 void
-KAboutData::setProductName( const char *productName )
+TDEAboutData::setProductName( const char *productName )
 {
   d->productName = productName;
 }
 
 const char *
-KAboutData::appName() const
+TDEAboutData::appName() const
 {
    return mAppName;
 }
 
 const char *
-KAboutData::productName() const
+TDEAboutData::productName() const
 {
    if (d->productName)
       return d->productName;
@@ -249,7 +249,7 @@ KAboutData::productName() const
 }
 
 TQString
-KAboutData::programName() const
+TDEAboutData::programName() const
 {
    if (mProgramName && *mProgramName)
       return i18n(mProgramName);
@@ -258,7 +258,7 @@ KAboutData::programName() const
 }
 
 const char*
-KAboutData::internalProgramName() const
+TDEAboutData::internalProgramName() const
 {
    if (d->mTranslatedProgramName)
       return d->mTranslatedProgramName;
@@ -266,26 +266,26 @@ KAboutData::internalProgramName() const
       return mProgramName;
 }
 
-// KCrash should call as few things as possible and should avoid e.g. malloc()
-// because it may deadlock. Since i18n() needs it, when KLocale is available
+// TDECrash should call as few things as possible and should avoid e.g. malloc()
+// because it may deadlock. Since i18n() needs it, when TDELocale is available
 // the i18n() call will be done here in advance.
 void
-KAboutData::translateInternalProgramName() const
+TDEAboutData::translateInternalProgramName() const
 {
   delete[] d->mTranslatedProgramName;
   d->mTranslatedProgramName = 0;
-  if( KGlobal::locale() )
+  if( TDEGlobal::locale() )
       d->mTranslatedProgramName = tqstrdup( programName().utf8());
 }
 
 TQImage
-KAboutData::programLogo() const
+TDEAboutData::programLogo() const
 {
     return d->programLogo ? (*d->programLogo) : TQImage();
 }
 
 void
-KAboutData::setProgramLogo(const TQImage& image)
+TDEAboutData::setProgramLogo(const TQImage& image)
 {
     if (!d->programLogo)
        d->programLogo = new TQImage( image );
@@ -294,13 +294,13 @@ KAboutData::setProgramLogo(const TQImage& image)
 }
 
 TQString
-KAboutData::version() const
+TDEAboutData::version() const
 {
    return TQString::fromLatin1(mVersion);
 }
 
 TQString
-KAboutData::shortDescription() const
+TDEAboutData::shortDescription() const
 {
    if (mShortDescription && *mShortDescription)
       return i18n(mShortDescription);
@@ -309,33 +309,33 @@ KAboutData::shortDescription() const
 }
 
 TQString
-KAboutData::homepage() const
+TDEAboutData::homepage() const
 {
    return TQString::fromLatin1(mHomepageAddress);
 }
 
 TQString
-KAboutData::bugAddress() const
+TDEAboutData::bugAddress() const
 {
    return TQString::fromLatin1(mBugEmailAddress);
 }
 
-const TQValueList<KAboutPerson>
-KAboutData::authors() const
+const TQValueList<TDEAboutPerson>
+TDEAboutData::authors() const
 {
    return mAuthorList;
 }
 
-const TQValueList<KAboutPerson>
-KAboutData::credits() const
+const TQValueList<TDEAboutPerson>
+TDEAboutData::credits() const
 {
    return mCreditList;
 }
 
-const TQValueList<KAboutTranslator>
-KAboutData::translators() const
+const TQValueList<TDEAboutTranslator>
+TDEAboutData::translators() const
 {
-    TQValueList<KAboutTranslator> personList;
+    TQValueList<TDEAboutTranslator> personList;
 
     if(d->translatorName == 0)
         return personList;
@@ -375,14 +375,14 @@ KAboutData::translators() const
 
         TQString name=*nit;
 
-        personList.append(KAboutTranslator(name.stripWhiteSpace(), email.stripWhiteSpace()));
+        personList.append(TDEAboutTranslator(name.stripWhiteSpace(), email.stripWhiteSpace()));
     }
 
     return personList;
 }
 
 TQString
-KAboutData::aboutTranslationTeam()
+TDEAboutData::aboutTranslationTeam()
 {
     return i18n("replace this with information about your translation team",
             "<p>KDE is translated into many languages thanks to the work "
@@ -393,7 +393,7 @@ KAboutData::aboutTranslationTeam()
 }
 
 TQString
-KAboutData::otherText() const
+TDEAboutData::otherText() const
 {
    if (mOtherText && *mOtherText)
       return i18n(mOtherText);
@@ -403,7 +403,7 @@ KAboutData::otherText() const
 
 
 TQString
-KAboutData::license() const
+TDEAboutData::license() const
 {
   TQString result;
   if (!copyrightStatement().isEmpty())
@@ -466,7 +466,7 @@ KAboutData::license() const
 }
 
 TQString
-KAboutData::copyrightStatement() const
+TDEAboutData::copyrightStatement() const
 {
   if (mCopyrightStatement && *mCopyrightStatement)
      return i18n(mCopyrightStatement);
@@ -475,25 +475,25 @@ KAboutData::copyrightStatement() const
 }
 
 TQString
-KAboutData::customAuthorPlainText() const
+TDEAboutData::customAuthorPlainText() const
 {
   return d->customAuthorPlainText;
 }
 
 TQString
-KAboutData::customAuthorRichText() const
+TDEAboutData::customAuthorRichText() const
 {
   return d->customAuthorRichText;
 }
 
 bool
-KAboutData::customAuthorTextEnabled() const
+TDEAboutData::customAuthorTextEnabled() const
 {
   return d->customAuthorTextEnabled;
 }
     
 void
-KAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText)
+TDEAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richText)
 {
   d->customAuthorPlainText = plainText;
   d->customAuthorRichText = richText;
@@ -502,7 +502,7 @@ KAboutData::setCustomAuthorText(const TQString &plainText, const TQString &richT
 }
     
 void
-KAboutData::unsetCustomAuthorText()
+TDEAboutData::unsetCustomAuthorText()
 {
   d->customAuthorPlainText = TQString::null;
   d->customAuthorRichText = TQString::null;
diff --git a/tdecore/kaboutdata.h b/tdecore/tdeaboutdata.h
index 525ed3c92..db76287f2 100644
--- a/tdecore/kaboutdata.h
+++ b/tdecore/tdeaboutdata.h
@@ -22,36 +22,36 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifndef _KABOUTDATA_H_
 #define _KABOUTDATA_H_
 
-class KAboutPersonPrivate;
-class KAboutDataPrivate;
+class TDEAboutPersonPrivate;
+class TDEAboutDataPrivate;
 
 /**
  * This structure is used to store information about a person or developer.
  * It can store the person's name, a task, an email address and a
  * link to a home page. This class is intended for use in the
- * KAboutData class, but it can be used elsewhere as well.
+ * TDEAboutData class, but it can be used elsewhere as well.
  * Normally you should at least define the person's name.
  *
  * Example Usage within a main():
  *
  * \code
- *   KAboutData about("khello", I18N_NOOP("KHello"), "0.1",
+ *   TDEAboutData about("khello", I18N_NOOP("KHello"), "0.1",
  *                   I18N_NOOP("A TDE version of Hello, world!"),
- *                   KAboutData::License_LGPL,
+ *                   TDEAboutData::License_LGPL,
  *                   I18N_NOOP("Copyright (c) 2003 Developer"));
  *
  *   about.addAuthor("Joe Developer", I18N_NOOP("developer"), "joe@host.com", 0);
  *   about.addCredit("Joe User", I18N_NOOP("A lot of bug reports"),
  *                   "joe.user@host.org", 0);
- *   KCmdLineArgs::init(argc, argv, &about);
+ *   TDECmdLineArgs::init(argc, argv, &about);
  * \endcode
  */
-class TDECORE_EXPORT KAboutPerson
+class TDECORE_EXPORT TDEAboutPerson
 {
 public:
     /**
@@ -67,7 +67,7 @@ public:
      *
      * @param webAddress Home page of the person.
      */
-    KAboutPerson( const char *name, const char *task,
+    TDEAboutPerson( const char *name, const char *task,
                   const char *emailAddress, const char *webAddress )
     {
       mName = name;
@@ -79,7 +79,7 @@ public:
      * @internal
      * Don't use. Required by QValueList
      */
-    KAboutPerson() {}
+    TDEAboutPerson() {}
 
     /**
      * The person's name
@@ -115,23 +115,23 @@ private:
     const char *mEmailAddress;
     const char *mWebAddress;
 
-    KAboutPersonPrivate *d;
+    TDEAboutPersonPrivate *d;
 };
 
-class KAboutTranslatorPrivate;
+class TDEAboutTranslatorPrivate;
 /**
  * This structure is used to store information about a translator.
  * It can store the translator's name and an email address.
- * This class is intended for use in the KAboutData class,
+ * This class is intended for use in the TDEAboutData class,
  * but it can be used elsewhere as well.
  * Normally you should at least define the translator's name.
  *
- * It's not possible to use KAboutPerson for this, because
- * KAboutPerson stores internally only const char* pointers, but the
+ * It's not possible to use TDEAboutPerson for this, because
+ * TDEAboutPerson stores internally only const char* pointers, but the
  * translator information is generated dynamically from the translation
  * of a dummy string.
 */
-class TDECORE_EXPORT KAboutTranslator
+class TDECORE_EXPORT TDEAboutTranslator
 {
 public:
     /**
@@ -141,7 +141,7 @@ public:
      *
      * @param emailAddress The email address of the person.
      */
-    KAboutTranslator(const TQString & name=TQString::null,
+    TDEAboutTranslator(const TQString & name=TQString::null,
                      const TQString & emailAddress=TQString::null);
 
     /**
@@ -161,7 +161,7 @@ public:
 private:
     TQString mName;
     TQString mEmail;
-    KAboutTranslatorPrivate* d;
+    TDEAboutTranslatorPrivate* d;
 };
 
 
@@ -169,17 +169,17 @@ private:
  * This class is used to store information about a program. It can store
  * such values as version number, program name, home page, email address
  * for bug reporting, multiple authors and contributors
- * (using KAboutPerson), license and copyright information.
+ * (using TDEAboutPerson), license and copyright information.
  *
  * Currently, the values set here are shown by the "About" box
- * (see KAboutDialog), used by the bug report dialog (see KBugReport),
- * and by the help shown on command line (see KCmdLineArgs).
+ * (see TDEAboutDialog), used by the bug report dialog (see KBugReport),
+ * and by the help shown on command line (see TDECmdLineArgs).
  *
  * @short Holds information needed by the "About" box and other
  * classes.
  * @author Espen Sand (espen@kde.org), David Faure (faure@kde.org)
  */
-class TDECORE_EXPORT KAboutData
+class TDECORE_EXPORT TDEAboutData
 {
   public:
   /**
@@ -235,7 +235,7 @@ class TDECORE_EXPORT KAboutData
      *        This defaults to the trinitydesktop.org bug system.
      *
      */
-    KAboutData( const char *appName,
+    TDEAboutData( const char *appName,
                 const char *programName,
 		const char *version,
 		const char *shortDescription = 0,
@@ -246,7 +246,7 @@ class TDECORE_EXPORT KAboutData
 		const char *bugsEmailAddress = 0
 		);
 
-     ~KAboutData();
+     ~TDEAboutData();
 
     /**
      * Defines an author. You can call this function as many times you
@@ -318,7 +318,7 @@ class TDECORE_EXPORT KAboutData
      *
      * @param name the name of the translator
      * @param emailAddress the email address of the translator
-     * @see KAboutTranslator
+     * @see TDEAboutTranslator
      */
     void setTranslator(const char* name, const char* emailAddress);
 
@@ -521,19 +521,19 @@ class TDECORE_EXPORT KAboutData
      * Returns a list of authors.
      * @return author information (list of persons).
      */
-    const TQValueList<KAboutPerson> authors() const;
+    const TQValueList<TDEAboutPerson> authors() const;
 
     /**
      * Returns a list of persons who contributed.
      * @return credit information (list of persons).
      */
-    const TQValueList<KAboutPerson> credits() const;
+    const TQValueList<TDEAboutPerson> credits() const;
 
     /**
      * Returns a list of translators.
      * @return translators information (list of persons)
      */
-    const TQValueList<KAboutTranslator> translators() const;
+    const TQValueList<TDEAboutTranslator> translators() const;
 
     /**
      * Returns a message about the translation team.
@@ -618,12 +618,12 @@ class TDECORE_EXPORT KAboutData
     const char *mOtherText;
     const char *mHomepageAddress;
     const char *mBugEmailAddress;
-    TQValueList<KAboutPerson> mAuthorList;
-    TQValueList<KAboutPerson> mCreditList;
+    TQValueList<TDEAboutPerson> mAuthorList;
+    TQValueList<TDEAboutPerson> mCreditList;
     const char *mLicenseText;
     static const char *defaultBugTracker;
 
-    KAboutDataPrivate *d;
+    TDEAboutDataPrivate *d;
 };
 
 #endif
diff --git a/tdecore/kaccel.cpp b/tdecore/tdeaccel.cpp
index 52175e2eb..5430c2529 100644
--- a/tdecore/kaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccel.h"
+#include "tdeaccel.h"
 
 #include <tqaccel.h>
 #include <tqguardedptr.h>
@@ -26,13 +26,13 @@
 #include <tqstring.h>
 #include <tqtimer.h>
 
-#include "kaccelbase.h"
-#include <kapplication.h>
+#include "tdeaccelbase.h"
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kshortcut.h>
+#include <tdelocale.h>
+#include <tdeshortcut.h>
 
-#include "kaccelprivate.h"
+#include "tdeaccelprivate.h"
 
 #ifdef Q_WS_X11
 #	include <X11/Xlib.h>
@@ -43,17 +43,17 @@
 #	endif
 #endif
 
-// TODO: Put in kaccelbase.cpp
+// TODO: Put in tdeaccelbase.cpp
 //---------------------------------------------------------------------
-// KAccelEventHandler
+// TDEAccelEventHandler
 //---------------------------------------------------------------------
 //
-// In KAccelEventHandler::x11Event we do our own X11 keyboard event handling
+// In TDEAccelEventHandler::x11Event we do our own X11 keyboard event handling
 // This allows us to map the Win key to Qt::MetaButton, Qt does not know about
 // the Win key.
 //
-// KAccelEventHandler::x11Event will generate an AccelOverride event. The
-// AccelOverride event is abused a bit to ensure that KAccelPrivate::eventFilter
+// TDEAccelEventHandler::x11Event will generate an AccelOverride event. The
+// AccelOverride event is abused a bit to ensure that TDEAccelPrivate::eventFilter
 // (as an event filter on the toplevel widget) will get the key event first
 // (in the form of AccelOverride) before any of the intermediate widgets are
 // able to process it.
@@ -63,51 +63,51 @@
 // skipped and the KeyPress is followed immediately.
 // If the Accel event is accepted, no KeyPress event will follow.
 //
-// KAccelEventHandler::x11Event converts a X11 keyboard event into an AccelOverride
+// TDEAccelEventHandler::x11Event converts a X11 keyboard event into an AccelOverride
 // event, there are now two possibilities:
 //
-// 1) If KAccel intercepts the AccelOverride we are done and can consider the X11
+// 1) If TDEAccel intercepts the AccelOverride we are done and can consider the X11
 // keyboard event as handled.
 // 2) If another widget accepts the AccelOverride, it will expect to get a normal
 // Qt generated KeyPress event afterwards. So we let Qt handle the X11 keyboard event
 // again. However, this will first generate an AccelOverride event, and we already
-// had send that one. To compnesate for this, the global event filter in KApplication
+// had send that one. To compnesate for this, the global event filter in TDEApplication
 // is instructed to eat the next AccelOveride event. Qt will then send a normal KeyPress
 // event and from then on everything is normal again.
 //
-// kde_g_bKillAccelOverride is used to tell KApplication::notify to eat the next
+// kde_g_bKillAccelOverride is used to tell TDEApplication::notify to eat the next
 // AccelOverride event.
 
 bool kde_g_bKillAccelOverride = false;
 
-class KAccelEventHandler : public TQWidget
+class TDEAccelEventHandler : public TQWidget
 {
  public:
-	static KAccelEventHandler* self()
+	static TDEAccelEventHandler* self()
 	{
 		if( !g_pSelf )
-			g_pSelf = new KAccelEventHandler;
+			g_pSelf = new TDEAccelEventHandler;
 		return g_pSelf;
 	}
 
 	static void accelActivated( bool b ) { g_bAccelActivated = b; }
 
  private:
-	KAccelEventHandler();
+	TDEAccelEventHandler();
 
 #	ifdef Q_WS_X11
 	bool x11Event( XEvent* pEvent );
 #	endif
 
-	static KAccelEventHandler* g_pSelf;
+	static TDEAccelEventHandler* g_pSelf;
 	static bool g_bAccelActivated;
 };
 
-KAccelEventHandler* KAccelEventHandler::g_pSelf = 0;
-bool KAccelEventHandler::g_bAccelActivated = false;
+TDEAccelEventHandler* TDEAccelEventHandler::g_pSelf = 0;
+bool TDEAccelEventHandler::g_bAccelActivated = false;
 
-KAccelEventHandler::KAccelEventHandler()
-    : TQWidget( 0, "KAccelEventHandler" )
+TDEAccelEventHandler::TDEAccelEventHandler()
+    : TQWidget( 0, "TDEAccelEventHandler" )
 {
 #	ifdef Q_WS_X11
 	if ( kapp )
@@ -118,7 +118,7 @@ KAccelEventHandler::KAccelEventHandler()
 #ifdef Q_WS_X11
 bool	tqt_try_modal( TQWidget *, XEvent * );
 
-bool KAccelEventHandler::x11Event( XEvent* pEvent )
+bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
 {
 	if( TQWidget::keyboardGrabber() || !kapp->focusWidget() )
 		return false;
@@ -146,8 +146,8 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
 		g_bAccelActivated = false;
 		kapp->sendEvent( kapp->focusWidget(), &ke );
 
-		// If the Override event was accepted from a non-KAccel widget,
-		//  then kill the next AccelOverride in KApplication::notify.
+		// If the Override event was accepted from a non-TDEAccel widget,
+		//  then kill the next AccelOverride in TDEApplication::notify.
 		if( ke.isAccepted() && !g_bAccelActivated )
 			kde_g_bKillAccelOverride = true;
 
@@ -160,35 +160,35 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
 #endif // Q_WS_X11
 
 //---------------------------------------------------------------------
-// KAccelPrivate
+// TDEAccelPrivate
 //---------------------------------------------------------------------
 
-KAccelPrivate::KAccelPrivate( KAccel* pParent, TQWidget* pWatch )
-: KAccelBase( KAccelBase::QT_KEYS )
+TDEAccelPrivate::TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch )
+: TDEAccelBase( TDEAccelBase::QT_KEYS )
 {
-	//kdDebug(125) << "KAccelPrivate::KAccelPrivate( pParent = " << pParent << " ): this = " << this << endl;
+	//kdDebug(125) << "TDEAccelPrivate::TDEAccelPrivate( pParent = " << pParent << " ): this = " << this << endl;
 	m_pAccel = pParent;
 	m_pWatch = pWatch;
 	m_bAutoUpdate = true;
 	connect( (TQAccel*)m_pAccel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyPressed(int)) );
 
-#ifdef Q_WS_X11 //only makes sense if KAccelEventHandler is working
+#ifdef Q_WS_X11 //only makes sense if TDEAccelEventHandler is working
 	if( m_pWatch )
 		m_pWatch->installEventFilter( this );
 #endif
-	KAccelEventHandler::self();
+	TDEAccelEventHandler::self();
 }
 
-void KAccelPrivate::setEnabled( bool bEnabled )
+void TDEAccelPrivate::setEnabled( bool bEnabled )
 {
 	m_bEnabled = bEnabled;
 	((TQAccel*)m_pAccel)->setEnabled( bEnabled );
 }
 
-bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
+bool TDEAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
 {
-	kdDebug(125) << "KAccelPrivate::setEnabled( \"" << sAction << "\", " << bEnable << " ): this = " << this << endl;
-	KAccelAction* pAction = actionPtr( sAction );
+	kdDebug(125) << "TDEAccelPrivate::setEnabled( \"" << sAction << "\", " << bEnable << " ): this = " << this << endl;
+	TDEAccelAction* pAction = actionPtr( sAction );
 	if( !pAction )
 		return false;
 	if( pAction->isEnabled() == bEnable )
@@ -196,7 +196,7 @@ bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
 
 	pAction->setEnabled( bEnable );
 
-	TQMap<int, KAccelAction*>::const_iterator it = m_mapIDToAction.begin();
+	TQMap<int, TDEAccelAction*>::const_iterator it = m_mapIDToAction.begin();
 	for( ; it != m_mapIDToAction.end(); ++it ) {
 		if( *it == pAction )
 			((TQAccel*)m_pAccel)->setItemEnabled( it.key(), bEnable );
@@ -204,32 +204,32 @@ bool KAccelPrivate::setEnabled( const TQString& sAction, bool bEnable )
 	return true;
 }
 
-bool KAccelPrivate::removeAction( const TQString& sAction )
+bool TDEAccelPrivate::removeAction( const TQString& sAction )
 {
 	// FIXME: getID() doesn't contains any useful
 	//  information!  Use mapIDToAction. --ellis, 2/May/2002
-	//  Or maybe KAccelBase::remove() takes care of TQAccel indirectly...
-	KAccelAction* pAction = actions().actionPtr( sAction );
+	//  Or maybe TDEAccelBase::remove() takes care of TQAccel indirectly...
+	TDEAccelAction* pAction = actions().actionPtr( sAction );
 	if( pAction ) {
 		int nID = pAction->getID();
 		//bool b = actions().removeAction( sAction );
-		bool b = KAccelBase::remove( sAction );
+		bool b = TDEAccelBase::remove( sAction );
 		((TQAccel*)m_pAccel)->removeItem( nID );
 		return b;
 	} else
 		return false;
 }
 
-bool KAccelPrivate::emitSignal( KAccelBase::Signal signal )
+bool TDEAccelPrivate::emitSignal( TDEAccelBase::Signal signal )
 {
-	if( signal == KAccelBase::KEYCODE_CHANGED ) {
+	if( signal == TDEAccelBase::KEYCODE_CHANGED ) {
 		m_pAccel->emitKeycodeChanged();
 		return true;
 	}
 	return false;
 }
 
-bool KAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& key )
 {
 	uint keyQt = key.keyCodeQt();
 	int nID = ((TQAccel*)m_pAccel)->insertItem( keyQt );
@@ -246,23 +246,23 @@ bool KAccelPrivate::connectKey( KAccelAction& action, const KKeyServer::Key& key
 			((TQAccel*)m_pAccel)->setItemEnabled( nID, false );
 	}
 
-	kdDebug(125) << "KAccelPrivate::connectKey( \"" << action.name() << "\", " << key.key().toStringInternal() << " = 0x" << TQString::number(keyQt,16) << " ): id = " << nID << " m_pObjSlot = " << action.objSlotPtr() << endl;
+	kdDebug(125) << "TDEAccelPrivate::connectKey( \"" << action.name() << "\", " << key.key().toStringInternal() << " = 0x" << TQString::number(keyQt,16) << " ): id = " << nID << " m_pObjSlot = " << action.objSlotPtr() << endl;
 	//kdDebug(125) << "m_pAccel = " << m_pAccel << endl;
 	return nID != 0;
 }
 
-bool KAccelPrivate::connectKey( const KKeyServer::Key& key )
+bool TDEAccelPrivate::connectKey( const KKeyServer::Key& key )
 {
 	uint keyQt = key.keyCodeQt();
 	int nID = ((TQAccel*)m_pAccel)->insertItem( keyQt );
 
 	m_mapIDToKey[nID] = keyQt;
 
-	kdDebug(125) << "KAccelPrivate::connectKey( " << key.key().toStringInternal() << " = 0x" << TQString::number(keyQt,16) << " ): id = " << nID << endl;
+	kdDebug(125) << "TDEAccelPrivate::connectKey( " << key.key().toStringInternal() << " = 0x" << TQString::number(keyQt,16) << " ): id = " << nID << endl;
 	return nID != 0;
 }
 
-bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key& key )
+bool TDEAccelPrivate::disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key )
 {
 	int keyQt = key.keyCodeQt();
 	TQMap<int, int>::iterator it = m_mapIDToKey.begin();
@@ -270,7 +270,7 @@ bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key&
 		//kdDebug(125) << "m_mapIDToKey[" << it.key() << "] = " << TQString::number(*it,16) << " == " << TQString::number(keyQt,16) << endl;
 		if( *it == keyQt ) {
 			int nID = it.key();
-			kdDebug(125) << "KAccelPrivate::disconnectKey( \"" << action.name() << "\", 0x" << TQString::number(keyQt,16) << " ) : id = " << nID << " m_pObjSlot = " << action.objSlotPtr() << endl;
+			kdDebug(125) << "TDEAccelPrivate::disconnectKey( \"" << action.name() << "\", 0x" << TQString::number(keyQt,16) << " ) : id = " << nID << " m_pObjSlot = " << action.objSlotPtr() << endl;
 			((TQAccel*)m_pAccel)->removeItem( nID );
 			m_mapIDToAction.remove( nID );
 			m_mapIDToKey.remove( it );
@@ -282,10 +282,10 @@ bool KAccelPrivate::disconnectKey( KAccelAction& action, const KKeyServer::Key&
 	return false;
 }
 
-bool KAccelPrivate::disconnectKey( const KKeyServer::Key& key )
+bool TDEAccelPrivate::disconnectKey( const KKeyServer::Key& key )
 {
 	int keyQt = key.keyCodeQt();
-	kdDebug(125) << "KAccelPrivate::disconnectKey( 0x" << TQString::number(keyQt,16) << " )" << endl;
+	kdDebug(125) << "TDEAccelPrivate::disconnectKey( 0x" << TQString::number(keyQt,16) << " )" << endl;
 	TQMap<int, int>::iterator it = m_mapIDToKey.begin();
 	for( ; it != m_mapIDToKey.end(); ++it ) {
 		if( *it == keyQt ) {
@@ -299,9 +299,9 @@ bool KAccelPrivate::disconnectKey( const KKeyServer::Key& key )
 	return false;
 }
 
-void KAccelPrivate::slotKeyPressed( int id )
+void TDEAccelPrivate::slotKeyPressed( int id )
 {
-	kdDebug(125) << "KAccelPrivate::slotKeyPressed( " << id << " )" << endl;
+	kdDebug(125) << "TDEAccelPrivate::slotKeyPressed( " << id << " )" << endl;
 
 	if( m_mapIDToKey.contains( id ) ) {
 		KKey key = m_mapIDToKey[id];
@@ -326,14 +326,14 @@ void KAccelPrivate::slotKeyPressed( int id )
 	}
 }
 
-void KAccelPrivate::slotShowMenu()
+void TDEAccelPrivate::slotShowMenu()
 {
 }
 
-void KAccelPrivate::slotMenuActivated( int iAction )
+void TDEAccelPrivate::slotMenuActivated( int iAction )
 {
-	kdDebug(125) << "KAccelPrivate::slotMenuActivated( " << iAction << " )" << endl;
-	KAccelAction* pAction = actions().actionPtr( iAction );
+	kdDebug(125) << "TDEAccelPrivate::slotMenuActivated( " << iAction << " )" << endl;
+	TDEAccelAction* pAction = actions().actionPtr( iAction );
 #ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 	if( pAction ) {
 		connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
@@ -345,12 +345,12 @@ void KAccelPrivate::slotMenuActivated( int iAction )
 #endif
 }
 
-bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
+bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 {
 	if( pEvent->type() == TQEvent::AccelOverride && m_bEnabled ) {
 		TQKeyEvent* pKeyEvent = (TQKeyEvent*) pEvent;
 		KKey key( pKeyEvent );
-		kdDebug(125) << "KAccelPrivate::eventFilter( AccelOverride ): this = " << this << ", key = " << key.toStringInternal() << endl;
+		kdDebug(125) << "TDEAccelPrivate::eventFilter( AccelOverride ): this = " << this << ", key = " << key.toStringInternal() << endl;
 		int keyCodeQt = key.keyCodeQt();
 		TQMap<int, int>::iterator it = m_mapIDToKey.begin();
 		for( ; it != m_mapIDToKey.end(); ++it ) {
@@ -359,11 +359,11 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 				kdDebug(125) << "shortcut found!" << endl;
 				if( m_mapIDToAction.contains( nID ) ) {
 					// TODO: reduce duplication between here and slotMenuActivated
-					KAccelAction* pAction = m_mapIDToAction[nID];
+					TDEAccelAction* pAction = m_mapIDToAction[nID];
 					if( !pAction->isEnabled() )
 						continue;
 #ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
-					TQGuardedPtr<KAccelPrivate> me = this;
+					TQGuardedPtr<TDEAccelPrivate> me = this;
 					connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 					emit menuItemActivated();
 					if (me) {
@@ -376,7 +376,7 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 					slotKeyPressed( nID );
 
 				pKeyEvent->accept();
-				KAccelEventHandler::accelActivated( true );
+				TDEAccelEventHandler::accelActivated( true );
 				return true;
 			}
 		}
@@ -385,17 +385,17 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 }
 
 #ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
-void KAccelPrivate::emitActivatedSignal( KAccelAction* pAction )
+void TDEAccelPrivate::emitActivatedSignal( TDEAccelAction* pAction )
 {
 	if( pAction ) {
-		TQGuardedPtr<KAccelPrivate> me = this;
-		TQRegExp reg( "([ ]*KAccelAction.*)" );
+		TQGuardedPtr<TDEAccelPrivate> me = this;
+		TQRegExp reg( "([ ]*TDEAccelAction.*)" );
 		if( reg.search( pAction->methodSlotPtr()) >= 0 ) {
-			connect( this, TQT_SIGNAL(menuItemActivated(KAccelAction*)),
+			connect( this, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
 				pAction->objSlotPtr(), pAction->methodSlotPtr() );
 			emit menuItemActivated( pAction );
 			if (me)
-				disconnect( me, TQT_SIGNAL(menuItemActivated(KAccelAction*)),
+				disconnect( me, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
 					pAction->objSlotPtr(), pAction->methodSlotPtr() );
 		} else {
 			connect( this, TQT_SIGNAL(menuItemActivated()),
@@ -411,39 +411,39 @@ void KAccelPrivate::emitActivatedSignal( KAccelAction* pAction )
 #endif
 
 //---------------------------------------------------------------------
-// KAccel
+// TDEAccel
 //---------------------------------------------------------------------
 
-KAccel::KAccel( TQWidget* pParent, const char* psName )
-: TQAccel( pParent, (psName) ? psName : "KAccel-TQAccel" )
+TDEAccel::TDEAccel( TQWidget* pParent, const char* psName )
+: TQAccel( pParent, (psName) ? psName : "TDEAccel-TQAccel" )
 {
-	kdDebug(125) << "KAccel( pParent = " << pParent << ", psName = " << psName << " ): this = " << this << endl;
-	d = new KAccelPrivate( this, pParent );
+	kdDebug(125) << "TDEAccel( pParent = " << pParent << ", psName = " << psName << " ): this = " << this << endl;
+	d = new TDEAccelPrivate( this, pParent );
 }
 
-KAccel::KAccel( TQWidget* watch, TQObject* pParent, const char* psName )
-: TQAccel( watch, pParent, (psName) ? psName : "KAccel-TQAccel" )
+TDEAccel::TDEAccel( TQWidget* watch, TQObject* pParent, const char* psName )
+: TQAccel( watch, pParent, (psName) ? psName : "TDEAccel-TQAccel" )
 {
-	kdDebug(125) << "KAccel( watch = " << watch << ", pParent = " << pParent << ", psName = " << psName << " ): this = " << this << endl;
+	kdDebug(125) << "TDEAccel( watch = " << watch << ", pParent = " << pParent << ", psName = " << psName << " ): this = " << this << endl;
 	if( !watch )
 		kdDebug(125) << kdBacktrace() << endl;
-	d = new KAccelPrivate( this, watch );
+	d = new TDEAccelPrivate( this, watch );
 }
 
-KAccel::~KAccel()
+TDEAccel::~TDEAccel()
 {
-	kdDebug(125) << "~KAccel(): this = " << this << endl;
+	kdDebug(125) << "~TDEAccel(): this = " << this << endl;
 	delete d;
 }
 
-KAccelActions& KAccel::actions()             { return d->actions(); }
-const KAccelActions& KAccel::actions() const { return d->actions(); }
-bool KAccel::isEnabled()                     { return d->isEnabled(); }
-void KAccel::setEnabled( bool bEnabled )     { d->setEnabled( bEnabled ); }
-bool KAccel::setAutoUpdate( bool bAuto )     { return d->setAutoUpdate( bAuto ); }
+TDEAccelActions& TDEAccel::actions()             { return d->actions(); }
+const TDEAccelActions& TDEAccel::actions() const { return d->actions(); }
+bool TDEAccel::isEnabled()                     { return d->isEnabled(); }
+void TDEAccel::setEnabled( bool bEnabled )     { d->setEnabled( bEnabled ); }
+bool TDEAccel::setAutoUpdate( bool bAuto )     { return d->setAutoUpdate( bAuto ); }
 
-KAccelAction* KAccel::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-		const KShortcut& cutDef,
+TDEAccelAction* TDEAccel::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+		const TDEShortcut& cutDef,
 		const TQObject* pObjSlot, const char* psMethodSlot,
 		bool bConfigurable, bool bEnabled )
 {
@@ -453,8 +453,8 @@ KAccelAction* KAccel::insert( const TQString& sAction, const TQString& sLabel, c
 		bConfigurable, bEnabled );
 }
 
-KAccelAction* KAccel::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-		const KShortcut& cutDef3, const KShortcut& cutDef4,
+TDEAccelAction* TDEAccel::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+		const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 		const TQObject* pObjSlot, const char* psMethodSlot,
 		bool bConfigurable, bool bEnabled )
 {
@@ -464,7 +464,7 @@ KAccelAction* KAccel::insert( const TQString& sAction, const TQString& sLabel, c
 		bConfigurable, bEnabled );
 }
 
-KAccelAction* KAccel::insert( const char* psAction, const KShortcut& cutDef,
+TDEAccelAction* TDEAccel::insert( const char* psAction, const TDEShortcut& cutDef,
 		const TQObject* pObjSlot, const char* psMethodSlot,
 		bool bConfigurable, bool bEnabled )
 {
@@ -474,45 +474,45 @@ KAccelAction* KAccel::insert( const char* psAction, const KShortcut& cutDef,
 		bConfigurable, bEnabled );
 }
 
-KAccelAction* KAccel::insert( KStdAccel::StdAccel id,
+TDEAccelAction* TDEAccel::insert( TDEStdAccel::StdAccel id,
 		const TQObject* pObjSlot, const char* psMethodSlot,
 		bool bConfigurable, bool bEnabled )
 {
-	TQString sAction = KStdAccel::name( id );
+	TQString sAction = TDEStdAccel::name( id );
 	if( sAction.isEmpty() )
 		return 0;
 
-	KAccelAction* pAction = d->insert( sAction, KStdAccel::label( id ), KStdAccel::whatsThis( id ),
-		KStdAccel::shortcutDefault3( id ), KStdAccel::shortcutDefault4( id ),
+	TDEAccelAction* pAction = d->insert( sAction, TDEStdAccel::label( id ), TDEStdAccel::whatsThis( id ),
+		TDEStdAccel::shortcutDefault3( id ), TDEStdAccel::shortcutDefault4( id ),
 		pObjSlot, psMethodSlot,
 		bConfigurable, bEnabled );
 	if( pAction )
-		pAction->setShortcut( KStdAccel::shortcut( id ) );
+		pAction->setShortcut( TDEStdAccel::shortcut( id ) );
 
 	return pAction;
 }
 
-bool KAccel::remove( const TQString& sAction )
+bool TDEAccel::remove( const TQString& sAction )
 	{ return d->removeAction( sAction ); }
-bool KAccel::updateConnections()
+bool TDEAccel::updateConnections()
 	{ return d->updateConnections(); }
 
-const KShortcut& KAccel::shortcut( const TQString& sAction ) const
+const TDEShortcut& TDEAccel::shortcut( const TQString& sAction ) const
 {
-	const KAccelAction* pAction = actions().actionPtr( sAction );
-	return (pAction) ? pAction->shortcut() : KShortcut::null();
+	const TDEAccelAction* pAction = actions().actionPtr( sAction );
+	return (pAction) ? pAction->shortcut() : TDEShortcut::null();
 }
 
-bool KAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
+bool TDEAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
 	{ return d->setActionSlot( sAction, pObjSlot, psMethodSlot ); }
 
-bool KAccel::setEnabled( const TQString& sAction, bool bEnable )
+bool TDEAccel::setEnabled( const TQString& sAction, bool bEnable )
 	{ return d->setEnabled( sAction, bEnable ); }
 
-bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
+bool TDEAccel::setShortcut( const TQString& sAction, const TDEShortcut& cut )
 {
-	kdDebug(125) << "KAccel::setShortcut( \"" << sAction << "\", " << cut.toStringInternal() << " )" << endl;
-	KAccelAction* pAction = actions().actionPtr( sAction );
+	kdDebug(125) << "TDEAccel::setShortcut( \"" << sAction << "\", " << cut.toStringInternal() << " )" << endl;
+	TDEAccelAction* pAction = actions().actionPtr( sAction );
 	if( pAction ) {
 		if( pAction->shortcut() != cut )
 			return d->setShortcut( sAction, cut );
@@ -521,24 +521,24 @@ bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
 	return false;
 }
 
-const TQString& KAccel::configGroup() const
+const TQString& TDEAccel::configGroup() const
 	{ return d->configGroup(); }
 // for tdegames/ksirtet
-void KAccel::setConfigGroup( const TQString& s )
+void TDEAccel::setConfigGroup( const TQString& s )
 	{ d->setConfigGroup( s ); }
 
-bool KAccel::readSettings( KConfigBase* pConfig )
+bool TDEAccel::readSettings( TDEConfigBase* pConfig )
 {
 	d->readSettings( pConfig );
 	return true;
 }
 
-bool KAccel::writeSettings( KConfigBase* pConfig ) const
+bool TDEAccel::writeSettings( TDEConfigBase* pConfig ) const
 	{ d->writeSettings( pConfig ); return true; }
 
-void KAccel::emitKeycodeChanged()
+void TDEAccel::emitKeycodeChanged()
 {
-	kdDebug(125) << "KAccel::emitKeycodeChanged()" << endl;
+	kdDebug(125) << "TDEAccel::emitKeycodeChanged()" << endl;
 	emit keycodeChanged();
 }
 
@@ -547,11 +547,11 @@ void KAccel::emitKeycodeChanged()
 // Obsolete methods -- for backward compatibility
 //------------------------------------------------------------
 
-bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
+bool TDEAccel::insertItem( const TQString& sLabel, const TQString& sAction,
 		const char* cutsDef,
 		int /*nIDMenu*/, TQPopupMenu *, bool bConfigurable )
 {
-	KShortcut cut( cutsDef );
+	TDEShortcut cut( cutsDef );
 	bool b = d->insert( sAction, sLabel, TQString::null,
 		cut, cut,
 		0, 0,
@@ -559,13 +559,13 @@ bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
 	return b;
 }
 
-bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
+bool TDEAccel::insertItem( const TQString& sLabel, const TQString& sAction,
 		int key,
 		int /*nIDMenu*/, TQPopupMenu*, bool bConfigurable )
 {
-	KShortcut cut;
+	TDEShortcut cut;
 	cut.init( TQKeySequence(key) );
-	KAccelAction* pAction = d->insert( sAction, sLabel, TQString::null,
+	TDEAccelAction* pAction = d->insert( sAction, sLabel, TQString::null,
 		cut, cut,
 		0, 0,
 		bConfigurable );
@@ -573,20 +573,20 @@ bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
 }
 
 // Used in tdeutils/kjots
-bool KAccel::insertStdItem( KStdAccel::StdAccel id, const TQString& sLabel )
+bool TDEAccel::insertStdItem( TDEStdAccel::StdAccel id, const TQString& sLabel )
 {
-	KAccelAction* pAction = d->insert( KStdAccel::name( id ), sLabel, TQString::null,
-		KStdAccel::shortcutDefault3( id ), KStdAccel::shortcutDefault4( id ),
+	TDEAccelAction* pAction = d->insert( TDEStdAccel::name( id ), sLabel, TQString::null,
+		TDEStdAccel::shortcutDefault3( id ), TDEStdAccel::shortcutDefault4( id ),
 		0, 0 );
 	if( pAction )
-		pAction->setShortcut( KStdAccel::shortcut( id ) );
+		pAction->setShortcut( TDEStdAccel::shortcut( id ) );
 
 	return true;
 }
 
-bool KAccel::connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate )
+bool TDEAccel::connectItem( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot, bool bActivate )
 {
-	kdDebug(125) << "KAccel::connectItem( " << sAction << ", " << pObjSlot << ", " << psMethodSlot << " )" << endl;
+	kdDebug(125) << "TDEAccel::connectItem( " << sAction << ", " << pObjSlot << ", " << psMethodSlot << " )" << endl;
 	if( bActivate == false )
 		d->setActionEnabled( sAction, false );
 	bool b = setSlot( sAction, pObjSlot, psMethodSlot );
@@ -595,15 +595,15 @@ bool KAccel::connectItem( const TQString& sAction, const TQObject* pObjSlot, con
 	return b;
 }
 
-bool KAccel::removeItem( const TQString& sAction )
+bool TDEAccel::removeItem( const TQString& sAction )
 	{ return d->removeAction( sAction ); }
 
-bool KAccel::setItemEnabled( const TQString& sAction, bool bEnable )
+bool TDEAccel::setItemEnabled( const TQString& sAction, bool bEnable )
 	{ return setEnabled( sAction, bEnable ); }
 
-void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action )
+void TDEAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action )
 {
-	KAccelAction* pAction = actions().actionPtr( action );
+	TDEAccelAction* pAction = actions().actionPtr( action );
 	TQString s = menu->text( id );
 	if( !pAction || s.isEmpty() )
 		return;
@@ -628,27 +628,27 @@ void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action
 		menu->changeItem( s, id );
 }
 
-void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, KStdAccel::StdAccel accel )
+void TDEAccel::changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel )
 {
-	changeMenuAccel( menu, id, KStdAccel::name( accel ) );
+	changeMenuAccel( menu, id, TDEStdAccel::name( accel ) );
 }
 
-int KAccel::stringToKey( const TQString& sKey )
+int TDEAccel::stringToKey( const TQString& sKey )
 {
 	return KKey( sKey ).keyCodeQt();
 }
 
-int KAccel::currentKey( const TQString& sAction ) const
+int TDEAccel::currentKey( const TQString& sAction ) const
 {
-	KAccelAction* pAction = d->actionPtr( sAction );
+	TDEAccelAction* pAction = d->actionPtr( sAction );
 	if( pAction )
 		return pAction->shortcut().keyCodeQt();
 	return 0;
 }
 
-TQString KAccel::findKey( int key ) const
+TQString TDEAccel::findKey( int key ) const
 {
-	KAccelAction* pAction = d->actionPtr( KKey(key) );
+	TDEAccelAction* pAction = d->actionPtr( KKey(key) );
 	if( pAction )
 		return pAction->name();
 	else
@@ -656,8 +656,8 @@ TQString KAccel::findKey( int key ) const
 }
 #endif // !KDE_NO_COMPAT
 
-void KAccel::virtual_hook( int, void* )
+void TDEAccel::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kaccel.moc"
-#include "kaccelprivate.moc"
+#include "tdeaccel.moc"
+#include "tdeaccelprivate.moc"
diff --git a/tdecore/kaccel.h b/tdecore/tdeaccel.h
index 7f24a5e73..8b61102f4 100644
--- a/tdecore/kaccel.h
+++ b/tdecore/tdeaccel.h
@@ -21,17 +21,17 @@
 #define _KACCEL_H
 
 #include <tqaccel.h>
-#include <kshortcut.h>
-#include <kstdaccel.h>
+#include <tdeshortcut.h>
+#include <tdestdaccel.h>
 #include "tdelibs_export.h"
 
 class TQPopupMenu; // for obsolete insertItem() methods below
 class TQWidget;
-class KAccelAction;
-class KAccelActions;
-class KConfigBase;
+class TDEAccelAction;
+class TDEAccelActions;
+class TDEConfigBase;
 
-class KAccelPrivate;
+class TDEAccelPrivate;
 /**
  * Handle shortcuts.
  *
@@ -39,19 +39,19 @@ class KAccelPrivate;
  * through application configuration files or through the
  * KKeyChooser GUI.
  *
- * A KAccel contains a list of accelerator actions.
+ * A TDEAccel contains a list of accelerator actions.
  *
  * For example, CTRL+Key_P could be a shortcut for printing a document. The key
  * codes are listed in tqnamespace.h. "Print" could be the action name for printing.
  * The action name identifies the shortcut in configuration files and the
  * KKeyChooser GUI.
  *
- * A KAccel object handles key events sent to its parent widget and to all
- * children of this parent widget.  The most recently created KAccel object
- * has precedence over any KAccel objects created before it.
- * When a shortcut pressed, KAccel calls the slot to which it has been
+ * A TDEAccel object handles key events sent to its parent widget and to all
+ * children of this parent widget.  The most recently created TDEAccel object
+ * has precedence over any TDEAccel objects created before it.
+ * When a shortcut pressed, TDEAccel calls the slot to which it has been
  * connected. If you want to set global accelerators, independent of the window
- * which has the focus, use KGlobalAccel.
+ * which has the focus, use TDEGlobalAccel.
  *
  * Reconfiguration of a given shortcut can be prevented by specifying
  * that an accelerator item is not configurable when it is inserted. A special
@@ -69,14 +69,14 @@ class KAccelPrivate;
  * The translated first argument for insertItem() is used only
  * in the configuration dialog.
  *\code
- * KAccel* pAccel = new KAccel( this );
+ * TDEAccel* pAccel = new TDEAccel( this );
  *
  * // Insert an action "Scroll Up" which is associated with the "Up" key:
  * pAccel->insert( "Scroll Up", i18n("Scroll up"),
  *                       i18n("Scroll up the current document by one line."),
  *                       Qt::Key_Up, this, TQT_SLOT(slotScrollUp()) );
  * // Insert an standard acclerator action.
- * pAccel->insert( KStdAccel::Print, this, TQT_SLOT(slotPrint()) );
+ * pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) );
  *
  * // Update the shortcuts by read any user-defined settings from the
  * // application's config file.
@@ -84,57 +84,57 @@ class KAccelPrivate;
  * \endcode
  *
  * @short Configurable shortcut support for widgets.
- * @see KGlobalAccel
- * @see KAccelShortcutList
+ * @see TDEGlobalAccel
+ * @see TDEAccelShortcutList
  * @see KKeyChooser
  * @see KKeyDialog
  */
 
-class TDECORE_EXPORT KAccel : public TQAccel
+class TDECORE_EXPORT TDEAccel : public TQAccel
 {
 	Q_OBJECT
  public:
 	/**
-	 * Creates a new KAccel that watches @p pParent, which is also
+	 * Creates a new TDEAccel that watches @p pParent, which is also
 	 * the QObject's parent.
 	 *
 	 * @param pParent the parent and widget to watch for key strokes
 	 * @param psName the name of the QObject
 	 */
-	KAccel( TQWidget* pParent, const char* psName = 0 );
+	TDEAccel( TQWidget* pParent, const char* psName = 0 );
 
 	/**
-	 * Creates a new KAccel that watches @p watch.
+	 * Creates a new TDEAccel that watches @p watch.
 	 *
 	 * @param watch the widget to watch for key strokes
 	 * @param parent the parent of the QObject
 	 * @param psName the name of the QObject
 	 */
-	KAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
-	virtual ~KAccel();
+	TDEAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
+	virtual ~TDEAccel();
 
 	/**
 	 * @internal
-	 * Returns the KAccel's @p KAccelActions, a list of @p KAccelAction.
-	 * @return the KAccelActions of the KAccel
+	 * Returns the TDEAccel's @p TDEAccelActions, a list of @p TDEAccelAction.
+	 * @return the TDEAccelActions of the TDEAccel
 	 */
-	KAccelActions& actions();
+	TDEAccelActions& actions();
 
 	/**
 	 * @internal
-	 * Returns the KAccel's @p KAccelActions, a list of @p KAccelAction.
-	 * @return the KAccelActions of the KAccel
+	 * Returns the TDEAccel's @p TDEAccelActions, a list of @p TDEAccelAction.
+	 * @return the TDEAccelActions of the TDEAccel
 	 */
-	const KAccelActions& actions() const;
+	const TDEAccelActions& actions() const;
 
 	/**
-	 * Checks whether the KAccel is active.
+	 * Checks whether the TDEAccel is active.
 	 * @return true if the TQAccel is enabled
 	 */
 	bool isEnabled();
 
 	/**
-	 * Enables or disables the KAccel.
+	 * Enables or disables the TDEAccel.
 	 * @param bEnabled true to enable, false to disable
 	 */
 	void setEnabled( bool bEnabled );
@@ -172,16 +172,16 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 * @param bConfigurable Allow the user to change this shortcut if set to 'true'.
 	 * @param bEnabled The action will be activated by the shortcut if set to 'true'.
 	 */
-	KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-	                 const KShortcut& cutDef,
+	TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+	                 const TDEShortcut& cutDef,
 	                 const TQObject* pObjSlot, const char* psMethodSlot,
 	                 bool bConfigurable = true, bool bEnabled = true );
 	/**
 	 * Same as first insert(), but with separate shortcuts defined for
 	 * 3- and 4- modifier defaults.
 	 */
-	KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-	                 const KShortcut& cutDef3, const KShortcut& cutDef4,
+	TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+	                 const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 	                 const TQObject* pObjSlot, const char* psMethodSlot,
 	                 bool bConfigurable = true, bool bEnabled = true );
 	/**
@@ -201,16 +201,16 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 * @param bConfigurable Allow the user to change this shortcut if set to 'true'.
 	 * @param bEnabled The action will be activated by the shortcut if set to 'true'.
 	 */
-	KAccelAction* insert( const char* psAction, const KShortcut& cutDef,
+	TDEAccelAction* insert( const char* psAction, const TDEShortcut& cutDef,
 	                 const TQObject* pObjSlot, const char* psMethodSlot,
 	                 bool bConfigurable = true, bool bEnabled = true );
 	/**
 	 * Similar to the first insert() method, but with the action
 	 * name, short description, help text, and default shortcuts all
 	 * set according to one of the standard accelerators.
-	 * @see KStdAccel.
+	 * @see TDEStdAccel.
 	 */
-	KAccelAction* insert( KStdAccel::StdAccel id,
+	TDEAccelAction* insert( TDEStdAccel::StdAccel id,
 	                 const TQObject* pObjSlot, const char* psMethodSlot,
 	                 bool bConfigurable = true, bool bEnabled = true );
 
@@ -237,7 +237,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 * @param sAction the name of the action
 	 * @return the action's shortcut, or a null shortcut if not found
 	 */
-	const KShortcut& shortcut( const TQString& sAction ) const;
+	const TDEShortcut& shortcut( const TQString& sAction ) const;
 
 	/**
 	 * Set the shortcut to be associated with the action named by @p sAction.
@@ -245,7 +245,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 * @param shortcut the shortcut to set
 	 * @return true if successful, false otherwise
 	 */
-	bool setShortcut( const TQString& sAction, const KShortcut &shortcut );
+	bool setShortcut( const TQString& sAction, const TDEShortcut &shortcut );
 
 	/**
 	 * Set the slot to be called when the shortcut of the action named
@@ -267,21 +267,21 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	/**
 	 * Returns the configuration group of the settings.
 	 * @return the configuration group
-	 * @see KConfig
+	 * @see TDEConfig
 	 */
 	const TQString& configGroup() const;
 
 	/**
 	 * Returns the configuration group of the settings.
 	 * @param name the new configuration group
-	 * @see KConfig
+	 * @see TDEConfig
 	 */
 	void setConfigGroup( const TQString &name );
 
 	/**
 	 * Read all shortcuts from @p pConfig, or (if @p pConfig
 	 * is zero) from the application's configuration file
-	 * KGlobal::config().
+	 * TDEGlobal::config().
 	 *
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
@@ -289,7 +289,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 *         configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool readSettings( KConfigBase* pConfig = 0 );
+	bool readSettings( TDEConfigBase* pConfig = 0 );
 	/**
 	 * Write the current shortcuts to @p pConfig,
 	 * or (if @p pConfig is zero) to the application's
@@ -298,7 +298,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 *         configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeSettings( KConfigBase* pConfig = 0 ) const;
+	bool writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	/**
 	 * Emits the keycodeChanged() signal.
@@ -329,7 +329,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	/**
 	 * @deprecated use insert
 	 */
-	bool insertStdItem( KStdAccel::StdAccel id, const TQString& descr = TQString::null ) KDE_DEPRECATED;
+	bool insertStdItem( TDEStdAccel::StdAccel id, const TQString& descr = TQString::null ) KDE_DEPRECATED;
 	/**
 	 * @deprecated use insert
 	 */
@@ -338,7 +338,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	 * @deprecated use insert( accel, pObjSlot, psMethodSlot );
 	 *
 	 */
-	KDE_DEPRECATED bool connectItem( KStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot )
+	KDE_DEPRECATED bool connectItem( TDEStdAccel::StdAccel accel, const TQObject* pObjSlot, const char* psMethodSlot )
 		{ return insert( accel, pObjSlot, psMethodSlot ); }
 	/**
 	 * @deprecated use remove
@@ -355,7 +355,7 @@ class TDECORE_EXPORT KAccel : public TQAccel
 	/**
 	 * @deprecated see KDE3PORTING.html
 	 */
-	void changeMenuAccel( TQPopupMenu *menu, int id, KStdAccel::StdAccel accel ) KDE_DEPRECATED;
+	void changeMenuAccel( TQPopupMenu *menu, int id, TDEStdAccel::StdAccel accel ) KDE_DEPRECATED;
 	/**
 	 * @deprecated
 	 */
@@ -383,8 +383,8 @@ class TDECORE_EXPORT KAccel : public TQAccel
         /** \internal */
 	virtual void virtual_hook( int id, void* data );
  private:
-	class KAccelPrivate* d;
-	friend class KAccelPrivate;
+	class TDEAccelPrivate* d;
+	friend class TDEAccelPrivate;
 };
 
 #endif // _KACCEL_H
diff --git a/tdecore/kaccelaction.cpp b/tdecore/tdeaccelaction.cpp
index 856bbefdc..89d8efaa2 100644
--- a/tdecore/kaccelaction.cpp
+++ b/tdecore/tdeaccelaction.cpp
@@ -20,33 +20,33 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelaction.h"
-#include "kaccelbase.h"   // for KAccelBase::slotRemoveAction() & emitSignal()
+#include "tdeaccelaction.h"
+#include "tdeaccelbase.h"   // for TDEAccelBase::slotRemoveAction() & emitSignal()
 
 #include <tqkeycode.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeynative.h>
-#include <klocale.h>
-#include <kshortcutlist.h>
+#include <tdelocale.h>
+#include <tdeshortcutlist.h>
 
 //---------------------------------------------------------------------
-// KAccelAction
+// TDEAccelAction
 //---------------------------------------------------------------------
 
-class KAccelActionPrivate
+class TDEAccelActionPrivate
 {
  public:
 	uint m_nConnections;
 };
 
-KAccelAction::KAccelAction()
+TDEAccelAction::TDEAccelAction()
 {
-	//kdDebug(125) << "KAccelAction(): this = " << this << endl;
-	d = new KAccelActionPrivate;
+	//kdDebug(125) << "TDEAccelAction(): this = " << this << endl;
+	d = new TDEAccelActionPrivate;
 	m_pObjSlot = 0;
 	m_psMethodSlot = 0;
 	m_bConfigurable = true;
@@ -55,33 +55,33 @@ KAccelAction::KAccelAction()
 	d->m_nConnections = 0;
 }
 
-KAccelAction::KAccelAction( const KAccelAction& action )
+TDEAccelAction::TDEAccelAction( const TDEAccelAction& action )
 {
-	//kdDebug(125) << "KAccelAction( copy from \"" << action.m_sName << "\" ): this = " << this << endl;
-	d = new KAccelActionPrivate;
+	//kdDebug(125) << "TDEAccelAction( copy from \"" << action.m_sName << "\" ): this = " << this << endl;
+	d = new TDEAccelActionPrivate;
 	*this = action;
 }
 
-KAccelAction::KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& cutDef3, const KShortcut& cutDef4,
+TDEAccelAction::TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled )
 {
-	//kdDebug(125) << "KAccelAction( \"" << sName << "\" ): this = " << this << endl;
-	d = new KAccelActionPrivate;
+	//kdDebug(125) << "TDEAccelAction( \"" << sName << "\" ): this = " << this << endl;
+	d = new TDEAccelActionPrivate;
 	init( sName, sLabel, sWhatsThis,
 		cutDef3, cutDef4,
 		pObjSlot, psMethodSlot,
 		bConfigurable, bEnabled );
 }
 
-KAccelAction::~KAccelAction()
+TDEAccelAction::~TDEAccelAction()
 {
-	//kdDebug(125) << "\t\t\tKAccelAction::~KAccelAction( \"" << m_sName << "\" ): this = " << this << endl;
+	//kdDebug(125) << "\t\t\tTDEAccelAction::~TDEAccelAction( \"" << m_sName << "\" ): this = " << this << endl;
 	delete d;
 }
 
-void KAccelAction::clear()
+void TDEAccelAction::clear()
 {
 	m_cut.clear();
 	m_pObjSlot = 0;
@@ -92,8 +92,8 @@ void KAccelAction::clear()
 	d->m_nConnections = 0;
 }
 
-bool KAccelAction::init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+bool TDEAccelAction::init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled )
 {
@@ -110,11 +110,11 @@ bool KAccelAction::init( const TQString& sName, const TQString& sLabel, const TQ
 	m_cut = shortcutDefault();
 	d->m_nConnections = 0;
 	if( !m_bEnabled )
-		kdDebug(125) << "KAccelAction::init( \"" << sName << "\" ): created with enabled = false" << endl;
+		kdDebug(125) << "TDEAccelAction::init( \"" << sName << "\" ): created with enabled = false" << endl;
 	return true;
 }
 
-KAccelAction& KAccelAction::operator =( const KAccelAction& action )
+TDEAccelAction& TDEAccelAction::operator =( const TDEAccelAction& action )
 {
 	m_sName          = action.m_sName;
 	m_sLabel         = action.m_sLabel;
@@ -132,37 +132,37 @@ KAccelAction& KAccelAction::operator =( const KAccelAction& action )
 	return *this;
 }
 
-void KAccelAction::setName( const TQString& s )
+void TDEAccelAction::setName( const TQString& s )
 	{ m_sName = s; }
-void KAccelAction::setLabel( const TQString& s )
+void TDEAccelAction::setLabel( const TQString& s )
 	{ m_sLabel = s; }
-void KAccelAction::setWhatsThis( const TQString& s )
+void TDEAccelAction::setWhatsThis( const TQString& s )
 	{ m_sWhatsThis = s; }
 
-bool KAccelAction::setShortcut( const KShortcut& cut )
+bool TDEAccelAction::setShortcut( const TDEShortcut& cut )
 {
 	m_cut = cut;
 	return true;
 }
 
-void KAccelAction::setSlot( const TQObject* pObjSlot, const char* psMethodSlot )
+void TDEAccelAction::setSlot( const TQObject* pObjSlot, const char* psMethodSlot )
 {
 	m_pObjSlot = pObjSlot;
 	m_psMethodSlot = psMethodSlot;
 }
 
-void KAccelAction::setConfigurable( bool b )
+void TDEAccelAction::setConfigurable( bool b )
 	{ m_bConfigurable = b; }
-void KAccelAction::setEnabled( bool b )
+void TDEAccelAction::setEnabled( bool b )
 	{ m_bEnabled = b; }
 
-TQString KAccelAction::toString() const
+TQString TDEAccelAction::toString() const
 	{ return m_cut.toString(); }
 
-TQString KAccelAction::toStringInternal() const
+TQString TDEAccelAction::toStringInternal() const
 	{ return m_cut.toStringInternal( &shortcutDefault() ); }
 
-bool KAccelAction::setKeySequence( uint i, const KKeySequence& seq )
+bool TDEAccelAction::setKeySequence( uint i, const KKeySequence& seq )
 {
 	if( i < m_cut.count() ) {
 		m_cut.setSeq( i, seq );
@@ -172,12 +172,12 @@ bool KAccelAction::setKeySequence( uint i, const KKeySequence& seq )
 	return false;
 }
 
-void KAccelAction::clearShortcut()
+void TDEAccelAction::clearShortcut()
 {
 	m_cut.clear();
 }
 
-bool KAccelAction::contains( const KKeySequence& seq )
+bool TDEAccelAction::contains( const KKeySequence& seq )
 {
 	return m_cut.contains( seq );
 	for( uint i = 0; i < m_cut.count(); i++ ) {
@@ -187,90 +187,90 @@ bool KAccelAction::contains( const KKeySequence& seq )
 	return false;
 }
 
-const KShortcut& KAccelAction::shortcutDefault() const
+const TDEShortcut& TDEAccelAction::shortcutDefault() const
 	{ return (useFourModifierKeys()) ? m_cutDefault4 : m_cutDefault3; }
-bool KAccelAction::isConnected() const
+bool TDEAccelAction::isConnected() const
 	{ return d->m_nConnections; }
-void KAccelAction::incConnections()
+void TDEAccelAction::incConnections()
 	{ d->m_nConnections++; }
-void KAccelAction::decConnections()
+void TDEAccelAction::decConnections()
 	{ if( d->m_nConnections > 0 ) d->m_nConnections--; }
 
 // Indicate whether to default to the 3- or 4- modifier keyboard schemes
-int KAccelAction::g_bUseFourModifierKeys = -1;
+int TDEAccelAction::g_bUseFourModifierKeys = -1;
 
-bool KAccelAction::useFourModifierKeys()
+bool TDEAccelAction::useFourModifierKeys()
 {
-	if( KAccelAction::g_bUseFourModifierKeys == -1 ) {
+	if( TDEAccelAction::g_bUseFourModifierKeys == -1 ) {
 		// Read in whether to use 4 modifier keys
-		KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
-		bool b = KGlobal::config()->readBoolEntry( "Use Four Modifier Keys",  false );
-		KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
+		TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+		bool b = TDEGlobal::config()->readBoolEntry( "Use Four Modifier Keys",  false );
+		TDEAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
 	}
-	return KAccelAction::g_bUseFourModifierKeys == 1;
+	return TDEAccelAction::g_bUseFourModifierKeys == 1;
 }
 
-void KAccelAction::useFourModifierKeys( bool b )
+void TDEAccelAction::useFourModifierKeys( bool b )
 {
-	if( KAccelAction::g_bUseFourModifierKeys != (int)b ) {
-		KAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
+	if( TDEAccelAction::g_bUseFourModifierKeys != (int)b ) {
+		TDEAccelAction::g_bUseFourModifierKeys = b && KKeyNative::keyboardHasWinKey();
 		// If we're 'turning off' the meta key or, if we're turning it on,
 		//  the keyboard must actually have a meta key.
 		if( b && !KKeyNative::keyboardHasWinKey() )
 			kdDebug(125) << "Tried to use four modifier keys on a keyboard layout without a Meta key.\n";
 	}
-	KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" );
-	KGlobal::config()->writeEntry( "Use Four Modifier Keys", KAccelAction::g_bUseFourModifierKeys, true, true);
+	TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" );
+	TDEGlobal::config()->writeEntry( "Use Four Modifier Keys", TDEAccelAction::g_bUseFourModifierKeys, true, true);
 
-	kdDebug(125) << "bUseFourModifierKeys = " << KAccelAction::g_bUseFourModifierKeys << endl;
+	kdDebug(125) << "bUseFourModifierKeys = " << TDEAccelAction::g_bUseFourModifierKeys << endl;
 }
 
 //---------------------------------------------------------------------
-// KAccelActions
+// TDEAccelActions
 //---------------------------------------------------------------------
 
-class KAccelActionsPrivate
+class TDEAccelActionsPrivate
 {
  public:
 };
 
-KAccelActions::KAccelActions()
+TDEAccelActions::TDEAccelActions()
 {
-	kdDebug(125) << "KAccelActions(): this = " << this << endl;
+	kdDebug(125) << "TDEAccelActions(): this = " << this << endl;
 	initPrivate( 0 );
 }
 
-KAccelActions::KAccelActions( const KAccelActions& actions )
+TDEAccelActions::TDEAccelActions( const TDEAccelActions& actions )
 {
-	kdDebug(125) << "KAccelActions( actions = " << &actions << " ): this = " << this << endl;
+	kdDebug(125) << "TDEAccelActions( actions = " << &actions << " ): this = " << this << endl;
 	initPrivate( 0 );
 	init( actions );
 }
 
-KAccelActions::KAccelActions( KAccelBase* pKAccelBase )
+TDEAccelActions::TDEAccelActions( TDEAccelBase* pTDEAccelBase )
 {
-	kdDebug(125) << "KAccelActions( KAccelBase = " << pKAccelBase << " ): this = " << this << endl;
-	initPrivate( pKAccelBase );
+	kdDebug(125) << "TDEAccelActions( TDEAccelBase = " << pTDEAccelBase << " ): this = " << this << endl;
+	initPrivate( pTDEAccelBase );
 }
 
-KAccelActions::~KAccelActions()
+TDEAccelActions::~TDEAccelActions()
 {
-	//kdDebug(125) << "KAccelActions::~KAccelActions(): this = " << this << endl;
+	//kdDebug(125) << "TDEAccelActions::~TDEAccelActions(): this = " << this << endl;
 	clear();
 	//delete d;
 }
 
-void KAccelActions::initPrivate( KAccelBase* pKAccelBase )
+void TDEAccelActions::initPrivate( TDEAccelBase* pTDEAccelBase )
 {
-	m_pKAccelBase = pKAccelBase;
+	m_pTDEAccelBase = pTDEAccelBase;
 	m_nSizeAllocated = m_nSize = 0;
 	m_prgActions = 0;
-	//d = new KAccelActionsPrivate;
+	//d = new TDEAccelActionsPrivate;
 }
 
-void KAccelActions::clear()
+void TDEAccelActions::clear()
 {
-	kdDebug(125) << "\tKAccelActions::clear()" << endl;
+	kdDebug(125) << "\tTDEAccelActions::clear()" << endl;
 	for( uint i = 0; i < m_nSize; i++ )
 		delete m_prgActions[i];
 	delete[] m_prgActions;
@@ -279,14 +279,14 @@ void KAccelActions::clear()
 	m_prgActions = 0;
 }
 
-bool KAccelActions::init( const KAccelActions& actions )
+bool TDEAccelActions::init( const TDEAccelActions& actions )
 {
 	clear();
 	resize( actions.count() );
 	for( uint i = 0; i < m_nSize; i++ ) {
-		KAccelAction* pAction = actions.m_prgActions[i];
+		TDEAccelAction* pAction = actions.m_prgActions[i];
 		if( pAction )
-			m_prgActions[i] = new KAccelAction( *pAction );
+			m_prgActions[i] = new TDEAccelAction( *pAction );
 		else
 			m_prgActions[i] = 0;
 	}
@@ -294,22 +294,22 @@ bool KAccelActions::init( const KAccelActions& actions )
 	return true;
 }
 
-bool KAccelActions::init( KConfigBase& config, const TQString& sGroup )
+bool TDEAccelActions::init( TDEConfigBase& config, const TQString& sGroup )
 {
-	kdDebug(125) << "KAccelActions::init( " << sGroup << " )" << endl;
+	kdDebug(125) << "TDEAccelActions::init( " << sGroup << " )" << endl;
 	TQMap<TQString, TQString> mapEntry = config.entryMap( sGroup );
 	resize( mapEntry.count() );
 
 	TQMap<TQString, TQString>::Iterator it( mapEntry.begin() );
 	for( uint i = 0; it != mapEntry.end(); ++it, i++ ) {
 		TQString sShortcuts = *it;
-		KShortcut cuts;
+		TDEShortcut cuts;
 
 		kdDebug(125) << it.key() << " = " << sShortcuts << endl;
 		if( !sShortcuts.isEmpty() && sShortcuts != "none" )
 			cuts.init( sShortcuts );
 
-		m_prgActions[i] = new KAccelAction( it.key(), it.key(), it.key(),
+		m_prgActions[i] = new TDEAccelAction( it.key(), it.key(), it.key(),
 			cuts, cuts,
 			0, 0,          // pObjSlot, psMethodSlot,
 			true, false ); // bConfigurable, bEnabled
@@ -318,11 +318,11 @@ bool KAccelActions::init( KConfigBase& config, const TQString& sGroup )
 	return true;
 }
 
-void KAccelActions::resize( uint nSize )
+void TDEAccelActions::resize( uint nSize )
 {
 	if( nSize > m_nSizeAllocated ) {
 		uint nSizeAllocated = ((nSize/10) + 1) * 10;
-		KAccelAction** prgActions = new KAccelAction* [nSizeAllocated];
+		TDEAccelAction** prgActions = new TDEAccelAction* [nSizeAllocated];
 
 		// Copy pointers over to new array
 		for( uint i = 0; i < m_nSizeAllocated; i++ )
@@ -340,21 +340,21 @@ void KAccelActions::resize( uint nSize )
 	m_nSize = nSize;
 }
 
-void KAccelActions::insertPtr( KAccelAction* pAction )
+void TDEAccelActions::insertPtr( TDEAccelAction* pAction )
 {
 	resize( m_nSize + 1 );
 	m_prgActions[m_nSize-1] = pAction;
 }
 
-void KAccelActions::updateShortcuts( KAccelActions& actions2 )
+void TDEAccelActions::updateShortcuts( TDEAccelActions& actions2 )
 {
-	kdDebug(125) << "KAccelActions::updateShortcuts()" << endl;
+	kdDebug(125) << "TDEAccelActions::updateShortcuts()" << endl;
 	bool bChanged = false;
 
 	for( uint i = 0; i < m_nSize; i++ ) {
-		KAccelAction* pAction = m_prgActions[i];
+		TDEAccelAction* pAction = m_prgActions[i];
 		if( pAction && pAction->m_bConfigurable ) {
-			KAccelAction* pAction2 = actions2.actionPtr( pAction->m_sName );
+			TDEAccelAction* pAction2 = actions2.actionPtr( pAction->m_sName );
 			if( pAction2 ) {
 				TQString sOld = pAction->m_cut.toStringInternal();
 				pAction->m_cut = pAction2->m_cut;
@@ -371,68 +371,68 @@ void KAccelActions::updateShortcuts( KAccelActions& actions2 )
 		emitKeycodeChanged();
 }
 
-int KAccelActions::actionIndex( const TQString& sAction ) const
+int TDEAccelActions::actionIndex( const TQString& sAction ) const
 {
 	for( uint i = 0; i < m_nSize; i++ ) {
 		if( m_prgActions[i] == 0 )
-			kdWarning(125) << "KAccelActions::actionPtr( " << sAction << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
+			kdWarning(125) << "TDEAccelActions::actionPtr( " << sAction << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
 		else if( m_prgActions[i]->m_sName == sAction )
 			return (int) i;
 	}
 	return -1;
 }
 
-KAccelAction* KAccelActions::actionPtr( uint i )
+TDEAccelAction* TDEAccelActions::actionPtr( uint i )
 {
 	return m_prgActions[i];
 }
 
-const KAccelAction* KAccelActions::actionPtr( uint i ) const
+const TDEAccelAction* TDEAccelActions::actionPtr( uint i ) const
 {
 	return m_prgActions[i];
 }
 
-KAccelAction* KAccelActions::actionPtr( const TQString& sAction )
+TDEAccelAction* TDEAccelActions::actionPtr( const TQString& sAction )
 {
 	int i = actionIndex( sAction );
 	return (i >= 0) ? m_prgActions[i] : 0;
 }
 
-const KAccelAction* KAccelActions::actionPtr( const TQString& sAction ) const
+const TDEAccelAction* TDEAccelActions::actionPtr( const TQString& sAction ) const
 {
 	int i = actionIndex( sAction );
 	return (i >= 0) ? m_prgActions[i] : 0;
 }
 
-KAccelAction* KAccelActions::actionPtr( KKeySequence cut )
+TDEAccelAction* TDEAccelActions::actionPtr( KKeySequence cut )
 {
 	for( uint i = 0; i < m_nSize; i++ ) {
 		if( m_prgActions[i] == 0 )
-			kdWarning(125) << "KAccelActions::actionPtr( " << cut.toStringInternal() << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
+			kdWarning(125) << "TDEAccelActions::actionPtr( " << cut.toStringInternal() << " ): encountered null pointer at m_prgActions[" << i << "]" << endl;
 		else if( m_prgActions[i]->contains( cut ) )
 			return m_prgActions[i];
 	}
 	return 0;
 }
 
-KAccelAction& KAccelActions::operator []( uint i )
+TDEAccelAction& TDEAccelActions::operator []( uint i )
 {
 	return *actionPtr( i );
 }
 
-const KAccelAction& KAccelActions::operator []( uint i ) const
+const TDEAccelAction& TDEAccelActions::operator []( uint i ) const
 {
 	return *actionPtr( i );
 }
 
-KAccelAction* KAccelActions::insert( const TQString& sName, const TQString& sLabel )
+TDEAccelAction* TDEAccelActions::insert( const TQString& sName, const TQString& sLabel )
 {
 	if( actionPtr( sName ) ) {
-		kdWarning(125) << "KAccelActions::insertLabel( " << sName << ", " << sLabel << " ): action with same name already present." << endl;
+		kdWarning(125) << "TDEAccelActions::insertLabel( " << sName << ", " << sLabel << " ): action with same name already present." << endl;
 		return 0;
 	}
 
-	KAccelAction* pAction = new KAccelAction;
+	TDEAccelAction* pAction = new TDEAccelAction;
 	pAction->m_sName = sName;
 	pAction->m_sLabel = sLabel;
 	pAction->m_bConfigurable = false;
@@ -442,38 +442,38 @@ KAccelAction* KAccelActions::insert( const TQString& sName, const TQString& sLab
 	return pAction;
 }
 
-KAccelAction* KAccelActions::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+TDEAccelAction* TDEAccelActions::insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled )
 {
-	//kdDebug(125) << "KAccelActions::insert()2 begin" << endl;
+	//kdDebug(125) << "TDEAccelActions::insert()2 begin" << endl;
 	if( actionPtr( sAction ) ) {
-		kdWarning(125) << "KAccelActions::insert( " << sAction << " ): action with same name already present." << endl;
+		kdWarning(125) << "TDEAccelActions::insert( " << sAction << " ): action with same name already present." << endl;
 		return 0;
 	}
 
-	KAccelAction* pAction = new KAccelAction(
+	TDEAccelAction* pAction = new TDEAccelAction(
 		sAction, sLabel, sWhatsThis,
 		rgCutDefaults3, rgCutDefaults4,
 		pObjSlot, psMethodSlot,
 		bConfigurable, bEnabled );
 	insertPtr( pAction );
 
-	//kdDebug(125) << "KAccelActions::insert()2 end" << endl;
+	//kdDebug(125) << "TDEAccelActions::insert()2 end" << endl;
 	return pAction;
 }
 
-bool KAccelActions::remove( const TQString& sAction )
+bool TDEAccelActions::remove( const TQString& sAction )
 {
-	kdDebug(125) << "KAccelActions::remove( \"" << sAction << "\" ): this = " << this << " m_pKAccelBase = " << m_pKAccelBase << endl;
+	kdDebug(125) << "TDEAccelActions::remove( \"" << sAction << "\" ): this = " << this << " m_pTDEAccelBase = " << m_pTDEAccelBase << endl;
 
 	int iAction = actionIndex( sAction );
 	if( iAction < 0 )
 		return false;
 
-	if( m_pKAccelBase )
-		m_pKAccelBase->slotRemoveAction( m_prgActions[iAction] );
+	if( m_pTDEAccelBase )
+		m_pTDEAccelBase->slotRemoveAction( m_prgActions[iAction] );
 	delete m_prgActions[iAction];
 
 	for( uint i = iAction; i < m_nSize - 1; i++ )
@@ -483,39 +483,39 @@ bool KAccelActions::remove( const TQString& sAction )
 	return true;
 }
 
-bool KAccelActions::readActions( const TQString& sConfigGroup, KConfigBase* pConfig )
+bool TDEAccelActions::readActions( const TQString& sConfigGroup, TDEConfigBase* pConfig )
 {
-	KAccelShortcutList accelList(*this, false);
+	TDEAccelShortcutList accelList(*this, false);
 	return accelList.readSettings( sConfigGroup, pConfig );
 }
 
 /*
-	1) KAccelAction = "Something"
+	1) TDEAccelAction = "Something"
 		1) KKeySequence = "Meta+X,Asterisk"
-			1) KAccelSequence = "Meta+X"
+			1) TDEAccelSequence = "Meta+X"
 				1) KKeySequence = Meta+X
-			2) KAccelSequence = "Asterisk"
+			2) TDEAccelSequence = "Asterisk"
 				1) KKeySequence = Shift+8 (English layout)
 				2) KKeySequence = Keypad_Asterisk
 		2) KKeySequence = "Alt+F2"
-			1) KAccelSequence = "Alt+F2"
+			1) TDEAccelSequence = "Alt+F2"
 				1) KKeySequence = Alt+F2
 	-> "Something=Meta+X,Asterisk;Alt+F2"
 */
-bool KAccelActions::writeActions( const TQString &sGroup, KConfigBase* pConfig,
+bool TDEAccelActions::writeActions( const TQString &sGroup, TDEConfigBase* pConfig,
 			bool bWriteAll, bool bGlobal ) const
 {
-	kdDebug(125) << "KAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
+	kdDebug(125) << "TDEAccelActions::writeActions( " << sGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
 	if( !pConfig )
-		pConfig = KGlobal::config();
-	KConfigGroupSaver cs( pConfig, sGroup );
+		pConfig = TDEGlobal::config();
+	TDEConfigGroupSaver cs( pConfig, sGroup );
 
 	for( uint i = 0; i < m_nSize; i++ ) {
 		if( m_prgActions[i] == 0 ) {
-			kdWarning(125) << "KAccelActions::writeActions(): encountered null pointer at m_prgActions[" << i << "]" << endl;
+			kdWarning(125) << "TDEAccelActions::writeActions(): encountered null pointer at m_prgActions[" << i << "]" << endl;
 			continue;
 		}
-		const KAccelAction& action = *m_prgActions[i];
+		const TDEAccelAction& action = *m_prgActions[i];
 
 		TQString s;
 		bool bConfigHasAction = !pConfig->readEntry( action.m_sName ).isEmpty();
@@ -555,11 +555,11 @@ bool KAccelActions::writeActions( const TQString &sGroup, KConfigBase* pConfig,
 	return true;
 }
 
-void KAccelActions::emitKeycodeChanged()
+void TDEAccelActions::emitKeycodeChanged()
 {
-	if( m_pKAccelBase )
-		m_pKAccelBase->emitSignal( KAccelBase::KEYCODE_CHANGED );
+	if( m_pTDEAccelBase )
+		m_pTDEAccelBase->emitSignal( TDEAccelBase::KEYCODE_CHANGED );
 }
 
-uint KAccelActions::count() const
+uint TDEAccelActions::count() const
 	{ return m_nSize; }
diff --git a/tdecore/kaccelaction.h b/tdecore/tdeaccelaction.h
index 470c70559..e8232cc44 100644
--- a/tdecore/kaccelaction.h
+++ b/tdecore/tdeaccelaction.h
@@ -25,37 +25,37 @@
 #include <tqstring.h>
 #include <tqvaluevector.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
-class KAccelBase;
+class TDEAccelBase;
 
 class TQObject;
-class KConfig;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigBase;
 
 /**
  * @internal
- * A KAccelAction prepresents an action that can be executed using 
- * an accelerator key. Each KAccelAction has a name, a label, a 
- * "What's this" string and a KShortcut. The user can configure and 
+ * A TDEAccelAction prepresents an action that can be executed using 
+ * an accelerator key. Each TDEAccelAction has a name, a label, a 
+ * "What's this" string and a TDEShortcut. The user can configure and 
  * enable/disable them using KKeyDialog. 
  *
  * \code
- *	1) KAccelAction = "Run Command"
+ *	1) TDEAccelAction = "Run Command"
  *		Default3 = "Alt+F2"
  *		Default4 = "Meta+Enter;Alt+F2"
- *		1) KShortcut = "Meta+Enter"
+ *		1) TDEShortcut = "Meta+Enter"
  *			1) KKeySequence = "Meta+Enter"
  *				1) KKey = "Meta+Enter"
  *					1) Meta+Enter
  *					2) Meta+Keypad_Enter
- *		2) KShortcut = "Alt+F2"
+ *		2) TDEShortcut = "Alt+F2"
  *			1) KKeySequence = "Alt+F2"
  *				1) Alt+F2
- *	2) KAccelAction = "Something"
+ *	2) TDEAccelAction = "Something"
  *		Default3 = ""
  *		Default4 = ""
- *		1) KShortcut = "Meta+X,Asterisk"
+ *		1) TDEShortcut = "Meta+X,Asterisk"
  *			1) KKeySequence = "Meta+X,Asterisk"
  *				1) KKey = "Meta+X"
  *					1) Meta+X
@@ -64,27 +64,27 @@ class KConfigBase;
  *					2) Keypad_Asterisk
  * \endcode
  * @short An accelerator action
- * @see KAccel
- * @see KGlobalAccel
+ * @see TDEAccel
+ * @see TDEGlobalAccel
  * @see KKeyChooser
  * @see KKeyDialog
  */
-class TDECORE_EXPORT KAccelAction
+class TDECORE_EXPORT TDEAccelAction
 {
  public:
         /**
-	 * Creates an empty KAccelAction.
+	 * Creates an empty TDEAccelAction.
 	 * @see clear()
 	 */
-	KAccelAction();
+	TDEAccelAction();
 
 	/**
 	 * Copy constructor.
 	 */
-	KAccelAction( const KAccelAction& );
+	TDEAccelAction( const TDEAccelAction& );
 
 	/**
-	 * Creates a new KAccelAction.
+	 * Creates a new TDEAccelAction.
 	 * @param sName the name of the accelerator
 	 * @param sLabel the label of the accelerator (i18n!)
 	 * @param sWhatsThis the What's This text (18n!)
@@ -97,11 +97,11 @@ class TDECORE_EXPORT KAccelAction
 	 * @param bConfigurable if true the user can configure the shortcut
 	 * @param bEnabled true if the accelerator should be enabled
 	 */
-	KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& cutDef3, const KShortcut& cutDef4,
+	TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled );
-	~KAccelAction();
+	~TDEAccelAction();
 
 	/**
 	 * Clears the accelerator.
@@ -109,7 +109,7 @@ class TDECORE_EXPORT KAccelAction
 	void clear();
 
 	/**
-	 * Re-initialized the KAccelAction.
+	 * Re-initialized the TDEAccelAction.
 	 * @param sName the name of the accelerator
 	 * @param sLabel the label of the accelerator (i18n!)
 	 * @param sWhatsThis the What's This text (18n!)
@@ -124,14 +124,14 @@ class TDECORE_EXPORT KAccelAction
 	 * @return true if successful, false otherwise
 	 */
 	bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& cutDef3, const KShortcut& cutDef4,
+			const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled );
 
 	/**
-	 * Copies this KAccelAction.
+	 * Copies this TDEAccelAction.
 	 */
-	KAccelAction& operator=( const KAccelAction& );
+	TDEAccelAction& operator=( const TDEAccelAction& );
 
 	/**
 	 * Returns the name of the accelerator action.
@@ -156,10 +156,10 @@ class TDECORE_EXPORT KAccelAction
 	
 	/**
 	 * The shortcut that is actually used (may be used configured).
-	 * @return the shortcut of the KAccelAction, can be null if not set
+	 * @return the shortcut of the TDEAccelAction, can be null if not set
 	 * @see shortcutDefault()
 	 */
-	const KShortcut& shortcut() const          { return m_cut; }
+	const TDEShortcut& shortcut() const          { return m_cut; }
 
 	/**
 	 * The default shortcut for this system.
@@ -168,7 +168,7 @@ class TDECORE_EXPORT KAccelAction
 	 * @see shortcutDefault3()
 	 * @see shortcutDefault4()
 	 */
-	const KShortcut& shortcutDefault() const;
+	const TDEShortcut& shortcutDefault() const;
 
 	/**
 	 * The default shortcut for 3 modifier systems.
@@ -178,7 +178,7 @@ class TDECORE_EXPORT KAccelAction
 	 * @see shortcutDefault4()
 	 * @see useFourModifierKeys()
 	 */
-	const KShortcut& shortcutDefault3() const  { return m_cutDefault3; }
+	const TDEShortcut& shortcutDefault3() const  { return m_cutDefault3; }
 
 	/**
 	 * The default shortcut for 4 modifier systems.
@@ -188,7 +188,7 @@ class TDECORE_EXPORT KAccelAction
 	 * @see shortcutDefault3()
 	 * @see useFourModifierKeys()
 	 */
-	const KShortcut& shortcutDefault4() const  { return m_cutDefault4; }
+	const TDEShortcut& shortcutDefault4() const  { return m_cutDefault4; }
 
 	/**
 	 * Returns the receiver of signals.
@@ -237,7 +237,7 @@ class TDECORE_EXPORT KAccelAction
 	 * @param rgCuts the shortcut to set
 	 * @return true if successful, false otherwise
 	 */
-	bool setShortcut( const KShortcut& rgCuts );
+	bool setShortcut( const TDEShortcut& rgCuts );
 
 	/**
 	 * Sets the slot of the accelerator action.
@@ -284,14 +284,14 @@ class TDECORE_EXPORT KAccelAction
 	 * @param i the position of the sequence
 	 * @param keySeq the new new sequence
 	 * @return true if successful, false otherwise
-	 * @see KShortcut::setSeq()
+	 * @see TDEShortcut::setSeq()
 	 */
 	bool setKeySequence( uint i, const KKeySequence &keySeq );
 	
 	/**
 	 * Clears the action's shortcut. It will not contain any sequences after
 	 * calling this method.
-	 * @see KShortcut::clear()
+	 * @see TDEShortcut::clear()
 	 */
 	void clearShortcut();
 	
@@ -299,14 +299,14 @@ class TDECORE_EXPORT KAccelAction
 	 * Checks whether the action's shortcut contains the given key sequence.
 	 * @param keySeq the key sequence to check
 	 * @return true if the shortcut contains the given sequence
-	 * @see KShortcut::contains()
+	 * @see TDEShortcut::contains()
 	 */
 	bool contains( const KKeySequence &keySeq );
 
 	/**
 	 * Returns the string representation of the action's shortcut.
 	 * @return the string representation of the action's shortcut.
-	 * @see KShortcut::toString()
+	 * @see TDEShortcut::toString()
 	 */
 	TQString toString() const;
 
@@ -332,8 +332,8 @@ class TDECORE_EXPORT KAccelAction
 	TQString m_sName /**< Name of accel. @sa setName() */,
 	        m_sLabel /**< Label of accel. User-visible. */,
 	        m_sWhatsThis /**< WhatsThis help for accel. User-visible. */;
-	KShortcut m_cut /**< Shortcut actually assigned. */;
-	KShortcut m_cutDefault3 /**< Default shortcut in 3-modifier layout */, 
+	TDEShortcut m_cut /**< Shortcut actually assigned. */;
+	TDEShortcut m_cutDefault3 /**< Default shortcut in 3-modifier layout */, 
 		  m_cutDefault4 /**< Default shortcur in 4-modifier layout */;
 	const TQObject* m_pObjSlot /**< Object we will send signals to. */;
 	const char* m_psMethodSlot /**< Slot we send signals to, in m_pObjSlot */;
@@ -349,36 +349,36 @@ class TDECORE_EXPORT KAccelAction
 
  private:
 	static int g_bUseFourModifierKeys;
-	class KAccelActionPrivate* d;
+	class TDEAccelActionPrivate* d;
 
-	friend class KAccelActions;
-	friend class KAccelBase;
+	friend class TDEAccelActions;
+	friend class TDEAccelBase;
 };
 
 //---------------------------------------------------------------------
-// KAccelActions
+// TDEAccelActions
 //---------------------------------------------------------------------
 
 /**
  * @internal
- * This class represents a collection of KAccelAction objects.
+ * This class represents a collection of TDEAccelAction objects.
  *
  * @short A collection of accelerator actions
- * @see KAccelAction
+ * @see TDEAccelAction
  */
-class TDECORE_EXPORT KAccelActions
+class TDECORE_EXPORT TDEAccelActions
 {
  public:
        /**
-	* Creates a new, empty KAccelActions object.
+	* Creates a new, empty TDEAccelActions object.
 	*/
-	KAccelActions();
+	TDEAccelActions();
 
 	/**
 	 * Copy constructor (deep copy).
 	 */
-	KAccelActions( const KAccelActions& );
-	virtual ~KAccelActions();
+	TDEAccelActions( const TDEAccelActions& );
+	virtual ~TDEAccelActions();
 
 	/**
 	 * Removes all items from this collection.
@@ -391,7 +391,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param actions the actions to copy
 	 * @return true if successful, false otherwise
 	 */
-	bool init( const KAccelActions &actions );
+	bool init( const TDEAccelActions &actions );
 
 	/**
 	 * Loads the actions from the given configuration file.
@@ -400,7 +400,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sGroup the group in the configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool init( KConfigBase& config, const TQString& sGroup );
+	bool init( TDEConfigBase& config, const TQString& sGroup );
 
 	/**
 	 * Updates the shortcuts of all actions in this object
@@ -408,7 +408,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param shortcuts the collection that contains the new
 	 *        shortcuts
 	 */
-	void updateShortcuts( KAccelActions &shortcuts );
+	void updateShortcuts( TDEAccelActions &shortcuts );
 
 	/**
 	 * Retrieves the index of the action with the given name.
@@ -421,63 +421,63 @@ class TDECORE_EXPORT KAccelActions
 	 * Returns the action with the given @p index.
 	 * @param index the index of an action. You must not
 	 *         use an index that is too high.
-	 * @return the KAccelAction with the given index
+	 * @return the TDEAccelAction with the given index
 	 * @see count()
 	 */
-	KAccelAction* actionPtr( uint index );
+	TDEAccelAction* actionPtr( uint index );
 
 	/**
 	 * Returns the action with the given @p index.
 	 * @param index the index of an action. You must not
 	 *         use an index that is too high.
-	 * @return the KAccelAction with the given index
+	 * @return the TDEAccelAction with the given index
 	 * @see count()
 	 */
-	const KAccelAction* actionPtr( uint index ) const;
+	const TDEAccelAction* actionPtr( uint index ) const;
 
 	/**
 	 * Returns the action with the given name.
 	 * @param sAction the name of the action to search
-	 * @return the KAccelAction with the given name, or 0
+	 * @return the TDEAccelAction with the given name, or 0
 	 *          if not found
 	 */
-	KAccelAction* actionPtr( const TQString& sAction );
+	TDEAccelAction* actionPtr( const TQString& sAction );
 
 	/**
 	 * Returns the action with the given name.
 	 * @param sAction the name of the action to search
-	 * @return the KAccelAction with the given name, or 0
+	 * @return the TDEAccelAction with the given name, or 0
 	 *          if not found
 	 */
-	const KAccelAction* actionPtr( const TQString& sAction ) const;
+	const TDEAccelAction* actionPtr( const TQString& sAction ) const;
 
 	/**
 	 * Returns the action with the given key sequence.
 	 * @param cut the sequence to search for
-	 * @return the KAccelAction with the given sequence, or 0
+	 * @return the TDEAccelAction with the given sequence, or 0
 	 *          if not found
 	 */
-	KAccelAction* actionPtr( KKeySequence cut );
+	TDEAccelAction* actionPtr( KKeySequence cut );
 
 	/**
 	 * Returns the action with the given @p index.
 	 * @param index the index of an action. You must not
 	 *         use an index that is too high.
-	 * @return the KAccelAction with the given index
+	 * @return the TDEAccelAction with the given index
 	 * @see actionPtr()
 	 * @see count()
 	 */
-	KAccelAction& operator []( uint index );
+	TDEAccelAction& operator []( uint index );
 
 	/**
 	 * Returns the action with the given @p index.
 	 * @param index the index of an action. You must not
 	 *         use an index that is too high.
-	 * @return the KAccelAction with the given index
+	 * @return the TDEAccelAction with the given index
 	 * @see actionPtr()
 	 * @see count()
 	 */
-	const KAccelAction& operator []( uint index ) const;
+	const TDEAccelAction& operator []( uint index ) const;
 
 	/**
 	 * Inserts an action into the collection.
@@ -494,8 +494,8 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bEnabled       if true the accelerator should be enabled
 	 * @return the new action
 	 */
-	KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
-			const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+	TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+			const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
 			const TQObject* pObjSlot = 0, const char* psMethodSlot = 0,
 			bool bConfigurable = true, bool bEnabled = true );
 
@@ -505,7 +505,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param sLabel the label of the accelerator (i18n!)
 	 * @return the new action
 	 */
-	KAccelAction* insert( const TQString& sName, const TQString& sLabel );
+	TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
 
 	/**
 	 * Removes the given action.
@@ -521,7 +521,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 );
+	bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the actions to the given configuration file.
@@ -532,7 +532,7 @@ class TDECORE_EXPORT KAccelActions
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0,
+	bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
 	/**
@@ -548,9 +548,9 @@ class TDECORE_EXPORT KAccelActions
 
  protected:
 	/** Base object that proxies signals from us. */
-	KAccelBase* m_pKAccelBase;
+	TDEAccelBase* m_pTDEAccelBase;
 	/** Array of actions we're hanging on to. */
-	KAccelAction** m_prgActions;
+	TDEAccelAction** m_prgActions;
 	uint m_nSizeAllocated /**< Allocated size of the array. */, 
 	     m_nSize /**< Amount in use. */ ;
 
@@ -561,16 +561,16 @@ class TDECORE_EXPORT KAccelActions
 	 */
 	void resize( uint new_size );
 	/** Add a action to this collection. @todo Document ownership. */
-	void insertPtr( KAccelAction* );
+	void insertPtr( TDEAccelAction* );
 
  private:
-	class KAccelActionsPrivate* d;
+	class TDEAccelActionsPrivate* d;
 
-	KAccelActions( KAccelBase* );
-	void initPrivate( KAccelBase* );
-	KAccelActions& operator =( KAccelActions& );
+	TDEAccelActions( TDEAccelBase* );
+	void initPrivate( TDEAccelBase* );
+	TDEAccelActions& operator =( TDEAccelActions& );
 
-	friend class KAccelBase;
+	friend class TDEAccelBase;
 };
 
 #endif // _KACCELACTION_H
diff --git a/tdecore/kaccelbase.cpp b/tdecore/tdeaccelbase.cpp
index 4ba4c9c3b..6673cabb4 100644
--- a/tdecore/kaccelbase.cpp
+++ b/tdecore/tdeaccelbase.cpp
@@ -20,33 +20,33 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelbase.h"
+#include "tdeaccelbase.h"
 
 #include <tqkeycode.h>
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeynative.h>
 #include "kkeyserver.h"
-#include <klocale.h>
-#include "kshortcutmenu.h"
+#include <tdelocale.h>
+#include "tdeshortcutmenu.h"
 
 //---------------------------------------------------------------------
-// class KAccelBase::ActionInfo
+// class TDEAccelBase::ActionInfo
 //---------------------------------------------------------------------
 
 //---------------------------------------------------------------------
-// class KAccelBase
+// class TDEAccelBase
 //---------------------------------------------------------------------
 
-KAccelBase::KAccelBase( int fInitCode )
+TDEAccelBase::TDEAccelBase( int fInitCode )
 :	m_rgActions( this )
 {
-	kdDebug(125) << "KAccelBase(): this = " << this << endl;
+	kdDebug(125) << "TDEAccelBase(): this = " << this << endl;
 	m_bNativeKeys = fInitCode & NATIVE_KEYS;
 	m_bEnabled = true;
 	m_sConfigGroup = "Shortcuts";
@@ -55,27 +55,27 @@ KAccelBase::KAccelBase( int fInitCode )
 	mtemp_pActionRemoving = 0;
 }
 
-KAccelBase::~KAccelBase()
+TDEAccelBase::~TDEAccelBase()
 {
-	kdDebug(125) << "~KAccelBase(): this = " << this << endl;
+	kdDebug(125) << "~TDEAccelBase(): this = " << this << endl;
 }
 
-uint KAccelBase::actionCount() const { return m_rgActions.count(); }
-KAccelActions& KAccelBase::actions() { return m_rgActions; }
-bool KAccelBase::isEnabled() const { return m_bEnabled; }
-// see KGlobalAccel::blockShortcuts() stuff - it's to temporarily block
+uint TDEAccelBase::actionCount() const { return m_rgActions.count(); }
+TDEAccelActions& TDEAccelBase::actions() { return m_rgActions; }
+bool TDEAccelBase::isEnabled() const { return m_bEnabled; }
+// see TDEGlobalAccel::blockShortcuts() stuff - it's to temporarily block
 // all global shortcuts, so that the key grabs are released, but from the app's
-// point of view the KGlobalAccel is still enabled, so KGlobalAccel needs
+// point of view the TDEGlobalAccel is still enabled, so TDEGlobalAccel needs
 // to disable key grabbing even if enabled
-bool KAccelBase::isEnabledInternal() const { return isEnabled(); }
+bool TDEAccelBase::isEnabledInternal() const { return isEnabled(); }
 
-KAccelAction* KAccelBase::actionPtr( const TQString& sAction )
+TDEAccelAction* TDEAccelBase::actionPtr( const TQString& sAction )
 	{ return m_rgActions.actionPtr( sAction ); }
 
-const KAccelAction* KAccelBase::actionPtr( const TQString& sAction ) const
+const TDEAccelAction* TDEAccelBase::actionPtr( const TQString& sAction ) const
 	{ return m_rgActions.actionPtr( sAction ); }
 
-KAccelAction* KAccelBase::actionPtr( const KKeyServer::Key& key )
+TDEAccelAction* TDEAccelBase::actionPtr( const KKeyServer::Key& key )
 {
 	if( !m_mapKeyToAction.contains( key ) )
 		return 0;
@@ -83,25 +83,25 @@ KAccelAction* KAccelBase::actionPtr( const KKeyServer::Key& key )
 	return m_mapKeyToAction[key].pAction;
 }
 
-KAccelAction* KAccelBase::actionPtr( const KKey& key )
+TDEAccelAction* TDEAccelBase::actionPtr( const KKey& key )
 {
 	KKeyServer::Key k2;
 	k2.init( key, !m_bNativeKeys );
 	return actionPtr( k2 );
 }
 
-void KAccelBase::setConfigGroup( const TQString& sConfigGroup )
+void TDEAccelBase::setConfigGroup( const TQString& sConfigGroup )
 	{ m_sConfigGroup = sConfigGroup; }
 
-void KAccelBase::setConfigGlobal( bool global )
+void TDEAccelBase::setConfigGlobal( bool global )
 	{ m_bConfigIsGlobal = global; }
 
-bool KAccelBase::setActionEnabled( const TQString& sAction, bool bEnable )
+bool TDEAccelBase::setActionEnabled( const TQString& sAction, bool bEnable )
 {
-	KAccelAction* pAction = actionPtr( sAction );
+	TDEAccelAction* pAction = actionPtr( sAction );
 	if( pAction ) {
 		if( pAction->m_bEnabled != bEnable ) {
-			kdDebug(125) << "KAccelBase::setActionEnabled( " << sAction << ", " << bEnable << " )" << endl;
+			kdDebug(125) << "TDEAccelBase::setActionEnabled( " << sAction << ", " << bEnable << " )" << endl;
 			pAction->m_bEnabled = bEnable;
 			if( m_bAutoUpdate ) {
 				// FIXME: the action may already have it's connections inserted!
@@ -116,9 +116,9 @@ bool KAccelBase::setActionEnabled( const TQString& sAction, bool bEnable )
 	return false;
 }
 
-bool KAccelBase::setAutoUpdate( bool bAuto )
+bool TDEAccelBase::setAutoUpdate( bool bAuto )
 {
-	kdDebug(125) << "KAccelBase::setAutoUpdate( " << bAuto << " ): m_bAutoUpdate on entrance = " << m_bAutoUpdate << endl;
+	kdDebug(125) << "TDEAccelBase::setAutoUpdate( " << bAuto << " ): m_bAutoUpdate on entrance = " << m_bAutoUpdate << endl;
 	bool b = m_bAutoUpdate;
 	if( !m_bAutoUpdate && bAuto )
 		updateConnections();
@@ -126,13 +126,13 @@ bool KAccelBase::setAutoUpdate( bool bAuto )
 	return b;
 }
 
-KAccelAction* KAccelBase::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
-			const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+TDEAccelAction* TDEAccelBase::insert( const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
+			const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
 			const TQObject* pObjSlot, const char* psMethodSlot,
 			bool bConfigurable, bool bEnabled )
 {
-	//kdDebug(125) << "KAccelBase::insert() begin" << endl;
-	KAccelAction* pAction = m_rgActions.insert(
+	//kdDebug(125) << "TDEAccelBase::insert() begin" << endl;
+	TDEAccelAction* pAction = m_rgActions.insert(
 		sAction, sDesc, sHelp,
 		rgCutDefaults3, rgCutDefaults4,
 		pObjSlot, psMethodSlot,
@@ -141,27 +141,27 @@ KAccelAction* KAccelBase::insert( const TQString& sAction, const TQString& sDesc
 	if( pAction && m_bAutoUpdate )
 		insertConnection( pAction );
 
-	//kdDebug(125) << "KAccelBase::insert() end" << endl;
+	//kdDebug(125) << "TDEAccelBase::insert() end" << endl;
 	return pAction;
 }
 
-KAccelAction* KAccelBase::insert( const TQString& sName, const TQString& sDesc )
+TDEAccelAction* TDEAccelBase::insert( const TQString& sName, const TQString& sDesc )
 	{ return m_rgActions.insert( sName, sDesc ); }
 
-bool KAccelBase::remove( const TQString& sAction )
+bool TDEAccelBase::remove( const TQString& sAction )
 {
 	return m_rgActions.remove( sAction );
 }
 
-void KAccelBase::slotRemoveAction( KAccelAction* pAction )
+void TDEAccelBase::slotRemoveAction( TDEAccelAction* pAction )
 {
 	removeConnection( pAction );
 }
 
-bool KAccelBase::setActionSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
+bool TDEAccelBase::setActionSlot( const TQString& sAction, const TQObject* pObjSlot, const char* psMethodSlot )
 {
-	kdDebug(125) << "KAccelBase::setActionSlot( " << sAction << ", " << pObjSlot << ", " << psMethodSlot << " )\n";
-	KAccelAction* pAction = m_rgActions.actionPtr( sAction );
+	kdDebug(125) << "TDEAccelBase::setActionSlot( " << sAction << ", " << pObjSlot << ", " << psMethodSlot << " )\n";
+	TDEAccelAction* pAction = m_rgActions.actionPtr( sAction );
 	if( pAction ) {
 		// If there was a previous connection, remove it.
 		if( m_bAutoUpdate && pAction->isConnected() ) {
@@ -182,24 +182,24 @@ bool KAccelBase::setActionSlot( const TQString& sAction, const TQObject* pObjSlo
 }
 
 /*
-KAccelBase
+TDEAccelBase
 	Run Command=Meta+Enter;Alt+F2
-	KAccelAction = "Run Command"
-		1) KAccelKeySeries = "Meta+Enter"
+	TDEAccelAction = "Run Command"
+		1) TDEAccelKeySeries = "Meta+Enter"
 			1a) Meta+Enter
 			1b) Meta+Keypad_Enter
-		2) KAccelKeySeries = "Alt+F2"
+		2) TDEAccelKeySeries = "Alt+F2"
 			1a) Alt+F2
 
 	Konqueror=Meta+I,I
-	KAccelAction = "Konqueror"
-		1) KAccelKeySeries = "Meta+I,I"
+	TDEAccelAction = "Konqueror"
+		1) TDEAccelKeySeries = "Meta+I,I"
 			1a) Meta+I
 			2a) I
 
 	Something=Meta+Asterisk,X
-	KAccelAction = "Something"
-		1) KAccelKeySeries = "Meta+Asterisk,X"
+	TDEAccelAction = "Something"
+		1) TDEAccelKeySeries = "Meta+Asterisk,X"
 			1a) Meta+Shift+8
 			1b) Meta+Keypad_8
 			2a) X
@@ -215,25 +215,25 @@ connect new key sequences
 /*
 {
 	For {
-		for( KAccelAction::iterator itAction = m_rgActions.begin(); itAction != m_rgActions.end(); ++itAction ) {
-			KAccelAction& action = *itAction;
-			for( KAccelSeries::iterator itSeries = action.m_rgSeries.begin(); itSeries != action.m_rgSeries.end(); ++itSeries ) {
-				KAccelSeries& series = *itSeries;
+		for( TDEAccelAction::iterator itAction = m_rgActions.begin(); itAction != m_rgActions.end(); ++itAction ) {
+			TDEAccelAction& action = *itAction;
+			for( TDEAccelSeries::iterator itSeries = action.m_rgSeries.begin(); itSeries != action.m_rgSeries.end(); ++itSeries ) {
+				TDEAccelSeries& series = *itSeries;
 				if(
 			}
 		}
 	}
 	Sort by: iVariation, iSequence, iSeries, iAction
 
-	1) KAccelAction = "Run Command"
-		1) KAccelKeySeries = "Meta+Enter"
+	1) TDEAccelAction = "Run Command"
+		1) TDEAccelKeySeries = "Meta+Enter"
 			1a) Meta+Enter
 			1b) Meta+Keypad_Enter
-		2) KAccelKeySeries = "Alt+F2"
+		2) TDEAccelKeySeries = "Alt+F2"
 			1a) Alt+F2
 
-	2) KAccelAction = "Enter Calculation"
-		1) KAccelKeySeries = "Meta+Keypad_Enter"
+	2) TDEAccelAction = "Enter Calculation"
+		1) TDEAccelKeySeries = "Meta+Keypad_Enter"
 			1a) Meta+Keypad_Enter
 
 	List =
@@ -246,7 +246,7 @@ connect new key sequences
 */
 
 #ifdef Q_WS_X11
-struct KAccelBase::X
+struct TDEAccelBase::X
 {
 	uint iAction, iSeq, iVari;
 	KKeyServer::Key key;
@@ -312,10 +312,10 @@ struct KAccelBase::X
    Ctrl+KP_Add => #2
 */
 
-bool KAccelBase::updateConnections()
+bool TDEAccelBase::updateConnections()
 {
 #ifdef Q_WS_X11
-	kdDebug(125) << "KAccelBase::updateConnections()  this = " << this << endl;
+	kdDebug(125) << "TDEAccelBase::updateConnections()  this = " << this << endl;
 	// Retrieve the list of keys to be connected, sorted by priority.
 	//  (key, variation, seq)
 	TQValueVector<X> rgKeys;
@@ -356,7 +356,7 @@ bool KAccelBase::updateConnections()
 		if( bNonUnique ) {
 			// Remove connection to single action if there is one
 			if( m_mapKeyToAction.contains( key ) ) {
-				KAccelAction* pAction = m_mapKeyToAction[key].pAction;
+				TDEAccelAction* pAction = m_mapKeyToAction[key].pAction;
 				if( pAction ) {
 					m_mapKeyToAction.remove( key );
 					disconnectKey( *pAction, key );
@@ -376,7 +376,7 @@ bool KAccelBase::updateConnections()
 	// Disconnect keys which no longer have bindings:
 	for( KKeyToActionMap::iterator it = m_mapKeyToAction.begin(); it != m_mapKeyToAction.end(); ++it ) {
 		const KKeyServer::Key& key = it.key();
-		KAccelAction* pAction = (*it).pAction;
+		TDEAccelAction* pAction = (*it).pAction;
 		// If this key is longer used or it points to a different action now,
 		if( !mapKeyToAction.contains( key ) || mapKeyToAction[key].pAction != pAction ) {
 			if( pAction ) {
@@ -392,7 +392,7 @@ bool KAccelBase::updateConnections()
 	//  new action map, but which are _not_ present in the old one.
 	for( KKeyToActionMap::iterator it = mapKeyToAction.begin(); it != mapKeyToAction.end(); ++it ) {
 		const KKeyServer::Key& key = it.key();
-		KAccelAction* pAction = (*it).pAction;
+		TDEAccelAction* pAction = (*it).pAction;
 		if( !m_mapKeyToAction.contains( key ) || m_mapKeyToAction[key].pAction != pAction ) {
 			// TODO: Decide what to do if connect fails.
 			//  Probably should remove this item from map.
@@ -419,16 +419,16 @@ bool KAccelBase::updateConnections()
 
 #ifdef Q_WS_X11
 // Construct a list of keys to be connected, sorted highest priority first.
-void KAccelBase::createKeyList( TQValueVector<struct X>& rgKeys )
+void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys )
 {
-	//kdDebug(125) << "KAccelBase::createKeyList()" << endl;
+	//kdDebug(125) << "TDEAccelBase::createKeyList()" << endl;
 	if( !isEnabledInternal())
 		return;
 
 	// create the list
 	// For each action
 	for( uint iAction = 0; iAction < m_rgActions.count(); iAction++ ) {
-		KAccelAction* pAction = m_rgActions.actionPtr( iAction );
+		TDEAccelAction* pAction = m_rgActions.actionPtr( iAction );
 		if( pAction && pAction->m_pObjSlot && pAction->m_psMethodSlot && pAction != mtemp_pActionRemoving ) {
 			// For each key sequence associated with action
 			for( uint iSeq = 0; iSeq < pAction->shortcut().count(); iSeq++ ) {
@@ -453,12 +453,12 @@ void KAccelBase::createKeyList( TQValueVector<struct X>& rgKeys )
 }
 #endif //Q_WS_X11
 
-bool KAccelBase::insertConnection( KAccelAction* pAction )
+bool TDEAccelBase::insertConnection( TDEAccelAction* pAction )
 {
 	if( !pAction->m_pObjSlot || !pAction->m_psMethodSlot )
 		return true;
 
-	kdDebug(125) << "KAccelBase::insertConnection( " << pAction << "=\"" << pAction->m_sName << "\"; shortcut = " << pAction->shortcut().toStringInternal() << " )  this = " << this << endl;
+	kdDebug(125) << "TDEAccelBase::insertConnection( " << pAction << "=\"" << pAction->m_sName << "\"; shortcut = " << pAction->shortcut().toStringInternal() << " )  this = " << this << endl;
 
 	// For each sequence associated with the given action:
 	for( uint iSeq = 0; iSeq < pAction->shortcut().count(); iSeq++ ) {
@@ -502,7 +502,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction )
 	}
 
 	//kdDebug(125) << "\tActions = " << m_rgActions.size() << endl;
-	//for( KAccelActions::const_iterator it = m_rgActions.begin(); it != m_rgActions.end(); ++it ) {
+	//for( TDEAccelActions::const_iterator it = m_rgActions.begin(); it != m_rgActions.end(); ++it ) {
 	//	kdDebug(125) << "\t" << &(*it) << " '" << (*it).m_sName << "'" << endl;
 	//}
 
@@ -516,9 +516,9 @@ bool KAccelBase::insertConnection( KAccelAction* pAction )
 	return true;
 }
 
-bool KAccelBase::removeConnection( KAccelAction* pAction )
+bool TDEAccelBase::removeConnection( TDEAccelAction* pAction )
 {
-	kdDebug(125) << "KAccelBase::removeConnection( " << pAction << " = \"" << pAction->m_sName << "\"; shortcut = " << pAction->m_cut.toStringInternal() << " ): this = " << this << endl;
+	kdDebug(125) << "TDEAccelBase::removeConnection( " << pAction << " = \"" << pAction->m_sName << "\"; shortcut = " << pAction->m_cut.toStringInternal() << " ): this = " << this << endl;
 
 	//for( KKeyToActionMap::iterator it = m_mapKeyToAction.begin(); it != m_mapKeyToAction.end(); ++it )
 	//	kdDebug(125) << "\tKey: " << it.key().toString() << " => '" << (*it)->m_sName << "'" << " " << *it << endl;
@@ -548,9 +548,9 @@ bool KAccelBase::removeConnection( KAccelAction* pAction )
 	return true;
 }
 
-bool KAccelBase::setShortcut( const TQString& sAction, const KShortcut& cut )
+bool TDEAccelBase::setShortcut( const TQString& sAction, const TDEShortcut& cut )
 {
-	KAccelAction* pAction = actionPtr( sAction );
+	TDEAccelAction* pAction = actionPtr( sAction );
 	if( pAction ) {
 		if( m_bAutoUpdate )
 			removeConnection( pAction );
@@ -564,26 +564,26 @@ bool KAccelBase::setShortcut( const TQString& sAction, const KShortcut& cut )
 		return false;
 }
 
-void KAccelBase::readSettings( KConfigBase* pConfig )
+void TDEAccelBase::readSettings( TDEConfigBase* pConfig )
 {
 	m_rgActions.readActions( m_sConfigGroup, pConfig );
 	if( m_bAutoUpdate )
 		updateConnections();
 }
 
-void KAccelBase::writeSettings( KConfigBase* pConfig ) const
+void TDEAccelBase::writeSettings( TDEConfigBase* pConfig ) const
 {
 	m_rgActions.writeActions( m_sConfigGroup, pConfig, m_bConfigIsGlobal, m_bConfigIsGlobal );
 }
 
-TQPopupMenu* KAccelBase::createPopupMenu( TQWidget* pParent, const KKeySequence& seq )
+TQPopupMenu* TDEAccelBase::createPopupMenu( TQWidget* pParent, const KKeySequence& seq )
 {
-	KShortcutMenu* pMenu = new KShortcutMenu( pParent, &actions(), seq );
+	TDEShortcutMenu* pMenu = new TDEShortcutMenu( pParent, &actions(), seq );
 
 	bool bActionInserted = false;
 	bool bInsertSeparator = false;
 	for( uint i = 0; i < actionCount(); i++ ) {
-		const KAccelAction* pAction = actions().actionPtr( i );
+		const TDEAccelAction* pAction = actions().actionPtr( i );
 
 		if( !pAction->isEnabled() )
 			continue;
diff --git a/tdecore/kaccelbase.h b/tdecore/tdeaccelbase.h
index 082f09324..377589718 100644
--- a/tdecore/kaccelbase.h
+++ b/tdecore/tdeaccelbase.h
@@ -26,7 +26,7 @@
 #include <tqvaluevector.h>
 #include <tqvaluelist.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include "kkeyserver.h"
 
 class TQPopupMenu;
@@ -42,7 +42,7 @@ class TQWidget;
  * key bindings through application configuration files or through the
  * KKeyChooser GUI.
  *
- * A KAccel contains a list of accelerator items. Each accelerator item
+ * A TDEAccel contains a list of accelerator items. Each accelerator item
  * consists of an action name and a keyboard code combined with modifiers
  * (Shift, Ctrl and Alt.)
  *
@@ -55,7 +55,7 @@ class TQWidget;
  * connected. Accelerator items can be connected so that a key will activate
  * two different slots.
  *
- * A KAccel object handles key events sent to its parent widget and to all
+ * A TDEAccel object handles key events sent to its parent widget and to all
  * children of this parent widget.
  *
  * Key binding reconfiguration during run time can be prevented by specifying
@@ -74,33 +74,33 @@ class TQWidget;
  * The translated first argument for insertItem() is used only
  * in the configuration dialog.
  *\code
- * KAccel *a = new KAccel( myWindow );
+ * TDEAccel *a = new TDEAccel( myWindow );
  * // Insert an action "Scroll Up" which is associated with the "Up" key:
  * a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
  * // Insert an action "Scroll Down" which is not associated with any key:
  * a->insertItem( i18n("Scroll Down"), "Scroll Down", 0);
  * a->connectItem( "Scroll up", myWindow, TQT_SLOT( scrollUp() ) );
- * // a->insertStdItem( KStdAccel::Print ); //not necessary, since it
+ * // a->insertStdItem( TDEStdAccel::Print ); //not necessary, since it
  *	// is done automatially with the
  *	// connect below!
- * a->connectItem(KStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) );
+ * a->connectItem(TDEStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) );
  *
  * a->readSettings();
  *\endcode
  *
  * If a shortcut has a menu entry as well, you could insert them like
- * this. The example is again the KStdAccel::Print from above.
+ * this. The example is again the TDEStdAccel::Print from above.
  *
  * \code
  * int id;
  * id = popup->insertItem("&Print",this, TQT_SLOT(printDoc()));
- * a->changeMenuAccel(popup, id, KStdAccel::Print );
+ * a->changeMenuAccel(popup, id, TDEStdAccel::Print );
  * \endcode
  *
  * If you want a somewhat "exotic" name for your standard print action, like
  *   id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc()));
  * it might be a good idea to insert the standard action before as
- *          a->insertStdItem( KStdAccel::Print, i18n("Print Document") )
+ *          a->insertStdItem( TDEStdAccel::Print, i18n("Print Document") )
  * as well, so that the user can easily find the corresponding function.
  *
  * This technique works for other actions as well.  Your "scroll up" function
@@ -118,10 +118,10 @@ class TQWidget;
  * @short Configurable key binding support.
  */
 
-class TDECORE_EXPORT KAccelBase
+class TDECORE_EXPORT TDEAccelBase
 {
  public:
-	/** Initialization mode of the KAccelBase, used in constructor. */
+	/** Initialization mode of the TDEAccelBase, used in constructor. */
 	enum Init { QT_KEYS = 0x00, NATIVE_KEYS = 0x01 };
 
 	/** Enum for kinds of signals which may be emitted. */
@@ -130,32 +130,32 @@ class TDECORE_EXPORT KAccelBase
 	/** Constructor. @p fInitCode should be a bitwise OR of
 	*   values from the Init enum.
 	*/
-	KAccelBase( int fInitCode );
-	virtual ~KAccelBase();
+	TDEAccelBase( int fInitCode );
+	virtual ~TDEAccelBase();
 
 	/** Returns number of actions in this handler. */
 	uint actionCount() const;
 	/** Returns a list of all the actions in this handler. */
-	KAccelActions& actions();
+	TDEAccelActions& actions();
 	/** Returns whether this accelerator handler is enabled or not. */
 	bool isEnabled() const;
 
-	/** Returns a pointer to the KAccelAction named @p sAction. */
-	KAccelAction* actionPtr( const TQString& sAction );
+	/** Returns a pointer to the TDEAccelAction named @p sAction. */
+	TDEAccelAction* actionPtr( const TQString& sAction );
 	/** Const version of the above. */
-	const KAccelAction* actionPtr( const TQString& sAction ) const;
-	/** Returns a pointer to the KAccelAction associated with
+	const TDEAccelAction* actionPtr( const TQString& sAction ) const;
+	/** Returns a pointer to the TDEAccelAction associated with
 	*   the key @p key. This function takes into account the
 	*   key mapping defined in the constructor.
 	*
 	*   May return 0 if no (or more than one)
 	*   action is associated with the key.
 	*/
-	KAccelAction* actionPtr( const KKey& key );
+	TDEAccelAction* actionPtr( const KKey& key );
 	/** Basically the same as above, except a KKeyServer::Key
 	*   already has a key mapping defined (either NATIVE_KEYS or not).
 	*/
-	KAccelAction* actionPtr( const KKeyServer::Key& key );
+	TDEAccelAction* actionPtr( const KKeyServer::Key& key );
 
 	/** Returns the name of the configuration group these
 	*   accelerators are stored in. The default is "Shortcuts".
@@ -181,10 +181,10 @@ class TDECORE_EXPORT KAccelBase
 // Procedures for manipulating Actions.
 	//void clearActions();
 
-	KAccelAction* insert( const TQString& sName, const TQString& sDesc );
-	KAccelAction* insert(
+	TDEAccelAction* insert( const TQString& sName, const TQString& sDesc );
+	TDEAccelAction* insert(
 	                 const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
-	                 const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+	                 const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
 	                 const TQObject* pObjSlot, const char* psMethodSlot,
 			 bool bConfigurable = true, bool bEnabled = true );
 	bool remove( const TQString& sAction );
@@ -192,7 +192,7 @@ class TDECORE_EXPORT KAccelBase
 
 	bool updateConnections();
 
-	bool setShortcut( const TQString& sAction, const KShortcut& cut );
+	bool setShortcut( const TQString& sAction, const TDEShortcut& cut );
 
 // Modify individual Action sub-items
 	bool setActionEnabled( const TQString& sAction, bool bEnable );
@@ -200,25 +200,25 @@ class TDECORE_EXPORT KAccelBase
 	/**
 	 * Read all key associations from @p config, or (if @p config
 	 * is zero) from the application's configuration file
-	 * KGlobal::config().
+	 * TDEGlobal::config().
 	 *
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
 	 */
-	void readSettings( KConfigBase* pConfig = 0 );
+	void readSettings( TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Write the current configurable associations to @p config,
          * or (if @p config is zero) to the application's
 	 * configuration file.
 	 */
-	void writeSettings( KConfigBase* pConfig = 0 ) const;
+	void writeSettings( TDEConfigBase* pConfig = 0 ) const;
 
 	TQPopupMenu* createPopupMenu( TQWidget* pParent, const KKeySequence& );
 
  // Protected methods
  protected:
-	void slotRemoveAction( KAccelAction* );
+	void slotRemoveAction( TDEAccelAction* );
 
 	struct X;
 
@@ -226,8 +226,8 @@ class TDECORE_EXPORT KAccelBase
 	 * @param rgKeys constructed list of keys
 	 */
 	void createKeyList( TQValueVector<struct X>& rgKeys );
-	bool insertConnection( KAccelAction* );
-	bool removeConnection( KAccelAction* );
+	bool insertConnection( TDEAccelAction* );
+	bool removeConnection( TDEAccelAction* );
 
 	/** Emits a signal.
 	 * @param signal signal to be emitted
@@ -237,14 +237,14 @@ class TDECORE_EXPORT KAccelBase
 	 * @param action action to be executed when key is pressed
 	 * @param key key which causes the action to be executed
 	 */
-	virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key ) = 0;
+	virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key ) = 0;
 	/** Defines a key which activates the accelerator
 	 * @param key key which causes the action to be executed
 	 */
 	virtual bool connectKey( const KKeyServer::Key& key) = 0;
 	/** Removes the key from accelerator so it no longer executes the action
 	 */
-	virtual bool disconnectKey( KAccelAction&, const KKeyServer::Key& ) = 0;
+	virtual bool disconnectKey( TDEAccelAction&, const KKeyServer::Key& ) = 0;
 	/** Removes the key from accelerator
 	 */
 	virtual bool disconnectKey( const KKeyServer::Key& ) = 0;
@@ -253,30 +253,30 @@ class TDECORE_EXPORT KAccelBase
         virtual bool isEnabledInternal() const;
 	struct ActionInfo
 	{
-		KAccelAction* pAction;
+		TDEAccelAction* pAction;
 		uint iSeq, iVariation;
 		//ActionInfo* pInfoNext; // nil if only one action uses this key.
 
 		ActionInfo() { pAction = 0; iSeq = 0xffff; iVariation = 0xffff; }
-		ActionInfo( KAccelAction* _pAction, uint _iSeq, uint _iVariation )
+		ActionInfo( TDEAccelAction* _pAction, uint _iSeq, uint _iVariation )
 			{ pAction = _pAction; iSeq = _iSeq; iVariation = _iVariation; }
 	};
 	typedef TQMap<KKeyServer::Key, ActionInfo> KKeyToActionMap;
 
-	KAccelActions m_rgActions;
+	TDEAccelActions m_rgActions;
 	KKeyToActionMap m_mapKeyToAction;
-	TQValueList<KAccelAction*> m_rgActionsNonUnique;
+	TQValueList<TDEAccelAction*> m_rgActionsNonUnique;
 	bool m_bNativeKeys; // Use native key codes instead of Qt codes
 	bool m_bEnabled;
 	bool m_bConfigIsGlobal;
 	TQString m_sConfigGroup;
 	bool m_bAutoUpdate;
-	KAccelAction* mtemp_pActionRemoving;
+	TDEAccelAction* mtemp_pActionRemoving;
 
  private:
-	KAccelBase& operator =( const KAccelBase& );
+	TDEAccelBase& operator =( const TDEAccelBase& );
 
-	friend class KAccelActions;
+	friend class TDEAccelActions;
 };
 
 #endif // _KACCELBASE_H
diff --git a/tdecore/kaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp
index d4387e652..5fcfcc450 100644
--- a/tdecore/kaccelmanager.cpp
+++ b/tdecore/tdeaccelmanager.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaccelmanager.h"
+#include "tdeaccelmanager.h"
 
 #include <tqapplication.h>
 #include <tqcheckbox.h>
@@ -45,9 +45,9 @@
 #include <kdebug.h>
 
 
-#include "kaccelmanager_private.h"
+#include "tdeaccelmanager_private.h"
 #include "../tdeui/kstdaction_p.h"
-#include "../kutils/kmultitabbar.h"
+#include "../tdeutils/tdemultitabbar.h"
 
 
 /*********************************************************************
@@ -63,7 +63,7 @@
 
 /*********************************************************************
 
- class KAcceleratorManagerPrivate - internal helper class
+ class TDEAcceleratorManagerPrivate - internal helper class
 
  This class does all the work to find accelerators for a hierarchy of
  widgets.
@@ -71,7 +71,7 @@
  *********************************************************************/
 
 
-class KAcceleratorManagerPrivate
+class TDEAcceleratorManagerPrivate
 {
 public:
 
@@ -79,7 +79,7 @@ public:
     static bool programmers_mode;
     static bool standardName(const TQString &str);
 
-    static bool checkChange(const KAccelString &as)  {
+    static bool checkChange(const TDEAccelString &as)  {
         TQString t2 = as.accelerated();
         TQString t1 = as.originalText();
         if (t1 != t2)
@@ -125,7 +125,7 @@ private:
     void addChild(Item *item);
 
     TQWidget       *m_widget;
-    KAccelString  m_content;
+    TDEAccelString  m_content;
     ItemList      *m_children;
     int           m_index;
 
@@ -133,28 +133,28 @@ private:
 };
 
 
-bool KAcceleratorManagerPrivate::programmers_mode = false;
-TQString KAcceleratorManagerPrivate::changed_string;
-TQString KAcceleratorManagerPrivate::added_string;
-TQString KAcceleratorManagerPrivate::removed_string;
+bool TDEAcceleratorManagerPrivate::programmers_mode = false;
+TQString TDEAcceleratorManagerPrivate::changed_string;
+TQString TDEAcceleratorManagerPrivate::added_string;
+TQString TDEAcceleratorManagerPrivate::removed_string;
 static TQStringList *kaccmp_sns = 0;
 static KStaticDeleter<TQStringList> kaccmp_sns_d;
-TQMap<TQWidget*, int> KAcceleratorManagerPrivate::ignored_widgets;
+TQMap<TQWidget*, int> TDEAcceleratorManagerPrivate::ignored_widgets;
 
-bool KAcceleratorManagerPrivate::standardName(const TQString &str)
+bool TDEAcceleratorManagerPrivate::standardName(const TQString &str)
 {
     if (!kaccmp_sns)
         kaccmp_sns_d.setObject(kaccmp_sns, new TQStringList(KStdAction::internal_stdNames()));
         return kaccmp_sns->contains(str);
 }
 
-KAcceleratorManagerPrivate::Item::~Item()
+TDEAcceleratorManagerPrivate::Item::~Item()
 {
     delete m_children;
 }
 
 
-void KAcceleratorManagerPrivate::Item::addChild(Item *item)
+void TDEAcceleratorManagerPrivate::Item::addChild(Item *item)
 {
     if (!m_children) {
         m_children = new ItemList;
@@ -164,7 +164,7 @@ void KAcceleratorManagerPrivate::Item::addChild(Item *item)
     m_children->append(item);
 }
 
-void KAcceleratorManagerPrivate::manage(TQWidget *widget)
+void TDEAcceleratorManagerPrivate::manage(TQWidget *widget)
 {
     if (!widget)
     {
@@ -175,7 +175,7 @@ void KAcceleratorManagerPrivate::manage(TQWidget *widget)
     if (dynamic_cast<TQPopupMenu*>(widget))
     {
         // create a popup accel manager that can deal with dynamic menus
-        KPopupAccelManager::manage(static_cast<TQPopupMenu*>(widget));
+        TDEPopupAccelManager::manage(static_cast<TQPopupMenu*>(widget));
         return;
     }
 
@@ -189,13 +189,13 @@ void KAcceleratorManagerPrivate::manage(TQWidget *widget)
 }
 
 
-void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &used)
+void TDEAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &used)
 {
     if (!item->m_children)
         return;
 
     // collect the contents
-    KAccelStringList contents;
+    TDEAccelStringList contents;
     for (Item *it = item->m_children->first(); it != 0;
          it = item->m_children->next())
     {
@@ -203,7 +203,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
     }
 
     // find the right accelerators
-    KAccelManagerAlgorithm::findAccelerators(contents, used);
+    TDEAccelManagerAlgorithm::findAccelerators(contents, used);
 
     // write them back into the widgets
     int cnt = -1;
@@ -261,7 +261,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
 }
 
 
-void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
+void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
 {
   TQObjectList *childList = widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false);
   for ( TQObject *it = childList->first(); it; it = childList->next() )
@@ -271,7 +271,7 @@ void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
     if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) )
         continue;
 
-    if ( KAcceleratorManagerPrivate::ignored_widgets.find( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() )
+    if ( TDEAcceleratorManagerPrivate::ignored_widgets.find( w ) != TDEAcceleratorManagerPrivate::ignored_widgets.end() )
         continue;
 
     manageWidget(w, item);
@@ -279,7 +279,7 @@ void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
   delete childList;
 }
 
-void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
+void TDEAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
 {
   // first treat the special cases
 
@@ -301,7 +301,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
   if (popupMenu)
   {
       // create a popup accel manager that can deal with dynamic menus
-      KPopupAccelManager::manage(popupMenu);
+      TDEPopupAccelManager::manage(popupMenu);
       return;
   }
 
@@ -368,26 +368,26 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
         i->m_widget = w;
 
         // put some more weight on the usual action elements
-        int weight = KAccelManagerAlgorithm::DEFAULT_WEIGHT;
+        int weight = TDEAccelManagerAlgorithm::DEFAULT_WEIGHT;
         if (dynamic_cast<TQPushButton*>(w) || dynamic_cast<TQCheckBox*>(w) || dynamic_cast<TQRadioButton*>(w) || dynamic_cast<TQLabel*>(w))
-            weight = KAccelManagerAlgorithm::ACTION_ELEMENT_WEIGHT;
+            weight = TDEAccelManagerAlgorithm::ACTION_ELEMENT_WEIGHT;
 
         // don't put weight on group boxes, as usually the contents are more important
         if (dynamic_cast<TQGroupBox*>(w))
-            weight = KAccelManagerAlgorithm::GROUP_BOX_WEIGHT;
+            weight = TDEAccelManagerAlgorithm::GROUP_BOX_WEIGHT;
 
         // put a lot of extra weight on the KDialogBaseButton's
         if (w->inherits("KDialogBaseButton"))
-            weight += KAccelManagerAlgorithm::DIALOG_BUTTON_EXTRA_WEIGHT;
+            weight += TDEAccelManagerAlgorithm::DIALOG_BUTTON_EXTRA_WEIGHT;
 
-        i->m_content = KAccelString(content, weight);
+        i->m_content = TDEAccelString(content, weight);
         item->addChild(i);
     }
   }
   traverseChildren(w, item);
 }
 
-void KAcceleratorManagerPrivate::manageTabBar(TQTabBar *bar, Item *item)
+void TDEAcceleratorManagerPrivate::manageTabBar(TQTabBar *bar, Item *item)
 {
   for (int i=0; i<bar->count(); i++)
   {
@@ -399,11 +399,11 @@ void KAcceleratorManagerPrivate::manageTabBar(TQTabBar *bar, Item *item)
     item->addChild(it);
     it->m_widget = bar;
     it->m_index = i;
-    it->m_content = KAccelString(content);
+    it->m_content = TDEAccelString(content);
   }
 }
 
-void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
+void TDEAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
 {
     TQMenuItem *mitem;
     TQString s;
@@ -424,9 +424,9 @@ void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
             Item *it = new Item;
             item->addChild(it);
             it->m_content =
-                KAccelString(s,
+                TDEAccelString(s,
                              // menu titles are important, so raise the weight
-                             KAccelManagerAlgorithm::MENU_TITLE_WEIGHT);
+                             TDEAccelManagerAlgorithm::MENU_TITLE_WEIGHT);
 
             it->m_widget = mbar;
             it->m_index = i;
@@ -434,49 +434,49 @@ void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item)
 
         // have a look at the popup as well, if present
         if (mitem->popup())
-            KPopupAccelManager::manage(mitem->popup());
+            TDEPopupAccelManager::manage(mitem->popup());
     }
 }
 
 
 /*********************************************************************
 
- class KAcceleratorManager - main entry point
+ class TDEAcceleratorManager - main entry point
 
  This class is just here to provide a clean public API...
 
  *********************************************************************/
 
-void KAcceleratorManager::manage(TQWidget *widget)
+void TDEAcceleratorManager::manage(TQWidget *widget)
 {
-    KAcceleratorManager::manage(widget, false);
+    TDEAcceleratorManager::manage(widget, false);
 }
 
-void KAcceleratorManager::manage(TQWidget *widget, bool programmers_mode)
+void TDEAcceleratorManager::manage(TQWidget *widget, bool programmers_mode)
 {
-    kdDebug(131) << "KAcceleratorManager::manage\n";
-    KAcceleratorManagerPrivate::changed_string = TQString::null;
-    KAcceleratorManagerPrivate::added_string = TQString::null;
-    KAcceleratorManagerPrivate::removed_string = TQString::null;
-    KAcceleratorManagerPrivate::programmers_mode = programmers_mode;
-    KAcceleratorManagerPrivate::manage(widget);
+    kdDebug(131) << "TDEAcceleratorManager::manage\n";
+    TDEAcceleratorManagerPrivate::changed_string = TQString::null;
+    TDEAcceleratorManagerPrivate::added_string = TQString::null;
+    TDEAcceleratorManagerPrivate::removed_string = TQString::null;
+    TDEAcceleratorManagerPrivate::programmers_mode = programmers_mode;
+    TDEAcceleratorManagerPrivate::manage(widget);
 }
 
-void KAcceleratorManager::last_manage(TQString &added,  TQString &changed, TQString &removed)
+void TDEAcceleratorManager::last_manage(TQString &added,  TQString &changed, TQString &removed)
 {
-    added = KAcceleratorManagerPrivate::added_string;
-    changed = KAcceleratorManagerPrivate::changed_string;
-    removed = KAcceleratorManagerPrivate::removed_string;
+    added = TDEAcceleratorManagerPrivate::added_string;
+    changed = TDEAcceleratorManagerPrivate::changed_string;
+    removed = TDEAcceleratorManagerPrivate::removed_string;
 }
 
 
 /*********************************************************************
 
- class KAccelString - a string with weighted characters
+ class TDEAccelString - a string with weighted characters
 
  *********************************************************************/
 
-KAccelString::KAccelString(const TQString &input, int initialWeight)
+TDEAccelString::TDEAccelString(const TQString &input, int initialWeight)
   : m_pureText(input), m_weight()
 {
     m_orig_accel = m_pureText.find("(!)&");
@@ -495,7 +495,7 @@ KAccelString::KAccelString(const TQString &input, int initialWeight)
     m_orig_accel = m_accel = stripAccelerator(m_pureText);
 
     if (initialWeight == -1)
-        initialWeight = KAccelManagerAlgorithm::DEFAULT_WEIGHT;
+        initialWeight = TDEAccelManagerAlgorithm::DEFAULT_WEIGHT;
 
     calculateWeights(initialWeight);
 
@@ -503,13 +503,13 @@ KAccelString::KAccelString(const TQString &input, int initialWeight)
 }
 
 
-TQString KAccelString::accelerated() const
+TQString TDEAccelString::accelerated() const
 {
   TQString result = m_origText;
   if (result.isEmpty())
       return result;
 
-  if (KAcceleratorManagerPrivate::programmers_mode)
+  if (TDEAcceleratorManagerPrivate::programmers_mode)
   {
     if (m_accel != m_orig_accel) {
       int oa = m_orig_accel;
@@ -532,7 +532,7 @@ TQString KAccelString::accelerated() const
 }
 
 
-TQChar KAccelString::accelerator() const
+TQChar TDEAccelString::accelerator() const
 {
   if ((m_accel < 0) || (m_accel > (int)m_pureText.length()))
     return TQChar();
@@ -541,7 +541,7 @@ TQChar KAccelString::accelerator() const
 }
 
 
-void KAccelString::calculateWeights(int initialWeight)
+void TDEAccelString::calculateWeights(int initialWeight)
 {
   m_weight.resize(m_pureText.length());
 
@@ -556,12 +556,12 @@ void KAccelString::calculateWeights(int initialWeight)
 
     // add special weight to first character
     if (pos == 0)
-      weight += KAccelManagerAlgorithm::FIRST_CHARACTER_EXTRA_WEIGHT;
+      weight += TDEAccelManagerAlgorithm::FIRST_CHARACTER_EXTRA_WEIGHT;
 
     // add weight to word beginnings
     if (start_character)
     {
-      weight += KAccelManagerAlgorithm::WORD_BEGINNING_EXTRA_WEIGHT;
+      weight += TDEAccelManagerAlgorithm::WORD_BEGINNING_EXTRA_WEIGHT;
       start_character = false;
     }
 
@@ -571,10 +571,10 @@ void KAccelString::calculateWeights(int initialWeight)
 
     // try to preserve the wanted accelarators
     if ((int)pos == accel()) {
-        weight += KAccelManagerAlgorithm::WANTED_ACCEL_EXTRA_WEIGHT;
-        // kdDebug(131) << "wanted " << m_pureText << " " << KAcceleratorManagerPrivate::standardName(m_origText) << endl;
-        if (KAcceleratorManagerPrivate::standardName(m_origText))  {
-            weight += KAccelManagerAlgorithm::STANDARD_ACCEL;
+        weight += TDEAccelManagerAlgorithm::WANTED_ACCEL_EXTRA_WEIGHT;
+        // kdDebug(131) << "wanted " << m_pureText << " " << TDEAcceleratorManagerPrivate::standardName(m_origText) << endl;
+        if (TDEAcceleratorManagerPrivate::standardName(m_origText))  {
+            weight += TDEAccelManagerAlgorithm::STANDARD_ACCEL;
         }
     }
 
@@ -592,7 +592,7 @@ void KAccelString::calculateWeights(int initialWeight)
 }
 
 
-int KAccelString::stripAccelerator(TQString &text)
+int TDEAccelString::stripAccelerator(TQString &text)
 {
   // Note: this code is derived from TQAccel::shortcutKey
   int p = 0;
@@ -621,7 +621,7 @@ int KAccelString::stripAccelerator(TQString &text)
 }
 
 
-int KAccelString::maxWeight(int &index, const TQString &used)
+int TDEAccelString::maxWeight(int &index, const TQString &used)
 {
   int max = 0;
   index = -1;
@@ -638,7 +638,7 @@ int KAccelString::maxWeight(int &index, const TQString &used)
 }
 
 
-void KAccelString::dump()
+void TDEAccelString::dump()
 {
   TQString s;
   for (uint i=0; i<m_weight.count(); ++i)
@@ -680,13 +680,13 @@ void KAccelString::dump()
 
  *********************************************************************/
 
-void KAccelManagerAlgorithm::findAccelerators(KAccelStringList &result, TQString &used)
+void TDEAccelManagerAlgorithm::findAccelerators(TDEAccelStringList &result, TQString &used)
 {
     kdDebug(131) << "findAccelerators\n";
-  KAccelStringList accel_strings = result;
+  TDEAccelStringList accel_strings = result;
 
   // initally remove all accelerators
-  for (KAccelStringList::Iterator it = result.begin(); it != result.end(); ++it) {
+  for (TDEAccelStringList::Iterator it = result.begin(); it != result.end(); ++it) {
     (*it).setAccel(-1);
   }
 
@@ -720,18 +720,18 @@ void KAccelManagerAlgorithm::findAccelerators(KAccelStringList &result, TQString
     }
 
     // make sure we don't visit this one again
-    accel_strings[index] = KAccelString();
+    accel_strings[index] = TDEAccelString();
   }
 }
 
 
 /*********************************************************************
 
- class KPopupAccelManager - managing TQPopupMenu widgets dynamically
+ class TDEPopupAccelManager - managing TQPopupMenu widgets dynamically
 
  *********************************************************************/
 
-KPopupAccelManager::KPopupAccelManager(TQPopupMenu *popup)
+TDEPopupAccelManager::TDEPopupAccelManager(TQPopupMenu *popup)
   : TQObject(popup), m_popup(popup), m_count(-1)
 {
     aboutToShow(); // do one check and then connect to show
@@ -739,7 +739,7 @@ KPopupAccelManager::KPopupAccelManager(TQPopupMenu *popup)
 }
 
 
-void KPopupAccelManager::aboutToShow()
+void TDEPopupAccelManager::aboutToShow()
 {
   // Note: we try to be smart and avoid recalculating the accelerators
   // whenever possible. Unfortunately, there is no way to know if an
@@ -754,7 +754,7 @@ void KPopupAccelManager::aboutToShow()
   }
   else
   {
-    KAccelStringList entries;
+    TDEAccelStringList entries;
     findMenuEntries(entries);
     if (entries != m_entries)
     {
@@ -765,18 +765,18 @@ void KPopupAccelManager::aboutToShow()
 }
 
 
-void KPopupAccelManager::calculateAccelerators()
+void TDEPopupAccelManager::calculateAccelerators()
 {
   // find the new accelerators
   TQString used;
-  KAccelManagerAlgorithm::findAccelerators(m_entries, used);
+  TDEAccelManagerAlgorithm::findAccelerators(m_entries, used);
 
   // change the menu entries
   setMenuEntries(m_entries);
 }
 
 
-void KPopupAccelManager::findMenuEntries(KAccelStringList &list)
+void TDEPopupAccelManager::findMenuEntries(TDEAccelStringList &list)
 {
   TQMenuItem *mitem;
   TQString s;
@@ -797,16 +797,16 @@ void KPopupAccelManager::findMenuEntries(KAccelStringList &list)
     if (s.contains('\t'))
         weight = 0;
 
-    list.append(KAccelString(s, weight));
+    list.append(TDEAccelString(s, weight));
 
     // have a look at the popup as well, if present
     if (mitem->popup())
-        KPopupAccelManager::manage(mitem->popup());
+        TDEPopupAccelManager::manage(mitem->popup());
   }
 }
 
 
-void KPopupAccelManager::setMenuEntries(const KAccelStringList &list)
+void TDEPopupAccelManager::setMenuEntries(const TDEAccelStringList &list)
 {
   TQMenuItem *mitem;
 
@@ -817,18 +817,18 @@ void KPopupAccelManager::setMenuEntries(const KAccelStringList &list)
     if (mitem->isSeparator())
       continue;
 
-    if (KAcceleratorManagerPrivate::checkChange(list[cnt]))
+    if (TDEAcceleratorManagerPrivate::checkChange(list[cnt]))
         mitem->setText(list[cnt].accelerated());
     cnt++;
   }
 }
 
 
-void KPopupAccelManager::manage(TQPopupMenu *popup)
+void TDEPopupAccelManager::manage(TQPopupMenu *popup)
 {
   // don't add more than one manager to a popup
-  if (popup->child(0, "KPopupAccelManager", false) == 0 )
-    new KPopupAccelManager(popup);
+  if (popup->child(0, "TDEPopupAccelManager", false) == 0 )
+    new TDEPopupAccelManager(popup);
 }
 
 void QWidgetStackAccelManager::manage( TQWidgetStack *stack )
@@ -847,7 +847,7 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack)
 bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e )
 {
     if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) {
-        KAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) );
+        TDEAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) );
         watched->removeEventFilter( this );
     }
     return false;
@@ -864,9 +864,9 @@ void QWidgetStackAccelManager::aboutToShow(TQWidget *child)
     child->installEventFilter( this );
 }
 
-void KAcceleratorManager::setNoAccel( TQWidget *widget )
+void TDEAcceleratorManager::setNoAccel( TQWidget *widget )
 {
-    KAcceleratorManagerPrivate::ignored_widgets[widget] = 1;
+    TDEAcceleratorManagerPrivate::ignored_widgets[widget] = 1;
 }
 
-#include "kaccelmanager_private.moc"
+#include "tdeaccelmanager_private.moc"
diff --git a/tdecore/kaccelmanager.h b/tdecore/tdeaccelmanager.h
index 29304803b..03ee627b3 100644
--- a/tdecore/kaccelmanager.h
+++ b/tdecore/tdeaccelmanager.h
@@ -37,7 +37,7 @@ class TQString;
  * @since 3.1
 */
 
-class TDECORE_EXPORT KAcceleratorManager
+class TDECORE_EXPORT TDEAcceleratorManager
 {
 public:
 
@@ -69,7 +69,7 @@ public:
      *
      * TODO KDE4: merge with the above
      * @param widget The toplevel widget you want to manage.
-     * @param programmers_mode if true, KAcceleratorManager adds (&) for removed
+     * @param programmers_mode if true, TDEAcceleratorManager adds (&) for removed
      *             accels and & before added accels
      */
     static void manage(TQWidget *widget, bool programmers_mode);
diff --git a/tdecore/kaccelmanager_private.h b/tdecore/tdeaccelmanager_private.h
index e931b7e3e..ed401801e 100644
--- a/tdecore/kaccelmanager_private.h
+++ b/tdecore/tdeaccelmanager_private.h
@@ -39,12 +39,12 @@ class TQWidgetStack;
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
 */
 
-class KAccelString
+class TDEAccelString
 {
 public:
 
-  KAccelString() : m_pureText(), m_accel(-1) {}
-  KAccelString(const TQString &input, int initalWeight=-1);
+  TDEAccelString() : m_pureText(), m_accel(-1) {}
+  TDEAccelString(const TQString &input, int initalWeight=-1);
 
   void calculateWeights(int initialWeight);
 
@@ -61,7 +61,7 @@ public:
 
   int maxWeight(int &index, const TQString &used);
 
-  bool operator == (const KAccelString &c) const { return m_pureText == c.m_pureText && m_accel == c.m_accel && m_orig_accel == c.m_orig_accel; }
+  bool operator == (const TDEAccelString &c) const { return m_pureText == c.m_pureText && m_accel == c.m_accel && m_orig_accel == c.m_orig_accel; }
 
 
 private:
@@ -77,7 +77,7 @@ private:
 };
 
 
-typedef TQValueList<KAccelString> KAccelStringList;
+typedef TQValueList<TDEAccelString> TDEAccelStringList;
 
 
 /**
@@ -87,7 +87,7 @@ typedef TQValueList<KAccelString> KAccelStringList;
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
 */
 
-class KAccelManagerAlgorithm
+class TDEAccelManagerAlgorithm
 {
 public:
 
@@ -114,7 +114,7 @@ public:
   };
 
   /// Method to call to find the best distribution of accelerators.
-  static void findAccelerators(KAccelStringList &result, TQString &used);
+  static void findAccelerators(TDEAccelStringList &result, TQString &used);
 
 };
 
@@ -131,7 +131,7 @@ class TQPopupMenu;
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
 */
 
-class KPopupAccelManager : public TQObject
+class TDEPopupAccelManager : public TQObject
 {
   Q_OBJECT
 
@@ -142,7 +142,7 @@ public:
 
 protected:
 
-  KPopupAccelManager(TQPopupMenu *popup);
+  TDEPopupAccelManager(TQPopupMenu *popup);
 
 
 private slots:
@@ -154,11 +154,11 @@ private:
 
   void calculateAccelerators();
 
-  void findMenuEntries(KAccelStringList &list);
-  void setMenuEntries(const KAccelStringList &list);
+  void findMenuEntries(TDEAccelStringList &list);
+  void setMenuEntries(const TDEAccelStringList &list);
 
   TQPopupMenu       *m_popup;
-  KAccelStringList m_entries;
+  TDEAccelStringList m_entries;
   int              m_count;
 
 };
@@ -188,7 +188,7 @@ private:
   void calculateAccelerators();
 
   TQWidgetStack     *m_stack;
-  KAccelStringList m_entries;
+  TDEAccelStringList m_entries;
 
 };
 
diff --git a/tdecore/kaccelprivate.h b/tdecore/tdeaccelprivate.h
index 8d009b950..0d967998d 100644
--- a/tdecore/kaccelprivate.h
+++ b/tdecore/tdeaccelprivate.h
@@ -4,22 +4,22 @@
 #include "kkeyserver_x11.h"
 #include <tqtimer.h>
 
-class KAccelAction;
+class TDEAccelAction;
 
 /**
  * @internal
  */
-class TDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
+class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
 {
 	Q_OBJECT
  public:
-	KAccel* m_pAccel;
+	TDEAccel* m_pAccel;
 	TQWidget* m_pWatch;
 	TQMap<int, int> m_mapIDToKey;
-	TQMap<int, KAccelAction*> m_mapIDToAction;
+	TQMap<int, TDEAccelAction*> m_mapIDToAction;
 	TQTimer m_timerShowMenu;
 
-	KAccelPrivate( KAccel* pParent, TQWidget* pWatch );
+	TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch );
 
 	virtual void setEnabled( bool bEnabled );
 
@@ -27,19 +27,19 @@ class TDECORE_EXPORT KAccelPrivate : public TQObject, public KAccelBase
 
 	virtual bool removeAction( const TQString& sAction );
 
-	virtual bool emitSignal( KAccelBase::Signal signal );
-	virtual bool connectKey( KAccelAction& action, const KKeyServer::Key& key );
+	virtual bool emitSignal( TDEAccelBase::Signal signal );
+	virtual bool connectKey( TDEAccelAction& action, const KKeyServer::Key& key );
 	virtual bool connectKey( const KKeyServer::Key& key );
-	virtual bool disconnectKey( KAccelAction& action, const KKeyServer::Key& key );
+	virtual bool disconnectKey( TDEAccelAction& action, const KKeyServer::Key& key );
 	virtual bool disconnectKey( const KKeyServer::Key& key );
 
  signals:
 	void menuItemActivated();
-	void menuItemActivated(KAccelAction*);
+	void menuItemActivated(TDEAccelAction*);
 
  private:
 #ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
-	void emitActivatedSignal(KAccelAction*);
+	void emitActivatedSignal(TDEAccelAction*);
 #endif
 
  private slots:
diff --git a/tdecore/kapplication.cpp b/tdecore/tdeapplication.cpp
index b4caefc2c..58b010e4e 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -35,7 +35,7 @@
 #undef QT_NO_TRANSLATION
 #undef TQT_NO_TRANSLATION
 #include <tqtranslator.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #define QT_NO_TRANSLATION
 #define TQT_NO_TRANSLATION
 #include <tqdir.h>
@@ -61,24 +61,24 @@
 #include <tqsqlpropertymap.h>
 #endif
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kstyle.h>
+#include <tdelocale.h>
+#include <tdestyle.h>
 #include <kiconloader.h>
 #include <kclipboard.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeglobalsettings.h>
 #include <kcrash.h>
 #include <kdatastream.h>
 #include <klibloader.h>
 #include <kmimesourcefactory.h>
-#include <kstdaccel.h>
-#include <kaccel.h>
+#include <tdestdaccel.h>
+#include <tdeaccel.h>
 #include "kcheckaccelerators.h"
 #include <tqptrdict.h>
 #include <kmacroexpander.h>
@@ -89,7 +89,7 @@
 #include <kglobalaccel.h>
 
 #if defined Q_WS_X11
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #endif
 
 #include <dcopclient.h>
@@ -175,10 +175,10 @@ KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
 bool kde_kiosk_exception = false; // flag to disable kiosk restrictions
 bool kde_kiosk_admin = false;
 
-KApplication* KApplication::KApp = 0L;
-bool KApplication::loadedByKdeinit = false;
-DCOPClient *KApplication::s_DCOPClient = 0L;
-bool KApplication::s_dcopClientNeedsPostInit = false;
+TDEApplication* TDEApplication::KApp = 0L;
+bool TDEApplication::loadedByKdeinit = false;
+DCOPClient *TDEApplication::s_DCOPClient = 0L;
+bool TDEApplication::s_dcopClientNeedsPostInit = false;
 
 #ifdef Q_WS_X11
 static Atom atom_DesktopWindow;
@@ -230,7 +230,7 @@ static void kde_ice_ioerrorhandler( IceConn conn )
 #endif
 
 #ifdef Q_WS_WIN
-void KApplication_init_windows(bool GUIenabled);
+void TDEApplication_init_windows(bool GUIenabled);
 
 class QAssistantClient;
 #endif
@@ -238,10 +238,10 @@ class QAssistantClient;
 /*
   Private data to make keeping binary compatibility easier
  */
-class KApplicationPrivate
+class TDEApplicationPrivate
 {
 public:
-  KApplicationPrivate()
+  TDEApplicationPrivate()
     :   actionRestrictions( false ),
 	refCount( 1 ),
 	oldIceIOErrorHandler( 0 ),
@@ -260,7 +260,7 @@ public:
   {
   }
 
-  ~KApplicationPrivate()
+  ~TDEApplicationPrivate()
   {
 #ifdef Q_WS_WIN
      delete qassistantclient;
@@ -272,7 +272,7 @@ public:
   bool guiEnabled : 1;
   /**
    * This counter indicates when to exit the application.
-   * It starts at 1, is decremented in KMainWindow when the last window is closed, but
+   * It starts at 1, is decremented in TDEMainWindow when the last window is closed, but
    * is incremented by operations that should outlive the last window closed
    * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
    */
@@ -439,7 +439,7 @@ public:
 static TQPtrList<TQWidget>*x11Filter = 0;
 static bool autoDcopRegistration = true;
 
-void KApplication::installX11EventFilter( TQWidget* filter )
+void TDEApplication::installX11EventFilter( TQWidget* filter )
 {
     if ( !filter )
         return;
@@ -449,12 +449,12 @@ void KApplication::installX11EventFilter( TQWidget* filter )
     x11Filter->append( filter );
 }
 
-void KApplication::x11FilterDestroyed()
+void TDEApplication::x11FilterDestroyed()
 {
     removeX11EventFilter( static_cast< const TQWidget* >( sender()));
 }
 
-void KApplication::removeX11EventFilter( const TQWidget* filter )
+void TDEApplication::removeX11EventFilter( const TQWidget* filter )
 {
     if ( !x11Filter || !filter )
         return;
@@ -468,10 +468,10 @@ void KApplication::removeX11EventFilter( const TQWidget* filter )
 // FIXME: remove this when we've get a better method of
 // customizing accelerator handling -- hopefully in Qt.
 // For now, this is set whenever an accelerator is overridden
-// in KAccelEventHandler so that the AccelOverride isn't sent twice. -- ellis, 19/10/02
+// in TDEAccelEventHandler so that the AccelOverride isn't sent twice. -- ellis, 19/10/02
 extern bool kde_g_bKillAccelOverride;
 
-bool KApplication::notify(TQObject *receiver, TQEvent *event)
+bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
 {
     TQEvent::Type t = event->type();
     if (kde_g_bKillAccelOverride)
@@ -489,7 +489,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
 
     if ((t == TQEvent::AccelOverride) || (t == TQEvent::KeyPress))
     {
-       static const KShortcut& _selectAll = KStdAccel::selectAll();
+       static const TDEShortcut& _selectAll = TDEStdAccel::selectAll();
        TQLineEdit *edit = ::tqqt_cast<TQLineEdit *>(receiver);
        if (edit)
        {
@@ -552,7 +552,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
         TQWidget* w = TQT_TQWIDGET( receiver );
 #if defined Q_WS_X11
         if( w->isTopLevel() && !startupId().isEmpty() && !TQT_TQSHOWEVENT(event)->spontaneous()) // TODO better done using window group leader?
-            KStartupInfo::setWindowStartupId( w->winId(), startupId());
+            TDEStartupInfo::setWindowStartupId( w->winId(), startupId());
 #endif
         if( w->isTopLevel() && !w->testWFlags( WX11BypassWM ) && !w->isPopup() && !event->spontaneous())
         {
@@ -569,8 +569,8 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
             // icon() cannot be null pixmap, it'll be the "unknown" icon - so check if there is this application icon
             static TQPixmap* ic = NULL;
             if( ic == NULL )
-                ic = new TQPixmap( KGlobal::iconLoader()->loadIcon( iconName(),
-                    KIcon::NoGroup, 0, KIcon::DefaultState, NULL, true ));
+                ic = new TQPixmap( TDEGlobal::iconLoader()->loadIcon( iconName(),
+                    TDEIcon::NoGroup, 0, TDEIcon::DefaultState, NULL, true ));
             if( !ic->isNull())
             {
                 w->setIcon( *ic );
@@ -583,10 +583,10 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event)
     return TQApplication::notify(receiver, event);
 }
 
-void KApplication::checkAppStartedSlot()
+void TDEApplication::checkAppStartedSlot()
 {
 #if defined Q_WS_X11
-    KStartupInfo::handleAutoAppStartedSending();
+    TDEStartupInfo::handleAutoAppStartedSending();
 #endif
 }
 
@@ -604,7 +604,7 @@ static TQPtrList<KSessionManaged>* sessionClients()
   instance specific config object.
   Syntax:  "session/<appname>_<sessionId>"
  */
-TQString KApplication::sessionConfigName() const
+TQString TDEApplication::sessionConfigName() const
 {
     TQString sessKey = sessionKey();
     if ( sessKey.isEmpty() && !d->sessionKey.isEmpty() )
@@ -621,14 +621,14 @@ static SmcConn tmpSmcConnection = 0;
 #endif
 static TQTime* smModificationTime = 0;
 
-KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName,
+TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName,
                             bool allowStyles, bool GUIenabled ) :
-  TQApplication( argc, argv, GUIenabled ), KInstance(rAppName),
+  TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName),
 #ifdef Q_WS_X11
   display(0L),
   argb_visual(false),
 #endif
-  d (new KApplicationPrivate())
+  d (new TDEApplicationPrivate())
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -640,21 +640,21 @@ KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName,
     setName(rAppName);
 
     installSigpipeHandler();
-    KCmdLineArgs::initIgnore(argc, argv, rAppName.data());
+    TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
     parseCommandLine( );
     init(GUIenabled);
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
-//  TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), TRUE ),	// Qt4 requires that there always be a GUI
-  TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), GUIenabled ),	// We need to be able to run command line apps
-  KInstance( KCmdLineArgs::about),
+TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
+//  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ),	// Qt4 requires that there always be a GUI
+  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ),	// We need to be able to run command line apps
+  TDEInstance( TDECmdLineArgs::about),
 #ifdef Q_WS_X11
   display(0L),
   argb_visual(false),
 #endif
-  d (new KApplicationPrivate)
+  d (new TDEApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -671,10 +671,10 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
 }
 
 #ifdef Q_WS_X11
-KApplication::KApplication( Display *dpy, bool allowStyles ) :
-  TQApplication( dpy, *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(),
+TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
+  TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ),
-  KInstance( KCmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -687,10 +687,10 @@ KApplication::KApplication( Display *dpy, bool allowStyles ) :
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-KApplication::KApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) :
-  TQApplication( dpy, *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(),
+TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) :
+  TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ),
-  KInstance( KCmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -704,11 +704,11 @@ KApplication::KApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual,
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
+TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
 		            bool allowStyles ) :
-  TQApplication( dpy, *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(),
+  TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
-  KInstance( KCmdLineArgs::about), display(0L), d (new KApplicationPrivate)
+  TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
 {
     if ((visual) && (colormap))
         getX11RGBAInformation(dpy);
@@ -723,11 +723,11 @@ KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
-		            bool allowStyles, KInstance * _instance ) :
-  TQApplication( dpy, *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(),
+TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
+		            bool allowStyles, TDEInstance * _instance ) :
+  TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
-  KInstance( _instance ), display(0L), d (new KApplicationPrivate)
+  TDEInstance( _instance ), display(0L), d (new TDEApplicationPrivate)
 {
     if ((visual) && (colormap))
         getX11RGBAInformation(dpy);
@@ -743,15 +743,15 @@ KApplication::KApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap
 }
 #endif
 
-KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ) :
-  TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(),
+TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance ) :
+  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 GUIenabled ),
-  KInstance( _instance ),
+  TDEInstance( _instance ),
 #ifdef Q_WS_X11
   display(0L),
 #endif
   argb_visual(false),
-  d (new KApplicationPrivate)
+  d (new TDEApplicationPrivate)
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -768,12 +768,12 @@ KApplication::KApplication( bool allowStyles, bool GUIenabled, KInstance* _insta
 }
 
 #ifdef Q_WS_X11
-KApplication::KApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
+TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
                            bool allowStyles, bool GUIenabled ) :
-  TQApplication( display ), KInstance(rAppName),
+  TQApplication( display ), TDEInstance(rAppName),
   display(0L),
   argb_visual(false),
-  d (new KApplicationPrivate())
+  d (new TDEApplicationPrivate())
 {
     aIconPixmap.pm.icon = 0L;
     aIconPixmap.pm.miniIcon = 0L;
@@ -786,14 +786,14 @@ KApplication::KApplication(Display *display, int& argc, char** argv, const TQCSt
     setName(rAppName);
 
     installSigpipeHandler();
-    KCmdLineArgs::initIgnore(argc, argv, rAppName.data());
+    TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
     parseCommandLine( );
     init(GUIenabled);
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 #endif
 
-int KApplication::xioErrhandler( Display* dpy )
+int TDEApplication::xioErrhandler( Display* dpy )
 {
     if(kapp)
     {
@@ -808,7 +808,7 @@ int KApplication::xioErrhandler( Display* dpy )
     return 0;
 }
 
-int KApplication::xErrhandler( Display* dpy, void* err_ )
+int TDEApplication::xErrhandler( Display* dpy, void* err_ )
 { // no idea how to make forward decl. for XErrorEvent
 #ifdef Q_WS_X11
     XErrorEvent* err = static_cast< XErrorEvent* >( err_ );
@@ -821,7 +821,7 @@ int KApplication::xErrhandler( Display* dpy, void* err_ )
     return 0;
 }
 
-void KApplication::iceIOErrorHandler( _IceConn *conn )
+void TDEApplication::iceIOErrorHandler( _IceConn *conn )
 {
     emit shutDown();
 
@@ -841,12 +841,12 @@ public:
 					 const char* message) const
   {
     TQTranslatorMessage res;
-    res.setTranslation(KGlobal::locale()->translateQt(context, sourceText, message));
+    res.setTranslation(TDEGlobal::locale()->translateQt(context, sourceText, message));
     return res;
   }
 };
 
-void KApplication::init(bool GUIenabled)
+void TDEApplication::init(bool GUIenabled)
 {
   d->guiEnabled = GUIenabled;
   if ((getuid() != geteuid()) ||
@@ -861,9 +861,9 @@ void KApplication::init(bool GUIenabled)
      }
   }
 
-  KProcessController::ref();
+  TDEProcessController::ref();
 
-  (void) KClipboardSynchronizer::self();
+  (void) TDEClipboardSynchronizer::self();
 
   TQApplication::setDesktopSettingsAware( false );
 
@@ -912,9 +912,9 @@ void KApplication::init(bool GUIenabled)
 #endif
 
   // Trigger creation of locale.
-  (void) KGlobal::locale();
+  (void) TDEGlobal::locale();
 
-  KConfig* config = KGlobal::config();
+  TDEConfig* config = TDEGlobal::config();
   d->actionRestrictions = config->hasGroup("KDE Action Restrictions" ) && !kde_kiosk_exception;
   // For brain-dead configurations where the user's local config file is not writable.
   // * We use kdialog to warn the user, so we better not generate warnings from
@@ -923,7 +923,7 @@ void KApplication::init(bool GUIenabled)
   TQCString readOnly = getenv("TDE_HOME_READONLY");
   if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0))
   {
-    KConfigGroupSaver saver(config, "KDE Action Restrictions");
+    TDEConfigGroupSaver saver(config, "KDE Action Restrictions");
     if (config->readBoolEntry("warn_unwritable_config",true))
        config->checkConfigFilesWritable(true);
   }
@@ -945,7 +945,7 @@ void KApplication::init(bool GUIenabled)
 #endif
 
     {
-        TQStringList plugins = KGlobal::dirs()->resourceDirs( "qtplugins" );
+        TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" );
         TQStringList::Iterator it = plugins.begin();
         while (it != plugins.end()) {
             addLibraryPath( *it );
@@ -953,9 +953,9 @@ void KApplication::init(bool GUIenabled)
         }
 
     }
-    kdisplaySetStyle();
-    kdisplaySetFont();
-//    kdisplaySetPalette(); done by kdisplaySetStyle
+    tdedisplaySetStyle();
+    tdedisplaySetFont();
+//    tdedisplaySetPalette(); done by tdedisplaySetStyle
     propagateSettings(SETTINGS_QT);
 
     // Set default mime-source factory
@@ -977,8 +977,8 @@ void KApplication::init(bool GUIenabled)
 
 #ifdef Q_WS_MACX
   if (GUIenabled) {
-      TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( KCmdLineArgs::appName(),
-              KIcon::NoGroup, KIcon::SizeLarge, KIcon::DefaultState, 0L, false );
+      TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(),
+              TDEIcon::NoGroup, TDEIcon::SizeLarge, TDEIcon::DefaultState, 0L, false );
       if (!pixmap.isNull()) {
           TQImage i = pixmap.convertToImage().convertDepth(32).smoothScale(40, 40);
           for(int y = 0; y < i.height(); y++) {
@@ -1013,7 +1013,7 @@ void KApplication::init(bool GUIenabled)
 	setReverseLayout( !rtl );
 
   // install appdata resource type
-  KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data")
+  TDEGlobal::dirs()->addResourceType("appdata", TDEStandardDirs::kde_default("data")
                                    + TQString::fromLatin1(name()) + '/');
   pSessionConfig = 0L;
   bSessionManagement = true;
@@ -1030,7 +1030,7 @@ void KApplication::init(bool GUIenabled)
   }
   d->oldIceIOErrorHandler = IceSetIOErrorHandler( kde_ice_ioerrorhandler );
 #elif defined(Q_WS_WIN)
-  KApplication_init_windows(GUIenabled);
+  TDEApplication_init_windows(GUIenabled);
 #else
   // FIXME(E): Implement for Qt Embedded
 #endif
@@ -1057,13 +1057,13 @@ static int my_system (const char *command) {
 }
 
 
-DCOPClient *KApplication::dcopClient()
+DCOPClient *TDEApplication::dcopClient()
 {
   if (s_DCOPClient)
     return s_DCOPClient;
 
   s_DCOPClient = new DCOPClient();
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs("tde");
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("tde");
   if (args && args->isSet("dcopserver"))
   {
     s_DCOPClient->setServerAddress( args->getOption("dcopserver"));
@@ -1081,7 +1081,7 @@ DCOPClient *KApplication::dcopClient()
   return s_DCOPClient;
 }
 
-void KApplication::dcopClientPostInit()
+void TDEApplication::dcopClientPostInit()
 {
   if( s_dcopClientNeedsPostInit )
     {
@@ -1092,7 +1092,7 @@ void KApplication::dcopClientPostInit()
     }
 }
 
-void KApplication::dcopAutoRegistration()
+void TDEApplication::dcopAutoRegistration()
 {
   if (autoDcopRegistration)
      {
@@ -1102,31 +1102,31 @@ void KApplication::dcopAutoRegistration()
      }
 }
 
-void KApplication::disableAutoDcopRegistration()
+void TDEApplication::disableAutoDcopRegistration()
 {
   autoDcopRegistration = false;
 }
 
-KConfig* KApplication::sessionConfig()
+TDEConfig* TDEApplication::sessionConfig()
 {
     if (pSessionConfig)
         return pSessionConfig;
 
     // create an instance specific config object
-    pSessionConfig = new KConfig( sessionConfigName(), false, false);
+    pSessionConfig = new TDEConfig( sessionConfigName(), false, false);
     return pSessionConfig;
 }
 
-void KApplication::ref()
+void TDEApplication::ref()
 {
     d->refCount++;
-    //kdDebug() << "KApplication::ref() : refCount = " << d->refCount << endl;
+    //kdDebug() << "TDEApplication::ref() : refCount = " << d->refCount << endl;
 }
 
-void KApplication::deref()
+void TDEApplication::deref()
 {
     d->refCount--;
-    //kdDebug() << "KApplication::deref() : refCount = " << d->refCount << endl;
+    //kdDebug() << "TDEApplication::deref() : refCount = " << d->refCount << endl;
     if ( d->refCount <= 0 )
         quit();
 }
@@ -1153,11 +1153,11 @@ bool KSessionManaged::commitData(TQSessionManager&)
 }
 
 
-void KApplication::disableSessionManagement() {
+void TDEApplication::disableSessionManagement() {
   bSessionManagement = false;
 }
 
-void KApplication::enableSessionManagement() {
+void TDEApplication::enableSessionManagement() {
   bSessionManagement = true;
 #ifdef Q_WS_X11
   // Session management support in Qt/TDE is awfully broken.
@@ -1181,7 +1181,7 @@ void KApplication::enableSessionManagement() {
 }
 
 
-bool KApplication::requestShutDown(
+bool TDEApplication::requestShutDown(
     ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode )
 {
 #ifdef Q_WS_X11
@@ -1244,7 +1244,7 @@ bool KApplication::requestShutDown(
 #endif
 }
 
-void KApplication::propagateSessionManager()
+void TDEApplication::propagateSessionManager()
 {
 #ifdef Q_WS_X11
     TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
@@ -1279,7 +1279,7 @@ void KApplication::propagateSessionManager()
 #endif
 }
 
-void KApplication::commitData( TQSessionManager& sm )
+void TDEApplication::commitData( TQSessionManager& sm )
 {
     d->session_save = true;
     bool canceled = false;
@@ -1297,7 +1297,7 @@ void KApplication::commitData( TQSessionManager& sm )
         bool canceled = false;
         TQWidget* w = list->first();
         while ( !canceled && w ) {
-            if ( !w->testWState( WState_ForceHide ) && !w->inherits("KMainWindow") ) {
+            if ( !w->testWState( WState_ForceHide ) && !w->inherits("TDEMainWindow") ) {
                 TQCloseEvent e;
                 sendEvent( w, &e );
                 canceled = !e.isAccepted();
@@ -1346,13 +1346,13 @@ static void checkRestartVersion( TQSessionManager& sm )
             }
         }
     }
-    TQString wrapper = KStandardDirs::findExe( "trinity" );
+    TQString wrapper = TDEStandardDirs::findExe( "trinity" );
     TQStringList restartCommand = sm.restartCommand();
     restartCommand.prepend( wrapper );
     sm.setRestartCommand( restartCommand );
 }
 
-void KApplication::saveState( TQSessionManager& sm )
+void TDEApplication::saveState( TQSessionManager& sm )
 {
     d->session_save = true;
 #ifdef Q_WS_X11
@@ -1434,26 +1434,26 @@ void KApplication::saveState( TQSessionManager& sm )
     d->session_save = false;
 }
 
-bool KApplication::sessionSaving() const
+bool TDEApplication::sessionSaving() const
 {
     return d->session_save;
 }
 
-void KApplication::startKdeinit()
+void TDEApplication::startKdeinit()
 {
 #ifndef Q_WS_WIN //TODO
-  KInstance inst( "starttdeinitlock" );
-  KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
-  if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
+  TDEInstance inst( "starttdeinitlock" );
+  TDELockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
+  if( lock.lock( TDELockFile::LockNoBlock ) != TDELockFile::LockOK ) {
      lock.lock();
      DCOPClient cl;
      if( cl.attach())
          return; // whoever held the lock has already started dcopserver
   }
   // Try to launch tdeinit.
-  TQString srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"));
+  TQString srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"));
   if (srv.isEmpty())
-     srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
+     srv = TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit"), TDEGlobal::dirs()->kfsstnd_defaultbindir());
   if (srv.isEmpty())
      return;
   if (kapp && (Tty != kapp->type()))
@@ -1464,7 +1464,7 @@ void KApplication::startKdeinit()
 #endif
 }
 
-void KApplication::dcopFailure(const TQString &msg)
+void TDEApplication::dcopFailure(const TQString &msg)
 {
   static int failureCount = 0;
   failureCount++;
@@ -1476,8 +1476,8 @@ void KApplication::dcopFailure(const TQString &msg)
   if (failureCount == 2)
   {
 #ifdef Q_WS_WIN
-     KGlobal::config()->setGroup("General");
-     if (KGlobal::config()->readBoolEntry("ignoreDCOPFailures", false))
+     TDEGlobal::config()->setGroup("General");
+     if (TDEGlobal::config()->readBoolEntry("ignoreDCOPFailures", false))
          return;
 #endif
      TQString msgStr(i18n("There was an error setting up inter-process "
@@ -1505,7 +1505,7 @@ void KApplication::dcopFailure(const TQString &msg)
   }
 }
 
-static const KCmdLineOptions qt_options[] =
+static const TDECmdLineOptions qt_options[] =
 {
   //FIXME: Check if other options are specific to Qt/X11
 #ifdef Q_WS_X11
@@ -1539,10 +1539,10 @@ static const KCmdLineOptions qt_options[] =
    { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0},
 #endif
    { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0},
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
-static const KCmdLineOptions kde_options[] =
+static const TDECmdLineOptions kde_options[] =
 {
    { "caption <caption>",       I18N_NOOP("Use 'caption' as name in the titlebar"), 0},
    { "icon <icon>",             I18N_NOOP("Use 'icon' as the application icon"), 0},
@@ -1556,19 +1556,19 @@ static const KCmdLineOptions kde_options[] =
    { "smkey <sessionKey>", 0, 0}, // this option is obsolete and exists only to allow smooth upgrades from sessions
                                   // saved under Qt 3.0.x -- Qt 3.1.x includes the session key now automatically in
 				  // the session id (Simon)
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 void
-KApplication::addCmdLineOptions()
+TDEApplication::addCmdLineOptions()
 {
-   KCmdLineArgs::addCmdLineOptions(qt_options, "Qt", "qt");
-   KCmdLineArgs::addCmdLineOptions(kde_options, "TDE", "tde");
+   TDECmdLineArgs::addCmdLineOptions(qt_options, "Qt", "qt");
+   TDECmdLineArgs::addCmdLineOptions(kde_options, "TDE", "tde");
 }
 
-void KApplication::parseCommandLine( )
+void TDEApplication::parseCommandLine( )
 {
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs("tde");
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("tde");
 
     if ( !args ) return;
 
@@ -1581,7 +1581,7 @@ void KApplication::parseCommandLine( )
     if (args->isSet("style"))
     {
 
-        TQStringList plugins = KGlobal::dirs()->resourceDirs( "qtplugins" );
+        TQStringList plugins = TDEGlobal::dirs()->resourceDirs( "qtplugins" );
         TQStringList::Iterator itp = plugins.begin();
         while (itp != plugins.end()) {
             addLibraryPath( *itp );
@@ -1646,10 +1646,10 @@ void KApplication::parseCommandLine( )
     if (!nocrashhandler && args->isSet("crashhandler"))
     {
         // set default crash handler / set emergency save function to nothing
-        KCrash::setCrashHandler(KCrash::defaultCrashHandler);
-        KCrash::setEmergencySaveFunction(NULL);
+        TDECrash::setCrashHandler(TDECrash::defaultCrashHandler);
+        TDECrash::setEmergencySaveFunction(NULL);
 
-        KCrash::setApplicationName(TQString(args->appName()));
+        TDECrash::setApplicationName(TQString(args->appName()));
     }
 
 #ifdef Q_WS_X11
@@ -1686,12 +1686,12 @@ void KApplication::parseCommandLine( )
 
 }
 
-TQString KApplication::geometryArgument() const
+TQString TDEApplication::geometryArgument() const
 {
     return d->geometry_arg;
 }
 
-TQPixmap KApplication::icon() const
+TQPixmap TDEApplication::icon() const
 {
   if( !aIconPixmap.pm.icon) {
       aIconPixmap.pm.icon = new TQPixmap;
@@ -1702,12 +1702,12 @@ TQPixmap KApplication::icon() const
   return *aIconPixmap.pm.icon;
 }
 
-TQString KApplication::iconName() const
+TQString TDEApplication::iconName() const
 {
   return aIconName.isNull() ? (TQString)instanceName() : aIconName;
 }
 
-TQPixmap KApplication::miniIcon() const
+TQPixmap TDEApplication::miniIcon() const
 {
   if (!aIconPixmap.pm.miniIcon) {
       aIconPixmap.pm.miniIcon = new TQPixmap;
@@ -1718,14 +1718,14 @@ TQPixmap KApplication::miniIcon() const
   return *aIconPixmap.pm.miniIcon;
 }
 
-TQString KApplication::miniIconName() const
+TQString TDEApplication::miniIconName() const
 {
   return aMiniIconName.isNull() ? (TQString)instanceName() : aMiniIconName;
 }
 
 extern void kDebugCleanup();
 
-KApplication::~KApplication()
+TDEApplication::~TDEApplication()
 {
   delete aIconPixmap.pm.miniIcon;
   aIconPixmap.pm.miniIcon = 0L;
@@ -1736,7 +1736,7 @@ KApplication::~KApplication()
   // First call the static deleters and then call KLibLoader::cleanup()
   // The static deleters may delete libraries for which they need KLibLoader.
   // KLibLoader will take care of the remaining ones.
-  KGlobal::deleteStaticDeleters();
+  TDEGlobal::deleteStaticDeleters();
   KLibLoader::cleanUp();
 
   delete smw;
@@ -1745,7 +1745,7 @@ KApplication::~KApplication()
   delete s_DCOPClient;
   s_DCOPClient = 0L;
 
-  KProcessController::deref();
+  TDEProcessController::deref();
 
 #ifdef Q_WS_X11
   if ( d->oldXErrorHandler != NULL )
@@ -1784,7 +1784,7 @@ public:
 #endif
 
 #if defined(Q_WS_X11) && defined(COMPOSITE)
-bool KApplication::isCompositionManagerAvailable() {
+bool TDEApplication::isCompositionManagerAvailable() {
 	bool have_manager = false;
 	const char *home;
 	struct passwd *p;
@@ -1816,14 +1816,14 @@ bool KApplication::isCompositionManagerAvailable() {
 	return have_manager;
 }
 
-bool KApplication::detectCompositionManagerAvailable(bool force_available, bool available) {
+bool TDEApplication::detectCompositionManagerAvailable(bool force_available, bool available) {
 	bool compositing_manager_available;
 	if (force_available) {
 		compositing_manager_available = available;
 	}
 	else {
 		// See if compositing has been enabled
-		KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
+		TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
 		char *displayname = 0;
 		if ( qtargs->isSet("display"))
 			displayname = qtargs->getOption( "display" ).data();
@@ -1895,8 +1895,8 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available, bool
 	return compositing_manager_available;
 }
 
-Display* KApplication::openX11RGBADisplay() {
-	KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
+Display* TDEApplication::openX11RGBADisplay() {
+	TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
 	char *display = 0;
 	if ( qtargs->isSet("display"))
 		display = qtargs->getOption( "display" ).data();
@@ -1910,9 +1910,9 @@ Display* KApplication::openX11RGBADisplay() {
 	return dpy;
 }
 
-Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) {
+Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
 	getX11RGBAInformation(dpy);
-	if (KApplication::isCompositionManagerAvailable() == true) {
+	if (TDEApplication::isCompositionManagerAvailable() == true) {
 		return argb_x11_visual;
 	}
 	else {
@@ -1920,9 +1920,9 @@ Qt::HANDLE KApplication::getX11RGBAVisual(Display *dpy) {
 	}
 }
 
-Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) {
+Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
 	getX11RGBAInformation(dpy);
-	if (KApplication::isCompositionManagerAvailable() == true) {
+	if (TDEApplication::isCompositionManagerAvailable() == true) {
 		return argb_x11_colormap;
 	}
 	else {
@@ -1930,11 +1930,11 @@ Qt::HANDLE KApplication::getX11RGBAColormap(Display *dpy) {
 	}
 }
 
-bool KApplication::isX11CompositionAvailable() {
+bool TDEApplication::isX11CompositionAvailable() {
 	return (argb_visual & isCompositionManagerAvailable());
 }
 
-void KApplication::getX11RGBAInformation(Display *dpy) {
+void TDEApplication::getX11RGBAInformation(Display *dpy) {
 	if ( !dpy ) {
 		argb_visual = false;
 		return;
@@ -1976,14 +1976,14 @@ void KApplication::getX11RGBAInformation(Display *dpy) {
 	return;
 }
 #else
-void KApplication::getX11RGBAInformation(Display *dpy) {
+void TDEApplication::getX11RGBAInformation(Display *dpy) {
 }
 
-bool KApplication::isCompositionManagerAvailable() {
+bool TDEApplication::isCompositionManagerAvailable() {
 	return false;
 }
 
-bool KApplication::detectCompositionManagerAvailable(bool force_available) {
+bool TDEApplication::detectCompositionManagerAvailable(bool force_available) {
 	const char *home;
 	struct passwd *p;
 	p = getpwuid(getuid());
@@ -2021,36 +2021,36 @@ bool KApplication::detectCompositionManagerAvailable(bool force_available) {
 	return false;
 }
 
-Display* KApplication::openX11RGBADisplay() {
+Display* TDEApplication::openX11RGBADisplay() {
 	return 0;
 }
 
-Qt::HANDLE KApplication::getX11RGBAVisual(char *display) {
+Qt::HANDLE TDEApplication::getX11RGBAVisual(char *display) {
 	return 0;
 }
 
-Qt::HANDLE KApplication::getX11RGBAColormap(char *display) {
+Qt::HANDLE TDEApplication::getX11RGBAColormap(char *display) {
 	return 0;
 }
 
-bool KApplication::isX11CompositionAvailable() {
+bool TDEApplication::isX11CompositionAvailable() {
 	return false;
 }
 
-KApplication KApplication::KARGBApplication( bool allowStyles ) {
-	return KApplication::KApplication(allowStyles, true);
+TDEApplication TDEApplication::KARGBApplication( bool allowStyles ) {
+	return TDEApplication::TDEApplication(allowStyles, true);
 }
 #endif
 
 static bool kapp_block_user_input = false;
 
-void KApplication::dcopBlockUserInput( bool b )
+void TDEApplication::dcopBlockUserInput( bool b )
 {
     kapp_block_user_input = b;
 }
 
 #ifdef Q_WS_X11
-bool KApplication::x11EventFilter( XEvent *_event )
+bool TDEApplication::x11EventFilter( XEvent *_event )
 {
     switch ( _event->type ) {
         case ClientMessage:
@@ -2123,25 +2123,25 @@ bool KApplication::x11EventFilter( XEvent *_event )
             switch (id)
             {
             case KIPC::StyleChanged:
-                KGlobal::config()->reparseConfiguration();
-                kdisplaySetStyle();
+                TDEGlobal::config()->reparseConfiguration();
+                tdedisplaySetStyle();
                 break;
 
             case KIPC::ToolbarStyleChanged:
-                KGlobal::config()->reparseConfiguration();
+                TDEGlobal::config()->reparseConfiguration();
                 if (useStyles)
                     emit toolbarAppearanceChanged(arg);
                 break;
 
             case KIPC::PaletteChanged:
-                KGlobal::config()->reparseConfiguration();
-                kdisplaySetPalette();
+                TDEGlobal::config()->reparseConfiguration();
+                tdedisplaySetPalette();
                 break;
 
             case KIPC::FontChanged:
-                KGlobal::config()->reparseConfiguration();
-                KGlobalSettings::rereadFontSettings();
-                kdisplaySetFont();
+                TDEGlobal::config()->reparseConfiguration();
+                TDEGlobalSettings::rereadFontSettings();
+                tdedisplaySetFont();
                 break;
 
             case KIPC::BackgroundChanged:
@@ -2149,28 +2149,28 @@ bool KApplication::x11EventFilter( XEvent *_event )
                 break;
 
             case KIPC::SettingsChanged:
-                KGlobal::config()->reparseConfiguration();
+                TDEGlobal::config()->reparseConfiguration();
                 if (arg == SETTINGS_PATHS)
-                    KGlobalSettings::rereadPathSettings();
+                    TDEGlobalSettings::rereadPathSettings();
                 else if (arg == SETTINGS_MOUSE)
-                    KGlobalSettings::rereadMouseSettings();
+                    TDEGlobalSettings::rereadMouseSettings();
                 propagateSettings((SettingsCategory)arg);
                 break;
 
             case KIPC::IconChanged:
                 TQPixmapCache::clear();
-                KGlobal::config()->reparseConfiguration();
-                KGlobal::instance()->newIconLoader();
+                TDEGlobal::config()->reparseConfiguration();
+                TDEGlobal::instance()->newIconLoader();
                 emit updateIconLoaders();
                 emit iconChanged(arg);
                 break;
 
             case KIPC::ClipboardConfigChanged:
-                KClipboardSynchronizer::newConfiguration(arg);
+                TDEClipboardSynchronizer::newConfiguration(arg);
                 break;
                 
             case KIPC::BlockShortcuts:
-                KGlobalAccel::blockShortcuts(arg);
+                TDEGlobalAccel::blockShortcuts(arg);
                 emit kipcMessage(id, arg); // some apps may do additional things
                 break;
             }
@@ -2185,7 +2185,7 @@ bool KApplication::x11EventFilter( XEvent *_event )
 }
 #endif // Q_WS_X11
 
-void KApplication::updateUserTimestamp( unsigned long time )
+void TDEApplication::updateUserTimestamp( unsigned long time )
 {
 #if defined Q_WS_X11
     if( time == 0 )
@@ -2205,7 +2205,7 @@ void KApplication::updateUserTimestamp( unsigned long time )
 #endif
 }
 
-unsigned long KApplication::userTimestamp() const
+unsigned long TDEApplication::userTimestamp() const
 {
 #if defined Q_WS_X11
     return GET_QT_X_USER_TIME();
@@ -2214,7 +2214,7 @@ unsigned long KApplication::userTimestamp() const
 #endif
 }
 
-void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time )
+void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time )
 {
 #if defined Q_WS_X11
     if( time == 0 )
@@ -2223,7 +2223,7 @@ void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned
 #endif
 }
 
-void KApplication::invokeEditSlot( const char *slot )
+void TDEApplication::invokeEditSlot( const char *slot )
 {
   TQObject *object = TQT_TQOBJECT(focusWidget());
   if( !object )
@@ -2238,7 +2238,7 @@ void KApplication::invokeEditSlot( const char *slot )
   object->tqt_invoke( idx, 0 );
 }
 
-void KApplication::addKipcEventMask(int id)
+void TDEApplication::addKipcEventMask(int id)
 {
     if (id >= 32)
     {
@@ -2248,7 +2248,7 @@ void KApplication::addKipcEventMask(int id)
     kipcEventMask |= (1 << id);
 }
 
-void KApplication::removeKipcEventMask(int id)
+void TDEApplication::removeKipcEventMask(int id)
 {
     if (id >= 32)
     {
@@ -2258,7 +2258,7 @@ void KApplication::removeKipcEventMask(int id)
     kipcEventMask &= ~(1 << id);
 }
 
-void KApplication::enableStyles()
+void TDEApplication::enableStyles()
 {
     if (!useStyles)
     {
@@ -2267,17 +2267,17 @@ void KApplication::enableStyles()
     }
 }
 
-void KApplication::disableStyles()
+void TDEApplication::disableStyles()
 {
     useStyles = false;
 }
 
-void KApplication::applyGUIStyle()
+void TDEApplication::applyGUIStyle()
 {
     if ( !useStyles ) return;
 
-    KConfigGroup pConfig (KGlobal::config(), "General");
-    TQString defaultStyle = KStyle::defaultStyle();
+    TDEConfigGroup pConfig (TDEGlobal::config(), "General");
+    TQString defaultStyle = TDEStyle::defaultStyle();
     TQString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
 
     if (d->overrideStyle.isEmpty()) {
@@ -2296,18 +2296,18 @@ void KApplication::applyGUIStyle()
     else
         setStyle(d->overrideStyle);
     // Reread palette from config file.
-    kdisplaySetPalette();
+    tdedisplaySetPalette();
 }
 
-TQString KApplication::caption() const
+TQString TDEApplication::caption() const
 {
   // Caption set from command line ?
   if( !aCaption.isNull() )
         return aCaption;
   else
       // We have some about data ?
-      if ( KGlobal::instance()->aboutData() )
-        return KGlobal::instance()->aboutData()->programName();
+      if ( TDEGlobal::instance()->aboutData() )
+        return TDEGlobal::instance()->aboutData()->programName();
       else
         // Last resort : application name
         return name();
@@ -2318,7 +2318,7 @@ TQString KApplication::caption() const
 // 1999-09-20: Espen Sand
 // An attempt to simplify consistent captions.
 //
-TQString KApplication::makeStdCaption( const TQString &userCaption,
+TQString TDEApplication::makeStdCaption( const TQString &userCaption,
                                       bool withAppName, bool modified ) const
 {
   TQString s = userCaption.isEmpty() ? caption() : userCaption;
@@ -2337,14 +2337,14 @@ TQString KApplication::makeStdCaption( const TQString &userCaption,
   return s;
 }
 
-TQPalette KApplication::createApplicationPalette()
+TQPalette TDEApplication::createApplicationPalette()
 {
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver saver( config, "General" );
-    return createApplicationPalette( config, KGlobalSettings::contrast() );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver saver( config, "General" );
+    return createApplicationPalette( config, TDEGlobalSettings::contrast() );
 }
 
-TQPalette KApplication::createApplicationPalette( KConfig *config, int contrast_ )
+TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contrast_ )
 {
     TQColor trinity4Background( 239, 239, 239 );
     TQColor trinity4Blue( 103,141,178 );
@@ -2435,57 +2435,57 @@ TQPalette KApplication::createApplicationPalette( KConfig *config, int contrast_
 }
 
 
-void KApplication::kdisplaySetPalette()
+void TDEApplication::tdedisplaySetPalette()
 {
 #ifdef Q_WS_MACX
     //Can I have this on other platforms, please!? --Sam
     {
-        KConfig *config = KGlobal::config();
-        KConfigGroupSaver saver( config, "General" );
+        TDEConfig *config = TDEGlobal::config();
+        TDEConfigGroupSaver saver( config, "General" );
         bool do_not_set_palette = FALSE;
         if(config->readBoolEntry("nopaletteChange", &do_not_set_palette))
             return;
     }
 #endif
     TQApplication::setPalette( createApplicationPalette(), true);
-    emit kdisplayPaletteChanged();
+    emit tdedisplayPaletteChanged();
     emit appearanceChanged();
 }
 
 
-void KApplication::kdisplaySetFont()
+void TDEApplication::tdedisplaySetFont()
 {
-    TQApplication::setFont(KGlobalSettings::generalFont(), true);
-    TQApplication::setFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
-    TQApplication::setFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
-    TQApplication::setFont(KGlobalSettings::menuFont(), true, "KPopupTitle");
+    TQApplication::setFont(TDEGlobalSettings::generalFont(), true);
+    TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
+    TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
+    TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TDEPopupTitle");
 
     // "patch" standard TQStyleSheet to follow our fonts
     TQStyleSheet* sheet = TQStyleSheet::defaultSheet();
-    sheet->item ("pre")->setFontFamily (KGlobalSettings::fixedFont().family());
-    sheet->item ("code")->setFontFamily (KGlobalSettings::fixedFont().family());
-    sheet->item ("tt")->setFontFamily (KGlobalSettings::fixedFont().family());
+    sheet->item ("pre")->setFontFamily (TDEGlobalSettings::fixedFont().family());
+    sheet->item ("code")->setFontFamily (TDEGlobalSettings::fixedFont().family());
+    sheet->item ("tt")->setFontFamily (TDEGlobalSettings::fixedFont().family());
 
-    emit kdisplayFontChanged();
+    emit tdedisplayFontChanged();
     emit appearanceChanged();
 }
 
 
-void KApplication::kdisplaySetStyle()
+void TDEApplication::tdedisplaySetStyle()
 {
     if (useStyles)
     {
         applyGUIStyle();
-        emit kdisplayStyleChanged();
+        emit tdedisplayStyleChanged();
         emit appearanceChanged();
     }
 }
 
 
-void KApplication::propagateSettings(SettingsCategory arg)
+void TDEApplication::propagateSettings(SettingsCategory arg)
 {
-    KConfigBase* config = KGlobal::config();
-    KConfigGroupSaver saver( config, "KDE" );
+    TDEConfigBase* config = TDEGlobal::config();
+    TDEConfigGroupSaver saver( config, "KDE" );
 
 #ifdef QT_HAVE_MAX_IMAGE_SIZE
     TQSize maxImageSize(4096, 4096);
@@ -2524,7 +2524,7 @@ void KApplication::propagateSettings(SettingsCategory arg)
     emit settingsChanged(arg);
 }
 
-void KApplication::installKDEPropertyMap()
+void TDEApplication::installKDEPropertyMap()
 {
 #ifndef QT_NO_SQL
     static bool installed = false;
@@ -2532,7 +2532,7 @@ void KApplication::installKDEPropertyMap()
     installed = true;
     /**
      * If you are adding a widget that was missing please
-     * make sure to also add it to KConfigDialogManager's retrieveSettings()
+     * make sure to also add it to TDEConfigDialogManager's retrieveSettings()
      * function.
      * Thanks.
      */
@@ -2544,11 +2544,11 @@ void KApplication::installKDEPropertyMap()
     kdeMap->insert( "KDateWidget", "date" );
     kdeMap->insert( "KDateTimeWidget", "dateTime" );
     kdeMap->insert( "KEditListBox", "items" );
-    kdeMap->insert( "KFontCombo", "family" );
-    kdeMap->insert( "KFontRequester", "font" );
-    kdeMap->insert( "KFontChooser", "font" );
+    kdeMap->insert( "TDEFontCombo", "family" );
+    kdeMap->insert( "TDEFontRequester", "font" );
+    kdeMap->insert( "TDEFontChooser", "font" );
     kdeMap->insert( "KHistoryCombo", "currentItem" );
-    kdeMap->insert( "KListBox", "currentItem" );
+    kdeMap->insert( "TDEListBox", "currentItem" );
     kdeMap->insert( "KLineEdit", "text" );
     kdeMap->insert( "KRestrictedLine", "text" );
     kdeMap->insert( "KSqueezedTextLabel", "text" );
@@ -2566,7 +2566,7 @@ void KApplication::installKDEPropertyMap()
 #endif
 }
 
-void KApplication::invokeHelp( const TQString& anchor,
+void TDEApplication::invokeHelp( const TQString& anchor,
                                const TQString& _appname) const
 {
     return invokeHelp( anchor, _appname, "" );
@@ -2575,7 +2575,7 @@ void KApplication::invokeHelp( const TQString& anchor,
 #ifndef Q_WS_WIN
 // for win32 we're using simple help tools like Qt Assistant,
 // see kapplication_win.cpp
-void KApplication::invokeHelp( const TQString& anchor,
+void TDEApplication::invokeHelp( const TQString& anchor,
                                const TQString& _appname,
                                const TQCString& startup_id ) const
 {
@@ -2609,7 +2609,7 @@ void KApplication::invokeHelp( const TQString& anchor,
 }
 #endif
 
-void KApplication::invokeHTMLHelp( const TQString& _filename, const TQString& topic ) const
+void TDEApplication::invokeHTMLHelp( const TQString& _filename, const TQString& topic ) const
 {
    kdWarning() << "invoking HTML help is deprecated! use docbook and invokeHelp!\n";
 
@@ -2644,28 +2644,28 @@ void KApplication::invokeHTMLHelp( const TQString& _filename, const TQString& to
 }
 
 
-void KApplication::invokeMailer(const TQString &address, const TQString &subject)
+void TDEApplication::invokeMailer(const TQString &address, const TQString &subject)
 {
     return invokeMailer(address,subject,"");
 }
 
-void KApplication::invokeMailer(const TQString &address, const TQString &subject, const TQCString& startup_id)
+void TDEApplication::invokeMailer(const TQString &address, const TQString &subject, const TQCString& startup_id)
 {
    invokeMailer(address, TQString::null, TQString::null, subject, TQString::null, TQString::null,
        TQStringList(), startup_id );
 }
 
-void KApplication::invokeMailer(const KURL &mailtoURL)
+void TDEApplication::invokeMailer(const KURL &mailtoURL)
 {
     return invokeMailer( mailtoURL, "" );
 }
 
-void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id )
+void TDEApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id )
 {
     return invokeMailer( mailtoURL, startup_id, false);
 }
 
-void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id, bool allowAttachments )
+void TDEApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_id, bool allowAttachments )
 {
    TQString address = KURL::decode_string(mailtoURL.path()), subject, cc, bcc, body;
    TQStringList queries = TQStringList::split('&', mailtoURL.query().mid(1));
@@ -2698,7 +2698,7 @@ void KApplication::invokeMailer(const KURL &mailtoURL, const TQCString& startup_
    invokeMailer( address, cc, bcc, subject, body, TQString::null, attachURLs, startup_id );
 }
 
-void KApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc,
+void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const TQString &bcc,
                                 const TQString &subject, const TQString &body,
                                 const TQString & messageFile, const TQStringList &attachURLs)
 {
@@ -2780,12 +2780,12 @@ static TQStringList splitEmailAddressList( const TQString & aStr )
   return list;
 }
 
-void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString &_bcc,
+void TDEApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString &_bcc,
                                 const TQString &subject, const TQString &body,
                                 const TQString & /*messageFile TODO*/, const TQStringList &attachURLs,
                                 const TQCString& startup_id )
 {
-   KConfig config("emaildefaults");
+   TDEConfig config("emaildefaults");
 
    config.setGroup("Defaults");
    TQString group = config.readEntry("Profile","Default");
@@ -2821,7 +2821,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
 
    if (config.readBoolEntry("TerminalClient", false))
    {
-     KConfigGroup confGroup( KGlobal::config(), "General" );
+     TDEConfigGroup confGroup( TDEGlobal::config(), "General" );
      TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", "konsole");
      command = preferredTerminal + " -e " + command;
    }
@@ -2913,7 +2913,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
 }
 #endif
 
-void KApplication::invokeBrowser( const TQString &url )
+void TDEApplication::invokeBrowser( const TQString &url )
 {
     return invokeBrowser( url, "" );
 }
@@ -2921,7 +2921,7 @@ void KApplication::invokeBrowser( const TQString &url )
 #ifndef Q_WS_WIN
 // on win32, for invoking browser we're using win32 API
 // see kapplication_win.cpp
-void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
+void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
 {
    TQString error;
 
@@ -2937,40 +2937,40 @@ void KApplication::invokeBrowser( const TQString &url, const TQCString& startup_
 }
 #endif
 
-void KApplication::cut()
+void TDEApplication::cut()
 {
   invokeEditSlot( TQT_SLOT( cut() ) );
 }
 
-void KApplication::copy()
+void TDEApplication::copy()
 {
   invokeEditSlot( TQT_SLOT( copy() ) );
 }
 
-void KApplication::paste()
+void TDEApplication::paste()
 {
   invokeEditSlot( TQT_SLOT( paste() ) );
 }
 
-void KApplication::clear()
+void TDEApplication::clear()
 {
   invokeEditSlot( TQT_SLOT( clear() ) );
 }
 
-void KApplication::selectAll()
+void TDEApplication::selectAll()
 {
   invokeEditSlot( TQT_SLOT( selectAll() ) );
 }
 
-void KApplication::broadcastKeyCode(unsigned int keyCode)
+void TDEApplication::broadcastKeyCode(unsigned int keyCode)
 {
   emit coreFakeKeyPress(keyCode);
 }
 
 TQCString
-KApplication::launcher()
+TDEApplication::launcher()
 {
-   return "klauncher";
+   return "tdelauncher";
 }
 
 static int
@@ -3010,7 +3010,7 @@ startServiceInternal( const TQCString &function,
    stream << _name << URLs;
    TQCString replyType;
    TQByteArray replyData;
-   TQCString _launcher = KApplication::launcher();
+   TQCString _launcher = TDEApplication::launcher();
    TQValueList<TQCString> envs;
 #ifdef Q_WS_X11
    if (tqt_xdisplay()) {
@@ -3024,7 +3024,7 @@ startServiceInternal( const TQCString &function,
    stream << envs;
 #if defined Q_WS_X11
    // make sure there is id, so that user timestamp exists
-   stream << ( startup_id.isEmpty() ? KStartupInfo::createNewStartupId() : startup_id );
+   stream << ( startup_id.isEmpty() ? TDEStartupInfo::createNewStartupId() : startup_id );
 #endif
    if( function.left( 12 ) != "tdeinit_exec" )
        stream << noWait;
@@ -3033,7 +3033,7 @@ startServiceInternal( const TQCString &function,
         function, params, replyType, replyData))
    {
         if (error)
-           *error = i18n("KLauncher could not be reached via DCOP.\n");
+           *error = i18n("TDELauncher could not be reached via DCOP.\n");
         if (!kapp)
            delete dcopClient;
         return -1;
@@ -3057,7 +3057,7 @@ startServiceInternal( const TQCString &function,
 }
 
 int
-KApplication::startServiceByName( const TQString& _name, const TQString &URL,
+TDEApplication::startServiceByName( const TQString& _name, const TQString &URL,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    TQStringList URLs;
@@ -3069,7 +3069,7 @@ KApplication::startServiceByName( const TQString& _name, const TQString &URL,
 }
 
 int
-KApplication::startServiceByName( const TQString& _name, const TQStringList &URLs,
+TDEApplication::startServiceByName( const TQString& _name, const TQStringList &URLs,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    return startServiceInternal(
@@ -3078,7 +3078,7 @@ KApplication::startServiceByName( const TQString& _name, const TQStringList &URL
 }
 
 int
-KApplication::startServiceByDesktopPath( const TQString& _name, const TQString &URL,
+TDEApplication::startServiceByDesktopPath( const TQString& _name, const TQString &URL,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    TQStringList URLs;
@@ -3090,7 +3090,7 @@ KApplication::startServiceByDesktopPath( const TQString& _name, const TQString &
 }
 
 int
-KApplication::startServiceByDesktopPath( const TQString& _name, const TQStringList &URLs,
+TDEApplication::startServiceByDesktopPath( const TQString& _name, const TQStringList &URLs,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    return startServiceInternal(
@@ -3099,7 +3099,7 @@ KApplication::startServiceByDesktopPath( const TQString& _name, const TQStringLi
 }
 
 int
-KApplication::startServiceByDesktopName( const TQString& _name, const TQString &URL,
+TDEApplication::startServiceByDesktopName( const TQString& _name, const TQString &URL,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    TQStringList URLs;
@@ -3111,7 +3111,7 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQString &
 }
 
 int
-KApplication::startServiceByDesktopName( const TQString& _name, const TQStringList &URLs,
+TDEApplication::startServiceByDesktopName( const TQString& _name, const TQStringList &URLs,
                   TQString *error, TQCString *dcopService, int *pid, const TQCString& startup_id, bool noWait )
 {
    return startServiceInternal(
@@ -3120,14 +3120,14 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi
 }
 
 int
-KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
+TDEApplication::tdeinitExec( const TQString& name, const TQStringList &args,
                            TQString *error, int *pid )
 {
     return tdeinitExec( name, args, error, pid, "" );
 }
 
 int
-KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
+TDEApplication::tdeinitExec( const TQString& name, const TQStringList &args,
                            TQString *error, int *pid, const TQCString& startup_id )
 {
    return startServiceInternal("tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
@@ -3135,27 +3135,27 @@ KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
 }
 
 int
-KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
+TDEApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
                            TQString *error, int *pid )
 {
     return tdeinitExecWait( name, args, error, pid, "" );
 }
 
 int
-KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
+TDEApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
                            TQString *error, int *pid, const TQCString& startup_id )
 {
    return startServiceInternal("tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
         name, args, error, 0, pid, startup_id, false);
 }
 
-TQString KApplication::tempSaveName( const TQString& pFilename ) const
+TQString TDEApplication::tempSaveName( const TQString& pFilename ) const
 {
   TQString aFilename;
 
   if( TQDir::isRelativePath(pFilename) )
     {
-      kdWarning(101) << "Relative filename passed to KApplication::tempSaveName" << endl;
+      kdWarning(101) << "Relative filename passed to TDEApplication::tempSaveName" << endl;
       aFilename = TQFileInfo( TQDir( "." ), pFilename ).absFilePath();
     }
   else
@@ -3167,7 +3167,7 @@ TQString KApplication::tempSaveName( const TQString& pFilename ) const
       if( !aAutosaveDir.mkdir( aAutosaveDir.absPath() ) )
         {
           // Last chance: use temp dir
-          aAutosaveDir.setPath( KGlobal::dirs()->saveLocation("tmp") );
+          aAutosaveDir.setPath( TDEGlobal::dirs()->saveLocation("tmp") );
         }
     }
 
@@ -3177,14 +3177,14 @@ TQString KApplication::tempSaveName( const TQString& pFilename ) const
 }
 
 
-TQString KApplication::checkRecoverFile( const TQString& pFilename,
+TQString TDEApplication::checkRecoverFile( const TQString& pFilename,
         bool& bRecover ) const
 {
   TQString aFilename;
 
   if( TQDir::isRelativePath(pFilename) )
     {
-      kdWarning(101) << "Relative filename passed to KApplication::tempSaveName" << endl;
+      kdWarning(101) << "Relative filename passed to TDEApplication::tempSaveName" << endl;
       aFilename = TQFileInfo( TQDir( "." ), pFilename ).absFilePath();
     }
   else
@@ -3196,7 +3196,7 @@ TQString KApplication::checkRecoverFile( const TQString& pFilename,
       if( !aAutosaveDir.mkdir( aAutosaveDir.absPath() ) )
         {
           // Last chance: use temp dir
-          aAutosaveDir.setPath( KGlobal::dirs()->saveLocation("tmp") );
+          aAutosaveDir.setPath( TDEGlobal::dirs()->saveLocation("tmp") );
         }
     }
 
@@ -3249,13 +3249,13 @@ bool checkAccess(const TQString& pathname, int mode)
     return false; // No
 }
 
-void KApplication::setTopWidget( TQWidget *topWidget )
+void TDEApplication::setTopWidget( TQWidget *topWidget )
 {
   if( !topWidget )
       return;
 
     // set the specified caption
-    if ( !topWidget->inherits("KMainWindow") ) { // KMainWindow does this already for us
+    if ( !topWidget->inherits("TDEMainWindow") ) { // TDEMainWindow does this already for us
         topWidget->setCaption( caption() );
     }
 
@@ -3266,21 +3266,21 @@ void KApplication::setTopWidget( TQWidget *topWidget )
     KWin::setIcons(topWidget->winId(), icon(), miniIcon() ); // NET_WM hints for KWin
 
     // set the app startup notification window property
-    KStartupInfo::setWindowStartupId( topWidget->winId(), startupId());
+    TDEStartupInfo::setWindowStartupId( topWidget->winId(), startupId());
 #endif
 }
 
-TQCString KApplication::startupId() const
+TQCString TDEApplication::startupId() const
 {
     return d->startup_id;
 }
 
-void KApplication::setStartupId( const TQCString& startup_id )
+void TDEApplication::setStartupId( const TQCString& startup_id )
 {
     if( startup_id == d->startup_id )
         return;
 #if defined Q_WS_X11
-    KStartupInfo::handleAutoAppStartedSending(); // finish old startup notification if needed
+    TDEStartupInfo::handleAutoAppStartedSending(); // finish old startup notification if needed
 #endif
     if( startup_id.isEmpty())
         d->startup_id = "0";
@@ -3288,7 +3288,7 @@ void KApplication::setStartupId( const TQCString& startup_id )
         {
         d->startup_id = startup_id;
 #if defined Q_WS_X11
-        KStartupInfoId id;
+        TDEStartupInfoId id;
         id.initId( startup_id );
         long timestamp = id.timestamp();
         if( timestamp != 0 )
@@ -3299,16 +3299,16 @@ void KApplication::setStartupId( const TQCString& startup_id )
 
 // read the startup notification env variable, save it and unset it in order
 // not to propagate it to processes started from this app
-void KApplication::read_app_startup_id()
+void TDEApplication::read_app_startup_id()
 {
 #if defined Q_WS_X11
-    KStartupInfoId id = KStartupInfo::currentStartupIdEnv();
-    KStartupInfo::resetStartupEnv();
+    TDEStartupInfoId id = TDEStartupInfo::currentStartupIdEnv();
+    TDEStartupInfo::resetStartupEnv();
     d->startup_id = id.id();
 #endif
 }
 
-int KApplication::random()
+int TDEApplication::random()
 {
    static bool init = false;
    if (!init)
@@ -3328,7 +3328,7 @@ int KApplication::random()
    return rand();
 }
 
-TQString KApplication::randomString(int length)
+TQString TDEApplication::randomString(int length)
 {
    if (length <=0 ) return TQString::null;
 
@@ -3346,39 +3346,39 @@ TQString KApplication::randomString(int length)
    return str;
 }
 
-bool KApplication::authorize(const TQString &genericAction)
+bool TDEApplication::authorize(const TQString &genericAction)
 {
    if (!d->actionRestrictions)
       return true;
 
-   KConfig *config = KGlobal::config();
-   KConfigGroupSaver saver( config, "KDE Action Restrictions" );
+   TDEConfig *config = TDEGlobal::config();
+   TDEConfigGroupSaver saver( config, "KDE Action Restrictions" );
    return config->readBoolEntry(genericAction, true);
 }
 
-bool KApplication::authorizeKAction(const char *action)
+bool TDEApplication::authorizeTDEAction(const char *action)
 {
    if (!d->actionRestrictions || !action)
       return true;
 
-   static const TQString &action_prefix = KGlobal::staticQString( "action/" );
+   static const TQString &action_prefix = TDEGlobal::staticQString( "action/" );
 
    return authorize(action_prefix + action);
 }
 
-bool KApplication::authorizeControlModule(const TQString &menuId)
+bool TDEApplication::authorizeControlModule(const TQString &menuId)
 {
    if (menuId.isEmpty() || kde_kiosk_exception)
       return true;
-   KConfig *config = KGlobal::config();
-   KConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
+   TDEConfig *config = TDEGlobal::config();
+   TDEConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
    return config->readBoolEntry(menuId, true);
 }
 
-TQStringList KApplication::authorizeControlModules(const TQStringList &menuIds)
+TQStringList TDEApplication::authorizeControlModules(const TQStringList &menuIds)
 {
-   KConfig *config = KGlobal::config();
-   KConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
+   TDEConfig *config = TDEGlobal::config();
+   TDEConfigGroupSaver saver( config, "TDE Control Module Restrictions" );
    TQStringList result;
    for(TQStringList::ConstIterator it = menuIds.begin();
        it != menuIds.end(); ++it)
@@ -3389,45 +3389,45 @@ TQStringList KApplication::authorizeControlModules(const TQStringList &menuIds)
    return result;
 }
 
-void KApplication::initUrlActionRestrictions()
+void TDEApplication::initUrlActionRestrictions()
 {
   d->urlActionRestrictions.setAutoDelete(true);
   d->urlActionRestrictions.clear();
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("open", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true));
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("list", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true));
 // TEST:
-//  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+//  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
 //  ("list", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, false));
-//  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+//  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
 //  ("list", TQString::null, TQString::null, TQString::null, "file", TQString::null, TQDir::homeDirPath(), true));
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("link", TQString::null, TQString::null, TQString::null, ":internet", TQString::null, TQString::null, true));
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, ":internet", TQString::null, TQString::null, true));
 
   // We allow redirections to file: but not from internet protocols, redirecting to file:
   // is very popular among io-slaves and we don't want to break them
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, "file", TQString::null, TQString::null, true));
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", ":internet", TQString::null, TQString::null, "file", TQString::null, TQString::null, false));
 
   // local protocols may redirect everywhere
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", ":local", TQString::null, TQString::null, TQString::null, TQString::null, TQString::null, true));
 
   // Anyone may redirect to about:
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, "about", TQString::null, TQString::null, true));
 
   // Anyone may redirect to itself, cq. within it's own group
-  d->urlActionRestrictions.append( new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append( new TDEApplicationPrivate::URLActionRule
   ("redirect", TQString::null, TQString::null, TQString::null, "=", TQString::null, TQString::null, true));
 
-  KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver( config, "KDE URL Restrictions" );
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver( config, "KDE URL Restrictions" );
   int count = config->readNumEntry("rule_count");
   TQString keyFormat = TQString("rule_%1");
   for(int i = 1; i <= count; i++)
@@ -3457,26 +3457,26 @@ void KApplication::initUrlActionRestrictions()
        urlPath.replace(0, 1, TQDir::homeDirPath());
 
     if (refPath.startsWith("$TMP"))
-       refPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
+       refPath.replace(0, 4, TDEGlobal::dirs()->saveLocation("tmp"));
     if (urlPath.startsWith("$TMP"))
-       urlPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp"));
+       urlPath.replace(0, 4, TDEGlobal::dirs()->saveLocation("tmp"));
 
-    d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule
+    d->urlActionRestrictions.append(new TDEApplicationPrivate::URLActionRule
     	( action, refProt, refHost, refPath, urlProt, urlHost, urlPath, bEnabled));
   }
 }
 
-void KApplication::allowURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL)
+void TDEApplication::allowURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL)
 {
   if (authorizeURLAction(action, _baseURL, _destURL))
      return;
 
-  d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule
+  d->urlActionRestrictions.append(new TDEApplicationPrivate::URLActionRule
         ( action, _baseURL.protocol(), _baseURL.host(), _baseURL.path(-1),
                   _destURL.protocol(), _destURL.host(), _destURL.path(-1), true));
 }
 
-bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL)
+bool TDEApplication::authorizeURLAction(const TQString &action, const KURL &_baseURL, const KURL &_destURL)
 {
   if (_destURL.isEmpty())
      return true;
@@ -3492,7 +3492,7 @@ bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseU
   destURL.setPath(TQDir::cleanDirPath(destURL.path()));
   TQString destClass = KProtocolInfo::protocolClass(destURL.protocol());
 
-  for(KApplicationPrivate::URLActionRule *rule = d->urlActionRestrictions.first();
+  for(TDEApplicationPrivate::URLActionRule *rule = d->urlActionRestrictions.first();
       rule; rule = d->urlActionRestrictions.next())
   {
      if ((result != rule->permission) && // No need to check if it doesn't make a difference
@@ -3507,7 +3507,7 @@ bool KApplication::authorizeURLAction(const TQString &action, const KURL &_baseU
 }
 
 
-uint KApplication::keyboardModifiers()
+uint TDEApplication::keyboardModifiers()
 {
 #ifdef Q_WS_X11
     Window root;
@@ -3525,7 +3525,7 @@ uint KApplication::keyboardModifiers()
 #endif
 }
 
-uint KApplication::mouseState()
+uint TDEApplication::mouseState()
 {
     uint mousestate;
 #ifdef Q_WS_X11
@@ -3550,7 +3550,7 @@ uint KApplication::mouseState()
     return mousestate & 0xff00;
 }
 
-TQ_ButtonState KApplication::keyboardMouseState()
+TQ_ButtonState TDEApplication::keyboardMouseState()
 {
     int ret = 0;
 #ifdef Q_WS_X11
@@ -3597,7 +3597,7 @@ TQ_ButtonState KApplication::keyboardMouseState()
     return static_cast< ButtonState >( ret );
 }
 
-void KApplication::installSigpipeHandler()
+void TDEApplication::installSigpipeHandler()
 {
 #ifdef Q_OS_UNIX
     struct sigaction act;
@@ -3608,7 +3608,7 @@ void KApplication::installSigpipeHandler()
 #endif
 }
 
-void KApplication::sigpipeHandler(int)
+void TDEApplication::sigpipeHandler(int)
 {
     int saved_errno = errno;
     // Using kdDebug from a signal handler is not a good idea.
@@ -3624,15 +3624,15 @@ void KApplication::sigpipeHandler(int)
     errno = saved_errno;
 }
 
-bool KApplication::guiEnabled()
+bool TDEApplication::guiEnabled()
 {
     return kapp && kapp->d->guiEnabled;
 }
 
-void KApplication::virtual_hook( int id, void* data )
-{ KInstance::virtual_hook( id, data ); }
+void TDEApplication::virtual_hook( int id, void* data )
+{ TDEInstance::virtual_hook( id, data ); }
 
 void KSessionManaged::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kapplication.moc"
+#include "tdeapplication.moc"
diff --git a/tdecore/kapplication.h b/tdecore/tdeapplication.h
index 2da1e0b82..5ab8d7ee7 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/tdeapplication.h
@@ -25,7 +25,7 @@
 #include "tdeversion.h"
 #include "tdelibs_export.h"
 
-class KConfig;
+class TDEConfig;
 class KCharsets;
 class DCOPClient;
 class DCOPObject;
@@ -45,12 +45,12 @@ struct _IceConn;
 class TQPopupMenu;
 class TQStrList;
 class KSessionManaged;
-class KStyle;
+class TDEStyle;
 class KURL;
 
-#define kapp KApplication::kApplication()
+#define kapp TDEApplication::kApplication()
 
-class KApplicationPrivate;
+class TDEApplicationPrivate;
 
 /**
 * Controls and provides information to all KDE applications.
@@ -63,15 +63,15 @@ class KApplicationPrivate;
 *
 * @li It controls the event queue (see TQApplication ).
 * @li It provides the application with KDE resources such as
-* accelerators, common menu entries, a KConfig object. session
+* accelerators, common menu entries, a TDEConfig object. session
 * management events, help invocation etc.
 * @li Installs a signal handler for the SIGCHLD signal in order to
 * avoid zombie children. If you want to catch this signal yourself or
 * don't want it to be caught at all, you have set a new signal handler
-* (or SIG_IGN) after KApplication's constructor has run.
+* (or SIG_IGN) after TDEApplication's constructor has run.
 * @li Installs an empty signal handler for the SIGPIPE signal using
 * installSigpipeHandler(). If you want to catch this signal
-* yourself, you have set a new signal handler after KApplication's
+* yourself, you have set a new signal handler after TDEApplication's
 * constructor has run.
 * @li It can start new services
 *
@@ -93,7 +93,7 @@ class KApplicationPrivate;
 * @short Controls and provides information to all KDE applications.
 * @author Matthias Kalle Dalheimer <kalle@kde.org>
 */
-class TDECORE_EXPORT KApplication : public TQApplication, public KInstance
+class TDECORE_EXPORT TDEApplication : public TQApplication, public TDEInstance
 {
 
   Q_OBJECT
@@ -111,13 +111,13 @@ public:
 
   /**
    * This constructor takes aboutData and command line
-   *  arguments from KCmdLineArgs.
+   *  arguments from TDECmdLineArgs.
    *
    * If ARGB (transparent) widgets are to be used in your application,
    * please use
-   * KApplication app(KApplication::openX11RGBADisplay());
+   * TDEApplication app(TDEApplication::openX11RGBADisplay());
    * or
-   * KApplication app(KApplication::openX11RGBADisplay(), useStyles);
+   * TDEApplication app(TDEApplication::openX11RGBADisplay(), useStyles);
    *
    * @param allowStyles Set to false to disable the loading on plugin based
    * styles. This is only useful to applications that do not display a GUI
@@ -128,7 +128,7 @@ public:
    * @param GUIenabled Set to false to disable all GUI stuff. This implies
    * no styles either.
    */
-  KApplication( bool allowStyles=true, bool GUIenabled=true);
+  TDEApplication( bool allowStyles=true, bool GUIenabled=true);
 
 #ifdef Q_WS_X11
   /**
@@ -148,7 +148,7 @@ public:
    * 
    * @see RGBADisplay()
    */
-  KApplication(Display *display, bool allowStyles);
+  TDEApplication(Display *display, bool allowStyles);
 
   /**
    * Constructor. Parses command-line arguments. Use this constructor when you
@@ -177,7 +177,7 @@ public:
    * 
    * @see RGBADisplay()
    */
-  KApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles);
+  TDEApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles);
 
   /**
    * Constructor. Parses command-line arguments. Use this constructor when you
@@ -202,11 +202,11 @@ public:
    *
    * @since KDE 3.3
    */
-  KApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0,
+  TDEApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0,
                bool allowStyles=true);
 
   /**
-   * Constructor. Parses command-line arguments. Use this constructor to use KApplication
+   * Constructor. Parses command-line arguments. Use this constructor to use TDEApplication
    * in a Motif or Xt program.
    *
    * @param display Will be passed to Qt as the X display. The display must be valid and already
@@ -229,12 +229,12 @@ public:
    * @param GUIenabled Set to false to disable all GUI stuff. This implies
    * no styles either.
    */
-  KApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
+  TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
                bool allowStyles=true, bool GUIenabled=true);
 #endif
 
   /**
-   * @deprecated do not use it at all, it will make your application crash, use KCmdLineArgs
+   * @deprecated do not use it at all, it will make your application crash, use TDECmdLineArgs
    *
    * Constructor. Parses command-line arguments.
    *
@@ -256,37 +256,37 @@ public:
    * no styles either.
    */
   // REMOVE FOR KDE 4.0 - using it only gives crashing applications because
-  // KCmdLineArgs::init isn't called
- KApplication(int& argc, char** argv,
+  // TDECmdLineArgs::init isn't called
+ TDEApplication(int& argc, char** argv,
               const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true) KDE_DEPRECATED;
 
   /**
-    * Add Qt and KDE command line options to KCmdLineArgs.
+    * Add Qt and KDE command line options to TDECmdLineArgs.
     */
   static void addCmdLineOptions();
 
-  virtual ~KApplication();
+  virtual ~TDEApplication();
 
   /**
    * Returns the current application object.
    *
    * This is similar to the global TQApplication pointer tqApp. It
-   * allows access to the single global KApplication object, since
+   * allows access to the single global TDEApplication object, since
    * more than one cannot be created in the same application. It
    * saves you the trouble of having to pass the pointer explicitly
    * to every function that may require it.
    * @return the current application object
    */
-  static KApplication* kApplication() { return KApp; }
+  static TDEApplication* kApplication() { return KApp; }
 
   /**
    * Returns the application session config object.
    *
    * @return A pointer to the application's instance specific
-   * KConfig object.
-   * @see KConfig
+   * TDEConfig object.
+   * @see TDEConfig
    */
-  KConfig* sessionConfig();
+  TDEConfig* sessionConfig();
 
   /**
    * Is the application restored from the session manager?
@@ -432,10 +432,10 @@ public:
   /**
    * Returns true if the application is currently saving its session
    * data (most probably before KDE logout). This is intended for use
-   * mainly in KMainWindow::queryClose() and KMainWindow::queryExit().
+   * mainly in TDEMainWindow::queryClose() and TDEMainWindow::queryExit().
    *
-   * @see KMainWindow::queryClose
-   * @see KMainWindow::queryExit
+   * @see TDEMainWindow::queryClose
+   * @see TDEMainWindow::queryExit
    * @since 3.1.1
    */
   bool sessionSaving() const;
@@ -450,7 +450,7 @@ public:
 
   /**
    * Disable automatic dcop registration
-   * Must be called before creating a KApplication instance to have an effect.
+   * Must be called before creating a TDEApplication instance to have an effect.
    */
   static void disableAutoDcopRegistration();
 
@@ -482,7 +482,7 @@ public:
    *  Sets the top widget of the application.
    *  This means basically applying the right window caption and
    *  icon. An application may have several top widgets. You don't
-   *  need to call this function manually when using KMainWindow.
+   *  need to call this function manually when using TDEMainWindow.
    *
    *  @param topWidget A top widget of the application.
    *
@@ -627,21 +627,21 @@ public slots:
    * If the widget with focus provides a clear() slot, call that slot.  Thus for a
    * simple application clear() can be implemented as:
    * \code
-   * new KAction( i18n( "Clear" ), "editclear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
+   * new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
    * \endcode
    *
    * Note that for some widgets, this may not provide the intended bahavior.  For
-   * example if you make use of the code above and a KListView has the focus, clear()
+   * example if you make use of the code above and a TDEListView has the focus, clear()
    * will clear all of the items in the list.  If this is not the intened behavior
-   * and you want to make use of this slot, you can subclass KListView and reimplement
-   * this slot.  For example the following code would implement a KListView without this
+   * and you want to make use of this slot, you can subclass TDEListView and reimplement
+   * this slot.  For example the following code would implement a TDEListView without this
    * behavior:
    *
    * \code
-   * class MyListView : public KListView {
+   * class MyListView : public TDEListView {
    *   Q_OBJECT
    * public:
-   *   MyListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : KListView( parent, name, f ) {}
+   *   MyListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : TDEListView( parent, name, f ) {}
    *   virtual ~MyListView() {}
    * public slots:
    *   virtual void clear() {}
@@ -662,7 +662,7 @@ public slots:
   /**
    * Broadcast a received keycode to all listening KDE applications
    * The primary use for this feature is to connect hotkeys such as
-   * XF86Display to their respective KGlobalAccel functions while
+   * XF86Display to their respective TDEGlobalAccel functions while
    * the screen is locked by kdesktop_lock.
    */
   void broadcastKeyCode(unsigned int keyCode);
@@ -872,7 +872,7 @@ public:
   /**
    * @deprecated
    */
-  KDE_DEPRECATED KStyle* kstyle() const { return 0; }
+  KDE_DEPRECATED TDEStyle* kstyle() const { return 0; }
 
   /**
    * Builds a caption that contains the application name along with the
@@ -951,10 +951,10 @@ public:
   /**
    * @internal
    * Opens the display
-   * This can be used to initialize a KApplication with RGBA support like this:
-   * KApplication app(KApplication::openX11RGBADisplay());
+   * This can be used to initialize a TDEApplication with RGBA support like this:
+   * TDEApplication app(TDEApplication::openX11RGBADisplay());
    * or
-   * KApplication app(KApplication::openX11RGBADisplay(), useStyles);
+   * TDEApplication app(TDEApplication::openX11RGBADisplay(), useStyles);
    */
    static Display* openX11RGBADisplay();
 
@@ -978,7 +978,7 @@ public:
    * You must first call getX11RGBAInformation()
    * 
    * Note that getX11RGBAInformation() has already
-   * been called if you used the default KApplication
+   * been called if you used the default TDEApplication
    * constructor.
    *
    * Additionally, at least one application must have called
@@ -994,7 +994,7 @@ public:
    * Enables style plugins.
    *
    * This is useful only to applications that normally
-   * do not display a GUI and create the KApplication with
+   * do not display a GUI and create the TDEApplication with
    * allowStyles set to false.
    */
   void enableStyles();
@@ -1071,7 +1071,7 @@ public:
    * Sets a new value for the application startup notification window property for newly
    * created toplevel windows. 
    * @param startup_id the startup notification identifier
-   * @see KStartupInfo::setNewStartupId
+   * @see TDEStartupInfo::setNewStartupId
    */
   void setStartupId( const TQCString& startup_id );
 
@@ -1121,13 +1121,13 @@ public:
   bool authorize(const TQString &genericAction);
 
   /**
-   * Returns whether a certain KAction is authorized.
+   * Returns whether a certain TDEAction is authorized.
    *
-   * @param action The name of a KAction action. The name is prepended
+   * @param action The name of a TDEAction action. The name is prepended
    * with "action/" before being passed to authorize()
-   * @return true if the KAction is authorized
+   * @return true if the TDEAction is authorized
    */
-  bool authorizeKAction(const char *action);
+  bool authorizeTDEAction(const char *action);
 
   /**
    * Returns whether a certain URL related action is authorized.
@@ -1215,7 +1215,7 @@ public:
 
 public slots:
   /**
-   * Tells KApplication about one more operation that should be finished
+   * Tells TDEApplication about one more operation that should be finished
    * before the application exits. The standard behavior is to exit on the
    * "last window closed" event, but some events should outlive the last window closed
    * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
@@ -1223,7 +1223,7 @@ public slots:
   void ref();
 
   /**
-   * Tells KApplication that one operation such as those described in ref() just finished.
+   * Tells TDEApplication that one operation such as those described in ref() just finished.
    * The application exits if the counter is back to 0.
    */
   void deref();
@@ -1232,14 +1232,14 @@ protected:
   /**
    * @internal Used by KUniqueApplication
    */
-  KApplication( bool allowStyles, bool GUIenabled, KInstance* _instance );
+  TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance );
 
 #ifdef Q_WS_X11
   /**
    * @internal Used by KUniqueApplication
    */
-  KApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap,
-		  bool allowStyles, KInstance* _instance );
+  TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap,
+		  bool allowStyles, TDEInstance* _instance );
 
   /**
    * Used to catch X11 events
@@ -1252,7 +1252,7 @@ protected:
   int kipcEventMask;
 
   /// Current application object.
-  static KApplication *KApp;
+  static TDEApplication *KApp;
   int pArgc;
 
   /**
@@ -1261,8 +1261,8 @@ protected:
    *
    * @param slot is the slot as returned using the TQT_SLOT() macro, for example TQT_SLOT( cut() )
    *
-   * This method can be used in KApplication subclasses to implement application wide
-   * edit actions not supported by the KApplication class.  For example (in your subclass):
+   * This method can be used in TDEApplication subclasses to implement application wide
+   * edit actions not supported by the TDEApplication class.  For example (in your subclass):
    *
    * \code
    * void MyApplication::deselect()
@@ -1272,7 +1272,7 @@ protected:
    * \endcode
    *
    * Now in your application calls to MyApplication::deselect() will call this slot on the
-   * focused widget if it provides this slot.  You can combine this with KAction with:
+   * focused widget if it provides this slot.  You can combine this with TDEAction with:
    *
    * \code
    * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQT_SLOT( cut() ), actionCollection() );
@@ -1296,7 +1296,7 @@ private slots:
 
 private:
   TQString sessionConfigName() const;
-  KConfig* pSessionConfig; //instance specific application config object
+  TDEConfig* pSessionConfig; //instance specific application config object
   static DCOPClient *s_DCOPClient; // app specific application communication client
   static bool s_dcopClientNeedsPostInit;
   TQString aCaption; // the name for the window title
@@ -1315,7 +1315,7 @@ private:
 
   void init( bool GUIenabled );
 
-  void parseCommandLine( ); // Handle KDE arguments (Using KCmdLineArgs)
+  void parseCommandLine( ); // Handle KDE arguments (Using TDECmdLineArgs)
 
   void read_app_startup_id();
 
@@ -1380,13 +1380,13 @@ public:
    * @internal
    * Raw access for use by TDM.
    */
-  static TQPalette createApplicationPalette( KConfig *config, int contrast );
+  static TQPalette createApplicationPalette( TDEConfig *config, int contrast );
 
   /**
    * Installs a handler for the SIGPIPE signal. It is thrown when you write to
    * a pipe or socket that has been closed.
    * The handler is installed automatically in the constructor, but you may
-   * need it if your application or component does not have a KApplication
+   * need it if your application or component does not have a TDEApplication
    * instance.
    */
   static void installSigpipeHandler();
@@ -1401,24 +1401,24 @@ public:
 
 signals:
   /**
-   * Emitted when KApplication has changed its palette due to a KControl request.
+   * Emitted when TDEApplication has changed its palette due to a KControl request.
    *
    * Normally, widgets will update their palette automatically, but you
    * should connect to this to program special behavior.
    */
-  void kdisplayPaletteChanged();
+  void tdedisplayPaletteChanged();
 
   /**
-   * Emitted when KApplication has changed its GUI style in response to a KControl request.
+   * Emitted when TDEApplication has changed its GUI style in response to a KControl request.
    *
    * Normally, widgets will update their styles automatically (as they would
    * respond to an explicit setGUIStyle() call), but you should connect to
    * this to program special behavior.
    */
-  void kdisplayStyleChanged();
+  void tdedisplayStyleChanged();
 
   /**
-   * Emitted when KApplication has changed its font in response to a KControl request.
+   * Emitted when TDEApplication has changed its font in response to a KControl request.
    *
    * Normally widgets will update their fonts automatically, but you should
    * connect to this to monitor global font changes, especially if you are
@@ -1428,17 +1428,17 @@ signals:
    *       reimplement TQWidget::fontChange(). This is the preferred way
    *       to get informed about font updates.
    */
-  void kdisplayFontChanged();
+  void tdedisplayFontChanged();
 
   /**
-   * Emitted when KApplication has changed either its GUI style, its font or its palette
-   * in response to a kdisplay request. Normally, widgets will update their styles
+   * Emitted when TDEApplication has changed either its GUI style, its font or its palette
+   * in response to a tdedisplay request. Normally, widgets will update their styles
    * automatically, but you should connect to this to program special
    * behavior. */
   void appearanceChanged();
 
   /**
-   * Emitted when the settings for toolbars have been changed. KToolBar will know what to do.
+   * Emitted when the settings for toolbars have been changed. TDEToolBar will know what to do.
    */
   void toolbarAppearanceChanged(int);
 
@@ -1450,8 +1450,8 @@ signals:
   void backgroundChanged(int desk);
 
   /**
-   * Emitted when the global settings have been changed - see KGlobalSettings
-   * KApplication takes care of calling reparseConfiguration on KGlobal::config()
+   * Emitted when the global settings have been changed - see TDEGlobalSettings
+   * TDEApplication takes care of calling reparseConfiguration on TDEGlobal::config()
    * so that applications/classes using this only have to re-read the configuration
    * @param category the category among the enum above
    */
@@ -1478,12 +1478,12 @@ signals:
       Session management asks you to save the state of your application.
 
      This signal is provided for compatibility only. For new
-     applications, simply use KMainWindow. By reimplementing 
-     KMainWindow::queryClose(), KMainWindow::saveProperties() and
- KMainWindow::readProperties() you can simply handle session
+     applications, simply use TDEMainWindow. By reimplementing 
+     TDEMainWindow::queryClose(), TDEMainWindow::saveProperties() and
+ TDEMainWindow::readProperties() you can simply handle session
      management for applications with multiple toplevel windows.
 
-     For purposes without KMainWindow, create an instance of
+     For purposes without TDEMainWindow, create an instance of
      KSessionManaged and reimplement the functions 
      KSessionManaged::commitData() and/or 
      KSessionManaged::saveState()
@@ -1494,7 +1494,7 @@ signals:
      manipulate the UI in that slot, it is blocked by the session
      manager.
 
-     Use the sessionConfig() KConfig object to store all your
+     Use the sessionConfig() TDEConfig object to store all your
      instance specific data.
 
      Do not do any closing at this point! The user may still select
@@ -1516,37 +1516,37 @@ signals:
 
   /**
    * @internal
-   * Used to notify KIconLoader objects that they need to reload.
+   * Used to notify TDEIconLoader objects that they need to reload.
    */
   void updateIconLoaders();
 
   /**
    * @internal
-   * Used to send KGlobalAccel objects a new keypress from physical hotkeys.
+   * Used to send TDEGlobalAccel objects a new keypress from physical hotkeys.
    */
   void coreFakeKeyPress(unsigned int keyCode);
 
 private:
   void propagateSettings(SettingsCategory category);
-  void kdisplaySetPalette();
-  void kdisplaySetStyle();
-  void kdisplaySetFont();
+  void tdedisplaySetPalette();
+  void tdedisplaySetStyle();
+  void tdedisplaySetFont();
   void applyGUIStyle();
   static void sigpipeHandler(int);
 
   int captionLayout;
 
-  KApplication(const KApplication&);
-  KApplication& operator=(const KApplication&);
+  TDEApplication(const TDEApplication&);
+  TDEApplication& operator=(const TDEApplication&);
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KApplicationPrivate* d;
+  TDEApplicationPrivate* d;
 };
 
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * Check, if a file may be accessed in a given mode.
  * This is a wrapper around the access() system call.
  * checkAccess() calls access() with the given parameters.
@@ -1572,12 +1572,12 @@ class KSessionManagedPrivate;
 
    KSessionManaged makes it possible to provide implementations for
  TQApplication::commitData() and TQApplication::saveState(), without
-   subclassing KApplication. KMainWindow internally makes use of this.
+   subclassing TDEApplication. TDEMainWindow internally makes use of this.
 
    You don't need to do anything with this class when using
-   KMainWindow. Instead, use KMainWindow::saveProperties(),
- KMainWindow::readProperties(), KMainWindow::queryClose(),
- KMainWindow::queryExit() and friends.
+   TDEMainWindow. Instead, use TDEMainWindow::saveProperties(),
+ TDEMainWindow::readProperties(), TDEMainWindow::queryClose(),
+ TDEMainWindow::queryExit() and friends.
 
   @short Highlevel access to session management.
   @author Matthias Ettrich <ettrich@kde.org>
@@ -1591,7 +1591,7 @@ public:
     /**
        See TQApplication::saveState() for documentation.
 
-       This function is just a convenience version to avoid subclassing KApplication.
+       This function is just a convenience version to avoid subclassing TDEApplication.
 
        Return true to indicate a successful state save or false to
        indicate a problem and to halt the shutdown process (will
@@ -1601,7 +1601,7 @@ public:
     /**
        See TQApplication::commitData() for documentation.
 
-       This function is just a convenience version to avoid subclassing KApplication.
+       This function is just a convenience version to avoid subclassing TDEApplication.
 
        Return true to indicate a successful commit of data or false to
        indicate a problem and to halt the shutdown process (will
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp
index 7abc46f7a..46d1b9f4a 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/tdecmdlineargs.cpp
@@ -35,11 +35,11 @@
 #include <tqasciidict.h>
 #include <tqstrlist.h>
 
-#include "kcmdlineargs.h"
-#include <kaboutdata.h>
-#include <klocale.h>
-#include <kapplication.h>
-#include <kglobal.h>
+#include "tdecmdlineargs.h"
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>
 
@@ -54,16 +54,16 @@
 #endif
 
 template class TQAsciiDict<TQCString>;
-template class TQPtrList<KCmdLineArgs>;
+template class TQPtrList<TDECmdLineArgs>;
 
-class KCmdLineParsedOptions : public TQAsciiDict<TQCString>
+class TDECmdLineParsedOptions : public TQAsciiDict<TQCString>
 {
 public:
-   KCmdLineParsedOptions()
+   TDECmdLineParsedOptions()
      : TQAsciiDict<TQCString>( 7 ) { }
 
    // WABA: Huh?
-   // The compiler doesn't find KCmdLineParsedOptions::write(s) by itself ???
+   // The compiler doesn't find TDECmdLineParsedOptions::write(s) by itself ???
    // WABA: No, because there is another write function that hides the
    // write function in the base class even though this function has a
    // different signature. (obscure C++ feature)
@@ -91,10 +91,10 @@ protected:
 
 };
 
-class KCmdLineParsedArgs : public TQStrList
+class TDECmdLineParsedArgs : public TQStrList
 {
 public:
-   KCmdLineParsedArgs()
+   TDECmdLineParsedArgs()
      : TQStrList( true ) { }
    TQDataStream& save( TQDataStream &s) const
    { return TQGList::write(s); }
@@ -104,53 +104,53 @@ public:
 };
 
 
-class KCmdLineArgsList: public TQPtrList<KCmdLineArgs>
+class TDECmdLineArgsList: public TQPtrList<TDECmdLineArgs>
 {
 public:
-   KCmdLineArgsList() { }
+   TDECmdLineArgsList() { }
 };
 
-KCmdLineArgsList *KCmdLineArgs::argsList = 0;
-int KCmdLineArgs::argc = 0;
-char **KCmdLineArgs::argv = 0;
-char *KCmdLineArgs::mCwd = 0;
+TDECmdLineArgsList *TDECmdLineArgs::argsList = 0;
+int TDECmdLineArgs::argc = 0;
+char **TDECmdLineArgs::argv = 0;
+char *TDECmdLineArgs::mCwd = 0;
 static KStaticDeleter <char> mCwdd;
-const KAboutData *KCmdLineArgs::about = 0;
-bool KCmdLineArgs::parsed = false;
-bool KCmdLineArgs::ignoreUnknown = false;
+const TDEAboutData *TDECmdLineArgs::about = 0;
+bool TDECmdLineArgs::parsed = false;
+bool TDECmdLineArgs::ignoreUnknown = false;
 
 //
 // Static functions
 //
 
 void
-KCmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* programName,
+TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* programName,
                    const char *_description, const char *_version, bool noKApp)
 {
    init(_argc, _argv,
-        new KAboutData(_appname, programName, _version, _description),
+        new TDEAboutData(_appname, programName, _version, _description),
         noKApp);
 }
 
 void
-KCmdLineArgs::init(int _argc, char **_argv, const char *_appname,
+TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname,
                    const char *_description, const char *_version, bool noKApp)
 {
    init(_argc, _argv,
-        new KAboutData(_appname, _appname, _version, _description),
+        new TDEAboutData(_appname, _appname, _version, _description),
         noKApp);
 }
 
 void
-KCmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
+TDECmdLineArgs::initIgnore(int _argc, char **_argv, const char *_appname )
 {
    init(_argc, _argv,
-        new KAboutData(_appname, _appname, "unknown", "TDE Application", false));
+        new TDEAboutData(_appname, _appname, "unknown", "TDE Application", false));
    ignoreUnknown = true;
 }
 
 void
-KCmdLineArgs::init(const KAboutData* ab)
+TDECmdLineArgs::init(const TDEAboutData* ab)
 {
    char **_argv = (char **) malloc(sizeof(char *));
    _argv[0] = (char *) ab->appName();
@@ -159,14 +159,14 @@ KCmdLineArgs::init(const KAboutData* ab)
 
 
 void
-KCmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noKApp)
+TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool noKApp)
 {
    argc = _argc;
    argv = _argv;
 
    if (!argv)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
       fprintf(stderr, "Passing null-pointer to 'argv' is not allowed.\n\n");
 
       assert( 0 );
@@ -188,33 +188,33 @@ KCmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool noKAp
    win32_slashify(mCwd, PATH_MAX);
 #endif
    if (!noKApp)
-      KApplication::addCmdLineOptions();
+      TDEApplication::addCmdLineOptions();
 }
 
-TQString KCmdLineArgs::cwd()
+TQString TDECmdLineArgs::cwd()
 {
    return TQFile::decodeName(TQCString(mCwd));
 }
 
-const char * KCmdLineArgs::appName()
+const char * TDECmdLineArgs::appName()
 {
    if (!argc) return 0;
    return argv[0];
 }
 
 void
-KCmdLineArgs::addCmdLineOptions( const KCmdLineOptions *options, const char *name,
+TDECmdLineArgs::addCmdLineOptions( const TDECmdLineOptions *options, const char *name,
          const char *id, const char *afterId)
 {
    if (!argsList)
-      argsList = new KCmdLineArgsList();
+      argsList = new TDECmdLineArgsList();
 
    int pos = argsList->count();
 
    if (pos && id && argsList->last() && !argsList->last()->name)
       pos--;
 
-   KCmdLineArgs *args;
+   TDECmdLineArgs *args;
    int i = 0;
    for(args = argsList->first(); args; args = argsList->next(), i++)
    {
@@ -230,12 +230,12 @@ KCmdLineArgs::addCmdLineOptions( const KCmdLineOptions *options, const char *nam
 
    assert( parsed == false ); // You must add _ALL_ cmd line options
                               // before accessing the arguments!
-   args = new KCmdLineArgs(options, name, id);
+   args = new TDECmdLineArgs(options, name, id);
    argsList->insert(pos, args);
 }
 
 void
-KCmdLineArgs::saveAppArgs( TQDataStream &ds)
+TDECmdLineArgs::saveAppArgs( TQDataStream &ds)
 {
    if (!parsed)
       parseAllArgs();
@@ -252,7 +252,7 @@ KCmdLineArgs::saveAppArgs( TQDataStream &ds)
 
    if (!count) return;
 
-   KCmdLineArgs *args;
+   TDECmdLineArgs *args;
    for(args = argsList->first(); args; args = argsList->next())
    {
       ds << TQCString(args->id);
@@ -261,7 +261,7 @@ KCmdLineArgs::saveAppArgs( TQDataStream &ds)
 }
 
 void
-KCmdLineArgs::loadAppArgs( TQDataStream &ds)
+TDECmdLineArgs::loadAppArgs( TQDataStream &ds)
 {
    parsed = true; // don't reparse argc/argv!
 
@@ -269,7 +269,7 @@ KCmdLineArgs::loadAppArgs( TQDataStream &ds)
    removeArgs("qt");
    removeArgs("tde");
 
-   KCmdLineArgs *args;
+   TDECmdLineArgs *args;
    if ( argsList ) {
       for(args = argsList->first(); args; args = argsList->next())
       {
@@ -307,9 +307,9 @@ KCmdLineArgs::loadAppArgs( TQDataStream &ds)
    parsed = true;
 }
 
-KCmdLineArgs *KCmdLineArgs::parsedArgs(const char *id)
+TDECmdLineArgs *TDECmdLineArgs::parsedArgs(const char *id)
 {
-   KCmdLineArgs *args = argsList ? argsList->first() : 0;
+   TDECmdLineArgs *args = argsList ? argsList->first() : 0;
    while(args)
    {
       if ((id && ::qstrcmp(args->id, id) == 0) || (!id && !args->id))
@@ -324,9 +324,9 @@ KCmdLineArgs *KCmdLineArgs::parsedArgs(const char *id)
    return args;
 }
 
-void KCmdLineArgs::removeArgs(const char *id)
+void TDECmdLineArgs::removeArgs(const char *id)
 {
-   KCmdLineArgs *args = argsList ? argsList->first() : 0;
+   TDECmdLineArgs *args = argsList ? argsList->first() : 0;
    while(args)
    {
       if (args->id && id && ::qstrcmp(args->id, id) == 0)
@@ -352,7 +352,7 @@ void KCmdLineArgs::removeArgs(const char *id)
  *  +4 - no more options follow         // !fork
  */
 static int
-findOption(const KCmdLineOptions *options, TQCString &opt,
+findOption(const TDECmdLineOptions *options, TQCString &opt,
            const char *&opt_name, const char *&def, bool &enabled)
 {
    int result;
@@ -426,9 +426,9 @@ findOption(const KCmdLineOptions *options, TQCString &opt,
 
 
 void
-KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled, bool &moreOptions)
+TDECmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled, bool &moreOptions)
 {
-   KCmdLineArgs *args = argsList->first();
+   TDECmdLineArgs *args = argsList->first();
    const char *opt_name;
    const char *def;
    TQCString argument;
@@ -534,22 +534,22 @@ KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled,
 }
 
 void
-KCmdLineArgs::printQ(const TQString &msg)
+TDECmdLineArgs::printQ(const TQString &msg)
 {
    TQCString localMsg = msg.local8Bit();
    fprintf(stdout, "%s", localMsg.data());
 }
 
 void
-KCmdLineArgs::parseAllArgs()
+TDECmdLineArgs::parseAllArgs()
 {
    bool allowArgs = false;
    bool inOptions = true;
    bool everythingAfterArgIsArgs = false;
-   KCmdLineArgs *appOptions = argsList->last();
+   TDECmdLineArgs *appOptions = argsList->last();
    if (!appOptions->id)
    {
-     const KCmdLineOptions *option = appOptions->options;
+     const TDECmdLineOptions *option = appOptions->options;
      while(option && option->name)
      {
        if (option->name[0] == '+')
@@ -607,10 +607,10 @@ KCmdLineArgs::parseAllArgs()
          } else if ( ::qstrcmp( option, "author") == 0 ) {
              enable_i18n();
        if ( about ) {
-         const TQValueList<KAboutPerson> authors = about->authors();
+         const TQValueList<TDEAboutPerson> authors = about->authors();
          if ( !authors.isEmpty() ) {
            TQString authorlist;
-           for (TQValueList<KAboutPerson>::ConstIterator it = authors.begin(); it != authors.end(); ++it ) {
+           for (TQValueList<TDEAboutPerson>::ConstIterator it = authors.begin(); it != authors.end(); ++it ) {
              TQString email;
              if ( !(*it).emailAddress().isEmpty() )
                email = " <" + (*it).emailAddress() + ">";
@@ -671,92 +671,92 @@ KCmdLineArgs::parseAllArgs()
 }
 
 /**
- * For KApplication only:
+ * For TDEApplication only:
  *
  * Return argc
  */
 int *
-KCmdLineArgs::qt_argc()
+TDECmdLineArgs::tqt_argc()
 {
    if (!argsList)
-      KApplication::addCmdLineOptions(); // Lazy bastards!
+      TDEApplication::addCmdLineOptions(); // Lazy bastards!
 
-   static int qt_argc = -1;
-   if( qt_argc != -1 )
-      return &qt_argc;
+   static int tqt_argc = -1;
+   if( tqt_argc != -1 )
+      return &tqt_argc;
 
-   KCmdLineArgs *args = parsedArgs("qt");
+   TDECmdLineArgs *args = parsedArgs("qt");
    assert(args); // No qt options have been added!
    if (!argv)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
-      fprintf(stderr, "Application has not called KCmdLineArgs::init(...).\n\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
+      fprintf(stderr, "Application has not called TDECmdLineArgs::init(...).\n\n");
 
       assert( 0 );
       exit(255);
    }
 
    assert(argc >= (args->count()+1));
-   qt_argc = args->count() +1;
-   return &qt_argc;
+   tqt_argc = args->count() +1;
+   return &tqt_argc;
 }
 
 /**
- * For KApplication only:
+ * For TDEApplication only:
  *
  * Return argv
  */
 char ***
-KCmdLineArgs::qt_argv()
+TDECmdLineArgs::tqt_argv()
 {
    if (!argsList)
-      KApplication::addCmdLineOptions(); // Lazy bastards!
+      TDEApplication::addCmdLineOptions(); // Lazy bastards!
 
-   static char** qt_argv;
-   if( qt_argv != NULL )
-      return &qt_argv;
+   static char** tqt_argv;
+   if( tqt_argv != NULL )
+      return &tqt_argv;
 
-   KCmdLineArgs *args = parsedArgs("qt");
+   TDECmdLineArgs *args = parsedArgs("qt");
    assert(args); // No qt options have been added!
    if (!argv)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
-      fprintf(stderr, "Application has not called KCmdLineArgs::init(...).\n\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
+      fprintf(stderr, "Application has not called TDECmdLineArgs::init(...).\n\n");
 
       assert( 0 );
       exit(255);
    }
 
-   qt_argv = new char*[ args->count() + 2 ];
-   qt_argv[ 0 ] = tqstrdup( appName());
+   tqt_argv = new char*[ args->count() + 2 ];
+   tqt_argv[ 0 ] = tqstrdup( appName());
    int i = 0;
    for(; i < args->count(); i++)
    {
-      qt_argv[i+1] = tqstrdup((char *) args->arg(i));
+      tqt_argv[i+1] = tqstrdup((char *) args->arg(i));
    }
-   qt_argv[i+1] = 0;
+   tqt_argv[i+1] = 0;
 
-   return &qt_argv;
+   return &tqt_argv;
 }
 
 void
-KCmdLineArgs::enable_i18n()
+TDECmdLineArgs::enable_i18n()
 {
     // called twice or too late
-    if (KGlobal::_locale)
+    if (TDEGlobal::_locale)
       return;
 
-    if (!KGlobal::_instance) {
-  KInstance *instance = new KInstance(about);
+    if (!TDEGlobal::_instance) {
+  TDEInstance *instance = new TDEInstance(about);
   (void) instance->config();
   // Don't delete instance!
     }
 }
 
 void
-KCmdLineArgs::usage(const TQString &error)
+TDECmdLineArgs::usage(const TQString &error)
 {
-    assert(KGlobal::_locale);
+    assert(TDEGlobal::_locale);
     TQCString localError = error.local8Bit();
     if (localError[error.length()-1] == '\n')
   localError = localError.left(error.length()-1);
@@ -769,7 +769,7 @@ KCmdLineArgs::usage(const TQString &error)
 }
 
 void
-KCmdLineArgs::usage(const char *id)
+TDECmdLineArgs::usage(const char *id)
 {
    enable_i18n();
    assert(argsList != 0); // It's an error to call usage(...) without
@@ -781,7 +781,7 @@ KCmdLineArgs::usage(const char *id)
    TQString tmp;
    TQString usage;
 
-   KCmdLineArgs *args = argsList->last();
+   TDECmdLineArgs *args = argsList->last();
 
    if (!(args->id) && (args->options) &&
        (args->options->name) && (args->options->name[0] != '+'))
@@ -798,10 +798,10 @@ KCmdLineArgs::usage(const char *id)
       args = argsList->prev();
    }
 
-   KCmdLineArgs *appOptions = argsList->last();
+   TDECmdLineArgs *appOptions = argsList->last();
    if (!appOptions->id)
    {
-     const KCmdLineOptions *option = appOptions->options;
+     const TDECmdLineOptions *option = appOptions->options;
      while(option && option->name)
      {
        if (option->name[0] == '+')
@@ -864,7 +864,7 @@ KCmdLineArgs::usage(const char *id)
 
      while (args)
      {
-       const KCmdLineOptions *option = args->options;
+       const TDECmdLineOptions *option = args->options;
        TQCString opt = "";
 //
        while(option && option->name)
@@ -986,7 +986,7 @@ KCmdLineArgs::usage(const char *id)
  *
  *  The given arguments are assumed to be constants.
  */
-KCmdLineArgs::KCmdLineArgs( const KCmdLineOptions *_options,
+TDECmdLineArgs::TDECmdLineArgs( const TDECmdLineOptions *_options,
                             const char *_name, const char *_id)
   : options(_options), name(_name), id(_id)
 {
@@ -998,7 +998,7 @@ KCmdLineArgs::KCmdLineArgs( const KCmdLineOptions *_options,
 /**
  *  Destructor.
  */
-KCmdLineArgs::~KCmdLineArgs()
+TDECmdLineArgs::~TDECmdLineArgs()
 {
   delete parsedOptionList;
   delete parsedArgList;
@@ -1007,7 +1007,7 @@ KCmdLineArgs::~KCmdLineArgs()
 }
 
 void
-KCmdLineArgs::clear()
+TDECmdLineArgs::clear()
 {
    delete parsedArgList;
    parsedArgList = 0;
@@ -1016,7 +1016,7 @@ KCmdLineArgs::clear()
 }
 
 void
-KCmdLineArgs::reset()
+TDECmdLineArgs::reset()
 {
    if ( argsList ) {
       argsList->setAutoDelete( true );
@@ -1028,7 +1028,7 @@ KCmdLineArgs::reset()
 }
 
 void
-KCmdLineArgs::save( TQDataStream &ds) const
+TDECmdLineArgs::save( TQDataStream &ds) const
 {
    uint count = 0;
    if (parsedOptionList)
@@ -1043,10 +1043,10 @@ KCmdLineArgs::save( TQDataStream &ds) const
 }
 
 void
-KCmdLineArgs::load( TQDataStream &ds)
+TDECmdLineArgs::load( TQDataStream &ds)
 {
-   if (!parsedOptionList) parsedOptionList = new KCmdLineParsedOptions;
-   if (!parsedArgList) parsedArgList = new KCmdLineParsedArgs;
+   if (!parsedOptionList) parsedOptionList = new TDECmdLineParsedOptions;
+   if (!parsedArgList) parsedArgList = new TDECmdLineParsedArgs;
 
    parsedOptionList->load( ds );
    parsedArgList->load( ds );
@@ -1064,7 +1064,7 @@ KCmdLineArgs::load( TQDataStream &ds)
 }
 
 void
-KCmdLineArgs::setOption(const TQCString &opt, bool enabled)
+TDECmdLineArgs::setOption(const TQCString &opt, bool enabled)
 {
    if (isQt)
    {
@@ -1076,7 +1076,7 @@ KCmdLineArgs::setOption(const TQCString &opt, bool enabled)
       addArgument(arg);
    }
    if (!parsedOptionList) {
-  parsedOptionList = new KCmdLineParsedOptions;
+  parsedOptionList = new TDECmdLineParsedOptions;
   parsedOptionList->setAutoDelete(true);
    }
 
@@ -1087,7 +1087,7 @@ KCmdLineArgs::setOption(const TQCString &opt, bool enabled)
 }
 
 void
-KCmdLineArgs::setOption(const TQCString &opt, const char *value)
+TDECmdLineArgs::setOption(const TQCString &opt, const char *value)
 {
    if (isQt)
    {
@@ -1106,7 +1106,7 @@ KCmdLineArgs::setOption(const TQCString &opt, const char *value)
 #endif
    }
    if (!parsedOptionList) {
-  parsedOptionList = new KCmdLineParsedOptions;
+  parsedOptionList = new TDECmdLineParsedOptions;
   parsedOptionList->setAutoDelete(true);
    }
 
@@ -1114,7 +1114,7 @@ KCmdLineArgs::setOption(const TQCString &opt, const char *value)
 }
 
 TQCString
-KCmdLineArgs::getOption(const char *_opt) const
+TDECmdLineArgs::getOption(const char *_opt) const
 {
    TQCString *value = 0;
    if (parsedOptionList)
@@ -1134,7 +1134,7 @@ KCmdLineArgs::getOption(const char *_opt) const
 
    if (result != 3)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
       fprintf(stderr, "Application requests for getOption(\"%s\") but the \"%s\" option\n",
                       _opt, _opt);
       fprintf(stderr, "has never been specified via addCmdLineOptions( ... )\n\n");
@@ -1146,7 +1146,7 @@ KCmdLineArgs::getOption(const char *_opt) const
 }
 
 QCStringList
-KCmdLineArgs::getOptionList(const char *_opt) const
+TDECmdLineArgs::getOptionList(const char *_opt) const
 {
    QCStringList result;
    if (!parsedOptionList)
@@ -1176,7 +1176,7 @@ KCmdLineArgs::getOptionList(const char *_opt) const
 }
 
 bool
-KCmdLineArgs::isSet(const char *_opt) const
+TDECmdLineArgs::isSet(const char *_opt) const
 {
    // Look up the default.
    const char *opt_name;
@@ -1187,7 +1187,7 @@ KCmdLineArgs::isSet(const char *_opt) const
 
    if (result == 0)
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs):\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n");
       fprintf(stderr, "Application requests for isSet(\"%s\") but the \"%s\" option\n",
                       _opt, _opt);
       fprintf(stderr, "has never been specified via addCmdLineOptions( ... )\n\n");
@@ -1219,7 +1219,7 @@ KCmdLineArgs::isSet(const char *_opt) const
 }
 
 int
-KCmdLineArgs::count() const
+TDECmdLineArgs::count() const
 {
    if (!parsedArgList)
       return 0;
@@ -1227,11 +1227,11 @@ KCmdLineArgs::count() const
 }
 
 const char *
-KCmdLineArgs::arg(int n) const
+TDECmdLineArgs::arg(int n) const
 {
    if (!parsedArgList || (n >= (int) parsedArgList->count()))
    {
-      fprintf(stderr, "\n\nFAILURE (KCmdLineArgs): Argument out of bounds\n");
+      fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs): Argument out of bounds\n");
       fprintf(stderr, "Application requests for arg(%d) without checking count() first.\n",
                       n);
 
@@ -1243,12 +1243,12 @@ KCmdLineArgs::arg(int n) const
 }
 
 KURL
-KCmdLineArgs::url(int n) const
+TDECmdLineArgs::url(int n) const
 {
    return makeURL( arg(n) );
 }
 
-KURL KCmdLineArgs::makeURL(const char *_urlArg)
+KURL TDECmdLineArgs::makeURL(const char *_urlArg)
 {
    const TQString urlArg = TQFile::decodeName(_urlArg);
    TQFileInfo fileInfo(urlArg);
@@ -1269,29 +1269,29 @@ KURL KCmdLineArgs::makeURL(const char *_urlArg)
 }
 
 void
-KCmdLineArgs::addArgument(const char *argument)
+TDECmdLineArgs::addArgument(const char *argument)
 {
    if (!parsedArgList)
-      parsedArgList = new KCmdLineParsedArgs;
+      parsedArgList = new TDECmdLineParsedArgs;
 
    parsedArgList->append(argument);
 }
 
-static const KCmdLineOptions kde_tempfile_option[] =
+static const TDECmdLineOptions kde_tempfile_option[] =
 {
    { "tempfile",       I18N_NOOP("The files/URLs opened by the application will be deleted after use"), 0},
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 void
-KCmdLineArgs::addTempFileOption()
+TDECmdLineArgs::addTempFileOption()
 {
-    KCmdLineArgs::addCmdLineOptions( kde_tempfile_option, "TDE-tempfile", "tde-tempfile" );
+    TDECmdLineArgs::addCmdLineOptions( kde_tempfile_option, "TDE-tempfile", "tde-tempfile" );
 }
 
-bool KCmdLineArgs::isTempFileSet()
+bool TDECmdLineArgs::isTempFileSet()
 {
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs( "tde-tempfile" );
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs( "tde-tempfile" );
     if ( args )
         return args->isSet( "tempfile" );
     return false;
diff --git a/tdecore/kcmdlineargs.h b/tdecore/tdecmdlineargs.h
index dc48fc45d..9b7dc0f4f 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/tdecmdlineargs.h
@@ -31,13 +31,13 @@ typedef TQValueList<TQCString> QCStringList;
 /**
  * @short Structure that holds command line options.
  *
- * This class is intended to be used with the KCmdLineArgs class, which
+ * This class is intended to be used with the TDECmdLineArgs class, which
  * provides convenient and powerful command line argument parsing and
  * handling functionality.
  *
- * @see KCmdLineArgs for additional usage information
+ * @see TDECmdLineArgs for additional usage information
  */
-struct TDECORE_EXPORT KCmdLineOptions
+struct TDECORE_EXPORT TDECmdLineOptions
 {
    /**
     * The name of the argument as it should be called on the command line and
@@ -49,7 +49,7 @@ struct TDECORE_EXPORT KCmdLineOptions
     * <i>myapp --nofoo</i> is called:
     *
     * \code
-    * KCmdLineArgs::parsedArgs()->isSet("foo"); // false
+    * TDECmdLineArgs::parsedArgs()->isSet("foo"); // false
     * \endcode
     */
    const char *name;
@@ -65,36 +65,36 @@ struct TDECORE_EXPORT KCmdLineOptions
    const char *def; // Default
 };
 
-#define KCmdLineLastOption { 0, 0, 0 }
+#define TDECmdLineLastOption { 0, 0, 0 }
 
-class KCmdLineArgsList;
-class KApplication;
+class TDECmdLineArgsList;
+class TDEApplication;
 class KUniqueApplication;
-class KCmdLineParsedOptions;
-class KCmdLineParsedArgs;
-class KAboutData;
-class KCmdLineArgsPrivate;
+class TDECmdLineParsedOptions;
+class TDECmdLineParsedArgs;
+class TDEAboutData;
+class TDECmdLineArgsPrivate;
 
 /**
  *  @short A class for command-line argument handling.
  *
- *  KCmdLineArgs provides simple access to the command-line arguments
+ *  TDECmdLineArgs provides simple access to the command-line arguments
  *  for an application. It takes into account Qt-specific options,
  *  KDE-specific options and application specific options.
  *
  *  This class is used in %main() via the static method
  *  init().
  *
- *  A typical %KDE application using %KCmdLineArgs should look like this:
+ *  A typical %KDE application using %TDECmdLineArgs should look like this:
  *
  *  \code
  *  int main(int argc, char *argv[])
  *  {
  *     // Initialize command line args
- *     KCmdLineArgs::init(argc, argv, appName, programName, description, version);
+ *     TDECmdLineArgs::init(argc, argv, appName, programName, description, version);
  *
  *     // Tell which options are supported
- *     KCmdLineArgs::addCmdLineOptions( options );
+ *     TDECmdLineArgs::addCmdLineOptions( options );
  *
  *     // Add options from other components
  *     KUniqueApplication::addCmdLineOptions();
@@ -107,11 +107,11 @@ class KCmdLineArgsPrivate;
  *     ....
  *
  *     // Handle our own options/arguments
- *     // A KApplication will usually do this in main but this is not
+ *     // A TDEApplication will usually do this in main but this is not
  *     // necessary.
  *     // A KUniqueApplication might want to handle it in newInstance().
  *
- *     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ *     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
  *
  *     // A binary option (on / off)
  *     if (args->isSet("some-option"))
@@ -136,10 +136,10 @@ class KCmdLineArgsPrivate;
  *  \endcode
  *
  *  The options that an application supports are configured using the
- *  KCmdLineOptions class. An example is shown below:
+ *  TDECmdLineOptions class. An example is shown below:
  *
  *  \code
- *  static const KCmdLineOptions options[] =
+ *  static const TDECmdLineOptions options[] =
  *  {
  *     { "a", I18N_NOOP("A short binary option"), 0 },
  *     { "b \<file>", I18N_NOOP("A short option which takes an argument"), 0 },
@@ -160,12 +160,12 @@ class KCmdLineArgsPrivate;
  *     { "+[arg1]", I18N_NOOP("An optional argument 'arg1'"), 0 },
  *     { "!+command", I18N_NOOP("A required argument 'command', that can contain multiple words, even starting with '-'"), 0 },
  *     { "", I18N_NOOP("Additional help text not associated with any particular option") 0 },
- *     KCmdLineLastOption // End of options.
+ *     TDECmdLineLastOption // End of options.
  *  };
  *  \endcode
  *
  *  The I18N_NOOP macro is used to indicate that these strings should be
- *  marked for translation. The actual translation is done by KCmdLineArgs.
+ *  marked for translation. The actual translation is done by TDECmdLineArgs.
  *  You can't use i18n() here because we are setting up a static data
  *  structure and can't do translations at compile time.
  *
@@ -219,11 +219,11 @@ class KCmdLineArgsPrivate;
  *  @author Waldo Bastian
  *  @version 0.0.4
  */
-class TDECORE_EXPORT KCmdLineArgs
+class TDECORE_EXPORT TDECmdLineArgs
 {
-  friend class KApplication;
+  friend class TDEApplication;
   friend class KUniqueApplication;
-  friend class TQPtrList<KCmdLineArgs>;
+  friend class TQPtrList<TDECmdLineArgs>;
 public:
   // Static functions:
 
@@ -242,7 +242,7 @@ public:
    * @param _description A short description of what your application is about.
    * @param _version A version.
    * @param noKApp Set this true to not add commandline options for
-   *        TQApplication / KApplication
+   *        TQApplication / TDEApplication
    *
    * @since 3.2
    */
@@ -263,17 +263,17 @@ public:
    * Initialize class.
    *
    * This function should be called as the very first thing in
-   *  your application. It uses KAboutData to replace some of the
+   *  your application. It uses TDEAboutData to replace some of the
    *  arguments that would otherwise be required.
    *
    * @param _argc As passed to @p main(...).
    * @param _argv As passed to @p main(...).
-   * @param about A KAboutData object describing your program.
+   * @param about A TDEAboutData object describing your program.
    * @param noKApp Set this true to not add commandline options for
-   *        TQApplication / KApplication
+   *        TQApplication / TDEApplication
    */
   static void init(int _argc, char **_argv,
-                   const KAboutData *about, bool noKApp = false);
+                   const TDEAboutData *about, bool noKApp = false);
 
   /**
    * Initialize Class
@@ -281,14 +281,14 @@ public:
    * This function should be called as the very first thing in your
    * application. This method will rarely be used, since it doesn't
    * provide any argument parsing. It does provide access to the
-   * KAboutData information.
+   * TDEAboutData information.
    * This method is exactly the same as calling
-   * init(0,0, const KAboutData *about, true).
+   * init(0,0, const TDEAboutData *about, true).
    *
    * @param about the about data.
-   * \see KAboutData
+   * \see TDEAboutData
    */
-  static void init(const KAboutData *about);
+  static void init(const TDEAboutData *about);
 
   /**
    * Add options to your application.
@@ -299,13 +299,13 @@ public:
    * The list of options should look like this:
    *
    * \code
-   * static KCmdLineOptions options[] =
+   * static TDECmdLineOptions options[] =
    * {
    *    { "option1 \<argument>", I18N_NOOP("Description 1"), "my_extra_arg" },
    *    { "o", 0, 0 },
    *    { "option2", I18N_NOOP("Description 2"), 0 },
    *    { "nooption3", I18N_NOOP("Description 3"), 0 },
-   *    KCmdLineLastOption
+   *    TDECmdLineLastOption
    * }
    * \endcode
    *
@@ -321,8 +321,8 @@ public:
    *     true. If required, you must check yourself the number of arguments
    *     specified by the user:
    *     \code
-   *       KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-   *       if (args->count() == 0) KCmdLineArgs::usage(i18n("No file specified!"));
+   *       TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
+   *       if (args->count() == 0) TDECmdLineArgs::usage(i18n("No file specified!"));
    *     \endcode
    *
    * In BNF:
@@ -354,7 +354,7 @@ public:
    * @param id A name with which these options can be identified, can be 0.
    * @param afterId The options are inserted after this set of options, can be 0.
    */
-  static void addCmdLineOptions( const KCmdLineOptions *options,
+  static void addCmdLineOptions( const TDECmdLineOptions *options,
 				 const char *name=0, const char *id = 0,
 				 const char *afterId=0);
 
@@ -367,7 +367,7 @@ public:
    *
    * @param id The name of the options you are interested in, can be 0.
    */
-  static KCmdLineArgs *parsedArgs(const char *id=0);
+  static TDECmdLineArgs *parsedArgs(const char *id=0);
 
   /**
    * Get the CWD (Current Working Directory) associated with the
@@ -415,7 +415,7 @@ public:
   /**
    *  Read out a string option.
    *
-   *  The option must have a corresponding KCmdLineOptions entry
+   *  The option must have a corresponding TDECmdLineOptions entry
    *  of the form:
    *  \code
    *    { "option \<argument>", I18N_NOOP("Description"), "default" }
@@ -435,7 +435,7 @@ public:
   /**
    *  Read out all occurrences of a string option.
    *
-   *  The option must have a corresponding KCmdLineOptions entry
+   *  The option must have a corresponding TDECmdLineOptions entry
    *  of the form:
    *  \code
    *    { "option \<argument>", I18N_NOOP("Description"), "default" }
@@ -457,11 +457,11 @@ public:
    *
    *  @return The value of the option. It will be true if the option
    *  was specifically turned on in the command line, or if the option
-   *  is turned on by default (in the KCmdLineOptions list) and was
+   *  is turned on by default (in the TDECmdLineOptions list) and was
    *  not specifically turned off in the command line. Equivalently,
    *  it will be false if the option was specifically turned off in
    *  the command line, or if the option is turned off by default (in
-   *  the KCmdLineOptions list) and was not specifically turned on in
+   *  the TDECmdLineOptions list) and was not specifically turned on in
    *  the command line.
    */
   bool isSet(const char *option) const;
@@ -501,14 +501,14 @@ public:
 
   /**
    * Used by url().
-   * Made public for apps that don't use KCmdLineArgs
+   * Made public for apps that don't use TDECmdLineArgs
    * @param urlArg the argument
    * @return the url.
    */
   static KURL makeURL( const char * urlArg );
 
   /**
-   * Made public for apps that don't use KCmdLineArgs
+   * Made public for apps that don't use TDECmdLineArgs
    * To be done before makeURL, to set the current working
    * directory in case makeURL needs it.
    * @param cwd the new working directory
@@ -522,8 +522,8 @@ public:
 
   /**
    *  Reset all option definitions, i.e. cancel all addCmdLineOptions calls.
-   *  Note that KApplication's options are removed too, you might want to
-   *  call KApplication::addCmdLineOptions if you want them back.
+   *  Note that TDEApplication's options are removed too, you might want to
+   *  call TDEApplication::addCmdLineOptions if you want them back.
    *
    *  You usually don't want to call this method.
    */
@@ -553,7 +553,7 @@ protected:
    * @internal
    *  Constructor.
    */
-  KCmdLineArgs( const KCmdLineOptions *_options, const char *_name,
+  TDECmdLineArgs( const TDECmdLineOptions *_options, const char *_name,
                 const char *_id);
 
   /**
@@ -563,7 +563,7 @@ protected:
    *
    *  Destructor.
    */
-  ~KCmdLineArgs();
+  ~TDECmdLineArgs();
 
 private:
   /**
@@ -582,19 +582,19 @@ private:
   static void parseAllArgs();
 
   /**
-   * @internal for KApplication only:
+   * @internal for TDEApplication only:
    *
    * Return argc
    */
-  static int *qt_argc();
+  static int *tqt_argc();
 
   /**
-   * @internal for KApplication only:
+   * @internal for TDEApplication only:
    *
    * Return argv
    */
 
-  static char ***qt_argv();
+  static char ***tqt_argv();
 
   /**
    * @internal
@@ -648,7 +648,7 @@ private:
   void load( TQDataStream &);
 
   /**
-   * @internal for KApplication only
+   * @internal for TDEApplication only
    *
    * Initialize class.
    *
@@ -659,22 +659,22 @@ private:
    * @param appname The untranslated name of your application. This should
    *                match with @p argv[0].
    *
-   * This function makes KCmdLineArgs ignore all unknown options as well as
+   * This function makes TDECmdLineArgs ignore all unknown options as well as
    * all arguments.
    */
   static void initIgnore(int _argc, char **_argv, const char *_appname);
 
   static void printQ(const TQString &msg);
 
-  const KCmdLineOptions *options;
+  const TDECmdLineOptions *options;
   const char *name;
   const char *id;
-  KCmdLineParsedOptions *parsedOptionList;
-  KCmdLineParsedArgs *parsedArgList;
+  TDECmdLineParsedOptions *parsedOptionList;
+  TDECmdLineParsedArgs *parsedArgList;
   bool isQt;
 
-  static KCmdLineArgsList *argsList; // All options.
-  static const KAboutData *about;
+  static TDECmdLineArgsList *argsList; // All options.
+  static const TDEAboutData *about;
 
   static int argc; // The original argc
   static char **argv; // The original argv
@@ -683,7 +683,7 @@ private:
   static char *mCwd; // Current working directory. Important for KUnqiueApp!
   static bool parseArgs;
 
-  KCmdLineArgsPrivate *d;
+  TDECmdLineArgsPrivate *d;
 };
 
 #endif
diff --git a/tdecore/kconfig.cpp b/tdecore/tdeconfig.cpp
index 709e39de3..68307dc85 100644
--- a/tdecore/kconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -32,18 +32,18 @@
 
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
-#include "kconfigbackend.h"
+#include <tdeapplication.h>
+#include "tdeconfigbackend.h"
 
-#include "kconfig.h"
-#include "kglobal.h"
+#include "tdeconfig.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "kstaticdeleter.h"
 #include <tqtimer.h>
 
-KConfig::KConfig( const TQString& fileName,
+TDEConfig::TDEConfig( const TQString& fileName,
                  bool bReadOnly, bool bUseKderc, const char *resType )
-  : KConfigBase(), bGroupImmutable(false), bFileImmutable(false),
+  : TDEConfigBase(), bGroupImmutable(false), bFileImmutable(false),
     bForceGlobal(false)
 {
   // set the object's read-only status.
@@ -52,7 +52,7 @@ KConfig::KConfig( const TQString& fileName,
   // for right now we will hardcode that we are using the INI
   // back end driver.  In the future this should be converted over to
   // a object factory of some sorts.
-  KConfigINIBackEnd *aBackEnd = new KConfigINIBackEnd(this,
+  TDEConfigINIBackEnd *aBackEnd = new TDEConfigINIBackEnd(this,
 						      fileName,
                                                       resType,
 						      bUseKderc);
@@ -63,7 +63,7 @@ KConfig::KConfig( const TQString& fileName,
   // read initial information off disk
   reparseConfiguration();
 
-  // we let KStandardDirs add custom user config files. It will do
+  // we let TDEStandardDirs add custom user config files. It will do
   // this only once. So only the first call ever to this constructor
   // will anything else than return here We have to reparse here as
   // configuration files may appear after customized directories have
@@ -71,11 +71,11 @@ KConfig::KConfig( const TQString& fileName,
   // config object.
   // Since this makes only sense for config directories, addCustomized
   // returns true only if new config directories appeared.
-  if (KGlobal::dirs()->addCustomized(this))
+  if (TDEGlobal::dirs()->addCustomized(this))
       reparseConfiguration();
 }
 
-KConfig::KConfig(KConfigBackEnd *aBackEnd, bool bReadOnly)
+TDEConfig::TDEConfig(TDEConfigBackEnd *aBackEnd, bool bReadOnly)
     : bGroupImmutable(false), bFileImmutable(false),
     bForceGlobal(false)
 {
@@ -84,19 +84,19 @@ KConfig::KConfig(KConfigBackEnd *aBackEnd, bool bReadOnly)
   reparseConfiguration();
 }
 
-KConfig::~KConfig()
+TDEConfig::~TDEConfig()
 {
   sync();
 
   delete backEnd;
 }
 
-void KConfig::rollback(bool bDeep)
+void TDEConfig::rollback(bool bDeep)
 {
-  KConfigBase::rollback(bDeep);
+  TDEConfigBase::rollback(bDeep);
 
   if (!bDeep)
-    return; // object's bDeep flag is set in KConfigBase method
+    return; // object's bDeep flag is set in TDEConfigBase method
 
   // clear any dirty flags that entries might have set
   for (KEntryMapIterator aIt = aEntryMap.begin();
@@ -104,7 +104,7 @@ void KConfig::rollback(bool bDeep)
     (*aIt).bDirty = false;
 }
 
-TQStringList KConfig::groupList() const
+TQStringList TDEConfig::groupList() const
 {
   TQStringList retList;
 
@@ -138,7 +138,7 @@ TQStringList KConfig::groupList() const
   return retList;
 }
 
-TQMap<TQString, TQString> KConfig::entryMap(const TQString &pGroup) const
+TQMap<TQString, TQString> TDEConfig::entryMap(const TQString &pGroup) const
 {
   TQCString pGroup_utf = pGroup.utf8();
   KEntryKey groupKey( pGroup_utf, 0 );
@@ -158,7 +158,7 @@ TQMap<TQString, TQString> KConfig::entryMap(const TQString &pGroup) const
   return tmpMap;
 }
 
-void KConfig::reparseConfiguration()
+void TDEConfig::reparseConfiguration()
 {
   // Don't lose pending changes
   if (!isReadOnly() && backEnd && bDirty)
@@ -175,7 +175,7 @@ void KConfig::reparseConfiguration()
   bFileImmutable = bReadOnly;
 }
 
-KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const
+KEntryMap TDEConfig::internalEntryMap(const TQString &pGroup) const
 {
   TQCString pGroup_utf = pGroup.utf8();
   KEntry aEntry;
@@ -199,7 +199,7 @@ KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const
   return tmpEntryMap;
 }
 
-void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup)
+void TDEConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup)
 {
   if (bFileImmutable && !_key.bDefault)
     return;
@@ -235,7 +235,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro
   }
 }
 
-KEntry KConfig::lookupData(const KEntryKey &_key) const
+KEntry TDEConfig::lookupData(const KEntryKey &_key) const
 {
   KEntryMapConstIterator aIt = aEntryMap.find(_key);
   if (aIt != aEntryMap.end())
@@ -251,7 +251,7 @@ KEntry KConfig::lookupData(const KEntryKey &_key) const
   }
 }
 
-bool KConfig::internalHasGroup(const TQCString &group) const
+bool TDEConfig::internalHasGroup(const TQCString &group) const
 {
   KEntryKey groupKey( group, 0);
 
@@ -272,19 +272,19 @@ bool KConfig::internalHasGroup(const TQCString &group) const
   return false;
 }
 
-void KConfig::setFileWriteMode(int mode)
+void TDEConfig::setFileWriteMode(int mode)
 {
   backEnd->setFileWriteMode(mode);
 }
 
-KLockFile::Ptr KConfig::lockFile(bool bGlobal)
+TDELockFile::Ptr TDEConfig::lockFile(bool bGlobal)
 {
-  KConfigINIBackEnd *aBackEnd = dynamic_cast<KConfigINIBackEnd*>(backEnd);
+  TDEConfigINIBackEnd *aBackEnd = dynamic_cast<TDEConfigINIBackEnd*>(backEnd);
   if (!aBackEnd) return 0;
   return aBackEnd->lockFile(bGlobal);
 }
 
-void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
+void TDEConfig::checkUpdate(const TQString &id, const TQString &updateFile)
 {
   TQString oldGroup = group();
   setGroup("$Version");
@@ -294,16 +294,16 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
   {
      TQStringList args;
      args << "--check" << updateFile;
-     KApplication::tdeinitExecWait("kconf_update", args);
+     TDEApplication::tdeinitExecWait("tdeconf_update", args);
      reparseConfiguration();
   }
   setGroup(oldGroup);
 }
 
-KConfig* KConfig::copyTo(const TQString &file, KConfig *config) const
+TDEConfig* TDEConfig::copyTo(const TQString &file, TDEConfig *config) const
 {
   if (!config)
-     config = new KConfig(TQString::null, false, false);
+     config = new TDEConfig(TQString::null, false, false);
   config->backEnd->changeFileName(file, "config", false);
   config->setReadOnly(false);
   config->bFileImmutable = false;
@@ -325,17 +325,17 @@ KConfig* KConfig::copyTo(const TQString &file, KConfig *config) const
   return config;
 }
 
-void KConfig::virtual_hook( int id, void* data )
-{ KConfigBase::virtual_hook( id, data ); }
+void TDEConfig::virtual_hook( int id, void* data )
+{ TDEConfigBase::virtual_hook( id, data ); }
 
-static KStaticDeleter< TQValueList<KSharedConfig*> > sd;
-TQValueList<KSharedConfig*> *KSharedConfig::s_list = 0;
+static KStaticDeleter< TQValueList<TDESharedConfig*> > sd;
+TQValueList<TDESharedConfig*> *TDESharedConfig::s_list = 0;
 
-KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool readOnly, bool useKDEGlobals )
+TDESharedConfig::Ptr TDESharedConfig::openConfig(const TQString& fileName, bool readOnly, bool useKDEGlobals )
 {
   if (s_list)
   {
-     for(TQValueList<KSharedConfig*>::ConstIterator it = s_list->begin();
+     for(TQValueList<TDESharedConfig*>::ConstIterator it = s_list->begin();
          it != s_list->end(); ++it)
      {
         if ((*it)->backEnd->fileName() == fileName &&
@@ -344,24 +344,24 @@ KSharedConfig::Ptr KSharedConfig::openConfig(const TQString& fileName, bool read
            return (*it);
      }
   }
-  return new KSharedConfig(fileName, readOnly, useKDEGlobals);
+  return new TDESharedConfig(fileName, readOnly, useKDEGlobals);
 }
 
-KSharedConfig::KSharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals)
- : KConfig(fileName, readonly, usekdeglobals)
+TDESharedConfig::TDESharedConfig( const TQString& fileName, bool readonly, bool usekdeglobals)
+ : TDEConfig(fileName, readonly, usekdeglobals)
 {
   if (!s_list)
   {
-    sd.setObject(s_list, new TQValueList<KSharedConfig*>);
+    sd.setObject(s_list, new TQValueList<TDESharedConfig*>);
   }
 
   s_list->append(this);
 }
 
-KSharedConfig::~KSharedConfig()
+TDESharedConfig::~TDESharedConfig()
 {
   if ( s_list )
     s_list->remove(this);
 }
 
-#include "kconfig.moc"
+#include "tdeconfig.moc"
diff --git a/tdecore/kconfig.h b/tdecore/tdeconfig.h
index e3eb52f64..c2da06446 100644
--- a/tdecore/kconfig.h
+++ b/tdecore/tdeconfig.h
@@ -26,10 +26,10 @@ class TQTimer;
 
 #include <tqvaluelist.h>
 
-#include "kconfigbase.h"
+#include "tdeconfigbase.h"
 #include "klockfile.h"
 
-class KConfigPrivate;
+class TDEConfigPrivate;
 
 /**
 * Access KDE Configuration entries.
@@ -37,17 +37,17 @@ class KConfigPrivate;
 * This class implements KDE's default configuration system.
 *
 * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org>
-* @see KGlobal::config(), KConfigBase, KSimpleConfig
+* @see TDEGlobal::config(), TDEConfigBase, KSimpleConfig
 * @short KDE Configuration Management class
 */
-class TDECORE_EXPORT KConfig : public KConfigBase
+class TDECORE_EXPORT TDEConfig : public TDEConfigBase
 {
   Q_OBJECT
 
 public:
 
   /**
-   * Constructs a KConfig object.
+   * Constructs a TDEConfig object.
    *
    * @param fileName A file to parse in addition to the
    *        system-wide file(s).  If it is not provided, only global
@@ -57,20 +57,20 @@ public:
    *        object will automatically become read-only if either the user does not have
    *        write permission to @p fileName or if no file was specified.
    * @param bUseKDEGlobals Toggle reading the global KDE configuration file.
-   * @param resType the place to look in (config, data, etc) See KStandardDirs.
+   * @param resType the place to look in (config, data, etc) See TDEStandardDirs.
    */
-  KConfig( const TQString& fileName = TQString::null,
+  TDEConfig( const TQString& fileName = TQString::null,
           bool bReadOnly = false, bool bUseKDEGlobals = true, const char *resType="config");
 
-  KConfig(KConfigBackEnd *backEnd, bool bReadOnly = false);
+  TDEConfig(TDEConfigBackEnd *backEnd, bool bReadOnly = false);
 
   /**
-   * Destructs the KConfig object.
+   * Destructs the TDEConfig object.
    *
    * Writes back any dirty configuration entries, and destroys
    * dynamically created objects.
    */
-  virtual ~KConfig();
+  virtual ~TDEConfig();
 
   /**
    * Clears all entries out of the @p dirtyEntryMap, so the
@@ -82,7 +82,7 @@ public:
    *        false, but the dirty entries remain in the dirty entry
    *        map.
    *
-   * @see KConfigBase::rollback
+   * @see TDEConfigBase::rollback
    */
   virtual void rollback(bool bDeep = true);
 
@@ -137,7 +137,7 @@ public:
 
   /**
    * Checks whether the config file contains the update @p id
-   * as contained in @p updateFile. If not, it runs kconf_update
+   * as contained in @p updateFile. If not, it runs tdeconf_update
    * to update the config file.
    *
    * If you install config update files with critical fixes
@@ -162,21 +162,21 @@ public:
    * @param config optional config object to reuse
    * @since 3.2
    */
-  KConfig* copyTo(const TQString &file, KConfig *config=0) const;
+  TDEConfig* copyTo(const TQString &file, TDEConfig *config=0) const;
 
   /**
    * Returns a lock file object for the configuration file or 0 if
    * the backend does not support locking.
    * @param bGlobal if true, return the lock file for the global config file
    *
-   * NOTE: KConfig::sync() requires a lock on both the normal and global
-   * config file. When calling KConfig::sync() while having a lock on the
+   * NOTE: TDEConfig::sync() requires a lock on both the normal and global
+   * config file. When calling TDEConfig::sync() while having a lock on the
    * global config file, the normal config file MUST be locked AS WELL and the 
    * normal config file MUST be locked BEFORE the global config file!
    * Otherwise there is a risk of deadlock.
    * @since 3.3
    */
-  KLockFile::Ptr lockFile( bool bGlobal=false );
+  TDELockFile::Ptr lockFile( bool bGlobal=false );
 
 protected:
 
@@ -247,12 +247,12 @@ private:
    * @internal
    * copy-construction and assignment are not allowed
    */
-  KConfig( const KConfig& );
+  TDEConfig( const TDEConfig& );
   /**
    * @internal
    * copy-construction and assignment are not allowed
    */
-  KConfig& operator= ( const KConfig& rConfig );
+  TDEConfig& operator= ( const TDEConfig& rConfig );
 
 private:
   bool bGroupImmutable : 1; // Current group is immutable.
@@ -261,20 +261,20 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KConfigPrivate *d;
+  TDEConfigPrivate *d;
 };
 
 /**
- * KConfig variant using shared memory
+ * TDEConfig variant using shared memory
  *
- * KSharedConfig provides a reference counted, shared memory variant
- * of KConfig.
+ * TDESharedConfig provides a reference counted, shared memory variant
+ * of TDEConfig.
  */
-class TDECORE_EXPORT KSharedConfig : public KConfig, public KShared
+class TDECORE_EXPORT TDESharedConfig : public TDEConfig, public TDEShared
 {
-  friend class TQValueList<KSharedConfig*>;
+  friend class TQValueList<TDESharedConfig*>;
 public:
-  typedef KSharedPtr<KSharedConfig> Ptr;
+  typedef TDESharedPtr<TDESharedConfig> Ptr;
 
 public:  
   /**
@@ -283,14 +283,14 @@ public:
    * @param readOnly set the config object's read-only status
    * @param bUseKDEGlobals Toggle reading the global KDE configuration file.
    */
-  static KSharedConfig::Ptr openConfig(const TQString& fileName, bool readOnly = false,
+  static TDESharedConfig::Ptr openConfig(const TQString& fileName, bool readOnly = false,
     bool bUseKDEGlobals = true);
 
 private:
-  KSharedConfig( const TQString& fileName, bool readOnly, bool useKDEGlobals );
-  ~KSharedConfig();
+  TDESharedConfig( const TQString& fileName, bool readOnly, bool useKDEGlobals );
+  ~TDESharedConfig();
 
-  static TQValueList<KSharedConfig*> *s_list;
+  static TQValueList<TDESharedConfig*> *s_list;
 };
 
 #endif
diff --git a/tdecore/kconfig_compiler/CMakeLists.txt b/tdecore/tdeconfig_compiler/CMakeLists.txt
index 4acc09f51..a4f24c43e 100644
--- a/tdecore/kconfig_compiler/CMakeLists.txt
+++ b/tdecore/tdeconfig_compiler/CMakeLists.txt
@@ -20,10 +20,10 @@ link_directories(
 )
 
 
-##### kconfig_compiler ##########################
+##### tdeconfig_compiler ##########################
 
-tde_add_executable( kconfig_compiler
-  SOURCES kconfig_compiler.cpp
+tde_add_executable( tdeconfig_compiler
+  SOURCES tdeconfig_compiler.cpp
   LINK tdecore-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdecore/tdeconfig_compiler/Makefile.am b/tdecore/tdeconfig_compiler/Makefile.am
new file mode 100644
index 000000000..d5141f102
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/Makefile.am
@@ -0,0 +1,18 @@
+SUBDIRS = example tests
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
+
+bin_PROGRAMS = tdeconfig_compiler
+
+tdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeconfig_compiler_LDADD = $(LIB_TDECORE)
+tdeconfig_compiler_SOURCES = tdeconfig_compiler.cpp
+
+TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
+
+check-local:
+	for i in $(TESTFILES); \
+	  do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
+	  perl $(top_srcdir)/tdecore/tdeconfig_compiler/checkkcfg.pl \
+          $(top_srcdir)/tdecore/tdeconfig_compiler/tests/$$i; done
+	  
diff --git a/tdecore/kconfig_compiler/README.dox b/tdecore/tdeconfig_compiler/README.dox
index 36d9f988b..1b4926e96 100644
--- a/tdecore/kconfig_compiler/README.dox
+++ b/tdecore/tdeconfig_compiler/README.dox
@@ -1,10 +1,10 @@
 /**
-\page kconfig_compiler The KDE Configuration Compiler
+\page tdeconfig_compiler The KDE Configuration Compiler
 
-kconfig_compiler generates C++ source code from an XML file containing 
+tdeconfig_compiler generates C++ source code from an XML file containing 
 information about configuration options (.kcfg) and a file that provides 
 the code generation options (.kcfgc) The generated class is based on 
-KConfigSkeleton and provides an API for the application to access its
+TDEConfigSkeleton and provides an API for the application to access its
 configuration data.
 
 <h2>XML description of the configuration options</h2>
@@ -96,9 +96,9 @@ The following options are read from the kcfgc file:
 <tr>
   <td><b>Inherits</b></td>
   <td>string</td>
-  <td>KConfigSkeleton</td>
+  <td>TDEConfigSkeleton</td>
   <td>Class the generated class inherits from. This class must inherit
-  KConfigSkeleton.</td>
+  TDEConfigSkeleton.</td>
 </tr>
 <tr>
   <td><b>Visibility</b></td>
@@ -144,7 +144,7 @@ The following options are read from the kcfgc file:
   <td><b>ItemAccessors</b></td>
   <td>bool</td>
   <td>false</td>
-  <td>Generate accessor functions for the KConfigSkeletonItem objects
+  <td>Generate accessor functions for the TDEConfigSkeletonItem objects
   corresponding to the configuration options. If <b>SetUserTexts</b> is set,
   <b>ItemAccessors</b> also has to be set.</td>
 </tr>
diff --git a/tdecore/kconfig_compiler/TODO b/tdecore/tdeconfig_compiler/TODO
index e69de29bb..e69de29bb 100644
--- a/tdecore/kconfig_compiler/TODO
+++ b/tdecore/tdeconfig_compiler/TODO
diff --git a/tdecore/kconfig_compiler/checkkcfg.pl b/tdecore/tdeconfig_compiler/checkkcfg.pl
index 2eddbeee6..8d066b810 100755
--- a/tdecore/kconfig_compiler/checkkcfg.pl
+++ b/tdecore/tdeconfig_compiler/checkkcfg.pl
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
 
 $kcfgc = $file . "c";
 
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./tdeconfig_compiler $file $kcfgc";
 
 #print "CMD $cmd\n";
 
 if ( system( $cmd ) != 0 ) {
-  print STDERR "Unable to run kconfig_compiler\n";
+  print STDERR "Unable to run tdeconfig_compiler\n";
   exit 1;
 }
 
diff --git a/tdecore/kconfig_compiler/example/Makefile.am b/tdecore/tdeconfig_compiler/example/Makefile.am
index f7834ba63..612788f6b 100644
--- a/tdecore/kconfig_compiler/example/Makefile.am
+++ b/tdecore/tdeconfig_compiler/example/Makefile.am
@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
 check_PROGRAMS = example # autoexample
 EXTRA_PROGRAMS = autoexample
 
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 example_LDADD = $(LIB_TDECORE)
 example_SOURCES = example.cpp exampleprefs_base.cpp
 
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI)
 autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
   autoexample.cpp  
@@ -15,8 +15,8 @@ autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
 example.o exampleprefs_base.o: exampleprefs_base.h
 # avoid running the below command in parallel
 exampleprefs_base.cpp: exampleprefs_base.h
-exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg ../kconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
-	../kconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
+exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg ../tdeconfig_compiler $(srcdir)/exampleprefs_base.kcfgc
+	../tdeconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
 
 METASOURCES = AUTO
 
diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/tdeconfig_compiler/example/autoexample.cpp
index 2c4e4d442..6085fa6eb 100644
--- a/tdecore/kconfig_compiler/example/autoexample.cpp
+++ b/tdecore/tdeconfig_compiler/example/autoexample.cpp
@@ -24,31 +24,31 @@
 
 #include "exampleprefs_base.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <tqlabel.h>
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
+  TDEAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   ExamplePrefsBase configSkeleton( "dummy1", "dummy2" );
   configSkeleton.readConfig();
 
-  KConfigDialog *dialog = new KConfigDialog( 0, "settings", &configSkeleton );
+  TDEConfigDialog *dialog = new TDEConfigDialog( 0, "settings", &configSkeleton );
   
   GeneralBase *general = new GeneralBase( 0 );
   dialog->addPage( general, i18n("General"), "General", "" );
diff --git a/tdecore/kconfig_compiler/example/example.cpp b/tdecore/tdeconfig_compiler/example/example.cpp
index 146d2460f..157570d98 100644
--- a/tdecore/kconfig_compiler/example/example.cpp
+++ b/tdecore/tdeconfig_compiler/example/example.cpp
@@ -21,23 +21,23 @@
 
 #include "exampleprefs_base.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
+  TDEAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   ExamplePrefsBase *prefs = new ExamplePrefsBase("Trans1", "Folder2");
   
diff --git a/tdecore/kconfig_compiler/example/example.kcfg b/tdecore/tdeconfig_compiler/example/example.kcfg
index 076bfb644..076bfb644 100644
--- a/tdecore/kconfig_compiler/example/example.kcfg
+++ b/tdecore/tdeconfig_compiler/example/example.kcfg
diff --git a/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc b/tdecore/tdeconfig_compiler/example/exampleprefs_base.kcfgc
index 829ec2e29..9b72fdb07 100644
--- a/tdecore/kconfig_compiler/example/exampleprefs_base.kcfgc
+++ b/tdecore/tdeconfig_compiler/example/exampleprefs_base.kcfgc
@@ -1,9 +1,9 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=ExamplePrefsBase
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/tdecore/kconfig_compiler/example/general_base.ui b/tdecore/tdeconfig_compiler/example/general_base.ui
index 9b41370c7..9b41370c7 100644
--- a/tdecore/kconfig_compiler/example/general_base.ui
+++ b/tdecore/tdeconfig_compiler/example/general_base.ui
diff --git a/tdecore/kconfig_compiler/example/myoptions_base.ui b/tdecore/tdeconfig_compiler/example/myoptions_base.ui
index 3c0c2e6cb..3c0c2e6cb 100644
--- a/tdecore/kconfig_compiler/example/myoptions_base.ui
+++ b/tdecore/tdeconfig_compiler/example/myoptions_base.ui
diff --git a/tdecore/kconfig_compiler/kcfg.xsd b/tdecore/tdeconfig_compiler/kcfg.xsd
index 97f716d62..9eb18a068 100644
--- a/tdecore/kconfig_compiler/kcfg.xsd
+++ b/tdecore/tdeconfig_compiler/kcfg.xsd
@@ -29,7 +29,7 @@
     <xsd:annotation>
         <xsd:documentation>
             
-            A Schema for KDE's KConfigXT XML format. It is similar to the DTD
+            A Schema for KDE's TDEConfigXT XML format. It is similar to the DTD
             found at:
             
             http://www.kde.org/standards/kcfg/1.0/kcfg.dtd    
diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
index 55a3c7f34..207a78402 100644
--- a/tdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
@@ -27,25 +27,25 @@
 #include <tqdom.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
 #include <iostream>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "d", 0, 0 },
   { "directory <dir>", I18N_NOOP("Directory to generate files in"), "." },
   { "+file.kcfg", I18N_NOOP("Input kcfg XML file"), 0 },
   { "+file.kcfgc", I18N_NOOP("Code generation options file"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
@@ -627,7 +627,7 @@ TQString param( const TQString &type )
     else if ( type == "PathList" )    return "const TQStringList &";
     else if ( type == "Password" )    return "const TQString &";
     else {
-        kdError() <<"kconfig_compiler does not support type \""<< type <<"\""<<endl;
+        kdError() <<"tdeconfig_compiler does not support type \""<< type <<"\""<<endl;
         return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
     }
 }
@@ -657,7 +657,7 @@ TQString cppType( const TQString &type )
     else if ( type == "PathList" )    return TQSTRINGLIST_OBJECT_NAME_STRING;
     else if ( type == "Password" )    return TQSTRING_OBJECT_NAME_STRING;
     else {
-        kdError()<<"kconfig_compiler does not support type \""<< type <<"\""<<endl;
+        kdError()<<"tdeconfig_compiler does not support type \""<< type <<"\""<<endl;
         return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
     }
 }
@@ -666,7 +666,7 @@ TQString defaultValue( const TQString &type )
 {
     if ( type == "String" )           return "\"\""; // Use empty string, not null string!
     else if ( type == "StringList" )  return "TQStringList()";
-    else if ( type == "Font" )        return "KGlobalSettings::generalFont()";
+    else if ( type == "Font" )        return "TDEGlobalSettings::generalFont()";
     else if ( type == "Rect" )        return "TQRect()";
     else if ( type == "Size" )        return "TQSize()";
     else if ( type == "Color" )       return "TQColor(128, 128, 128)";
@@ -684,7 +684,7 @@ TQString defaultValue( const TQString &type )
     else if ( type == "PathList" )    return "TQStringList()";
     else if ( type == "Password" )    return "\"\""; // Use empty string, not null string!
     else {
-        kdWarning()<<"Error, kconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl;
+        kdWarning()<<"Error, tdeconfig_compiler doesn't support the \""<< type <<"\" type!"<<endl;
         return TQSTRING_OBJECT_NAME_STRING; //For now, but an assert would be better
     }
 }
@@ -706,7 +706,7 @@ static TQString itemDeclaration(const CfgEntry *e)
 
   TQString fCap = e->name();
   fCap[0] = fCap[0].upper();
-  return "  KConfigSkeleton::Item"+itemType( e->type() ) +
+  return "  TDEConfigSkeleton::Item"+itemType( e->type() ) +
          "  *item" + fCap +
          ( (!e->param().isEmpty())?(TQString("[%1]").arg(e->paramMax()+1)) : TQString()) +
          ";\n";
@@ -754,7 +754,7 @@ static TQString itemPath(const CfgEntry *e)
 TQString newItem( const TQString &type, const TQString &name, const TQString &key,
                  const TQString &defaultValue, const TQString &param = TQString())
 {
-  TQString t = "new KConfigSkeleton::Item" + itemType( type ) +
+  TQString t = "new TDEConfigSkeleton::Item" + itemType( type ) +
               "( currentGroup(), " + key + ", " + varPath( name ) + param;
   if ( type == "Enum" ) t += ", values" + name;
   if ( !defaultValue.isEmpty() ) {
@@ -952,8 +952,8 @@ TQString indent(TQString text, int spaces)
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
-    I18N_NOOP("KConfig Compiler") , KAboutData::License_LGPL );
+  TDEAboutData aboutData( "tdeconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
+    I18N_NOOP("TDEConfig Compiler") , TDEAboutData::License_LGPL );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
   aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
   aboutData.addAuthor( "Zack Rusin", 0, "zack@kde.org" );
@@ -962,12 +962,12 @@ int main( int argc, char **argv )
   aboutData.addCredit( "Duncan Mac-Vicar P.", "dpointer support",
       "duncan@kde.org", "http://www.mac-vicar.com/~duncan" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KInstance app( &aboutData );
+  TDEInstance app( &aboutData );
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->count() < 2 ) {
     kdError() << "Too few arguments." << endl;
@@ -1093,7 +1093,7 @@ int main( int argc, char **argv )
     }
   }
 
-  if ( inherits.isEmpty() ) inherits = "KConfigSkeleton";
+  if ( inherits.isEmpty() ) inherits = "TDEConfigSkeleton";
 
   if ( className.isEmpty() ) {
     kdError() << "Class name missing" << endl;
@@ -1134,7 +1134,7 @@ int main( int argc, char **argv )
 
   TQTextStream h( &header );
 
-  h << "// This file is generated by kconfig_compiler from " << args->url(0).fileName() << "." << endl;
+  h << "// This file is generated by tdeconfig_compiler from " << args->url(0).fileName() << "." << endl;
   h << "// All changes you do to this file will be lost." << endl;
 
   h << "#ifndef " << ( !nameSpace.isEmpty() ? nameSpace.upper() + "_" : "" )
@@ -1151,9 +1151,9 @@ int main( int argc, char **argv )
   if ( headerIncludes.count() > 0 ) h << endl;
 
   if ( !singleton && cfgFileNameArg && parameters.isEmpty() )
-    h << "#include <kglobal.h>" << endl;
+    h << "#include <tdeglobal.h>" << endl;
 
-  h << "#include <kconfigskeleton.h>" << endl;
+  h << "#include <tdeconfigskeleton.h>" << endl;
   h << "#include <kdebug.h>" << endl << endl;
 
   // Includes
@@ -1220,7 +1220,7 @@ int main( int argc, char **argv )
   if ( !singleton ) {
     h << "    " << className << "(";
     if (cfgFileNameArg)
-       h << " KSharedConfig::Ptr config" << (parameters.isEmpty() ? " = KGlobal::sharedConfig()" : ", ");
+       h << " TDESharedConfig::Ptr config" << (parameters.isEmpty() ? " = TDEGlobal::sharedConfig()" : ", ");
     for (TQValueList<Param>::ConstIterator it = parameters.begin();
          it != parameters.end(); ++it)
     {
@@ -1330,7 +1330,7 @@ int main( int argc, char **argv )
     h << "    static" << endl;
     h << "    void writeConfig()" << endl;
     h << "    {" << endl;
-    h << "      static_cast<KConfigSkeleton*>(self())->writeConfig();" << endl;
+    h << "      static_cast<TDEConfigSkeleton*>(self())->writeConfig();" << endl;
     h << "    }" << endl;
   }
 
@@ -1416,12 +1416,12 @@ int main( int argc, char **argv )
   TQTextStream cpp( &implementation );
 
 
-  cpp << "// This file is generated by kconfig_compiler from " << args->url(0).fileName() << "." << endl;
+  cpp << "// This file is generated by tdeconfig_compiler from " << args->url(0).fileName() << "." << endl;
   cpp << "// All changes you do to this file will be lost." << endl << endl;
 
   cpp << "#include \"" << headerFileName << "\"" << endl << endl;
 
-  if ( setUserTexts ) cpp << "#include <klocale.h>" << endl << endl;
+  if ( setUserTexts ) cpp << "#include <tdelocale.h>" << endl << endl;
 
   // Header required by singleton implementation
   if ( singleton )
@@ -1455,7 +1455,7 @@ int main( int argc, char **argv )
     }
     cpp << endl << "    // items" << endl;
     for( e = entries.first(); e; e = entries.next() ) {
-      cpp << "    KConfigSkeleton::Item" << itemType( e->type() ) << " *" << itemVar( e );
+      cpp << "    TDEConfigSkeleton::Item" << itemType( e->type() ) << " *" << itemVar( e );
       if (!e->param().isEmpty() ) cpp << TQString("[%1]").arg( e->paramMax()+1 );
         cpp << ";" << endl;
     }
@@ -1502,7 +1502,7 @@ int main( int argc, char **argv )
   cpp << className << "::" << className << "( ";
   if ( cfgFileNameArg ) {
     if ( !singleton )
-      cpp << " KSharedConfig::Ptr config";
+      cpp << " TDESharedConfig::Ptr config";
     else
       cpp << " const char *config";
     cpp << (parameters.isEmpty() ? " " : ", ");
@@ -1553,13 +1553,13 @@ int main( int argc, char **argv )
       cpp << e->code() << endl;
     }
     if ( e->type() == "Enum" ) {
-      cpp << "  TQValueList<KConfigSkeleton::ItemEnum::Choice> values"
+      cpp << "  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> values"
           << e->name() << ";" << endl;
       TQValueList<CfgEntry::Choice> choices = e->choices();
       TQValueList<CfgEntry::Choice>::ConstIterator it;
       for( it = choices.begin(); it != choices.end(); ++it ) {
         cpp << "  {" << endl;
-        cpp << "    KConfigSkeleton::ItemEnum::Choice choice;" << endl;
+        cpp << "    TDEConfigSkeleton::ItemEnum::Choice choice;" << endl;
         cpp << "    choice.name = TQString::fromLatin1( \"" << (*it).name << "\" );" << endl;
         if ( setUserTexts ) {
           if ( !(*it).label.isEmpty() )
@@ -1670,7 +1670,7 @@ int main( int argc, char **argv )
       if ( itemAccessors )
       {
         cpp << endl;
-        cpp << "KConfigSkeleton::Item" << itemType( e->type() ) << " *"
+        cpp << "TDEConfigSkeleton::Item" << itemType( e->type() ) << " *"
           << getFunction( n, className ) << "Item(";
         if (!e->param().isEmpty()) {
           cpp << " " << cppType(e->paramType()) << " i ";
diff --git a/tdecore/kconfig_compiler/tests/Makefile.am b/tdecore/tdeconfig_compiler/tests/Makefile.am
index 9462c800b..fa88f0b4b 100644
--- a/tdecore/kconfig_compiler/tests/Makefile.am
+++ b/tdecore/tdeconfig_compiler/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
 
 check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer
 
@@ -14,117 +14,117 @@ CLEANFILES = test1.cpp test1.h \
 						 test_dpointer.cpp test_dpointer.h \
              md5sums
 
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test1_LDADD = $(LIB_TDECORE)
 test1_SOURCES = test1main.cpp test1.cpp
 
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test2_LDADD = $(LIB_TDECORE)
 test2_SOURCES = test2main.cpp test2.cpp
 
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test3_LDADD = $(LIB_TDECORE)
 test3_SOURCES = test3main.cpp test3.cpp
 
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test4_LDADD = $(LIB_TDECORE)
 test4_SOURCES = test4main.cpp test4.cpp
 
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test5_LDADD = $(LIB_TDECORE)
 test5_SOURCES = test5main.cpp test5.cpp
 
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test6_LDADD = $(LIB_TDECORE)
 test6_SOURCES = test6main.cpp test6.cpp
 
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test7_LDADD = $(LIB_TDECORE)
 test7_SOURCES = test7main.cpp test7.cpp
 
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test8_LDADD = $(LIB_TDECORE)
 test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
 
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test9_LDADD = $(LIB_TDECORE)
 test9_SOURCES = test9main.cpp test9.cpp
 
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test_dpointer_LDADD = $(LIB_TDECORE)
 test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
 
-check_LTLIBRARIES = kunittest_kconfigcompiler_test.la
+check_LTLIBRARIES = tdeunittest_tdeconfigcompiler_test.la
 
-kunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp
-kunittest_kconfigcompiler_test_la_LIBADD = \
-	$(top_builddir)/kunittest/libkunittest.la
-kunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \
+tdeunittest_tdeconfigcompiler_test_la_SOURCES = tdeconfigcompiler_test.cpp
+tdeunittest_tdeconfigcompiler_test_la_LIBADD = \
+	$(top_builddir)/tdeunittest/libtdeunittest.la
+tdeunittest_tdeconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \
 	$(all_libraries)
 
 
 test1main.o test1.o: test1.h
 # avoid running the below command in parallel
 test1.cpp: test1.h
-test1.cpp test1.h: $(srcdir)/test1.kcfg ../kconfig_compiler $(srcdir)/test1.kcfgc
-	../kconfig_compiler $(srcdir)/test1.kcfg $(srcdir)/test1.kcfgc
+test1.cpp test1.h: $(srcdir)/test1.kcfg ../tdeconfig_compiler $(srcdir)/test1.kcfgc
+	../tdeconfig_compiler $(srcdir)/test1.kcfg $(srcdir)/test1.kcfgc
 
 test2main.o test2.o: test2.h
 # avoid running the below command in parallel
 test2.cpp: test2.h
-test2.cpp test2.h: $(srcdir)/test2.kcfg ../kconfig_compiler $(srcdir)/test2.kcfgc
-	../kconfig_compiler $(srcdir)/test2.kcfg $(srcdir)/test2.kcfgc
+test2.cpp test2.h: $(srcdir)/test2.kcfg ../tdeconfig_compiler $(srcdir)/test2.kcfgc
+	../tdeconfig_compiler $(srcdir)/test2.kcfg $(srcdir)/test2.kcfgc
 
 test3main.o test3.o: test3.h
 # avoid running the below command in parallel
 test3.cpp: test3.h
-test3.cpp test3.h: $(srcdir)/test3.kcfg ../kconfig_compiler $(srcdir)/test3.kcfgc
-	../kconfig_compiler $(srcdir)/test3.kcfg $(srcdir)/test3.kcfgc
+test3.cpp test3.h: $(srcdir)/test3.kcfg ../tdeconfig_compiler $(srcdir)/test3.kcfgc
+	../tdeconfig_compiler $(srcdir)/test3.kcfg $(srcdir)/test3.kcfgc
 
 test4main.o test4.o: test4.h
 # avoid running the below command in parallel
 test4.cpp: test4.h
-test4.cpp test4.h: $(srcdir)/test4.kcfg ../kconfig_compiler $(srcdir)/test4.kcfgc
-	../kconfig_compiler $(srcdir)/test4.kcfg $(srcdir)/test4.kcfgc
+test4.cpp test4.h: $(srcdir)/test4.kcfg ../tdeconfig_compiler $(srcdir)/test4.kcfgc
+	../tdeconfig_compiler $(srcdir)/test4.kcfg $(srcdir)/test4.kcfgc
 
 test5main.o test5.o: test5.h
 # avoid running the below command in parallel
 test5.cpp: test5.h
-test5.cpp test5.h: $(srcdir)/test5.kcfg ../kconfig_compiler $(srcdir)/test5.kcfgc
-	../kconfig_compiler $(srcdir)/test5.kcfg $(srcdir)/test5.kcfgc
+test5.cpp test5.h: $(srcdir)/test5.kcfg ../tdeconfig_compiler $(srcdir)/test5.kcfgc
+	../tdeconfig_compiler $(srcdir)/test5.kcfg $(srcdir)/test5.kcfgc
 
 test6main.o test6.o: test6.h
 # avoid running the below command in parallel
 test6.cpp: test6.h
-test6.cpp test6.h: $(srcdir)/test6.kcfg ../kconfig_compiler $(srcdir)/test6.kcfgc
-	../kconfig_compiler $(srcdir)/test6.kcfg $(srcdir)/test6.kcfgc
+test6.cpp test6.h: $(srcdir)/test6.kcfg ../tdeconfig_compiler $(srcdir)/test6.kcfgc
+	../tdeconfig_compiler $(srcdir)/test6.kcfg $(srcdir)/test6.kcfgc
 
 test7main.o test7.o: test7.h
 # avoid running the below command in parallel
 test7.cpp: test7.h
-test7.cpp test7.h: $(srcdir)/test7.kcfg ../kconfig_compiler $(srcdir)/test7.kcfgc
-	../kconfig_compiler $(srcdir)/test7.kcfg $(srcdir)/test7.kcfgc
+test7.cpp test7.h: $(srcdir)/test7.kcfg ../tdeconfig_compiler $(srcdir)/test7.kcfgc
+	../tdeconfig_compiler $(srcdir)/test7.kcfg $(srcdir)/test7.kcfgc
 
 test8main.o test8a.o test8b.o: test8a.h test8b.h
 # avoid running the below command in parallel
 test8a.cpp: test8a.h
-test8a.cpp test8a.h: $(srcdir)/test8a.kcfg ../kconfig_compiler $(srcdir)/test8a.kcfgc
-	../kconfig_compiler $(srcdir)/test8a.kcfg $(srcdir)/test8a.kcfgc
+test8a.cpp test8a.h: $(srcdir)/test8a.kcfg ../tdeconfig_compiler $(srcdir)/test8a.kcfgc
+	../tdeconfig_compiler $(srcdir)/test8a.kcfg $(srcdir)/test8a.kcfgc
 test8b.cpp: test8b.h
-test8b.cpp test8b.h: $(srcdir)/test8b.kcfg ../kconfig_compiler $(srcdir)/test8b.kcfgc
-	../kconfig_compiler $(srcdir)/test8b.kcfg $(srcdir)/test8b.kcfgc
+test8b.cpp test8b.h: $(srcdir)/test8b.kcfg ../tdeconfig_compiler $(srcdir)/test8b.kcfgc
+	../tdeconfig_compiler $(srcdir)/test8b.kcfg $(srcdir)/test8b.kcfgc
 
 test9main.o test9.o: test9.h
 # avoid running the below command in parallel
 test9.cpp: test9.h
-test9.cpp test9.h: $(srcdir)/test9.kcfg ../kconfig_compiler $(srcdir)/test9.kcfgc
-	../kconfig_compiler $(srcdir)/test9.kcfg $(srcdir)/test9.kcfgc
+test9.cpp test9.h: $(srcdir)/test9.kcfg ../tdeconfig_compiler $(srcdir)/test9.kcfgc
+	../tdeconfig_compiler $(srcdir)/test9.kcfg $(srcdir)/test9.kcfgc
 
 test_dpointer_main.o test_dpointer.o: test_dpointer.h
 # avoid running the below command in parallel
 test_dpointer.cpp: test_dpointer.h
-test_dpointer.cpp test_dpointer.h: $(srcdir)/test_dpointer.kcfg ../kconfig_compiler $(srcdir)/test_dpointer.kcfgc
-	../kconfig_compiler $(srcdir)/test_dpointer.kcfg $(srcdir)/test_dpointer.kcfgc
+test_dpointer.cpp test_dpointer.h: $(srcdir)/test_dpointer.kcfg ../tdeconfig_compiler $(srcdir)/test_dpointer.kcfgc
+	../tdeconfig_compiler $(srcdir)/test_dpointer.kcfg $(srcdir)/test_dpointer.kcfgc
 
 md5sums:
 	$(MD5SUM) $(srcdir)/test*.ref | sed -e "s,$(srcdir)/,,; s,\.ref$$,," > md5sums
diff --git a/tdecore/tdeconfig_compiler/tests/myprefs.h b/tdecore/tdeconfig_compiler/tests/myprefs.h
new file mode 100644
index 000000000..99ea62ec1
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/tests/myprefs.h
@@ -0,0 +1,7 @@
+#include <tdeconfigskeleton.h>
+
+class MyPrefs : public TDEConfigSkeleton
+{
+  public:
+    MyPrefs( const TQString &a ) : TDEConfigSkeleton( a ) {}
+};
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp
index 2f8e7eee3..e5bb3dcea 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp
@@ -1,5 +1,5 @@
 /*
-    Tests for KConfig Compiler
+    Tests for TDEConfig Compiler
 
     Copyright (c) 2005      by Duncan Mac-Vicar       <duncan@kde.org>
 
@@ -16,13 +16,13 @@
 #include <tqfile.h>
 #include <tqstring.h>
 #include <kdebug.h>
-#include <kunittest/module.h>
-#include "kconfigcompiler_test.h"
+#include <tdeunittest/module.h>
+#include "tdeconfigcompiler_test.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "KConfigXT")
-KUNITTEST_MODULE_REGISTER_TESTER( KConfigCompiler_Test )
+KUNITTEST_MODULE( tdeunittest_tdeconfigcompiler_test, "TDEConfigXT")
+KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
 
 typedef const char * CompilerTestSet[];
 
@@ -50,12 +50,12 @@ static CompilerTestSet willFailCases =
 };
 
 
-void KConfigCompiler_Test::allTests()
+void TDEConfigCompiler_Test::allTests()
 {
 	testExpectedOutput();
 }
 
-void KConfigCompiler_Test::testExpectedOutput()
+void TDEConfigCompiler_Test::testExpectedOutput()
 {
 	uint i = 0;
 	// Known to pass test cases
@@ -74,7 +74,7 @@ void KConfigCompiler_Test::testExpectedOutput()
 	}
 }
 
-void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
+void TDEConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
 {
 	TQFile file(fileName);
 	TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref"));
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h
index 36b33cd47..df3f4cf37 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.h
+++ b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h
@@ -1,5 +1,5 @@
 /*
-    Tests for KConfig Compiler
+    Tests for TDEConfig Compiler
 
     Copyright (c) 2005      by Duncan Mac-Vicar       <duncan@kde.org>
 
@@ -16,12 +16,12 @@
 #ifndef KCONFIGCOMPILER_TEST_H
 #define KCONFIGCOMPILER_TEST_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class TQString;
 
 // change to SlotTester when it works
-class KConfigCompiler_Test : public KUnitTest::Tester
+class TDEConfigCompiler_Test : public KUnitTest::Tester
 {
 public:
 	void allTests();
diff --git a/tdecore/tdeconfig_compiler/tests/test1.cpp.ref b/tdecore/tdeconfig_compiler/tests/test1.cpp.ref
new file mode 100644
index 000000000..50f084874
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/tests/test1.cpp.ref
@@ -0,0 +1,72 @@
+// This file is generated by tdeconfig_compiler from test1.kcfg.
+// All changes you do to this file will be lost.
+
+#include "test1.h"
+
+Test1::Test1(  const TQString & transport, const TQString & folder )
+  : TDEConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
+  , mParamtransport(transport)
+  , mParamfolder(folder)
+{
+  setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
+
+  TDEConfigSkeleton::ItemBool  *itemOneOption;
+  itemOneOption = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
+  addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) );
+  TDEConfigSkeleton::ItemInt  *itemAnotherOption;
+  itemAnotherOption = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
+  addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) );
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesListOption;
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "One" );
+    valuesListOption.append( choice );
+  }
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "Two" );
+    valuesListOption.append( choice );
+  }
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "Three" );
+    valuesListOption.append( choice );
+  }
+  TDEConfigSkeleton::ItemEnum  *itemListOption;
+  itemListOption = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
+  addItem( itemListOption, TQString::fromLatin1( "ListOption" ) );
+
+  setCurrentGroup( TQString::fromLatin1( "MyOptions" ) );
+
+  TDEConfigSkeleton::ItemString  *itemMyString;
+  itemMyString = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
+  addItem( itemMyString, TQString::fromLatin1( "MyString" ) );
+  TDEConfigSkeleton::ItemPath  *itemMyPath;
+  itemMyPath = new TDEConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
+  addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) );
+  TDEConfigSkeleton::ItemInt  *itemAnotherOption2;
+  itemAnotherOption2 = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
+  addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) );
+  TQStringList defaultMyStringList;
+  defaultMyStringList.append( TQString::fromUtf8( "up" ) );
+  defaultMyStringList.append( TQString::fromUtf8( "down" ) );
+
+  TDEConfigSkeleton::ItemStringList  *itemMyStringList;
+  itemMyStringList = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
+  TQStringList defaultMyStringListHidden;
+  defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) );
+  defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) );
+
+  TDEConfigSkeleton::ItemStringList  *itemMyStringListHidden;
+  itemMyStringListHidden = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
+  addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) );
+  TDEConfigSkeleton::ItemInt  *itemMyNumber;
+  itemMyNumber = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
+  addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) );
+}
+
+Test1::~Test1()
+{
+}
+
diff --git a/tdecore/kconfig_compiler/tests/test1.h.ref b/tdecore/tdeconfig_compiler/tests/test1.h.ref
index cc2d99c69..bb74038a5 100644
--- a/tdecore/kconfig_compiler/tests/test1.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test1.h.ref
@@ -1,13 +1,13 @@
-// This file is generated by kconfig_compiler from test1.kcfg.
+// This file is generated by tdeconfig_compiler from test1.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST1_H
 #define TEST1_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
-class Test1 : public KConfigSkeleton
+class Test1 : public TDEConfigSkeleton
 {
   public:
     class EnumListOption
diff --git a/tdecore/kconfig_compiler/tests/test1.kcfg b/tdecore/tdeconfig_compiler/tests/test1.kcfg
index ce42aebfb..ce42aebfb 100644
--- a/tdecore/kconfig_compiler/tests/test1.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test1.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test1.kcfgc b/tdecore/tdeconfig_compiler/tests/test1.kcfgc
index 3b74d7c51..dd086cdda 100644
--- a/tdecore/kconfig_compiler/tests/test1.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test1.kcfgc
@@ -1,9 +1,9 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=Test1
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/tdecore/kconfig_compiler/tests/test1main.cpp b/tdecore/tdeconfig_compiler/tests/test1main.cpp
index 976a7bbd6..79546639f 100644
--- a/tdecore/kconfig_compiler/tests/test1main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test1main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test1 *t = new Test1( TQString::null, TQString::null );
   delete t;
 }
diff --git a/tdecore/kconfig_compiler/tests/test2.cpp.ref b/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
index 2d56f7545..e66c5b9da 100644
--- a/tdecore/kconfig_compiler/tests/test2.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
@@ -1,68 +1,68 @@
-// This file is generated by kconfig_compiler from test2.kcfg.
+// This file is generated by tdeconfig_compiler from test2.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test2.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Test2::Test2(  )
   : MyPrefs( TQString::fromLatin1( "korganizerrc" ) )
 {
   setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  mAutoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
   mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
   addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
-  mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
+  mAutoSaveIntervalItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
   mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
   addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
-  mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
+  mConfirmItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
   mConfirmItem->setLabel( i18n("Confirm deletes") );
   addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) );
-  mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
+  mArchiveFileItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
   mArchiveFileItem->setLabel( i18n("Archive File") );
   addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
+  mDestinationItem = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
   mDestinationItem->setLabel( i18n("New Events/Todos Should") );
   addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
+  mHourSizeItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
   mHourSizeItem->setLabel( i18n("Hour Size") );
   addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) );
-  mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
+  mSelectionStartsEditorItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
   mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
   addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
@@ -72,22 +72,22 @@ Test2::Test2(  )
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
+  mSelectedPluginsItem = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
   mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") );
   addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
+  mHighlightColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
   mHighlightColorItem->setLabel( i18n("Highlight color") );
   addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
-  mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
+  mAgendaBgColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
   mAgendaBgColorItem->setLabel( i18n("Agenda view background color") );
   addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
+  mTimeBarFontItem = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
   mTimeBarFontItem->setLabel( i18n("Time bar") );
   addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
diff --git a/tdecore/kconfig_compiler/tests/test2.h.ref b/tdecore/tdeconfig_compiler/tests/test2.h.ref
index 6c0a74d66..47895ccaf 100644
--- a/tdecore/kconfig_compiler/tests/test2.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test2.h.ref
@@ -1,11 +1,11 @@
-// This file is generated by kconfig_compiler from test2.kcfg.
+// This file is generated by tdeconfig_compiler from test2.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST2_H
 #define TEST2_H
 
 #include <myprefs.h>
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test2 : public MyPrefs
diff --git a/tdecore/kconfig_compiler/tests/test2.kcfg b/tdecore/tdeconfig_compiler/tests/test2.kcfg
index 3b19e270e..3b19e270e 100644
--- a/tdecore/kconfig_compiler/tests/test2.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test2.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test2.kcfgc b/tdecore/tdeconfig_compiler/tests/test2.kcfgc
index 56620d2f4..e29040686 100644
--- a/tdecore/kconfig_compiler/tests/test2.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test2.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test2.kcfg
 ClassName=Test2
 Singleton=false
diff --git a/tdecore/kconfig_compiler/tests/test2main.cpp b/tdecore/tdeconfig_compiler/tests/test2main.cpp
index 904c57270..5970bf03d 100644
--- a/tdecore/kconfig_compiler/tests/test2main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test2main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test2 *t = new Test2();
   delete t;
 }
diff --git a/tdecore/tdeconfig_compiler/tests/test3.cpp.ref b/tdecore/tdeconfig_compiler/tests/test3.cpp.ref
new file mode 100644
index 000000000..be3e5c6c1
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/tests/test3.cpp.ref
@@ -0,0 +1,29 @@
+// This file is generated by tdeconfig_compiler from test3.kcfg.
+// All changes you do to this file will be lost.
+
+#include "test3.h"
+
+using namespace TestNameSpace;
+
+Test3::Test3(  )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
+{
+  setCurrentGroup( TQString::fromLatin1( "General" ) );
+
+  mAutoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+  addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+
+  setCurrentGroup( TQString::fromLatin1( "Blah" ) );
+
+  mBlubbItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
+  addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) );
+  mBlahBlahItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
+  addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) );
+  mMyPasswordItem = new TDEConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
+  addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) );
+}
+
+Test3::~Test3()
+{
+}
+
diff --git a/tdecore/kconfig_compiler/tests/test3.h.ref b/tdecore/tdeconfig_compiler/tests/test3.h.ref
index 75b1b0929..596e154e4 100644
--- a/tdecore/kconfig_compiler/tests/test3.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test3.h.ref
@@ -1,14 +1,14 @@
-// This file is generated by kconfig_compiler from test3.kcfg.
+// This file is generated by tdeconfig_compiler from test3.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TESTNAMESPACE_TEST3_H
 #define TESTNAMESPACE_TEST3_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 namespace TestNameSpace {
 
-class Test3 : public KConfigSkeleton
+class Test3 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test3.kcfg b/tdecore/tdeconfig_compiler/tests/test3.kcfg
index 77916da40..77916da40 100644
--- a/tdecore/kconfig_compiler/tests/test3.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test3.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test3.kcfgc b/tdecore/tdeconfig_compiler/tests/test3.kcfgc
index ca2c22057..d699810d0 100644
--- a/tdecore/kconfig_compiler/tests/test3.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test3.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test3.kcfg
 NameSpace=TestNameSpace
 ClassName=Test3
diff --git a/tdecore/kconfig_compiler/tests/test3main.cpp b/tdecore/tdeconfig_compiler/tests/test3main.cpp
index 9789d697d..f73ae38e3 100644
--- a/tdecore/kconfig_compiler/tests/test3main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test3main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   TestNameSpace::Test3 *t = new TestNameSpace::Test3();
   delete t;
 }
diff --git a/tdecore/tdeconfig_compiler/tests/test4.cpp.ref b/tdecore/tdeconfig_compiler/tests/test4.cpp.ref
new file mode 100644
index 000000000..c68437969
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/tests/test4.cpp.ref
@@ -0,0 +1,82 @@
+// This file is generated by tdeconfig_compiler from test4.kcfg.
+// All changes you do to this file will be lost.
+
+#include "test4.h"
+
+#include <kstaticdeleter.h>
+
+Test4 *Test4::mSelf = 0;
+static KStaticDeleter<Test4> staticTest4Deleter;
+
+Test4 *Test4::self()
+{
+  if ( !mSelf ) {
+    staticTest4Deleter.setObject( mSelf, new Test4() );
+    mSelf->readConfig();
+  }
+
+  return mSelf;
+}
+
+const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" };
+
+Test4::Test4(  )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+{
+  mSelf = this;
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
+
+TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
+  TDEConfigSkeleton::ItemColor  *itemColor[4];
+  itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
+  itemColor[1] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+  itemColor[2] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
+  itemColor[3] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "Encrypt" );
+    valuesMouseAction.append( choice );
+  }
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "Decrypt" );
+    valuesMouseAction.append( choice );
+  }
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "CrashNBurn" );
+    valuesMouseAction.append( choice );
+  }
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "PumpNDump" );
+    valuesMouseAction.append( choice );
+  }
+  TDEConfigSkeleton::ItemEnum  *itemMouseAction[3];
+  itemMouseAction[0] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
+  addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
+  itemMouseAction[1] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
+  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+  itemMouseAction[2] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
+  addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  itemAge->setMinValue(8);
+  itemAge->setMaxValue(88);
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
+}
+
+Test4::~Test4()
+{
+  if ( mSelf == this )
+    staticTest4Deleter.setObject( mSelf, 0, false );
+}
+
diff --git a/tdecore/kconfig_compiler/tests/test4.h.ref b/tdecore/tdeconfig_compiler/tests/test4.h.ref
index d11dd3aee..9901a4208 100644
--- a/tdecore/kconfig_compiler/tests/test4.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test4.h.ref
@@ -1,12 +1,12 @@
-// This file is generated by kconfig_compiler from test4.kcfg.
+// This file is generated by tdeconfig_compiler from test4.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST4_H
 #define TEST4_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
-class Test4 : public KConfigSkeleton
+class Test4 : public TDEConfigSkeleton
 {
   public:
     class EnumMouseAction
@@ -115,7 +115,7 @@ class Test4 : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test4();
diff --git a/tdecore/kconfig_compiler/tests/test4.kcfg b/tdecore/tdeconfig_compiler/tests/test4.kcfg
index d8ef2bfae..d8ef2bfae 100644
--- a/tdecore/kconfig_compiler/tests/test4.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test4.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test4.kcfgc b/tdecore/tdeconfig_compiler/tests/test4.kcfgc
index 754706dff..a81655b6c 100644
--- a/tdecore/kconfig_compiler/tests/test4.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test4.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test4.kcfg
 ClassName=Test4
 Singleton=true
diff --git a/tdecore/kconfig_compiler/tests/test4main.cpp b/tdecore/tdeconfig_compiler/tests/test4main.cpp
index 8b38b3dbd..5229d8a87 100644
--- a/tdecore/kconfig_compiler/tests/test4main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test4main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test4 *t = Test4::self();
   delete t;
 }
diff --git a/tdecore/tdeconfig_compiler/tests/test5.cpp.ref b/tdecore/tdeconfig_compiler/tests/test5.cpp.ref
new file mode 100644
index 000000000..17965999b
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/tests/test5.cpp.ref
@@ -0,0 +1,82 @@
+// This file is generated by tdeconfig_compiler from test5.kcfg.
+// All changes you do to this file will be lost.
+
+#include "test5.h"
+
+#include <kstaticdeleter.h>
+
+Test5 *Test5::mSelf = 0;
+static KStaticDeleter<Test5> staticTest5Deleter;
+
+Test5 *Test5::self()
+{
+  if ( !mSelf ) {
+    staticTest5Deleter.setObject( mSelf, new Test5() );
+    mSelf->readConfig();
+  }
+
+  return mSelf;
+}
+
+const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" };
+
+Test5::Test5(  )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+{
+  mSelf = this;
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
+
+TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
+  TDEConfigSkeleton::ItemColor  *itemColor[4];
+  itemColor[0] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+  addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
+  itemColor[1] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+  addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+  itemColor[2] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+  addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
+  itemColor[3] = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+  addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "Encrypt" );
+    valuesMouseAction.append( choice );
+  }
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "Decrypt" );
+    valuesMouseAction.append( choice );
+  }
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "CrashNBurn" );
+    valuesMouseAction.append( choice );
+  }
+  {
+    TDEConfigSkeleton::ItemEnum::Choice choice;
+    choice.name = TQString::fromLatin1( "PumpNDump" );
+    valuesMouseAction.append( choice );
+  }
+  TDEConfigSkeleton::ItemEnum  *itemMouseAction[3];
+  itemMouseAction[0] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
+  addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
+  itemMouseAction[1] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
+  addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+  itemMouseAction[2] = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
+  addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  itemAge->setMinValue(8);
+  itemAge->setMaxValue(88);
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
+}
+
+Test5::~Test5()
+{
+  if ( mSelf == this )
+    staticTest5Deleter.setObject( mSelf, 0, false );
+}
+
diff --git a/tdecore/kconfig_compiler/tests/test5.h.ref b/tdecore/tdeconfig_compiler/tests/test5.h.ref
index efb9b448a..e2f1f8118 100644
--- a/tdecore/kconfig_compiler/tests/test5.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test5.h.ref
@@ -1,12 +1,12 @@
-// This file is generated by kconfig_compiler from test5.kcfg.
+// This file is generated by tdeconfig_compiler from test5.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST5_H
 #define TEST5_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
-class Test5 : public KConfigSkeleton
+class Test5 : public TDEConfigSkeleton
 {
   public:
     enum { Encrypt, Decrypt, CrashNBurn, PumpNDump };
@@ -107,7 +107,7 @@ class Test5 : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test5();
diff --git a/tdecore/kconfig_compiler/tests/test5.kcfg b/tdecore/tdeconfig_compiler/tests/test5.kcfg
index d8ef2bfae..d8ef2bfae 100644
--- a/tdecore/kconfig_compiler/tests/test5.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test5.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test5.kcfgc b/tdecore/tdeconfig_compiler/tests/test5.kcfgc
index 663005e5e..dbc5603a0 100644
--- a/tdecore/kconfig_compiler/tests/test5.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test5.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test5.kcfg
 ClassName=Test5
 Singleton=true
diff --git a/tdecore/kconfig_compiler/tests/test5main.cpp b/tdecore/tdeconfig_compiler/tests/test5main.cpp
index 57ad5189d..89f28587f 100644
--- a/tdecore/kconfig_compiler/tests/test5main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test5main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test5 *t = Test5::self();
   delete t;
 }
diff --git a/tdecore/tdeconfig_compiler/tests/test6.cpp.ref b/tdecore/tdeconfig_compiler/tests/test6.cpp.ref
new file mode 100644
index 000000000..36717a7c8
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/tests/test6.cpp.ref
@@ -0,0 +1,31 @@
+// This file is generated by tdeconfig_compiler from test6.kcfg.
+// All changes you do to this file will be lost.
+
+#include "test6.h"
+
+Test6::Test6(  const TQString & Number )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
+  , mParamNumber(Number)
+{
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
+
+  TDEConfigSkeleton::ItemColor  *itemColor;
+  itemColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  addItem( itemColor, TQString::fromLatin1( "Color" ) );
+
+  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
+
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  itemAge->setMinValue(8);
+  itemAge->setMaxValue(88);
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
+}
+
+Test6::~Test6()
+{
+}
+
diff --git a/tdecore/kconfig_compiler/tests/test6.h.ref b/tdecore/tdeconfig_compiler/tests/test6.h.ref
index 6743d6064..da83c90c4 100644
--- a/tdecore/kconfig_compiler/tests/test6.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test6.h.ref
@@ -1,12 +1,12 @@
-// This file is generated by kconfig_compiler from test6.kcfg.
+// This file is generated by tdeconfig_compiler from test6.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST6_H
 #define TEST6_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
-class Test6 : public KConfigSkeleton
+class Test6 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test6.kcfg b/tdecore/tdeconfig_compiler/tests/test6.kcfg
index e59fa88f3..e59fa88f3 100644
--- a/tdecore/kconfig_compiler/tests/test6.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test6.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test6.kcfgc b/tdecore/tdeconfig_compiler/tests/test6.kcfgc
index b69dc152d..4c395ac08 100644
--- a/tdecore/kconfig_compiler/tests/test6.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test6.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test6.kcfg
 ClassName=Test6
 Singleton=false
diff --git a/tdecore/kconfig_compiler/tests/test6main.cpp b/tdecore/tdeconfig_compiler/tests/test6main.cpp
index 27dff57ff..9b1b7503e 100644
--- a/tdecore/kconfig_compiler/tests/test6main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test6main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test6 *t = new Test6(TQString::null);
   delete t;
 }
diff --git a/tdecore/tdeconfig_compiler/tests/test7.cpp.ref b/tdecore/tdeconfig_compiler/tests/test7.cpp.ref
new file mode 100644
index 000000000..e4b5f08f9
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/tests/test7.cpp.ref
@@ -0,0 +1,31 @@
+// This file is generated by tdeconfig_compiler from test7.kcfg.
+// All changes you do to this file will be lost.
+
+#include "test7.h"
+
+Test7::Test7(  int Number )
+  : TDEConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
+  , mParamNumber(Number)
+{
+  setCurrentGroup( TQString::fromLatin1( "Foo" ) );
+
+  TDEConfigSkeleton::ItemColor  *itemColor;
+  itemColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+  addItem( itemColor, TQString::fromLatin1( "Color" ) );
+
+  setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
+
+  TDEConfigSkeleton::ItemString  *itemFooBar;
+  itemFooBar = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+  addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
+  TDEConfigSkeleton::ItemInt  *itemAge;
+  itemAge = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
+  itemAge->setMinValue(8);
+  itemAge->setMaxValue(88);
+  addItem( itemAge, TQString::fromLatin1( "Age" ) );
+}
+
+Test7::~Test7()
+{
+}
+
diff --git a/tdecore/kconfig_compiler/tests/test7.h.ref b/tdecore/tdeconfig_compiler/tests/test7.h.ref
index 8f8808da1..8bd22ae97 100644
--- a/tdecore/kconfig_compiler/tests/test7.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test7.h.ref
@@ -1,12 +1,12 @@
-// This file is generated by kconfig_compiler from test7.kcfg.
+// This file is generated by tdeconfig_compiler from test7.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST7_H
 #define TEST7_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
-class Test7 : public KConfigSkeleton
+class Test7 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test7.kcfg b/tdecore/tdeconfig_compiler/tests/test7.kcfg
index 0a7fd3272..0a7fd3272 100644
--- a/tdecore/kconfig_compiler/tests/test7.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test7.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test7.kcfgc b/tdecore/tdeconfig_compiler/tests/test7.kcfgc
index 9a6c40954..c50aac7e3 100644
--- a/tdecore/kconfig_compiler/tests/test7.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test7.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test7.kcfg
 ClassName=Test7
 Singleton=false
diff --git a/tdecore/kconfig_compiler/tests/test7main.cpp b/tdecore/tdeconfig_compiler/tests/test7main.cpp
index 9c1ad1931..81cca0184 100644
--- a/tdecore/kconfig_compiler/tests/test7main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test7main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test7 *t = new Test7(42);
   delete t;
 }
diff --git a/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref b/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref
new file mode 100644
index 000000000..6181295eb
--- /dev/null
+++ b/tdecore/tdeconfig_compiler/tests/test8a.cpp.ref
@@ -0,0 +1,22 @@
+// This file is generated by tdeconfig_compiler from test8a.kcfg.
+// All changes you do to this file will be lost.
+
+#include "test8a.h"
+
+Test8a::Test8a(  TDESharedConfig::Ptr config  )
+  : TDEConfigSkeleton( config )
+{
+  setCurrentGroup( TQString::fromLatin1( "Group" ) );
+
+  TDEConfigSkeleton::ItemFont  *itemFont;
+  itemFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, TDEGlobalSettings::generalFont() );
+  addItem( itemFont, TQString::fromLatin1( "Font" ) );
+  TDEConfigSkeleton::ItemFont  *itemTitleFont;
+  itemTitleFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, TDEGlobalSettings::windowTitleFont() );
+  addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
+}
+
+Test8a::~Test8a()
+{
+}
+
diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
index 2e947c437..a1e5b7e37 100644
--- a/tdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
@@ -1,17 +1,17 @@
-// This file is generated by kconfig_compiler from test8a.kcfg.
+// This file is generated by tdeconfig_compiler from test8a.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST8A_H
 #define TEST8A_H
 
-#include <kglobal.h>
-#include <kconfigskeleton.h>
+#include <tdeglobal.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
-class Test8a : public KConfigSkeleton
+class Test8a : public TDEConfigSkeleton
 {
   public:
 
-    Test8a( KSharedConfig::Ptr config = KGlobal::sharedConfig() );
+    Test8a( TDESharedConfig::Ptr config = TDEGlobal::sharedConfig() );
     ~Test8a();
 
     /**
diff --git a/tdecore/kconfig_compiler/tests/test8a.kcfg b/tdecore/tdeconfig_compiler/tests/test8a.kcfg
index 5ee87199f..53448b624 100644
--- a/tdecore/kconfig_compiler/tests/test8a.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test8a.kcfg
@@ -7,11 +7,11 @@
 
   <group name="Group">
     <entry name="Font" type="Font">
-      <default code="true">KGlobalSettings::generalFont()</default>
+      <default code="true">TDEGlobalSettings::generalFont()</default>
     </entry>
 
     <entry name="TitleFont" type="Font">
-      <default code="true">KGlobalSettings::windowTitleFont()</default>
+      <default code="true">TDEGlobalSettings::windowTitleFont()</default>
     </entry>
   </group>
 </kcfg>
diff --git a/tdecore/kconfig_compiler/tests/test8a.kcfgc b/tdecore/tdeconfig_compiler/tests/test8a.kcfgc
index 5f63c31c2..5f63c31c2 100644
--- a/tdecore/kconfig_compiler/tests/test8a.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test8a.kcfgc
diff --git a/tdecore/kconfig_compiler/tests/test8b.cpp.ref b/tdecore/tdeconfig_compiler/tests/test8b.cpp.ref
index e29e3c4e7..288faeb12 100644
--- a/tdecore/kconfig_compiler/tests/test8b.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8b.cpp.ref
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from test8b.kcfg.
+// This file is generated by tdeconfig_compiler from test8b.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test8b.h"
@@ -24,17 +24,17 @@ Test8b::Test8b(  )
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "Group8b1" ) );
 
-  KConfigSkeleton::ItemUInt  *itemSomething;
-  itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
+  TDEConfigSkeleton::ItemUInt  *itemSomething;
+  itemSomething = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
   addItem( itemSomething, TQString::fromLatin1( "Something" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Group8b2" ) );
 
-  KConfigSkeleton::ItemBool  *itemFooBoo;
-  itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
+  TDEConfigSkeleton::ItemBool  *itemFooBoo;
+  itemFooBoo = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
   addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) );
-  KConfigSkeleton::ItemUInt  *itemPort;
-  itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
+  TDEConfigSkeleton::ItemUInt  *itemPort;
+  itemPort = new TDEConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
   addItem( itemPort, TQString::fromLatin1( "Port" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test8b.h.ref b/tdecore/tdeconfig_compiler/tests/test8b.h.ref
index 4ca0d5c7f..82ab5d92b 100644
--- a/tdecore/kconfig_compiler/tests/test8b.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8b.h.ref
@@ -1,11 +1,11 @@
-// This file is generated by kconfig_compiler from test8b.kcfg.
+// This file is generated by tdeconfig_compiler from test8b.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST8B_H
 #define TEST8B_H
 
 #include <test8a.h>
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class Test8b : public Test8a
@@ -75,7 +75,7 @@ class Test8b : public Test8a
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     Test8b();
diff --git a/tdecore/kconfig_compiler/tests/test8b.kcfg b/tdecore/tdeconfig_compiler/tests/test8b.kcfg
index 3e203a155..3e203a155 100644
--- a/tdecore/kconfig_compiler/tests/test8b.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test8b.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test8b.kcfgc b/tdecore/tdeconfig_compiler/tests/test8b.kcfgc
index 7be055203..7be055203 100644
--- a/tdecore/kconfig_compiler/tests/test8b.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test8b.kcfgc
diff --git a/tdecore/kconfig_compiler/tests/test8main.cpp b/tdecore/tdeconfig_compiler/tests/test8main.cpp
index b3c242f68..2611a48af 100644
--- a/tdecore/kconfig_compiler/tests/test8main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test8main.cpp
@@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
-  Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) );
+  TDEInstance i("test");
+  Test8a *config1 = new Test8a( TDESharedConfig::openConfig( TQString::null ) );
   Test8a *config2 = new Test8a();
   Test8b::self();
   delete config1;
diff --git a/tdecore/kconfig_compiler/tests/test9.cpp.ref b/tdecore/tdeconfig_compiler/tests/test9.cpp.ref
index c5d57e4d1..a5ee144aa 100644
--- a/tdecore/kconfig_compiler/tests/test9.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test9.cpp.ref
@@ -1,10 +1,10 @@
-// This file is generated by kconfig_compiler from test9.kcfg.
+// This file is generated by tdeconfig_compiler from test9.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test9.h"
 
 Test9::Test9(  const TQString & transport, const TQString & folder )
-  : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
   , mParamtransport(transport)
   , mParamfolder(folder)
 {
@@ -14,18 +14,18 @@ Test9::Test9(  const TQString & transport, const TQString & folder )
   defaultMyStringList.append( TQString::fromUtf8( "up" ) );
   defaultMyStringList.append( TQString::fromUtf8( "down" ) );
 
-  KConfigSkeleton::ItemStringList  *itemMyStringList;
-  itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+  TDEConfigSkeleton::ItemStringList  *itemMyStringList;
+  itemMyStringList = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
   addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
   TQStringList defaultMyPathList;
   defaultMyPathList.append( TQString::fromUtf8( "/home" ) );
   defaultMyPathList.append( TQString::fromUtf8( "~" ) );
 
-  KConfigSkeleton::ItemPathList  *itemMyPathList;
-  itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
+  TDEConfigSkeleton::ItemPathList  *itemMyPathList;
+  itemMyPathList = new TDEConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
   addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) );
-  KConfigSkeleton::ItemPathList  *itemMyPathsList2;
-  itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
+  TDEConfigSkeleton::ItemPathList  *itemMyPathsList2;
+  itemMyPathsList2 = new TDEConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
   addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) );
 }
 
diff --git a/tdecore/kconfig_compiler/tests/test9.h.ref b/tdecore/tdeconfig_compiler/tests/test9.h.ref
index 66a629b48..23755f411 100644
--- a/tdecore/kconfig_compiler/tests/test9.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test9.h.ref
@@ -1,13 +1,13 @@
-// This file is generated by kconfig_compiler from test9.kcfg.
+// This file is generated by tdeconfig_compiler from test9.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TEST9_H
 #define TEST9_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 #include <tqdir.h>
-class Test9 : public KConfigSkeleton
+class Test9 : public TDEConfigSkeleton
 {
   public:
 
diff --git a/tdecore/kconfig_compiler/tests/test9.kcfg b/tdecore/tdeconfig_compiler/tests/test9.kcfg
index b7495e2b6..b7495e2b6 100644
--- a/tdecore/kconfig_compiler/tests/test9.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test9.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test9.kcfgc b/tdecore/tdeconfig_compiler/tests/test9.kcfgc
index 8f124fc25..47f5e5f43 100644
--- a/tdecore/kconfig_compiler/tests/test9.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test9.kcfgc
@@ -1,9 +1,9 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 ClassName=Test9
 #
 # Singleton=false
 #
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 #
 # IncludeFiles=libtdepim/kpimprefs.h
 #
diff --git a/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/tdeconfig_compiler/tests/test9main.cpp
index 39b904af9..8668d8d8c 100644
--- a/tdecore/kconfig_compiler/tests/test9main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test9main.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test9 *t = new Test9( TQString::null, TQString::null );
 
   TQStringList myPathsList2 = t->myPathsList2();
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
index 7b5f55f03..b3fde4334 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
@@ -1,9 +1,9 @@
-// This file is generated by kconfig_compiler from test_dpointer.kcfg.
+// This file is generated by tdeconfig_compiler from test_dpointer.kcfg.
 // All changes you do to this file will be lost.
 
 #include "test_dpointer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kstaticdeleter.h>
 
@@ -33,17 +33,17 @@ class TestDPointerPrivate
     TQFont timeBarFont;
 
     // items
-    KConfigSkeleton::ItemBool *autoSaveItem;
-    KConfigSkeleton::ItemInt *autoSaveIntervalItem;
-    KConfigSkeleton::ItemBool *confirmItem;
-    KConfigSkeleton::ItemString *archiveFileItem;
-    KConfigSkeleton::ItemEnum *destinationItem;
-    KConfigSkeleton::ItemInt *hourSizeItem;
-    KConfigSkeleton::ItemBool *selectionStartsEditorItem;
-    KConfigSkeleton::ItemStringList *selectedPluginsItem;
-    KConfigSkeleton::ItemColor *highlightColorItem;
-    KConfigSkeleton::ItemColor *agendaBgColorItem;
-    KConfigSkeleton::ItemFont *timeBarFontItem;
+    TDEConfigSkeleton::ItemBool *autoSaveItem;
+    TDEConfigSkeleton::ItemInt *autoSaveIntervalItem;
+    TDEConfigSkeleton::ItemBool *confirmItem;
+    TDEConfigSkeleton::ItemString *archiveFileItem;
+    TDEConfigSkeleton::ItemEnum *destinationItem;
+    TDEConfigSkeleton::ItemInt *hourSizeItem;
+    TDEConfigSkeleton::ItemBool *selectionStartsEditorItem;
+    TDEConfigSkeleton::ItemStringList *selectedPluginsItem;
+    TDEConfigSkeleton::ItemColor *highlightColorItem;
+    TDEConfigSkeleton::ItemColor *agendaBgColorItem;
+    TDEConfigSkeleton::ItemFont *timeBarFontItem;
 };
 
 TestDPointer *TestDPointer::mSelf = 0;
@@ -60,65 +60,65 @@ TestDPointer *TestDPointer::self()
 }
 
 TestDPointer::TestDPointer(  )
-  : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
+  : TDEConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
 {
   d = new TestDPointerPrivate;
   mSelf = this;
   setCurrentGroup( TQString::fromLatin1( "General" ) );
 
-  d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
+  d->autoSaveItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
   d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
   d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
   addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) );
-  d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
+  d->autoSaveIntervalItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
   d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
   addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
-  d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
+  d->confirmItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
   d->confirmItem->setLabel( i18n("Confirm deletes") );
   addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) );
-  d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
+  d->archiveFileItem = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
   d->archiveFileItem->setLabel( i18n("Archive File") );
   addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
-  TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
+  TQValueList<TDEConfigSkeleton::ItemEnum::Choice> valuesDestination;
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "standardDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "askDestination" );
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl1" );
     choice.label = i18n("Argl1 Label");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl2" );
     choice.whatsThis = i18n("Argl2 Whatsthis");
     valuesDestination.append( choice );
   }
   {
-    KConfigSkeleton::ItemEnum::Choice choice;
+    TDEConfigSkeleton::ItemEnum::Choice choice;
     choice.name = TQString::fromLatin1( "argl3" );
     choice.label = i18n("Argl3 Label");
     choice.whatsThis = i18n("Argl3 Whatsthis");
     valuesDestination.append( choice );
   }
-  d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
+  d->destinationItem = new TDEConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
   d->destinationItem->setLabel( i18n("New Events/Todos Should") );
   addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Views" ) );
 
-  d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
+  d->hourSizeItem = new TDEConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
   d->hourSizeItem->setLabel( i18n("Hour Size") );
   addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) );
-  d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
+  d->selectionStartsEditorItem = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
   d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
   addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
 
@@ -128,22 +128,22 @@ TestDPointer::TestDPointer(  )
   defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
   defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
 
-  d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
+  d->selectedPluginsItem = new TDEConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
   d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") );
   addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Colors" ) );
 
-  d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
+  d->highlightColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
   d->highlightColorItem->setLabel( i18n("Highlight color") );
   addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
-  d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
+  d->agendaBgColorItem = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
   d->agendaBgColorItem->setLabel( i18n("Agenda view background color") );
   addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
 
   setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
 
-  d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
+  d->timeBarFontItem = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
   d->timeBarFontItem->setLabel( i18n("Time bar") );
   addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
 }
@@ -160,7 +160,7 @@ bool TestDPointer::autoSave()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
 {
   return d->autoSaveItem;
 }
@@ -177,7 +177,7 @@ int TestDPointer::autoSaveInterval()
 }
 
 
-KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
+TDEConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
 {
   return d->autoSaveIntervalItem;
 }
@@ -194,7 +194,7 @@ bool TestDPointer::confirm()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::confirmItem()
 {
   return d->confirmItem;
 }
@@ -211,7 +211,7 @@ TQString TestDPointer::archiveFile()
 }
 
 
-KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
+TDEConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
 {
   return d->archiveFileItem;
 }
@@ -228,7 +228,7 @@ int TestDPointer::destination()
 }
 
 
-KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
+TDEConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
 {
   return d->destinationItem;
 }
@@ -245,7 +245,7 @@ int TestDPointer::hourSize()
 }
 
 
-KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
+TDEConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
 {
   return d->hourSizeItem;
 }
@@ -262,7 +262,7 @@ bool TestDPointer::selectionStartsEditor()
 }
 
 
-KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
+TDEConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
 {
   return d->selectionStartsEditorItem;
 }
@@ -279,7 +279,7 @@ TQStringList TestDPointer::selectedPlugins()
 }
 
 
-KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
+TDEConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
 {
   return d->selectedPluginsItem;
 }
@@ -296,7 +296,7 @@ TQColor TestDPointer::highlightColor()
 }
 
 
-KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
+TDEConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
 {
   return d->highlightColorItem;
 }
@@ -313,7 +313,7 @@ TQColor TestDPointer::agendaBgColor()
 }
 
 
-KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
+TDEConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
 {
   return d->agendaBgColorItem;
 }
@@ -330,7 +330,7 @@ TQFont TestDPointer::timeBarFont()
 }
 
 
-KConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem()
+TDEConfigSkeleton::ItemFont *TestDPointer::timeBarFontItem()
 {
   return d->timeBarFontItem;
 }
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref b/tdecore/tdeconfig_compiler/tests/test_dpointer.h.ref
index 81f281e83..0bd7e771e 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.h.ref
@@ -1,14 +1,14 @@
-// This file is generated by kconfig_compiler from test_dpointer.kcfg.
+// This file is generated by tdeconfig_compiler from test_dpointer.kcfg.
 // All changes you do to this file will be lost.
 #ifndef TESTDPOINTER_H
 #define TESTDPOINTER_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
 
 class TestDPointerPrivate;
 
-class TestDPointer : public KConfigSkeleton
+class TestDPointer : public TDEConfigSkeleton
 {
   public:
     class EnumDestination
@@ -210,7 +210,7 @@ class TestDPointer : public KConfigSkeleton
     static
     void writeConfig()
     {
-      static_cast<KConfigSkeleton*>(self())->writeConfig();
+      static_cast<TDEConfigSkeleton*>(self())->writeConfig();
     }
   protected:
     TestDPointer();
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.kcfg b/tdecore/tdeconfig_compiler/tests/test_dpointer.kcfg
index 3b19e270e..3b19e270e 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.kcfg
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.kcfg
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.kcfgc b/tdecore/tdeconfig_compiler/tests/test_dpointer.kcfgc
index 48baa376e..83f4bce3b 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.kcfgc
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=test_dpointer.kcfg
 ClassName=TestDPointer
 Singleton=true
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp b/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp
index a6c23c8fe..b62ee17af 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer_main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   TestDPointer *t = TestDPointer::self();
   delete t;
 }
diff --git a/tdecore/kconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index efb2a20a9..6d5197ff7 100644
--- a/tdecore/kconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -39,12 +39,12 @@
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 
-#include "kconfigbackend.h"
-#include "kconfigbase.h"
-#include <kapplication.h>
-#include <kglobal.h>
+#include "tdeconfigbackend.h"
+#include "tdeconfigbase.h"
+#include <tdeapplication.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
 #include <kurl.h>
@@ -231,16 +231,16 @@ static TQCString decodeKey(const char* key)
     return newKey;
 }
 
-class KConfigBackEnd::KConfigBackEndPrivate
+class TDEConfigBackEnd::TDEConfigBackEndPrivate
 {
 public:
    TQDateTime localLastModified;
    uint      localLastSize;
-   KLockFile::Ptr localLockFile;
-   KLockFile::Ptr globalLockFile;
+   TDELockFile::Ptr localLockFile;
+   TDELockFile::Ptr globalLockFile;
 };
 
-void KConfigBackEnd::changeFileName(const TQString &_fileName,
+void TDEConfigBackEnd::changeFileName(const TQString &_fileName,
                                     const char * _resType,
                                     bool _useKDEGlobals)
 {
@@ -254,11 +254,11 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
       mLocalFileName = mfileName;
    }
    else {
-      mLocalFileName = KGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName;
+      mLocalFileName = TDEGlobal::dirs()->saveLocation(resType, TQString(), false) + mfileName;
    }
 
    if (useKDEGlobals) {
-      mGlobalFileName = KGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals");
+      mGlobalFileName = TDEGlobal::dirs()->saveLocation("config", TQString(), false) + TQString::fromLatin1("kdeglobals");
    }
    else {
       mGlobalFileName = TQString::null;
@@ -270,7 +270,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
    d->globalLockFile = 0;
 }
 
-KLockFile::Ptr KConfigBackEnd::lockFile(bool bGlobal)
+TDELockFile::Ptr TDEConfigBackEnd::lockFile(bool bGlobal)
 {
    if (bGlobal)
    {
@@ -279,7 +279,7 @@ KLockFile::Ptr KConfigBackEnd::lockFile(bool bGlobal)
       
       if (!mGlobalFileName.isEmpty())
       {
-         d->globalLockFile = new KLockFile(mGlobalFileName+".lock");
+         d->globalLockFile = new TDELockFile(mGlobalFileName+".lock");
          return d->globalLockFile;
       }
    }
@@ -290,42 +290,42 @@ KLockFile::Ptr KConfigBackEnd::lockFile(bool bGlobal)
       
       if (!mLocalFileName.isEmpty())
       {
-         d->localLockFile = new KLockFile(mLocalFileName+".lock");
+         d->localLockFile = new TDELockFile(mLocalFileName+".lock");
          return d->localLockFile;
       }
    }
    return 0;
 }
 
-KConfigBackEnd::KConfigBackEnd(KConfigBase *_config,
+TDEConfigBackEnd::TDEConfigBackEnd(TDEConfigBase *_config,
 			       const TQString &_fileName,
 			       const char * _resType,
 			       bool _useKDEGlobals)
-  : pConfig(_config), bFileImmutable(false), mConfigState(KConfigBase::NoAccess), mFileMode(-1)
+  : pConfig(_config), bFileImmutable(false), mConfigState(TDEConfigBase::NoAccess), mFileMode(-1)
 {
-   d = new KConfigBackEndPrivate;
+   d = new TDEConfigBackEndPrivate;
    changeFileName(_fileName, _resType, _useKDEGlobals);
 }
 
-KConfigBackEnd::~KConfigBackEnd()
+TDEConfigBackEnd::~TDEConfigBackEnd()
 {
    delete d;
 }
 
-void KConfigBackEnd::setFileWriteMode(int mode)
+void TDEConfigBackEnd::setFileWriteMode(int mode)
 {
   mFileMode = mode;
 }
 
-bool KConfigINIBackEnd::parseConfigFiles()
+bool TDEConfigINIBackEnd::parseConfigFiles()
 {
   // Check if we can write to the local file.
-  mConfigState = KConfigBase::ReadOnly;
+  mConfigState = TDEConfigBase::ReadOnly;
   if (!mLocalFileName.isEmpty() && !pConfig->isReadOnly())
   {
      if (checkAccess(mLocalFileName, W_OK))
      {
-        mConfigState = KConfigBase::ReadWrite;
+        mConfigState = TDEConfigBase::ReadWrite;
      }
      else
      {
@@ -333,11 +333,11 @@ bool KConfigINIBackEnd::parseConfigFiles()
         KURL path;
         path.setPath(mLocalFileName);
         TQString dir=path.directory();
-        KStandardDirs::makeDir(dir);
+        TDEStandardDirs::makeDir(dir);
 
         if (checkAccess(mLocalFileName, W_OK))
         {
-           mConfigState = KConfigBase::ReadWrite;
+           mConfigState = TDEConfigBase::ReadWrite;
         }
      }
      TQFileInfo info(mLocalFileName);
@@ -350,7 +350,7 @@ bool KConfigINIBackEnd::parseConfigFiles()
 
   // Parse the general config files
   if (useKDEGlobals) {
-    TQStringList kdercs = KGlobal::dirs()->
+    TQStringList kdercs = TDEGlobal::dirs()->
       findAllResources("config", TQString::fromLatin1("kdeglobals"));
 
 #ifdef Q_WS_WIN
@@ -362,7 +362,7 @@ bool KConfigINIBackEnd::parseConfigFiles()
     if (checkAccess(etc_kderc, R_OK))
       kdercs += etc_kderc;
 
-    kdercs += KGlobal::dirs()->
+    kdercs += TDEGlobal::dirs()->
       findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
 
     TQStringList::ConstIterator it;
@@ -383,9 +383,9 @@ bool KConfigINIBackEnd::parseConfigFiles()
   while(bReadFile) {
     bReadFile = false;
     TQString bootLanguage;
-    if (useKDEGlobals && localeString.isEmpty() && !KGlobal::_locale) {
+    if (useKDEGlobals && localeString.isEmpty() && !TDEGlobal::_locale) {
        // Boot strap language
-       bootLanguage = KLocale::_initLanguage(pConfig);
+       bootLanguage = TDELocale::_initLanguage(pConfig);
        setLocaleString(bootLanguage.utf8());
     }
 
@@ -394,7 +394,7 @@ bool KConfigINIBackEnd::parseConfigFiles()
     if ( !TQDir::isRelativePath(mfileName) )
        list << mfileName;
     else
-       list = KGlobal::dirs()->findAllResources(resType, mfileName);
+       list = TDEGlobal::dirs()->findAllResources(resType, mfileName);
 
     TQStringList::ConstIterator it;
 
@@ -410,12 +410,12 @@ bool KConfigINIBackEnd::parseConfigFiles()
             break;
       }
     }
-    if (KGlobal::dirs()->isRestrictedResource(resType, mfileName))
+    if (TDEGlobal::dirs()->isRestrictedResource(resType, mfileName))
        bFileImmutable = true;
     TQString currentLanguage;
     if (!bootLanguage.isEmpty())
     {
-       currentLanguage = KLocale::_initLanguage(pConfig);
+       currentLanguage = TDELocale::_initLanguage(pConfig);
        // If the file changed the language, we need to read the file again
        // with the new language setting.
        if (bootLanguage != currentLanguage)
@@ -426,7 +426,7 @@ bool KConfigINIBackEnd::parseConfigFiles()
     }
   }
   if (bFileImmutable)
-     mConfigState = KConfigBase::ReadOnly;
+     mConfigState = TDEConfigBase::ReadOnly;
 
   return true;
 }
@@ -447,7 +447,7 @@ extern "C" {
 
 extern bool kde_kiosk_exception;
 
-void KConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile,
+void TDEConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile,
 					      KEntryMap *pWriteBackMap,
 					      bool bGlobal, bool bDefault)
 {
@@ -730,18 +730,18 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1());
          pConfig->putData(aEntryKey, aEntry, false);
       }
    }
-   // Look up translations using KLocale
+   // Look up translations using TDELocale
    // https://launchpad.net/distros/ubuntu/+spec/langpacks-desktopfiles-kde
-   // This calls KLocale up to 10 times for each config file (and each KConfig has up to 4 files)
+   // This calls TDELocale up to 10 times for each config file (and each TDEConfig has up to 4 files)
    // so I'll see how much of a performance hit it is
    // it also only acts on the last group in a file
    // Ideas: only translate most important fields, only translate "Desktop Entry" files,
-   //        do translation per KConfig not per single file
+   //        do translation per TDEConfig not per single file
    if (!pWriteBackMap) {
      TQFile file("file.txt");
      if (foundGettextDomain) {
 
-       KLocale locale(gettextDomain);
+       TDELocale locale(gettextDomain);
 
        TQString language = locale.language();
        translateKey(locale, aCurrentGroup, TQCString("Name"));
@@ -772,7 +772,7 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1());
 #endif
 }
 
-void KConfigINIBackEnd::translateKey(KLocale& locale, TQCString currentGroup, TQCString key) {
+void TDEConfigINIBackEnd::translateKey(TDELocale& locale, TQCString currentGroup, TQCString key) {
   KEntryKey entryKey = KEntryKey(currentGroup, key);
   KEntry entry = pConfig->lookupData(entryKey);
   if (TQString(entry.mValue) != "") {
@@ -788,7 +788,7 @@ void KConfigINIBackEnd::translateKey(KLocale& locale, TQCString currentGroup, TQ
   }
 }
 
-void KConfigINIBackEnd::sync(bool bMerge)
+void TDEConfigINIBackEnd::sync(bool bMerge)
 {
   // write-sync is only necessary if there are dirty entries
   if (!pConfig->isDirty())
@@ -806,7 +806,7 @@ void KConfigINIBackEnd::sync(bool bMerge)
        KURL path;
        path.setPath(mLocalFileName);
        TQString dir=path.directory();
-       KStandardDirs::makeDir(dir);
+       TDEStandardDirs::makeDir(dir);
     }
 
     // Can we allow the write? We can, if the program
@@ -815,7 +815,7 @@ void KConfigINIBackEnd::sync(bool bMerge)
     // it wasn't SUID.
     if (checkAccess(mLocalFileName, W_OK)) {
       // File is writable
-      KLockFile::Ptr lf;
+      TDELockFile::Ptr lf;
 
       bool mergeLocalFile = bMerge;
       // Check if the file has been updated since.
@@ -827,7 +827,7 @@ void KConfigINIBackEnd::sync(bool bMerge)
 
          if (lf) 
          {
-            lf->lock( KLockFile::LockForce );
+            lf->lock( TDELockFile::LockForce );
             // But what if the locking failed? Ignore it for now...
          }
          
@@ -873,13 +873,13 @@ void KConfigINIBackEnd::sync(bool bMerge)
 
     // can we allow the write? (see above)
     if (checkAccess ( mGlobalFileName, W_OK )) {
-      KLockFile::Ptr lf = lockFile(true); // Lock file for global file
+      TDELockFile::Ptr lf = lockFile(true); // Lock file for global file
       if (lf && lf->isLocked())
          lf = 0; // Already locked, we don't need to lock/unlock again
 
       if (lf) 
       {
-         lf->lock( KLockFile::LockForce );
+         lf->lock( TDELockFile::LockForce );
          // But what if the locking failed? Ignore it for now...
       }
       writeConfigFile( mGlobalFileName, true, bMerge ); // Always merge
@@ -978,7 +978,7 @@ static void writeEntries(FILE *pStream, const KEntryMap& entryMap, bool defaultG
   } // for loop
 }
 
-bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
+bool TDEConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
                                     TQFile *mergeFile)
 {
   bool bEntriesLeft = false;
@@ -1032,7 +1032,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
 }
 
 /* antlarr: KDE 4.0:  make the first parameter "const TQString &" */
-bool KConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal,
+bool TDEConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal,
 					bool bMerge)
 {
   // is the config object read-only?
@@ -1135,7 +1135,7 @@ bool KConfigINIBackEnd::writeConfigFile(TQString filename, bool bGlobal,
   return bEntriesLeft;
 }
 
-void KConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap)
+void TDEConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap)
 {
   bool firstEntry = true;
 
@@ -1146,13 +1146,13 @@ void KConfigINIBackEnd::writeEntries(FILE *pStream, const KEntryMap &aTempMap)
   ::writeEntries(pStream, aTempMap, false, firstEntry, localeString);
 }
 
-void KConfigBackEnd::virtual_hook( int, void* )
+void TDEConfigBackEnd::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KConfigINIBackEnd::virtual_hook( int id, void* data )
-{ KConfigBackEnd::virtual_hook( id, data ); }
+void TDEConfigINIBackEnd::virtual_hook( int id, void* data )
+{ TDEConfigBackEnd::virtual_hook( id, data ); }
 
-bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser)
+bool TDEConfigBackEnd::checkConfigFilesWritable(bool warnUser)
 {
   // WARNING: Do NOT use the event loop as it may not exist at this time.
   bool allWritable = true;
@@ -1177,13 +1177,13 @@ bool KConfigBackEnd::checkConfigFilesWritable(bool warnUser)
   {
     // Note: We don't ask the user if we should not ask this question again because we can't save the answer.
     errorMsg += i18n("Please contact your system administrator.");
-    TQString cmdToExec = KStandardDirs::findExe(TQString("kdialog"));
-    KApplication *app = kapp;
+    TQString cmdToExec = TDEStandardDirs::findExe(TQString("kdialog"));
+    TDEApplication *app = kapp;
     if (!cmdToExec.isEmpty() && app)
     {
-      KProcess lprocess;
+      TDEProcess lprocess;
       lprocess << cmdToExec << "--title" << app->instanceName() << "--msgbox" << TQCString(errorMsg.local8Bit());
-      lprocess.start( KProcess::Block );
+      lprocess.start( TDEProcess::Block );
     }
   }
   return allWritable;
diff --git a/tdecore/kconfigbackend.h b/tdecore/tdeconfigbackend.h
index 03655ab2d..83c8047bc 100644
--- a/tdecore/kconfigbackend.h
+++ b/tdecore/tdeconfigbackend.h
@@ -22,14 +22,14 @@
 #ifndef _KCONFIGBACKEND_H
 #define _KCONFIGBACKEND_H
 
-#include "kconfigdata.h"
-#include <kconfigbase.h>
+#include "tdeconfigdata.h"
+#include <tdeconfigbase.h>
 #include <klockfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "tdelibs_export.h"
 
 class TQFile;
-class KConfigBackEndPrivate;
+class TDEConfigBackEndPrivate;
 
 /**
  * Abstract base class for KDE configuration file loading/saving.
@@ -45,10 +45,10 @@ class KConfigBackEndPrivate;
  *         Matthias Kalle Dalheimer <kalle@kde.org>
  * @short KDE Configuration file loading/saving abstract base class
  */
-class TDECORE_EXPORT KConfigBackEnd
+class TDECORE_EXPORT TDEConfigBackEnd
 {
-  friend class KConfig;
-  friend class KSharedConfig;
+  friend class TDEConfig;
+  friend class TDESharedConfig;
 public:
   /**
    * Constructs a configuration back end.
@@ -65,13 +65,13 @@ public:
    *        will be imported into the config object.  If false, only
    *        the filename specified will be dealt with.
    */
-  KConfigBackEnd(KConfigBase *_config, const TQString &_fileName,
+  TDEConfigBackEnd(TDEConfigBase *_config, const TQString &_fileName,
 		 const char * _resType, bool _useKDEGlobals);
 
   /**
    * Destructs the configuration backend.
    */
-  virtual ~KConfigBackEnd();
+  virtual ~TDEConfigBackEnd();
 
   /**
    * Parses all configuration files for a configuration object.  This
@@ -108,9 +108,9 @@ public:
   /**
    * Returns the state of the app-config object.
    *
-   * @see KConfig::getConfigState
+   * @see TDEConfig::getConfigState
    */
-  virtual KConfigBase::ConfigState getConfigState() const
+  virtual TDEConfigBase::ConfigState getConfigState() const
     { return mConfigState; }
 
   /**
@@ -128,7 +128,7 @@ public:
   /**
    * Set the locale string that defines the current language.
    * @param _localeString the identifier of the language
-   * @see KLocale
+   * @see TDELocale
    */
   void setLocaleString(const TQCString &_localeString) { localeString = _localeString; }
 
@@ -151,7 +151,7 @@ public:
    * @param bGlobal If true, returns a lock file object for kdeglobals
    * @since 3.3
    */
-  KLockFile::Ptr lockFile( bool bGlobal = false );
+  TDELockFile::Ptr lockFile( bool bGlobal = false );
 
 #ifdef KDE_NO_COMPAT
 private:
@@ -162,7 +162,7 @@ private:
   KDE_DEPRECATED TQString filename() const { return mfileName; }
 
 protected:
-  KConfigBase *pConfig;
+  TDEConfigBase *pConfig;
 
   TQString mfileName;
   TQCString resType;
@@ -171,14 +171,14 @@ protected:
   TQCString localeString;
   TQString mLocalFileName;
   TQString mGlobalFileName;
-  KConfigBase::ConfigState mConfigState;
+  TDEConfigBase::ConfigState mConfigState;
   int mFileMode;
 
 protected:
   virtual void virtual_hook( int id, void* data );
 protected:
-  class KConfigBackEndPrivate;
-  KConfigBackEndPrivate *d;
+  class TDEConfigBackEndPrivate;
+  TDEConfigBackEndPrivate *d;
 };
 
 
@@ -188,7 +188,7 @@ protected:
  * @author Preston Brown <pbrown@kde.org>,
  *         Matthias Kalle Dalheimer <kalle@kde.org>
  */
-class TDECORE_EXPORT KConfigINIBackEnd : public KConfigBackEnd
+class TDECORE_EXPORT TDEConfigINIBackEnd : public TDEConfigBackEnd
 {
 
 public:
@@ -207,14 +207,14 @@ public:
    *        will be imported into the config object.  If false, only
    *        the filename specified will be dealt with.
    */
-  KConfigINIBackEnd(KConfigBase *_config, const TQString &_fileName,
+  TDEConfigINIBackEnd(TDEConfigBase *_config, const TQString &_fileName,
 		    const char * _resType, bool _useKDEGlobals = true)
-    : KConfigBackEnd(_config, _fileName, _resType, _useKDEGlobals) {}
+    : TDEConfigBackEnd(_config, _fileName, _resType, _useKDEGlobals) {}
 
   /**
    * Destructs the configuration backend.
    */
-  virtual ~KConfigINIBackEnd() {}
+  virtual ~TDEConfigINIBackEnd() {}
 
   /**
    * Parses all INI-style configuration files for a config object.
@@ -252,9 +252,9 @@ protected:
 			     bool bGlobal = false, bool bDefault = false);
 
   // Kubuntu patch, 2006-08-03
-  // looks up a key in with KLocale
+  // looks up a key in with TDELocale
   // see https://launchpad.net/distros/ubuntu/+spec/langpacks-desktopfiles-kde
-  void translateKey(KLocale& locale, TQCString currentGroup, TQCString key);
+  void translateKey(TDELocale& locale, TQCString currentGroup, TQCString key);
 
   /**
    * Writes configuration file back.
@@ -292,8 +292,8 @@ protected:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KConfigINIBackEndPrivate;
-  KConfigINIBackEndPrivate *not_d;
+  class TDEConfigINIBackEndPrivate;
+  TDEConfigINIBackEndPrivate *not_d;
 };
 
 #endif
diff --git a/tdecore/kconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index c5c0a4e25..a3b15185b 100644
--- a/tdecore/kconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -27,56 +27,56 @@
 #include <tqdir.h>
 #include <tqtextstream.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 
-#include "kconfigbase.h"
-#include "kconfigbackend.h"
+#include "tdeconfigbase.h"
+#include "tdeconfigbackend.h"
 #include "kdebug.h"
 #include "kstandarddirs.h"
 #include "kstringhandler.h"
 
-class KConfigBase::KConfigBasePrivate
+class TDEConfigBase::TDEConfigBasePrivate
 {
 public:
-     KConfigBasePrivate() : readDefaults(false) { };
+     TDEConfigBasePrivate() : readDefaults(false) { };
 
 public:
      bool readDefaults;
 };
 
-KConfigBase::KConfigBase()
+TDEConfigBase::TDEConfigBase()
   : backEnd(0L), bDirty(false), bLocaleInitialized(false),
     bReadOnly(false), bExpand(false), d(0)
 {
     setGroup(TQString::null);
 }
 
-KConfigBase::~KConfigBase()
+TDEConfigBase::~TDEConfigBase()
 {
     delete d;
 }
 
-void KConfigBase::setLocale()
+void TDEConfigBase::setLocale()
 {
   bLocaleInitialized = true;
 
-  if (KGlobal::locale())
-    aLocaleString = KGlobal::locale()->language().utf8();
+  if (TDEGlobal::locale())
+    aLocaleString = TDEGlobal::locale()->language().utf8();
   else
-    aLocaleString = KLocale::defaultLanguage().utf8();
+    aLocaleString = TDELocale::defaultLanguage().utf8();
   if (backEnd)
      backEnd->setLocaleString(aLocaleString);
 }
 
-TQString KConfigBase::locale() const
+TQString TDEConfigBase::locale() const
 {
   return TQString::fromUtf8(aLocaleString);
 }
 
-void KConfigBase::setGroup( const TQString& group )
+void TDEConfigBase::setGroup( const TQString& group )
 {
   if ( group.isEmpty() )
     mGroup = "<default>";
@@ -84,12 +84,12 @@ void KConfigBase::setGroup( const TQString& group )
     mGroup = group.utf8();
 }
 
-void KConfigBase::setGroup( const char *pGroup )
+void TDEConfigBase::setGroup( const char *pGroup )
 {
   setGroup(TQCString(pGroup));
 }
 
-void KConfigBase::setGroup( const TQCString &group )
+void TDEConfigBase::setGroup( const TQCString &group )
 {
   if ( group.isEmpty() )
     mGroup = "<default>";
@@ -97,21 +97,21 @@ void KConfigBase::setGroup( const TQCString &group )
     mGroup = group;
 }
 
-TQString KConfigBase::group() const {
+TQString TDEConfigBase::group() const {
   return TQString::fromUtf8(mGroup);
 }
 
-void KConfigBase::setDesktopGroup()
+void TDEConfigBase::setDesktopGroup()
 {
   mGroup = "Desktop Entry";
 }
 
-bool KConfigBase::hasKey(const TQString &key) const
+bool TDEConfigBase::hasKey(const TQString &key) const
 {
    return hasKey(key.utf8().data());
 }
 
-bool KConfigBase::hasKey(const char *pKey) const
+bool TDEConfigBase::hasKey(const char *pKey) const
 {
   KEntryKey aEntryKey(mGroup, 0);
   aEntryKey.c_key = pKey;
@@ -131,7 +131,7 @@ bool KConfigBase::hasKey(const char *pKey) const
   return !entry.mValue.isNull();
 }
 
-bool KConfigBase::hasTranslatedKey(const char* pKey) const
+bool TDEConfigBase::hasTranslatedKey(const char* pKey) const
 {
   KEntryKey aEntryKey(mGroup, 0);
   aEntryKey.c_key = pKey;
@@ -149,27 +149,27 @@ bool KConfigBase::hasTranslatedKey(const char* pKey) const
   return false;
 }
 
-bool KConfigBase::hasGroup(const TQString &group) const
+bool TDEConfigBase::hasGroup(const TQString &group) const
 {
   return internalHasGroup( group.utf8());
 }
 
-bool KConfigBase::hasGroup(const char *_pGroup) const
+bool TDEConfigBase::hasGroup(const char *_pGroup) const
 {
   return internalHasGroup( TQCString(_pGroup));
 }
 
-bool KConfigBase::hasGroup(const TQCString &_pGroup) const
+bool TDEConfigBase::hasGroup(const TQCString &_pGroup) const
 {
   return internalHasGroup( _pGroup);
 }
 
-bool KConfigBase::isImmutable() const
+bool TDEConfigBase::isImmutable() const
 {
   return (getConfigState() != ReadWrite);
 }
 
-bool KConfigBase::groupIsImmutable(const TQString &group) const
+bool TDEConfigBase::groupIsImmutable(const TQString &group) const
 {
   if (getConfigState() != ReadWrite)
      return true;
@@ -179,7 +179,7 @@ bool KConfigBase::groupIsImmutable(const TQString &group) const
   return entry.bImmutable;
 }
 
-bool KConfigBase::entryIsImmutable(const TQString &key) const
+bool TDEConfigBase::entryIsImmutable(const TQString &key) const
 {
   if (getConfigState() != ReadWrite)
      return true;
@@ -201,14 +201,14 @@ bool KConfigBase::entryIsImmutable(const TQString &key) const
 }
 
 
-TQString KConfigBase::readEntryUntranslated( const TQString& pKey,
+TQString TDEConfigBase::readEntryUntranslated( const TQString& pKey,
                                 const TQString& aDefault ) const
 {
-   return KConfigBase::readEntryUntranslated(pKey.utf8().data(), aDefault);
+   return TDEConfigBase::readEntryUntranslated(pKey.utf8().data(), aDefault);
 }
 
 
-TQString KConfigBase::readEntryUntranslated( const char *pKey,
+TQString TDEConfigBase::readEntryUntranslated( const char *pKey,
                                 const TQString& aDefault ) const
 {
    TQCString result = readEntryUtf8(pKey);
@@ -218,22 +218,22 @@ TQString KConfigBase::readEntryUntranslated( const char *pKey,
 }
 
 
-TQString KConfigBase::readEntry( const TQString& pKey,
+TQString TDEConfigBase::readEntry( const TQString& pKey,
                                 const TQString& aDefault ) const
 {
-   return KConfigBase::readEntry(pKey.utf8().data(), aDefault);
+   return TDEConfigBase::readEntry(pKey.utf8().data(), aDefault);
 }
 
-TQString KConfigBase::readEntry( const char *pKey,
+TQString TDEConfigBase::readEntry( const char *pKey,
                                 const TQString& aDefault ) const
 {
   // we need to access _locale instead of the method locale()
   // because calling locale() will create a locale object if it
-  // doesn't exist, which requires KConfig, which will create a infinite
+  // doesn't exist, which requires TDEConfig, which will create a infinite
   // loop, and nobody likes those.
-  if (!bLocaleInitialized && KGlobal::_locale) {
+  if (!bLocaleInitialized && TDEGlobal::_locale) {
     // get around const'ness.
-    KConfigBase *that = const_cast<KConfigBase *>(this);
+    TDEConfigBase *that = const_cast<TDEConfigBase *>(this);
     that->setLocale();
   }
 
@@ -259,7 +259,7 @@ TQString KConfigBase::readEntry( const char *pKey,
       aValue = TQString::fromUtf8(aEntryData.mValue.data());
       if (aValue.isNull())
       {
-        static const TQString &emptyString = KGlobal::staticQString("");
+        static const TQString &emptyString = TDEGlobal::staticQString("");
         aValue = emptyString;
       }
       expand = aEntryData.bExpand;
@@ -335,7 +335,7 @@ TQString KConfigBase::readEntry( const char *pKey,
   return aValue;
 }
 
-TQCString KConfigBase::readEntryUtf8( const char *pKey) const
+TQCString TDEConfigBase::readEntryUtf8( const char *pKey) const
 {
   // We don't try the localized key
   KEntryKey entryKey(mGroup, 0);
@@ -350,13 +350,13 @@ TQCString KConfigBase::readEntryUtf8( const char *pKey) const
   return aEntryData.mValue;
 }
 
-TQVariant KConfigBase::readPropertyEntry( const TQString& pKey,
+TQVariant TDEConfigBase::readPropertyEntry( const TQString& pKey,
                                           TQVariant::Type type ) const
 {
   return readPropertyEntry(pKey.utf8().data(), type);
 }
 
-TQVariant KConfigBase::readPropertyEntry( const char *pKey,
+TQVariant TDEConfigBase::readPropertyEntry( const char *pKey,
                                           TQVariant::Type type ) const
 {
   TQVariant va;
@@ -365,13 +365,13 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey,
   return readPropertyEntry(pKey, va);
 }
 
-TQVariant KConfigBase::readPropertyEntry( const TQString& pKey,
+TQVariant TDEConfigBase::readPropertyEntry( const TQString& pKey,
                                          const TQVariant &aDefault ) const
 {
   return readPropertyEntry(pKey.utf8().data(), aDefault);
 }
 
-TQVariant KConfigBase::readPropertyEntry( const char *pKey,
+TQVariant TDEConfigBase::readPropertyEntry( const char *pKey,
                                          const TQVariant &aDefault ) const
 {
   if ( !hasKey( pKey ) ) return aDefault;
@@ -474,13 +474,13 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey,
   return TQVariant();
 }
 
-int KConfigBase::readListEntry( const TQString& pKey,
+int TDEConfigBase::readListEntry( const TQString& pKey,
                                 TQStrList &list, char sep ) const
 {
   return readListEntry(pKey.utf8().data(), list, sep);
 }
 
-int KConfigBase::readListEntry( const char *pKey,
+int TDEConfigBase::readListEntry( const char *pKey,
                                 TQStrList &list, char sep ) const
 {
   if( !hasKey( pKey ) )
@@ -519,14 +519,14 @@ int KConfigBase::readListEntry( const char *pKey,
   return list.count();
 }
 
-TQStringList KConfigBase::readListEntry( const TQString& pKey, char sep ) const
+TQStringList TDEConfigBase::readListEntry( const TQString& pKey, char sep ) const
 {
   return readListEntry(pKey.utf8().data(), sep);
 }
 
-TQStringList KConfigBase::readListEntry( const char *pKey, char sep ) const
+TQStringList TDEConfigBase::readListEntry( const char *pKey, char sep ) const
 {
-  static const TQString& emptyString = KGlobal::staticQString("");
+  static const TQString& emptyString = TDEGlobal::staticQString("");
 
   TQStringList list;
   if( !hasKey( pKey ) )
@@ -565,7 +565,7 @@ TQStringList KConfigBase::readListEntry( const char *pKey, char sep ) const
   return list;
 }
 
-TQStringList KConfigBase::readListEntry( const char* pKey, const TQStringList& aDefault,
+TQStringList TDEConfigBase::readListEntry( const char* pKey, const TQStringList& aDefault,
 		char sep ) const
 {
 	if ( !hasKey( pKey ) )
@@ -574,12 +574,12 @@ TQStringList KConfigBase::readListEntry( const char* pKey, const TQStringList& a
 		return readListEntry( pKey, sep );
 }
 
-TQValueList<int> KConfigBase::readIntListEntry( const TQString& pKey ) const
+TQValueList<int> TDEConfigBase::readIntListEntry( const TQString& pKey ) const
 {
   return readIntListEntry(pKey.utf8().data());
 }
 
-TQValueList<int> KConfigBase::readIntListEntry( const char *pKey ) const
+TQValueList<int> TDEConfigBase::readIntListEntry( const char *pKey ) const
 {
   TQStringList strlist = readListEntry(pKey);
   TQValueList<int> list;
@@ -592,12 +592,12 @@ TQValueList<int> KConfigBase::readIntListEntry( const char *pKey ) const
   return list;
 }
 
-TQString KConfigBase::readPathEntry( const TQString& pKey, const TQString& pDefault ) const
+TQString TDEConfigBase::readPathEntry( const TQString& pKey, const TQString& pDefault ) const
 {
   return readPathEntry(pKey.utf8().data(), pDefault);
 }
 
-TQString KConfigBase::readPathEntry( const char *pKey, const TQString& pDefault ) const
+TQString TDEConfigBase::readPathEntry( const char *pKey, const TQString& pDefault ) const
 {
   const bool bExpandSave = bExpand;
   bExpand = true;
@@ -606,12 +606,12 @@ TQString KConfigBase::readPathEntry( const char *pKey, const TQString& pDefault
   return aValue;
 }
 
-TQStringList KConfigBase::readPathListEntry( const TQString& pKey, char sep ) const
+TQStringList TDEConfigBase::readPathListEntry( const TQString& pKey, char sep ) const
 {
   return readPathListEntry(pKey.utf8().data(), sep);
 }
 
-TQStringList KConfigBase::readPathListEntry( const char *pKey, char sep ) const
+TQStringList TDEConfigBase::readPathListEntry( const char *pKey, char sep ) const
 {
   const bool bExpandSave = bExpand;
   bExpand = true;
@@ -620,12 +620,12 @@ TQStringList KConfigBase::readPathListEntry( const char *pKey, char sep ) const
   return aValue;
 }
 
-int KConfigBase::readNumEntry( const TQString& pKey, int nDefault) const
+int TDEConfigBase::readNumEntry( const TQString& pKey, int nDefault) const
 {
   return readNumEntry(pKey.utf8().data(), nDefault);
 }
 
-int KConfigBase::readNumEntry( const char *pKey, int nDefault) const
+int TDEConfigBase::readNumEntry( const char *pKey, int nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -641,12 +641,12 @@ int KConfigBase::readNumEntry( const char *pKey, int nDefault) const
 }
 
 
-unsigned int KConfigBase::readUnsignedNumEntry( const TQString& pKey, unsigned int nDefault) const
+unsigned int TDEConfigBase::readUnsignedNumEntry( const TQString& pKey, unsigned int nDefault) const
 {
   return readUnsignedNumEntry(pKey.utf8().data(), nDefault);
 }
 
-unsigned int KConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int nDefault) const
+unsigned int TDEConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -660,12 +660,12 @@ unsigned int KConfigBase::readUnsignedNumEntry( const char *pKey, unsigned int n
 }
 
 
-long KConfigBase::readLongNumEntry( const TQString& pKey, long nDefault) const
+long TDEConfigBase::readLongNumEntry( const TQString& pKey, long nDefault) const
 {
   return readLongNumEntry(pKey.utf8().data(), nDefault);
 }
 
-long KConfigBase::readLongNumEntry( const char *pKey, long nDefault) const
+long TDEConfigBase::readLongNumEntry( const char *pKey, long nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -679,12 +679,12 @@ long KConfigBase::readLongNumEntry( const char *pKey, long nDefault) const
 }
 
 
-unsigned long KConfigBase::readUnsignedLongNumEntry( const TQString& pKey, unsigned long nDefault) const
+unsigned long TDEConfigBase::readUnsignedLongNumEntry( const TQString& pKey, unsigned long nDefault) const
 {
   return readUnsignedLongNumEntry(pKey.utf8().data(), nDefault);
 }
 
-unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned long nDefault) const
+unsigned long TDEConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned long nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -697,12 +697,12 @@ unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned
     }
 }
 
-TQ_INT64 KConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const
+TQ_INT64 TDEConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const
 {
   return readNum64Entry(pKey.utf8().data(), nDefault);
 }
 
-TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
+TQ_INT64 TDEConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
 {
   // Note that TQCString::toLongLong() is missing, we muse use a TQString instead.
   TQString aValue = readEntry( pKey );
@@ -717,12 +717,12 @@ TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const
 }
 
 
-TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const
+TQ_UINT64 TDEConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const
 {
   return readUnsignedNum64Entry(pKey.utf8().data(), nDefault);
 }
 
-TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const
+TQ_UINT64 TDEConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const
 {
   // Note that TQCString::toULongLong() is missing, we muse use a TQString instead.
   TQString aValue = readEntry( pKey );
@@ -736,12 +736,12 @@ TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefa
     }
 }
 
-double KConfigBase::readDoubleNumEntry( const TQString& pKey, double nDefault) const
+double TDEConfigBase::readDoubleNumEntry( const TQString& pKey, double nDefault) const
 {
   return readDoubleNumEntry(pKey.utf8().data(), nDefault);
 }
 
-double KConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const
+double TDEConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const
 {
   TQCString aValue = readEntryUtf8( pKey );
   if( aValue.isNull() )
@@ -755,12 +755,12 @@ double KConfigBase::readDoubleNumEntry( const char *pKey, double nDefault) const
 }
 
 
-bool KConfigBase::readBoolEntry( const TQString& pKey, bool bDefault ) const
+bool TDEConfigBase::readBoolEntry( const TQString& pKey, bool bDefault ) const
 {
    return readBoolEntry(pKey.utf8().data(), bDefault);
 }
 
-bool KConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const
+bool TDEConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const
 {
   TQCString aValue = readEntryUtf8( pKey );
 
@@ -782,12 +782,12 @@ bool KConfigBase::readBoolEntry( const char *pKey, bool bDefault ) const
     }
 }
 
-TQFont KConfigBase::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const
+TQFont TDEConfigBase::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const
 {
   return readFontEntry(pKey.utf8().data(), pDefault);
 }
 
-TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) const
+TQFont TDEConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) const
 {
   TQFont aRetFont;
 
@@ -879,12 +879,12 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co
 }
 
 
-TQRect KConfigBase::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const
+TQRect TDEConfigBase::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const
 {
   return readRectEntry(pKey.utf8().data(), pDefault);
 }
 
-TQRect KConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) const
+TQRect TDEConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) const
 {
   TQCString aValue = readEntryUtf8(pKey);
 
@@ -903,13 +903,13 @@ TQRect KConfigBase::readRectEntry( const char *pKey, const TQRect* pDefault ) co
 }
 
 
-TQPoint KConfigBase::readPointEntry( const TQString& pKey,
+TQPoint TDEConfigBase::readPointEntry( const TQString& pKey,
                                     const TQPoint* pDefault ) const
 {
   return readPointEntry(pKey.utf8().data(), pDefault);
 }
 
-TQPoint KConfigBase::readPointEntry( const char *pKey,
+TQPoint TDEConfigBase::readPointEntry( const char *pKey,
                                     const TQPoint* pDefault ) const
 {
   TQCString aValue = readEntryUtf8(pKey);
@@ -928,13 +928,13 @@ TQPoint KConfigBase::readPointEntry( const char *pKey,
   return TQPoint();
 }
 
-TQSize KConfigBase::readSizeEntry( const TQString& pKey,
+TQSize TDEConfigBase::readSizeEntry( const TQString& pKey,
                                   const TQSize* pDefault ) const
 {
   return readSizeEntry(pKey.utf8().data(), pDefault);
 }
 
-TQSize KConfigBase::readSizeEntry( const char *pKey,
+TQSize TDEConfigBase::readSizeEntry( const char *pKey,
                                   const TQSize* pDefault ) const
 {
   TQCString aValue = readEntryUtf8(pKey);
@@ -954,13 +954,13 @@ TQSize KConfigBase::readSizeEntry( const char *pKey,
 }
 
 
-TQColor KConfigBase::readColorEntry( const TQString& pKey,
+TQColor TDEConfigBase::readColorEntry( const TQString& pKey,
                                     const TQColor* pDefault ) const
 {
   return readColorEntry(pKey.utf8().data(), pDefault);
 }
 
-TQColor KConfigBase::readColorEntry( const char *pKey,
+TQColor TDEConfigBase::readColorEntry( const char *pKey,
                                     const TQColor* pDefault ) const
 {
   TQColor aRetColor;
@@ -1019,14 +1019,14 @@ TQColor KConfigBase::readColorEntry( const char *pKey,
 }
 
 
-TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey,
+TQDateTime TDEConfigBase::readDateTimeEntry( const TQString& pKey,
                                           const TQDateTime* pDefault ) const
 {
   return readDateTimeEntry(pKey.utf8().data(), pDefault);
 }
 
 // ### currentDateTime() as fallback ? (Harri)
-TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
+TQDateTime TDEConfigBase::readDateTimeEntry( const char *pKey,
                                           const TQDateTime* pDefault ) const
 {
   if( !hasKey( pKey ) )
@@ -1051,7 +1051,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
   return TQDateTime::currentDateTime();
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQString& value,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQString& value,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS )
@@ -1059,7 +1059,7 @@ void KConfigBase::writeEntry( const TQString& pKey, const TQString& value,
    writeEntry(pKey.utf8().data(), value, bPersistent,  bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQString& value,
+void TDEConfigBase::writeEntry( const char *pKey, const TQString& value,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS )
@@ -1067,13 +1067,13 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value,
    writeEntry(pKey, value, bPersistent,  bGlobal, bNLS, false);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQString& value,
+void TDEConfigBase::writeEntry( const char *pKey, const TQString& value,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS,
                                  bool bExpand )
 {
-  // the KConfig object is dirty now
+  // the TDEConfig object is dirty now
   // set this before any IO takes place so that if any derivative
   // classes do caching, they won't try and flush the cache out
   // from under us before we read. A race condition is still
@@ -1081,7 +1081,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value,
   if( bPersistent )
     setDirty(true);
 
-  if (!bLocaleInitialized && KGlobal::locale())
+  if (!bLocaleInitialized && TDEGlobal::locale())
     setLocale();
 
   KEntryKey entryKey(mGroup, pKey);
@@ -1100,7 +1100,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQString& value,
   putData(entryKey, aEntryData, true);
 }
 
-void KConfigBase::writePathEntry( const TQString& pKey, const TQString & path,
+void TDEConfigBase::writePathEntry( const TQString& pKey, const TQString & path,
                                   bool bPersistent, bool bGlobal,
                                   bool bNLS)
 {
@@ -1152,7 +1152,7 @@ static TQString translatePath( TQString path )
 	path.remove(0,1);
    }
 
-   // we can not use KGlobal::dirs()->relativeLocation("home", path) here,
+   // we can not use TDEGlobal::dirs()->relativeLocation("home", path) here,
    // since it would not recognize paths without a trailing '/'.
    // All of the 3 following functions to return the user's home directory
    // can return different paths. We have to test all them.
@@ -1171,21 +1171,21 @@ static TQString translatePath( TQString path )
    return path;
 }
 
-void KConfigBase::writePathEntry( const char *pKey, const TQString & path,
+void TDEConfigBase::writePathEntry( const char *pKey, const TQString & path,
                                   bool bPersistent, bool bGlobal,
                                   bool bNLS)
 {
    writeEntry(pKey, translatePath(path), bPersistent, bGlobal, bNLS, true);
 }
 
-void KConfigBase::writePathEntry ( const TQString& pKey, const TQStringList &list,
+void TDEConfigBase::writePathEntry ( const TQString& pKey, const TQStringList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writePathEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
+void TDEConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
@@ -1204,25 +1204,25 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
   writeEntry( pKey, new_list, sep, bPersistent, bGlobal, bNLS, true );
 }
 
-void KConfigBase::deleteEntry( const TQString& pKey,
+void TDEConfigBase::deleteEntry( const TQString& pKey,
                                  bool bNLS,
                                  bool bGlobal)
 {
    deleteEntry(pKey.utf8().data(), bNLS, bGlobal);
 }
 
-void KConfigBase::deleteEntry( const char *pKey,
+void TDEConfigBase::deleteEntry( const char *pKey,
                                  bool bNLS,
                                  bool bGlobal)
 {
-  // the KConfig object is dirty now
+  // the TDEConfig object is dirty now
   // set this before any IO takes place so that if any derivative
   // classes do caching, they won't try and flush the cache out
   // from under us before we read. A race condition is still
   // possible but minimized.
   setDirty(true);
 
-  if (!bLocaleInitialized && KGlobal::locale())
+  if (!bLocaleInitialized && TDEGlobal::locale())
     setLocale();
 
   KEntryKey entryKey(mGroup, pKey);
@@ -1237,7 +1237,7 @@ void KConfigBase::deleteEntry( const char *pKey,
   putData(entryKey, aEntryData, true);
 }
 
-bool KConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal )
+bool TDEConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal )
 {
   KEntryMap aEntryMap = internalEntryMap(group);
 
@@ -1268,14 +1268,14 @@ bool KConfigBase::deleteGroup( const TQString& group, bool bDeep, bool bGlobal )
   return true;
 }
 
-void KConfigBase::writeEntry ( const TQString& pKey, const TQVariant &prop,
+void TDEConfigBase::writeEntry ( const TQString& pKey, const TQVariant &prop,
                                bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writeEntry(pKey.utf8().data(), prop, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
                                bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
@@ -1391,14 +1391,14 @@ void KConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
   Q_ASSERT( 0 );
 }
 
-void KConfigBase::writeEntry ( const TQString& pKey, const TQStrList &list,
+void TDEConfigBase::writeEntry ( const TQString& pKey, const TQStrList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writeEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
@@ -1431,21 +1431,21 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
   writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry ( const TQString& pKey, const TQStringList &list,
+void TDEConfigBase::writeEntry ( const TQString& pKey, const TQStringList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writeEntry(pKey.utf8().data(), list, sep, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
                                char sep , bool bPersistent,
                                bool bGlobal, bool bNLS )
 {
   writeEntry(pKey, list, sep, bPersistent, bGlobal, bNLS, false);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
                                char sep, bool bPersistent,
                                bool bGlobal, bool bNLS, bool bExpand )
 {
@@ -1475,13 +1475,13 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
   writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand );
 }
 
-void KConfigBase::writeEntry ( const TQString& pKey, const TQValueList<int> &list,
+void TDEConfigBase::writeEntry ( const TQString& pKey, const TQValueList<int> &list,
                                bool bPersistent, bool bGlobal, bool bNLS )
 {
   writeEntry(pKey.utf8().data(), list, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry ( const char *pKey, const TQValueList<int> &list,
+void TDEConfigBase::writeEntry ( const char *pKey, const TQValueList<int> &list,
                                bool bPersistent, bool bGlobal, bool bNLS )
 {
     TQStringList strlist;
@@ -1491,14 +1491,14 @@ void KConfigBase::writeEntry ( const char *pKey, const TQValueList<int> &list,
     writeEntry(pKey, strlist, ',', bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, int nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, int nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, int nValue,
+void TDEConfigBase::writeEntry( const char *pKey, int nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1506,14 +1506,14 @@ void KConfigBase::writeEntry( const char *pKey, int nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, unsigned int nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, unsigned int nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, unsigned int nValue,
+void TDEConfigBase::writeEntry( const char *pKey, unsigned int nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1521,14 +1521,14 @@ void KConfigBase::writeEntry( const char *pKey, unsigned int nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, long nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, long nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, long nValue,
+void TDEConfigBase::writeEntry( const char *pKey, long nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1536,28 +1536,28 @@ void KConfigBase::writeEntry( const char *pKey, long nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, unsigned long nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, unsigned long nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, unsigned long nValue,
+void TDEConfigBase::writeEntry( const char *pKey, unsigned long nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
+void TDEConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1565,21 +1565,21 @@ void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue,
+void TDEConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, double nValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, double nValue,
                                  bool bPersistent, bool bGlobal,
                                  char format, int precision,
                                  bool bNLS )
@@ -1588,7 +1588,7 @@ void KConfigBase::writeEntry( const TQString& pKey, double nValue,
                      bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const char *pKey, double nValue,
+void TDEConfigBase::writeEntry( const char *pKey, double nValue,
                                  bool bPersistent, bool bGlobal,
                                  char format, int precision,
                                  bool bNLS )
@@ -1598,7 +1598,7 @@ void KConfigBase::writeEntry( const char *pKey, double nValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, bool bValue,
+void TDEConfigBase::writeEntry( const TQString& pKey, bool bValue,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS )
@@ -1606,7 +1606,7 @@ void KConfigBase::writeEntry( const TQString& pKey, bool bValue,
   writeEntry(pKey.utf8().data(), bValue, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, bool bValue,
+void TDEConfigBase::writeEntry( const char *pKey, bool bValue,
                                  bool bPersistent,
                                  bool bGlobal,
                                  bool bNLS )
@@ -1622,14 +1622,14 @@ void KConfigBase::writeEntry( const char *pKey, bool bValue,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQFont& rFont,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQFont& rFont,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rFont, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQFont& rFont,
+void TDEConfigBase::writeEntry( const char *pKey, const TQFont& rFont,
                                  bool bPersistent, bool bGlobal,
                                  bool bNLS )
 {
@@ -1637,14 +1637,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQFont& rFont,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQRect& rRect,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQRect& rRect,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rRect, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQRect& rRect,
+void TDEConfigBase::writeEntry( const char *pKey, const TQRect& rRect,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
@@ -1659,14 +1659,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQRect& rRect,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQPoint& rPoint,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQPoint& rPoint,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rPoint, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint,
+void TDEConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
@@ -1679,14 +1679,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQPoint& rPoint,
 }
 
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQSize& rSize,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQSize& rSize,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rSize, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQSize& rSize,
+void TDEConfigBase::writeEntry( const char *pKey, const TQSize& rSize,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
@@ -1698,7 +1698,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQSize& rSize,
   writeEntry( pKey, list, ',', bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor,
                               bool bPersistent,
                               bool bGlobal,
                               bool bNLS  )
@@ -1706,7 +1706,7 @@ void KConfigBase::writeEntry( const TQString& pKey, const TQColor& rColor,
   writeEntry( pKey.utf8().data(), rColor, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQColor& rColor,
+void TDEConfigBase::writeEntry( const char *pKey, const TQColor& rColor,
                               bool bPersistent,
                               bool bGlobal,
                               bool bNLS  )
@@ -1720,14 +1720,14 @@ void KConfigBase::writeEntry( const char *pKey, const TQColor& rColor,
   writeEntry( pKey, aValue, bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::writeEntry( const TQString& pKey, const TQDateTime& rDateTime,
+void TDEConfigBase::writeEntry( const TQString& pKey, const TQDateTime& rDateTime,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
   writeEntry(pKey.utf8().data(), rDateTime, bPersistent, bGlobal, bNLS);
 }
 
-void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime,
+void TDEConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime,
                               bool bPersistent, bool bGlobal,
                               bool bNLS )
 {
@@ -1748,9 +1748,9 @@ void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime,
   writeEntry( pKey, list, ',', bPersistent, bGlobal, bNLS );
 }
 
-void KConfigBase::parseConfigFiles()
+void TDEConfigBase::parseConfigFiles()
 {
-  if (!bLocaleInitialized && KGlobal::_locale) {
+  if (!bLocaleInitialized && TDEGlobal::_locale) {
     setLocale();
   }
   if (backEnd)
@@ -1760,7 +1760,7 @@ void KConfigBase::parseConfigFiles()
   }
 }
 
-void KConfigBase::sync()
+void TDEConfigBase::sync()
 {
   if (isReadOnly())
     return;
@@ -1771,35 +1771,35 @@ void KConfigBase::sync()
     rollback();
 }
 
-KConfigBase::ConfigState KConfigBase::getConfigState() const {
+TDEConfigBase::ConfigState TDEConfigBase::getConfigState() const {
     if (backEnd)
        return backEnd->getConfigState();
     return ReadOnly;
 }
 
-void KConfigBase::rollback( bool /*bDeep = true*/ )
+void TDEConfigBase::rollback( bool /*bDeep = true*/ )
 {
   bDirty = false;
 }
 
 
-void KConfigBase::setReadDefaults(bool b)
+void TDEConfigBase::setReadDefaults(bool b)
 {
   if (!d)
   {
      if (!b) return;
-     d = new KConfigBasePrivate();
+     d = new TDEConfigBasePrivate();
   }
 
   d->readDefaults = b;
 }
 
-bool KConfigBase::readDefaults() const
+bool TDEConfigBase::readDefaults() const
 {
   return (d && d->readDefaults);
 }
 
-void KConfigBase::revertToDefault(const TQString &key)
+void TDEConfigBase::revertToDefault(const TQString &key)
 {
   setDirty(true);
 
@@ -1826,7 +1826,7 @@ void KConfigBase::revertToDefault(const TQString &key)
   putData(aEntryKey, entry, true); // Revert
 }
 
-bool KConfigBase::hasDefault(const TQString &key) const
+bool TDEConfigBase::hasDefault(const TQString &key) const
 {
   KEntryKey aEntryKey(mGroup, key.utf8());
   aEntryKey.bDefault = true;
@@ -1851,7 +1851,7 @@ bool KConfigBase::hasDefault(const TQString &key) const
 
 
 
-KConfigGroup::KConfigGroup(KConfigBase *master, const TQString &group)
+TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const TQString &group)
 {
   mMaster = master;
   backEnd = mMaster->backEnd; // Needed for getConfigState()
@@ -1864,7 +1864,7 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const TQString &group)
   setReadDefaults(mMaster->readDefaults());
 }
 
-KConfigGroup::KConfigGroup(KConfigBase *master, const TQCString &group)
+TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const TQCString &group)
 {
   mMaster = master;
   backEnd = mMaster->backEnd; // Needed for getConfigState()
@@ -1877,7 +1877,7 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const TQCString &group)
   setReadDefaults(mMaster->readDefaults());
 }
 
-KConfigGroup::KConfigGroup(KConfigBase *master, const char * group)
+TDEConfigGroup::TDEConfigGroup(TDEConfigBase *master, const char * group)
 {
   mMaster = master;
   backEnd = mMaster->backEnd; // Needed for getConfigState()
@@ -1890,43 +1890,43 @@ KConfigGroup::KConfigGroup(KConfigBase *master, const char * group)
   setReadDefaults(mMaster->readDefaults());
 }
 
-void KConfigGroup::deleteGroup(bool bGlobal)
+void TDEConfigGroup::deleteGroup(bool bGlobal)
 {
-  mMaster->deleteGroup(KConfigBase::group(), true, bGlobal);
+  mMaster->deleteGroup(TDEConfigBase::group(), true, bGlobal);
 }
 
-bool KConfigGroup::groupIsImmutable() const
+bool TDEConfigGroup::groupIsImmutable() const
 {
-    return mMaster->groupIsImmutable(KConfigBase::group());
+    return mMaster->groupIsImmutable(TDEConfigBase::group());
 }
 
-void KConfigGroup::setDirty(bool _bDirty)
+void TDEConfigGroup::setDirty(bool _bDirty)
 {
   mMaster->setDirty(_bDirty);
 }
 
-void KConfigGroup::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup)
+void TDEConfigGroup::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGroup)
 {
   mMaster->putData(_key, _data, _checkGroup);
 }
 
-KEntry KConfigGroup::lookupData(const KEntryKey &_key) const
+KEntry TDEConfigGroup::lookupData(const KEntryKey &_key) const
 {
   return mMaster->lookupData(_key);
 }
 
-void KConfigGroup::sync()
+void TDEConfigGroup::sync()
 {
   mMaster->sync();
 }
 
-void KConfigBase::virtual_hook( int, void* )
+void TDEConfigBase::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KConfigGroup::virtual_hook( int id, void* data )
-{ KConfigBase::virtual_hook( id, data ); }
+void TDEConfigGroup::virtual_hook( int id, void* data )
+{ TDEConfigBase::virtual_hook( id, data ); }
 
-bool KConfigBase::checkConfigFilesWritable(bool warnUser)
+bool TDEConfigBase::checkConfigFilesWritable(bool warnUser)
 {
   if (backEnd)
     return backEnd->checkConfigFilesWritable(warnUser);
@@ -1934,4 +1934,4 @@ bool KConfigBase::checkConfigFilesWritable(bool warnUser)
     return false;
 }
 
-#include "kconfigbase.moc"
+#include "tdeconfigbase.moc"
diff --git a/tdecore/kconfigbase.h b/tdecore/tdeconfigbase.h
index 7c0706e46..1166703ce 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/tdeconfigbase.h
@@ -32,28 +32,28 @@
 #include <tqvariant.h>
 #include <tqmap.h>
 
-#include "kconfigdata.h"
+#include "tdeconfigdata.h"
 #include "tdelibs_export.h"
 
-class KConfigBackEnd;
-class KConfigBasePrivate;
-class KConfigGroup;
+class TDEConfigBackEnd;
+class TDEConfigBasePrivate;
+class TDEConfigGroup;
 
 /**
  * @short KDE Configuration Management abstract base class
  *
  * This class forms the base for all %KDE configuration. It is an
  * abstract base class, meaning that you cannot directly instantiate
- * objects of this class. Either use KConfig (for usual %KDE
+ * objects of this class. Either use TDEConfig (for usual %KDE
  * configuration) or KSimpleConfig (for special needs as in ksamba), or
- * even KSharedConfig (stores values in shared memory).
+ * even TDESharedConfig (stores values in shared memory).
  *
  * All configuration entries are key, value pairs.  Each entry also
  * belongs to a specific group of related entries.  All configuration
  * entries that do not explicitly specify which group they are in are
  * in a special group called the default group.
  *
- * If there is a $ character in an entry, KConfigBase tries to expand
+ * If there is a $ character in an entry, TDEConfigBase tries to expand
  * environment variable and uses its value instead of its name. You
  * can avoid this feature by having two consecutive $ characters in
  * your config file which get expanded to one.
@@ -62,30 +62,30 @@ class KConfigGroup;
  * a group name.
  *
  * @author Kalle Dalheimer <kalle@kde.org>, Preston Brown <pbrown@kde.org>
- * @see KGlobal#config()
- * @see KConfig
+ * @see TDEGlobal#config()
+ * @see TDEConfig
  * @see KSimpleConfig
- * @see KSharedConfig
+ * @see TDESharedConfig
  */
-class TDECORE_EXPORT KConfigBase : public TQObject
+class TDECORE_EXPORT TDEConfigBase : public TQObject
 {
   Q_OBJECT
   
 
-  friend class KConfigBackEnd;
-  friend class KConfigINIBackEnd;
-  friend class KConfigGroup;
+  friend class TDEConfigBackEnd;
+  friend class TDEConfigINIBackEnd;
+  friend class TDEConfigGroup;
 
 public:
   /**
-   * Construct a KConfigBase object.
+   * Construct a TDEConfigBase object.
    */
-  KConfigBase();
+  TDEConfigBase();
 
   /**
-   * Destructs the KConfigBase object.
+   * Destructs the TDEConfigBase object.
    */
-  virtual ~KConfigBase();
+  virtual ~TDEConfigBase();
 
   /**
    * Specifies the group in which keys will be read and written.
@@ -1670,7 +1670,7 @@ public:
 
 
   /**
-   * Turns on or off "dollar  expansion" (see KConfigBase introduction)
+   * Turns on or off "dollar  expansion" (see TDEConfigBase introduction)
    *  when reading config entries.
    * Dollar sign expansion is initially OFF.
    *
@@ -1688,13 +1688,13 @@ public:
   /**
    * Mark the config object as "clean," i.e. don't write dirty entries
    * at destruction time. If @p bDeep is false, only the global dirty
-   * flag of the KConfig object gets cleared. If you then call
+   * flag of the TDEConfig object gets cleared. If you then call
    * writeEntry() again, the global dirty flag is set again and all
    * dirty entries will be written at a subsequent sync() call.
    *
-   * Classes that derive from KConfigBase should override this
+   * Classes that derive from TDEConfigBase should override this
    * method and implement storage-specific behavior, as well as
-   * calling the KConfigBase::rollback() explicitly in the initializer.
+   * calling the TDEConfigBase::rollback() explicitly in the initializer.
    *
    * @param bDeep If true, the dirty flags of all entries are cleared,
    *        as well as the global dirty flag.
@@ -1887,7 +1887,7 @@ protected:
   /**
    * Reads the locale and put in the configuration data struct.
    * Note that this should be done in the constructor, but this is not
-   * possible due to some mutual dependencies in KApplication::init()
+   * possible due to some mutual dependencies in TDEApplication::init()
    */
   void setLocale();
 
@@ -1901,7 +1901,7 @@ protected:
   /**
    * Parses all configuration files for a configuration object.
    *
-   * The actual parsing is done by the associated KConfigBackEnd.
+   * The actual parsing is done by the associated TDEConfigBackEnd.
    */
   virtual void parseConfigFiles();
 
@@ -1937,7 +1937,7 @@ protected:
 
   /**
    * Inserts a (key/value) pair into the internal storage mechanism of
-   * the configuration object. Classes that derive from KConfigBase
+   * the configuration object. Classes that derive from TDEConfigBase
    * will need to implement this method in a storage-specific manner.
    *
    * Do not use this function, the implementation / return type are
@@ -1954,7 +1954,7 @@ protected:
 
   /**
    * Looks up an entry in the config object's internal structure.
-   * Classes that derive from KConfigBase will need to implement this
+   * Classes that derive from TDEConfigBase will need to implement this
    * method in a storage-specific manner.
    *
    * Do not use this function, the implementation and return type are
@@ -1973,7 +1973,7 @@ protected:
   /**
    * A back end for loading/saving to disk in a particular format.
    */
-  KConfigBackEnd *backEnd;
+  TDEConfigBackEnd *backEnd;
 public:
   /**
    * Overloaded public methods:
@@ -2008,8 +2008,8 @@ protected:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KConfigBasePrivate;
-  KConfigBasePrivate *d;
+  class TDEConfigBasePrivate;
+  TDEConfigBasePrivate *d;
 
   void writeEntry( const char *pKey, const TQString &rValue,
     bool bPersistent, bool bGlobal, bool bNLS, bool bExpand );
@@ -2018,14 +2018,14 @@ private:
 
 };
 
-class KConfigGroupSaverPrivate;
+class TDEConfigGroupSaverPrivate;
 
 /**
-  * Helper class to facilitate working with KConfig / KSimpleConfig
+  * Helper class to facilitate working with TDEConfig / KSimpleConfig
   * groups.
   *
   * Careful programmers always set the group of a
-  * KConfig KSimpleConfig object to the group they want to read from
+  * TDEConfig KSimpleConfig object to the group they want to read from
   * and set it back to the old one of afterwards. This is usually
   * written as:
   * \code
@@ -2039,82 +2039,82 @@ class KConfigGroupSaverPrivate;
   * \endcode
   *
   * In order to facilitate this task, you can use
-  * KConfigGroupSaver. Simply construct such an object ON THE STACK
+  * TDEConfigGroupSaver. Simply construct such an object ON THE STACK
   * when you want to switch to a new group. Then, when the object goes
   * out of scope, the group will automatically be restored. If you
   * want to use several different groups within a function or method,
-  * you can still use KConfigGroupSaver: Simply enclose all work with
-  * one group (including the creation of the KConfigGroupSaver object)
+  * you can still use TDEConfigGroupSaver: Simply enclose all work with
+  * one group (including the creation of the TDEConfigGroupSaver object)
   * in one block.
   *
   * @deprecated This class is deprecated and will be removed in KDE 4.
-  * KConfigGroup provides similar functionality in a more object oriented
+  * TDEConfigGroup provides similar functionality in a more object oriented
   * way.
   *
   * @author Matthias Kalle Dalheimer <kalle@kde.org>
-  * @see KConfigBase, KConfig, KSimpleConfig, KConfigGroup
-  * @short Helper class for easier use of KConfig/KSimpleConfig groups
+  * @see TDEConfigBase, TDEConfig, KSimpleConfig, TDEConfigGroup
+  * @short Helper class for easier use of TDEConfig/KSimpleConfig groups
   */
 
-class TDECORE_EXPORT KConfigGroupSaver // KDE4 remove
+class TDECORE_EXPORT TDEConfigGroupSaver // KDE4 remove
 {
 public:
   /**
-   * Constructor. You pass a pointer to the KConfigBase-derived
+   * Constructor. You pass a pointer to the TDEConfigBase-derived
    * object you want to work with and a string indicating the _new_
    * group.
    *
-   * @param config The KConfigBase-derived object this
-   *               KConfigGroupSaver works on.
+   * @param config The TDEConfigBase-derived object this
+   *               TDEConfigGroupSaver works on.
    * @param group  The new group that the config object should switch to.
    */
-  KConfigGroupSaver( KConfigBase* config, TQString group )
+  TDEConfigGroupSaver( TDEConfigBase* config, TQString group )
       /* KDE 4 : make the second parameter const TQString & */
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
-  KConfigGroupSaver( KConfigBase* config, const char *group )
+  TDEConfigGroupSaver( TDEConfigBase* config, const char *group )
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
-  KConfigGroupSaver( KConfigBase* config, const TQCString &group )
+  TDEConfigGroupSaver( TDEConfigBase* config, const TQCString &group )
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
-  ~KConfigGroupSaver() { _config->setGroup( _oldgroup ); }
+  ~TDEConfigGroupSaver() { _config->setGroup( _oldgroup ); }
 
-    KConfigBase* config() { return _config; };
+    TDEConfigBase* config() { return _config; };
 
 private:
-  KConfigBase* _config;
+  TDEConfigBase* _config;
   TQString _oldgroup;
 
-  KConfigGroupSaver(const KConfigGroupSaver&);
-  KConfigGroupSaver& operator=(const KConfigGroupSaver&);
+  TDEConfigGroupSaver(const TDEConfigGroupSaver&);
+  TDEConfigGroupSaver& operator=(const TDEConfigGroupSaver&);
 
-  KConfigGroupSaverPrivate *d;
+  TDEConfigGroupSaverPrivate *d;
 };
 
-class KConfigGroupPrivate;
+class TDEConfigGroupPrivate;
 
 /**
- * A KConfigBase derived class for one specific group in a KConfig object.
+ * A TDEConfigBase derived class for one specific group in a TDEConfig object.
  */
-class TDECORE_EXPORT KConfigGroup: public KConfigBase
+class TDECORE_EXPORT TDEConfigGroup: public TDEConfigBase
 {
 public:
    /**
     * Construct a config group corresponding to @p group in @p master.
     * @p group is the group name encoded in UTF-8.
     */
-   KConfigGroup(KConfigBase *master, const TQCString &group);
+   TDEConfigGroup(TDEConfigBase *master, const TQCString &group);
    /**
     * This is an overloaded constructor provided for convenience.
     * It behaves essentially like the above function.
     *
     * Construct a config group corresponding to @p group in @p master
     */
-   KConfigGroup(KConfigBase *master, const TQString &group);
+   TDEConfigGroup(TDEConfigBase *master, const TQString &group);
    /**
     * This is an overloaded constructor provided for convenience.
     * It behaves essentially like the above function.
@@ -2122,7 +2122,7 @@ public:
     * Construct a config group corresponding to @p group in @p master
     * @p group is the group name encoded in UTF-8.
     */
-   KConfigGroup(KConfigBase *master, const char * group);
+   TDEConfigGroup(TDEConfigBase *master, const char * group);
 
    /**
     * Delete all entries in the entire group
@@ -2170,11 +2170,11 @@ private:
 
    void getConfigState() { }
 
-   KConfigBase *mMaster;
+   TDEConfigBase *mMaster;
 protected:
    virtual void virtual_hook( int id, void* data );
 private:
-   KConfigGroupPrivate* d;
+   TDEConfigGroupPrivate* d;
 };
 
 #endif
diff --git a/tdecore/kconfigdata.h b/tdecore/tdeconfigdata.h
index f99f72c08..f99f72c08 100644
--- a/tdecore/kconfigdata.h
+++ b/tdecore/tdeconfigdata.h
diff --git a/tdecore/kconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index 82567ca0b..9578c05c1 100644
--- a/tdecore/kconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -19,7 +19,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include "kconfigdialogmanager.h"
+#include "tdeconfigdialogmanager.h"
 
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
@@ -30,14 +30,14 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
-#include <kconfigskeleton.h>
+#include <tdeapplication.h>
+#include <tdeconfigskeleton.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <assert.h>
 
-class KConfigDialogManager::Private {
+class TDEConfigDialogManager::Private {
 
 public:
   Private() : insideGroupBox(false) { }
@@ -48,7 +48,7 @@ public:
   bool insideGroupBox;
 };
 
-KConfigDialogManager::KConfigDialogManager(TQWidget *parent, KConfigSkeleton *conf, const char *name)
+TDEConfigDialogManager::TDEConfigDialogManager(TQWidget *parent, TDEConfigSkeleton *conf, const char *name)
  : TQObject(parent, name), m_conf(conf), m_dialog(parent)
 {
   d = new Private();
@@ -59,12 +59,12 @@ KConfigDialogManager::KConfigDialogManager(TQWidget *parent, KConfigSkeleton *co
   init(true);
 }
 
-KConfigDialogManager::~KConfigDialogManager()
+TDEConfigDialogManager::~TDEConfigDialogManager()
 {
   delete d;
 }
 
-void KConfigDialogManager::init(bool trackChanges)
+void TDEConfigDialogManager::init(bool trackChanges)
 {
   if(trackChanges)
   {
@@ -95,9 +95,9 @@ void KConfigDialogManager::init(bool trackChanges)
 
     // KDE
     changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int)));
-    changedMap.insert( "KFontCombo", TQT_SIGNAL(activated (int)));
-    changedMap.insert( "KFontRequester", TQT_SIGNAL(fontSelected(const TQFont &)));
-    changedMap.insert( "KFontChooser",  TQT_SIGNAL(fontSelected(const TQFont &)));
+    changedMap.insert( "TDEFontCombo", TQT_SIGNAL(activated (int)));
+    changedMap.insert( "TDEFontRequester", TQT_SIGNAL(fontSelected(const TQFont &)));
+    changedMap.insert( "TDEFontChooser",  TQT_SIGNAL(fontSelected(const TQFont &)));
     changedMap.insert( "KHistoryCombo", TQT_SIGNAL(activated (int)));
 
     changedMap.insert( "KColorButton", TQT_SIGNAL(changed(const TQColor &)));
@@ -105,7 +105,7 @@ void KConfigDialogManager::init(bool trackChanges)
     changedMap.insert( "KDateWidget", TQT_SIGNAL(changed (TQDate)));
     changedMap.insert( "KDateTimeWidget", TQT_SIGNAL(valueChanged (const TQDateTime &)));
     changedMap.insert( "KEditListBox", TQT_SIGNAL(changed()));
-    changedMap.insert( "KListBox", TQT_SIGNAL(selectionChanged()));
+    changedMap.insert( "TDEListBox", TQT_SIGNAL(selectionChanged()));
     changedMap.insert( "KLineEdit", TQT_SIGNAL(textChanged(const TQString &)));
     changedMap.insert( "KPasswordEdit", TQT_SIGNAL(textChanged(const TQString &)));
     changedMap.insert( "KRestrictedLine", TQT_SIGNAL(textChanged(const TQString &)));
@@ -121,12 +121,12 @@ void KConfigDialogManager::init(bool trackChanges)
   (void) parseChildren(m_dialog, trackChanges);
 }
 
-void KConfigDialogManager::addWidget(TQWidget *widget)
+void TDEConfigDialogManager::addWidget(TQWidget *widget)
 {
   (void) parseChildren(widget, true);
 }
 
-void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *item)
+void TDEConfigDialogManager::setupWidget(TQWidget *widget, TDEConfigSkeletonItem *item)
 {
   TQVariant minValue = item->minValue();
   if (minValue.isValid())
@@ -150,7 +150,7 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it
   }
 }
 
-bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges)
+bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges)
 {
   bool valueChanged = false;
   const TQObjectList listOfChildren = widget->childrenListObject();
@@ -174,7 +174,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
     {
       // This is one of our widgets!
       TQString configId = widgetName+5;
-      KConfigSkeletonItem *item = m_conf->findItem(configId);
+      TDEConfigSkeletonItem *item = m_conf->findItem(configId);
       if (item)
       {
         d->knownWidget.insert(configId, childWidget);
@@ -187,7 +187,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
         {
 		   // If the class name of the widget wasn't in the monitored widgets map, then look for 
 		   // it again using the super class name. This fixes a problem with using QtRuby/Korundum 
-		   // widgets with KConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even 
+		   // widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even 
 		   // though it was a 'QWidget'.
           changedIt = changedMap.find(childWidget->metaObject()->superClassName());
         }
@@ -256,7 +256,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
   return valueChanged;
 }
 
-void KConfigDialogManager::updateWidgets()
+void TDEConfigDialogManager::updateWidgets()
 {
   bool changed = false;
   bool bSignalsBlocked = signalsBlocked();
@@ -266,7 +266,7 @@ void KConfigDialogManager::updateWidgets()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
+     TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -294,14 +294,14 @@ void KConfigDialogManager::updateWidgets()
     TQTimer::singleShot(0, this, TQT_SIGNAL(widgetModified()));
 }
 
-void KConfigDialogManager::updateWidgetsDefault()
+void TDEConfigDialogManager::updateWidgetsDefault()
 {
   bool bUseDefaults = m_conf->useDefaults(true);
   updateWidgets();
   m_conf->useDefaults(bUseDefaults);
 }
 
-void KConfigDialogManager::updateSettings()
+void TDEConfigDialogManager::updateSettings()
 {
   bool changed = false;
 
@@ -309,7 +309,7 @@ void KConfigDialogManager::updateSettings()
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
+     TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -330,7 +330,7 @@ void KConfigDialogManager::updateSettings()
   }
 }
 
-void KConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v)
+void TDEConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v)
 {
   TQButtonGroup *bg = dynamic_cast<TQButtonGroup *>(w);
   if (bg)
@@ -349,7 +349,7 @@ void KConfigDialogManager::setProperty(TQWidget *w, const TQVariant &v)
   propertyMap->setProperty(w, v);
 }
 
-TQVariant KConfigDialogManager::property(TQWidget *w)
+TQVariant TDEConfigDialogManager::property(TQWidget *w)
 {
   TQButtonGroup *bg = dynamic_cast<TQButtonGroup *>(w);
   if (bg)
@@ -362,14 +362,14 @@ TQVariant KConfigDialogManager::property(TQWidget *w)
   return propertyMap->property(w);
 }
 
-bool KConfigDialogManager::hasChanged()
+bool TDEConfigDialogManager::hasChanged()
 {
 
   TQWidget *widget;
   for( TQDictIterator<TQWidget> it( d->knownWidget );
        (widget = it.current()); ++it )
   {
-     KConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
+     TDEConfigSkeletonItem *item = m_conf->findItem(it.currentKey());
      if (!item)
      {
         kdWarning(178) << "The setting '" << it.currentKey() << "' has disappeared!" << endl;
@@ -386,7 +386,7 @@ bool KConfigDialogManager::hasChanged()
   return false;
 }
 
-bool KConfigDialogManager::isDefault()
+bool TDEConfigDialogManager::isDefault()
 {
   bool bUseDefaults = m_conf->useDefaults(true);
   bool result = !hasChanged();
@@ -394,5 +394,5 @@ bool KConfigDialogManager::isDefault()
   return result;
 }
 
-#include "kconfigdialogmanager.moc"
+#include "tdeconfigdialogmanager.moc"
 
diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h
index cc2238d4c..1b82e9eda 100644
--- a/tdecore/kconfigdialogmanager.h
+++ b/tdecore/tdeconfigdialogmanager.h
@@ -25,28 +25,28 @@
 #include <tqptrlist.h>
 #include "tdelibs_export.h"
 
-class KConfigSkeleton;
-class KConfigSkeletonItem;
+class TDEConfigSkeleton;
+class TDEConfigSkeletonItem;
 class TQWidget;
 class TQSqlPropertyMap;
 
 /**
  * @short Provides a means of automatically retrieving,
- * saving and resetting KConfigSkeleton based settings in a dialog.
+ * saving and resetting TDEConfigSkeleton based settings in a dialog.
  *
- * The KConfigDialogManager class provides a means of automatically
+ * The TDEConfigDialogManager class provides a means of automatically
  * retrieving, saving and resetting basic settings.
  * It also can emit signals when settings have been changed
  * (settings were saved) or modified (the user changes a checkbox
  * from on to off).
  *
  * The names of the widgets to be managed have to correspond to the names of the
- * configuration entries in the KConfigSkeleton object plus an additional
+ * configuration entries in the TDEConfigSkeleton object plus an additional
  * "kcfg_" prefix. For example a widget named "kcfg_MyOption" would be
  * associated to the configuration entry "MyOption".
  *
- * KConfigDialogManager uses the TQSqlPropertyMap class to determine if it can do
- * anything to a widget.  Note that KConfigDialogManager doesn't  require a
+ * TDEConfigDialogManager uses the TQSqlPropertyMap class to determine if it can do
+ * anything to a widget.  Note that TDEConfigDialogManager doesn't  require a
  * database, it simply uses the functionality that is built into the
  * TQSqlPropertyMap class.  New widgets can be added to the map using
  * TQSqlPropertyMap::installDefaultMap().  Note that you can't just add any
@@ -75,7 +75,7 @@ class TQSqlPropertyMap;
  * @author Benjamin C Meyer <ben+tdelibs at meyerhome dot net>
  * @author Waldo Bastian <bastian@kde.org>
  */
-class TDECORE_EXPORT KConfigDialogManager : public TQObject {
+class TDECORE_EXPORT TDEConfigDialogManager : public TQObject {
 
 Q_OBJECT
 
@@ -114,12 +114,12 @@ public:
    * @param conf Object that contains settings
    * @param name - Object name.
    */
-   KConfigDialogManager(TQWidget *parent, KConfigSkeleton *conf, const char *name=0);
+   TDEConfigDialogManager(TQWidget *parent, TDEConfigSkeleton *conf, const char *name=0);
 
   /**
    * Destructor.
    */
-  ~KConfigDialogManager();
+  ~TDEConfigDialogManager();
 
   /**
    * Add additional widgets to manage
@@ -200,13 +200,13 @@ protected:
   /**
    * Setup secondary widget properties
    */
-  void setupWidget(TQWidget *widget, KConfigSkeletonItem *item);
+  void setupWidget(TQWidget *widget, TDEConfigSkeletonItem *item);
 
 protected:
   /**
-   * KConfigSkeleton object used to store settings
+   * TDEConfigSkeleton object used to store settings
    */
-  KConfigSkeleton *m_conf;
+  TDEConfigSkeleton *m_conf;
 
   /**
    * Dialog being managed
@@ -226,7 +226,7 @@ protected:
 private:
   class Private;
   /**
-   * KConfigDialogManager Private class.
+   * TDEConfigDialogManager Private class.
    */
   Private *d;
 
diff --git a/tdecore/kconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp
index b464f64d2..45a4b4112 100644
--- a/tdecore/kconfigskeleton.cpp
+++ b/tdecore/tdeconfigskeleton.cpp
@@ -22,32 +22,32 @@
 #include <tqcolor.h>
 #include <tqvariant.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 
 #include "kstringhandler.h"
 
-#include "kconfigskeleton.h"
+#include "tdeconfigskeleton.h"
 
-void KConfigSkeletonItem::readImmutability( KConfig *config )
+void TDEConfigSkeletonItem::readImmutability( TDEConfig *config )
 {
   mIsImmutable = config->entryIsImmutable( mKey );
 }
 
 
-KConfigSkeleton::ItemString::ItemString( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemString::ItemString( const TQString &group, const TQString &key,
                                     TQString &reference,
                                     const TQString &defaultValue,
                                     Type type )
-  : KConfigSkeletonGenericItem<TQString>( group, key, reference, defaultValue ),
+  : TDEConfigSkeletonGenericItem<TQString>( group, key, reference, defaultValue ),
     mType( type )
 {
 }
 
-void KConfigSkeleton::ItemString::writeConfig( KConfig *config )
+void TDEConfigSkeleton::ItemString::writeConfig( TDEConfig *config )
 {
   if ( mReference != mLoadedValue ) // WABA: Is this test needed?
   {
@@ -64,7 +64,7 @@ void KConfigSkeleton::ItemString::writeConfig( KConfig *config )
 }
 
 
-void KConfigSkeleton::ItemString::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemString::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
 
@@ -88,39 +88,39 @@ void KConfigSkeleton::ItemString::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemString::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemString::setProperty(const TQVariant & p)
 {
   mReference = p.toString();
 }
 
-TQVariant KConfigSkeleton::ItemString::property() const
+TQVariant TDEConfigSkeleton::ItemString::property() const
 {
   return TQVariant(mReference);
 }
 
-KConfigSkeleton::ItemPassword::ItemPassword( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemPassword::ItemPassword( const TQString &group, const TQString &key,
                                     TQString &reference,
                                     const TQString &defaultValue)
   : ItemString( group, key, reference, defaultValue, Password )
 {
 }
 
-KConfigSkeleton::ItemPath::ItemPath( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemPath::ItemPath( const TQString &group, const TQString &key,
                                     TQString &reference,
                                     const TQString &defaultValue)
   : ItemString( group, key, reference, defaultValue, Path )
 {
 }
 
-KConfigSkeleton::ItemProperty::ItemProperty( const TQString &group,
+TDEConfigSkeleton::ItemProperty::ItemProperty( const TQString &group,
                                         const TQString &key,
                                         TQVariant &reference,
                                         TQVariant defaultValue )
-  : KConfigSkeletonGenericItem<TQVariant>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQVariant>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemProperty::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemProperty::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readPropertyEntry( mKey, mDefault );
@@ -129,23 +129,23 @@ void KConfigSkeleton::ItemProperty::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemProperty::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemProperty::setProperty(const TQVariant & p)
 {
   mReference = p;
 }
 
-TQVariant KConfigSkeleton::ItemProperty::property() const
+TQVariant TDEConfigSkeleton::ItemProperty::property() const
 {
   return mReference;
 }
 
-KConfigSkeleton::ItemBool::ItemBool( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemBool::ItemBool( const TQString &group, const TQString &key,
                                 bool &reference, bool defaultValue )
-  : KConfigSkeletonGenericItem<bool>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<bool>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemBool::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemBool::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readBoolEntry( mKey, mDefault );
@@ -154,25 +154,25 @@ void KConfigSkeleton::ItemBool::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemBool::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemBool::setProperty(const TQVariant & p)
 {
   mReference = p.toBool();
 }
 
-TQVariant KConfigSkeleton::ItemBool::property() const
+TQVariant TDEConfigSkeleton::ItemBool::property() const
 {
   return TQVariant( mReference, 42 /* dummy */ );
 }
 
 
-KConfigSkeleton::ItemInt::ItemInt( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemInt::ItemInt( const TQString &group, const TQString &key,
                               int &reference, int defaultValue )
-  : KConfigSkeletonGenericItem<int>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<int>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemInt::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemInt::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readNumEntry( mKey, mDefault );
@@ -185,51 +185,51 @@ void KConfigSkeleton::ItemInt::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemInt::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemInt::setProperty(const TQVariant & p)
 {
   mReference = p.toInt();
 }
 
-TQVariant KConfigSkeleton::ItemInt::property() const
+TQVariant TDEConfigSkeleton::ItemInt::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemInt::minValue() const
+TQVariant TDEConfigSkeleton::ItemInt::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemInt::maxValue() const
+TQVariant TDEConfigSkeleton::ItemInt::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemInt::setMinValue(int v)
+void TDEConfigSkeleton::ItemInt::setMinValue(int v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemInt::setMaxValue(int v)
+void TDEConfigSkeleton::ItemInt::setMaxValue(int v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key,
                               TQ_INT64 &reference, TQ_INT64 defaultValue )
-  : KConfigSkeletonGenericItem<TQ_INT64>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQ_INT64>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemInt64::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemInt64::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readNum64Entry( mKey, mDefault );
@@ -242,43 +242,43 @@ void KConfigSkeleton::ItemInt64::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemInt64::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemInt64::setProperty(const TQVariant & p)
 {
   mReference = p.toLongLong();
 }
 
-TQVariant KConfigSkeleton::ItemInt64::property() const
+TQVariant TDEConfigSkeleton::ItemInt64::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemInt64::minValue() const
+TQVariant TDEConfigSkeleton::ItemInt64::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemInt64::maxValue() const
+TQVariant TDEConfigSkeleton::ItemInt64::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v)
+void TDEConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v)
+void TDEConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v)
 {
   mHasMax = true;
   mMax = v;
 }
 
-KConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key,
                                      int &reference,
                                      const TQValueList<Choice> &choices,
                                      int defaultValue )
@@ -286,7 +286,7 @@ KConfigSkeleton::ItemEnum::ItemEnum( const TQString &group, const TQString &key,
 {
 }
 
-void KConfigSkeleton::ItemEnum::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemEnum::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   if (!config->hasKey(mKey))
@@ -315,7 +315,7 @@ void KConfigSkeleton::ItemEnum::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemEnum::writeConfig( KConfig *config )
+void TDEConfigSkeleton::ItemEnum::writeConfig( TDEConfig *config )
 {
   if ( mReference != mLoadedValue ) // WABA: Is this test needed?
   {
@@ -329,21 +329,21 @@ void KConfigSkeleton::ItemEnum::writeConfig( KConfig *config )
   }
 }
 
-TQValueList<KConfigSkeleton::ItemEnum::Choice> KConfigSkeleton::ItemEnum::choices() const
+TQValueList<TDEConfigSkeleton::ItemEnum::Choice> TDEConfigSkeleton::ItemEnum::choices() const
 {
   return mChoices;
 }
 
 
-KConfigSkeleton::ItemUInt::ItemUInt( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemUInt::ItemUInt( const TQString &group, const TQString &key,
                                 unsigned int &reference,
                                 unsigned int defaultValue )
-  : KConfigSkeletonGenericItem<unsigned int>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<unsigned int>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemUInt::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemUInt::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readUnsignedNumEntry( mKey, mDefault );
@@ -356,51 +356,51 @@ void KConfigSkeleton::ItemUInt::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemUInt::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemUInt::setProperty(const TQVariant & p)
 {
   mReference = p.toUInt();
 }
 
-TQVariant KConfigSkeleton::ItemUInt::property() const
+TQVariant TDEConfigSkeleton::ItemUInt::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemUInt::minValue() const
+TQVariant TDEConfigSkeleton::ItemUInt::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemUInt::maxValue() const
+TQVariant TDEConfigSkeleton::ItemUInt::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemUInt::setMinValue(unsigned int v)
+void TDEConfigSkeleton::ItemUInt::setMinValue(unsigned int v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemUInt::setMaxValue(unsigned int v)
+void TDEConfigSkeleton::ItemUInt::setMaxValue(unsigned int v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key,
                               TQ_UINT64 &reference, TQ_UINT64 defaultValue )
-  : KConfigSkeletonGenericItem<TQ_UINT64>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQ_UINT64>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemUInt64::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemUInt64::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readUnsignedNum64Entry( mKey, mDefault );
@@ -413,50 +413,50 @@ void KConfigSkeleton::ItemUInt64::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemUInt64::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemUInt64::setProperty(const TQVariant & p)
 {
   mReference = p.toULongLong();
 }
 
-TQVariant KConfigSkeleton::ItemUInt64::property() const
+TQVariant TDEConfigSkeleton::ItemUInt64::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemUInt64::minValue() const
+TQVariant TDEConfigSkeleton::ItemUInt64::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemUInt64::maxValue() const
+TQVariant TDEConfigSkeleton::ItemUInt64::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v)
+void TDEConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v)
+void TDEConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v)
 {
   mHasMax = true;
   mMax = v;
 }
 
-KConfigSkeleton::ItemLong::ItemLong( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemLong::ItemLong( const TQString &group, const TQString &key,
                                 long &reference, long defaultValue )
-  : KConfigSkeletonGenericItem<long>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<long>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemLong::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemLong::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readLongNumEntry( mKey, mDefault );
@@ -469,52 +469,52 @@ void KConfigSkeleton::ItemLong::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemLong::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemLong::setProperty(const TQVariant & p)
 {
   mReference = p.toLongLong();
 }
 
-TQVariant KConfigSkeleton::ItemLong::property() const
+TQVariant TDEConfigSkeleton::ItemLong::property() const
 {
   return TQVariant((TQ_LLONG) mReference);
 }
 
-TQVariant KConfigSkeleton::ItemLong::minValue() const
+TQVariant TDEConfigSkeleton::ItemLong::minValue() const
 {
   if (mHasMin)
     return TQVariant((TQ_LLONG) mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemLong::maxValue() const
+TQVariant TDEConfigSkeleton::ItemLong::maxValue() const
 {
   if (mHasMax)
     return TQVariant((TQ_LLONG) mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemLong::setMinValue(long v)
+void TDEConfigSkeleton::ItemLong::setMinValue(long v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemLong::setMaxValue(long v)
+void TDEConfigSkeleton::ItemLong::setMaxValue(long v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemULong::ItemULong( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemULong::ItemULong( const TQString &group, const TQString &key,
                                   unsigned long &reference,
                                   unsigned long defaultValue )
-  : KConfigSkeletonGenericItem<unsigned long>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<unsigned long>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemULong::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemULong::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readUnsignedLongNumEntry( mKey, mDefault );
@@ -527,51 +527,51 @@ void KConfigSkeleton::ItemULong::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemULong::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemULong::setProperty(const TQVariant & p)
 {
   mReference = p.toULongLong();
 }
 
-TQVariant KConfigSkeleton::ItemULong::property() const
+TQVariant TDEConfigSkeleton::ItemULong::property() const
 {
   return TQVariant((TQ_ULLONG) mReference);
 }
 
-TQVariant KConfigSkeleton::ItemULong::minValue() const
+TQVariant TDEConfigSkeleton::ItemULong::minValue() const
 {
   if (mHasMin)
     return TQVariant((TQ_ULLONG) mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemULong::maxValue() const
+TQVariant TDEConfigSkeleton::ItemULong::maxValue() const
 {
   if (mHasMax)
     return TQVariant((TQ_ULLONG) mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemULong::setMinValue(unsigned long v)
+void TDEConfigSkeleton::ItemULong::setMinValue(unsigned long v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemULong::setMaxValue(unsigned long v)
+void TDEConfigSkeleton::ItemULong::setMaxValue(unsigned long v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemDouble::ItemDouble( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemDouble::ItemDouble( const TQString &group, const TQString &key,
                                     double &reference, double defaultValue )
-  : KConfigSkeletonGenericItem<double>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<double>( group, key, reference, defaultValue )
   ,mHasMin(false), mHasMax(false)
 {
 }
 
-void KConfigSkeleton::ItemDouble::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemDouble::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readDoubleNumEntry( mKey, mDefault );
@@ -584,51 +584,51 @@ void KConfigSkeleton::ItemDouble::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemDouble::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemDouble::setProperty(const TQVariant & p)
 {
   mReference = p.toDouble();
 }
 
-TQVariant KConfigSkeleton::ItemDouble::property() const
+TQVariant TDEConfigSkeleton::ItemDouble::property() const
 {
   return TQVariant(mReference);
 }
 
-TQVariant KConfigSkeleton::ItemDouble::minValue() const
+TQVariant TDEConfigSkeleton::ItemDouble::minValue() const
 {
   if (mHasMin)
     return TQVariant(mMin);
   return TQVariant();
 }
 
-TQVariant KConfigSkeleton::ItemDouble::maxValue() const
+TQVariant TDEConfigSkeleton::ItemDouble::maxValue() const
 {
   if (mHasMax)
     return TQVariant(mMax);
   return TQVariant();
 }
 
-void KConfigSkeleton::ItemDouble::setMinValue(double v)
+void TDEConfigSkeleton::ItemDouble::setMinValue(double v)
 {
   mHasMin = true;
   mMin = v;
 }
 
-void KConfigSkeleton::ItemDouble::setMaxValue(double v)
+void TDEConfigSkeleton::ItemDouble::setMaxValue(double v)
 {
   mHasMax = true;
   mMax = v;
 }
 
 
-KConfigSkeleton::ItemColor::ItemColor( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemColor::ItemColor( const TQString &group, const TQString &key,
                                   TQColor &reference,
                                   const TQColor &defaultValue )
-  : KConfigSkeletonGenericItem<TQColor>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQColor>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemColor::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemColor::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readColorEntry( mKey, &mDefault );
@@ -637,25 +637,25 @@ void KConfigSkeleton::ItemColor::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemColor::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemColor::setProperty(const TQVariant & p)
 {
   mReference = p.toColor();
 }
 
-TQVariant KConfigSkeleton::ItemColor::property() const
+TQVariant TDEConfigSkeleton::ItemColor::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemFont::ItemFont( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemFont::ItemFont( const TQString &group, const TQString &key,
                                 TQFont &reference,
                                 const TQFont &defaultValue )
-  : KConfigSkeletonGenericItem<TQFont>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQFont>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemFont::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemFont::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readFontEntry( mKey, &mDefault );
@@ -664,25 +664,25 @@ void KConfigSkeleton::ItemFont::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemFont::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemFont::setProperty(const TQVariant & p)
 {
   mReference = p.toFont();
 }
 
-TQVariant KConfigSkeleton::ItemFont::property() const
+TQVariant TDEConfigSkeleton::ItemFont::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemRect::ItemRect( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemRect::ItemRect( const TQString &group, const TQString &key,
                                 TQRect &reference,
                                 const TQRect &defaultValue )
-  : KConfigSkeletonGenericItem<TQRect>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQRect>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemRect::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemRect::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readRectEntry( mKey, &mDefault );
@@ -691,25 +691,25 @@ void KConfigSkeleton::ItemRect::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemRect::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemRect::setProperty(const TQVariant & p)
 {
   mReference = p.toRect();
 }
 
-TQVariant KConfigSkeleton::ItemRect::property() const
+TQVariant TDEConfigSkeleton::ItemRect::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemPoint::ItemPoint( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemPoint::ItemPoint( const TQString &group, const TQString &key,
                                   TQPoint &reference,
                                   const TQPoint &defaultValue )
-  : KConfigSkeletonGenericItem<TQPoint>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQPoint>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemPoint::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemPoint::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readPointEntry( mKey, &mDefault );
@@ -718,25 +718,25 @@ void KConfigSkeleton::ItemPoint::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemPoint::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemPoint::setProperty(const TQVariant & p)
 {
   mReference = p.toPoint();
 }
 
-TQVariant KConfigSkeleton::ItemPoint::property() const
+TQVariant TDEConfigSkeleton::ItemPoint::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemSize::ItemSize( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemSize::ItemSize( const TQString &group, const TQString &key,
                                 TQSize &reference,
                                 const TQSize &defaultValue )
-  : KConfigSkeletonGenericItem<TQSize>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQSize>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemSize::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemSize::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readSizeEntry( mKey, &mDefault );
@@ -745,25 +745,25 @@ void KConfigSkeleton::ItemSize::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemSize::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemSize::setProperty(const TQVariant & p)
 {
   mReference = p.toSize();
 }
 
-TQVariant KConfigSkeleton::ItemSize::property() const
+TQVariant TDEConfigSkeleton::ItemSize::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemDateTime::ItemDateTime( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemDateTime::ItemDateTime( const TQString &group, const TQString &key,
                                         TQDateTime &reference,
                                         const TQDateTime &defaultValue )
-  : KConfigSkeletonGenericItem<TQDateTime>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQDateTime>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemDateTime::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemDateTime::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   mReference = config->readDateTimeEntry( mKey, &mDefault );
@@ -772,25 +772,25 @@ void KConfigSkeleton::ItemDateTime::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemDateTime::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemDateTime::setProperty(const TQVariant & p)
 {
   mReference = p.toDateTime();
 }
 
-TQVariant KConfigSkeleton::ItemDateTime::property() const
+TQVariant TDEConfigSkeleton::ItemDateTime::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemStringList::ItemStringList( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemStringList::ItemStringList( const TQString &group, const TQString &key,
                                             TQStringList &reference,
                                             const TQStringList &defaultValue )
-  : KConfigSkeletonGenericItem<TQStringList>( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQStringList>( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemStringList::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemStringList::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   if ( !config->hasKey( mKey ) )
@@ -802,25 +802,25 @@ void KConfigSkeleton::ItemStringList::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemStringList::setProperty(const TQVariant & p)
+void TDEConfigSkeleton::ItemStringList::setProperty(const TQVariant & p)
 {
   mReference = p.toStringList();
 }
 
-TQVariant KConfigSkeleton::ItemStringList::property() const
+TQVariant TDEConfigSkeleton::ItemStringList::property() const
 {
   return TQVariant(mReference);
 }
 
 
-KConfigSkeleton::ItemPathList::ItemPathList( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemPathList::ItemPathList( const TQString &group, const TQString &key,
                                             TQStringList &reference,
                                             const TQStringList &defaultValue )
   : ItemStringList( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemPathList::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemPathList::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   if ( !config->hasKey( mKey ) )
@@ -832,7 +832,7 @@ void KConfigSkeleton::ItemPathList::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemPathList::writeConfig( KConfig *config )
+void TDEConfigSkeleton::ItemPathList::writeConfig( TDEConfig *config )
 {
   if ( mReference != mLoadedValue ) // WABA: Is this test needed?
   {
@@ -847,14 +847,14 @@ void KConfigSkeleton::ItemPathList::writeConfig( KConfig *config )
 }
 
 
-KConfigSkeleton::ItemIntList::ItemIntList( const TQString &group, const TQString &key,
+TDEConfigSkeleton::ItemIntList::ItemIntList( const TQString &group, const TQString &key,
                                       TQValueList<int> &reference,
                                       const TQValueList<int> &defaultValue )
-  : KConfigSkeletonGenericItem<TQValueList<int> >( group, key, reference, defaultValue )
+  : TDEConfigSkeletonGenericItem<TQValueList<int> >( group, key, reference, defaultValue )
 {
 }
 
-void KConfigSkeleton::ItemIntList::readConfig( KConfig *config )
+void TDEConfigSkeleton::ItemIntList::readConfig( TDEConfig *config )
 {
   config->setGroup( mGroup );
   if ( !config->hasKey( mKey ) )
@@ -866,67 +866,67 @@ void KConfigSkeleton::ItemIntList::readConfig( KConfig *config )
   readImmutability( config );
 }
 
-void KConfigSkeleton::ItemIntList::setProperty(const TQVariant &)
+void TDEConfigSkeleton::ItemIntList::setProperty(const TQVariant &)
 {
   // TODO: Not yet supported
 }
 
-TQVariant KConfigSkeleton::ItemIntList::property() const
+TQVariant TDEConfigSkeleton::ItemIntList::property() const
 {
   // TODO: Not yet supported
   return TQVariant();  
 }
 
 
-KConfigSkeleton::KConfigSkeleton( const TQString &configname )
+TDEConfigSkeleton::TDEConfigSkeleton( const TQString &configname )
   : mCurrentGroup( "No Group" ), mUseDefaults(false)
 {
-  kdDebug(177) << "Creating KConfigSkeleton (" << (void *)this << ")" << endl;
+  kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl;
 
   if ( !configname.isEmpty() )
   {
-    mConfig = KSharedConfig::openConfig( configname );
+    mConfig = TDESharedConfig::openConfig( configname );
   }
   else
   {
-    mConfig = KGlobal::sharedConfig();
+    mConfig = TDEGlobal::sharedConfig();
   }
 }
 
-KConfigSkeleton::KConfigSkeleton(KSharedConfig::Ptr config)
+TDEConfigSkeleton::TDEConfigSkeleton(TDESharedConfig::Ptr config)
   : mCurrentGroup( "No Group" ), mUseDefaults(false)
 {
-  kdDebug(177) << "Creating KConfigSkeleton (" << (void *)this << ")" << endl;
+  kdDebug(177) << "Creating TDEConfigSkeleton (" << (void *)this << ")" << endl;
   mConfig = config;
 }
 
 
-KConfigSkeleton::~KConfigSkeleton()
+TDEConfigSkeleton::~TDEConfigSkeleton()
 {
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it )
   {
     delete *it;
   }
 }
 
-void KConfigSkeleton::setCurrentGroup( const TQString &group )
+void TDEConfigSkeleton::setCurrentGroup( const TQString &group )
 {
   mCurrentGroup = group;
 }
 
-KConfig *KConfigSkeleton::config() const
+TDEConfig *TDEConfigSkeleton::config() const
 {
   return mConfig;
 }
 
-bool KConfigSkeleton::useDefaults(bool b)
+bool TDEConfigSkeleton::useDefaults(bool b)
 {
   if (b == mUseDefaults)
      return mUseDefaults;
 
   mUseDefaults = b;
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it )
   {
     (*it)->swapDefault();
@@ -936,9 +936,9 @@ bool KConfigSkeleton::useDefaults(bool b)
   return !mUseDefaults;
 }
 
-void KConfigSkeleton::setDefaults()
+void TDEConfigSkeleton::setDefaults()
 {
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it ) {
     (*it)->setDefault();
   }
@@ -946,14 +946,14 @@ void KConfigSkeleton::setDefaults()
   usrSetDefaults();
 }
 
-void KConfigSkeleton::readConfig()
+void TDEConfigSkeleton::readConfig()
 {
-  kdDebug(177) << "KConfigSkeleton::readConfig()" << endl;
+  kdDebug(177) << "TDEConfigSkeleton::readConfig()" << endl;
   
   TQString origGroup = mConfig->group();
 
   mConfig->reparseConfiguration();
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it )
   {
     (*it)->readConfig( mConfig );
@@ -964,13 +964,13 @@ void KConfigSkeleton::readConfig()
   mConfig->setGroup(origGroup);
 }
 
-void KConfigSkeleton::writeConfig()
+void TDEConfigSkeleton::writeConfig()
 {
-  kdDebug(177) << "KConfigSkeleton::writeConfig()" << endl;
+  kdDebug(177) << "TDEConfigSkeleton::writeConfig()" << endl;
 
   TQString origGroup = mConfig->group();
 
-  KConfigSkeletonItem::List::ConstIterator it;
+  TDEConfigSkeletonItem::List::ConstIterator it;
   for( it = mItems.begin(); it != mItems.end(); ++it )
   {
     (*it)->writeConfig( mConfig );
@@ -985,7 +985,7 @@ void KConfigSkeleton::writeConfig()
   mConfig->setGroup(origGroup);
 }
 
-void KConfigSkeleton::addItem( KConfigSkeletonItem *item, const TQString &name )
+void TDEConfigSkeleton::addItem( TDEConfigSkeletonItem *item, const TQString &name )
 {
   item->setName( name.isEmpty() ? item->key() : name );
   mItems.append( item );
@@ -994,214 +994,214 @@ void KConfigSkeleton::addItem( KConfigSkeletonItem *item, const TQString &name )
   item->readConfig( mConfig );
 }
 
-KConfigSkeleton::ItemString *KConfigSkeleton::addItemString( const TQString &name, TQString &reference,
+TDEConfigSkeleton::ItemString *TDEConfigSkeleton::addItemString( const TQString &name, TQString &reference,
                                      const TQString &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemString *item;
-  item = new KConfigSkeleton::ItemString( mCurrentGroup, key.isEmpty() ? name : key,
+  TDEConfigSkeleton::ItemString *item;
+  item = new TDEConfigSkeleton::ItemString( mCurrentGroup, key.isEmpty() ? name : key,
                                           reference, defaultValue,
-                                          KConfigSkeleton::ItemString::Normal );
+                                          TDEConfigSkeleton::ItemString::Normal );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemPassword *KConfigSkeleton::addItemPassword( const TQString &name, TQString &reference,
+TDEConfigSkeleton::ItemPassword *TDEConfigSkeleton::addItemPassword( const TQString &name, TQString &reference,
                                        const TQString &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemPassword *item;
-  item = new KConfigSkeleton::ItemPassword( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemPassword *item;
+  item = new TDEConfigSkeleton::ItemPassword( mCurrentGroup, key.isNull() ? name : key,
                                           reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemPath *KConfigSkeleton::addItemPath( const TQString &name, TQString &reference,
+TDEConfigSkeleton::ItemPath *TDEConfigSkeleton::addItemPath( const TQString &name, TQString &reference,
                                    const TQString &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemPath *item;
-  item = new KConfigSkeleton::ItemPath( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemPath *item;
+  item = new TDEConfigSkeleton::ItemPath( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemProperty *KConfigSkeleton::addItemProperty( const TQString &name, TQVariant &reference,
+TDEConfigSkeleton::ItemProperty *TDEConfigSkeleton::addItemProperty( const TQString &name, TQVariant &reference,
                                        const TQVariant &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemProperty *item;
-  item = new KConfigSkeleton::ItemProperty( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemProperty *item;
+  item = new TDEConfigSkeleton::ItemProperty( mCurrentGroup, key.isNull() ? name : key,
                                             reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemBool *KConfigSkeleton::addItemBool( const TQString &name, bool &reference,
+TDEConfigSkeleton::ItemBool *TDEConfigSkeleton::addItemBool( const TQString &name, bool &reference,
                                    bool defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemBool *item;
-  item = new KConfigSkeleton::ItemBool( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemBool *item;
+  item = new TDEConfigSkeleton::ItemBool( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemInt *KConfigSkeleton::addItemInt( const TQString &name, int &reference,
+TDEConfigSkeleton::ItemInt *TDEConfigSkeleton::addItemInt( const TQString &name, int &reference,
                                   int defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemInt *item;
-  item = new KConfigSkeleton::ItemInt( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemInt *item;
+  item = new TDEConfigSkeleton::ItemInt( mCurrentGroup, key.isNull() ? name : key,
                                        reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemUInt *KConfigSkeleton::addItemUInt( const TQString &name, unsigned int &reference,
+TDEConfigSkeleton::ItemUInt *TDEConfigSkeleton::addItemUInt( const TQString &name, unsigned int &reference,
                                    unsigned int defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemUInt *item;
-  item = new KConfigSkeleton::ItemUInt( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemUInt *item;
+  item = new TDEConfigSkeleton::ItemUInt( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference,
+TDEConfigSkeleton::ItemInt64 *TDEConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference,
                                     TQ_INT64 defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemInt64 *item;
-  item = new KConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemInt64 *item;
+  item = new TDEConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key,
                                          reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference,
+TDEConfigSkeleton::ItemUInt64 *TDEConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference,
                                      TQ_UINT64 defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemUInt64 *item;
-  item = new KConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemUInt64 *item;
+  item = new TDEConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key,
                                           reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemLong *KConfigSkeleton::addItemLong( const TQString &name, long &reference,
+TDEConfigSkeleton::ItemLong *TDEConfigSkeleton::addItemLong( const TQString &name, long &reference,
                                    long defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemLong *item;
-  item = new KConfigSkeleton::ItemLong( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemLong *item;
+  item = new TDEConfigSkeleton::ItemLong( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemULong *KConfigSkeleton::addItemULong( const TQString &name, unsigned long &reference,
+TDEConfigSkeleton::ItemULong *TDEConfigSkeleton::addItemULong( const TQString &name, unsigned long &reference,
                                     unsigned long defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemULong *item;
-  item = new KConfigSkeleton::ItemULong( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemULong *item;
+  item = new TDEConfigSkeleton::ItemULong( mCurrentGroup, key.isNull() ? name : key,
                                          reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemDouble *KConfigSkeleton::addItemDouble( const TQString &name, double &reference,
+TDEConfigSkeleton::ItemDouble *TDEConfigSkeleton::addItemDouble( const TQString &name, double &reference,
                                      double defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemDouble *item;
-  item = new KConfigSkeleton::ItemDouble( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemDouble *item;
+  item = new TDEConfigSkeleton::ItemDouble( mCurrentGroup, key.isNull() ? name : key,
                                           reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemColor *KConfigSkeleton::addItemColor( const TQString &name, TQColor &reference,
+TDEConfigSkeleton::ItemColor *TDEConfigSkeleton::addItemColor( const TQString &name, TQColor &reference,
                                     const TQColor &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemColor *item;
-  item = new KConfigSkeleton::ItemColor( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemColor *item;
+  item = new TDEConfigSkeleton::ItemColor( mCurrentGroup, key.isNull() ? name : key,
                                          reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemFont *KConfigSkeleton::addItemFont( const TQString &name, TQFont &reference,
+TDEConfigSkeleton::ItemFont *TDEConfigSkeleton::addItemFont( const TQString &name, TQFont &reference,
                                    const TQFont &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemFont *item;
-  item = new KConfigSkeleton::ItemFont( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemFont *item;
+  item = new TDEConfigSkeleton::ItemFont( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemRect *KConfigSkeleton::addItemRect( const TQString &name, TQRect &reference,
+TDEConfigSkeleton::ItemRect *TDEConfigSkeleton::addItemRect( const TQString &name, TQRect &reference,
                                    const TQRect &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemRect *item;
-  item = new KConfigSkeleton::ItemRect( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemRect *item;
+  item = new TDEConfigSkeleton::ItemRect( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemPoint *KConfigSkeleton::addItemPoint( const TQString &name, TQPoint &reference,
+TDEConfigSkeleton::ItemPoint *TDEConfigSkeleton::addItemPoint( const TQString &name, TQPoint &reference,
                                     const TQPoint &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemPoint *item;
-  item = new KConfigSkeleton::ItemPoint( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemPoint *item;
+  item = new TDEConfigSkeleton::ItemPoint( mCurrentGroup, key.isNull() ? name : key,
                                          reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemSize *KConfigSkeleton::addItemSize( const TQString &name, TQSize &reference,
+TDEConfigSkeleton::ItemSize *TDEConfigSkeleton::addItemSize( const TQString &name, TQSize &reference,
                                    const TQSize &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemSize *item;
-  item = new KConfigSkeleton::ItemSize( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemSize *item;
+  item = new TDEConfigSkeleton::ItemSize( mCurrentGroup, key.isNull() ? name : key,
                                         reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemDateTime *KConfigSkeleton::addItemDateTime( const TQString &name, TQDateTime &reference,
+TDEConfigSkeleton::ItemDateTime *TDEConfigSkeleton::addItemDateTime( const TQString &name, TQDateTime &reference,
                                        const TQDateTime &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemDateTime *item;
-  item = new KConfigSkeleton::ItemDateTime( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemDateTime *item;
+  item = new TDEConfigSkeleton::ItemDateTime( mCurrentGroup, key.isNull() ? name : key,
                                             reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemStringList *KConfigSkeleton::addItemStringList( const TQString &name, TQStringList &reference,
+TDEConfigSkeleton::ItemStringList *TDEConfigSkeleton::addItemStringList( const TQString &name, TQStringList &reference,
                                          const TQStringList &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemStringList *item;
-  item = new KConfigSkeleton::ItemStringList( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemStringList *item;
+  item = new TDEConfigSkeleton::ItemStringList( mCurrentGroup, key.isNull() ? name : key,
                                               reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-KConfigSkeleton::ItemIntList *KConfigSkeleton::addItemIntList( const TQString &name, TQValueList<int> &reference,
+TDEConfigSkeleton::ItemIntList *TDEConfigSkeleton::addItemIntList( const TQString &name, TQValueList<int> &reference,
                                       const TQValueList<int> &defaultValue, const TQString &key )
 {
-  KConfigSkeleton::ItemIntList *item;
-  item = new KConfigSkeleton::ItemIntList( mCurrentGroup, key.isNull() ? name : key,
+  TDEConfigSkeleton::ItemIntList *item;
+  item = new TDEConfigSkeleton::ItemIntList( mCurrentGroup, key.isNull() ? name : key,
                                            reference, defaultValue );
   addItem( item, name );
   return item;
 }
 
-bool KConfigSkeleton::isImmutable(const TQString &name)
+bool TDEConfigSkeleton::isImmutable(const TQString &name)
 {
-  KConfigSkeletonItem *item = findItem(name);
+  TDEConfigSkeletonItem *item = findItem(name);
   return !item || item->isImmutable();
 }
 
-KConfigSkeletonItem *KConfigSkeleton::findItem(const TQString &name)
+TDEConfigSkeletonItem *TDEConfigSkeleton::findItem(const TQString &name)
 {
   return mItemDict.find(name);
 }
diff --git a/tdecore/kconfigskeleton.h b/tdecore/tdeconfigskeleton.h
index dde0779cf..b260db1e8 100644
--- a/tdecore/kconfigskeleton.h
+++ b/tdecore/tdeconfigskeleton.h
@@ -33,26 +33,26 @@
 #include <tqsize.h>
 #include <tqstringlist.h>
 #include <tqvariant.h>
-#include <kconfig.h>
-#include <kglobalsettings.h>
+#include <tdeconfig.h>
+#include <tdeglobalsettings.h>
 
   /**
    * @short Class for storing a preferences setting
    * @author Cornelius Schumacher
-   * @see KConfigSkeleton
+   * @see TDEConfigSkeleton
    * 
-   * This class represents one preferences setting as used by @ref KConfigSkeleton.
-   * Subclasses of KConfigSkeletonItem implement storage functions for a certain type of
+   * This class represents one preferences setting as used by @ref TDEConfigSkeleton.
+   * Subclasses of TDEConfigSkeletonItem implement storage functions for a certain type of
    * setting. Normally you don't have to use this class directly. Use the special
-   * addItem() functions of KConfigSkeleton instead. If you subclass this class you will
-   * have to register instances with the function KConfigSkeleton::addItem().
+   * addItem() functions of TDEConfigSkeleton instead. If you subclass this class you will
+   * have to register instances with the function TDEConfigSkeleton::addItem().
    */
-  class TDECORE_EXPORT KConfigSkeletonItem
+  class TDECORE_EXPORT TDEConfigSkeletonItem
   {
   public:
-    typedef TQValueList < KConfigSkeletonItem * >List;
-    typedef TQDict < KConfigSkeletonItem > Dict;
-    typedef TQDictIterator < KConfigSkeletonItem > DictIterator;
+    typedef TQValueList < TDEConfigSkeletonItem * >List;
+    typedef TQDict < TDEConfigSkeletonItem > Dict;
+    typedef TQDictIterator < TDEConfigSkeletonItem > DictIterator;
 
     /**
      * Constructor.
@@ -60,7 +60,7 @@
      * @param group Config file group.
      * @param key Config file key.
      */
-    KConfigSkeletonItem(const TQString & group, const TQString & key)
+    TDEConfigSkeletonItem(const TQString & group, const TQString & key)
       :mGroup(group),mKey(key), mIsImmutable(true)
     {
     }
@@ -68,7 +68,7 @@
     /**
      * Destructor.
      */
-    virtual ~KConfigSkeletonItem()
+    virtual ~TDEConfigSkeletonItem()
     {
     }
 
@@ -153,22 +153,22 @@
     }
 
     /**
-     * This function is called by @ref KConfigSkeleton to read the value for this setting
+     * This function is called by @ref TDEConfigSkeleton to read the value for this setting
      * from a config file.
      * value.
      */
-    virtual void readConfig(KConfig *) = 0;
+    virtual void readConfig(TDEConfig *) = 0;
 
     /**
-     * This function is called by @ref KConfigSkeleton to write the value of this setting
+     * This function is called by @ref TDEConfigSkeleton to write the value of this setting
      * to a config file.
      */
-    virtual void writeConfig(KConfig *) = 0;
+    virtual void writeConfig(TDEConfig *) = 0;
 
     /**
      * Read global default value.
      */
-    virtual void readDefault(KConfig *) = 0;
+    virtual void readDefault(TDEConfig *) = 0;
 
     /**
      * Set item to @p p
@@ -197,7 +197,7 @@
 
     /**
      * Exchanges the current value with the default value
-     * Used by KConfigSkeleton::useDefaults(bool);
+     * Used by TDEConfigSkeleton::useDefaults(bool);
      */
     virtual void swapDefault() = 0;
 
@@ -212,9 +212,9 @@
   protected:
     /**
      * sets mIsImmutable to true if mKey in config is immutable
-     * @param config KConfig to check if mKey is immutable in
+     * @param config TDEConfig to check if mKey is immutable in
      */
-    void readImmutability(KConfig *config);
+    void readImmutability(TDEConfig *config);
 
     TQString mGroup;
     TQString mKey;
@@ -228,18 +228,18 @@
   };
 
 
-template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonItem
+template < typename T > class TDEConfigSkeletonGenericItem:public TDEConfigSkeletonItem
   {
   public:
-    KConfigSkeletonGenericItem(const TQString & group, const TQString & key, T & reference,
+    TDEConfigSkeletonGenericItem(const TQString & group, const TQString & key, T & reference,
                 T defaultValue)
-      : KConfigSkeletonItem(group, key), mReference(reference),
+      : TDEConfigSkeletonItem(group, key), mReference(reference),
         mDefault(defaultValue), mLoadedValue(defaultValue)
     {
     }
 
     /**
-     * Set value of this KConfigSkeletonItem.
+     * Set value of this TDEConfigSkeletonItem.
      */
     void setValue(const T & v)
     {
@@ -247,7 +247,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
     }
 
     /**
-     * Return value of this KConfigSkeletonItem.
+     * Return value of this TDEConfigSkeletonItem.
      */
     T & value()
     {
@@ -255,7 +255,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
     }
 
     /**
-     * Return const value of this KConfigSkeletonItem.
+     * Return const value of this TDEConfigSkeletonItem.
      */
     const T & value() const
     {
@@ -275,7 +275,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
       mReference = mDefault;
     }
 
-    virtual void writeConfig(KConfig * config)
+    virtual void writeConfig(TDEConfig * config)
     {
       if ( mReference != mLoadedValue ) // Is this needed?
       {
@@ -287,7 +287,7 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
       }
     }
 
-    void readDefault(KConfig * config)
+    void readDefault(TDEConfig * config)
     {
       config->setReadDefaults(true);
       readConfig(config);
@@ -311,19 +311,19 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
   /**
    * @short Class for handling preferences settings for an application.
    * @author Cornelius Schumacher
-   * @see KConfigSkeletonItem
+   * @see TDEConfigSkeletonItem
    * 
    * This class provides an interface to preferences settings. Preferences items
    * can be registered by the addItem() function corresponding to the data type of
-   * the seetting. KConfigSkeleton then handles reading and writing of config files and
+   * the seetting. TDEConfigSkeleton then handles reading and writing of config files and
    * setting of default values.
    * 
-   * Normally you will subclass KConfigSkeleton, add data members for the preferences
+   * Normally you will subclass TDEConfigSkeleton, add data members for the preferences
    * settings and register the members in the constructor of the subclass.
    * 
    * Example:
    * \code
-   * class MyPrefs : public KConfigSkeleton
+   * class MyPrefs : public TDEConfigSkeleton
    * {
    *   public:
    *     MyPrefs()
@@ -342,9 +342,9 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
    * }
    * \endcode
    * 
-   * It might be convenient in many cases to make this subclass of KConfigSkeleton a
+   * It might be convenient in many cases to make this subclass of TDEConfigSkeleton a
    * singleton for global access from all over the application without passing
-   * references to the KConfigSkeleton object around.
+   * references to the TDEConfigSkeleton object around.
    * 
    * You can write the data to the configuration file by calling @ref writeConfig()
    * and read the data from the configuration file by calling @ref readConfig().
@@ -355,21 +355,21 @@ template < typename T > class KConfigSkeletonGenericItem:public KConfigSkeletonI
    * @ref usrWriteConfig().
    * 
    * Internally preferences settings are stored in instances of subclasses of
-   * @ref KConfigSkeletonItem. You can also add KConfigSkeletonItem subclasses 
+   * @ref TDEConfigSkeletonItem. You can also add TDEConfigSkeletonItem subclasses 
    * for your own types and call the generic @ref addItem() to register them.
    *
-   * In many cases you don't have to write the specific KConfigSkeleton
-   * subclasses yourself, but you can use \ref kconfig_compiler to automatically
+   * In many cases you don't have to write the specific TDEConfigSkeleton
+   * subclasses yourself, but you can use \ref tdeconfig_compiler to automatically
    * generate the C++ code from an XML description of the configuration options.
    */
-class TDECORE_EXPORT KConfigSkeleton
+class TDECORE_EXPORT TDEConfigSkeleton
 {
 public:
 
   /**
    * Class for handling a string preferences item.
    */
-  class TDECORE_EXPORT ItemString:public KConfigSkeletonGenericItem < TQString >
+  class TDECORE_EXPORT ItemString:public TDEConfigSkeletonGenericItem < TQString >
   {
   public:
     enum Type { Normal, Password, Path };
@@ -379,8 +379,8 @@ public:
                const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !!
                Type type = Normal);
 
-    void writeConfig(KConfig * config);
-    void readConfig(KConfig * config);
+    void writeConfig(TDEConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
 
@@ -414,13 +414,13 @@ public:
   /**
    * Class for handling a TQVariant preferences item.
    */
-  class TDECORE_EXPORT ItemProperty:public KConfigSkeletonGenericItem < TQVariant >
+  class TDECORE_EXPORT ItemProperty:public TDEConfigSkeletonGenericItem < TQVariant >
   {
   public:
     ItemProperty(const TQString & group, const TQString & key,
                  TQVariant & reference, TQVariant defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -429,13 +429,13 @@ public:
   /**
    * Class for handling a bool preferences item.
    */
-  class TDECORE_EXPORT ItemBool:public KConfigSkeletonGenericItem < bool >
+  class TDECORE_EXPORT ItemBool:public TDEConfigSkeletonGenericItem < bool >
   {
   public:
     ItemBool(const TQString & group, const TQString & key, bool & reference,
              bool defaultValue = true);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -444,13 +444,13 @@ public:
   /**
    * Class for handling an integer preferences item.
    */
-  class TDECORE_EXPORT ItemInt:public KConfigSkeletonGenericItem < int >
+  class TDECORE_EXPORT ItemInt:public TDEConfigSkeletonGenericItem < int >
   {
   public:
     ItemInt(const TQString & group, const TQString & key, int &reference,
             int defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -469,13 +469,13 @@ public:
   /**
    * Class for handling an 64-bit integer preferences item.
    */
-  class TDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 >
+  class TDECORE_EXPORT ItemInt64:public TDEConfigSkeletonGenericItem < TQ_INT64 >
   {
   public:
     ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference,
             TQ_INT64 defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
 
@@ -510,8 +510,8 @@ public:
 
     TQValueList<Choice> choices() const;
 
-    void readConfig(KConfig * config);
-    void writeConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
+    void writeConfig(TDEConfig * config);
 
   private:
       TQValueList<Choice> mChoices;
@@ -521,13 +521,13 @@ public:
   /**
    * Class for handling an unsingend integer preferences item.
    */
-  class TDECORE_EXPORT ItemUInt:public KConfigSkeletonGenericItem < unsigned int >
+  class TDECORE_EXPORT ItemUInt:public TDEConfigSkeletonGenericItem < unsigned int >
   {
   public:
     ItemUInt(const TQString & group, const TQString & key,
              unsigned int &reference, unsigned int defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -547,13 +547,13 @@ public:
   /**
    * Class for hanlding a long integer preferences item.
    */
-  class TDECORE_EXPORT ItemLong:public KConfigSkeletonGenericItem < long >
+  class TDECORE_EXPORT ItemLong:public TDEConfigSkeletonGenericItem < long >
   {
   public:
     ItemLong(const TQString & group, const TQString & key, long &reference,
              long defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -573,13 +573,13 @@ public:
   /**
    * Class for handling an unsigned long integer preferences item.
    */
-  class TDECORE_EXPORT ItemULong:public KConfigSkeletonGenericItem < unsigned long >
+  class TDECORE_EXPORT ItemULong:public TDEConfigSkeletonGenericItem < unsigned long >
   {
   public:
     ItemULong(const TQString & group, const TQString & key,
               unsigned long &reference, unsigned long defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -598,13 +598,13 @@ public:
   /**
    * Class for handling unsigned 64-bit integer preferences item.
    */
-  class TDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 >
+  class TDECORE_EXPORT ItemUInt64:public TDEConfigSkeletonGenericItem < TQ_UINT64 >
   {
   public:
     ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference,
             TQ_UINT64 defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
 
@@ -624,13 +624,13 @@ public:
   /**
    * Class for handling a floating point preference item.
    */
-  class TDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < double >
+  class TDECORE_EXPORT ItemDouble:public TDEConfigSkeletonGenericItem < double >
   {
   public:
     ItemDouble(const TQString & group, const TQString & key,
                double &reference, double defaultValue = 0);
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
     TQVariant minValue() const;
@@ -650,14 +650,14 @@ public:
   /**
    * Class for handling a color preferences item.
    */
-  class TDECORE_EXPORT ItemColor:public KConfigSkeletonGenericItem < TQColor >
+  class TDECORE_EXPORT ItemColor:public TDEConfigSkeletonGenericItem < TQColor >
   {
   public:
     ItemColor(const TQString & group, const TQString & key,
               TQColor & reference,
               const TQColor & defaultValue = TQColor(128, 128, 128));
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -666,13 +666,13 @@ public:
   /**
    * Class for handling a font preferences item.
    */
-  class TDECORE_EXPORT ItemFont:public KConfigSkeletonGenericItem < TQFont >
+  class TDECORE_EXPORT ItemFont:public TDEConfigSkeletonGenericItem < TQFont >
   {
   public:
     ItemFont(const TQString & group, const TQString & key, TQFont & reference,
-             const TQFont & defaultValue = KGlobalSettings::generalFont());
+             const TQFont & defaultValue = TDEGlobalSettings::generalFont());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -681,13 +681,13 @@ public:
   /**
    * Class for handling a TQRect preferences item.
    */
-  class TDECORE_EXPORT ItemRect:public KConfigSkeletonGenericItem < TQRect >
+  class TDECORE_EXPORT ItemRect:public TDEConfigSkeletonGenericItem < TQRect >
   {
   public:
     ItemRect(const TQString & group, const TQString & key, TQRect & reference,
              const TQRect & defaultValue = TQRect());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -696,13 +696,13 @@ public:
   /**
    * Class for handling a TQPoint preferences item.
    */
-  class TDECORE_EXPORT ItemPoint:public KConfigSkeletonGenericItem < TQPoint >
+  class TDECORE_EXPORT ItemPoint:public TDEConfigSkeletonGenericItem < TQPoint >
   {
   public:
     ItemPoint(const TQString & group, const TQString & key, TQPoint & reference,
               const TQPoint & defaultValue = TQPoint());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -711,13 +711,13 @@ public:
   /**
    * Class for handling a TQSize preferences item.
    */
-  class TDECORE_EXPORT ItemSize:public KConfigSkeletonGenericItem < TQSize >
+  class TDECORE_EXPORT ItemSize:public TDEConfigSkeletonGenericItem < TQSize >
   {
   public:
     ItemSize(const TQString & group, const TQString & key, TQSize & reference,
              const TQSize & defaultValue = TQSize());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -726,14 +726,14 @@ public:
   /**
    * Class for handling a TQDateTime preferences item.
    */
-  class TDECORE_EXPORT ItemDateTime:public KConfigSkeletonGenericItem < TQDateTime >
+  class TDECORE_EXPORT ItemDateTime:public TDEConfigSkeletonGenericItem < TQDateTime >
   {
   public:
     ItemDateTime(const TQString & group, const TQString & key,
                  TQDateTime & reference,
                  const TQDateTime & defaultValue = TQDateTime());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -742,14 +742,14 @@ public:
   /**
    * Class for handling a string list preferences item.
    */
-  class TDECORE_EXPORT ItemStringList:public KConfigSkeletonGenericItem < TQStringList >
+  class TDECORE_EXPORT ItemStringList:public TDEConfigSkeletonGenericItem < TQStringList >
   {
   public:
     ItemStringList(const TQString & group, const TQString & key,
                    TQStringList & reference,
                    const TQStringList & defaultValue = TQStringList());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -765,22 +765,22 @@ public:
                    TQStringList & reference,
                    const TQStringList & defaultValue = TQStringList());
 
-    void readConfig(KConfig * config);
-    void writeConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
+    void writeConfig(TDEConfig * config);
   };
 
 
   /**
    * Class for handling an integer list preferences item.
    */
-  class TDECORE_EXPORT ItemIntList:public KConfigSkeletonGenericItem < TQValueList < int > >
+  class TDECORE_EXPORT ItemIntList:public TDEConfigSkeletonGenericItem < TQValueList < int > >
   {
   public:
     ItemIntList(const TQString & group, const TQString & key,
                 TQValueList < int >&reference,
                 const TQValueList < int >&defaultValue = TQValueList < int >());
 
-    void readConfig(KConfig * config);
+    void readConfig(TDEConfig * config);
     void setProperty(const TQVariant & p);
     TQVariant property() const;
   };
@@ -793,19 +793,19 @@ public:
    * @param configname name of config file. If no name is given, the default
    * config file as returned by kapp()->config() is used.
    */
-  KConfigSkeleton(const TQString & configname = TQString::null);
+  TDEConfigSkeleton(const TQString & configname = TQString::null);
 
   /**
    * Constructor.
    * 
    * @param config configuration object to use.
    */
-  KConfigSkeleton(KSharedConfig::Ptr config);
+  TDEConfigSkeleton(TDESharedConfig::Ptr config);
 
   /**
    * Destructor
    */
-    virtual ~ KConfigSkeleton();
+    virtual ~ TDEConfigSkeleton();
 
   /**
     Set all registered items to their default values.
@@ -840,12 +840,12 @@ public:
   }
 
   /**
-   * Register a custom @ref KConfigSkeletonItem with a given name. If the name
-   * parameter is null, take the name from KConfigSkeletonItem::key().
+   * Register a custom @ref TDEConfigSkeletonItem with a given name. If the name
+   * parameter is null, take the name from TDEConfigSkeletonItem::key().
    * Note that all names must be unique but that multiple entries can have
    * the same key if they reside in different groups. 
    */
-  void addItem(KConfigSkeletonItem *, const TQString & name = TQString::null );
+  void addItem(TDEConfigSkeletonItem *, const TQString & name = TQString::null );
 
   /**
    * Register an item of type TQString.
@@ -1059,7 +1059,7 @@ public:
    */
   ItemFont *addItemFont(const TQString & name, TQFont & reference,
                         const TQFont & defaultValue =
-                        KGlobalSettings::generalFont(),
+                        TDEGlobalSettings::generalFont(),
                         const TQString & key = TQString::null);
 
   /**
@@ -1154,14 +1154,14 @@ public:
                               const TQString & key = TQString::null);
 
   /**
-   * Return the @ref KConfig object used for reading and writing the settings.
+   * Return the @ref TDEConfig object used for reading and writing the settings.
    */
-  KConfig *config() const;
+  TDEConfig *config() const;
 
   /**
-   * Return list of items managed by this KConfigSkeleton object.
+   * Return list of items managed by this TDEConfigSkeleton object.
    */
-  KConfigSkeletonItem::List items() const
+  TDEConfigSkeletonItem::List items() const
   {
     return mItems;
   }
@@ -1174,7 +1174,7 @@ public:
   /**
    * Lookup item by name
    */
-  KConfigSkeletonItem * findItem(const TQString & name);
+  TDEConfigSkeletonItem * findItem(const TQString & name);
 
   /**
    * Indicate whether this object should reflect the actual
@@ -1215,10 +1215,10 @@ protected:
 private:
   TQString mCurrentGroup;
 
-  KSharedConfig::Ptr mConfig; // pointer to KConfig object
+  TDESharedConfig::Ptr mConfig; // pointer to TDEConfig object
 
-  KConfigSkeletonItem::List mItems;
-  KConfigSkeletonItem::Dict mItemDict;
+  TDEConfigSkeletonItem::List mItems;
+  TDEConfigSkeletonItem::Dict mItemDict;
   
   bool mUseDefaults;
 
diff --git a/tdecore/kglobal.cpp b/tdecore/tdeglobal.cpp
index 6c88302ce..f8639d526 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/tdeglobal.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 /*
-* kglobal.cpp -- Implementation of class KGlobal.
+* tdeglobal.cpp -- Implementation of class TDEGlobal.
 * Author:	Sirtaj Singh Kang
 * Version:	$Id$
 * Generated:	Sat May  1 02:08:43 EST 1999
@@ -25,13 +25,13 @@
 #include <tqglobal.h>
 #include <tqdict.h>
 #include <tqptrlist.h>
-#include "kglobal.h"
+#include "tdeglobal.h"
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <kiconloader.h>
 #include <tdehardwaredevices.h>
@@ -44,7 +44,7 @@
 
 #ifndef NDEBUG
 #define MYASSERT(x) if (!x) \
-   tqFatal("Fatal error: you need to have a KInstance object before\n" \
+   tqFatal("Fatal error: you need to have a TDEInstance object before\n" \
          "you do anything that requires it! Examples of this are config\n" \
          "objects, standard directories or translations.");
 #else
@@ -53,55 +53,55 @@
 
 static void kglobal_init();
 
-KStandardDirs *KGlobal::dirs()
+TDEStandardDirs *TDEGlobal::dirs()
 {
     MYASSERT(_instance);
 
     return _instance->dirs();
 }
 
-KConfig	*KGlobal::config()
+TDEConfig	*TDEGlobal::config()
 {
     MYASSERT(_instance);
 
     return _instance->config();
 }
 
-KSharedConfig *KGlobal::sharedConfig()
+TDESharedConfig *TDEGlobal::sharedConfig()
 {
     MYASSERT(_instance);
 
     return _instance->sharedConfig();
 }
 
-KIconLoader *KGlobal::iconLoader()
+TDEIconLoader *TDEGlobal::iconLoader()
 {
     MYASSERT(_instance);
 
     return _instance->iconLoader();
 }
 
-TDEHardwareDevices *KGlobal::hardwareDevices()
+TDEHardwareDevices *TDEGlobal::hardwareDevices()
 {
     MYASSERT(_instance);
 
     return _instance->hardwareDevices();
 }
 
-TDEGlobalNetworkManager *KGlobal::networkManager()
+TDEGlobalNetworkManager *TDEGlobal::networkManager()
 {
     MYASSERT(_instance);
 
     return _instance->networkManager();
 }
 
-KInstance *KGlobal::instance()
+TDEInstance *TDEGlobal::instance()
 {
     MYASSERT(_instance);
     return _instance;
 }
 
-KLocale	*KGlobal::locale()
+TDELocale	*TDEGlobal::locale()
 {
     if( _locale == 0 ) {
 	if (!_instance)
@@ -109,7 +109,7 @@ KLocale	*KGlobal::locale()
         kglobal_init();
 
         // will set _locale if it works - otherwise 0 is returned
-        KLocale::initInstance();
+        TDELocale::initInstance();
         if( _instance->aboutData())
             _instance->aboutData()->translateInternalProgramName();
     }
@@ -117,7 +117,7 @@ KLocale	*KGlobal::locale()
     return _locale;
 }
 
-KCharsets *KGlobal::charsets()
+KCharsets *TDEGlobal::charsets()
 {
     if( _charsets == 0 ) {
         _charsets =new KCharsets();
@@ -127,7 +127,7 @@ KCharsets *KGlobal::charsets()
     return _charsets;
 }
 
-void KGlobal::setActiveInstance(KInstance *i)
+void TDEGlobal::setActiveInstance(TDEInstance *i)
 {
     _activeInstance = i;
     if (i && _locale)
@@ -138,10 +138,10 @@ void KGlobal::setActiveInstance(KInstance *i)
  * Create a static QString
  *
  * To be used inside functions(!) like:
- * static const TQString &myString = KGlobal::staticQString("myText");
+ * static const TQString &myString = TDEGlobal::staticQString("myText");
  */
 const TQString &
-KGlobal::staticQString(const char *str)
+TDEGlobal::staticQString(const char *str)
 {
    return staticQString(TQString::fromLatin1(str));
 }
@@ -156,10 +156,10 @@ public:
  * Create a static QString
  *
  * To be used inside functions(!) like:
- * static const TQString &myString = KGlobal::staticQString(i18n("My Text"));
+ * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text"));
  */
 const TQString &
-KGlobal::staticQString(const TQString &str)
+TDEGlobal::staticQString(const TQString &str)
 {
     if (!_stringDict) {
       _stringDict = new KStringDict;
@@ -182,7 +182,7 @@ public:
 };
 
 void
-KGlobal::registerStaticDeleter(KStaticDeleterBase *obj)
+TDEGlobal::registerStaticDeleter(KStaticDeleterBase *obj)
 {
    if (!_staticDeleters)
       kglobal_init();
@@ -191,16 +191,16 @@ KGlobal::registerStaticDeleter(KStaticDeleterBase *obj)
 }
 
 void
-KGlobal::unregisterStaticDeleter(KStaticDeleterBase *obj)
+TDEGlobal::unregisterStaticDeleter(KStaticDeleterBase *obj)
 {
    if (_staticDeleters)
       _staticDeleters->removeRef(obj);
 }
 
 void
-KGlobal::deleteStaticDeleters()
+TDEGlobal::deleteStaticDeleters()
 {
-    if (!KGlobal::_staticDeleters)
+    if (!TDEGlobal::_staticDeleters)
         return;
 
     for(;_staticDeleters->count();)
@@ -208,18 +208,18 @@ KGlobal::deleteStaticDeleters()
         _staticDeleters->take(0)->destructObject();
     }
 
-    delete KGlobal::_staticDeleters;
-    KGlobal::_staticDeleters = 0;
+    delete TDEGlobal::_staticDeleters;
+    TDEGlobal::_staticDeleters = 0;
 }
 
 // The Variables
 
-KStringDict     *KGlobal::_stringDict   = 0;
-KInstance       *KGlobal::_instance     = 0;
-KInstance       *KGlobal::_activeInstance = 0;
-KLocale         *KGlobal::_locale	= 0;
-KCharsets       *KGlobal::_charsets	= 0;
-KStaticDeleterList *KGlobal::_staticDeleters = 0;
+KStringDict     *TDEGlobal::_stringDict   = 0;
+TDEInstance       *TDEGlobal::_instance     = 0;
+TDEInstance       *TDEGlobal::_activeInstance = 0;
+TDELocale         *TDEGlobal::_locale	= 0;
+KCharsets       *TDEGlobal::_charsets	= 0;
+KStaticDeleterList *TDEGlobal::_staticDeleters = 0;
 
 #ifdef WIN32
 #include <windows.h>
@@ -235,23 +235,23 @@ __attribute__((destructor))
 #endif
 static void kglobal_freeAll()
 {
-    delete KGlobal::_locale;
-    KGlobal::_locale = 0;
-    delete KGlobal::_charsets;
-    KGlobal::_charsets = 0;
-    delete KGlobal::_stringDict;
-    KGlobal::_stringDict = 0;
-    KGlobal::deleteStaticDeleters();
+    delete TDEGlobal::_locale;
+    TDEGlobal::_locale = 0;
+    delete TDEGlobal::_charsets;
+    TDEGlobal::_charsets = 0;
+    delete TDEGlobal::_stringDict;
+    TDEGlobal::_stringDict = 0;
+    TDEGlobal::deleteStaticDeleters();
     // so that we don't hold a reference and see memory leaks :/
-    KGlobal::setActiveInstance(0);
+    TDEGlobal::setActiveInstance(0);
 }
 
 static void kglobal_init()
 {
-    if (KGlobal::_staticDeleters)
+    if (TDEGlobal::_staticDeleters)
         return;
 
-    KGlobal::_staticDeleters = new KStaticDeleterList;
+    TDEGlobal::_staticDeleters = new KStaticDeleterList;
 }
 
 int kasciistricmp( const char *str1, const char *str2 )
diff --git a/tdecore/kglobal.h b/tdecore/tdeglobal.h
index d7aadbc3f..a1a8114be 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/tdeglobal.h
@@ -19,16 +19,16 @@
 #define _KGLOBAL_H
 
 #include "tdelibs_export.h"
-#include <kinstance.h> // KDE4: class KInstance is enough here
+#include <kinstance.h> // KDE4: class TDEInstance is enough here
 
 class KCharsets;
-class KConfig;
-class KSharedConfig;
-class KIconLoader;
+class TDEConfig;
+class TDESharedConfig;
+class TDEIconLoader;
 class TDEHardwareDevices;
 class TDEGlobalNetworkManager;
-class KLocale;
-class KStandardDirs;
+class TDELocale;
+class TDEStandardDirs;
 class KStaticDeleterBase;
 class KStaticDeleterList;
 class KStringDict;
@@ -36,14 +36,14 @@ class TQString;
 
 /**
  * Access to the KDE global objects.
- * KGlobal provides you with pointers of many central
+ * TDEGlobal provides you with pointers of many central
  * objects that exist only once in the process. It is also
  * responsible for managing instances of KStaticDeleterBase.
  *
  * @see KStaticDeleterBase
  * @author Sirtaj Singh Kang (taj@kde.org)
  */
-class TDECORE_EXPORT KGlobal
+class TDECORE_EXPORT TDEGlobal
 {
 public:
 
@@ -53,31 +53,31 @@ public:
      * cases the application itself).
      * @return the global instance
      */
-    static KInstance            *instance();
+    static TDEInstance            *instance();
 
     /**
      *  Returns the application standard dirs object.
      * @return the global standard dir object
      */
-    static KStandardDirs	*dirs();
+    static TDEStandardDirs	*dirs();
 
     /**
      *  Returns the general config object.
      * @return the global configuration object.
      */
-    static KConfig		*config();
+    static TDEConfig		*config();
 
     /**
      *  Returns the general config object.
      * @return the global configuration object.
      */
-    static KSharedConfig        *sharedConfig();
+    static TDESharedConfig        *sharedConfig();
 
     /**
      *  Returns an iconloader object.
      * @return the global iconloader object
      */
-    static KIconLoader	        *iconLoader();
+    static TDEIconLoader	        *iconLoader();
 
     /**
      *  Returns a TDEHardwareDevices object.
@@ -95,7 +95,7 @@ public:
      * Returns the global locale object.
      * @return the global locale object
      */
-    static KLocale              *locale();
+    static TDELocale              *locale();
 
     /**
      * The global charset manager.
@@ -108,12 +108,12 @@ public:
      *
      * To be used inside functions(!) like:
      * \code
-     * static const TQString &myString = KGlobal::staticQString("myText");
+     * static const TQString &myString = TDEGlobal::staticQString("myText");
      * \endcode
      *
      * !!! Do _NOT_ use: !!!
      * \code
-     * static TQString myString = KGlobal::staticQString("myText");
+     * static TQString myString = TDEGlobal::staticQString("myText");
      * \endcode
      * This creates a static object (instead of a static reference)
      * and as you know static objects are EVIL.
@@ -127,12 +127,12 @@ public:
      *
      * To be used inside functions(!) like:
      * \code
-     * static const TQString &myString = KGlobal::staticQString(i18n("My Text"));
+     * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text"));
      * \endcode
      *
      * !!! Do _NOT_ use: !!!
      * \code
-     * static TQString myString = KGlobal::staticQString(i18n("myText"));
+     * static TQString myString = TDEGlobal::staticQString(i18n("myText"));
      * \endcode
      * This creates a static object (instead of a static reference)
      * and as you know static objects are EVIL.
@@ -167,40 +167,40 @@ public:
 
     //private:
     static  KStringDict         *_stringDict;
-    static  KInstance           *_instance;
-    static  KLocale             *_locale;
+    static  TDEInstance           *_instance;
+    static  TDELocale             *_locale;
     static  KCharsets	        *_charsets;
     static  KStaticDeleterList  *_staticDeleters;
 
     /**
      * The instance currently active (useful in a multi-instance
      * application, such as a KParts application).
-     * Don't use this - it's mainly for KAboutDialog and KBugReport.
+     * Don't use this - it's mainly for TDEAboutDialog and KBugReport.
      * @internal
      */
-    static void setActiveInstance(KInstance *d);
-    static KInstance *activeInstance() { return _activeInstance; }
+    static void setActiveInstance(TDEInstance *d);
+    static TDEInstance *activeInstance() { return _activeInstance; }
 
-    static  KInstance           *_activeInstance;
+    static  TDEInstance           *_activeInstance;
 };
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * A typesafe function to find the minimum of the two arguments.
  */
 #define KMIN(a,b)	kMin(a,b)
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * A typesafe function to find the maximum of the two arguments.
  */
 #define KMAX(a,b)	kMax(a,b)
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * A typesafe function to determine the absolute value of the argument.
  */
 #define KABS(a)	kAbs(a)
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * A typesafe function that returns x if it's between low and high values.
  * low if x is smaller than then low and high if x is bigger than high.
  */
@@ -242,7 +242,7 @@ int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
  * of other (but no less important) things.
  *
  * All KDE applications should link to the tdecore library. Also, using a
- * KApplication derived class instead of TQApplication is almost
+ * TDEApplication derived class instead of TQApplication is almost
  * mandatory if you expect your application to behave nicely within the
  * KDE environment.
  */
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp
index d257097bf..c0c6329c7 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/tdeglobalsettings.cpp
@@ -16,16 +16,16 @@
    Boston, MA 02110-1301, USA.
 */
 #include "config.h"
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
 
 #include <tqdir.h>
 #include <tqpixmap.h>
 #include <tqfontdatabase.h>
 #include <tqcursor.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kipc.h>
 
@@ -40,12 +40,12 @@ static QRgb qt_colorref2qrgb(COLORREF col)
 #endif
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kshortcut.h>
+#include <tdeglobal.h>
+#include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kcharsets.h>
-#include <kaccel.h>
-#include <klocale.h>
+#include <tdeaccel.h>
+#include <tdelocale.h>
 #include <tqfontinfo.h>
 #include <stdlib.h>
 #include <kprotocolinfo.h>
@@ -58,28 +58,28 @@ static QRgb qt_colorref2qrgb(COLORREF col)
 #include <X11/Xlib.h>
 #endif
 
-TQString* KGlobalSettings::s_desktopPath = 0;
-TQString* KGlobalSettings::s_autostartPath = 0;
-TQString* KGlobalSettings::s_trashPath = 0;
-TQString* KGlobalSettings::s_documentPath = 0;
-TQFont *KGlobalSettings::_generalFont = 0;
-TQFont *KGlobalSettings::_fixedFont = 0;
-TQFont *KGlobalSettings::_toolBarFont = 0;
-TQFont *KGlobalSettings::_menuFont = 0;
-TQFont *KGlobalSettings::_windowTitleFont = 0;
-TQFont *KGlobalSettings::_taskbarFont = 0;
-TQFont *KGlobalSettings::_largeFont = 0;
-TQColor *KGlobalSettings::_trinity4Blue = 0;
-TQColor *KGlobalSettings::_inactiveBackground = 0;
-TQColor *KGlobalSettings::_inactiveForeground = 0;
-TQColor *KGlobalSettings::_activeBackground = 0;
-TQColor *KGlobalSettings::_buttonBackground = 0;
-TQColor *KGlobalSettings::_selectBackground = 0;
-TQColor *KGlobalSettings::_linkColor = 0;
-TQColor *KGlobalSettings::_visitedLinkColor = 0;
-TQColor *KGlobalSettings::alternateColor = 0;
-
-KGlobalSettings::KMouseSettings *KGlobalSettings::s_mouseSettings = 0;
+TQString* TDEGlobalSettings::s_desktopPath = 0;
+TQString* TDEGlobalSettings::s_autostartPath = 0;
+TQString* TDEGlobalSettings::s_trashPath = 0;
+TQString* TDEGlobalSettings::s_documentPath = 0;
+TQFont *TDEGlobalSettings::_generalFont = 0;
+TQFont *TDEGlobalSettings::_fixedFont = 0;
+TQFont *TDEGlobalSettings::_toolBarFont = 0;
+TQFont *TDEGlobalSettings::_menuFont = 0;
+TQFont *TDEGlobalSettings::_windowTitleFont = 0;
+TQFont *TDEGlobalSettings::_taskbarFont = 0;
+TQFont *TDEGlobalSettings::_largeFont = 0;
+TQColor *TDEGlobalSettings::_trinity4Blue = 0;
+TQColor *TDEGlobalSettings::_inactiveBackground = 0;
+TQColor *TDEGlobalSettings::_inactiveForeground = 0;
+TQColor *TDEGlobalSettings::_activeBackground = 0;
+TQColor *TDEGlobalSettings::_buttonBackground = 0;
+TQColor *TDEGlobalSettings::_selectBackground = 0;
+TQColor *TDEGlobalSettings::_linkColor = 0;
+TQColor *TDEGlobalSettings::_visitedLinkColor = 0;
+TQColor *TDEGlobalSettings::alternateColor = 0;
+
+TDEGlobalSettings::KMouseSettings *TDEGlobalSettings::s_mouseSettings = 0;
 
 // helper function for reading xdg user dirs: it is required in order to take 
 // care of locale stuff
@@ -106,49 +106,49 @@ void readXdgUserDirs(TQString *desktop, TQString *documents)
 	}
 }
 
-int KGlobalSettings::dndEventDelay()
+int TDEGlobalSettings::dndEventDelay()
 {
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readNumEntry("StartDragDist", TQApplication::startDragDistance());
 }
 
-bool KGlobalSettings::singleClick()
+bool TDEGlobalSettings::singleClick()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK);
 }
 
-bool KGlobalSettings::iconUseRoundedRect()
+bool TDEGlobalSettings::iconUseRoundedRect()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED);
 }
 
-KGlobalSettings::TearOffHandle KGlobalSettings::insertTearOffHandle()
+TDEGlobalSettings::TearOffHandle TDEGlobalSettings::insertTearOffHandle()
 {
     int tearoff;
     bool effectsenabled;
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     effectsenabled = g.readBoolEntry( "EffectsEnabled", false);
     tearoff = g.readNumEntry("InsertTearOffHandle", KDE_DEFAULT_INSERTTEAROFFHANDLES);
     return effectsenabled ? (TearOffHandle) tearoff : Disable;
 }
 
-bool KGlobalSettings::changeCursorOverIcon()
+bool TDEGlobalSettings::changeCursorOverIcon()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("ChangeCursor", KDE_DEFAULT_CHANGECURSOR);
 }
 
-bool KGlobalSettings::visualActivate()
+bool TDEGlobalSettings::visualActivate()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("VisualActivate", KDE_DEFAULT_VISUAL_ACTIVATE);
 }
 
-unsigned int KGlobalSettings::visualActivateSpeed()
+unsigned int TDEGlobalSettings::visualActivateSpeed()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return
         g.readNumEntry(
             "VisualActivateSpeed",
@@ -158,16 +158,16 @@ unsigned int KGlobalSettings::visualActivateSpeed()
 
 
 
-int KGlobalSettings::autoSelectDelay()
+int TDEGlobalSettings::autoSelectDelay()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readNumEntry("AutoSelectDelay", KDE_DEFAULT_AUTOSELECTDELAY);
 }
 
-KGlobalSettings::Completion KGlobalSettings::completionMode()
+TDEGlobalSettings::Completion TDEGlobalSettings::completionMode()
 {
     int completion;
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     completion = g.readNumEntry("completionMode", -1);
     if ((completion < (int) CompletionNone) ||
         (completion > (int) CompletionPopupAuto))
@@ -177,51 +177,51 @@ KGlobalSettings::Completion KGlobalSettings::completionMode()
   return (Completion) completion;
 }
 
-bool KGlobalSettings::showContextMenusOnPress ()
+bool TDEGlobalSettings::showContextMenusOnPress ()
 {
-    KConfigGroup g(KGlobal::config(), "ContextMenus");
+    TDEConfigGroup g(TDEGlobal::config(), "ContextMenus");
     return g.readBoolEntry("ShowOnPress", true);
 }
 
-int KGlobalSettings::contextMenuKey ()
+int TDEGlobalSettings::contextMenuKey ()
 {
-    KConfigGroup g(KGlobal::config(), "Shortcuts");
-    KShortcut cut (g.readEntry ("PopupMenuContext", "Menu"));
+    TDEConfigGroup g(TDEGlobal::config(), "Shortcuts");
+    TDEShortcut cut (g.readEntry ("PopupMenuContext", "Menu"));
     return cut.keyCodeQt();
 }
 
-TQColor KGlobalSettings::toolBarHighlightColor()
+TQColor TDEGlobalSettings::toolBarHighlightColor()
 {
     initColors();
-    KConfigGroup g( KGlobal::config(), "Toolbar style" );
+    TDEConfigGroup g( TDEGlobal::config(), "Toolbar style" );
     return g.readColorEntry("HighlightColor", _trinity4Blue);
 }
 
-TQColor KGlobalSettings::inactiveTitleColor()
+TQColor TDEGlobalSettings::inactiveTitleColor()
 {
 #ifdef Q_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION));
 #else
     if (!_inactiveBackground)
         _inactiveBackground = new TQColor(157, 170, 186);
-    KConfigGroup g( KGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     return g.readColorEntry( "inactiveBackground", _inactiveBackground );
 #endif
 }
 
-TQColor KGlobalSettings::inactiveTextColor()
+TQColor TDEGlobalSettings::inactiveTextColor()
 {
 #ifdef Q_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT));
 #else
     if (!_inactiveForeground)
        _inactiveForeground = new TQColor(221,221,221);
-    KConfigGroup g( KGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     return g.readColorEntry( "inactiveForeground", _inactiveForeground );
 #endif
 }
 
-TQColor KGlobalSettings::activeTitleColor()
+TQColor TDEGlobalSettings::activeTitleColor()
 {
 #ifdef Q_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION));
@@ -229,89 +229,89 @@ TQColor KGlobalSettings::activeTitleColor()
     initColors();
     if (!_activeBackground)
       _activeBackground = new TQColor(65,142,220);
-    KConfigGroup g( KGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     return g.readColorEntry( "activeBackground", _activeBackground);
 #endif
 }
 
-TQColor KGlobalSettings::activeTextColor()
+TQColor TDEGlobalSettings::activeTextColor()
 {
 #ifdef Q_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT));
 #else
-    KConfigGroup g( KGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     return g.readColorEntry( "activeForeground", tqwhiteptr );
 #endif
 }
 
-int KGlobalSettings::contrast()
+int TDEGlobalSettings::contrast()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readNumEntry( "contrast", 7 );
 }
 
-TQColor KGlobalSettings::buttonBackground()
+TQColor TDEGlobalSettings::buttonBackground()
 {
     if (!_buttonBackground)
       _buttonBackground = new TQColor(221,223,228);
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "buttonBackground", _buttonBackground );
 }
 
-TQColor KGlobalSettings::buttonTextColor()
+TQColor TDEGlobalSettings::buttonTextColor()
 {
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "buttonForeground", tqblackptr );
 }
 
 // IMPORTANT:
 //  This function should be kept in sync with
-//   KApplication::kdisplaySetPalette()
-TQColor KGlobalSettings::baseColor()
+//   TDEApplication::tdedisplaySetPalette()
+TQColor TDEGlobalSettings::baseColor()
 {
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "windowBackground", tqwhiteptr );
 }
 
 // IMPORTANT:
 //  This function should be kept in sync with
-//   KApplication::kdisplaySetPalette()
-TQColor KGlobalSettings::textColor()
+//   TDEApplication::tdedisplaySetPalette()
+TQColor TDEGlobalSettings::textColor()
 {
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "windowForeground", tqblackptr );
 }
 
 // IMPORTANT:
 //  This function should be kept in sync with
-//   KApplication::kdisplaySetPalette()
-TQColor KGlobalSettings::highlightedTextColor()
+//   TDEApplication::tdedisplaySetPalette()
+TQColor TDEGlobalSettings::highlightedTextColor()
 {
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "selectForeground", tqwhiteptr );
 }
 
 // IMPORTANT:
 //  This function should be kept in sync with
-//   KApplication::kdisplaySetPalette()
-TQColor KGlobalSettings::highlightColor()
+//   TDEApplication::tdedisplaySetPalette()
+TQColor TDEGlobalSettings::highlightColor()
 {
     initColors();
     if (!_selectBackground)
         _selectBackground = new TQColor(103,141,178);
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "selectBackground", _selectBackground );
 }
 
-TQColor KGlobalSettings::alternateBackgroundColor()
+TQColor TDEGlobalSettings::alternateBackgroundColor()
 {
     initColors();
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *alternateColor = calculateAlternateBackgroundColor( baseColor() );
     return g.readColorEntry( "alternateBackground", alternateColor );
 }
 
-TQColor KGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base)
+TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base)
 {
     if (base == Qt::white)
         return TQColor(238,246,255);
@@ -328,30 +328,30 @@ TQColor KGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base)
     }
 }
 
-bool KGlobalSettings::shadeSortColumn()
+bool TDEGlobalSettings::shadeSortColumn()
 {
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readBoolEntry( "shadeSortColumn", KDE_DEFAULT_SHADE_SORT_COLUMN );
 }
 
-TQColor KGlobalSettings::linkColor()
+TQColor TDEGlobalSettings::linkColor()
 {
     initColors();
     if (!_linkColor)
         _linkColor = new TQColor(0,0,238);
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "linkColor", _linkColor );
 }
 
-TQColor KGlobalSettings::visitedLinkColor()
+TQColor TDEGlobalSettings::visitedLinkColor()
 {
     if (!_visitedLinkColor)
         _visitedLinkColor = new TQColor(82,24,139);
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     return g.readColorEntry( "visitedLinkColor", _visitedLinkColor );
 }
 
-TQFont KGlobalSettings::generalFont()
+TQFont TDEGlobalSettings::generalFont()
 {
     if (_generalFont)
         return *_generalFont;
@@ -361,13 +361,13 @@ TQFont KGlobalSettings::generalFont()
     _generalFont->setPointSize(10);
     _generalFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_generalFont = g.readFontEntry("font", _generalFont);
 
     return *_generalFont;
 }
 
-TQFont KGlobalSettings::fixedFont()
+TQFont TDEGlobalSettings::fixedFont()
 {
     if (_fixedFont)
         return *_fixedFont;
@@ -377,13 +377,13 @@ TQFont KGlobalSettings::fixedFont()
     _fixedFont->setPointSize(10);
     _fixedFont->setStyleHint(TQFont::TypeWriter);
 
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_fixedFont = g.readFontEntry("fixed", _fixedFont);
 
     return *_fixedFont;
 }
 
-TQFont KGlobalSettings::toolBarFont()
+TQFont TDEGlobalSettings::toolBarFont()
 {
     if(_toolBarFont)
         return *_toolBarFont;
@@ -393,13 +393,13 @@ TQFont KGlobalSettings::toolBarFont()
     _toolBarFont->setPointSize(10);
     _toolBarFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_toolBarFont = g.readFontEntry("toolBarFont", _toolBarFont);
 
     return *_toolBarFont;
 }
 
-TQFont KGlobalSettings::menuFont()
+TQFont TDEGlobalSettings::menuFont()
 {
     if(_menuFont)
         return *_menuFont;
@@ -409,13 +409,13 @@ TQFont KGlobalSettings::menuFont()
     _menuFont->setPointSize(10);
     _menuFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_menuFont = g.readFontEntry("menuFont", _menuFont);
 
     return *_menuFont;
 }
 
-TQFont KGlobalSettings::windowTitleFont()
+TQFont TDEGlobalSettings::windowTitleFont()
 {
     if(_windowTitleFont)
         return *_windowTitleFont;
@@ -425,13 +425,13 @@ TQFont KGlobalSettings::windowTitleFont()
     _windowTitleFont->setPointSize(10);
     _windowTitleFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( KGlobal::config(), "WM" );
+    TDEConfigGroup g( TDEGlobal::config(), "WM" );
     *_windowTitleFont = g.readFontEntry("activeFont", _windowTitleFont); // inconsistency
 
     return *_windowTitleFont;
 }
 
-TQFont KGlobalSettings::taskbarFont()
+TQFont TDEGlobalSettings::taskbarFont()
 {
     if(_taskbarFont)
         return *_taskbarFont;
@@ -441,14 +441,14 @@ TQFont KGlobalSettings::taskbarFont()
     _taskbarFont->setPointSize(10);
     _taskbarFont->setStyleHint(TQFont::SansSerif);
 
-    KConfigGroup g( KGlobal::config(), "General" );
+    TDEConfigGroup g( TDEGlobal::config(), "General" );
     *_taskbarFont = g.readFontEntry("taskbarFont", _taskbarFont);
 
     return *_taskbarFont;
 }
 
 
-TQFont KGlobalSettings::largeFont(const TQString &text)
+TQFont TDEGlobalSettings::largeFont(const TQString &text)
 {
     TQFontDatabase db;
     TQStringList fam = db.families();
@@ -501,12 +501,12 @@ TQFont KGlobalSettings::largeFont(const TQString &text)
             return *_largeFont;
         }
     }
-    _largeFont = new TQFont(KGlobalSettings::generalFont());
+    _largeFont = new TQFont(TDEGlobalSettings::generalFont());
     _largeFont->setPointSize(48);
     return *_largeFont;
 }
 
-void KGlobalSettings::initStatic() // should be called initPaths(). Don't put anything else here.
+void TDEGlobalSettings::initStatic() // should be called initPaths(). Don't put anything else here.
 {
     if ( s_desktopPath != 0 )
         return;
@@ -516,7 +516,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an
     s_trashPath = new TQString();
     s_documentPath = new TQString();
 
-    KConfigGroup g( KGlobal::config(), "Paths" );
+    TDEConfigGroup g( TDEGlobal::config(), "Paths" );
 
 	// Read desktop and documents path using XDG_USER_DIRS
 	readXdgUserDirs(s_desktopPath, s_documentPath);
@@ -539,7 +539,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an
     if ( !s_documentPath->endsWith("/"))
       s_documentPath->append('/');
 
-    // Trash Path - TODO remove in KDE4 (kio_trash can't use it for interoperability reasons)
+    // Trash Path - TODO remove in KDE4 (tdeio_trash can't use it for interoperability reasons)
     *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
     *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
     *s_trashPath = TQDir::cleanDirPath( *s_trashPath );
@@ -553,7 +553,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an
     }
 
     // Autostart Path
-    *s_autostartPath = KGlobal::dirs()->localtdedir() + "Autostart/";
+    *s_autostartPath = TDEGlobal::dirs()->localtdedir() + "Autostart/";
     *s_autostartPath = g.readPathEntry( "Autostart" , *s_autostartPath);
     *s_autostartPath = TQDir::cleanDirPath( *s_autostartPath );
     if ( !s_autostartPath->endsWith("/") )
@@ -564,7 +564,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an
         kapp->addKipcEventMask(KIPC::SettingsChanged);
 }
 
-void KGlobalSettings::initColors()
+void TDEGlobalSettings::initColors()
 {
     if (!_trinity4Blue) {
       if (TQPixmap::defaultDepth() > 8)
@@ -576,7 +576,7 @@ void KGlobalSettings::initColors()
       alternateColor = new TQColor(237, 244, 249);
 }
 
-void KGlobalSettings::rereadFontSettings()
+void TDEGlobalSettings::rereadFontSettings()
 {
     delete _generalFont;
     _generalFont = 0L;
@@ -592,9 +592,9 @@ void KGlobalSettings::rereadFontSettings()
     _taskbarFont = 0L;
 }
 
-void KGlobalSettings::rereadPathSettings()
+void TDEGlobalSettings::rereadPathSettings()
 {
-    kdDebug() << "KGlobalSettings::rereadPathSettings" << endl;
+    kdDebug() << "TDEGlobalSettings::rereadPathSettings" << endl;
     delete s_autostartPath;
     s_autostartPath = 0L;
     delete s_trashPath;
@@ -605,7 +605,7 @@ void KGlobalSettings::rereadPathSettings()
     s_documentPath = 0L;
 }
 
-KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings()
+TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
 {
     if ( ! s_mouseSettings )
     {
@@ -613,7 +613,7 @@ KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings()
         KMouseSettings & s = *s_mouseSettings; // for convenience
 
 #ifndef Q_WS_WIN
-        KConfigGroup g( KGlobal::config(), "Mouse" );
+        TDEConfigGroup g( TDEGlobal::config(), "Mouse" );
         TQString setting = g.readEntry("MouseButtonMapping");
         if (setting == "RightHanded")
             s.handed = KMouseSettings::RightHanded;
@@ -655,7 +655,7 @@ KGlobalSettings::KMouseSettings & KGlobalSettings::mouseSettings()
     return *s_mouseSettings;
 }
 
-void KGlobalSettings::rereadMouseSettings()
+void TDEGlobalSettings::rereadMouseSettings()
 {
 #ifndef Q_WS_WIN
     delete s_mouseSettings;
@@ -663,7 +663,7 @@ void KGlobalSettings::rereadMouseSettings()
 #endif
 }
 
-bool KGlobalSettings::isMultiHead()
+bool TDEGlobalSettings::isMultiHead()
 {
 #ifdef Q_WS_WIN
     return GetSystemMetrics(SM_CMONITORS) > 1;
@@ -676,18 +676,18 @@ bool KGlobalSettings::isMultiHead()
 #endif
 }
 
-bool KGlobalSettings::wheelMouseZooms()
+bool TDEGlobalSettings::wheelMouseZooms()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry( "WheelMouseZooms", KDE_DEFAULT_WHEEL_ZOOM );
 }
 
-TQRect KGlobalSettings::splashScreenDesktopGeometry()
+TQRect TDEGlobalSettings::splashScreenDesktopGeometry()
 {
     TQDesktopWidget *dw = TQApplication::desktop();
 
     if (dw->isVirtualDesktop()) {
-        KConfigGroup group(KGlobal::config(), "Windows");
+        TDEConfigGroup group(TDEGlobal::config(), "Windows");
         int scr = group.readNumEntry("Unmanaged", -3);
         if (group.readBoolEntry("XineramaEnabled", true) && scr != -2) {
             if (scr == -3)
@@ -701,12 +701,12 @@ TQRect KGlobalSettings::splashScreenDesktopGeometry()
     }
 }
 
-TQRect KGlobalSettings::desktopGeometry(const TQPoint& point)
+TQRect TDEGlobalSettings::desktopGeometry(const TQPoint& point)
 {
     TQDesktopWidget *dw = TQApplication::desktop();
 
     if (dw->isVirtualDesktop()) {
-        KConfigGroup group(KGlobal::config(), "Windows");
+        TDEConfigGroup group(TDEGlobal::config(), "Windows");
         if (group.readBoolEntry("XineramaEnabled", true) &&
             group.readBoolEntry("XineramaPlacementEnabled", true)) {
             return dw->screenGeometry(dw->screenNumber(point));
@@ -718,12 +718,12 @@ TQRect KGlobalSettings::desktopGeometry(const TQPoint& point)
     }
 }
 
-TQRect KGlobalSettings::desktopGeometry(TQWidget* w)
+TQRect TDEGlobalSettings::desktopGeometry(TQWidget* w)
 {
     TQDesktopWidget *dw = TQApplication::desktop();
 
     if (dw->isVirtualDesktop()) {
-        KConfigGroup group(KGlobal::config(), "Windows");
+        TDEConfigGroup group(TDEGlobal::config(), "Windows");
         if (group.readBoolEntry("XineramaEnabled", true) &&
             group.readBoolEntry("XineramaPlacementEnabled", true)) {
             if (w)
@@ -737,38 +737,38 @@ TQRect KGlobalSettings::desktopGeometry(TQWidget* w)
     }
 }
 
-bool KGlobalSettings::showIconsOnPushButtons()
+bool TDEGlobalSettings::showIconsOnPushButtons()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("ShowIconsOnPushButtons",
         KDE_DEFAULT_ICON_ON_PUSHBUTTON);
 }
 
-bool KGlobalSettings::showFilePreview(const KURL &url)
+bool TDEGlobalSettings::showFilePreview(const KURL &url)
 {
-    KConfigGroup g(KGlobal::config(), "PreviewSettings");
+    TDEConfigGroup g(TDEGlobal::config(), "PreviewSettings");
     TQString protocol = url.protocol();
     bool defaultSetting = KProtocolInfo::showFilePreview( protocol );
     return g.readBoolEntry(protocol, defaultSetting );
 }
 
-bool KGlobalSettings::showKonqIconActivationEffect()
+bool TDEGlobalSettings::showKonqIconActivationEffect()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("ShowKonqIconActivationEffect",
         KDE_DEFAULT_KONQ_ACTIVATION_EFFECT);
 }
 
-bool KGlobalSettings::opaqueResize()
+bool TDEGlobalSettings::opaqueResize()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readBoolEntry("OpaqueResize",
         KDE_DEFAULT_OPAQUE_RESIZE);
 }
 
-int KGlobalSettings::buttonLayout()
+int TDEGlobalSettings::buttonLayout()
 {
-    KConfigGroup g( KGlobal::config(), "KDE" );
+    TDEConfigGroup g( TDEGlobal::config(), "KDE" );
     return g.readNumEntry("ButtonLayout",
         KDE_DEFAULT_BUTTON_LAYOUT);
 }
diff --git a/tdecore/kglobalsettings.h b/tdecore/tdeglobalsettings.h
index 5fef2f67a..0e11426d2 100644
--- a/tdecore/kglobalsettings.h
+++ b/tdecore/tdeglobalsettings.h
@@ -45,7 +45,7 @@ class KURL;
  *
  * @author David Faure <faure@kde.org>
  */
-class TDECORE_EXPORT KGlobalSettings
+class TDECORE_EXPORT TDEGlobalSettings
 {
   public:
 
@@ -74,7 +74,7 @@ class TDECORE_EXPORT KGlobalSettings
      * {
      *    if( !(e->state() && LeftButton)) return;
      *
-     *    int delay = KGlobalSettings::dndEventDelay();
+     *    int delay = TDEGlobalSettings::dndEventDelay();
      *    TQPoint newPos = e->pos();
      *    if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay ||
      *       newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay)
@@ -111,7 +111,7 @@ class TDECORE_EXPORT KGlobalSettings
     /**
      * This enum describes the return type for insertTearOffHandle() whether to insert
      * a handle or not. Applications who independently want to use handles in their popup menus
-     * should test for Application level before calling the appropriate function in KPopupMenu.
+     * should test for Application level before calling the appropriate function in TDEPopupMenu.
      * @since 3.1
      **/
     enum TearOffHandle {
@@ -121,8 +121,8 @@ class TDECORE_EXPORT KGlobalSettings
     };
 
     /**
-     * Returns whether tear-off handles are inserted in KPopupMenus.
-     * @return whether tear-off handles are inserted in KPopupMenus.
+     * Returns whether tear-off handles are inserted in TDEPopupMenus.
+     * @return whether tear-off handles are inserted in TDEPopupMenus.
      * @since 3.1
      **/
     static TearOffHandle insertTearOffHandle();
@@ -171,7 +171,7 @@ class TDECORE_EXPORT KGlobalSettings
     static bool showContextMenusOnPress ();
 
     /**
-     * This enum describes the completion mode used for by the KCompletion class.
+     * This enum describes the completion mode used for by the TDECompletion class.
      * See <a href="http://developer.kde.org/documentation/standards/kde/style/keys/completion.html">
      * the styleguide</a>.
      **/
@@ -241,7 +241,7 @@ class TDECORE_EXPORT KGlobalSettings
     /**
      * DEPRECATED (starting from kde-3.4).
      * This isn't where the trash contents is, anymore.
-     * Use KIO::trash() to trash files, "trash:/" to list the trash contents.
+     * Use TDEIO::trash() to trash files, "trash:/" to list the trash contents.
      */
     static TQString trashPath() { initStatic(); return *s_trashPath; }
     // KDE4: if you want to remove the above, move it to kdesktop/init.cc, which needs
@@ -346,8 +346,8 @@ class TDECORE_EXPORT KGlobalSettings
     static TQColor highlightColor();
 
     /**
-     * Returns the alternate background color used by KListView with
-     * KListViewItem. Any other list that uses alternating background
+     * Returns the alternate background color used by TDEListView with
+     * TDEListViewItem. Any other list that uses alternating background
      * colors should use this too, to obey to the user's preferences. Returns
      * an invalid color if the user doesn't want alternating backgrounds.
      * @return the alternate background color
@@ -365,7 +365,7 @@ class TDECORE_EXPORT KGlobalSettings
     static TQColor calculateAlternateBackgroundColor(const TQColor& base);
 
     /**
-      * Returns if the sorted column in a KListView shall be drawn with a
+      * Returns if the sorted column in a TDEListView shall be drawn with a
       * shaded background color.
       * @return true if the sorted column shall be shaded
       * @since 3.4
@@ -543,15 +543,15 @@ private:
      */
     static void initColors();
     /**
-     * drop cached values for fonts (called by KApplication)
+     * drop cached values for fonts (called by TDEApplication)
      */
     static void rereadFontSettings();
     /**
-     * drop cached values for paths (called by KApplication)
+     * drop cached values for paths (called by TDEApplication)
      */
     static void rereadPathSettings();
     /**
-     * drop cached values for mouse settings (called by KApplication)
+     * drop cached values for mouse settings (called by TDEApplication)
      */
     static void rereadMouseSettings();
 
@@ -578,7 +578,7 @@ private:
     static TQColor * alternateColor;
     static KMouseSettings *s_mouseSettings;
 
-    friend class KApplication;
+    friend class TDEApplication;
 };
 
 #endif
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index b69c40d45..60f3efde9 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -23,14 +23,14 @@
 #include <tqstringlist.h>
 #include <tqsocketnotifier.h>
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kconfig.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
+#include <tdetempfile.h>
 #include <ksimpledirwatch.h>
 #include <kstandarddirs.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <libudev.h>
@@ -286,8 +286,8 @@ TDEGenericDevice* TDEGenericDevice::parentDevice() {
 	return m_parentDevice;
 }
 
-TQPixmap TDEGenericDevice::icon(KIcon::StdSizes size) {
-	return KGlobal::hardwareDevices()->getDeviceTypeIconFromType(type(), size);
+TQPixmap TDEGenericDevice::icon(TDEIcon::StdSizes size) {
+	return TDEGlobal::hardwareDevices()->getDeviceTypeIconFromType(type(), size);
 }
 
 bool TDEGenericDevice::blacklistedForUpdate() {
@@ -299,7 +299,7 @@ void TDEGenericDevice::internalSetBlacklistedForUpdate(bool bl) {
 }
 
 TQString TDEGenericDevice::friendlyDeviceType() {
-	return KGlobal::hardwareDevices()->getFriendlyDeviceTypeStringFromType(type());
+	return TDEGlobal::hardwareDevices()->getFriendlyDeviceTypeStringFromType(type());
 }
 
 TQString TDEGenericDevice::busID() {
@@ -321,10 +321,10 @@ TQString TDEGenericDevice::friendlyName() {
 			m_friendlyName = friendlyDriverName;
 		}
 		else if (m_modAlias.lower().startsWith("pci")) {
-			m_friendlyName = KGlobal::hardwareDevices()->findPCIDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID);
+			m_friendlyName = TDEGlobal::hardwareDevices()->findPCIDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID);
 		}
 		else if (m_modAlias.lower().startsWith("usb")) {
-			m_friendlyName = KGlobal::hardwareDevices()->findUSBDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID);
+			m_friendlyName = TDEGlobal::hardwareDevices()->findUSBDeviceName(m_vendorID, m_modelID, m_subvendorID, m_submodelID);
 		}
 		else {
 			TQString acpigentype = systemPath();
@@ -333,7 +333,7 @@ TQString TDEGenericDevice::friendlyName() {
 			TQString pnpgentype = acpigentype;
 			pnpgentype.truncate(pnpgentype.find(":"));
 			if (pnpgentype.startsWith("PNP")) {
-				m_friendlyName = KGlobal::hardwareDevices()->findPNPDeviceName(pnpgentype);
+				m_friendlyName = TDEGlobal::hardwareDevices()->findPNPDeviceName(pnpgentype);
 			}
 			else if (acpigentype.startsWith("device:")) {
 				acpigentype.remove(0, acpigentype.findRev(":")+1);
@@ -541,7 +541,7 @@ TQString TDEStorageDevice::friendlyName() {
 TQString TDEStorageDevice::friendlyDeviceType() {
 	TQString ret = i18n("Hard Disk Drive");
 
-	// Keep this in sync with TDEStorageDevice::icon(KIcon::StdSizes size) below
+	// Keep this in sync with TDEStorageDevice::icon(TDEIcon::StdSizes size) below
 	if (isDiskOfType(TDEDiskDeviceType::Floppy)) {
 		ret = i18n("Floppy Drive");
 	}
@@ -602,7 +602,7 @@ TQString TDEStorageDevice::friendlyDeviceType() {
 	return ret;
 }
 
-TQPixmap TDEStorageDevice::icon(KIcon::StdSizes size) {
+TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) {
 	TQPixmap ret = DesktopIcon("hdd_unmount", size);
 
 	if (isDiskOfType(TDEDiskDeviceType::Floppy)) {
@@ -706,7 +706,7 @@ TQString TDEStorageDevice::mountPath() {
 	// where <something> is listed in <system path>/dm/name
 
 	// First, ensure that all device information (mainly holders/slaves) is accurate
-	KGlobal::hardwareDevices()->rescanDeviceInformation(this);
+	TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 
 	TQString dmnodename = systemPath();
 	dmnodename.append("/dm/name");
@@ -746,7 +746,7 @@ TQString TDEStorageDevice::mountPath() {
 	TQStringList slaveDeviceList = holdingDevices();
 	for ( TQStringList::Iterator slavedevit = slaveDeviceList.begin(); slavedevit != slaveDeviceList.end(); ++slavedevit ) {
 		// Try to locate this device path in the TDE device tree
-		TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 		TDEGenericDevice *hwdevice = hwdevices->findBySystemPath(*slavedevit);
 		if ((hwdevice) && (hwdevice->type() == TDEGenericDeviceType::Disk)) {
 			TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
@@ -792,7 +792,7 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TQString mountOptions
 	}
 
 	// Update internal mount data
-	KGlobal::hardwareDevices()->processModifiedMounts();
+	TDEGlobal::hardwareDevices()->processModifiedMounts();
 
 	ret = mountPath();
 
@@ -841,7 +841,7 @@ TQString TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString me
 	}
 
 	// Update internal mount data
-	KGlobal::hardwareDevices()->processModifiedMounts();
+	TDEGlobal::hardwareDevices()->processModifiedMounts();
 
 	ret = mountPath();
 
@@ -879,7 +879,7 @@ bool TDEStorageDevice::unmountDevice(TQString* errRet, int* retcode) {
 	}
 
 	// Update internal mount data
-	KGlobal::hardwareDevices()->processModifiedMounts();
+	TDEGlobal::hardwareDevices()->processModifiedMounts();
 
 	return false;
 }
@@ -977,7 +977,25 @@ bool TDECPUDevice::canSetGovernor() {
 		return TRUE;
 	}
 	else {
+#ifdef WITH_UPOWER
+		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
+		if (dbusConn.isConnected()) {
+			TQT_DBusProxy hardwareControl("org.trinitydesktop.hardwarecontrol", "/org/trinitydesktop/hardwarecontrol", "org.trinitydesktop.hardwarecontrol,CPUGovernor", dbusConn);
+	
+			// can set brightness?
+			TQValueList<TQT_DBusData> params;
+			params << TQT_DBusData::fromInt32(coreNumber());
+			TQT_DBusMessage reply = hardwareControl.sendWithReply("CanSetCPUGovernor", params);
+			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
+				return reply[0].toVariant().value.toBool();
+			}
+		}
+		else {
+			return FALSE;
+		}
+#else // WITH_UPOWER
 		return FALSE;
+#endif// WITH_UPOWER
 	}
 }
 
@@ -989,9 +1007,25 @@ void TDECPUDevice::setGovernor(TQString gv) {
 		stream << gv.lower();
 		file.close();
 	}
+#ifdef WITH_UPOWER
+	else {
+		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
+		if (dbusConn.isConnected()) {
+			TQT_DBusProxy hardwareControl("org.trinitydesktop.hardwarecontrol", "/org/trinitydesktop/hardwarecontrol", "org.trinitydesktop.hardwarecontrol.CPUGovernor", dbusConn);
+	
+			// set brightness
+			TQValueList<TQT_DBusData> params;
+			params << TQT_DBusData::fromInt32(coreNumber()) << TQT_DBusData::fromString(gv.lower());
+			hardwareControl.sendWithReply("SetCPUGovernor", params);
+		}
+		else {
+			return;
+		}
+	}
+#endif // WITH_UPOWER
 
 	// Force update of the device information object
-	KGlobal::hardwareDevices()->processModifiedCPUs();
+	TDEGlobal::hardwareDevices()->processModifiedCPUs();
 }
 
 bool TDECPUDevice::canSetMaximumScalingFrequency() {
@@ -1015,7 +1049,7 @@ void TDECPUDevice::setMaximumScalingFrequency(double fr) {
 	}
 
 	// Force update of the device information object
-	KGlobal::hardwareDevices()->processModifiedCPUs();
+	TDEGlobal::hardwareDevices()->processModifiedCPUs();
 }
 
 int TDECPUDevice::coreNumber() {
@@ -1183,7 +1217,7 @@ bool TDERootSystemDevice::canPowerOff() {
 	// Can we power down this system?
 	// This should probably be checked via DCOP and therefore interface with KDM
 
-	KConfig *config = KGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->reparseConfiguration(); // config may have changed in the KControl module
 	
 	config->setGroup("General" );
@@ -1629,7 +1663,25 @@ bool TDEBacklightDevice::canSetBrightness() {
 		return TRUE;
 	}
 	else {
+#ifdef WITH_UPOWER
+		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
+		if (dbusConn.isConnected()) {
+			TQT_DBusProxy hardwareControl("org.trinitydesktop.hardwarecontrol", "/org/trinitydesktop/hardwarecontrol", "org.trinitydesktop.hardwarecontrol,Brightness", dbusConn);
+	
+			// can set brightness?
+			TQValueList<TQT_DBusData> params;
+			params << TQT_DBusData::fromString(brightnessnode);
+			TQT_DBusMessage reply = hardwareControl.sendWithReply("CanSetBrightness", params);
+			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
+				return reply[0].toVariant().value.toBool();
+			}
+		}
+		else {
+			return FALSE;
+		}
+#else // WITH_UPOWER
 		return FALSE;
+#endif// WITH_UPOWER
 	}
 }
 
@@ -1639,14 +1691,29 @@ int TDEBacklightDevice::rawBrightness() {
 
 void TDEBacklightDevice::setRawBrightness(int br) {
 	TQString brightnessnode = systemPath() + "/brightness";
+	TQString brightnessCommand = TQString("%1").arg(br);
 	TQFile file( brightnessnode );
 	if ( file.open( IO_WriteOnly ) ) {
-		TQString brightnessCommand;
-		brightnessCommand = TQString("%1").arg(br);
 		TQTextStream stream( &file );
 		stream << brightnessCommand;
 		file.close();
 	}
+#ifdef WITH_UPOWER
+	else {
+		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
+		if (dbusConn.isConnected()) {
+			TQT_DBusProxy hardwareControl("org.trinitydesktop.hardwarecontrol", "/org/trinitydesktop/hardwarecontrol", "org.trinitydesktop.hardwarecontrol.Brightness", dbusConn);
+	
+			// set brightness
+			TQValueList<TQT_DBusData> params;
+			params << TQT_DBusData::fromString(brightnessnode) << TQT_DBusData::fromString(brightnessCommand);
+			hardwareControl.sendWithReply("SetBrightness", params);
+		}
+		else {
+			return;
+		}
+	}
+#endif // WITH_UPOWER
 }
 
 TDEMonitorDevice::TDEMonitorDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn) {
@@ -2697,9 +2764,9 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ
 	return disktype;
 }
 
-	// KStandardDirs::kde_default
+	// TDEStandardDirs::kde_default
 
-typedef TQMap<TQString, TQString> KConfigMap;
+typedef TQMap<TQString, TQString> TDEConfigMap;
 
 TQString readUdevAttribute(udev_device* dev, TQString attr) {
 	return TQString(udev_device_get_property_value(dev, attr.ascii()));
@@ -2998,12 +3065,12 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_
 		}
 	}
 	else {
-		TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data"));
+		TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data"));
 		TQString hardware_info_directory_suffix("tdehwlib/deviceclasses/");
 		TQString hardware_info_directory;
 	
 		// Scan the hardware_info_directory for configuration files
-		// For each one, open it with KConfig() and apply its rules to classify the device
+		// For each one, open it with TDEConfig() and apply its rules to classify the device
 		// FIXME
 		// Should this also scan up to <n> subdirectories for the files?  That feature might end up being too expensive...
 
@@ -3012,7 +3079,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_
 			hardware_info_directory = (*it);
 			hardware_info_directory += hardware_info_directory_suffix;
 	
-			if (KGlobal::dirs()->exists(hardware_info_directory)) {
+			if (TDEGlobal::dirs()->exists(hardware_info_directory)) {
 				TQDir d(hardware_info_directory);
 				d.setFilter( TQDir::Files | TQDir::Hidden );
 				
@@ -3025,10 +3092,10 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_
 						bool match = true;
 		
 						// Open the rules file
-						KConfig rulesFile(fi->absFilePath(), true, false);
+						TDEConfig rulesFile(fi->absFilePath(), true, false);
 						rulesFile.setGroup("Conditions");
-						KConfigMap conditionmap = rulesFile.entryMap("Conditions");
-						KConfigMap::Iterator cndit;
+						TDEConfigMap conditionmap = rulesFile.entryMap("Conditions");
+						TDEConfigMap::Iterator cndit;
 						for (cndit = conditionmap.begin(); cndit != conditionmap.end(); ++cndit) {
 							TQStringList conditionList = TQStringList::split(',', cndit.data(), false);
 							bool atleastonematch = false;
@@ -4391,7 +4458,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD
 		}
 
 		// FIXME
-		// Much of the code in libkrandr should be integrated into/interfaced with this library
+		// Much of the code in libtderandr should be integrated into/interfaced with this library
 	}
 
 	if (device->type() == TDEGenericDeviceType::RootSystem) {
@@ -5059,7 +5126,7 @@ TQString TDEHardwareDevices::findPNPDeviceName(TQString pnpid) {
 	if (!pnp_id_map) {
 		pnp_id_map = new TDEDeviceIDMap;
 
-		TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data"));
+		TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data"));
 		TQString hardware_info_directory_suffix("tdehwlib/pnpdev/");
 		TQString hardware_info_directory;
 		TQString database_filename;
@@ -5068,7 +5135,7 @@ TQString TDEHardwareDevices::findPNPDeviceName(TQString pnpid) {
 			hardware_info_directory = (*it);
 			hardware_info_directory += hardware_info_directory_suffix;
 	
-			if (KGlobal::dirs()->exists(hardware_info_directory)) {
+			if (TDEGlobal::dirs()->exists(hardware_info_directory)) {
 				database_filename = hardware_info_directory + "pnp.ids";
 				if (TQFile::exists(database_filename)) {
 					break;
@@ -5129,7 +5196,7 @@ TQString TDEHardwareDevices::findMonitorManufacturerName(TQString dpyid) {
 	if (!dpy_id_map) {
 		dpy_id_map = new TDEDeviceIDMap;
 
-		TQStringList hardware_info_directories(KGlobal::dirs()->resourceDirs("data"));
+		TQStringList hardware_info_directories(TDEGlobal::dirs()->resourceDirs("data"));
 		TQString hardware_info_directory_suffix("tdehwlib/pnpdev/");
 		TQString hardware_info_directory;
 		TQString database_filename;
@@ -5138,7 +5205,7 @@ TQString TDEHardwareDevices::findMonitorManufacturerName(TQString dpyid) {
 			hardware_info_directory = (*it);
 			hardware_info_directory += hardware_info_directory_suffix;
 	
-			if (KGlobal::dirs()->exists(hardware_info_directory)) {
+			if (TDEGlobal::dirs()->exists(hardware_info_directory)) {
 				database_filename = hardware_info_directory + "dpy.ids";
 				if (TQFile::exists(database_filename)) {
 					break;
@@ -5428,7 +5495,7 @@ TQString TDEHardwareDevices::getFriendlyDeviceTypeStringFromType(TDEGenericDevic
 	return ret;
 }
 
-TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDEGenericDeviceType query, KIcon::StdSizes size) {
+TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDEGenericDeviceType query, TDEIcon::StdSizes size) {
 	TQPixmap ret = DesktopIcon("misc", size);
 
 // 	// Keep this in sync with the TDEGenericDeviceType definition in the header
@@ -5520,7 +5587,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
 		ret = DesktopIcon("kcmpci", size);
 	}
 	else if (query == TDEGenericDeviceType::Backlight) {
-		ret = DesktopIcon("kscreensaver", size);	// FIXME
+		ret = DesktopIcon("tdescreensaver", size);	// FIXME
 	}
 	else if (query == TDEGenericDeviceType::Battery) {
 		ret = DesktopIcon("energy", size);
diff --git a/tdecore/tdehardwaredevices.h b/tdecore/tdehardwaredevices.h
index b6d0dd5ef..0363596e4 100644
--- a/tdecore/tdehardwaredevices.h
+++ b/tdecore/tdehardwaredevices.h
@@ -353,10 +353,10 @@ class TDECORE_EXPORT TDEGenericDevice : public TQObject
 
 		/**
 		*  Get an icon for this device
-		*  @param size a KIcon::StdSizes structure specifying the desired icon size
+		*  @param size a TDEIcon::StdSizes structure specifying the desired icon size
 		*  @return a TQPixmap containing the icon for the specified type
 		*/
-		virtual TQPixmap icon(KIcon::StdSizes size);
+		virtual TQPixmap icon(TDEIcon::StdSizes size);
 
 	protected:
 		/**
@@ -622,12 +622,12 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
 
 		/**
 		* Get an icon for this device
-		* @param size a KIcon::StdSizes structure specifying the desired icon size
+		* @param size a TDEIcon::StdSizes structure specifying the desired icon size
 		* @return a TQPixmap containing the icon for the specified type
 		*
-		* This method overrides TDEGenericDevice::icon(KIcon::StdSizes size)
+		* This method overrides TDEGenericDevice::icon(TDEIcon::StdSizes size)
 		*/
-		TQPixmap icon(KIcon::StdSizes size);
+		TQPixmap icon(TDEIcon::StdSizes size);
 
 		/**
 		* @return a TQString with a friendly name
@@ -1977,10 +1977,10 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject
 		/**
 		*  Get an icon for a device type
 		*  @param query a TDEGenericDeviceType::TDEGenericDeviceType specifying a device type
-		*  @param size a KIcon::StdSizes structure specifying the desired icon size
+		*  @param size a TDEIcon::StdSizes structure specifying the desired icon size
 		*  @return a TQPixmap containing the icon for the specified type
 		*/
-		TQPixmap getDeviceTypeIconFromType(TDEGenericDeviceType::TDEGenericDeviceType query, KIcon::StdSizes size);
+		TQPixmap getDeviceTypeIconFromType(TDEGenericDeviceType::TDEGenericDeviceType query, TDEIcon::StdSizes size);
 
 		/**
 		*  Convenience function to obtain the root system device
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index 767752689..46b36f1d8 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -37,22 +37,22 @@
 #define TDEFX_EXPORT KDE_EXPORT
 #define TDEPRINT_EXPORT KDE_EXPORT
 #define KDNSSD_EXPORT KDE_EXPORT
-#define KIO_EXPORT KDE_EXPORT
+#define TDEIO_EXPORT KDE_EXPORT
 #define DCOP_EXPORT KDE_EXPORT
 #define KPARTS_EXPORT KDE_EXPORT
 #define KTEXTEDITOR_EXPORT KDE_EXPORT
 #define KABC_EXPORT KDE_EXPORT
 #define TDESU_EXPORT KDE_EXPORT
 #define KVCARD_EXPORT KDE_EXPORT
-#define KRESOURCES_EXPORT KDE_EXPORT
+#define TDERESOURCES_EXPORT KDE_EXPORT
 #define KSTYLE_EXPORT KDE_EXPORT
-#define KHTML_EXPORT KDE_EXPORT
+#define TDEHTML_EXPORT KDE_EXPORT
 #define KMDI_EXPORT KDE_EXPORT
 #define KUTILS_EXPORT KDE_EXPORT
 #define KATEPARTINTERFACES_EXPORT KDE_EXPORT
 #define KATEPART_EXPORT KDE_EXPORT
 #define KMID_EXPORT KDE_EXPORT
-#define KRANDR_EXPORT KDE_EXPORT
+#define TDERANDR_EXPORT KDE_EXPORT
 #define KIMPROXY_EXPORT KDE_EXPORT
 #define KDE_ARTS_EXPORT KDE_EXPORT
 #define KUNITTEST_EXPORT KDE_EXPORT
@@ -73,8 +73,8 @@
 # ifndef TDECORE_EXPORT_DEPRECATED
 #  define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT
 # endif
-# ifndef KIO_EXPORT_DEPRECATED
-#  define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
+# ifndef TDEIO_EXPORT_DEPRECATED
+#  define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT
 # endif
 # ifndef TDEUI_EXPORT_DEPRECATED
 #  define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT
diff --git a/tdecore/klocale.cpp b/tdecore/tdelocale.cpp
index c4ae52b19..4402dd183 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -33,15 +33,15 @@
 #include <tqregexp.h>
 
 #include "kcatalogue.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "ksimpleconfig.h"
 #include "kinstance.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kdebug.h"
 #include "kcalendarsystem.h"
 #include "kcalendarsystemfactory.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #ifdef Q_WS_WIN
 #include <windows.h>
@@ -51,7 +51,7 @@ static const char * const SYSTEM_MESSAGES = "tdelibs";
 
 static const char *maincatalogue = 0;
 
-class KLocalePrivate
+class TDELocalePrivate
 {
 public:
   int weekStartDay;
@@ -62,12 +62,12 @@ public:
   TQValueList<KCatalogue> catalogues; // list of all loaded catalogs, contains one instance per catalog name and language
   TQString encoding;
   TQTextCodec * codecForEncoding;
-  KConfig * config;
+  TDEConfig * config;
   bool formatInited;
   int /*TQPrinter::PageSize*/ pageSize;
-  KLocale::MeasureSystem measureSystem;
+  TDELocale::MeasureSystem measureSystem;
   TQStringList langTwoAlpha;
-  KConfig *languages;
+  TDEConfig *languages;
 
   TQString calendarType;
   KCalendarSystem * calendar;
@@ -79,11 +79,11 @@ public:
   bool useMainCatalogue;
 };
 
-static KLocale *this_klocale = 0;
+static TDELocale *this_klocale = 0;
 
-KLocale::KLocale( const TQString & catalog, KConfig * config )
+TDELocale::TDELocale( const TQString & catalog, TDEConfig * config )
 {
-  d = new KLocalePrivate;
+  d = new TDELocalePrivate;
   d->config = config;
   d->languages = 0;
   d->calendar = 0;
@@ -92,9 +92,9 @@ KLocale::KLocale( const TQString & catalog, KConfig * config )
   initEncoding(0);
   initFileNameEncoding(0);
 
-  KConfig *cfg = d->config;
+  TDEConfig *cfg = d->config;
   this_klocale = this;
-  if (!cfg) cfg = KGlobal::instance()->config();
+  if (!cfg) cfg = TDEGlobal::instance()->config();
   this_klocale = 0;
   Q_ASSERT( cfg );
 
@@ -103,19 +103,19 @@ KLocale::KLocale( const TQString & catalog, KConfig * config )
   initMainCatalogues(catalog);
 }
 
-TQString KLocale::_initLanguage(KConfigBase *config)
+TQString TDELocale::_initLanguage(TDEConfigBase *config)
 {
   if (this_klocale)
   {
      // ### HPB Why this cast??
-     this_klocale->initLanguageList((KConfig *) config, true);
+     this_klocale->initLanguageList((TDEConfig *) config, true);
      // todo: adapt current catalog list: remove unused languages, insert main catalogs, if not already found
      return this_klocale->language();
   }
   return TQString::null;
 }
 
-void KLocale::initMainCatalogues(const TQString & catalog)
+void TDELocale::initMainCatalogues(const TQString & catalog)
 {
   // Use the first non-null string.
   TQString mainCatalogue = catalog;
@@ -128,7 +128,7 @@ void KLocale::initMainCatalogues(const TQString & catalog)
   }
 
   if (mainCatalogue.isEmpty()) {
-    kdDebug(173) << "KLocale instance created called without valid "
+    kdDebug(173) << "TDELocale instance created called without valid "
                  << "catalog! Give an argument or call setMainCatalogue "
                  << "before init" << endl;
   }
@@ -144,9 +144,9 @@ void KLocale::initMainCatalogues(const TQString & catalog)
   }
 }
 
-void KLocale::initLanguageList(KConfig * config, bool useEnv)
+void TDELocale::initLanguageList(TDEConfig * config, bool useEnv)
 {
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfigGroupSaver saver(config, "Locale");
 
   m_country = config->readEntry( "Country" );
   if ( m_country.isEmpty() )
@@ -193,7 +193,7 @@ void KLocale::initLanguageList(KConfig * config, bool useEnv)
   setLanguage( languageList );
 }
 
-void KLocale::initPluralTypes()
+void TDELocale::initPluralTypes()
 {
   for ( TQValueList<KCatalogue>::Iterator it = d->catalogues.begin();
     it != d->catalogues.end();
@@ -206,7 +206,7 @@ void KLocale::initPluralTypes()
 }
 
 
-int KLocale::pluralType( const TQString & language )
+int TDELocale::pluralType( const TQString & language )
 {
   for ( TQValueList<KCatalogue>::ConstIterator it = d->catalogues.begin();
     it != d->catalogues.end();
@@ -220,7 +220,7 @@ int KLocale::pluralType( const TQString & language )
   return -1;
 }
 
-int KLocale::pluralType( const KCatalogue& catalog )
+int TDELocale::pluralType( const KCatalogue& catalog )
 {
     const char* pluralFormString =
     I18N_NOOP("_: Dear translator, please do not translate this string "
@@ -285,31 +285,31 @@ int KLocale::pluralType( const KCatalogue& catalog )
     }
 }
 
-void KLocale::doFormatInit() const
+void TDELocale::doFormatInit() const
 {
   if ( d->formatInited ) return;
 
-  KLocale * that = const_cast<KLocale *>(this);
+  TDELocale * that = const_cast<TDELocale *>(this);
   that->initFormat();
 
   d->formatInited = true;
 }
 
-void KLocale::initFormat()
+void TDELocale::initFormat()
 {
-  KConfig *config = d->config;
-  if (!config) config = KGlobal::instance()->config();
+  TDEConfig *config = d->config;
+  if (!config) config = TDEGlobal::instance()->config();
   Q_ASSERT( config );
 
-  kdDebug(173) << "KLocale::initFormat" << endl;
+  kdDebug(173) << "TDELocale::initFormat" << endl;
 
   // make sure the config files are read using the correct locale
-  // ### Why not add a KConfigBase::setLocale( const KLocale * )?
+  // ### Why not add a TDEConfigBase::setLocale( const TDELocale * )?
   // ### Then we could remove this hack
-  KLocale *lsave = KGlobal::_locale;
-  KGlobal::_locale = this;
+  TDELocale *lsave = TDEGlobal::_locale;
+  TDEGlobal::_locale = this;
 
-  KConfigGroupSaver saver(config, "Locale");
+  TDEConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig entry(locate("locale",
                              TQString::fromLatin1("l10n/%1/entry.desktop")
@@ -385,10 +385,10 @@ void KLocale::initFormat()
 		       d->dateMonthNamePossessive);
 
   // end of hack
-  KGlobal::_locale = lsave;
+  TDEGlobal::_locale = lsave;
 }
 
-bool KLocale::setCountry(const TQString & country)
+bool TDELocale::setCountry(const TQString & country)
 {
   // Check if the file exists too??
   if ( country.isEmpty() )
@@ -401,7 +401,7 @@ bool KLocale::setCountry(const TQString & country)
   return true;
 }
 
-TQString KLocale::catalogueFileName(const TQString & language,
+TQString TDELocale::catalogueFileName(const TQString & language,
 				   const KCatalogue & catalog)
 {
   TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
@@ -415,7 +415,7 @@ TQString KLocale::catalogueFileName(const TQString & language,
   return fileName;
 }
 
-bool KLocale::setLanguage(const TQString & language)
+bool TDELocale::setLanguage(const TQString & language)
 {
   if ( d->languageList.contains( language ) ) {
  	 d->languageList.remove( language );
@@ -433,7 +433,7 @@ bool KLocale::setLanguage(const TQString & language)
   return true; // Maybe the mo-files for this language are empty, but in principle we can speak all languages
 }
 
-bool KLocale::setLanguage(const TQStringList & languages)
+bool TDELocale::setLanguage(const TQStringList & languages)
 {
   TQStringList languageList( languages );
   // This list might contain
@@ -484,7 +484,7 @@ bool KLocale::setLanguage(const TQStringList & languages)
   return true; // we found something. Maybe it's only English, but we found something
 }
 
-bool KLocale::isApplicationTranslatedInto( const TQString & language)
+bool TDELocale::isApplicationTranslatedInto( const TQString & language)
 {
   if ( language.isEmpty() ) {
     return false;
@@ -518,7 +518,7 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language)
   return ! sAbsFileName.isEmpty();
 }
 
-void KLocale::splitLocale(const TQString & aStr,
+void TDELocale::splitLocale(const TQString & aStr,
 			  TQString & language,
 			  TQString & country,
 			  TQString & chrset)
@@ -551,17 +551,17 @@ void KLocale::splitLocale(const TQString & aStr,
   language = str;
 }
 
-TQString KLocale::language() const
+TQString TDELocale::language() const
 {
   return m_language;
 }
 
-TQString KLocale::country() const
+TQString TDELocale::country() const
 {
   return m_country;
 }
 
-TQString KLocale::monthName(int i, bool shortName) const
+TQString TDELocale::monthName(int i, bool shortName) const
 {
   if ( shortName )
     switch ( i )
@@ -599,7 +599,7 @@ TQString KLocale::monthName(int i, bool shortName) const
   return TQString::null;
 }
 
-TQString KLocale::monthNamePossessive(int i, bool shortName) const
+TQString TDELocale::monthNamePossessive(int i, bool shortName) const
 {
   if ( shortName )
     switch ( i )
@@ -637,12 +637,12 @@ TQString KLocale::monthNamePossessive(int i, bool shortName) const
   return TQString::null;
 }
 
-TQString KLocale::weekDayName (int i, bool shortName) const
+TQString TDELocale::weekDayName (int i, bool shortName) const
 {
   return calendar()->weekDayName(i, shortName);
 }
 
-void KLocale::insertCatalogue( const TQString & catalog )
+void TDELocale::insertCatalogue( const TQString & catalog )
 {
   if ( !d->catalogNames.contains( catalog) ) {
     d->catalogNames.append( catalog );
@@ -650,7 +650,7 @@ void KLocale::insertCatalogue( const TQString & catalog )
   updateCatalogues( ); // evaluate the changed list and generate the neccessary KCatalog objects
 }
 
-void KLocale::updateCatalogues( )
+void TDELocale::updateCatalogues( )
 {
   // some changes have occured. Maybe we have learned or forgotten some languages.
   // Maybe the language precedence has changed.
@@ -672,7 +672,7 @@ void KLocale::updateCatalogues( )
   }
 
   // now iterate over all languages and all wanted catalog names and append or create them in the right order
-  // the sequence must be e.g. nds/appname nds/tdelibs nds/kio de/appname de/tdelibs de/kio etc.
+  // the sequence must be e.g. nds/appname nds/tdelibs nds/tdeio de/appname de/tdelibs de/tdeio etc.
   // and not nds/appname de/appname nds/tdelibs de/tdelibs etc. Otherwise we would be in trouble with a language
   // sequende nds,en_US, de. In this case en_US must hide everything below in the language list.
   for ( TQStringList::ConstIterator itLangs =  d->languageList.begin();
@@ -691,16 +691,16 @@ void KLocale::updateCatalogues( )
 
 
 
-void KLocale::removeCatalogue(const TQString &catalog)
+void TDELocale::removeCatalogue(const TQString &catalog)
 {
   if ( d->catalogNames.contains( catalog )) {
     d->catalogNames.remove( catalog );
-    if (KGlobal::_instance)
+    if (TDEGlobal::_instance)
       updateCatalogues();  // walk through the KCatalogue instances and weed out everything we no longer need
   }
 }
 
-void KLocale::setActiveCatalogue(const TQString &catalog)
+void TDELocale::setActiveCatalogue(const TQString &catalog)
 {
   if ( d->catalogNames.contains( catalog ) ) {
     d->catalogNames.remove( catalog );
@@ -709,7 +709,7 @@ void KLocale::setActiveCatalogue(const TQString &catalog)
   }
 }
 
-KLocale::~KLocale()
+TDELocale::~TDELocale()
 {
   delete d->calendar;
   delete d->languages;
@@ -717,7 +717,7 @@ KLocale::~KLocale()
   d = 0L;
 }
 
-TQString KLocale::translate_priv(const char *msgid,
+TQString TDELocale::translate_priv(const char *msgid,
 				const char *fallback,
 				const char **translated,
 				int* pluralType ) const
@@ -727,7 +727,7 @@ TQString KLocale::translate_priv(const char *msgid,
   }
   if (!msgid || !msgid[0])
     {
-      kdWarning() << "KLocale: trying to look up \"\" in catalog. "
+      kdWarning() << "TDELocale: trying to look up \"\" in catalog. "
 		   << "Fix the program" << endl;
       return TQString::null;
     }
@@ -766,16 +766,16 @@ TQString KLocale::translate_priv(const char *msgid,
   return TQString::fromUtf8( fallback );
 }
 
-TQString KLocale::translate(const char* msgid) const
+TQString TDELocale::translate(const char* msgid) const
 {
   return translate_priv(msgid, msgid);
 }
 
-TQString KLocale::translate( const char *index, const char *fallback) const
+TQString TDELocale::translate( const char *index, const char *fallback) const
 {
   if (!index || !index[0] || !fallback || !fallback[0])
     {
-      kdDebug(173) << "KLocale: trying to look up \"\" in catalog. "
+      kdDebug(173) << "TDELocale: trying to look up \"\" in catalog. "
 		   << "Fix the program" << endl;
       return TQString::null;
     }
@@ -807,12 +807,12 @@ static TQString put_n_in(const TQString &orig, unsigned long n)
       kdError() << "translation of \"" << singular << "\" doesn't contain " << x << " different plural forms as expected\n"; \
       return TQString( "BROKEN TRANSLATION %1" ).arg( singular ); }
 
-TQString KLocale::translate( const char *singular, const char *plural,
+TQString TDELocale::translate( const char *singular, const char *plural,
                             unsigned long n ) const
 {
   if (!singular || !singular[0] || !plural || !plural[0])
     {
-      kdWarning() << "KLocale: trying to look up \"\" in catalog. "
+      kdWarning() << "TDELocale: trying to look up \"\" in catalog. "
 		   << "Fix the program" << endl;
       return TQString::null;
     }
@@ -960,11 +960,11 @@ TQString KLocale::translate( const char *singular, const char *plural,
   return TQString::null;
 }
 
-TQString KLocale::translateQt( const char *context, const char *source,
+TQString TDELocale::translateQt( const char *context, const char *source,
 			      const char *message) const
 {
   if (!source || !source[0]) {
-    kdWarning() << "KLocale: trying to look up \"\" in catalog. "
+    kdWarning() << "TDELocale: trying to look up \"\" in catalog. "
 		<< "Fix the program" << endl;
     return TQString::null;
   }
@@ -1004,97 +1004,97 @@ TQString KLocale::translateQt( const char *context, const char *source,
   return TQString::null;
 }
 
-bool KLocale::nounDeclension() const
+bool TDELocale::nounDeclension() const
 {
   doFormatInit();
   return d->nounDeclension;
 }
 
-bool KLocale::dateMonthNamePossessive() const
+bool TDELocale::dateMonthNamePossessive() const
 {
   doFormatInit();
   return d->dateMonthNamePossessive;
 }
 
-int KLocale::weekStartDay() const
+int TDELocale::weekStartDay() const
 {
   doFormatInit();
   return d->weekStartDay;
 }
 
-bool KLocale::weekStartsMonday() const //deprecated
+bool TDELocale::weekStartsMonday() const //deprecated
 {
   doFormatInit();
   return (d->weekStartDay==1);
 }
 
-TQString KLocale::decimalSymbol() const
+TQString TDELocale::decimalSymbol() const
 {
   doFormatInit();
   return m_decimalSymbol;
 }
 
-TQString KLocale::thousandsSeparator() const
+TQString TDELocale::thousandsSeparator() const
 {
   doFormatInit();
   return m_thousandsSeparator;
 }
 
-TQString KLocale::currencySymbol() const
+TQString TDELocale::currencySymbol() const
 {
   doFormatInit();
   return m_currencySymbol;
 }
 
-TQString KLocale::monetaryDecimalSymbol() const
+TQString TDELocale::monetaryDecimalSymbol() const
 {
   doFormatInit();
   return m_monetaryDecimalSymbol;
 }
 
-TQString KLocale::monetaryThousandsSeparator() const
+TQString TDELocale::monetaryThousandsSeparator() const
 {
   doFormatInit();
   return m_monetaryThousandsSeparator;
 }
 
-TQString KLocale::positiveSign() const
+TQString TDELocale::positiveSign() const
 {
   doFormatInit();
   return m_positiveSign;
 }
 
-TQString KLocale::negativeSign() const
+TQString TDELocale::negativeSign() const
 {
   doFormatInit();
   return m_negativeSign;
 }
 
-int KLocale::fracDigits() const
+int TDELocale::fracDigits() const
 {
   doFormatInit();
   return m_fracDigits;
 }
 
-bool KLocale::positivePrefixCurrencySymbol() const
+bool TDELocale::positivePrefixCurrencySymbol() const
 {
   doFormatInit();
   return m_positivePrefixCurrencySymbol;
 }
 
-bool KLocale::negativePrefixCurrencySymbol() const
+bool TDELocale::negativePrefixCurrencySymbol() const
 {
   doFormatInit();
   return m_negativePrefixCurrencySymbol;
 }
 
-KLocale::SignPosition KLocale::positiveMonetarySignPosition() const
+TDELocale::SignPosition TDELocale::positiveMonetarySignPosition() const
 {
   doFormatInit();
   return m_positiveMonetarySignPosition;
 }
 
-KLocale::SignPosition KLocale::negativeMonetarySignPosition() const
+TDELocale::SignPosition TDELocale::negativeMonetarySignPosition() const
 {
   doFormatInit();
   return m_negativeMonetarySignPosition;
@@ -1127,7 +1127,7 @@ static void _insertSeparator(TQString &str, const TQString &separator,
   str = mainPart + fracPart;
 }
 
-TQString KLocale::formatMoney(double num,
+TQString TDELocale::formatMoney(double num,
 			     const TQString & symbol,
 			     int precision) const
 {
@@ -1188,24 +1188,24 @@ TQString KLocale::formatMoney(double num,
   return res;
 }
 
-TQString KLocale::formatMoney(const TQString &numStr) const
+TQString TDELocale::formatMoney(const TQString &numStr) const
 {
   return formatMoney(numStr.toDouble());
 }
 
-TQString KLocale::formatNumber(double num, int precision) const
+TQString TDELocale::formatNumber(double num, int precision) const
 {
   if (precision == -1) precision = 2;
   // no need to round since TQString::number does this for us
   return formatNumber(TQString::number(num, 'f', precision), false, 0);
 }
 
-TQString KLocale::formatLong(long num) const
+TQString TDELocale::formatLong(long num) const
 {
   return formatNumber((double)num, 0);
 }
 
-TQString KLocale::formatNumber(const TQString &numStr) const
+TQString TDELocale::formatNumber(const TQString &numStr) const
 {
   return formatNumber(numStr, true, 2);
 }
@@ -1301,7 +1301,7 @@ static void _round(TQString &str, int precision)
   if (precision == 0) str = str.section('.', 0, 0);
 }
 
-TQString KLocale::formatNumber(const TQString &numStr, bool round,
+TQString TDELocale::formatNumber(const TQString &numStr, bool round,
 			      int precision) const
 {
   TQString tmpString = numStr;
@@ -1335,7 +1335,7 @@ TQString KLocale::formatNumber(const TQString &numStr, bool round,
   return mantString +  expString;
 }
 
-TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const
+TQString TDELocale::formatDate(const TQDate &pDate, bool shortFormat) const
 {
   const TQString rst = shortFormat?dateFormatShort():dateFormat();
 
@@ -1410,12 +1410,12 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const
   return buffer;
 }
 
-void KLocale::setMainCatalogue(const char *catalog)
+void TDELocale::setMainCatalogue(const char *catalog)
 {
   maincatalogue = catalog;
 }
 
-double KLocale::readNumber(const TQString &_str, bool * ok) const
+double TDELocale::readNumber(const TQString &_str, bool * ok) const
 {
   TQString str = _str.stripWhiteSpace();
   bool neg = str.find(negativeSign()) == 0;
@@ -1480,7 +1480,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const
   return tot.toDouble(ok);
 }
 
-double KLocale::readMoney(const TQString &_str, bool * ok) const
+double TDELocale::readMoney(const TQString &_str, bool * ok) const
 {
   TQString str = _str.stripWhiteSpace();
   bool neg = false;
@@ -1594,7 +1594,7 @@ static int readInt(const TQString &str, uint &pos)
   return result;
 }
 
-TQDate KLocale::readDate(const TQString &intstr, bool* ok) const
+TQDate TDELocale::readDate(const TQString &intstr, bool* ok) const
 {
   TQDate date;
   date = readDate(intstr, ShortFormat, ok);
@@ -1602,15 +1602,15 @@ TQDate KLocale::readDate(const TQString &intstr, bool* ok) const
   return readDate(intstr, NormalFormat, ok);
 }
 
-TQDate KLocale::readDate(const TQString &intstr, ReadDateFlags flags, bool* ok) const
+TQDate TDELocale::readDate(const TQString &intstr, ReadDateFlags flags, bool* ok) const
 {
   TQString fmt = ((flags & ShortFormat) ? dateFormatShort() : dateFormat()).simplifyWhiteSpace();
   return readDate( intstr, fmt, ok );
 }
 
-TQDate KLocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok) const
+TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok) const
 {
-  //kdDebug() << "KLocale::readDate intstr=" << intstr << " fmt=" << fmt << endl;
+  //kdDebug() << "TDELocale::readDate intstr=" << intstr << " fmt=" << fmt << endl;
   TQString str = intstr.simplifyWhiteSpace().lower();
   int day = -1, month = -1;
   // allow the year to be omitted if not in the format
@@ -1722,7 +1722,7 @@ TQDate KLocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok)
     error = true;
   }
 
-  //kdDebug(173) << "KLocale::readDate day=" << day << " month=" << month << " year=" << year << endl;
+  //kdDebug(173) << "TDELocale::readDate day=" << day << " month=" << month << " year=" << year << endl;
   if ( year != -1 && month != -1 && day != -1 && !error)
   {
     if (ok) *ok = true;
@@ -1739,7 +1739,7 @@ TQDate KLocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok)
   }
 }
 
-TQTime KLocale::readTime(const TQString &intstr, bool *ok) const
+TQTime TDELocale::readTime(const TQString &intstr, bool *ok) const
 {
   TQTime _time;
   _time = readTime(intstr, WithSeconds, ok);
@@ -1747,7 +1747,7 @@ TQTime KLocale::readTime(const TQString &intstr, bool *ok) const
   return readTime(intstr, WithoutSeconds, ok);
 }
 
-TQTime KLocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok) const
+TQTime TDELocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok) const
 {
   TQString str = intstr.simplifyWhiteSpace().lower();
   TQString Format = timeFormat().simplifyWhiteSpace();
@@ -1855,12 +1855,12 @@ TQTime KLocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok)
 }
 
 //BIC: merge with below
-TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs) const
+TQString TDELocale::formatTime(const TQTime &pTime, bool includeSecs) const
 {
   return formatTime( pTime, includeSecs, false );
 }
 
-TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDuration) const
+TQString TDELocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDuration) const
 {
   const TQString rst = timeFormat();
 
@@ -1946,7 +1946,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat
     return ret;
 }
 
-bool KLocale::use12Clock() const
+bool TDELocale::use12Clock() const
 {
   if ((timeFormat().contains(TQString::fromLatin1("%I")) > 0) ||
       (timeFormat().contains(TQString::fromLatin1("%l")) > 0))
@@ -1955,17 +1955,17 @@ bool KLocale::use12Clock() const
     return false;
 }
 
-TQString KLocale::languages() const
+TQString TDELocale::languages() const
 {
   return d->languageList.join( TQString::fromLatin1(":") );
 }
 
-TQStringList KLocale::languageList() const
+TQStringList TDELocale::languageList() const
 {
   return d->languageList;
 }
 
-TQString KLocale::formatDateTime(const TQDateTime &pDateTime,
+TQString TDELocale::formatDateTime(const TQDateTime &pDateTime,
 				bool shortFormat,
 				bool includeSeconds) const
 {
@@ -1976,7 +1976,7 @@ TQString KLocale::formatDateTime(const TQDateTime &pDateTime,
 
 TQString i18n(const char* text)
 {
-  register KLocale *instance = KGlobal::locale();
+  register TDELocale *instance = TDEGlobal::locale();
   if (instance)
     return instance->translate(text);
   return TQString::fromUtf8(text);
@@ -1984,7 +1984,7 @@ TQString i18n(const char* text)
 
 TQString i18n(const char* index, const char *text)
 {
-  register KLocale *instance = KGlobal::locale();
+  register TDELocale *instance = TDEGlobal::locale();
   if (instance)
     return instance->translate(index, text);
   return TQString::fromUtf8(text);
@@ -1992,7 +1992,7 @@ TQString i18n(const char* index, const char *text)
 
 TQString i18n(const char* singular, const char* plural, unsigned long n)
 {
-  register KLocale *instance = KGlobal::locale();
+  register TDELocale *instance = TDEGlobal::locale();
   if (instance)
     return instance->translate(singular, plural, n);
   if (n == 1)
@@ -2001,33 +2001,33 @@ TQString i18n(const char* singular, const char* plural, unsigned long n)
     return put_n_in(TQString::fromUtf8(plural), n);
 }
 
-void KLocale::initInstance()
+void TDELocale::initInstance()
 {
-  if (KGlobal::_locale)
+  if (TDEGlobal::_locale)
     return;
 
-  KInstance *app = KGlobal::instance();
+  TDEInstance *app = TDEGlobal::instance();
   if (app) {
-    KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName()));
+    TDEGlobal::_locale = new TDELocale(TQString::fromLatin1(app->instanceName()));
 
     // only do this for the global instance
-    TQTextCodec::setCodecForLocale(KGlobal::_locale->codecForEncoding());
+    TQTextCodec::setCodecForLocale(TDEGlobal::_locale->codecForEncoding());
   }
   else
-    kdDebug(173) << "no app name available using KLocale - nothing to do\n";
+    kdDebug(173) << "no app name available using TDELocale - nothing to do\n";
 }
 
-TQString KLocale::langLookup(const TQString &fname, const char *rtype)
+TQString TDELocale::langLookup(const TQString &fname, const char *rtype)
 {
   TQStringList search;
 
   // assemble the local search paths
-  const TQStringList localDoc = KGlobal::dirs()->resourceDirs(rtype);
+  const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs(rtype);
 
   // look up the different languages
   for (int id=localDoc.count()-1; id >= 0; --id)
     {
-      TQStringList langs = KGlobal::locale()->languageList();
+      TQStringList langs = TDEGlobal::locale()->languageList();
       langs.append( "en" );
       langs.remove( defaultLanguage() );
       TQStringList::ConstIterator lang;
@@ -2049,12 +2049,12 @@ TQString KLocale::langLookup(const TQString &fname, const char *rtype)
   return TQString::null;
 }
 
-bool KLocale::useDefaultLanguage() const
+bool TDELocale::useDefaultLanguage() const
 {
   return language() == defaultLanguage();
 }
 
-void KLocale::initEncoding(KConfig *)
+void TDELocale::initEncoding(TDEConfig *)
 {
   const int mibDefault = 4; // ISO 8859-1
 
@@ -2070,65 +2070,65 @@ void KLocale::initEncoding(KConfig *)
   Q_ASSERT( d->codecForEncoding );
 }
 
-void KLocale::initFileNameEncoding(KConfig *)
+void TDELocale::initFileNameEncoding(TDEConfig *)
 {
   // If the following environment variable is set, assume all filenames
   // are in UTF-8 regardless of the current C locale.
   d->utf8FileEncoding = getenv("TDE_UTF8_FILENAMES") != 0;
   if (d->utf8FileEncoding)
   {
-    TQFile::setEncodingFunction(KLocale::encodeFileNameUTF8);
-    TQFile::setDecodingFunction(KLocale::decodeFileNameUTF8);
+    TQFile::setEncodingFunction(TDELocale::encodeFileNameUTF8);
+    TQFile::setDecodingFunction(TDELocale::decodeFileNameUTF8);
   }
   // Otherwise, stay with QFile's default filename encoding functions
   // which, on Unix platforms, use the locale's codec.
 }
 
 #ifdef USE_QT3
-TQCString KLocale::encodeFileNameUTF8( const TQString & fileName )
+TQCString TDELocale::encodeFileNameUTF8( const TQString & fileName )
 #endif // USE_QT3
 #ifdef USE_QT4
-QByteArray KLocale::encodeFileNameUTF8( const QString & fileName )
+QByteArray TDELocale::encodeFileNameUTF8( const QString & fileName )
 #endif // USE_QT4
 {
   return TQString(fileName).utf8();
 }
 
 #ifdef USE_QT3
-TQString KLocale::decodeFileNameUTF8( const TQCString & localFileName )
+TQString TDELocale::decodeFileNameUTF8( const TQCString & localFileName )
 #endif // USE_QT3
 #ifdef USE_QT4
-QString KLocale::decodeFileNameUTF8( const QByteArray & localFileName )
+QString TDELocale::decodeFileNameUTF8( const QByteArray & localFileName )
 #endif // USE_QT4
 {
   return TQString::fromUtf8(localFileName);
 }
 
-void KLocale::setDateFormat(const TQString & format)
+void TDELocale::setDateFormat(const TQString & format)
 {
   doFormatInit();
   m_dateFormat = format.stripWhiteSpace();
 }
 
-void KLocale::setDateFormatShort(const TQString & format)
+void TDELocale::setDateFormatShort(const TQString & format)
 {
   doFormatInit();
   m_dateFormatShort = format.stripWhiteSpace();
 }
 
-void KLocale::setDateMonthNamePossessive(bool possessive)
+void TDELocale::setDateMonthNamePossessive(bool possessive)
 {
   doFormatInit();
   d->dateMonthNamePossessive = possessive;
 }
 
-void KLocale::setTimeFormat(const TQString & format)
+void TDELocale::setTimeFormat(const TQString & format)
 {
   doFormatInit();
   m_timeFormat = format.stripWhiteSpace();
 }
 
-void KLocale::setWeekStartsMonday(bool start) //deprecated
+void TDELocale::setWeekStartsMonday(bool start) //deprecated
 {
   doFormatInit();
   if (start)
@@ -2137,7 +2137,7 @@ void KLocale::setWeekStartsMonday(bool start) //deprecated
     d->weekStartDay = 7;
 }
 
-void KLocale::setWeekStartDay(int day)
+void TDELocale::setWeekStartDay(int day)
 {
   doFormatInit();
   if (day>7 || day<1)
@@ -2146,134 +2146,134 @@ void KLocale::setWeekStartDay(int day)
     d->weekStartDay = day;
 }
 
-TQString KLocale::dateFormat() const
+TQString TDELocale::dateFormat() const
 {
   doFormatInit();
   return m_dateFormat;
 }
 
-TQString KLocale::dateFormatShort() const
+TQString TDELocale::dateFormatShort() const
 {
   doFormatInit();
   return m_dateFormatShort;
 }
 
-TQString KLocale::timeFormat() const
+TQString TDELocale::timeFormat() const
 {
   doFormatInit();
   return m_timeFormat;
 }
 
-void KLocale::setDecimalSymbol(const TQString & symbol)
+void TDELocale::setDecimalSymbol(const TQString & symbol)
 {
   doFormatInit();
   m_decimalSymbol = symbol.stripWhiteSpace();
 }
 
-void KLocale::setThousandsSeparator(const TQString & separator)
+void TDELocale::setThousandsSeparator(const TQString & separator)
 {
   doFormatInit();
   // allow spaces here
   m_thousandsSeparator = separator;
 }
 
-void KLocale::setPositiveSign(const TQString & sign)
+void TDELocale::setPositiveSign(const TQString & sign)
 {
   doFormatInit();
   m_positiveSign = sign.stripWhiteSpace();
 }
 
-void KLocale::setNegativeSign(const TQString & sign)
+void TDELocale::setNegativeSign(const TQString & sign)
 {
   doFormatInit();
   m_negativeSign = sign.stripWhiteSpace();
 }
 
-void KLocale::setPositiveMonetarySignPosition(SignPosition signpos)
+void TDELocale::setPositiveMonetarySignPosition(SignPosition signpos)
 {
   doFormatInit();
   m_positiveMonetarySignPosition = signpos;
 }
 
-void KLocale::setNegativeMonetarySignPosition(SignPosition signpos)
+void TDELocale::setNegativeMonetarySignPosition(SignPosition signpos)
 {
   doFormatInit();
   m_negativeMonetarySignPosition = signpos;
 }
 
-void KLocale::setPositivePrefixCurrencySymbol(bool prefix)
+void TDELocale::setPositivePrefixCurrencySymbol(bool prefix)
 {
   doFormatInit();
   m_positivePrefixCurrencySymbol = prefix;
 }
 
-void KLocale::setNegativePrefixCurrencySymbol(bool prefix)
+void TDELocale::setNegativePrefixCurrencySymbol(bool prefix)
 {
   doFormatInit();
   m_negativePrefixCurrencySymbol = prefix;
 }
 
-void KLocale::setFracDigits(int digits)
+void TDELocale::setFracDigits(int digits)
 {
   doFormatInit();
   m_fracDigits = digits;
 }
 
-void KLocale::setMonetaryThousandsSeparator(const TQString & separator)
+void TDELocale::setMonetaryThousandsSeparator(const TQString & separator)
 {
   doFormatInit();
   // allow spaces here
   m_monetaryThousandsSeparator = separator;
 }
 
-void KLocale::setMonetaryDecimalSymbol(const TQString & symbol)
+void TDELocale::setMonetaryDecimalSymbol(const TQString & symbol)
 {
   doFormatInit();
   m_monetaryDecimalSymbol = symbol.stripWhiteSpace();
 }
 
-void KLocale::setCurrencySymbol(const TQString & symbol)
+void TDELocale::setCurrencySymbol(const TQString & symbol)
 {
   doFormatInit();
   m_currencySymbol = symbol.stripWhiteSpace();
 }
 
-int KLocale::pageSize() const
+int TDELocale::pageSize() const
 {
   doFormatInit();
   return d->pageSize;
 }
 
-void KLocale::setPageSize(int pageSize)
+void TDELocale::setPageSize(int pageSize)
 {
   // #### check if it's in range??
   doFormatInit();
   d->pageSize = pageSize;
 }
 
-KLocale::MeasureSystem KLocale::measureSystem() const
+TDELocale::MeasureSystem TDELocale::measureSystem() const
 {
   doFormatInit();
   return d->measureSystem;
 }
 
-void KLocale::setMeasureSystem(MeasureSystem value)
+void TDELocale::setMeasureSystem(MeasureSystem value)
 {
   doFormatInit();
   d->measureSystem = value;
 }
 
-TQString KLocale::defaultLanguage()
+TQString TDELocale::defaultLanguage()
 {
   return TQString::fromLatin1("en_US");
 }
 
-TQString KLocale::defaultCountry()
+TQString TDELocale::defaultCountry()
 {
   return TQString::fromLatin1("C");
 }
 
-const char * KLocale::encoding() const
+const char * TDELocale::encoding() const
 {
 #ifdef Q_WS_WIN
   if (0==qstrcmp("System", codecForEncoding()->name()))
@@ -2290,24 +2290,24 @@ const char * KLocale::encoding() const
   return codecForEncoding()->name();
 }
 
-int KLocale::encodingMib() const
+int TDELocale::encodingMib() const
 {
   return codecForEncoding()->mibEnum();
 }
 
-int KLocale::fileEncodingMib() const
+int TDELocale::fileEncodingMib() const
 {
   if (d->utf8FileEncoding)
      return 106;
   return codecForEncoding()->mibEnum();
 }
 
-TQTextCodec * KLocale::codecForEncoding() const
+TQTextCodec * TDELocale::codecForEncoding() const
 {
   return d->codecForEncoding;
 }
 
-bool KLocale::setEncoding(int mibEnum)
+bool TDELocale::setEncoding(int mibEnum)
 {
   TQTextCodec * codec = TQTextCodec::codecForMib(mibEnum);
   if (codec)
@@ -2316,7 +2316,7 @@ bool KLocale::setEncoding(int mibEnum)
   return codec != 0;
 }
 
-TQStringList KLocale::languagesTwoAlpha() const
+TQStringList TDELocale::languagesTwoAlpha() const
 {
   if (d->langTwoAlpha.count())
      return d->langTwoAlpha;
@@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const
 
   TQStringList result;
 
-  KConfig config(TQString::fromLatin1("language.codes"), true, false);
+  TDEConfig config(TQString::fromLatin1("language.codes"), true, false);
   config.setGroup("TwoLetterCodes");
 
   for ( TQStringList::ConstIterator it = origList.begin();
@@ -2356,18 +2356,18 @@ TQStringList KLocale::languagesTwoAlpha() const
   return result;
 }
 
-TQStringList KLocale::allLanguagesTwoAlpha() const
+TQStringList TDELocale::allLanguagesTwoAlpha() const
 {
   if (!d->languages)
-    d->languages = new KConfig("all_languages", true, false, "locale");
+    d->languages = new TDEConfig("all_languages", true, false, "locale");
 
   return d->languages->groupList();
 }
 
-TQString KLocale::twoAlphaToLanguageName(const TQString &code) const
+TQString TDELocale::twoAlphaToLanguageName(const TQString &code) const
 {
   if (!d->languages)
-    d->languages = new KConfig("all_languages", true, false, "locale");
+    d->languages = new TDEConfig("all_languages", true, false, "locale");
 
   TQString groupName = code;
   const int i = groupName.find('_');
@@ -2377,10 +2377,10 @@ TQString KLocale::twoAlphaToLanguageName(const TQString &code) const
   return d->languages->readEntry("Name");
 }
 
-TQStringList KLocale::allCountriesTwoAlpha() const
+TQStringList TDELocale::allCountriesTwoAlpha() const
 {
   TQStringList countries;
-  TQStringList paths = KGlobal::dirs()->findAllResources("locale", "l10n/*/entry.desktop");
+  TQStringList paths = TDEGlobal::dirs()->findAllResources("locale", "l10n/*/entry.desktop");
   for(TQStringList::ConstIterator it = paths.begin();
       it != paths.end(); ++it)
   {
@@ -2391,14 +2391,14 @@ TQStringList KLocale::allCountriesTwoAlpha() const
   return countries;
 }
 
-TQString KLocale::twoAlphaToCountryName(const TQString &code) const
+TQString TDELocale::twoAlphaToCountryName(const TQString &code) const
 {
-  KConfig cfg("l10n/"+code.lower()+"/entry.desktop", true, false, "locale");
+  TDEConfig cfg("l10n/"+code.lower()+"/entry.desktop", true, false, "locale");
   cfg.setGroup("KCM Locale");
   return cfg.readEntry("Name");
 }
 
-void KLocale::setCalendar(const TQString & calType)
+void TDELocale::setCalendar(const TQString & calType)
 {
   doFormatInit();
 
@@ -2408,14 +2408,14 @@ void KLocale::setCalendar(const TQString & calType)
   d->calendar = 0;
 }
 
-TQString KLocale::calendarType() const
+TQString TDELocale::calendarType() const
 {
   doFormatInit();
 
   return d->calendarType;
 }
 
-const KCalendarSystem * KLocale::calendar() const
+const KCalendarSystem * TDELocale::calendar() const
 {
   doFormatInit();
 
@@ -2426,14 +2426,14 @@ const KCalendarSystem * KLocale::calendar() const
   return d->calendar;
 }
 
-KLocale::KLocale(const KLocale & rhs)
+TDELocale::TDELocale(const TDELocale & rhs)
 {
-  d = new KLocalePrivate;
+  d = new TDELocalePrivate;
 
   *this = rhs;
 }
 
-KLocale & KLocale::operator=(const KLocale & rhs)
+TDELocale & TDELocale::operator=(const TDELocale & rhs)
 {
   // Numbers and money
   m_decimalSymbol = rhs.m_decimalSymbol;
@@ -2465,8 +2465,8 @@ KLocale & KLocale::operator=(const KLocale & rhs)
   return *this;
 }
 
-bool KLocale::setCharset(const TQString & ) { return true; }
-TQString KLocale::charset() const { return TQString::fromLatin1("UTF-8"); }
+bool TDELocale::setCharset(const TQString & ) { return true; }
+TQString TDELocale::charset() const { return TQString::fromLatin1("UTF-8"); }
 
 // KDE4: remove
 #if 0
diff --git a/tdecore/klocale.h b/tdecore/tdelocale.h
index ce9dad46b..94cf704f1 100644
--- a/tdecore/klocale.h
+++ b/tdecore/tdelocale.h
@@ -31,20 +31,20 @@ class TQDate;
 class TQTime;
 class TQDateTime;
 
-class KGlobal;
-class KConfig;
-class KConfigBase;
-class KLocalePrivate;
+class TDEGlobal;
+class TDEConfig;
+class TDEConfigBase;
+class TDELocalePrivate;
 class KCatalogue;
 class KCalendarSystem;
 
 /**
- * \file klocale.h
+ * \file tdelocale.h
  */
 
 #ifndef I18N_NOOP
 /**
- * \relates KLocale
+ * \relates TDELocale
  * I18N_NOOP marks a string to be translated without translating it.
  * Do not use this unless you know you need it.
  * http://developer.kde.org/documentation/other/developer-faq.html#q2.11.2
@@ -54,7 +54,7 @@ class KCalendarSystem;
 
 #ifndef I18N_NOOP2
 /**
- * \relates KLocale
+ * \relates TDELocale
  *  If the string is too ambiguous to be translated well to a non-english
  *  language, use this instead of I18N_NOOP to separate lookup string and english.
  * \warning You need to call i18n( comment, stringVar ) later on, not just i18n( stringVar ).
@@ -64,7 +64,7 @@ class KCalendarSystem;
 #endif
 
 /**
- * \relates KLocale
+ * \relates TDELocale
  *  i18n is the function that does everything you need to translate
  *  a string. You just wrap around every user visible string a i18n
  *  call to get a TQString with the string in the user's preferred
@@ -78,7 +78,7 @@ class KCalendarSystem;
 TDECORE_EXPORT TQString i18n(const char *text);
 
 /**
- * \relates KLocale
+ * \relates TDELocale
  *  If the string is too ambiguous to be translated well to a non-english
  *  language, use this form of i18n to separate lookup string and english
  *  text.
@@ -87,7 +87,7 @@ TDECORE_EXPORT TQString i18n(const char *text);
 TDECORE_EXPORT TQString i18n(const char *comment, const char *text);
 
 /**
- * \relates KLocale
+ * \relates TDELocale
  *  If you want to handle plural forms, use this form of i18n.
  *  @param singular the singular form of the word, for example "file".
   * @param plural the plural form of the word. Must contain a "%n" that will
@@ -100,7 +100,7 @@ TDECORE_EXPORT TQString i18n(const char *comment, const char *text);
 TDECORE_EXPORT TQString i18n(const char *singular, const char *plural, unsigned long n);
 
 /**
- * \relates KLocale
+ * \relates TDELocale
  * Qt3's uic generates i18n( "msg", "comment" ) calls which conflict
  * with our i18n method. We use uic -tr tr2i18n to redirect
  * to the right i18n() function
@@ -111,52 +111,52 @@ inline TQString tr2i18n(const char* message, const char* =0) {
 
 /**
   *
-  * KLocale provides support for country specific stuff like
+  * TDELocale provides support for country specific stuff like
   * the national language.
   *
-  * KLocale supports translating, as well as specifying the format
+  * TDELocale supports translating, as well as specifying the format
   * for numbers, currency, time, and date.
   *
   * @author Stephan Kulow <coolo@kde.org>, Preston Brown <pbrown@kde.org>,
   * Hans Petter Bieker <bieker@kde.org>, Lukas Tinkl <lukas.tinkl@suse.cz>
   * @short class for supporting locale settings and national language
   */
-class TDECORE_EXPORT KLocale
+class TDECORE_EXPORT TDELocale
 {
-  friend class KGlobal; // for initInstance()
+  friend class TDEGlobal; // for initInstance()
 public:
   /**
-   * Constructs a KLocale with the given catalog name.
+   * Constructs a TDELocale with the given catalog name.
    * The constructor looks for an entry Locale/Language in the
    * configuration file.
    * If no config file is specified, it will also look for languages
    * using the environment variables (TDE_LANG, LC_MESSAGES, LC_ALL, LANG),
-   * as well as the global configuration file. If KLocale is not able to use
+   * as well as the global configuration file. If TDELocale is not able to use
    * any of the specified languages, the default language (en_US) will be
    * used.
    *
    * If you specify a configuration file, it has to be valid until
-   * the KLocale object is destroyed.
+   * the TDELocale object is destroyed.
    *
    * @param catalog The name of the main language file
    * @param config The configuration file to use.
    */
-  KLocale( const TQString& catalog, KConfig *config = 0 );
+  TDELocale( const TQString& catalog, TDEConfig *config = 0 );
 
   /**
    * Copy constructor.
    */
-  KLocale( const KLocale & rhs );
+  TDELocale( const TDELocale & rhs );
 
   /**
    * Assignment operator.
    */
-  KLocale& operator= ( const KLocale & rhs );
+  TDELocale& operator= ( const TDELocale & rhs );
 
   /**
    * Destructor.
    */
-  ~KLocale();
+  ~TDELocale();
 
   /**
    * Translates the string into the corresponding string in
@@ -877,14 +877,14 @@ public:
    *
    * Please use setWeekStartDay instead.
    *
-   * Changes how KLocale defines the first day in week.
+   * Changes how TDELocale defines the first day in week.
    *
    * @param start True if Monday is the first day in the week
    */
   void setWeekStartsMonday(bool start) KDE_DEPRECATED; //### remove for KDE 4.0
 
   /**
-   * Changes how KLocale defines the first day in week.
+   * Changes how TDELocale defines the first day in week.
    *
    * @param day first day of the week (Monday=1..Sunday=7) as integer
    * @since 3.1
@@ -1105,10 +1105,10 @@ public:
 			  TQString & charset);
 
   /**
-   * Use this as main catalog for *all* KLocales, if not the appname
+   * Use this as main catalog for *all* TDELocales, if not the appname
    * will be used. This function is best to be the very first instruction
    * in your program's main function as it only has an effect before the
-   * first KLocale object is created.
+   * first TDELocale object is created.
    *
    * @param catalog Catalogue to override all other main catalogues.
    */
@@ -1138,9 +1138,9 @@ public:
 
 
   /**
-   * @internal Called from KConfigBackend to initialize language.
+   * @internal Called from TDEConfigBackend to initialize language.
    */
-  static TQString _initLanguage(KConfigBase *config);
+  static TQString _initLanguage(TDEConfigBase *config);
 
 #ifdef KDE_NO_COMPAT
 private:
@@ -1173,7 +1173,7 @@ private:
 
 protected:
   /**
-   * @internal Creates a KLocale object for KGlobal and inits the locale
+   * @internal Creates a TDELocale object for TDEGlobal and inits the locale
    * pointer.
    */
   static void initInstance();
@@ -1185,7 +1185,7 @@ private:
    *
    * @param config The configuration object used for init.
    */
-  void initFormat(KConfig *config);
+  void initFormat(TDEConfig *config);
   
   /**
    * @internal Initializes the catalogs appname, tdelibs and kio for all chosen languages.
@@ -1203,20 +1203,20 @@ private:
    * @param config The configuration object used for init
    * @param useEnv True if we should use environment variables
    */
-  void initLanguageList(KConfig * config, bool useEnv);
+  void initLanguageList(TDEConfig * config, bool useEnv);
 
   /**
    * @internal Figures out which encoding the user prefers.
    *
    * @param config The configuration object used for init
    */
-  void initEncoding(KConfig * config);
+  void initEncoding(TDEConfig * config);
 
   /**
    * @internal Figures out which encoding the user prefers for filenames
    * and sets up the appropriate TQFile encoding and decoding functions.
    */
-  void initFileNameEncoding(KConfig *config);
+  void initFileNameEncoding(TDEConfig *config);
 
   /**
    * @internal A TQFile filename encoding function (TQFile::encodeFn).
@@ -1344,7 +1344,7 @@ private:
   bool m_positivePrefixCurrencySymbol;
   bool m_negativePrefixCurrencySymbol;
 
-  KLocalePrivate *d;
+  TDELocalePrivate *d;
 };
 
 #endif
diff --git a/tdecore/kmultipledrag.cpp b/tdecore/tdemultipledrag.cpp
index 29d56bd85..db71c9e87 100644
--- a/tdecore/kmultipledrag.cpp
+++ b/tdecore/tdemultipledrag.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kmultipledrag.h"
+#include "tdemultipledrag.h"
 #include "kdebug.h"
 
 #ifndef QT_NO_DRAGANDDROP
@@ -77,6 +77,6 @@ const char* KMultipleDrag::format( int i ) const
 void KMultipleDrag::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kmultipledrag.moc"
+#include "tdemultipledrag.moc"
 
 #endif
diff --git a/tdecore/kmultipledrag.h b/tdecore/tdemultipledrag.h
index 42baf3530..42baf3530 100644
--- a/tdecore/kmultipledrag.h
+++ b/tdecore/tdemultipledrag.h
diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdenetworkconnections.cpp
index 80f34b765..2682aa991 100644
--- a/tdecore/tdenetworkconnections.cpp
+++ b/tdecore/tdenetworkconnections.cpp
@@ -23,7 +23,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // #define DEBUG_SIGNAL_QUEUE 1
 
@@ -717,7 +717,7 @@ TDENetworkConnection* TDENetworkConnectionManager::findConnectionByUUID(TQString
 }
 
 TDENetworkDevice* TDENetworkConnectionManager::findDeviceByUUID(TQString uuid) {
-	TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	if (!hwdevices) return NULL;
 
 	TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network);
@@ -1071,7 +1071,7 @@ TDENetworkDevice* TDEGlobalNetworkManager::findDeviceByUUID(TQString uuid) {
 }
 
 TDENetworkWiFiAPInfo* TDEGlobalNetworkManager::findAccessPointByBSSID(TDEMACAddress bssid) {
-	TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	if (!hwdevices) {
 		return NULL;
 	}
diff --git a/tdecore/kshortcut.cpp b/tdecore/tdeshortcut.cpp
index 10c6c31fa..bae897e98 100644
--- a/tdecore/kshortcut.cpp
+++ b/tdecore/tdeshortcut.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 #include "kkeynative.h"
 #include "kkeyserver.h"
 
@@ -25,15 +25,15 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 
 //----------------------------------------------------
 
 static KKey* g_pspec = 0;
 static KKeySequence* g_pseq = 0;
-static KShortcut* g_pcut = 0;
+static TDEShortcut* g_pcut = 0;
 
 //----------------------------------------------------
 // KKey
@@ -396,28 +396,28 @@ KKeySequence& KKeySequence::null()
 }
 
 //---------------------------------------------------------------------
-// KShortcut
+// TDEShortcut
 //---------------------------------------------------------------------
 
-KShortcut::KShortcut()                            { clear(); }
-KShortcut::KShortcut( int keyQt )                 { init( keyQt ); }
-KShortcut::KShortcut( const TQKeySequence& key )   { init( key ); }
-KShortcut::KShortcut( const KKey& key )           { init( key ); }
-KShortcut::KShortcut( const KKeySequence& seq )   { init( seq ); }
-KShortcut::KShortcut( const KShortcut& cut )      { init( cut ); }
-KShortcut::KShortcut( const char* ps )            { init( TQString(ps) ); }
-KShortcut::KShortcut( const TQString& s )          { init( s ); }
+TDEShortcut::TDEShortcut()                            { clear(); }
+TDEShortcut::TDEShortcut( int keyQt )                 { init( keyQt ); }
+TDEShortcut::TDEShortcut( const TQKeySequence& key )   { init( key ); }
+TDEShortcut::TDEShortcut( const KKey& key )           { init( key ); }
+TDEShortcut::TDEShortcut( const KKeySequence& seq )   { init( seq ); }
+TDEShortcut::TDEShortcut( const TDEShortcut& cut )      { init( cut ); }
+TDEShortcut::TDEShortcut( const char* ps )            { init( TQString(ps) ); }
+TDEShortcut::TDEShortcut( const TQString& s )          { init( s ); }
 
-KShortcut::~KShortcut()
+TDEShortcut::~TDEShortcut()
 {
 }
 
-void KShortcut::clear()
+void TDEShortcut::clear()
 {
 	m_nSeqs = 0;
 }
 
-bool KShortcut::init( int keyQt )
+bool TDEShortcut::init( int keyQt )
 {
 	if( keyQt ) {
 		m_nSeqs = 1;
@@ -427,28 +427,28 @@ bool KShortcut::init( int keyQt )
 	return true;
 }
 
-bool KShortcut::init( const TQKeySequence& key )
+bool TDEShortcut::init( const TQKeySequence& key )
 {
 	m_nSeqs = 1;
 	m_rgseq[0].init( key );
 	return true;
 }
 
-bool KShortcut::init( const KKey& spec )
+bool TDEShortcut::init( const KKey& spec )
 {
 	m_nSeqs = 1;
 	m_rgseq[0].init( spec );
 	return true;
 }
 
-bool KShortcut::init( const KKeySequence& seq )
+bool TDEShortcut::init( const KKeySequence& seq )
 {
 	m_nSeqs = 1;
 	m_rgseq[0] = seq;
 	return true;
 }
 
-bool KShortcut::init( const KShortcut& cut )
+bool TDEShortcut::init( const TDEShortcut& cut )
 {
 	m_nSeqs = cut.m_nSeqs;
 	for( uint i = 0; i < m_nSeqs; i++ )
@@ -456,7 +456,7 @@ bool KShortcut::init( const KShortcut& cut )
 	return true;
 }
 
-bool KShortcut::init( const TQString& s )
+bool TDEShortcut::init( const TQString& s )
 {
 	bool bRet = true;
 	TQStringList rgs = TQStringList::split( ';', s );
@@ -480,7 +480,7 @@ bool KShortcut::init( const TQString& s )
 	if( !s.isEmpty() ) {
 		TQString sDebug;
 		TQTextStream os( &sDebug, IO_WriteOnly );
-		os << "KShortcut::init( \"" << s << "\" ): ";
+		os << "TDEShortcut::init( \"" << s << "\" ): ";
 		for( uint i = 0; i < m_nSeqs; i++ ) {
 			os << " m_rgseq[" << i << "]: ";
 			KKeyServer::Variations vars;
@@ -494,29 +494,29 @@ bool KShortcut::init( const TQString& s )
 	return bRet;
 }
 
-uint KShortcut::count() const
+uint TDEShortcut::count() const
 {
 	return m_nSeqs;
 }
 
-const KKeySequence& KShortcut::seq( uint i ) const
+const KKeySequence& TDEShortcut::seq( uint i ) const
 {
 	return (i < m_nSeqs) ? m_rgseq[i] : KKeySequence::null();
 }
 
-int KShortcut::keyCodeQt() const
+int TDEShortcut::keyCodeQt() const
 {
 	if( m_nSeqs >= 1 )
 		return m_rgseq[0].keyCodeQt();
 	return TQKeySequence();
 }
 
-bool KShortcut::isNull() const
+bool TDEShortcut::isNull() const
 {
 	return m_nSeqs == 0;
 }
 
-int KShortcut::compare( const KShortcut& cut ) const
+int TDEShortcut::compare( const TDEShortcut& cut ) const
 {
 	for( uint i = 0; i < m_nSeqs && i < cut.m_nSeqs; i++ ) {
 		int ret = m_rgseq[i].compare( cut.m_rgseq[i] );
@@ -526,12 +526,12 @@ int KShortcut::compare( const KShortcut& cut ) const
 	return m_nSeqs - cut.m_nSeqs;
 }
 
-bool KShortcut::contains( const KKey& key ) const
+bool TDEShortcut::contains( const KKey& key ) const
 {
 	return contains( KKeySequence(key) );
 }
 
-bool KShortcut::contains( const KKeyNative& keyNative ) const
+bool TDEShortcut::contains( const KKeyNative& keyNative ) const
 {
 	KKey key = keyNative.key();
 	key.simplify();
@@ -545,7 +545,7 @@ bool KShortcut::contains( const KKeyNative& keyNative ) const
 	return false;
 }
 
-bool KShortcut::contains( const KKeySequence& seq ) const
+bool TDEShortcut::contains( const KKeySequence& seq ) const
 {
 	for( uint i = 0; i < count(); i++ ) {
 		if( !m_rgseq[i].isNull() && m_rgseq[i] == seq )
@@ -554,7 +554,7 @@ bool KShortcut::contains( const KKeySequence& seq ) const
 	return false;
 }
 
-bool KShortcut::setSeq( uint iSeq, const KKeySequence& seq )
+bool TDEShortcut::setSeq( uint iSeq, const KKeySequence& seq )
 {
 	// TODO: check if seq is null, and act accordingly.
 	if( iSeq <= m_nSeqs && iSeq < MAX_SEQUENCES ) {
@@ -566,7 +566,7 @@ bool KShortcut::setSeq( uint iSeq, const KKeySequence& seq )
 		return false;
 }
 
-void KShortcut::remove( const KKeySequence& seq )
+void TDEShortcut::remove( const KKeySequence& seq )
 {
 	if (seq.isNull()) return;
 	
@@ -581,7 +581,7 @@ void KShortcut::remove( const KKeySequence& seq )
 	}
 }
 
-bool KShortcut::append( const KKeySequence& seq )
+bool TDEShortcut::append( const KKeySequence& seq )
 {
 	if( m_nSeqs < MAX_SEQUENCES ) {
 		if( !seq.isNull() ) {
@@ -593,7 +593,7 @@ bool KShortcut::append( const KKeySequence& seq )
 		return false;
 }
 
-bool KShortcut::append( const KKey& spec )
+bool TDEShortcut::append( const KKey& spec )
 {
 	if( m_nSeqs < MAX_SEQUENCES ) {
 		m_rgseq[m_nSeqs].init( spec );
@@ -603,7 +603,7 @@ bool KShortcut::append( const KKey& spec )
 		return false;
 }
 
-bool KShortcut::append( const KShortcut& cut )
+bool TDEShortcut::append( const TDEShortcut& cut )
 {
 	uint seqs = m_nSeqs, co = cut.count();
 	for( uint i=0; i<co; i++ ) {
@@ -621,7 +621,7 @@ bool KShortcut::append( const KShortcut& cut )
 	return true;
 }
 
-KShortcut::operator TQKeySequence () const
+TDEShortcut::operator TQKeySequence () const
 {
 	if( count() >= 1 )
 		return m_rgseq[0].qt();
@@ -629,7 +629,7 @@ KShortcut::operator TQKeySequence () const
 		return TQKeySequence();
 }
 
-TQString KShortcut::toString() const
+TQString TDEShortcut::toString() const
 {
 	TQString s;
 
@@ -642,7 +642,7 @@ TQString KShortcut::toString() const
 	return s;
 }
 
-TQString KShortcut::toStringInternal( const KShortcut* pcutDefault ) const
+TQString TDEShortcut::toStringInternal( const TDEShortcut* pcutDefault ) const
 {
 	TQString s;
 
@@ -661,10 +661,10 @@ TQString KShortcut::toStringInternal( const KShortcut* pcutDefault ) const
 	return s;
 }
 
-KShortcut& KShortcut::null()
+TDEShortcut& TDEShortcut::null()
 {
 	if( !g_pcut )
-		g_pcut = new KShortcut;
+		g_pcut = new TDEShortcut;
 	if( !g_pcut->isNull() )
 		g_pcut->clear();
 	return *g_pcut;
diff --git a/tdecore/kshortcut.h b/tdecore/tdeshortcut.h
index 9baf31b0d..e98a007b5 100644
--- a/tdecore/kshortcut.h
+++ b/tdecore/tdeshortcut.h
@@ -34,7 +34,7 @@ class KKeyNative;
 * by the underlying system (e.g. X11).
 * @see KKeyNative
 * @see KKeySequence
-* @see KShortcut
+* @see TDEShortcut
 */
 
 class TDECORE_EXPORT KKey
@@ -282,7 +282,7 @@ class TDECORE_EXPORT KKey
 * A KKeySequence object holds a sequence of up to 4 keys.
 * Ex: Ctrl+X,I
 * @see KKey
-* @see KShortcut
+* @see TDEShortcut
 */
 
 class TDECORE_EXPORT KKeySequence
@@ -518,18 +518,18 @@ class TDECORE_EXPORT KKeySequence
 };
 
 /**
-* The KShortcut class is used to represent a keyboard shortcut to an action.
+* The TDEShortcut class is used to represent a keyboard shortcut to an action.
 * A shortcut is normally a single key with modifiers, such as Ctrl+V.
-* A KShortcut object may also contain an alternate key which will also
+* A TDEShortcut object may also contain an alternate key which will also
 * activate the action it's associated to, as long as no other actions have
 * defined that key as their primary key.  Ex: Ctrl+V;Shift+Insert.
 *
-* This can be used to add additional accelerators to a KAction.  For example,
+* This can be used to add additional accelerators to a TDEAction.  For example,
 * the below code binds the escape key to the close action.
 *
 * \code
-*  KAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
-*  KShortcut closeShortcut = closeAction->shortcut();
+*  TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
+*  TDEShortcut closeShortcut = closeAction->shortcut();
 *  closeShortcut.append( KKey(Key_Escape));
 *  closeAction->setShortcut(closeShortcut);
 * \endcode
@@ -540,12 +540,12 @@ class TDECORE_EXPORT KKeySequence
 * 
 */
 
-class TDECORE_EXPORT KShortcut
+class TDECORE_EXPORT TDEShortcut
 {
  public:
         /**
 	 * The maximum number of key sequences that can be contained in
-	 * a KShortcut.
+	 * a TDEShortcut.
          */
 	enum { MAX_SEQUENCES = 2 };
 
@@ -555,7 +555,7 @@ class TDECORE_EXPORT KShortcut
 	 * @see isNull()
 	 * @see clear()
 	 */
-	KShortcut();
+	TDEShortcut();
 
 	/**
 	 * Creates a new shortcut with the given Qt key code
@@ -563,34 +563,34 @@ class TDECORE_EXPORT KShortcut
 	 * @param keyQt the qt keycode
 	 * @see Qt::Key
 	 */
-	KShortcut( int keyQt );
+	TDEShortcut( int keyQt );
 
 	/**
 	 * Creates a new shortcut that contains only the given qt key
 	 * sequence.
 	 * @param keySeq the qt key sequence to add
 	 */
-	KShortcut( const TQKeySequence& keySeq );
+	TDEShortcut( const TQKeySequence& keySeq );
 
 	/**
 	 * Creates a new shortcut that contains only the given key
 	 * in its only sequence.
 	 * @param key the key to add
 	 */
-	KShortcut( const KKey& key );
+	TDEShortcut( const KKey& key );
 
 	/**
 	 * Creates a new shortcut that contains only the given key
 	 * sequence.
 	 * @param keySeq the key sequence to add
 	 */
-	KShortcut( const KKeySequence& keySeq );
+	TDEShortcut( const KKeySequence& keySeq );
 
 	/**
 	 * Copies the given shortcut.
 	 * @param shortcut the shortcut to add
 	 */
-	KShortcut( const KShortcut& shortcut );
+	TDEShortcut( const TDEShortcut& shortcut );
 
 	/**
 	 * Creates a new key sequence that contains the given key sequence.
@@ -599,7 +599,7 @@ class TDECORE_EXPORT KShortcut
 	 * @param shortcut the description of the key
 	 * @see KKeySequence::KKeySequence(const TQString&)
 	 */
-	KShortcut( const char* shortcut );
+	TDEShortcut( const char* shortcut );
 
 	/**
 	 * Creates a new key sequence that contains the given key sequence.
@@ -608,8 +608,8 @@ class TDECORE_EXPORT KShortcut
 	 * @param shortcut the description of the key
 	 * @see KKeySequence::KKeySequence(const TQString&)
 	 */
-	KShortcut( const TQString& shortcut );
-	~KShortcut();
+	TDEShortcut( const TQString& shortcut );
+	~TDEShortcut();
 
 	/**
 	 * Clears the shortcut. The shortcut is null after calling this
@@ -648,7 +648,7 @@ class TDECORE_EXPORT KShortcut
 	 * Copies the given shortcut.
 	 * @param shortcut the shortcut to add
 	 */
-	bool init( const KShortcut& shortcut );
+	bool init( const TDEShortcut& shortcut );
 
 	/**
 	 * Initializes the key sequence with the given key sequence.
@@ -662,7 +662,7 @@ class TDECORE_EXPORT KShortcut
 	/**
 	 * Copies the given shortcut over this shortcut.
 	 */
-	KShortcut& operator =( const KShortcut& cut )
+	TDEShortcut& operator =( const TDEShortcut& cut )
 		{ init( cut ); return *this; }
 
 	/**
@@ -708,32 +708,32 @@ class TDECORE_EXPORT KShortcut
 	 * beginning until an unequal key sequences has been found. If a shortcut
 	 * contains more key sequences, it is considered larger.
 	 * @param shortcut the shortcut to compare to
-	 * @return a negative number if the given KShortcut is larger, 0 if
-	 * they are equal and a positive number this KShortcut is larger
+	 * @return a negative number if the given TDEShortcut is larger, 0 if
+	 * they are equal and a positive number this TDEShortcut is larger
 	 * @see KKey::compare()
 	 * @see KKeyShortcut::compare()
 	 */
-	int compare( const KShortcut& shortcut ) const;
+	int compare( const TDEShortcut& shortcut ) const;
 
 	/**
 	 * Compares the sequences of both shortcuts.
 	 * @see compare()
 	 */
-	bool operator == ( const KShortcut& cut ) const
+	bool operator == ( const TDEShortcut& cut ) const
 		{ return compare( cut ) == 0; }
 
 	/**
 	 * Compares the sequences of both shortcuts.
 	 * @see compare()
 	 */
-	bool operator != ( const KShortcut& cut ) const
+	bool operator != ( const TDEShortcut& cut ) const
 		{ return compare( cut ) != 0; }
 
 	/**
 	 * Compares the sequences of both shortcuts.
 	 * @see compare()
 	 */
-	bool operator < ( const KShortcut& cut ) const
+	bool operator < ( const TDEShortcut& cut ) const
 		{ return compare( cut ) < 0; }
 
 	/**
@@ -804,7 +804,7 @@ class TDECORE_EXPORT KShortcut
 	 * @see MAX_SEQUENCES
 	 * @since 3.2
 	*/
-	bool append( const KShortcut& cut );
+	bool append( const TDEShortcut& cut );
 
 	/**
 	 * Converts this shortcut to a key sequence. The first key sequence
@@ -824,7 +824,7 @@ class TDECORE_EXPORT KShortcut
 	/**
 	 * @internal
 	 */
-	TQString toStringInternal( const KShortcut* pcutDefault = 0 ) const;
+	TQString toStringInternal( const TDEShortcut* pcutDefault = 0 ) const;
 
 	/**
 	 * Returns a null shortcut.
@@ -832,14 +832,14 @@ class TDECORE_EXPORT KShortcut
 	 * @see isNull()
 	 * @see clear()
 	 */
-	static KShortcut& null();
+	static TDEShortcut& null();
 
  protected:
 	uint m_nSeqs;
 	KKeySequence m_rgseq[MAX_SEQUENCES];
 
  private:
-	class KShortcutPrivate* d;
+	class TDEShortcutPrivate* d;
 	friend class KKeyNative;
 
 #ifndef KDE_NO_COMPAT
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp
index 865bdc257..ffacd001c 100644
--- a/tdecore/kshortcutlist.cpp
+++ b/tdecore/tdeshortcutlist.cpp
@@ -1,34 +1,34 @@
 #include <tqstring.h>
 #include <tqvariant.h>
 
-#include <kaccel.h>
-#include "kaccelaction.h"
-#include <kconfig.h>
+#include <tdeaccel.h>
+#include "tdeaccelaction.h"
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kglobalaccel.h>
 #include <kinstance.h>
-#include <kshortcut.h>
-#include "kshortcutlist.h"
+#include <tdeshortcut.h>
+#include "tdeshortcutlist.h"
 
 //---------------------------------------------------------------------
-// KShortcutList
+// TDEShortcutList
 //---------------------------------------------------------------------
 
-KShortcutList::KShortcutList()
+TDEShortcutList::TDEShortcutList()
 {
 }
 
-KShortcutList::~KShortcutList()
+TDEShortcutList::~TDEShortcutList()
 {
 }
 
-bool KShortcutList::isGlobal( uint ) const
+bool TDEShortcutList::isGlobal( uint ) const
 {
 	return false;
 }
 
-int KShortcutList::index( const TQString& sName ) const
+int TDEShortcutList::index( const TQString& sName ) const
 {
 	uint nSize = count();
         for( uint i = 0;
@@ -39,7 +39,7 @@ int KShortcutList::index( const TQString& sName ) const
 	return -1;
 }
 
-int KShortcutList::index( const KKeySequence& seq ) const
+int TDEShortcutList::index( const KKeySequence& seq ) const
 {
 	if( seq.isNull() )
 		return -1;
@@ -53,26 +53,26 @@ int KShortcutList::index( const KKeySequence& seq ) const
 	return -1;
 }
 
-const KInstance* KShortcutList::instance() const
+const TDEInstance* TDEShortcutList::instance() const
 {
 	return 0;
 }
 
-TQVariant KShortcutList::getOther( Other, uint ) const
+TQVariant TDEShortcutList::getOther( Other, uint ) const
 {
 	return TQVariant();
 }
 
-bool KShortcutList::setOther( Other, uint, TQVariant )
+bool TDEShortcutList::setOther( Other, uint, TQVariant )
 {
 	return false;
 }
 
-bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pConfig )
+bool TDEShortcutList::readSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig )
 {
-	kdDebug(125) << "KShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl;
+	kdDebug(125) << "TDEShortcutList::readSettings( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl;
 	if( !pConfig )
-		pConfig = KGlobal::config();
+		pConfig = TDEGlobal::config();
 	TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts");
 
 	// If the config file still has the old group name:
@@ -84,7 +84,7 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo
 	kdDebug(125) << "\treadSettings( \"" << sGroup << "\", " << pConfig << " )" << endl;
 	if( !pConfig->hasGroup( sGroup ) )
 		return true;
-	KConfigGroupSaver cgs( pConfig, sGroup );
+	TDEConfigGroupSaver cgs( pConfig, sGroup );
 
 	uint nSize = count();
 	for( uint i = 0; i < nSize; i++ ) {
@@ -92,9 +92,9 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo
 			TQString sEntry = pConfig->readEntry( name(i) );
 			if( !sEntry.isEmpty() ) {
 				if( sEntry == "none" )
-					setShortcut( i, KShortcut() );
+					setShortcut( i, TDEShortcut() );
 				else
-					setShortcut( i, KShortcut(sEntry) );
+					setShortcut( i, TDEShortcut(sEntry) );
 			}
 			else // default shortcut
 				setShortcut( i, shortcutDefault(i) );
@@ -102,15 +102,15 @@ bool KShortcutList::readSettings( const TQString& sConfigGroup, KConfigBase* pCo
 		}
 	}
 
-	kdDebug(125) << "KShortcutList::readSettings done" << endl;
+	kdDebug(125) << "TDEShortcutList::readSettings done" << endl;
 	return true;
 }
 
-bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const
+bool TDEShortcutList::writeSettings( const TQString &sConfigGroup, TDEConfigBase* pConfig, bool bWriteAll, bool bGlobal ) const
 {
-	kdDebug(125) << "KShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
+	kdDebug(125) << "TDEShortcutList::writeSettings( " << sConfigGroup << ", " << pConfig << ", " << bWriteAll << ", " << bGlobal << " )" << endl;
 	if( !pConfig )
-		pConfig = KGlobal::config();
+		pConfig = TDEGlobal::config();
 
 	TQString sGroup = (!sConfigGroup.isEmpty()) ? sConfigGroup : TQString("Shortcuts");
 
@@ -118,7 +118,7 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pC
 	if( pConfig->hasGroup( "Keys" ) )
 		pConfig->deleteGroup( "Keys", true );
 
-	KConfigGroupSaver cs( pConfig, sGroup );
+	TDEConfigGroupSaver cs( pConfig, sGroup );
 
 	uint nSize = count();
 	for( uint i = 0; i < nSize; i++ ) {
@@ -149,72 +149,72 @@ bool KShortcutList::writeSettings( const TQString &sConfigGroup, KConfigBase* pC
 }
 
 //---------------------------------------------------------------------
-// KAccelShortcutList
+// TDEAccelShortcutList
 //---------------------------------------------------------------------
 
-class KAccelShortcutListPrivate
+class TDEAccelShortcutListPrivate
 {
 	public:
 		TQString m_configGroup;
 };
 
-KAccelShortcutList::KAccelShortcutList( KAccel* pAccel )
+TDEAccelShortcutList::TDEAccelShortcutList( TDEAccel* pAccel )
 : m_actions( pAccel->actions() )
 {
-	d=new KAccelShortcutListPrivate;
+	d=new TDEAccelShortcutListPrivate;
 	m_bGlobal = false;
 	d->m_configGroup=pAccel->configGroup();
 }
 
-KAccelShortcutList::KAccelShortcutList( KGlobalAccel* pAccel )
+TDEAccelShortcutList::TDEAccelShortcutList( TDEGlobalAccel* pAccel )
 : m_actions( pAccel->actions() )
 {
-	d=new KAccelShortcutListPrivate;
+	d=new TDEAccelShortcutListPrivate;
 	m_bGlobal = true;
 	d->m_configGroup=pAccel->configGroup();
 }
 
-KAccelShortcutList::KAccelShortcutList( KAccelActions& actions, bool bGlobal )
+TDEAccelShortcutList::TDEAccelShortcutList( TDEAccelActions& actions, bool bGlobal )
 : m_actions( actions )
 {
-	d=new KAccelShortcutListPrivate;
+	d=new TDEAccelShortcutListPrivate;
 	m_bGlobal = bGlobal;
 }
 
 
-KAccelShortcutList::~KAccelShortcutList()
+TDEAccelShortcutList::~TDEAccelShortcutList()
 	{  delete d;}
-uint KAccelShortcutList::count() const
+uint TDEAccelShortcutList::count() const
 	{ return m_actions.count(); }
-TQString KAccelShortcutList::name( uint i ) const
+TQString TDEAccelShortcutList::name( uint i ) const
 	{ return m_actions.actionPtr(i)->name(); }
-TQString KAccelShortcutList::label( uint i ) const
+TQString TDEAccelShortcutList::label( uint i ) const
 	{ return m_actions.actionPtr(i)->label(); }
-TQString KAccelShortcutList::whatsThis( uint i ) const
+TQString TDEAccelShortcutList::whatsThis( uint i ) const
 	{ return m_actions.actionPtr(i)->whatsThis(); }
-const KShortcut& KAccelShortcutList::shortcut( uint i ) const
+const TDEShortcut& TDEAccelShortcutList::shortcut( uint i ) const
 	{ return m_actions.actionPtr(i)->shortcut(); }
-const KShortcut& KAccelShortcutList::shortcutDefault( uint i ) const
+const TDEShortcut& TDEAccelShortcutList::shortcutDefault( uint i ) const
 	{ return m_actions.actionPtr(i)->shortcutDefault(); }
-bool KAccelShortcutList::isConfigurable( uint i ) const
+bool TDEAccelShortcutList::isConfigurable( uint i ) const
 	{ return m_actions.actionPtr(i)->isConfigurable(); }
-bool KAccelShortcutList::setShortcut( uint i, const KShortcut& cut )
+bool TDEAccelShortcutList::setShortcut( uint i, const TDEShortcut& cut )
 	{ return m_actions.actionPtr(i)->setShortcut( cut ); }
-TQVariant KAccelShortcutList::getOther( Other, uint ) const
+TQVariant TDEAccelShortcutList::getOther( Other, uint ) const
 	{ return TQVariant(); }
-bool KAccelShortcutList::isGlobal( uint ) const
+bool TDEAccelShortcutList::isGlobal( uint ) const
 	{ return m_bGlobal; }
-bool KAccelShortcutList::setOther( Other, uint, TQVariant )
+bool TDEAccelShortcutList::setOther( Other, uint, TQVariant )
 	{ return false; }
-bool KAccelShortcutList::save() const
+bool TDEAccelShortcutList::save() const
 	{ return writeSettings( d->m_configGroup ); }
 
-void KShortcutList::virtual_hook( int, void* )
+void TDEShortcutList::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KAccelShortcutList::virtual_hook( int id, void* data )
-{ KShortcutList::virtual_hook( id, data ); }
+void TDEAccelShortcutList::virtual_hook( int id, void* data )
+{ TDEShortcutList::virtual_hook( id, data ); }
 
-void KStdAccel::ShortcutList::virtual_hook( int id, void* data )
-{ KShortcutList::virtual_hook( id, data ); }
+void TDEStdAccel::ShortcutList::virtual_hook( int id, void* data )
+{ TDEShortcutList::virtual_hook( id, data ); }
 
diff --git a/tdecore/kshortcutlist.h b/tdecore/tdeshortcutlist.h
index 7a1890c1c..99e83766b 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/tdeshortcutlist.h
@@ -25,34 +25,34 @@
 #include "tdelibs_export.h"
 
 class TQVariant;
-class KConfigBase;
-class KInstance;
+class TDEConfigBase;
+class TDEInstance;
 class KKeySequence;
-class KShortcut;
+class TDEShortcut;
 
 /**********************************************************************
 * This is a wrapper class which allows a function to use one interface
-* to KActionCollection, KAccelActions, and KActionPtrList.
+* to TDEActionCollection, TDEAccelActions, and TDEActionPtrList.
 **********************************************************************/
 
 /**
- * KShortcutList is an abstract base class for
- * KAccelShortcutList and KStdAccel::ShortcutList. It gives
+ * TDEShortcutList is an abstract base class for
+ * TDEAccelShortcutList and TDEStdAccel::ShortcutList. It gives
  * you an unified interface for accessing the accelerator lists
- * of KAccel (using KAccelShortcutList),
- * KGlobalAccel (using KAccelShortcutList), and
- * KStdAccel (using KStdAccel::ShortcutList).
+ * of TDEAccel (using TDEAccelShortcutList),
+ * TDEGlobalAccel (using TDEAccelShortcutList), and
+ * TDEStdAccel (using TDEStdAccel::ShortcutList).
  *
  * @short Base class for accessing accelerator lists
  */
-class TDECORE_EXPORT KShortcutList
+class TDECORE_EXPORT TDEShortcutList
 {
  public:
         /**
 	 * Default constructor.
 	 */
-	KShortcutList();
-	virtual ~KShortcutList();
+	TDEShortcutList();
+	virtual ~TDEShortcutList();
 
 	/**
 	 * Returns the number of entries.
@@ -90,7 +90,7 @@ class TDECORE_EXPORT KShortcutList
 	 * @return the shortcut
 	 * @see shortcutDefault()
 	 */
-	virtual const KShortcut& shortcut( uint index ) const = 0;
+	virtual const TDEShortcut& shortcut( uint index ) const = 0;
 
 	/**
 	 * Returns default shortcut with the given @p index.
@@ -98,7 +98,7 @@ class TDECORE_EXPORT KShortcutList
 	 * @return the default shortcut
 	 * @see shortcut()
 	 */
-	virtual const KShortcut& shortcutDefault( uint index ) const = 0;
+	virtual const TDEShortcut& shortcutDefault( uint index ) const = 0;
 
 	/**
 	 * Checks whether the shortcut with the given @p index is configurable.
@@ -112,7 +112,7 @@ class TDECORE_EXPORT KShortcutList
 	 * @param index the index of the shortcut (must be < count())
 	 * @param shortcut the shortcut
 	 */
-	virtual bool setShortcut( uint index, const KShortcut &shortcut ) = 0;
+	virtual bool setShortcut( uint index, const TDEShortcut &shortcut ) = 0;
 
 	/**
 	 * Checks whether the shortcut with the given @p index is saved in the
@@ -137,10 +137,10 @@ class TDECORE_EXPORT KShortcutList
 	virtual int index( const KKeySequence& keySeq ) const;
 
 	/**
-	 * The KInstance.
-	 * @return the KInstance of the list, can be 0 if not available
+	 * The TDEInstance.
+	 * @return the TDEInstance of the list, can be 0 if not available
 	 */
-	virtual const KInstance* instance() const;
+	virtual const TDEInstance* instance() const;
 
 	// These are here in order to handle expansion.
 	enum Other { };
@@ -162,7 +162,7 @@ class TDECORE_EXPORT KShortcutList
 	 * @param pConfig the configuration file to load from
 	 * @return true if successful, false otherwise
 	 */
-	virtual bool readSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 );
+	virtual bool readSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 );
 
 	/**
 	 * Writes the shortcuts to the given configuration file.
@@ -173,63 +173,63 @@ class TDECORE_EXPORT KShortcutList
 	 * @param bGlobal true to write to the global configuration file
 	 * @return true if successful, false otherwise
 	 */
-	virtual bool writeSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0,
+	virtual bool writeSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0,
 			bool bWriteAll = false, bool bGlobal = false ) const;
 
  protected:
 	/// used to extend the interface with virtuals without breaking binary compatibility
         virtual void virtual_hook( int id, void* data );
  private:
-	class KShortcutListPrivate* d;
+	class TDEShortcutListPrivate* d;
 };
 
 //---------------------------------------------------------------------
-// KAccelShortcutList
+// TDEAccelShortcutList
 //---------------------------------------------------------------------
 
-class KAccel;
-class KAccelActions;
-class KGlobalAccel;
+class TDEAccel;
+class TDEAccelActions;
+class TDEGlobalAccel;
 
 /**
- * KShortcutList implementation to access KAccel and
- * KGlobalAccel lists.
+ * TDEShortcutList implementation to access TDEAccel and
+ * TDEGlobalAccel lists.
  */
-class TDECORE_EXPORT KAccelShortcutList : public KShortcutList
+class TDECORE_EXPORT TDEAccelShortcutList : public TDEShortcutList
 {
  public:
         /**
-	 * Creates a new KShortcutList that accesses the given KAccel.
+	 * Creates a new TDEShortcutList that accesses the given TDEAccel.
 	 * @param accel the accelerators to access
 	 */
-	KAccelShortcutList( KAccel* accel );
+	TDEAccelShortcutList( TDEAccel* accel );
 
         /**
-	 * Creates a new KShortcutList that accesses the given
-	 * KGlobalAccel.
+	 * Creates a new TDEShortcutList that accesses the given
+	 * TDEGlobalAccel.
 	 * @param accel the accelerators to access
 	 */
-	KAccelShortcutList( KGlobalAccel* accel );
+	TDEAccelShortcutList( TDEGlobalAccel* accel );
 
         /**
 	 * @internal
-	 * Creates a new KShortcutList that accesses the given
-	 * KAccelActions collection.
+	 * Creates a new TDEShortcutList that accesses the given
+	 * TDEAccelActions collection.
 	 * @param actions the actions to access
 	 * @param bGlobal true to save the actions in the global
 	 *        configuration file
 	 */
-	KAccelShortcutList( KAccelActions &actions, bool bGlobal );
-	virtual ~KAccelShortcutList();
+	TDEAccelShortcutList( TDEAccelActions &actions, bool bGlobal );
+	virtual ~TDEAccelShortcutList();
 
 	virtual uint count() const;
 	virtual TQString name( uint index ) const;
 	virtual TQString label( uint index ) const;
 	virtual TQString whatsThis( uint index ) const;
-	virtual const KShortcut& shortcut( uint index ) const;
-	virtual const KShortcut& shortcutDefault( uint index ) const;
+	virtual const TDEShortcut& shortcut( uint index ) const;
+	virtual const TDEShortcut& shortcutDefault( uint index ) const;
 	virtual bool isConfigurable( uint index ) const;
-	virtual bool setShortcut( uint index , const KShortcut& shortcut );
+	virtual bool setShortcut( uint index , const TDEShortcut& shortcut );
 	virtual bool isGlobal( uint index ) const;
 
 	/** \internal */
@@ -241,26 +241,26 @@ class TDECORE_EXPORT KAccelShortcutList : public KShortcutList
 
  protected:
 	/** Actions (collection) for this shortcut list. Set by constructor. */
-	KAccelActions& m_actions;
+	TDEAccelActions& m_actions;
 	/** Is this shortcut list global? Access through isGlobal() */
 	bool m_bGlobal;
 
  protected:
 	virtual void virtual_hook( int id, void* data );
  private:
-	class KAccelShortcutListPrivate* d;
+	class TDEAccelShortcutListPrivate* d;
 };
 
-namespace KStdAccel {
+namespace TDEStdAccel {
 //---------------------------------------------------------------------
 // ShortcutList
 //---------------------------------------------------------------------
 
 /**
- * KShortcutList implementation that accesses KStdAccel
+ * TDEShortcutList implementation that accesses TDEStdAccel
  * actions.
  */
-class TDECORE_EXPORT ShortcutList : public KShortcutList
+class TDECORE_EXPORT ShortcutList : public TDEShortcutList
 {
  public:
         /**
@@ -273,10 +273,10 @@ class TDECORE_EXPORT ShortcutList : public KShortcutList
 	virtual TQString name( uint index ) const;
 	virtual TQString label( uint index ) const;
 	virtual TQString whatsThis( uint index ) const;
-	virtual const KShortcut& shortcut( uint index ) const;
-	virtual const KShortcut& shortcutDefault( uint index ) const;
+	virtual const TDEShortcut& shortcut( uint index ) const;
+	virtual const TDEShortcut& shortcutDefault( uint index ) const;
 	virtual bool isConfigurable( uint index ) const;
-	virtual bool setShortcut( uint index , const KShortcut& shortcut );
+	virtual bool setShortcut( uint index , const TDEShortcut& shortcut );
 
 	/** \internal */
 	virtual TQVariant getOther( Other, uint index ) const;
diff --git a/tdecore/kshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp
index 3df389f07..c035c0df9 100644
--- a/tdecore/kshortcutmenu.cpp
+++ b/tdecore/tdeshortcutmenu.cpp
@@ -21,20 +21,20 @@
 #include <tqlabel.h>
 #include <tqpopupmenu.h>
 
-#include "kaccelaction.h"
+#include "tdeaccelaction.h"
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include "kshortcutmenu.h"
+#include <tdeglobalsettings.h>
+#include "tdeshortcutmenu.h"
 //#include <kkeynative.h>
 
-KShortcutMenu::KShortcutMenu( TQWidget* pParent, KAccelActions* pActions, KKeySequence seq )
+TDEShortcutMenu::TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq )
 :	TQPopupMenu( pParent ),
 	m_pActions( pActions ),
 	m_seq( seq )
 {
 	kdDebug() << seq.toStringInternal() << endl;
 	
-	TQFont fontTitle = KGlobalSettings::menuFont();
+	TQFont fontTitle = TDEGlobalSettings::menuFont();
 	fontTitle.setBold( true );
 	
 	pTitle = new TQLabel( "", (TQWidget*)0 );
@@ -44,9 +44,9 @@ KShortcutMenu::KShortcutMenu( TQWidget* pParent, KAccelActions* pActions, KKeySe
 	insertItem( pTitle );
 }
 
-bool KShortcutMenu::insertAction( uint iAction, KKeySequence seq )
+bool TDEShortcutMenu::insertAction( uint iAction, KKeySequence seq )
 {
-	KAccelAction* pAction = m_pActions->actionPtr( iAction );
+	TDEAccelAction* pAction = m_pActions->actionPtr( iAction );
 	
 	if( pAction ) {
 		insertItem( "", iAction );
@@ -57,14 +57,14 @@ bool KShortcutMenu::insertAction( uint iAction, KKeySequence seq )
 }
 
 
-void KShortcutMenu::updateShortcuts()
+void TDEShortcutMenu::updateShortcuts()
 {
 	pTitle->setText( m_seq.toString() + ",..." );
 	
 	for( uint iItem = 1; iItem < count(); iItem++ ) {
 		int iAction = idAt( iItem );
 		if( iAction >= 0 ) {
-			KAccelAction* pAction = m_pActions->actionPtr( iAction );
+			TDEAccelAction* pAction = m_pActions->actionPtr( iAction );
 			if( pAction ) {
 				KKeySequence seq = m_seqs[iItem];
 				TQString sSeq = seq.key(m_seq.count()).toString();
@@ -78,7 +78,7 @@ void KShortcutMenu::updateShortcuts()
 	}
 }
 
-void KShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
+void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
 {
 	kdDebug() << "keypress; " << pEvent->key() << endl;
 	KKey key( pEvent );
@@ -117,7 +117,7 @@ void KShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
 	}
 }
 
-int KShortcutMenu::searchForKey( KKey key )
+int TDEShortcutMenu::searchForKey( KKey key )
 {
 	int iItemFound = -1; // -1 indicates no match
 	uint iKey = m_seq.count();
@@ -138,7 +138,7 @@ int KShortcutMenu::searchForKey( KKey key )
 	return iItemFound;
 }
 
-void KShortcutMenu::keepItemsMatching( KKey key )
+void TDEShortcutMenu::keepItemsMatching( KKey key )
 {
 	kdDebug(125) << "MyAccel::keepItemsMatching( " << key.toStringInternal() << " )" << endl;
 	
@@ -158,4 +158,4 @@ void KShortcutMenu::keepItemsMatching( KKey key )
 	updateShortcuts();
 }
 
-#include "kshortcutmenu.moc"
+#include "tdeshortcutmenu.moc"
diff --git a/tdecore/kshortcutmenu.h b/tdecore/tdeshortcutmenu.h
index 2c682342d..a62757316 100644
--- a/tdecore/kshortcutmenu.h
+++ b/tdecore/tdeshortcutmenu.h
@@ -23,20 +23,20 @@
 #include <tqmap.h>
 #include <tqpopupmenu.h>
 
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 class TQLabel;
 
-class KAccelActions;
+class TDEAccelActions;
 
 /**
  * @internal
  */
-class TDECORE_EXPORT KShortcutMenu : public TQPopupMenu
+class TDECORE_EXPORT TDEShortcutMenu : public TQPopupMenu
 {
 	Q_OBJECT
  public:
-	KShortcutMenu( TQWidget* pParent, KAccelActions* pActions, KKeySequence seq );
+	TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq );
 
 	bool insertAction( uint iAction, KKeySequence seq );
 
@@ -52,7 +52,7 @@ class TDECORE_EXPORT KShortcutMenu : public TQPopupMenu
  private:
 	typedef TQMap<uint, KKeySequence> IndexToKKeySequence;
 	
-	KAccelActions* m_pActions;
+	TDEAccelActions* m_pActions;
 	KKeySequence m_seq;
 	TQLabel* pTitle;
 	IndexToKKeySequence m_seqs;
diff --git a/tdecore/kstartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 1cb8ce345..3d798cdc1 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -27,7 +27,7 @@ DEALINGS IN THE SOFTWARE.
 // kdDebug() can't be turned off in tdeinit
 #if 0
 #define KSTARTUPINFO_ALL_DEBUG
-#warning Extra KStartupInfo debug messages enabled.
+#warning Extra TDEStartupInfo debug messages enabled.
 #endif
 
 #include <tqwidget.h>
@@ -45,7 +45,7 @@ DEALINGS IN THE SOFTWARE.
 #define QT_CLEAN_NAMESPACE
 #endif
 
-#include "kstartupinfo.h"
+#include "tdestartupinfo.h"
 
 #include <unistd.h>
 #include <sys/time.h>
@@ -55,7 +55,7 @@ DEALINGS IN THE SOFTWARE.
 #include <netwm.h>
 #endif
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <signal.h>
 #ifdef Q_WS_X11
 #include <twinmodule.h>
@@ -80,31 +80,31 @@ static TQString escape_str( const TQString& str_P );
 
 static Atom utf8_string_atom = None;
 
-class KStartupInfo::Data
-    : public KStartupInfoData
+class TDEStartupInfo::Data
+    : public TDEStartupInfoData
     {
     public:
-        Data() : KStartupInfoData(), age(0) {} // just because it's in a QMap
+        Data() : TDEStartupInfoData(), age(0) {} // just because it's in a QMap
         Data( const TQString& txt_P )
-            : KStartupInfoData( txt_P ), age( 0 ) {}
+            : TDEStartupInfoData( txt_P ), age( 0 ) {}
         unsigned int age;
     };
 
-struct KStartupInfoPrivate
+struct TDEStartupInfoPrivate
     {
     public:
-        TQMap< KStartupInfoId, KStartupInfo::Data > startups;
+        TQMap< TDEStartupInfoId, TDEStartupInfo::Data > startups;
 	// contains silenced ASN's only if !AnnounceSilencedChanges
-        TQMap< KStartupInfoId, KStartupInfo::Data > silent_startups;
+        TQMap< TDEStartupInfoId, TDEStartupInfo::Data > silent_startups;
         // contains ASN's that had change: but no new: yet
-        TQMap< KStartupInfoId, KStartupInfo::Data > uninited_startups;
+        TQMap< TDEStartupInfoId, TDEStartupInfo::Data > uninited_startups;
 #ifdef Q_WS_X11
         KWinModule* wm_module;
         KXMessages msgs;
 #endif
 	TQTimer* cleanup;
 	int flags;
-	KStartupInfoPrivate( int flags_P )
+	TDEStartupInfoPrivate( int flags_P )
     	    :
 #ifdef Q_WS_X11
 	    msgs( NET_STARTUP_MSG, NULL, false ),
@@ -112,29 +112,29 @@ struct KStartupInfoPrivate
 	      flags( flags_P ) {}
     };
 
-KStartupInfo::KStartupInfo( int flags_P, TQObject* parent_P, const char* name_P )
+TDEStartupInfo::TDEStartupInfo( int flags_P, TQObject* parent_P, const char* name_P )
     : TQObject( parent_P, name_P ),
         timeout( 60 ), d( NULL )
     {
     init( flags_P );
     }
 
-KStartupInfo::KStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P, const char* name_P )
+TDEStartupInfo::TDEStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P, const char* name_P )
     : TQObject( parent_P, name_P ),
         timeout( 60 ), d( NULL )
     {
     init( clean_on_cantdetect_P ? CleanOnCantDetect : 0 );
     }
 
-void KStartupInfo::init( int flags_P )
+void TDEStartupInfo::init( int flags_P )
     {
     // d == NULL means "disabled"
-    if( !KApplication::kApplication())
+    if( !TDEApplication::kApplication())
         return;
-    if( !KApplication::kApplication()->getDisplay())
+    if( !TDEApplication::kApplication()->getDisplay())
         return;
 
-    d = new KStartupInfoPrivate( flags_P );
+    d = new TDEStartupInfoPrivate( flags_P );
 #ifdef Q_WS_X11
     if( !( d->flags & DisableKWinModule ))
         {
@@ -150,12 +150,12 @@ void KStartupInfo::init( int flags_P )
     connect( d->cleanup, TQT_SIGNAL( timeout()), TQT_SLOT( startups_cleanup()));
     }
 
-KStartupInfo::~KStartupInfo()
+TDEStartupInfo::~TDEStartupInfo()
     {
     delete d;
     }
 
-void KStartupInfo::got_message( const TQString& msg_P )
+void TDEStartupInfo::got_message( const TQString& msg_P )
     {
 // TODO do something with SCREEN= ?
     kdDebug( 172 ) << "got:" << msg_P << endl;
@@ -171,7 +171,7 @@ void KStartupInfo::got_message( const TQString& msg_P )
 // if the application stops responding for a while, KWinModule may get
 // the information about the already mapped window before KXMessages
 // actually gets the info about the started application (depends
-// on their order in X11 event filter in KApplication)
+// on their order in X11 event filter in TDEApplication)
 // simply delay info from KWinModule a bit
 // SELI???
 namespace
@@ -186,12 +186,12 @@ class DelayedWindowEvent
     };
 }
 
-void KStartupInfo::slot_window_added( WId w_P )
+void TDEStartupInfo::slot_window_added( WId w_P )
     {
     kapp->postEvent( this, new DelayedWindowEvent( w_P ));
     }
 
-void KStartupInfo::customEvent( TQCustomEvent* e_P )
+void TDEStartupInfo::customEvent( TQCustomEvent* e_P )
     {
     if( e_P->type() == TQEvent::User + 15 )
 	window_added( static_cast< DelayedWindowEvent* >( e_P )->w );
@@ -199,10 +199,10 @@ void KStartupInfo::customEvent( TQCustomEvent* e_P )
 	TQObject::customEvent( e_P );
     }
 
-void KStartupInfo::window_added( WId w_P )
+void TDEStartupInfo::window_added( WId w_P )
     {
-    KStartupInfoId id;
-    KStartupInfoData data;
+    TDEStartupInfoId id;
+    TDEStartupInfoData data;
     startup_t ret = check_startup_internal( w_P, &id, &data );
     switch( ret )
         {
@@ -218,16 +218,16 @@ void KStartupInfo::window_added( WId w_P )
         }
     }
 
-void KStartupInfo::got_startup_info( const TQString& msg_P, bool update_P )
+void TDEStartupInfo::got_startup_info( const TQString& msg_P, bool update_P )
     {
-    KStartupInfoId id( msg_P );
+    TDEStartupInfoId id( msg_P );
     if( id.none())
         return;
-    KStartupInfo::Data data( msg_P );
+    TDEStartupInfo::Data data( msg_P );
     new_startup_info_internal( id, data, update_P );
     }
 
-void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P,
+void TDEStartupInfo::new_startup_info_internal( const TDEStartupInfoId& id_P,
     Data& data_P, bool update_P )
     {
     if( d == NULL )
@@ -298,10 +298,10 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P,
     d->cleanup->start( 1000 ); // 1 sec
     }
 
-void KStartupInfo::got_remove_startup_info( const TQString& msg_P )
+void TDEStartupInfo::got_remove_startup_info( const TQString& msg_P )
     {
-    KStartupInfoId id( msg_P );
-    KStartupInfoData data( msg_P );
+    TDEStartupInfoId id( msg_P );
+    TDEStartupInfoData data( msg_P );
     if( data.pids().count() > 0 )
         {
         if( !id.none())
@@ -313,7 +313,7 @@ void KStartupInfo::got_remove_startup_info( const TQString& msg_P )
     remove_startup_info_internal( id );
     }
 
-void KStartupInfo::remove_startup_info_internal( const KStartupInfoId& id_P )
+void TDEStartupInfo::remove_startup_info_internal( const TDEStartupInfoId& id_P )
     {
     if( d == NULL )
         return;
@@ -336,11 +336,11 @@ void KStartupInfo::remove_startup_info_internal( const KStartupInfoId& id_P )
     return;
     }
 
-void KStartupInfo::remove_startup_pids( const KStartupInfoData& data_P )
+void TDEStartupInfo::remove_startup_pids( const TDEStartupInfoData& data_P )
     { // first find the matching info
     if( d == NULL )
         return;
-    for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
+    for( TQMap< TDEStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          ++it )
         {
@@ -353,8 +353,8 @@ void KStartupInfo::remove_startup_pids( const KStartupInfoData& data_P )
         }
     }
 
-void KStartupInfo::remove_startup_pids( const KStartupInfoId& id_P,
-    const KStartupInfoData& data_P )
+void TDEStartupInfo::remove_startup_pids( const TDEStartupInfoId& id_P,
+    const TDEStartupInfoData& data_P )
     {
     if( d == NULL )
         return;
@@ -376,7 +376,7 @@ void KStartupInfo::remove_startup_pids( const KStartupInfoId& id_P,
     	remove_startup_info_internal( id_P );
     }
 
-bool KStartupInfo::sendStartup( const KStartupInfoId& id_P, const KStartupInfoData& data_P )
+bool TDEStartupInfo::sendStartup( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P )
     {
     if( id_P.none())
         return false;
@@ -389,8 +389,8 @@ bool KStartupInfo::sendStartup( const KStartupInfoId& id_P, const KStartupInfoDa
     return true;
     }
 
-bool KStartupInfo::sendStartupX( Display* disp_P, const KStartupInfoId& id_P,
-    const KStartupInfoData& data_P )
+bool TDEStartupInfo::sendStartupX( Display* disp_P, const TDEStartupInfoId& id_P,
+    const TDEStartupInfoData& data_P )
     {
     if( id_P.none())
         return false;
@@ -403,7 +403,7 @@ bool KStartupInfo::sendStartupX( Display* disp_P, const KStartupInfoId& id_P,
     return KXMessages::broadcastMessageX( disp_P, NET_STARTUP_MSG, msg, -1, false );
     }
 
-TQString KStartupInfo::check_required_startup_fields( const TQString& msg, const KStartupInfoData& data_P,
+TQString TDEStartupInfo::check_required_startup_fields( const TQString& msg, const TDEStartupInfoData& data_P,
     int screen )
     {
     TQString ret = msg;
@@ -420,7 +420,7 @@ TQString KStartupInfo::check_required_startup_fields( const TQString& msg, const
     return ret;
     }
 
-bool KStartupInfo::sendChange( const KStartupInfoId& id_P, const KStartupInfoData& data_P )
+bool TDEStartupInfo::sendChange( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P )
     {
     if( id_P.none())
         return false;
@@ -432,8 +432,8 @@ bool KStartupInfo::sendChange( const KStartupInfoId& id_P, const KStartupInfoDat
     return true;
     }
 
-bool KStartupInfo::sendChangeX( Display* disp_P, const KStartupInfoId& id_P,
-    const KStartupInfoData& data_P )
+bool TDEStartupInfo::sendChangeX( Display* disp_P, const TDEStartupInfoId& id_P,
+    const TDEStartupInfoData& data_P )
     {
     if( id_P.none())
         return false;
@@ -445,7 +445,7 @@ bool KStartupInfo::sendChangeX( Display* disp_P, const KStartupInfoId& id_P,
     return KXMessages::broadcastMessageX( disp_P, NET_STARTUP_MSG, msg, -1, false );
     }
 
-bool KStartupInfo::sendFinish( const KStartupInfoId& id_P )
+bool TDEStartupInfo::sendFinish( const TDEStartupInfoId& id_P )
     {
     if( id_P.none())
         return false;
@@ -456,7 +456,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P )
     return true;
     }
 
-bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P )
+bool TDEStartupInfo::sendFinishX( Display* disp_P, const TDEStartupInfoId& id_P )
     {
     if( id_P.none())
         return false;
@@ -467,7 +467,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P )
     return KXMessages::broadcastMessageX( disp_P, NET_STARTUP_MSG, msg, -1, false );
     }
 
-bool KStartupInfo::sendFinish( const KStartupInfoId& id_P, const KStartupInfoData& data_P )
+bool TDEStartupInfo::sendFinish( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P )
     {
 //    if( id_P.none()) // id may be none, the pids and hostname matter then
 //        return false;
@@ -479,8 +479,8 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P, const KStartupInfoDat
     return true;
     }
 
-bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P,
-    const KStartupInfoData& data_P )
+bool TDEStartupInfo::sendFinishX( Display* disp_P, const TDEStartupInfoId& id_P,
+    const TDEStartupInfoData& data_P )
     {
 //    if( id_P.none()) // id may be none, the pids and hostname matter then
 //        return false;
@@ -492,58 +492,58 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P,
     return KXMessages::broadcastMessageX( disp_P, NET_STARTUP_MSG, msg, -1, false );
     }
 
-void KStartupInfo::appStarted()
+void TDEStartupInfo::appStarted()
     {
-    if( kapp != NULL )  // KApplication constructor unsets the env. variable
+    if( kapp != NULL )  // TDEApplication constructor unsets the env. variable
         appStarted( kapp->startupId());
     else
-        appStarted( KStartupInfo::currentStartupIdEnv().id());
+        appStarted( TDEStartupInfo::currentStartupIdEnv().id());
     }
 
-void KStartupInfo::appStarted( const TQCString& startup_id )
+void TDEStartupInfo::appStarted( const TQCString& startup_id )
     {
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( startup_id );
     if( id.none())
         return;
     if( kapp != NULL )
-        KStartupInfo::sendFinish( id );
+        TDEStartupInfo::sendFinish( id );
     else if( getenv( "DISPLAY" ) != NULL ) // don't rely on tqt_xdisplay()
         {
 #ifdef Q_WS_X11
         Display* disp = XOpenDisplay( NULL );
         if( disp != NULL )
             {
-            KStartupInfo::sendFinishX( disp, id );
+            TDEStartupInfo::sendFinishX( disp, id );
             XCloseDisplay( disp );
             }
 #endif
         }
     }
 
-void KStartupInfo::disableAutoAppStartedSending( bool disable )
+void TDEStartupInfo::disableAutoAppStartedSending( bool disable )
     {
     auto_app_started_sending = !disable;
     }
 
-void KStartupInfo::silenceStartup( bool silence )
+void TDEStartupInfo::silenceStartup( bool silence )
     {
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( kapp->startupId());
     if( id.none())
         return;
-    KStartupInfoData data;
-    data.setSilent( silence ? KStartupInfoData::Yes : KStartupInfoData::No );
+    TDEStartupInfoData data;
+    data.setSilent( silence ? TDEStartupInfoData::Yes : TDEStartupInfoData::No );
     sendChange( id, data );
     }
 
-void KStartupInfo::handleAutoAppStartedSending()
+void TDEStartupInfo::handleAutoAppStartedSending()
     {
     if( auto_app_started_sending )
         appStarted();
     }
 
-void KStartupInfo::setNewStartupId( TQWidget* window, const TQCString& startup_id )
+void TDEStartupInfo::setNewStartupId( TQWidget* window, const TQCString& startup_id )
     {
     bool activate = true;
     kapp->setStartupId( startup_id );
@@ -554,7 +554,7 @@ void KStartupInfo::setNewStartupId( TQWidget* window, const TQCString& startup_i
             NETRootInfo i( tqt_xdisplay(), NET::Supported );
             if( i.isSupported( NET::WM2StartupId ))
                 {
-                KStartupInfo::setWindowStartupId( window->winId(), startup_id );
+                TDEStartupInfo::setWindowStartupId( window->winId(), startup_id );
                 activate = false; // WM will take care of it
                 }
             }
@@ -568,32 +568,32 @@ void KStartupInfo::setNewStartupId( TQWidget* window, const TQCString& startup_i
             KWin::forceActiveWindow( window->winId());
             }
         }
-    KStartupInfo::handleAutoAppStartedSending();
+    TDEStartupInfo::handleAutoAppStartedSending();
     }
 
-KStartupInfo::startup_t KStartupInfo::checkStartup( WId w_P, KStartupInfoId& id_O,
-    KStartupInfoData& data_O )
+TDEStartupInfo::startup_t TDEStartupInfo::checkStartup( WId w_P, TDEStartupInfoId& id_O,
+    TDEStartupInfoData& data_O )
     {
     return check_startup_internal( w_P, &id_O, &data_O );
     }
 
-KStartupInfo::startup_t KStartupInfo::checkStartup( WId w_P, KStartupInfoId& id_O )
+TDEStartupInfo::startup_t TDEStartupInfo::checkStartup( WId w_P, TDEStartupInfoId& id_O )
     {
     return check_startup_internal( w_P, &id_O, NULL );
     }
 
-KStartupInfo::startup_t KStartupInfo::checkStartup( WId w_P, KStartupInfoData& data_O )
+TDEStartupInfo::startup_t TDEStartupInfo::checkStartup( WId w_P, TDEStartupInfoData& data_O )
     {
     return check_startup_internal( w_P, NULL, &data_O );
     }
 
-KStartupInfo::startup_t KStartupInfo::checkStartup( WId w_P )
+TDEStartupInfo::startup_t TDEStartupInfo::checkStartup( WId w_P )
     {
     return check_startup_internal( w_P, NULL, NULL );
     }
 
-KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupInfoId* id_O,
-    KStartupInfoData* data_O )
+TDEStartupInfo::startup_t TDEStartupInfo::check_startup_internal( WId w_P, TDEStartupInfoId* id_O,
+    TDEStartupInfoData* data_O )
     {
     if( d == NULL )
         return NoMatch;
@@ -661,13 +661,13 @@ KStartupInfo::startup_t KStartupInfo::check_startup_internal( WId w_P, KStartupI
     return CantDetect;
     }
 
-bool KStartupInfo::find_id( const TQCString& id_P, KStartupInfoId* id_O,
-    KStartupInfoData* data_O )
+bool TDEStartupInfo::find_id( const TQCString& id_P, TDEStartupInfoId* id_O,
+    TDEStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
     kdDebug( 172 ) << "find_id:" << id_P << endl;
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( id_P );
     if( d->startups.contains( id ))
         {
@@ -681,13 +681,13 @@ bool KStartupInfo::find_id( const TQCString& id_P, KStartupInfoId* id_O,
     return false;
     }
 
-bool KStartupInfo::find_pid( pid_t pid_P, const TQCString& hostname_P,
-    KStartupInfoId* id_O, KStartupInfoData* data_O )
+bool TDEStartupInfo::find_pid( pid_t pid_P, const TQCString& hostname_P,
+    TDEStartupInfoId* id_O, TDEStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
     kdDebug( 172 ) << "find_pid:" << pid_P << endl;
-    for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
+    for( TQMap< TDEStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          ++it )
         {
@@ -706,15 +706,15 @@ bool KStartupInfo::find_pid( pid_t pid_P, const TQCString& hostname_P,
     return false;
     }
 
-bool KStartupInfo::find_wclass( TQCString res_name, TQCString res_class,
-    KStartupInfoId* id_O, KStartupInfoData* data_O )
+bool TDEStartupInfo::find_wclass( TQCString res_name, TQCString res_class,
+    TDEStartupInfoId* id_O, TDEStartupInfoData* data_O )
     {
     if( d == NULL )
         return false;
     res_name = res_name.lower();
     res_class = res_class.lower();
     kdDebug( 172 ) << "find_wclass:" << res_name << ":" << res_class << endl;
-    for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
+    for( TQMap< TDEStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          ++it )
         {
@@ -758,7 +758,7 @@ static TQCString read_startup_id_property( WId w_P )
 
 #endif
 
-TQCString KStartupInfo::windowStartupId( WId w_P )
+TQCString TDEStartupInfo::windowStartupId( WId w_P )
     {
 #ifdef Q_WS_X11
     if( net_startup_atom == None )
@@ -780,7 +780,7 @@ TQCString KStartupInfo::windowStartupId( WId w_P )
 #endif
     }
 
-void KStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P )
+void TDEStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P )
     {
 #ifdef Q_WS_X11
     if( id_P.isNull())
@@ -794,7 +794,7 @@ void KStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P )
 #endif
     }
 
-TQCString KStartupInfo::get_window_hostname( WId w_P )
+TQCString TDEStartupInfo::get_window_hostname( WId w_P )
     {
 #ifdef Q_WS_X11
     XTextProperty tp;
@@ -816,19 +816,19 @@ TQCString KStartupInfo::get_window_hostname( WId w_P )
     return TQCString();
     }
 
-void KStartupInfo::setTimeout( unsigned int secs_P )
+void TDEStartupInfo::setTimeout( unsigned int secs_P )
     {
     timeout = secs_P;
  // schedule removing entries that are older than the new timeout
     TQTimer::singleShot( 0, this, TQT_SLOT( startups_cleanup_no_age()));
     }
 
-void KStartupInfo::startups_cleanup_no_age()
+void TDEStartupInfo::startups_cleanup_no_age()
     {
     startups_cleanup_internal( false );
     }
 
-void KStartupInfo::startups_cleanup()
+void TDEStartupInfo::startups_cleanup()
     {
     if( d == NULL )
         return;
@@ -841,11 +841,11 @@ void KStartupInfo::startups_cleanup()
     startups_cleanup_internal( true );
     }
 
-void KStartupInfo::startups_cleanup_internal( bool age_P )
+void TDEStartupInfo::startups_cleanup_internal( bool age_P )
     {
     if( d == NULL )
         return;
-    for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
+    for( TQMap< TDEStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          )
         {
@@ -856,7 +856,7 @@ void KStartupInfo::startups_cleanup_internal( bool age_P )
 	    tout *= 20;
         if( ( *it ).age >= tout )
             {
-            const KStartupInfoId& key = it.key();
+            const TDEStartupInfoId& key = it.key();
             ++it;
             kdDebug( 172 ) << "startups entry timeout:" << key.id() << endl;
             remove_startup_info_internal( key );
@@ -864,7 +864,7 @@ void KStartupInfo::startups_cleanup_internal( bool age_P )
         else
             ++it;
         }
-    for( TQMap< KStartupInfoId, Data >::Iterator it = d->silent_startups.begin();
+    for( TQMap< TDEStartupInfoId, Data >::Iterator it = d->silent_startups.begin();
          it != d->silent_startups.end();
          )
         {
@@ -875,7 +875,7 @@ void KStartupInfo::startups_cleanup_internal( bool age_P )
 	    tout *= 20;
         if( ( *it ).age >= tout )
             {
-            const KStartupInfoId& key = it.key();
+            const TDEStartupInfoId& key = it.key();
             ++it;
             kdDebug( 172 ) << "silent entry timeout:" << key.id() << endl;
             remove_startup_info_internal( key );
@@ -883,7 +883,7 @@ void KStartupInfo::startups_cleanup_internal( bool age_P )
         else
             ++it;
         }
-    for( TQMap< KStartupInfoId, Data >::Iterator it = d->uninited_startups.begin();
+    for( TQMap< TDEStartupInfoId, Data >::Iterator it = d->uninited_startups.begin();
          it != d->uninited_startups.end();
          )
         {
@@ -894,7 +894,7 @@ void KStartupInfo::startups_cleanup_internal( bool age_P )
 	    tout *= 20;
         if( ( *it ).age >= tout )
             {
-            const KStartupInfoId& key = it.key();
+            const TDEStartupInfoId& key = it.key();
             ++it;
             kdDebug( 172 ) << "uninited entry timeout:" << key.id() << endl;
             remove_startup_info_internal( key );
@@ -904,11 +904,11 @@ void KStartupInfo::startups_cleanup_internal( bool age_P )
         }
     }
 
-void KStartupInfo::clean_all_noncompliant()
+void TDEStartupInfo::clean_all_noncompliant()
     {
     if( d == NULL )
         return;
-    for( TQMap< KStartupInfoId, Data >::Iterator it = d->startups.begin();
+    for( TQMap< TDEStartupInfoId, Data >::Iterator it = d->startups.begin();
          it != d->startups.end();
          )
         {
@@ -917,14 +917,14 @@ void KStartupInfo::clean_all_noncompliant()
             ++it;
             continue;
             }
-        const KStartupInfoId& key = it.key();
+        const TDEStartupInfoId& key = it.key();
         ++it;
         kdDebug( 172 ) << "entry cleaning:" << key.id() << endl;
         remove_startup_info_internal( key );
         }
     }
 
-TQCString KStartupInfo::createNewStartupId()
+TQCString TDEStartupInfo::createNewStartupId()
     {
     // Assign a unique id, use hostname+time+pid, that should be 200% unique.
     // Also append the user timestamp (for focus stealing prevention).
@@ -941,26 +941,26 @@ TQCString KStartupInfo::createNewStartupId()
     }
 
 
-struct KStartupInfoIdPrivate
+struct TDEStartupInfoIdPrivate
     {
-    KStartupInfoIdPrivate() : id( "" ) {}
+    TDEStartupInfoIdPrivate() : id( "" ) {}
     TQCString id; // id
     };
 
-const TQCString& KStartupInfoId::id() const
+const TQCString& TDEStartupInfoId::id() const
     {
     return d->id;
     }
 
 
-TQString KStartupInfoId::to_text() const
+TQString TDEStartupInfoId::to_text() const
     {
     return TQString::fromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
     }
 
-KStartupInfoId::KStartupInfoId( const TQString& txt_P )
+TDEStartupInfoId::TDEStartupInfoId( const TQString& txt_P )
     {
-    d = new KStartupInfoIdPrivate;
+    d = new TDEStartupInfoIdPrivate;
     TQStringList items = get_fields( txt_P );
     const TQString id_str = TQString::fromLatin1( "ID=" );
     for( TQStringList::Iterator it = items.begin();
@@ -972,7 +972,7 @@ KStartupInfoId::KStartupInfoId( const TQString& txt_P )
         }
     }
 
-void KStartupInfoId::initId( const TQCString& id_P )
+void TDEStartupInfoId::initId( const TQCString& id_P )
     {
     if( !id_P.isEmpty())
         {
@@ -991,10 +991,10 @@ void KStartupInfoId::initId( const TQCString& id_P )
 #endif
         return;
         }
-    d->id = KStartupInfo::createNewStartupId();
+    d->id = TDEStartupInfo::createNewStartupId();
     }
 
-bool KStartupInfoId::setupStartupEnv() const
+bool TDEStartupInfoId::setupStartupEnv() const
     {
     if( id().isEmpty())
         {
@@ -1004,10 +1004,10 @@ bool KStartupInfoId::setupStartupEnv() const
     return setenv( NET_STARTUP_ENV, id(), true ) == 0;
     }
 
-KStartupInfoId KStartupInfo::currentStartupIdEnv()
+TDEStartupInfoId TDEStartupInfo::currentStartupIdEnv()
     {
     const char* startup_env = getenv( NET_STARTUP_ENV );
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     if( startup_env != NULL && *startup_env != '\0' )
         id.d->id = startup_env;
     else
@@ -1015,57 +1015,57 @@ KStartupInfoId KStartupInfo::currentStartupIdEnv()
     return id;
     }
 
-void KStartupInfo::resetStartupEnv()
+void TDEStartupInfo::resetStartupEnv()
     {
     unsetenv( NET_STARTUP_ENV );
     }
 
-KStartupInfoId::KStartupInfoId()
+TDEStartupInfoId::TDEStartupInfoId()
     {
-    d = new KStartupInfoIdPrivate;
+    d = new TDEStartupInfoIdPrivate;
     }
 
-KStartupInfoId::~KStartupInfoId()
+TDEStartupInfoId::~TDEStartupInfoId()
     {
     delete d;
     }
 
-KStartupInfoId::KStartupInfoId( const KStartupInfoId& id_P )
+TDEStartupInfoId::TDEStartupInfoId( const TDEStartupInfoId& id_P )
     {
-    d = new KStartupInfoIdPrivate( *id_P.d );
+    d = new TDEStartupInfoIdPrivate( *id_P.d );
     }
 
-KStartupInfoId& KStartupInfoId::operator=( const KStartupInfoId& id_P )
+TDEStartupInfoId& TDEStartupInfoId::operator=( const TDEStartupInfoId& id_P )
     {
     if( &id_P == this )
         return *this;
     delete d;
-    d = new KStartupInfoIdPrivate( *id_P.d );
+    d = new TDEStartupInfoIdPrivate( *id_P.d );
     return *this;
     }
 
-bool KStartupInfoId::operator==( const KStartupInfoId& id_P ) const
+bool TDEStartupInfoId::operator==( const TDEStartupInfoId& id_P ) const
     {
     return id() == id_P.id();
     }
 
-bool KStartupInfoId::operator!=( const KStartupInfoId& id_P ) const
+bool TDEStartupInfoId::operator!=( const TDEStartupInfoId& id_P ) const
     {
     return !(*this == id_P );
     }
 
 // needed for QMap
-bool KStartupInfoId::operator<( const KStartupInfoId& id_P ) const
+bool TDEStartupInfoId::operator<( const TDEStartupInfoId& id_P ) const
     {
     return id() < id_P.id();
     }
 
-bool KStartupInfoId::none() const
+bool TDEStartupInfoId::none() const
     {
     return d->id.isEmpty() || d->id == "0";
     }
 
-unsigned long KStartupInfoId::timestamp() const
+unsigned long TDEStartupInfoId::timestamp() const
     {
     if( none())
         return 0;
@@ -1097,14 +1097,14 @@ unsigned long KStartupInfoId::timestamp() const
                 return time;
             }
         }
-    // bah ... old KStartupInfo or a problem
+    // bah ... old TDEStartupInfo or a problem
     return 0;
     }
 
-struct KStartupInfoDataPrivate
+struct TDEStartupInfoDataPrivate
     {
-    KStartupInfoDataPrivate() : desktop( 0 ), wmclass( "" ), hostname( "" ),
-	silent( KStartupInfoData::Unknown ), timestamp( -1U ), screen( -1 ), xinerama( -1 ), launched_by( 0 ) {}
+    TDEStartupInfoDataPrivate() : desktop( 0 ), wmclass( "" ), hostname( "" ),
+	silent( TDEStartupInfoData::Unknown ), timestamp( -1U ), screen( -1 ), xinerama( -1 ), launched_by( 0 ) {}
     TQString bin;
     TQString name;
     TQString description;
@@ -1113,14 +1113,14 @@ struct KStartupInfoDataPrivate
     TQValueList< pid_t > pids;
     TQCString wmclass;
     TQCString hostname;
-    KStartupInfoData::TriState silent;
+    TDEStartupInfoData::TriState silent;
     unsigned long timestamp;
     int screen;
     int xinerama;
     WId launched_by;
     };
 
-TQString KStartupInfoData::to_text() const
+TQString TDEStartupInfoData::to_text() const
     {
     TQString ret = "";
     if( !d->bin.isEmpty())
@@ -1155,9 +1155,9 @@ TQString KStartupInfoData::to_text() const
     return ret;
     }
 
-KStartupInfoData::KStartupInfoData( const TQString& txt_P )
+TDEStartupInfoData::TDEStartupInfoData( const TQString& txt_P )
     {
-    d = new KStartupInfoDataPrivate;
+    d = new TDEStartupInfoDataPrivate;
     TQStringList items = get_fields( txt_P );
     const TQString bin_str = TQString::fromLatin1( "BIN=" );
     const TQString name_str = TQString::fromLatin1( "NAME=" );
@@ -1209,21 +1209,21 @@ KStartupInfoData::KStartupInfoData( const TQString& txt_P )
         }
     }
 
-KStartupInfoData::KStartupInfoData( const KStartupInfoData& data )
+TDEStartupInfoData::TDEStartupInfoData( const TDEStartupInfoData& data )
 {
-    d = new KStartupInfoDataPrivate( *data.d );
+    d = new TDEStartupInfoDataPrivate( *data.d );
 }
 
-KStartupInfoData& KStartupInfoData::operator=( const KStartupInfoData& data )
+TDEStartupInfoData& TDEStartupInfoData::operator=( const TDEStartupInfoData& data )
 {
     if( &data == this )
         return *this;
     delete d;
-    d = new KStartupInfoDataPrivate( *data.d );
+    d = new TDEStartupInfoDataPrivate( *data.d );
     return *this;
 }
 
-void KStartupInfoData::update( const KStartupInfoData& data_P )
+void TDEStartupInfoData::update( const TDEStartupInfoData& data_P )
     {
     if( !data_P.bin().isEmpty())
         d->bin = data_P.bin();
@@ -1255,105 +1255,105 @@ void KStartupInfoData::update( const KStartupInfoData& data_P )
         d->launched_by = data_P.launchedBy();
     }
 
-KStartupInfoData::KStartupInfoData()
+TDEStartupInfoData::TDEStartupInfoData()
 {
-    d = new KStartupInfoDataPrivate;
+    d = new TDEStartupInfoDataPrivate;
 }
 
-KStartupInfoData::~KStartupInfoData()
+TDEStartupInfoData::~TDEStartupInfoData()
 {
     delete d;
 }
 
-void KStartupInfoData::setBin( const TQString& bin_P )
+void TDEStartupInfoData::setBin( const TQString& bin_P )
     {
     d->bin = bin_P;
     }
 
-const TQString& KStartupInfoData::bin() const
+const TQString& TDEStartupInfoData::bin() const
     {
     return d->bin;
     }
 
-void KStartupInfoData::setName( const TQString& name_P )
+void TDEStartupInfoData::setName( const TQString& name_P )
     {
     d->name = name_P;
     }
 
-const TQString& KStartupInfoData::name() const
+const TQString& TDEStartupInfoData::name() const
     {
     return d->name;
     }
 
-const TQString& KStartupInfoData::findName() const
+const TQString& TDEStartupInfoData::findName() const
     {
     if( !name().isEmpty())
         return name();
     return bin();
     }
 
-void KStartupInfoData::setDescription( const TQString& desc_P )
+void TDEStartupInfoData::setDescription( const TQString& desc_P )
     {
     d->description = desc_P;
     }
 
-const TQString& KStartupInfoData::description() const
+const TQString& TDEStartupInfoData::description() const
     {
     return d->description;
     }
 
-const TQString& KStartupInfoData::findDescription() const
+const TQString& TDEStartupInfoData::findDescription() const
     {
     if( !description().isEmpty())
         return description();
     return name();
     }
 
-void KStartupInfoData::setIcon( const TQString& icon_P )
+void TDEStartupInfoData::setIcon( const TQString& icon_P )
     {
     d->icon = icon_P;
     }
 
-const TQString& KStartupInfoData::findIcon() const
+const TQString& TDEStartupInfoData::findIcon() const
     {
     if( !icon().isEmpty())
         return icon();
     return bin();
     }
 
-const TQString& KStartupInfoData::icon() const
+const TQString& TDEStartupInfoData::icon() const
     {
     return d->icon;
     }
 
-void KStartupInfoData::setDesktop( int desktop_P )
+void TDEStartupInfoData::setDesktop( int desktop_P )
     {
     d->desktop = desktop_P;
     }
 
-int KStartupInfoData::desktop() const
+int TDEStartupInfoData::desktop() const
     {
     return d->desktop;
     }
 
-void KStartupInfoData::setWMClass( const TQCString& wmclass_P )
+void TDEStartupInfoData::setWMClass( const TQCString& wmclass_P )
     {
     d->wmclass = wmclass_P;
     }
 
-const TQCString KStartupInfoData::findWMClass() const
+const TQCString TDEStartupInfoData::findWMClass() const
     {
     if( !WMClass().isEmpty() && WMClass() != "0" )
         return WMClass();
     return bin().utf8();
     }
 
-const TQCString& KStartupInfoData::WMClass() const
+const TQCString& TDEStartupInfoData::WMClass() const
     {
     return d->wmclass;
     }
 
-void KStartupInfoData::setHostname( const TQCString& hostname_P )
+void TDEStartupInfoData::setHostname( const TQCString& hostname_P )
     {
     if( !hostname_P.isNull())
         d->hostname = hostname_P;
@@ -1367,78 +1367,78 @@ void KStartupInfoData::setHostname( const TQCString& hostname_P )
         }
     }
 
-const TQCString& KStartupInfoData::hostname() const
+const TQCString& TDEStartupInfoData::hostname() const
     {
     return d->hostname;
     }
 
-void KStartupInfoData::addPid( pid_t pid_P )
+void TDEStartupInfoData::addPid( pid_t pid_P )
     {
     if( !d->pids.contains( pid_P ))
         d->pids.append( pid_P );
     }
 
-void KStartupInfoData::remove_pid( pid_t pid_P )
+void TDEStartupInfoData::remove_pid( pid_t pid_P )
     {
     d->pids.remove( pid_P );
     }
 
-const TQValueList< pid_t >& KStartupInfoData::pids() const
+const TQValueList< pid_t >& TDEStartupInfoData::pids() const
     {
     return d->pids;
     }
 
-bool KStartupInfoData::is_pid( pid_t pid_P ) const
+bool TDEStartupInfoData::is_pid( pid_t pid_P ) const
     {
     return d->pids.contains( pid_P );
     }
 
-void KStartupInfoData::setSilent( TriState state_P )
+void TDEStartupInfoData::setSilent( TriState state_P )
     {
     d->silent = state_P;
     }
 
-KStartupInfoData::TriState KStartupInfoData::silent() const
+TDEStartupInfoData::TriState TDEStartupInfoData::silent() const
     {
     return d->silent;
     }
 
-void KStartupInfoData::setTimestamp( unsigned long time )
+void TDEStartupInfoData::setTimestamp( unsigned long time )
     {
     d->timestamp = time;
     }
 
-unsigned long KStartupInfoData::timestamp() const
+unsigned long TDEStartupInfoData::timestamp() const
     {
     return d->timestamp;
     }
 
-void KStartupInfoData::setScreen( int screen )
+void TDEStartupInfoData::setScreen( int screen )
     {
     d->screen = screen;
     }
 
-int KStartupInfoData::screen() const
+int TDEStartupInfoData::screen() const
     {
     return d->screen;
     }
 
-void KStartupInfoData::setXinerama( int xinerama )
+void TDEStartupInfoData::setXinerama( int xinerama )
     {
     d->xinerama = xinerama;
     }
 
-int KStartupInfoData::xinerama() const
+int TDEStartupInfoData::xinerama() const
     {
     return d->xinerama;
     }
 
-void KStartupInfoData::setLaunchedBy( WId window )
+void TDEStartupInfoData::setLaunchedBy( WId window )
     {
     d->launched_by = window;
     }
 
-WId KStartupInfoData::launchedBy() const
+WId TDEStartupInfoData::launchedBy() const
     {
     return d->launched_by;
     }
@@ -1525,5 +1525,5 @@ static TQString escape_str( const TQString& str_P )
     return ret;
     }
 
-#include "kstartupinfo.moc"
+#include "tdestartupinfo.moc"
 #endif
diff --git a/tdecore/kstartupinfo.h b/tdecore/tdestartupinfo.h
index f71a0b830..3f8310f6b 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/tdestartupinfo.h
@@ -39,17 +39,17 @@ DEALINGS IN THE SOFTWARE.
 #include <tqvaluelist.h>
 #include "tdelibs_export.h"
 
-class KStartupInfoId;
-class KStartupInfoData;
+class TDEStartupInfoId;
+class TDEStartupInfoData;
 
-class KStartupInfoPrivate;
+class TDEStartupInfoPrivate;
 
 /**
  * Class for manipulating the application startup notification.
  *
  * This class can be used to send information about started application,
  * change the information and receive this information. For detailed
- * description, see tdelibs/tdecore/README.kstartupinfo.
+ * description, see tdelibs/tdecore/README.tdestartupinfo.
  *
  * You usually don't need to use this class for sending the notification
  * information, as KDE libraries should do this when an application is
@@ -59,12 +59,12 @@ class KStartupInfoPrivate;
  * to its slots. It will automatically detect started applications and when
  * they are ready.
  *
- * @see KStartupInfoId
- * @see KStartupInfoData
+ * @see TDEStartupInfoId
+ * @see TDEStartupInfoData
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class TDECORE_EXPORT KStartupInfo
+class TDECORE_EXPORT TDEStartupInfo
     : public TQObject
     {
     Q_OBJECT
@@ -151,7 +151,7 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param name the name of the TQObject (can be 0 for no name)
 	 *
 	 */
-	KStartupInfo( int flags, TQObject* parent = NULL, const char* name = NULL );
+	TDEStartupInfo( int flags, TQObject* parent = NULL, const char* name = NULL );
 	/**
 	 * Creates an instance that will receive the startup notifications.
 	 *
@@ -163,8 +163,8 @@ class TDECORE_EXPORT KStartupInfo
 	 *
 	 * @obsolete
 	 */
-        KStartupInfo( bool clean_on_cantdetect, TQObject* parent = 0, const char* name = 0 );
-        virtual ~KStartupInfo();
+        TDEStartupInfo( bool clean_on_cantdetect, TQObject* parent = 0, const char* name = 0 );
+        virtual ~TDEStartupInfo();
 	/**
 	 * Sends given notification data about started application
 	 * with the given startup identification. If no notification for this identification
@@ -174,10 +174,10 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param id the id of the application
 	 * @param data the application's data
 	 * @return true if successful, false otherwise
-	 * @see KStartupInfoId
-	 * @see KStartupInfoData
+	 * @see TDEStartupInfoId
+	 * @see TDEStartupInfoData
 	 */
-        static bool sendStartup( const KStartupInfoId& id, const KStartupInfoData& data );
+        static bool sendStartup( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
 
 	/**
 	 * Like sendStartup , uses dpy instead of tqt_xdisplay() for sending the info.
@@ -187,8 +187,8 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param data the application's data
 	 * @return true if successful, false otherwise
 	 */
-        static bool sendStartupX( Display* dpy, const KStartupInfoId& id,
-            const KStartupInfoData& data );
+        static bool sendStartupX( Display* dpy, const TDEStartupInfoId& id,
+            const TDEStartupInfoData& data );
 
 	/**
 	 * Sends given notification data about started application
@@ -197,10 +197,10 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param id the id of the application
 	 * @param data the application's data
 	 * @return true if successful, false otherwise
-	 * @see KStartupInfoId
-	 * @see KStartupInfoData
+	 * @see TDEStartupInfoId
+	 * @see TDEStartupInfoData
 	 */
-        static bool sendChange( const KStartupInfoId& id, const KStartupInfoData& data );
+        static bool sendChange( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
 
 	/**
 	 * Like sendChange , uses dpy instead of tqt_xdisplay() for sending the info.
@@ -209,15 +209,15 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param data the application's data
 	 * @return true if successful, false otherwise
 	 */
-        static bool sendChangeX( Display* dpy, const KStartupInfoId& id,
-            const KStartupInfoData& data );
+        static bool sendChangeX( Display* dpy, const TDEStartupInfoId& id,
+            const TDEStartupInfoData& data );
 
 	/**
 	 * Ends startup notification with the given identification.
 	 * @param id the id of the application
 	 * @return true if successful, false otherwise
 	 */
-        static bool sendFinish( const KStartupInfoId& id );
+        static bool sendFinish( const TDEStartupInfoId& id );
 
 	/**
 	 * Like sendFinish , uses dpy instead of tqt_xdisplay() for sending the info.
@@ -225,7 +225,7 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param id the id of the application
 	 * @return true if successful, false otherwise
 	 */
-        static bool sendFinishX( Display* dpy, const KStartupInfoId& id );
+        static bool sendFinishX( Display* dpy, const TDEStartupInfoId& id );
 
 	/**
 	 * Ends startup notification with the given identification and the given data ( e.g.
@@ -234,7 +234,7 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param data the application's data
 	 * @return true if successful, false otherwise
 	 */
-        static bool sendFinish( const KStartupInfoId& id, const KStartupInfoData& data );
+        static bool sendFinish( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
 
 	/**
 	 * Like sendFinish , uses dpy instead of tqt_xdisplay() for sending the info.
@@ -243,16 +243,16 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param data the application's data
 	 * @return true if successful, false otherwise
 	 */
-        static bool sendFinishX( Display* dpy, const KStartupInfoId& id,
-            const KStartupInfoData& data );
+        static bool sendFinishX( Display* dpy, const TDEStartupInfoId& id,
+            const TDEStartupInfoData& data );
 
 	/**
 	 * Returns the current startup notification identification for the current
-	 * startup notification environment variable. Note that KApplication constructor
-	 * unsets the variable and you have to use KApplication::startupId .
+	 * startup notification environment variable. Note that TDEApplication constructor
+	 * unsets the variable and you have to use TDEApplication::startupId .
 	 * @return the current startup notification identification
 	 */
-        static KStartupInfoId currentStartupIdEnv();
+        static TDEStartupInfoId currentStartupIdEnv();
 	/**
 	 * Unsets the startup notification environment variable.
 	 */
@@ -277,7 +277,7 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param id if found, the id of the startup notification will be written here
 	 * @return the result of the operation
 	 */
-        startup_t checkStartup( WId w, KStartupInfoId& id );
+        startup_t checkStartup( WId w, TDEStartupInfoId& id );
 	/**
 	 * Checks if the given windows matches any existing startup notification, and
 	 * if yes, returns the notification data in data.
@@ -285,7 +285,7 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param data if found, the data of the startup notification will be written here
 	 * @return the result of the operation
 	 */
-        startup_t checkStartup( WId w, KStartupInfoData& data );
+        startup_t checkStartup( WId w, TDEStartupInfoData& data );
 	/**
 	 * Checks if the given windows matches any existing startup notification, and
 	 * if yes, returns the identification in id and notification data in data.
@@ -294,7 +294,7 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param data if found, the data of the startup notification will be written here
 	 * @return the result of the operation
 	 */
-        startup_t checkStartup( WId w, KStartupInfoId& id, KStartupInfoData& data );
+        startup_t checkStartup( WId w, TDEStartupInfoId& id, TDEStartupInfoData& data );
 	/**
 	 * Sets the timeout for notifications, after this timeout a notification is removed.
 	 * @param secs the new timeout in seconds
@@ -327,20 +327,20 @@ class TDECORE_EXPORT KStartupInfo
 	 * @param id the notification identification
 	 * @param data the notification data
 	 */
-        void gotNewStartup( const KStartupInfoId& id, const KStartupInfoData& data );
+        void gotNewStartup( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
 	/**
 	 * Emitted when a startup notification changes.
 	 * @param id the notification identification
 	 * @param data the notification data
 	 */
-        void gotStartupChange( const KStartupInfoId& id, const KStartupInfoData& data );
+        void gotStartupChange( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
 	/**
 	 * Emitted when a startup notification is removed (either because it was detected
 	 * that the application is ready or because of a timeout).
 	 * @param id the notification identification
 	 * @param data the notification data
 	 */
-        void gotRemoveStartup( const KStartupInfoId& id, const KStartupInfoData& data );
+        void gotRemoveStartup( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
     protected:
 	/**
 	 * 
@@ -354,32 +354,32 @@ class TDECORE_EXPORT KStartupInfo
 	void slot_window_added( WId w );
     private:
         void init( int flags );
-        friend class KStartupInfoPrivate;
+        friend class TDEStartupInfoPrivate;
         void got_startup_info( const TQString& msg_P, bool update_only_P );
         void got_remove_startup_info( const TQString& msg_P );
-        void new_startup_info_internal( const KStartupInfoId& id_P,
+        void new_startup_info_internal( const TDEStartupInfoId& id_P,
             Data& data_P, bool update_only_P );
-        void remove_startup_info_internal( const KStartupInfoId& id_P );
-        void remove_startup_pids( const KStartupInfoId& id, const KStartupInfoData& data );
-        void remove_startup_pids( const KStartupInfoData& data );
-        startup_t check_startup_internal( WId w, KStartupInfoId* id, KStartupInfoData* data );
-        bool find_id( const TQCString& id_P, KStartupInfoId* id_O,
-            KStartupInfoData* data_O );
-        bool find_pid( pid_t pid_P, const TQCString& hostname, KStartupInfoId* id_O,
-            KStartupInfoData* data_O );
+        void remove_startup_info_internal( const TDEStartupInfoId& id_P );
+        void remove_startup_pids( const TDEStartupInfoId& id, const TDEStartupInfoData& data );
+        void remove_startup_pids( const TDEStartupInfoData& data );
+        startup_t check_startup_internal( WId w, TDEStartupInfoId* id, TDEStartupInfoData* data );
+        bool find_id( const TQCString& id_P, TDEStartupInfoId* id_O,
+            TDEStartupInfoData* data_O );
+        bool find_pid( pid_t pid_P, const TQCString& hostname, TDEStartupInfoId* id_O,
+            TDEStartupInfoData* data_O );
         bool find_wclass( TQCString res_name_P, TQCString res_class_P,
-            KStartupInfoId* id_O, KStartupInfoData* data_O );
+            TDEStartupInfoId* id_O, TDEStartupInfoData* data_O );
         static TQCString get_window_hostname( WId w_P );
         void startups_cleanup_internal( bool age_P );
         void clean_all_noncompliant();
         static TQString check_required_startup_fields( const TQString& msg,
-            const KStartupInfoData& data, int screen );
+            const TDEStartupInfoData& data, int screen );
         bool clean_on_cantdetect_; // KDE4 remove unused
         unsigned int timeout;
-        KStartupInfoPrivate* d;
+        TDEStartupInfoPrivate* d;
     };
 
-class KStartupInfoIdPrivate;
+class TDEStartupInfoIdPrivate;
 
 /**
  * Class representing an identification of application startup notification.
@@ -387,24 +387,24 @@ class KStartupInfoIdPrivate;
  * Every existing notification about a starting application has its own unique
  * identification, that's used to identify and manipulate the notification.
  *
- * @see KStartupInfo
- * @see KStartupInfoData
+ * @see TDEStartupInfo
+ * @see TDEStartupInfoData
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class TDECORE_EXPORT KStartupInfoId
+class TDECORE_EXPORT TDEStartupInfoId
     {
     public:
 	/**
 	 * Overloaded operator.
 	 * @return true if the notification identifications are the same
 	 */
-        bool operator==( const KStartupInfoId& id ) const;
+        bool operator==( const TDEStartupInfoId& id ) const;
 	/**
 	 * Overloaded operator.
 	 * @return true if the notification identifications are different
 	 */
-        bool operator!=( const KStartupInfoId& id ) const;
+        bool operator!=( const TDEStartupInfoId& id ) const;
 	/**
 	 * Checks whether the identifier is valid.
 	 * @return true if this object doesn't represent a valid notification identification
@@ -437,22 +437,22 @@ class TDECORE_EXPORT KStartupInfoId
 	/**
 	 * Creates an empty identification
 	 */
-        KStartupInfoId();
+        TDEStartupInfoId();
 	/**
 	 * Copy constructor.
 	 */
-        KStartupInfoId( const KStartupInfoId& data );
-        ~KStartupInfoId();
-        KStartupInfoId& operator=( const KStartupInfoId& data );
-        bool operator<( const KStartupInfoId& id ) const;
+        TDEStartupInfoId( const TDEStartupInfoId& data );
+        ~TDEStartupInfoId();
+        TDEStartupInfoId& operator=( const TDEStartupInfoId& data );
+        bool operator<( const TDEStartupInfoId& id ) const;
     private:
-        KStartupInfoId( const TQString& txt );
+        TDEStartupInfoId( const TQString& txt );
         TQString to_text() const;
-        friend class KStartupInfo;
-        KStartupInfoIdPrivate* d;
+        friend class TDEStartupInfo;
+        TDEStartupInfoIdPrivate* d;
     };
 
-class KStartupInfoDataPrivate;
+class TDEStartupInfoDataPrivate;
 
 /**
  * Class representing data about an application startup notification.
@@ -460,12 +460,12 @@ class KStartupInfoDataPrivate;
  * Such data include the icon of the starting application, the desktop on which
  * the application should start, the binary name of the application, etc.
  *
- * @see KStartupInfo
- * @see KStartupInfoId
+ * @see TDEStartupInfo
+ * @see TDEStartupInfoId
  *
  * @author Lubos Lunak <l.lunak@kde.org>
  */
-class TDECORE_EXPORT KStartupInfoData
+class TDECORE_EXPORT TDEStartupInfoData
     {
     public:
 	/**
@@ -608,13 +608,13 @@ class TDECORE_EXPORT KStartupInfoData
 	
 	/**
 	 * Return the silence status for the startup notification.
-	 * @return KStartupInfoData::Yes if visual feedback is silenced
+	 * @return TDEStartupInfoData::Yes if visual feedback is silenced
 	 * @since 3.1.1
 	 */
 	TriState silent() const;
         
         /**
-         * @obsolete Timestamp is already assigned in KStartupInfoId::initId().
+         * @obsolete Timestamp is already assigned in TDEStartupInfoId::initId().
          * Sets timestamp for the startup notification. The timestamp is expressed
          * as XServer time, and is used to prevent activation of the matching
          * window if user interaction took place after this timestamp.
@@ -624,7 +624,7 @@ class TDECORE_EXPORT KStartupInfoData
         void setTimestamp( unsigned long time );
         
         /**
-         * @obsolete Use KStartupInfoId::timestamp().
+         * @obsolete Use TDEStartupInfoId::timestamp().
          * Return the timestamp for the startup notification, or -1 if no timestamp
          * is set.
          */
@@ -670,26 +670,26 @@ class TDECORE_EXPORT KStartupInfoData
 	 * or the name, won't be rewritten if already set.
 	 * @param data the data to update
 	 */
-        void update( const KStartupInfoData& data );
+        void update( const TDEStartupInfoData& data );
 
 	/**
 	 * Constructor. Initializes all the data to their default empty values.
 	 */
-        KStartupInfoData();
+        TDEStartupInfoData();
 
 	/**
 	 * Copy constructor.
 	 */
-        KStartupInfoData( const KStartupInfoData& data );
-        ~KStartupInfoData();
-        KStartupInfoData& operator=( const KStartupInfoData& data );
+        TDEStartupInfoData( const TDEStartupInfoData& data );
+        ~TDEStartupInfoData();
+        TDEStartupInfoData& operator=( const TDEStartupInfoData& data );
     private:
-        KStartupInfoData( const TQString& txt );
+        TDEStartupInfoData( const TQString& txt );
         TQString to_text() const;
         void remove_pid( pid_t pid );
-        friend class KStartupInfo;
-        friend class KStartupInfo::Data;
-        KStartupInfoDataPrivate* d;
+        friend class TDEStartupInfo;
+        friend class TDEStartupInfo::Data;
+        TDEStartupInfoDataPrivate* d;
     };
 
 #endif //Q_WS_X11
diff --git a/tdecore/kstdaccel.cpp b/tdecore/tdestdaccel.cpp
index cb2d9dbba..ba3e64ca5 100644
--- a/tdecore/kstdaccel.cpp
+++ b/tdecore/tdestdaccel.cpp
@@ -19,95 +19,95 @@
 */
 #define __KSTDACCEL_CPP_ 1
 
-#include "kstdaccel.h"
+#include "tdestdaccel.h"
 
-#include "kaccelaction.h"
-#include "kaccelbase.h"
-#include <kconfig.h>
+#include "tdeaccelaction.h"
+#include "tdeaccelbase.h"
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 
-namespace KStdAccel
+namespace TDEStdAccel
 {
 
-struct KStdAccelInfo
+struct TDEStdAccelInfo
 {
 	StdAccel id;
 	const char* psName;
 	const char* psDesc;
 	int cutDefault, cutDefault4, cutDefault3B, cutDefault4B;
-	KShortcut cut;
+	TDEShortcut cut;
 	bool bInitialized;
 };
 
-/** Array of predefined KStdAccelInfo objects, which cover all
+/** Array of predefined TDEStdAccelInfo objects, which cover all
     the "standard" accelerators. Each enum value from StdAccel
     should appear in this table.
 */
-static KStdAccelInfo g_infoStdAccel[] =
+static TDEStdAccelInfo g_infoStdAccel[] =
 {
-	{AccelNone,            "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, KShortcut(), false },
-	{ Open,                I18N_NOOP("Open"), 0,     Qt::CTRL+Qt::Key_O, 0, 0, 0, KShortcut(), false },
-	{ New,                 I18N_NOOP("New"), 0,      Qt::CTRL+Qt::Key_N, 0, 0, 0, KShortcut(), false },
-	{ Close,               I18N_NOOP("Close"), 0,    Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, KShortcut(), false },
-	{ Save,                I18N_NOOP("Save"), 0,     Qt::CTRL+Qt::Key_S, 0, 0, 0, KShortcut(), false },
-	{ Print,               I18N_NOOP("Print"), 0,    Qt::CTRL+Qt::Key_P, 0, 0, 0, KShortcut(), false },
-	{ Quit,                I18N_NOOP("Quit"), 0,     Qt::CTRL+Qt::Key_Q, 0, 0, 0, KShortcut(), false },
-	{AccelNone,            "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, KShortcut(), false },
-	{ Undo,                I18N_NOOP("Undo"), 0,     Qt::CTRL+Qt::Key_Z, 0, 0, 0, KShortcut(), false },
-	{ Redo,                I18N_NOOP("Redo"), 0,     Qt::CTRL+Qt::SHIFT+Qt::Key_Z, 0, 0, 0, KShortcut(), false },
-	{ Cut,                 I18N_NOOP("Cut"), 0,      Qt::CTRL+Qt::Key_X, 0, Qt::SHIFT+Qt::Key_Delete, 0, KShortcut(), false },
-	{ Copy,                I18N_NOOP("Copy"), 0,     Qt::CTRL+Qt::Key_C, 0, Qt::CTRL+Qt::Key_Insert, 0, KShortcut(), false },
-	{ Paste,               I18N_NOOP("Paste"), 0,    Qt::CTRL+Qt::Key_V, 0, Qt::SHIFT+Qt::Key_Insert, 0, KShortcut(), false },
-	{ PasteSelection,      I18N_NOOP("Paste Selection"), 0, 0, 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, 0, KShortcut(), false },
-	{ SelectAll,           "SelectAll", I18N_NOOP("Select All"), Qt::CTRL+Qt::Key_A, 0, 0, 0, KShortcut(), false },
-	{ Deselect,            I18N_NOOP("Deselect"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_A, 0, 0, 0, KShortcut(), false },
-	{ DeleteWordBack,      "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), Qt::CTRL+Qt::Key_Backspace, 0, 0, 0, KShortcut(), false },
-	{ DeleteWordForward,   "DeleteWordForward", I18N_NOOP("Delete Word Forward"), Qt::CTRL+Qt::Key_Delete, 0,  0, 0, KShortcut(), false },
-	{ Find,                I18N_NOOP("Find"), 0,     Qt::CTRL+Qt::Key_F, 0, 0, 0, KShortcut(), false },
-	{ FindNext,            "FindNext", I18N_NOOP("Find Next"), Qt::Key_F3, 0, 0, 0, KShortcut(), false },
-	{ FindPrev,            "FindPrev", I18N_NOOP("Find Prev"), Qt::SHIFT+Qt::Key_F3, 0, 0, 0, KShortcut(), false },
-	{ Replace,             I18N_NOOP("Replace"), 0,  Qt::CTRL+Qt::Key_R, 0, 0, 0, KShortcut(), false },
-	{AccelNone,            "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, KShortcut(), false },
-	{ Home,                I18N_NOOP2("Opposite to End","Home"), 0,     Qt::CTRL+Qt::Key_Home, 0, Qt::Key_HomePage, 0, KShortcut(), false },
-	{ End,                 I18N_NOOP("End"), 0,      Qt::CTRL+Qt::Key_End, 0, 0, 0, KShortcut(), false },
-	{ BeginningOfLine,     "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, KShortcut(), false},
-	{ EndOfLine,           "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, KShortcut(), false},
-	{ Prior,               I18N_NOOP("Prior"), 0,    TQt::Key_Prior, 0, 0, 0, KShortcut(), false },
-	{ Next,                I18N_NOOP2("Opposite to Prior","Next"), 0,     TQt::Key_Next, 0, 0, 0, KShortcut(), false },
-	{ GotoLine,            "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, KShortcut(), false },
-	{ AddBookmark,         "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, KShortcut(), false },
-	{ ZoomIn,              "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, KShortcut(), false },
-	{ ZoomOut,             "ZoomOut", I18N_NOOP("Zoom Out"), Qt::CTRL+Qt::Key_Minus, 0, 0, 0, KShortcut(), false },
-	{ Up,                  I18N_NOOP("Up"), 0,       Qt::ALT+Qt::Key_Up, 0, 0, 0, KShortcut(), false },
-	{ Back,                I18N_NOOP("Back"), 0,     Qt::ALT+Qt::Key_Left, 0, Qt::Key_Back, 0, KShortcut(), false },
-	{ Forward,             I18N_NOOP("Forward"), 0,  Qt::ALT+Qt::Key_Right, 0, Qt::Key_Forward, 0, KShortcut(), false },
-	{ Reload,              I18N_NOOP("Reload"), 0,   Qt::Key_F5, 0, Qt::Key_Refresh, 0, KShortcut(), false },
-	{ PopupMenuContext,    "PopupMenuContext", I18N_NOOP("Popup Menu Context"), Qt::Key_Menu, 0, 0, 0, KShortcut(), false },
-	{ ShowMenubar,         "ShowMenubar", I18N_NOOP("Show Menu Bar"), Qt::CTRL+Qt::Key_M, 0, 0, 0, KShortcut(), false },
-	{ BackwardWord,        "BackwardWord", I18N_NOOP("Backward Word"), Qt::CTRL+Qt::Key_Left, 0, 0, 0, KShortcut(), false },
-	{ ForwardWord,         "ForwardWord", I18N_NOOP("Forward Word"), Qt::CTRL+Qt::Key_Right, 0, 0, 0, KShortcut(), false },
-	{ TabNext,             I18N_NOOP("Activate Next Tab"), 0,  Qt::CTRL+Qt::Key_Period, 0, Qt::CTRL+Qt::Key_BracketRight, 0, KShortcut(), false },
-	{ TabPrev,             I18N_NOOP("Activate Previous Tab"), 0,   Qt::CTRL+Qt::Key_Comma, 0, Qt::CTRL+Qt::Key_BracketLeft, 0, KShortcut(), false },
-	{ FullScreen,          "FullScreen", I18N_NOOP("Full Screen Mode"), Qt::CTRL+Qt::SHIFT+Qt::Key_F, 0, 0, 0, KShortcut(), false },
-	{AccelNone,            "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, KShortcut(), false },
-	{ Help,                I18N_NOOP("Help"), 0,     Qt::Key_F1, 0, 0, 0, KShortcut(), false },
-	{ WhatsThis,           "WhatsThis", I18N_NOOP("What's This"), Qt::SHIFT+Qt::Key_F1, 0, 0, 0, KShortcut(), false },
-	{AccelNone,            "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, KShortcut(), false },
-	{ TextCompletion,      "TextCompletion", I18N_NOOP("Text Completion"), Qt::CTRL+Qt::Key_E, 0, 0, 0, KShortcut(), false },
-	{ PrevCompletion,      "PrevCompletion", I18N_NOOP("Previous Completion Match"), Qt::CTRL+Qt::Key_Up, 0, 0, 0, KShortcut(), false },
-	{ NextCompletion,      "NextCompletion", I18N_NOOP("Next Completion Match"), Qt::CTRL+Qt::Key_Down, 0, 0, 0, KShortcut(), false },
-	{ SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), Qt::CTRL+Qt::Key_T, 0, 0, 0, KShortcut(), false },
-	{ RotateUp,            "RotateUp", I18N_NOOP("Previous Item in List"), Qt::Key_Up, 0, 0, 0, KShortcut(), false },
-	{ RotateDown,          "RotateDown", I18N_NOOP("Next Item in List"), Qt::Key_Down, 0, 0, 0, KShortcut(), false },
-	{ AccelNone,           0, 0, 0, 0, 0, 0, KShortcut(), false }
+	{AccelNone,            "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, TDEShortcut(), false },
+	{ Open,                I18N_NOOP("Open"), 0,     Qt::CTRL+Qt::Key_O, 0, 0, 0, TDEShortcut(), false },
+	{ New,                 I18N_NOOP("New"), 0,      Qt::CTRL+Qt::Key_N, 0, 0, 0, TDEShortcut(), false },
+	{ Close,               I18N_NOOP("Close"), 0,    Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, TDEShortcut(), false },
+	{ Save,                I18N_NOOP("Save"), 0,     Qt::CTRL+Qt::Key_S, 0, 0, 0, TDEShortcut(), false },
+	{ Print,               I18N_NOOP("Print"), 0,    Qt::CTRL+Qt::Key_P, 0, 0, 0, TDEShortcut(), false },
+	{ Quit,                I18N_NOOP("Quit"), 0,     Qt::CTRL+Qt::Key_Q, 0, 0, 0, TDEShortcut(), false },
+	{AccelNone,            "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, TDEShortcut(), false },
+	{ Undo,                I18N_NOOP("Undo"), 0,     Qt::CTRL+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false },
+	{ Redo,                I18N_NOOP("Redo"), 0,     Qt::CTRL+Qt::SHIFT+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false },
+	{ Cut,                 I18N_NOOP("Cut"), 0,      Qt::CTRL+Qt::Key_X, 0, Qt::SHIFT+Qt::Key_Delete, 0, TDEShortcut(), false },
+	{ Copy,                I18N_NOOP("Copy"), 0,     Qt::CTRL+Qt::Key_C, 0, Qt::CTRL+Qt::Key_Insert, 0, TDEShortcut(), false },
+	{ Paste,               I18N_NOOP("Paste"), 0,    Qt::CTRL+Qt::Key_V, 0, Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false },
+	{ PasteSelection,      I18N_NOOP("Paste Selection"), 0, 0, 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false },
+	{ SelectAll,           "SelectAll", I18N_NOOP("Select All"), Qt::CTRL+Qt::Key_A, 0, 0, 0, TDEShortcut(), false },
+	{ Deselect,            I18N_NOOP("Deselect"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_A, 0, 0, 0, TDEShortcut(), false },
+	{ DeleteWordBack,      "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), Qt::CTRL+Qt::Key_Backspace, 0, 0, 0, TDEShortcut(), false },
+	{ DeleteWordForward,   "DeleteWordForward", I18N_NOOP("Delete Word Forward"), Qt::CTRL+Qt::Key_Delete, 0,  0, 0, TDEShortcut(), false },
+	{ Find,                I18N_NOOP("Find"), 0,     Qt::CTRL+Qt::Key_F, 0, 0, 0, TDEShortcut(), false },
+	{ FindNext,            "FindNext", I18N_NOOP("Find Next"), Qt::Key_F3, 0, 0, 0, TDEShortcut(), false },
+	{ FindPrev,            "FindPrev", I18N_NOOP("Find Prev"), Qt::SHIFT+Qt::Key_F3, 0, 0, 0, TDEShortcut(), false },
+	{ Replace,             I18N_NOOP("Replace"), 0,  Qt::CTRL+Qt::Key_R, 0, 0, 0, TDEShortcut(), false },
+	{AccelNone,            "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, TDEShortcut(), false },
+	{ Home,                I18N_NOOP2("Opposite to End","Home"), 0,     Qt::CTRL+Qt::Key_Home, 0, Qt::Key_HomePage, 0, TDEShortcut(), false },
+	{ End,                 I18N_NOOP("End"), 0,      Qt::CTRL+Qt::Key_End, 0, 0, 0, TDEShortcut(), false },
+	{ BeginningOfLine,     "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, TDEShortcut(), false},
+	{ EndOfLine,           "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, TDEShortcut(), false},
+	{ Prior,               I18N_NOOP("Prior"), 0,    TQt::Key_Prior, 0, 0, 0, TDEShortcut(), false },
+	{ Next,                I18N_NOOP2("Opposite to Prior","Next"), 0,     TQt::Key_Next, 0, 0, 0, TDEShortcut(), false },
+	{ GotoLine,            "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, TDEShortcut(), false },
+	{ AddBookmark,         "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, TDEShortcut(), false },
+	{ ZoomIn,              "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, TDEShortcut(), false },
+	{ ZoomOut,             "ZoomOut", I18N_NOOP("Zoom Out"), Qt::CTRL+Qt::Key_Minus, 0, 0, 0, TDEShortcut(), false },
+	{ Up,                  I18N_NOOP("Up"), 0,       Qt::ALT+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+	{ Back,                I18N_NOOP("Back"), 0,     Qt::ALT+Qt::Key_Left, 0, Qt::Key_Back, 0, TDEShortcut(), false },
+	{ Forward,             I18N_NOOP("Forward"), 0,  Qt::ALT+Qt::Key_Right, 0, Qt::Key_Forward, 0, TDEShortcut(), false },
+	{ Reload,              I18N_NOOP("Reload"), 0,   Qt::Key_F5, 0, Qt::Key_Refresh, 0, TDEShortcut(), false },
+	{ PopupMenuContext,    "PopupMenuContext", I18N_NOOP("Popup Menu Context"), Qt::Key_Menu, 0, 0, 0, TDEShortcut(), false },
+	{ ShowMenubar,         "ShowMenubar", I18N_NOOP("Show Menu Bar"), Qt::CTRL+Qt::Key_M, 0, 0, 0, TDEShortcut(), false },
+	{ BackwardWord,        "BackwardWord", I18N_NOOP("Backward Word"), Qt::CTRL+Qt::Key_Left, 0, 0, 0, TDEShortcut(), false },
+	{ ForwardWord,         "ForwardWord", I18N_NOOP("Forward Word"), Qt::CTRL+Qt::Key_Right, 0, 0, 0, TDEShortcut(), false },
+	{ TabNext,             I18N_NOOP("Activate Next Tab"), 0,  Qt::CTRL+Qt::Key_Period, 0, Qt::CTRL+Qt::Key_BracketRight, 0, TDEShortcut(), false },
+	{ TabPrev,             I18N_NOOP("Activate Previous Tab"), 0,   Qt::CTRL+Qt::Key_Comma, 0, Qt::CTRL+Qt::Key_BracketLeft, 0, TDEShortcut(), false },
+	{ FullScreen,          "FullScreen", I18N_NOOP("Full Screen Mode"), Qt::CTRL+Qt::SHIFT+Qt::Key_F, 0, 0, 0, TDEShortcut(), false },
+	{AccelNone,            "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, TDEShortcut(), false },
+	{ Help,                I18N_NOOP("Help"), 0,     Qt::Key_F1, 0, 0, 0, TDEShortcut(), false },
+	{ WhatsThis,           "WhatsThis", I18N_NOOP("What's This"), Qt::SHIFT+Qt::Key_F1, 0, 0, 0, TDEShortcut(), false },
+	{AccelNone,            "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, TDEShortcut(), false },
+	{ TextCompletion,      "TextCompletion", I18N_NOOP("Text Completion"), Qt::CTRL+Qt::Key_E, 0, 0, 0, TDEShortcut(), false },
+	{ PrevCompletion,      "PrevCompletion", I18N_NOOP("Previous Completion Match"), Qt::CTRL+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+	{ NextCompletion,      "NextCompletion", I18N_NOOP("Next Completion Match"), Qt::CTRL+Qt::Key_Down, 0, 0, 0, TDEShortcut(), false },
+	{ SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), Qt::CTRL+Qt::Key_T, 0, 0, 0, TDEShortcut(), false },
+	{ RotateUp,            "RotateUp", I18N_NOOP("Previous Item in List"), Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+	{ RotateDown,          "RotateDown", I18N_NOOP("Next Item in List"), Qt::Key_Down, 0, 0, 0, TDEShortcut(), false },
+	{ AccelNone,           0, 0, 0, 0, 0, 0, TDEShortcut(), false }
 };
 
-/** Search for the KStdAccelInfo object associated with the given @p id. */
-static KStdAccelInfo* infoPtr( StdAccel id )
+/** Search for the TDEStdAccelInfo object associated with the given @p id. */
+static TDEStdAccelInfo* infoPtr( StdAccel id )
 {
 	if( id != AccelNone ) {
 		// Linear search. Changing the data structure doesn't seem possible
@@ -126,11 +126,11 @@ static KStdAccelInfo* infoPtr( StdAccel id )
 */
 static void initialize( StdAccel id )
 {
-	KConfigGroupSaver saver( KGlobal::config(), "Shortcuts" );
-	KStdAccelInfo* pInfo = infoPtr( id );
+	TDEConfigGroupSaver saver( TDEGlobal::config(), "Shortcuts" );
+	TDEStdAccelInfo* pInfo = infoPtr( id );
 
 	if( !pInfo ) {
-		kdWarning(125) << "KStdAccel: id not found!" << endl; // -- ellis
+		kdWarning(125) << "TDEStdAccel: id not found!" << endl; // -- ellis
 		return;
 	}
 
@@ -147,7 +147,7 @@ static void initialize( StdAccel id )
 
 TQString name( StdAccel id )
 {
-	KStdAccelInfo* pInfo = infoPtr( id );
+	TDEStdAccelInfo* pInfo = infoPtr( id );
 	if( !pInfo )
 		return TQString::null;
 	return pInfo->psName;
@@ -155,27 +155,27 @@ TQString name( StdAccel id )
 
 TQString label( StdAccel id )
 {
-	KStdAccelInfo* pInfo = infoPtr( id );
+	TDEStdAccelInfo* pInfo = infoPtr( id );
 	if( !pInfo )
 		return TQString::null;
 	return i18n((pInfo->psDesc) ? pInfo->psDesc : pInfo->psName);
 }
 
-// TODO: Add psWhatsThis entry to KStdAccelInfo
+// TODO: Add psWhatsThis entry to TDEStdAccelInfo
 TQString whatsThis( StdAccel /*id*/ )
 {
-//	KStdAccelInfo* pInfo = infoPtr( id );
+//	TDEStdAccelInfo* pInfo = infoPtr( id );
 //	if( pInfo && pInfo->psWhatsThis )
 //		return i18n(pInfo->psWhatsThis);
 //	else
 		return TQString::null;
 }
 
-const KShortcut& shortcut( StdAccel id )
+const TDEShortcut& shortcut( StdAccel id )
 {
-	KStdAccelInfo* pInfo = infoPtr( id );
+	TDEStdAccelInfo* pInfo = infoPtr( id );
 	if( !pInfo )
-		return KShortcut::null();
+		return TDEShortcut::null();
 
 	if( !pInfo->bInitialized )
 		initialize( id );
@@ -199,17 +199,17 @@ StdAccel findStdAccel( const KKeySequence& seq )
 	return AccelNone;
 }
 
-KShortcut shortcutDefault( StdAccel id )
+TDEShortcut shortcutDefault( StdAccel id )
 {
-	return (KAccelAction::useFourModifierKeys())
+	return (TDEAccelAction::useFourModifierKeys())
 		? shortcutDefault4(id) : shortcutDefault3(id);
 }
 
-KShortcut shortcutDefault3( StdAccel id )
+TDEShortcut shortcutDefault3( StdAccel id )
 {
-	KShortcut cut;
+	TDEShortcut cut;
 
-	KStdAccelInfo* pInfo = infoPtr( id );
+	TDEStdAccelInfo* pInfo = infoPtr( id );
 	if( pInfo ) {
 		if( pInfo->cutDefault )
 			cut.init( pInfo->cutDefault );
@@ -222,13 +222,13 @@ KShortcut shortcutDefault3( StdAccel id )
 	return cut;
 }
 
-KShortcut shortcutDefault4( StdAccel id )
+TDEShortcut shortcutDefault4( StdAccel id )
 {
-	KShortcut cut;
+	TDEShortcut cut;
 
-	KStdAccelInfo* pInfo = infoPtr( id );
+	TDEStdAccelInfo* pInfo = infoPtr( id );
 	if( pInfo ) {
-		KStdAccelInfo& info = *pInfo;
+		TDEStdAccelInfo& info = *pInfo;
 		KKeySequence key2;
 
 		cut.init( (info.cutDefault4) ?
@@ -247,13 +247,13 @@ KShortcut shortcutDefault4( StdAccel id )
 }
 
 #if 0 // unused
-void createAccelActions( KAccelActions& actions )
+void createAccelActions( TDEAccelActions& actions )
 {
 	actions.clear();
 
 	for( uint i = 0; g_infoStdAccel[i].psName != 0; i++ ) {
 		StdAccel id = g_infoStdAccel[i].id;
-		KStdAccelInfo* pInfo = &g_infoStdAccel[i];
+		TDEStdAccelInfo* pInfo = &g_infoStdAccel[i];
 
 		if( id != AccelNone ) {
 			actions.insert( pInfo->psName,
@@ -267,54 +267,54 @@ void createAccelActions( KAccelActions& actions )
 }
 #endif
 
-const KShortcut& open()                  { return shortcut( Open ); }
-const KShortcut& openNew()               { return shortcut( New ); }
-const KShortcut& close()                 { return shortcut( Close ); }
-const KShortcut& save()                  { return shortcut( Save ); }
-const KShortcut& print()                 { return shortcut( Print ); }
-const KShortcut& quit()                  { return shortcut( Quit ); }
-const KShortcut& cut()                   { return shortcut( Cut ); }
-const KShortcut& copy()                  { return shortcut( Copy ); }
-const KShortcut& paste()                 { return shortcut( Paste ); }
-const KShortcut& pasteSelection()        { return shortcut( PasteSelection ); }
-const KShortcut& deleteWordBack()        { return shortcut( DeleteWordBack ); }
-const KShortcut& deleteWordForward()     { return shortcut( DeleteWordForward ); }
-const KShortcut& undo()                  { return shortcut( Undo ); }
-const KShortcut& redo()                  { return shortcut( Redo ); }
-const KShortcut& find()                  { return shortcut( Find ); }
-const KShortcut& findNext()              { return shortcut( FindNext ); }
-const KShortcut& findPrev()              { return shortcut( FindPrev ); }
-const KShortcut& replace()               { return shortcut( Replace ); }
-const KShortcut& home()                  { return shortcut( Home ); }
-const KShortcut& end()                   { return shortcut( End ); }
-const KShortcut& beginningOfLine()       { return shortcut( BeginningOfLine ); }
-const KShortcut& endOfLine()             { return shortcut( EndOfLine ); }
-const KShortcut& prior()                 { return shortcut( Prior ); }
-const KShortcut& next()                  { return shortcut( Next ); }
-const KShortcut& backwardWord()          { return shortcut( BackwardWord ); }
-const KShortcut& forwardWord()           { return shortcut( ForwardWord ); }
-const KShortcut& gotoLine()              { return shortcut( GotoLine ); }
-const KShortcut& addBookmark()           { return shortcut( AddBookmark ); }
-const KShortcut& tabNext()               { return shortcut( TabNext ); }
-const KShortcut& tabPrev()               { return shortcut( TabPrev ); }
-const KShortcut& fullScreen()            { return shortcut( FullScreen ); }
-const KShortcut& zoomIn()                { return shortcut( ZoomIn ); }
-const KShortcut& zoomOut()               { return shortcut( ZoomOut ); }
-const KShortcut& help()                  { return shortcut( Help ); }
-const KShortcut& completion()            { return shortcut( TextCompletion ); }
-const KShortcut& prevCompletion()        { return shortcut( PrevCompletion ); }
-const KShortcut& nextCompletion()        { return shortcut( NextCompletion ); }
-const KShortcut& rotateUp()              { return shortcut( RotateUp ); }
-const KShortcut& rotateDown()            { return shortcut( RotateDown ); }
-const KShortcut& substringCompletion()   { return shortcut( SubstringCompletion ); }
-const KShortcut& popupMenuContext()      { return shortcut( PopupMenuContext ); }
-const KShortcut& whatsThis()             { return shortcut( WhatsThis ); }
-const KShortcut& reload()                { return shortcut( Reload ); }
-const KShortcut& selectAll()             { return shortcut( SelectAll ); }
-const KShortcut& up()                    { return shortcut( Up ); }
-const KShortcut& back()                  { return shortcut( Back ); }
-const KShortcut& forward()               { return shortcut( Forward ); }
-const KShortcut& showMenubar()           { return shortcut( ShowMenubar ); }
+const TDEShortcut& open()                  { return shortcut( Open ); }
+const TDEShortcut& openNew()               { return shortcut( New ); }
+const TDEShortcut& close()                 { return shortcut( Close ); }
+const TDEShortcut& save()                  { return shortcut( Save ); }
+const TDEShortcut& print()                 { return shortcut( Print ); }
+const TDEShortcut& quit()                  { return shortcut( Quit ); }
+const TDEShortcut& cut()                   { return shortcut( Cut ); }
+const TDEShortcut& copy()                  { return shortcut( Copy ); }
+const TDEShortcut& paste()                 { return shortcut( Paste ); }
+const TDEShortcut& pasteSelection()        { return shortcut( PasteSelection ); }
+const TDEShortcut& deleteWordBack()        { return shortcut( DeleteWordBack ); }
+const TDEShortcut& deleteWordForward()     { return shortcut( DeleteWordForward ); }
+const TDEShortcut& undo()                  { return shortcut( Undo ); }
+const TDEShortcut& redo()                  { return shortcut( Redo ); }
+const TDEShortcut& find()                  { return shortcut( Find ); }
+const TDEShortcut& findNext()              { return shortcut( FindNext ); }
+const TDEShortcut& findPrev()              { return shortcut( FindPrev ); }
+const TDEShortcut& replace()               { return shortcut( Replace ); }
+const TDEShortcut& home()                  { return shortcut( Home ); }
+const TDEShortcut& end()                   { return shortcut( End ); }
+const TDEShortcut& beginningOfLine()       { return shortcut( BeginningOfLine ); }
+const TDEShortcut& endOfLine()             { return shortcut( EndOfLine ); }
+const TDEShortcut& prior()                 { return shortcut( Prior ); }
+const TDEShortcut& next()                  { return shortcut( Next ); }
+const TDEShortcut& backwardWord()          { return shortcut( BackwardWord ); }
+const TDEShortcut& forwardWord()           { return shortcut( ForwardWord ); }
+const TDEShortcut& gotoLine()              { return shortcut( GotoLine ); }
+const TDEShortcut& addBookmark()           { return shortcut( AddBookmark ); }
+const TDEShortcut& tabNext()               { return shortcut( TabNext ); }
+const TDEShortcut& tabPrev()               { return shortcut( TabPrev ); }
+const TDEShortcut& fullScreen()            { return shortcut( FullScreen ); }
+const TDEShortcut& zoomIn()                { return shortcut( ZoomIn ); }
+const TDEShortcut& zoomOut()               { return shortcut( ZoomOut ); }
+const TDEShortcut& help()                  { return shortcut( Help ); }
+const TDEShortcut& completion()            { return shortcut( TextCompletion ); }
+const TDEShortcut& prevCompletion()        { return shortcut( PrevCompletion ); }
+const TDEShortcut& nextCompletion()        { return shortcut( NextCompletion ); }
+const TDEShortcut& rotateUp()              { return shortcut( RotateUp ); }
+const TDEShortcut& rotateDown()            { return shortcut( RotateDown ); }
+const TDEShortcut& substringCompletion()   { return shortcut( SubstringCompletion ); }
+const TDEShortcut& popupMenuContext()      { return shortcut( PopupMenuContext ); }
+const TDEShortcut& whatsThis()             { return shortcut( WhatsThis ); }
+const TDEShortcut& reload()                { return shortcut( Reload ); }
+const TDEShortcut& selectAll()             { return shortcut( SelectAll ); }
+const TDEShortcut& up()                    { return shortcut( Up ); }
+const TDEShortcut& back()                  { return shortcut( Back ); }
+const TDEShortcut& forward()               { return shortcut( Forward ); }
+const TDEShortcut& showMenubar()           { return shortcut( ShowMenubar ); }
 
 //---------------------------------------------------------------------
 // ShortcutList
@@ -345,24 +345,24 @@ TQString ShortcutList::label( uint i ) const
 TQString ShortcutList::whatsThis( uint ) const
 	{ return TQString::null; }
 
-const KShortcut& ShortcutList::shortcut( uint i ) const
+const TDEShortcut& ShortcutList::shortcut( uint i ) const
 {
 	if( !g_infoStdAccel[i].bInitialized )
 		initialize( g_infoStdAccel[i].id );
 	return g_infoStdAccel[i].cut;
 }
 
-const KShortcut& ShortcutList::shortcutDefault( uint i ) const
+const TDEShortcut& ShortcutList::shortcutDefault( uint i ) const
 {
-	static KShortcut cut;
-	cut = KStdAccel::shortcutDefault( g_infoStdAccel[i].id );
+	static TDEShortcut cut;
+	cut = TDEStdAccel::shortcutDefault( g_infoStdAccel[i].id );
 	return cut;
 }
 
 bool ShortcutList::isConfigurable( uint i ) const
 	{ return (g_infoStdAccel[i].id != AccelNone); }
 
-bool ShortcutList::setShortcut( uint i, const KShortcut& cut )
+bool ShortcutList::setShortcut( uint i, const TDEShortcut& cut )
 	{ g_infoStdAccel[i].cut = cut; return true; }
 
 TQVariant ShortcutList::getOther( Other, uint ) const
diff --git a/tdecore/kstdaccel.h b/tdecore/tdestdaccel.h
index 813255cc3..3914794f6 100644
--- a/tdecore/kstdaccel.h
+++ b/tdecore/tdestdaccel.h
@@ -21,24 +21,24 @@
 #define KSTDACCEL_H
 
 #include <tqstring.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include "tdelibs_export.h"
 
 class TQKeyEvent;
-class KAccelActions;
+class TDEAccelActions;
 
 /**
- * \namespace KStdAccel
+ * \namespace TDEStdAccel
  * Convenient methods for access to the common accelerator keys in
  * the key configuration. These are the standard keybindings that should
  * be used in all KDE applications. They will be configurable,
  * so do not hardcode the default behavior.
  *
  * If you want real configurable keybindings in your applications,
- * please checkout the class KAccel in kaccel.h
- * @see KAccelShortcutList
+ * please checkout the class TDEAccel in tdeaccel.h
+ * @see TDEAccelShortcutList
  */
-namespace KStdAccel
+namespace TDEStdAccel
 {
   // Always add new std-accels to the end of this enum, never in the middle!
   /**
@@ -87,7 +87,7 @@ namespace KStdAccel
    * Returns the keybinding for @p accel.
    * @param id the id of the accelerator
    */
-  TDECORE_EXPORT const KShortcut& shortcut(StdAccel id);
+  TDECORE_EXPORT const TDEShortcut& shortcut(StdAccel id);
 
   /**
    * Returns a unique name for the given accel.
@@ -126,326 +126,326 @@ namespace KStdAccel
    * @param id the id of the accelerator
    * @return the default shortcut of the accelerator
    */
-  TDECORE_EXPORT KShortcut shortcutDefault(StdAccel id);
+  TDECORE_EXPORT TDEShortcut shortcutDefault(StdAccel id);
   /**
    * Returns the hardcoded default 3 modifier shortcut for @p id.
    * This does not take into account the user's configuration.
    * @param id the id of the accelerator
    * @return the default 3 modifier shortcut
    */
-  TDECORE_EXPORT KShortcut shortcutDefault3(StdAccel id);
+  TDECORE_EXPORT TDEShortcut shortcutDefault3(StdAccel id);
   /**
    * Returns the hardcoded default 4 modifier shortcut for @p id.
    * This does not take into account the user's configuration.
    * @param id the id of the accelerator
    * @return the default 4 modifier shortcut
    */
-  TDECORE_EXPORT KShortcut shortcutDefault4(StdAccel id);
+  TDECORE_EXPORT TDEShortcut shortcutDefault4(StdAccel id);
 
   /**
    * Open file. Default: Ctrl-o
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& open();
+  TDECORE_EXPORT const TDEShortcut& open();
 
   /**
    * Create a new document (or whatever). Default: Ctrl-n
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& openNew();
+  TDECORE_EXPORT const TDEShortcut& openNew();
 
   /**
    * Close current document. Default: Ctrl-w
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& close();
+  TDECORE_EXPORT const TDEShortcut& close();
 
   /**
    * Save current document. Default: Ctrl-s
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& save();
+  TDECORE_EXPORT const TDEShortcut& save();
 
   /**
    * Print current document. Default: Ctrl-p
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& print();
+  TDECORE_EXPORT const TDEShortcut& print();
 
   /**
    * Quit the program. Default: Ctrl-q
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& quit();
+  TDECORE_EXPORT const TDEShortcut& quit();
 
   /**
    * Undo last operation. Default: Ctrl-z
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& undo();
+  TDECORE_EXPORT const TDEShortcut& undo();
 
   /**
    * Redo. Default: Shift-Ctrl-z
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& redo();
+  TDECORE_EXPORT const TDEShortcut& redo();
 
   /**
    * Cut selected area and store it in the clipboard. Default: Ctrl-x
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& cut();
+  TDECORE_EXPORT const TDEShortcut& cut();
 
   /**
    * Copy selected area into the clipboard. Default: Ctrl-c
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& copy();
+  TDECORE_EXPORT const TDEShortcut& copy();
 
   /**
    * Paste contents of clipboard at mouse/cursor position. Default: Ctrl-v
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& paste();
+  TDECORE_EXPORT const TDEShortcut& paste();
 
   /**
    * Paste the selection at mouse/cursor position. Default: Ctrl-Shift-Insert
    * @return the shortcut of the standard accelerator
    * @since 3.4
    */
-  TDECORE_EXPORT const KShortcut& pasteSelection();
+  TDECORE_EXPORT const TDEShortcut& pasteSelection();
 
   /**
    * Reload. Default: Ctrl-A
    * @return the shortcut of the standard accelerator
    **/
-  TDECORE_EXPORT const KShortcut& selectAll();
+  TDECORE_EXPORT const TDEShortcut& selectAll();
 
   /**
    * Delete a word back from mouse/cursor position. Default: Ctrl-Backspace
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& deleteWordBack();
+  TDECORE_EXPORT const TDEShortcut& deleteWordBack();
 
   /**
    * Delete a word forward from mouse/cursor position. Default: Ctrl-Delete
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& deleteWordForward();
+  TDECORE_EXPORT const TDEShortcut& deleteWordForward();
 
   /**
    * Find, search. Default: Ctrl-f
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& find();
+  TDECORE_EXPORT const TDEShortcut& find();
 
   /**
    * Find/search next. Default: F3
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& findNext();
+  TDECORE_EXPORT const TDEShortcut& findNext();
 
   /**
    * Find/search previous. Default: Shift-F3
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& findPrev();
+  TDECORE_EXPORT const TDEShortcut& findPrev();
 
   /**
    * Find and replace matches. Default: Ctrl-r
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& replace();
+  TDECORE_EXPORT const TDEShortcut& replace();
 
   /**
    * Zoom in. Default: Ctrl-Plus
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& zoomIn();
+  TDECORE_EXPORT const TDEShortcut& zoomIn();
 
   /**
    * Zoom out. Default: Ctrl-Minus
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& zoomOut();
+  TDECORE_EXPORT const TDEShortcut& zoomOut();
 
   /**
    * Toggle insert/overwrite (with visual feedback, e.g. in the statusbar). Default: Insert
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& insert();
+  TDECORE_EXPORT const TDEShortcut& insert();
 
   /**
    * Goto beginning of the document. Default: Ctrl-Home
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& home();
+  TDECORE_EXPORT const TDEShortcut& home();
 
   /**
    * Goto end of the document. Default: Ctrl-End
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& end();
+  TDECORE_EXPORT const TDEShortcut& end();
 
   /**
    * Goto beginning of current line. Default: Home
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  TDECORE_EXPORT const KShortcut& beginningOfLine();
+  TDECORE_EXPORT const TDEShortcut& beginningOfLine();
 
   /**
    * Goto end of current line. Default: End
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  TDECORE_EXPORT const KShortcut& endOfLine();
+  TDECORE_EXPORT const TDEShortcut& endOfLine();
 
   /**
    * Scroll up one page. Default: Prior
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& prior();
+  TDECORE_EXPORT const TDEShortcut& prior();
 
   /**
    * Scroll down one page. Default: Next
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& next();
+  TDECORE_EXPORT const TDEShortcut& next();
 
   /**
    * Go to line. Default: Ctrl+G
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& gotoLine();
+  TDECORE_EXPORT const TDEShortcut& gotoLine();
 
   /**
    * Add current page to bookmarks. Default: Ctrl+B
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& addBookmark();
+  TDECORE_EXPORT const TDEShortcut& addBookmark();
 
   /**
    * Next Tab. Default: Ctrl-<
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  TDECORE_EXPORT const KShortcut& tabNext();
+  TDECORE_EXPORT const TDEShortcut& tabNext();
 
   /**
    * Previous Tab. Default: Ctrl->
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  TDECORE_EXPORT const KShortcut& tabPrev();
+  TDECORE_EXPORT const TDEShortcut& tabPrev();
 
   /**
    * Full Screen Mode. Default: Ctrl+Shift+F
    * @return the shortcut of the standard accelerator
    * @since 3.2
    */
-  TDECORE_EXPORT const KShortcut& fullScreen();
+  TDECORE_EXPORT const TDEShortcut& fullScreen();
 
   /**
    * Help the user in the current situation. Default: F1
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& help();
+  TDECORE_EXPORT const TDEShortcut& help();
 
   /**
    * Complete text in input widgets. Default Ctrl+E
    * @return the shortcut of the standard accelerator
    **/
-  TDECORE_EXPORT const KShortcut& completion();
+  TDECORE_EXPORT const TDEShortcut& completion();
 
   /**
    * Iterate through a list when completion returns
    * multiple items. Default: Ctrl+Up
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& prevCompletion();
+  TDECORE_EXPORT const TDEShortcut& prevCompletion();
 
   /**
    * Iterate through a list when completion returns
    * multiple items. Default: Ctrl+Down
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& nextCompletion();
+  TDECORE_EXPORT const TDEShortcut& nextCompletion();
 
   /**
    * Find a string within another string or list of strings.
    * Default: Ctrl-T
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& substringCompletion();
+  TDECORE_EXPORT const TDEShortcut& substringCompletion();
 
   /**
    * Help users iterate through a list of entries. Default: Up
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& rotateUp();
+  TDECORE_EXPORT const TDEShortcut& rotateUp();
 
   /**
    * Help users iterate through a list of entries. Default: Down
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& rotateDown();
+  TDECORE_EXPORT const TDEShortcut& rotateDown();
 
   /**
    * popup a context menu. Default: Menu
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& popupMenuContext();
+  TDECORE_EXPORT const TDEShortcut& popupMenuContext();
 
   /**
    * What's This button. Default: Shift+F1
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& whatsThis();
+  TDECORE_EXPORT const TDEShortcut& whatsThis();
 
   /**
    * Reload. Default: F5
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& reload();
+  TDECORE_EXPORT const TDEShortcut& reload();
 
   /**
    * Up. Default: Alt+Up
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& up();
+  TDECORE_EXPORT const TDEShortcut& up();
 
   /**
    * Back. Default: Alt+Left
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& back();
+  TDECORE_EXPORT const TDEShortcut& back();
 
   /**
    * Forward. Default: ALT+Right
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& forward();
+  TDECORE_EXPORT const TDEShortcut& forward();
 
   /**
    * BackwardWord. Default: Ctrl+Left
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  TDECORE_EXPORT const KShortcut& backwardWord();
+  TDECORE_EXPORT const TDEShortcut& backwardWord();
 
   /**
    * ForwardWord. Default: Ctrl+Right
    * @return the shortcut of the standard accelerator
    * @since 3.3
    */
-  TDECORE_EXPORT const KShortcut& forwardWord();
+  TDECORE_EXPORT const TDEShortcut& forwardWord();
 
   /**
    * Show Menu Bar.  Default: Ctrl-M
    * @return the shortcut of the standard accelerator
    */
-  TDECORE_EXPORT const KShortcut& showMenubar();
+  TDECORE_EXPORT const TDEShortcut& showMenubar();
 
 #if !defined(KDE_NO_COMPAT) && !defined(__KSTDACCEL_CPP_)
   /**
diff --git a/tdecore/ksycoca.cpp b/tdecore/tdesycoca.cpp
index 3e30aa7c1..8f5ede967 100644
--- a/tdecore/ksycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -18,17 +18,17 @@
 
 #include "config.h"
 
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocafactory.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocafactory.h"
 
 #include <tqdatastream.h>
 #include <tqfile.h>
 #include <tqbuffer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
@@ -87,7 +87,7 @@ int KSycoca::version()
 
 // Read-only constructor
 KSycoca::KSycoca()
-  : DCOPObject("ksycoca"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
+  : DCOPObject("tdesycoca"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
     m_sycoca_size(0), m_sycoca_mmap(0), m_timeStamp(0)
 {
    d = new KSycocaPrivate;
@@ -112,21 +112,21 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
    m_str = 0;
    m_barray = 0;
    TQString path;
-   TQCString ksycoca_env = getenv("TDESYCOCA");
-   if (ksycoca_env.isEmpty())
-      path = KGlobal::dirs()->saveLocation("cache") + "ksycoca";
+   TQCString tdesycoca_env = getenv("TDESYCOCA");
+   if (tdesycoca_env.isEmpty())
+      path = TDEGlobal::dirs()->saveLocation("cache") + "tdesycoca";
    else
-      path = TQFile::decodeName(ksycoca_env);
+      path = TQFile::decodeName(tdesycoca_env);
 
-   kdDebug(7011) << "Trying to open ksycoca from " << path << endl;
+   kdDebug(7011) << "Trying to open tdesycoca from " << path << endl;
    TQFile *database = new TQFile(path);
    bool bOpen = database->open( IO_ReadOnly );
    if (!bOpen)
    {
-     path = locate("services", "ksycoca");
+     path = locate("services", "tdesycoca");
      if (!path.isEmpty())
      {
-       kdDebug(7011) << "Trying to open global ksycoca from " << path << endl;
+       kdDebug(7011) << "Trying to open global tdesycoca from " << path << endl;
        delete database;
        database = new TQFile(path);
        bOpen = database->open( IO_ReadOnly );
@@ -166,7 +166,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
    }
    else
    {
-     kdDebug(7011) << "Could not open ksycoca" << endl;
+     kdDebug(7011) << "Could not open tdesycoca" << endl;
 
      // No database file
      delete database;
@@ -197,7 +197,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
 
 // Read-write constructor - only for KBuildSycoca
 KSycoca::KSycoca( bool /* dummy */ )
-  : DCOPObject("ksycoca_building"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
+  : DCOPObject("tdesycoca_building"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
     m_sycoca_size(0), m_sycoca_mmap(0)
 {
    d = new KSycocaPrivate;
@@ -206,14 +206,14 @@ KSycoca::KSycoca( bool /* dummy */ )
    _self = this;
 }
 
-static void delete_ksycoca_self() {
+static void delete_tdesycoca_self() {
   delete KSycoca::_self;
 }
 
 KSycoca * KSycoca::self()
 {
     if (!_self) {
-        tqAddPostRoutine(delete_ksycoca_self);
+        tqAddPostRoutine(delete_tdesycoca_self);
         _self = new KSycoca();
     }
   return _self;
@@ -333,7 +333,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id)
          {
            triedLaunchingKdeinit = true;
            kdDebug(7011) << "findFactory: we have no database.... launching tdeinit" << endl;
-           KApplication::startKdeinit();
+           TDEApplication::startKdeinit();
            // Ok, the new database should be here now, open it.
          }
          if (!openDatabase(false))
@@ -424,7 +424,7 @@ TQStringList KSycoca::allResourceDirs()
 TQString KSycoca::determineRelativePath( const TQString & _fullpath, const char *_resource )
 {
   TQString sRelativeFilePath;
-  TQStringList dirs = KGlobal::dirs()->resourceDirs( _resource );
+  TQStringList dirs = TDEGlobal::dirs()->resourceDirs( _resource );
   TQStringList::ConstIterator dirsit = dirs.begin();
   for ( ; dirsit != dirs.end() && sRelativeFilePath.isEmpty(); ++dirsit ) {
     // might need canonicalPath() ...
@@ -450,7 +450,7 @@ void KSycoca::flagError()
          return;
       _self->d->readError = true;
       if (_self->d->autoRebuild)
-         if(system("kbuildsycoca") < 0) // Rebuild the damned thing.
+         if(system("tdebuildsycoca") < 0) // Rebuild the damned thing.
 	   tqWarning("ERROR: Running KSycoca failed.");
    }
 }
@@ -525,4 +525,4 @@ void KSycoca::virtual_hook( int id, void* data )
 void KSycocaEntry::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "ksycoca.moc"
+#include "tdesycoca.moc"
diff --git a/tdecore/ksycoca.h b/tdecore/tdesycoca.h
index adf9d2aa7..4b43d4607 100644
--- a/tdecore/ksycoca.h
+++ b/tdecore/tdesycoca.h
@@ -16,13 +16,13 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycoca_h__
-#define __ksycoca_h__
+#ifndef __tdesycoca_h__
+#define __tdesycoca_h__
 
 #include <dcopobject.h>
 #include <tqobject.h>
 #include <tqstringlist.h>
-#include "ksycocatype.h"
+#include "tdesycocatype.h"
 #include <tdelibs_export.h>
 
 class TQDataStream;
@@ -99,7 +99,7 @@ public:
     * @internal - returns update signature of database
     *
     * Signature that keeps track of changes to
-    * $TDEDIR/share/services/update_ksycoca
+    * $TDEDIR/share/services/update_tdesycoca
     *
     * Touching this file causes the database to be recreated
     * from scratch.
@@ -124,7 +124,7 @@ public:
    virtual bool isBuilding() { return false; }
 
    /**
-    * @internal - disables launching of kbuildsycoca
+    * @internal - disables launching of tdebuildsycoca
     */
    void disableAutoRebuild();
 
@@ -136,7 +136,7 @@ public:
    /**
     * When you receive a "databaseChanged" signal, you can query here if
     * a change has occurred in a specific resource type.
-    * @see KStandardDirs for the various resource types.
+    * @see TDEStandardDirs for the various resource types.
     */
    static bool isChanged(const char *type);
 
@@ -152,7 +152,7 @@ public:
 
 k_dcop:
    /**
-    * internal function for receiving kded/kbuildsycoca's signal, when the sycoca file changes
+    * internal function for receiving kded/tdebuildsycoca's signal, when the sycoca file changes
     */
    void notifyDatabaseChanged(const TQStringList &);
 
diff --git a/tdecore/ksycocadict.cpp b/tdecore/tdesycocadict.cpp
index d8dcf3a24..702c163a7 100644
--- a/tdecore/ksycocadict.cpp
+++ b/tdecore/tdesycocadict.cpp
@@ -16,9 +16,9 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "ksycocadict.h"
-#include "ksycocaentry.h"
-#include "ksycoca.h"
+#include "tdesycocadict.h"
+#include "tdesycocaentry.h"
+#include "tdesycoca.h"
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
diff --git a/tdecore/ksycocadict.h b/tdecore/tdesycocadict.h
index 79f1432e8..006e72a61 100644
--- a/tdecore/ksycocadict.h
+++ b/tdecore/tdesycocadict.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocadict_h__
-#define __ksycocadict_h__
+#ifndef __tdesycocadict_h__
+#define __tdesycocadict_h__
 
 #include <tqstring.h>
 #include <tqvaluelist.h>
diff --git a/tdecore/ksycocaentry.h b/tdecore/tdesycocaentry.h
index a3071ec5a..d7ddbaf20 100644
--- a/tdecore/ksycocaentry.h
+++ b/tdecore/tdesycocaentry.h
@@ -16,10 +16,10 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocaentry_h__
-#define __ksycocaentry_h__
+#ifndef __tdesycocaentry_h__
+#define __tdesycocaentry_h__
 
-#include "ksycocatype.h"
+#include "tdesycocatype.h"
 
 #include <tqstringlist.h>
 #include <ksharedptr.h>
@@ -32,9 +32,9 @@ class TQDataStream;
  * the common functionality for servicetypes and services.
  * 
  * @internal
- * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/ksycoca.html 
+ * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdesycoca.html 
  */
-class TDECORE_EXPORT KSycocaEntry : public KShared
+class TDECORE_EXPORT KSycocaEntry : public TDEShared
 {
  
 public:
@@ -42,7 +42,7 @@ public:
    virtual KSycocaType sycocaType() const { return KST_KSycocaEntry; }
 
 public:
-  typedef KSharedPtr<KSycocaEntry> Ptr;
+  typedef TDESharedPtr<KSycocaEntry> Ptr;
   typedef TQValueList<Ptr> List;
 public: // KDoc seems to barf on those typedefs and generates no docs after them
    /**
diff --git a/tdecore/ksycocafactory.cpp b/tdecore/tdesycocafactory.cpp
index c224ebe79..bffd12b6a 100644
--- a/tdecore/ksycocafactory.cpp
+++ b/tdecore/tdesycocafactory.cpp
@@ -16,17 +16,17 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocafactory.h"
-#include "ksycocaentry.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocafactory.h"
+#include "tdesycocaentry.h"
+#include "tdesycocadict.h"
 #include <tqstringlist.h>
 #include <tqdict.h>
 #include <kdebug.h>
 
 template class TQDict<KSycocaEntry>;
-template class TQDict<KSharedPtr<KSycocaEntry> >;
+template class TQDict<TDESharedPtr<KSycocaEntry> >;
 
 KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id)
  : m_resourceList(0), m_entryDict(0), m_sycocaDict(0)
diff --git a/tdecore/ksycocafactory.h b/tdecore/tdesycocafactory.h
index 100047834..4569fff5a 100644
--- a/tdecore/ksycocafactory.h
+++ b/tdecore/tdesycocafactory.h
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __ksycocafactory_h__
-#define __ksycocafactory_h__
+#ifndef __tdesycocafactory_h__
+#define __tdesycocafactory_h__
 
-#include "ksycocatype.h"
-#include "ksycocaentry.h"
+#include "tdesycocatype.h"
+#include "tdesycocaentry.h"
 
 #include <tqdict.h>
 #include <tqptrlist.h>
diff --git a/tdecore/ksycocatype.h b/tdecore/tdesycocatype.h
index 889c3be6d..8407782fc 100644
--- a/tdecore/ksycocatype.h
+++ b/tdecore/tdesycocatype.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __ksycocatype_h__
-#define __ksycocatype_h__
+#ifndef __tdesycocatype_h__
+#define __tdesycocatype_h__
 
 /**
  * \relates KSycocaEntry
diff --git a/tdecore/ktempfile.cpp b/tdecore/tdetempfile.cpp
index 4632f0053..805d315a1 100644
--- a/tdecore/ktempfile.cpp
+++ b/tdecore/tdetempfile.cpp
@@ -48,10 +48,10 @@
 #include <tqdatastream.h>
 #include <tqtextstream.h>
 
-#include "kglobal.h"
-#include "kapplication.h"
+#include "tdeglobal.h"
+#include "tdeapplication.h"
 #include "kinstance.h"
-#include "ktempfile.h"
+#include "tdetempfile.h"
 #include "kstandarddirs.h"
 #include "kde_file.h"
 #include "kdebug.h"
@@ -71,7 +71,7 @@ KTempFile::KTempFile(TQString filePrefix, TQString fileExtension, int mode)
       fileExtension = ".tmp";
    if (filePrefix.isEmpty())
    {
-      filePrefix = locateLocal("tmp", KGlobal::instance()->instanceName());
+      filePrefix = locateLocal("tmp", TDEGlobal::instance()->instanceName());
    }
    (void) create(filePrefix, fileExtension, mode);
 }
@@ -93,7 +93,7 @@ KTempFile::create(const TQString &filePrefix, const TQString &fileExtension,
 		  int mode)
 {
    // make sure the random seed is randomized
-   (void) KApplication::random();
+   (void) TDEApplication::random();
 
    TQCString ext = TQFile::encodeName(fileExtension);
    TQCString nme = TQFile::encodeName(filePrefix) + "XXXXXX" + ext;
diff --git a/tdecore/ktempfile.h b/tdecore/tdetempfile.h
index 38cd8b5aa..abc78ffbf 100644
--- a/tdecore/ktempfile.h
+++ b/tdecore/tdetempfile.h
@@ -48,7 +48,7 @@ class KTempFilePrivate;
  *
  * KTempFile does not create any missing directories, but locateLocal() does.
  *
- * See also KStandardDirs
+ * See also TDEStandardDirs
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
diff --git a/tdecore/tests/KIDLTest.cpp b/tdecore/tests/KIDLTest.cpp
index e714bc52f..a54e32be5 100644
--- a/tdecore/tests/KIDLTest.cpp
+++ b/tdecore/tests/KIDLTest.cpp
@@ -1,6 +1,6 @@
 #include "KIDLTest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 KIDLTest::KIDLTest( const TQCString& id )
@@ -18,7 +18,7 @@ TQString KIDLTest::hello( const TQString& name )
 
 int main( int argc, char** argv )
 {
-    KApplication app( argc, argv, "kidlservertest", false /* No GUI */ );
+    TDEApplication app( argc, argv, "kidlservertest", false /* No GUI */ );
 
     app.dcopClient()->attach();
     app.dcopClient()->registerAs( "kidlservertest" );
diff --git a/tdecore/tests/KIDLTestClient.cpp b/tdecore/tests/KIDLTestClient.cpp
index 87884c05a..4614ed51e 100644
--- a/tdecore/tests/KIDLTestClient.cpp
+++ b/tdecore/tests/KIDLTestClient.cpp
@@ -1,11 +1,11 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include "KIDLTest_stub.h"
 
 int main( int argc, char** argv )
 {
-    KApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ );
+    TDEApplication app( argc, argv, "KIDLTestClient", false /* No GUI */ );
 
     kapp->dcopClient()->attach();
     // kapp->dcopClient()->registerAs( "kidlclienttest" );
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index e35ae68a4..a831eb65c 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -21,16 +21,16 @@ INCLUDES = -I$(top_srcdir)/tdecore $(all_includes)
 
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 
-check_PROGRAMS = kconfigtestgui klocaletest kprocesstest ksimpleconfigtest \
+check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \
 	kstddirstest kurltest kuniqueapptest ktempfiletest krandomsequencetest \
 	kdebugtest ksocktest kstringhandlertest kcmdlineargstest kapptest \
 	kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \
 	cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
 	ksortablevaluelisttest krfcdatetest testqtargs kprociotest \
 	kcharsetstest kcalendartest kmacroexpandertest kshelltest \
-	kxerrorhandlertest startserviceby kstdacceltest kglobaltest ktimezonestest
+	kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest
 
-TESTS = kurltest kstdacceltest
+TESTS = kurltest tdestdacceltest
 
 noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
 		kipctest.h kprociotest.h
@@ -38,10 +38,10 @@ noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
 METASOURCES = AUTO
 
 LDADD = ../libtdecore.la
-kconfigtestgui_SOURCES = kconfigtestgui.cpp
+tdeconfigtestgui_SOURCES = tdeconfigtestgui.cpp
 kdebugtest_SOURCES = kdebugtest.cpp
 klocaletest_SOURCES = klocaletest.cpp
-#klocaletest2_SOURCES = klocaletest2.cpp klocale.cpp libintl.cpp kcatalogue.cpp
+#klocaletest2_SOURCES = klocaletest2.cpp tdelocale.cpp libintl.cpp kcatalogue.cpp
 #kcatalogue_SOURCES = kcatalogue.cpp libintl.cpp
 ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp
 kurltest_SOURCES = kurltest.cpp
@@ -75,12 +75,12 @@ kmacroexpandertest_SOURCES = kmacroexpandertest.cpp
 kshelltest_SOURCES = kshelltest.cpp
 kxerrorhandlertest_SOURCES = kxerrorhandlertest.cpp
 startserviceby_SOURCES = startserviceby.cpp
-kstdacceltest_SOURCES = kstdacceltest.cpp
+tdestdacceltest_SOURCES = tdestdacceltest.cpp
 kglobaltest_SOURCES = kglobaltest.cpp
 ktimezonestest_SOURCES = ktimezonestest.cpp
 
-check_LTLIBRARIES = kunittest_kconfig.la
+check_LTLIBRARIES = tdeunittest_tdeconfig.la
 
-kunittest_kconfig_la_SOURCES = kconfigtest.cpp
-kunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST)
-kunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
+tdeunittest_tdeconfig_la_SOURCES = tdeconfigtest.cpp
+tdeunittest_tdeconfig_la_LIBADD = $(LIB_KUNITTEST)
+tdeunittest_tdeconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp
index 8830d34c7..b8bb055d6 100644
--- a/tdecore/tests/dcopkonqtest.cpp
+++ b/tdecore/tests/dcopkonqtest.cpp
@@ -1,10 +1,10 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 
 int main( int argc, char** argv )
 {
-    KApplication app( argc, argv, "KIDLTestClient", false );
+    TDEApplication app( argc, argv, "KIDLTestClient", false );
 
     kapp->dcopClient()->attach();
     // kapp->dcopClient()->registerAs( "kidlclienttest" );
@@ -27,8 +27,8 @@ debug("sending configure to object KonquerorIface in konqueror");
       debug("ko");
 
 /// BROADCAST
-debug("sending databaseChanged to object ksycoca in all apps");
-    if (kapp->dcopClient()->send( "*", "ksycoca", "databaseChanged()", data ))
+debug("sending databaseChanged to object tdesycoca in all apps");
+    if (kapp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data ))
       debug("ok");
     else
       debug("ko");
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 7e3b47f43..6a3abace9 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -17,24 +17,24 @@
 */
 
 #define private public
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <stdio.h>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kglobalsettings.h>
-#include <ksycoca.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeglobalsettings.h>
+#include <tdesycoca.h>
 
 int
 main(int argc, char *argv[])
 {
-   KAboutData about("kapptest", "kapptest", "version");
-   KCmdLineArgs::init(argc, argv, &about);
+   TDEAboutData about("kapptest", "kapptest", "version");
+   TDECmdLineArgs::init(argc, argv, &about);
 
-   KApplication a;
+   TDEApplication a;
 
    KSycoca *s = KSycoca::self();
   
    tqWarning("s->language() %s", s->language().latin1());
-   tqWarning("Offset of aIconName: %ld", (long) &(static_cast<KApplication *>(0)->aIconName));
+   tqWarning("Offset of aIconName: %ld", (long) &(static_cast<TDEApplication *>(0)->aIconName));
 }
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 51a40b892..7dc2cc6d7 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -7,20 +7,20 @@
 
 #include <tqstringlist.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
-class KLocale;
+class TDELocale;
 
 void test(TQDate & date);
 
 static const char description[] = "KCalendarTest";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "help", I18N_NOOP("Prints this help"), 0 },
   { "type hijri|gregorian|jalali|hebrew", I18N_NOOP("Supported calendar types"), 0 },
@@ -32,19 +32,19 @@ int main(int argc, char **argv) {
 	TQDate date;
 	TQString calType, option;
 	
-        KAboutData aboutData( "kcalendartest", "KCalendarTest" ,
-                        "0.1", description, KAboutData::License_GPL,
+        TDEAboutData aboutData( "kcalendartest", "KCalendarTest" ,
+                        "0.1", description, TDEAboutData::License_GPL,
                         "(c) 2002, Carlos Moro", 0, 0,
                         "cfmoro@correo.uniovi.es");
   	aboutData.addAuthor("Carlos Moro",0, "cfmoro@correo.uniovi.es");
 	
 
-        KCmdLineArgs::init( argc, argv, &aboutData );
-        KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+        TDECmdLineArgs::init( argc, argv, &aboutData );
+        TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-	KApplication app(false, false);
+	TDEApplication app(false, false);
 
         TQStringList lst = KCalendarSystemFactory::calendarSystems();
 	kdDebug() << "Supported calendar types: " << endl;
@@ -57,7 +57,7 @@ int main(int argc, char **argv) {
 		calType = args->getOption("type");
 	
 	
-	KGlobal::locale()->setCalendar(calType);
+	TDEGlobal::locale()->setCalendar(calType);
 
   /*
    *  If we like to see some date
@@ -65,7 +65,7 @@ int main(int argc, char **argv) {
    */
       	if ( args->isSet("date") ) {
     		option = args->getOption("date");
-                date = KGlobal::locale()->readDate(option);
+                date = TDEGlobal::locale()->readDate(option);
   	} else 
     		date = TQDate::currentDate();
 
@@ -81,72 +81,72 @@ int main(int argc, char **argv) {
 
 void test(TQDate & date) {
 
-        kdDebug() << "(KLocale) readDate" << endl;
+        kdDebug() << "(TDELocale) readDate" << endl;
 
-        kdDebug() << "Created calendar: " << KGlobal::locale()->calendar()->calendarName() << endl;
+        kdDebug() << "Created calendar: " << TDEGlobal::locale()->calendar()->calendarName() << endl;
 
-	kdDebug() << "Day name for first day of week is " << KGlobal::locale()->calendar()->weekDayName(1) << endl;
-	kdDebug() << "Short month name for second month is " << KGlobal::locale()->calendar()->weekDayName(1, true) << endl;
+	kdDebug() << "Day name for first day of week is " << TDEGlobal::locale()->calendar()->weekDayName(1) << endl;
+	kdDebug() << "Short month name for second month is " << TDEGlobal::locale()->calendar()->weekDayName(1, true) << endl;
 
-	kdDebug() << "Month name for second month is " << KGlobal::locale()->calendar()->monthName(2, KGlobal::locale()->calendar()->year(date)) << endl;
-	kdDebug() << "Short month name for second month is " << KGlobal::locale()->calendar()->monthName(2, KGlobal::locale()->calendar()->year(date), true) << endl;
-	kdDebug() << "Month name possessive for second month is " << KGlobal::locale()->calendar()->monthNamePossessive(2, KGlobal::locale()->calendar()->year(date)) << endl;
-	kdDebug() << "Short month name possessive for second month is " << KGlobal::locale()->calendar()->monthNamePossessive(2, KGlobal::locale()->calendar()->year(date), true) << endl;
-	kdDebug() << "Month name for fifth month is " << KGlobal::locale()->calendar()->monthName(5, KGlobal::locale()->calendar()->year(date)) << endl;
-	kdDebug() << "Short month name for fifth month is " << KGlobal::locale()->calendar()->monthName(5, KGlobal::locale()->calendar()->year(date), true) << endl;
-	kdDebug() << "Month name possessive for fifth month is " << KGlobal::locale()->calendar()->monthNamePossessive(5, KGlobal::locale()->calendar()->year(date)) << endl;
-	kdDebug() << "Short month name possessive for fifth month is " << KGlobal::locale()->calendar()->monthNamePossessive(5, KGlobal::locale()->calendar()->year(date), true) << endl;
+	kdDebug() << "Month name for second month is " << TDEGlobal::locale()->calendar()->monthName(2, TDEGlobal::locale()->calendar()->year(date)) << endl;
+	kdDebug() << "Short month name for second month is " << TDEGlobal::locale()->calendar()->monthName(2, TDEGlobal::locale()->calendar()->year(date), true) << endl;
+	kdDebug() << "Month name possessive for second month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(2, TDEGlobal::locale()->calendar()->year(date)) << endl;
+	kdDebug() << "Short month name possessive for second month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(2, TDEGlobal::locale()->calendar()->year(date), true) << endl;
+	kdDebug() << "Month name for fifth month is " << TDEGlobal::locale()->calendar()->monthName(5, TDEGlobal::locale()->calendar()->year(date)) << endl;
+	kdDebug() << "Short month name for fifth month is " << TDEGlobal::locale()->calendar()->monthName(5, TDEGlobal::locale()->calendar()->year(date), true) << endl;
+	kdDebug() << "Month name possessive for fifth month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(5, TDEGlobal::locale()->calendar()->year(date)) << endl;
+	kdDebug() << "Short month name possessive for fifth month is " << TDEGlobal::locale()->calendar()->monthNamePossessive(5, TDEGlobal::locale()->calendar()->year(date), true) << endl;
 
-	kdDebug() << "Day for date " << date.toString() << " is " << KGlobal::locale()->calendar()->day(date) << endl;
-	kdDebug() << "Month for date " << date.toString() << " is " << KGlobal::locale()->calendar()->month(date) << endl;
-	kdDebug() << "Year for date " << date.toString() << " is " << KGlobal::locale()->calendar()->year(date) << endl;
+	kdDebug() << "Day for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->day(date) << endl;
+	kdDebug() << "Month for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->month(date) << endl;
+	kdDebug() << "Year for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->year(date) << endl;
 
-	kdDebug() << "Day for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->dayString(date, true) << endl;
-	kdDebug() << "Month for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->monthString(date, true) << endl;
-	kdDebug() << "Year for date " << date.toString() << " as a string is " << KGlobal::locale()->calendar()->yearString(date, true) << endl;
+	kdDebug() << "Day for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->dayString(date, true) << endl;
+	kdDebug() << "Month for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->monthString(date, true) << endl;
+	kdDebug() << "Year for date " << date.toString() << " as a string is " << TDEGlobal::locale()->calendar()->yearString(date, true) << endl;
 
-	kdDebug() << "Day of week for date " << date.toString() << " is number " << KGlobal::locale()->calendar()->dayOfWeek(date) << endl;
-	kdDebug() << "Week name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->weekDayName(date) << endl;
-	kdDebug() << "Short week name for date " << date.toString() << " is " << KGlobal::locale()->calendar()->weekDayName(date, true) << endl;
+	kdDebug() << "Day of week for date " << date.toString() << " is number " << TDEGlobal::locale()->calendar()->dayOfWeek(date) << endl;
+	kdDebug() << "Week name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->weekDayName(date) << endl;
+	kdDebug() << "Short week name for date " << date.toString() << " is " << TDEGlobal::locale()->calendar()->weekDayName(date, true) << endl;
 
-	kdDebug() << "Month name for date " << date.toString() <<  " is "  << KGlobal::locale()->calendar()->monthName(date) << endl;
-	kdDebug() << "Short month name for date " << date.toString() << " is "  << KGlobal::locale()->calendar()->monthName(date, true) << endl;
-	kdDebug() << "Month name possessive for date " << date.toString() <<  " is "  << KGlobal::locale()->calendar()->monthNamePossessive(date) << endl;
-	kdDebug() << "Short month name possessive for date " << date.toString() << " is "  << KGlobal::locale()->calendar()->monthNamePossessive(date, true) << endl;
+	kdDebug() << "Month name for date " << date.toString() <<  " is "  << TDEGlobal::locale()->calendar()->monthName(date) << endl;
+	kdDebug() << "Short month name for date " << date.toString() << " is "  << TDEGlobal::locale()->calendar()->monthName(date, true) << endl;
+	kdDebug() << "Month name possessive for date " << date.toString() <<  " is "  << TDEGlobal::locale()->calendar()->monthNamePossessive(date) << endl;
+	kdDebug() << "Short month name possessive for date " << date.toString() << " is "  << TDEGlobal::locale()->calendar()->monthNamePossessive(date, true) << endl;
 
- 	kdDebug() << "It's week number " << KGlobal::locale()->calendar()->weekNumber(date) << endl;
+ 	kdDebug() << "It's week number " << TDEGlobal::locale()->calendar()->weekNumber(date) << endl;
 
 
-	kdDebug() << "(KLocale) Formatted date: " << KGlobal::locale()->formatDate(date) << endl;
-	kdDebug() << "(KLocale) Short formatted date: " << KGlobal::locale()->formatDate(date, true) << endl;
+	kdDebug() << "(TDELocale) Formatted date: " << TDEGlobal::locale()->formatDate(date) << endl;
+	kdDebug() << "(TDELocale) Short formatted date: " << TDEGlobal::locale()->formatDate(date, true) << endl;
 
-	kdDebug() << "That month have : " << KGlobal::locale()->calendar()->daysInMonth(date) << " days" << endl;
+	kdDebug() << "That month have : " << TDEGlobal::locale()->calendar()->daysInMonth(date) << " days" << endl;
 
-	kdDebug() << "That year has " << KGlobal::locale()->calendar()->monthsInYear(date) << " months" << endl;
-	kdDebug() << "There are " << KGlobal::locale()->calendar()->weeksInYear(KGlobal::locale()->calendar()->year(date)) << " weeks that year" << endl;
-	kdDebug() << "There are " << KGlobal::locale()->calendar()->daysInYear(date) << " days that year" << endl;
+	kdDebug() << "That year has " << TDEGlobal::locale()->calendar()->monthsInYear(date) << " months" << endl;
+	kdDebug() << "There are " << TDEGlobal::locale()->calendar()->weeksInYear(TDEGlobal::locale()->calendar()->year(date)) << " weeks that year" << endl;
+	kdDebug() << "There are " << TDEGlobal::locale()->calendar()->daysInYear(date) << " days that year" << endl;
 	
-	kdDebug() << "The day of pray is number " << KGlobal::locale()->calendar()->weekDayOfPray() << endl;
+	kdDebug() << "The day of pray is number " << TDEGlobal::locale()->calendar()->weekDayOfPray() << endl;
 	
-	kdDebug() << "Max valid year supported is " << KGlobal::locale()->calendar()->maxValidYear() << endl;
-	kdDebug() << "Min valid year supported is " << KGlobal::locale()->calendar()->minValidYear() << endl;
+	kdDebug() << "Max valid year supported is " << TDEGlobal::locale()->calendar()->maxValidYear() << endl;
+	kdDebug() << "Min valid year supported is " << TDEGlobal::locale()->calendar()->minValidYear() << endl;
 	
-	kdDebug() << "It's the day number " << KGlobal::locale()->calendar()->dayOfYear(date) << " of year" << endl;
+	kdDebug() << "It's the day number " << TDEGlobal::locale()->calendar()->dayOfYear(date) << " of year" << endl;
 	
 	kdDebug() << "Add 3 days" << endl;
-	date = KGlobal::locale()->calendar()->addDays(date, 3);
-	kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl;
+	date = TDEGlobal::locale()->calendar()->addDays(date, 3);
+	kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl;
 
 	kdDebug() << "Then add 3 months" << endl;
-	date = KGlobal::locale()->calendar()->addMonths(date, 3);
-	kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl;
+	date = TDEGlobal::locale()->calendar()->addMonths(date, 3);
+	kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl;
 
 	kdDebug() << "And last, add -3 years" << endl;
-	date = KGlobal::locale()->calendar()->addYears(date, -3);
-	kdDebug() << "It's " << KGlobal::locale()->formatDate(date) << endl;
+	date = TDEGlobal::locale()->calendar()->addYears(date, -3);
+	kdDebug() << "It's " << TDEGlobal::locale()->formatDate(date) << endl;
 	
-	kdDebug() << "Is lunar based: " << KGlobal::locale()->calendar()->isLunar() << endl;
-	kdDebug() << "Is lunisolar based: " << KGlobal::locale()->calendar()->isLunisolar() << endl;
-	kdDebug() << "Is solar based: " << KGlobal::locale()->calendar()->isSolar() << endl;
+	kdDebug() << "Is lunar based: " << TDEGlobal::locale()->calendar()->isLunar() << endl;
+	kdDebug() << "Is lunisolar based: " << TDEGlobal::locale()->calendar()->isLunisolar() << endl;
+	kdDebug() << "Is solar based: " << TDEGlobal::locale()->calendar()->isSolar() << endl;
 
 }
diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp
index 299196810..5213e443f 100644
--- a/tdecore/tests/kcmdlineargstest.cpp
+++ b/tdecore/tests/kcmdlineargstest.cpp
@@ -1,6 +1,6 @@
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 
@@ -11,30 +11,30 @@
 static const char version[] = "v0.0.2 1999 (c) Waldo Bastian";
 static const char description[] = I18N_NOP("This is a test program.");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
  { "test",		I18N_NOP("do a short test only, note that\n"
 				  "this is rather long comment"), 0 },
  { "baud <baudrate>",	I18N_NOP("set baudrate"), "9600" },
  { "+file(s)",		I18N_NOP("Files to load"), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
 };
 
 #if 1
 int
 main(int argc, char *argv[])
 {
-   KLocale::setMainCatalogue("tdelibs");
-   KCmdLineArgs::init( argc, argv, "testapp", description, version);
+   TDELocale::setMainCatalogue("tdelibs");
+   TDECmdLineArgs::init( argc, argv, "testapp", description, version);
 
-   KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+   TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
    // MyWidget::addCmdLineOptions();
 
-   KApplication k( false, false /*true, true*/ );
+   TDEApplication k( false, false /*true, true*/ );
 
    // Get application specific arguments
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); 
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); 
    // Check if an option is set
    if (args->isSet("test"))
    {
@@ -79,9 +79,9 @@ main(int argc, char *argv[])
 int
 main(int argc, char *argv[])
 {
-   KCmdLineArgs::init( argc, argv, "testapp", description, version);
+   TDECmdLineArgs::init( argc, argv, "testapp", description, version);
 
-   KApplication k( true, true );
+   TDEApplication k( true, true );
 
    k.exec();
    return 0;
diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp
index ee49127ea..cc85b4554 100644
--- a/tdecore/tests/kdebugtest.cpp
+++ b/tdecore/tests/kdebugtest.cpp
@@ -26,7 +26,7 @@ public:
     kdDebug(2 == 2) << "this is right " << perror << endl;
     kdDebug() << "Before instance creation" << endl;
     kdDebug(1202) << "Before instance creation" << endl;
-    KInstance i("kdebugtest");
+    TDEInstance i("kdebugtest");
     kdDebug(1) << "kDebugInfo with inexisting area number" << endl;
     kdDebug(1202) << "This number has a value of " << 5 << endl;
     // kdDebug() << "This number should come out as appname " << 5 << " " << "test" << endl;
diff --git a/tdecore/tests/kglobaltest.cpp b/tdecore/tests/kglobaltest.cpp
index d03be209e..852e2ba34 100644
--- a/tdecore/tests/kglobaltest.cpp
+++ b/tdecore/tests/kglobaltest.cpp
@@ -1,12 +1,12 @@
 #include <config.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 #include <assert.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static bool check(const TQString& txt, TQString a, TQString b)
 {
@@ -53,9 +53,9 @@ void testkasciistricmp()
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init( argc, argv, "kglobaltest", 0, 0, 0, 0 );
-  KApplication app( false, false );
+  TDEApplication::disableAutoDcopRegistration();
+  TDECmdLineArgs::init( argc, argv, "kglobaltest", 0, 0, 0, 0 );
+  TDEApplication app( false, false );
 
   testkasciistricmp();
 
diff --git a/tdecore/tests/kiconloadertest.cpp b/tdecore/tests/kiconloadertest.cpp
index 96a7a6813..c6da1994c 100644
--- a/tdecore/tests/kiconloadertest.cpp
+++ b/tdecore/tests/kiconloadertest.cpp
@@ -1,20 +1,20 @@
 #include <kiconloader.h>
 #include <tqdatetime.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
 
 int main(int argc, char *argv[])
 {
-  KApplication app(argc,argv,"kiconloadertest"/*,false,false*/);
+  TDEApplication app(argc,argv,"kiconloadertest"/*,false,false*/);
 
-  KIconLoader * mpLoader = KGlobal::iconLoader();
-  KIcon::Context mContext = KIcon::Application;
+  TDEIconLoader * mpLoader = TDEGlobal::iconLoader();
+  TDEIcon::Context mContext = TDEIcon::Application;
   TQTime dt;
   dt.start();
   int count = 0;
-  for ( int mGroup = 0; mGroup < KIcon::LastGroup ; ++mGroup )
+  for ( int mGroup = 0; mGroup < TDEIcon::LastGroup ; ++mGroup )
   {
       kdDebug() << "queryIcons " << mGroup << "," << mContext << endl;
       TQStringList filelist=mpLoader->queryIcons(mGroup, mContext);
@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
           ++it, ++i )
       {
           //kdDebug() << ( i==9 ? "..." : (*it) ) << endl;
-          mpLoader->loadIcon( (*it), (KIcon::Group)mGroup );
+          mpLoader->loadIcon( (*it), (TDEIcon::Group)mGroup );
 	  ++count;
       }
   }
diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp
index 136aa6d70..af6785f0c 100644
--- a/tdecore/tests/kipctest.cpp
+++ b/tdecore/tests/kipctest.cpp
@@ -1,16 +1,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <tqobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include "kipctest.h"
 
 MyObject::MyObject()
     : TQObject(0L, "testobj")
 {
-    connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged()));
-    connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), TQT_SLOT(slotFontChanged()));
-    connect(kapp, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
+    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged()));
+    connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(slotFontChanged()));
+    connect(kapp, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
     connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
     connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotAppearanceChanged()));
     connect(kapp, TQT_SIGNAL(kipcMessage(int,int)), TQT_SLOT(slotMessage(int,int)));
@@ -18,7 +18,7 @@ MyObject::MyObject()
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kipc");
+    TDEApplication app(argc, argv, "kipc");
 
     if (argc == 3) 
     {
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index f752467d6..36f301d6c 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -11,10 +11,10 @@
 #include <tqdatetime.h>
 #include <tqlabel.h>
 
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include "klocale.h"
-#include <kapplication.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include "tdelocale.h"
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 
@@ -51,7 +51,7 @@ bool checkDate(TQString txt, TQDate a, TQDate b)
 Test::Test( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  setCaption("Testing KLocale");
+  setCaption("Testing TDELocale");
 
   TQWidget *d = tqApp->desktop();
   setGeometry((d->width()-320)>>1, (d->height()-160)>>1, 420, 420);
@@ -70,19 +70,19 @@ void Test::createFields()
   TQString string;
 
   string+="Selected languages: ";
-  string+=KGlobal::locale()->languages()+"\n";
+  string+=TDEGlobal::locale()->languages()+"\n";
 
   // This will show nothing, as there is no klocaletest.mo
   // but you can copy other *.mo file
   string+="Used language: ";
-  string+=KGlobal::locale()->language()+"\n";
+  string+=TDEGlobal::locale()->language()+"\n";
   string+="Locale encoding: ";
-  string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n";
+  string+=TQString::fromLatin1(TDEGlobal::locale()->encoding())+"\n";
 
   string+="Localized date and time: ";
-  string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+  string+=TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
   string+="\nLocalized monetary numbers: ";
-  string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89);
+  string+=TDEGlobal::locale()->formatMoney(1234567.89) + " / \n" +TDEGlobal::locale()->formatMoney(-1234567.89);
   // This will not work
   // but you can copy other *.mo file
   string+="\nSome localized strings:\n";
@@ -93,56 +93,56 @@ void Test::createFields()
 
   label=new TQLabel(string,this,"Label");
   label->setGeometry(10,10,400,400);
-  label->setFont(KGlobalSettings::generalFont());
+  label->setFont(TDEGlobalSettings::generalFont());
   label->show();
 }
 
 int main( int argc, char ** argv )
 {
-  KLocale::setMainCatalogue("tdelibs");
-  KApplication a( argc, argv, "klocaletest" );
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEApplication a( argc, argv, "klocaletest" );
 
-  KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US"));
-  KGlobal::locale()->setCountry(TQString::fromLatin1("C"));
-  KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(","));
+  TDEGlobal::locale()->setLanguage(TQString::fromLatin1("en_US"));
+  TDEGlobal::locale()->setCountry(TQString::fromLatin1("C"));
+  TDEGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(","));
 
   TQString formatted;
-  formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00");
-  formatted = KGlobal::locale()->formatNumber( 70, 0 ); check("formatNumber(70, 0)",formatted,"70");
-  formatted = KGlobal::locale()->formatNumber( 70.2 ); check("formatNumber(70.2)",formatted,"70.20");
-  formatted = KGlobal::locale()->formatNumber( 70.24 ); check("formatNumber(70.24)",formatted,"70.24");
-  formatted = KGlobal::locale()->formatNumber( 70.245 ); check("formatNumber(70.245)",formatted,"70.25"); /*rounded*/
-  formatted = KGlobal::locale()->formatNumber(1234567.89123456789,8); check("formatNumber(1234567.89123456789,8)",formatted,"1,234,567.89123457");
+  formatted = TDEGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00");
+  formatted = TDEGlobal::locale()->formatNumber( 70, 0 ); check("formatNumber(70, 0)",formatted,"70");
+  formatted = TDEGlobal::locale()->formatNumber( 70.2 ); check("formatNumber(70.2)",formatted,"70.20");
+  formatted = TDEGlobal::locale()->formatNumber( 70.24 ); check("formatNumber(70.24)",formatted,"70.24");
+  formatted = TDEGlobal::locale()->formatNumber( 70.245 ); check("formatNumber(70.245)",formatted,"70.25"); /*rounded*/
+  formatted = TDEGlobal::locale()->formatNumber(1234567.89123456789,8); check("formatNumber(1234567.89123456789,8)",formatted,"1,234,567.89123457");
 
-  formatted = KGlobal::locale()->formatNumber("70"); check("formatNumber(\"70\")",formatted,"70.00");
-  formatted = KGlobal::locale()->formatNumber("70", true, 2); check("formatNumber(\"70\", true, 2)",formatted,"70.00");
-  formatted = KGlobal::locale()->formatNumber("70", true, 0); check("formatNumber(\"70\", true, 0)",formatted,"70");
-  formatted = KGlobal::locale()->formatNumber("70.9123", true, 0); check("formatNumber(\"70.9123\", true, 0)",formatted,"71"); /* rounded */
-  formatted = KGlobal::locale()->formatNumber("-70.2", true, 2); check("formatNumber(\"-70.2\", true, 2)",formatted,"-70.20");
-  formatted = KGlobal::locale()->formatNumber("+70.24", true, 2); check("formatNumber(\"+70.24\", true, 2)",formatted,"70.24");
-  formatted = KGlobal::locale()->formatNumber("70.245", true, 2); check("formatNumber(\"70.245\", true, 2)",formatted,"70.25"); /*rounded*/
-  formatted = KGlobal::locale()->formatNumber("99.996", true, 2); check("formatNumber(\"99.996\", true, 2)",formatted,"100.00"); /*rounded*/
-  formatted = KGlobal::locale()->formatNumber("12345678901234567.89123456789", false, 0); check("formatNumber(\"12345678901234567.89123456789\", false, 0)",formatted,"12,345,678,901,234,567.89123456789");
+  formatted = TDEGlobal::locale()->formatNumber("70"); check("formatNumber(\"70\")",formatted,"70.00");
+  formatted = TDEGlobal::locale()->formatNumber("70", true, 2); check("formatNumber(\"70\", true, 2)",formatted,"70.00");
+  formatted = TDEGlobal::locale()->formatNumber("70", true, 0); check("formatNumber(\"70\", true, 0)",formatted,"70");
+  formatted = TDEGlobal::locale()->formatNumber("70.9123", true, 0); check("formatNumber(\"70.9123\", true, 0)",formatted,"71"); /* rounded */
+  formatted = TDEGlobal::locale()->formatNumber("-70.2", true, 2); check("formatNumber(\"-70.2\", true, 2)",formatted,"-70.20");
+  formatted = TDEGlobal::locale()->formatNumber("+70.24", true, 2); check("formatNumber(\"+70.24\", true, 2)",formatted,"70.24");
+  formatted = TDEGlobal::locale()->formatNumber("70.245", true, 2); check("formatNumber(\"70.245\", true, 2)",formatted,"70.25"); /*rounded*/
+  formatted = TDEGlobal::locale()->formatNumber("99.996", true, 2); check("formatNumber(\"99.996\", true, 2)",formatted,"100.00"); /*rounded*/
+  formatted = TDEGlobal::locale()->formatNumber("12345678901234567.89123456789", false, 0); check("formatNumber(\"12345678901234567.89123456789\", false, 0)",formatted,"12,345,678,901,234,567.89123456789");
 
 
 
   double num;
   bool ok;
-  num = KGlobal::locale()->readNumber( "12,1", &ok ); check("readNumber(12,1)",ok?"yes":"no","no");
-  num = KGlobal::locale()->readNumber( "12,100", &ok ); check("readNumber(12,100)",ok?"yes":"no","yes");
-  num = KGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no");
-  num = KGlobal::locale()->readNumber( "12,100000000", &ok ); check("readNumber(12,100000000)",ok?"yes":"no","no");
-  num = KGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no");
-  num = KGlobal::locale()->readNumber( "12,,100,000", &ok ); check("readNumber(12,,100,000)",ok?"yes":"no","no");
-  num = KGlobal::locale()->readNumber( "12,1000,000", &ok ); check("readNumber(12,1000,000)",ok?"yes":"no","no");
-  num = KGlobal::locale()->readNumber( "12,0000000,000", &ok ); check("readNumber(12,0000000,000)",ok?"yes":"no","no");
-  num = KGlobal::locale()->readNumber( "12,0000000", &ok ); check("readNumber(12,0000000)",ok?"yes":"no","no");
-  num = KGlobal::locale()->readNumber( "12,146,131.12", &ok ); check("readNumber(12,146,131.12)",ok?"yes":"no","yes");
-  num = KGlobal::locale()->readNumber( "1.12345678912", &ok );
+  num = TDEGlobal::locale()->readNumber( "12,1", &ok ); check("readNumber(12,1)",ok?"yes":"no","no");
+  num = TDEGlobal::locale()->readNumber( "12,100", &ok ); check("readNumber(12,100)",ok?"yes":"no","yes");
+  num = TDEGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no");
+  num = TDEGlobal::locale()->readNumber( "12,100000000", &ok ); check("readNumber(12,100000000)",ok?"yes":"no","no");
+  num = TDEGlobal::locale()->readNumber( "12,100000,000", &ok ); check("readNumber(12,100000,000)",ok?"yes":"no","no");
+  num = TDEGlobal::locale()->readNumber( "12,,100,000", &ok ); check("readNumber(12,,100,000)",ok?"yes":"no","no");
+  num = TDEGlobal::locale()->readNumber( "12,1000,000", &ok ); check("readNumber(12,1000,000)",ok?"yes":"no","no");
+  num = TDEGlobal::locale()->readNumber( "12,0000000,000", &ok ); check("readNumber(12,0000000,000)",ok?"yes":"no","no");
+  num = TDEGlobal::locale()->readNumber( "12,0000000", &ok ); check("readNumber(12,0000000)",ok?"yes":"no","no");
+  num = TDEGlobal::locale()->readNumber( "12,146,131.12", &ok ); check("readNumber(12,146,131.12)",ok?"yes":"no","yes");
+  num = TDEGlobal::locale()->readNumber( "1.12345678912", &ok );
         tqDebug( "%s", TQString::number( num, 'g', 12 ).latin1() ); // warning this is the only way to see all decimals
         check("readNumber(1.12345678912)",ok && num==1.12345678912?"yes":"no","yes");
   // bug 95511
-  KLocale locale(*KGlobal::locale());
+  TDELocale locale(*TDEGlobal::locale());
   locale.setCurrencySymbol("$$");
   num = locale.readMoney("1,234,567.89$$", &ok);
   check("readMoney(1,234,567.89$$)",ok?"yes":"no","yes");
@@ -151,41 +151,41 @@ int main( int argc, char ** argv )
 
   TQDate date;
   date.setYMD( 2002, 5, 3 );
-  checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
+  checkDate("readDate( 3, 5, 2002 )",date,TDEGlobal::locale()->readDate( TDEGlobal::locale()->formatDate( date ) ) );
   date = TQDate::currentDate();
-  checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
+  checkDate("readDate( TQDate::currentDate() )",date,TDEGlobal::locale()->readDate( TDEGlobal::locale()->formatDate( date ) ) );
 
   TQTime time;
-  time = KGlobal::locale()->readTime( "11:22:33", &ok );
+  time = TDEGlobal::locale()->readTime( "11:22:33", &ok );
   check("readTime(\"11:22:33\")", (ok && time == TQTime(11, 22, 33)) ?
         "yes" : "no", "yes");
-  time = KGlobal::locale()->readTime( "11:22", &ok );
+  time = TDEGlobal::locale()->readTime( "11:22", &ok );
   check("readTime(\"11:22\")", (ok && time == TQTime(11, 22, 0)) ?
         "yes" : "no", "yes");
-  time = KGlobal::locale()->readTime( "foo", &ok );
+  time = TDEGlobal::locale()->readTime( "foo", &ok );
   check("readTime(\"foo\")", (!ok && !time.isValid()) ?
         "invalid" : "valid", "invalid");
 
-  time = KGlobal::locale()->readTime( "11:22:33", KLocale::WithoutSeconds, &ok );
+  time = TDEGlobal::locale()->readTime( "11:22:33", TDELocale::WithoutSeconds, &ok );
   check("readTime(\"11:22:33\", WithoutSeconds)", (!ok && !time.isValid()) ?
         "invalid" : "valid", "invalid");
-  time = KGlobal::locale()->readTime( "11:22", KLocale::WithoutSeconds, &ok );
+  time = TDEGlobal::locale()->readTime( "11:22", TDELocale::WithoutSeconds, &ok );
   check("readTime(\"11:22\", WithoutSeconds)", (ok && time == TQTime(11, 22, 0)) ?
         "yes" : "no", "yes");
 
-  KGlobal::locale()->setTimeFormat( "%H:%M %p" );
+  TDEGlobal::locale()->setTimeFormat( "%H:%M %p" );
   time = TQTime( 0, 22, 33 );
-  TQString timeStr = KGlobal::locale()->formatTime( time, true /*seconds*/, false /*duration*/ );
+  TQString timeStr = TDEGlobal::locale()->formatTime( time, true /*seconds*/, false /*duration*/ );
   check("formatTime(\"0:22\", as time)", timeStr, "00:22 am" );
-  timeStr = KGlobal::locale()->formatTime( time, true /*seconds*/, true /*duration*/ );
+  timeStr = TDEGlobal::locale()->formatTime( time, true /*seconds*/, true /*duration*/ );
   check("formatTime(\"0:22\", as duration)", timeStr, "00:22" );
 
   kdDebug() << "setLanguage C\n";
-  KGlobal::locale()->setLanguage(TQString::fromLatin1("C"));
+  TDEGlobal::locale()->setLanguage(TQString::fromLatin1("C"));
   kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
 
   kdDebug() << "setLanguage de\n";
-  KGlobal::locale()->setLanguage(TQString::fromLatin1("de"));
+  TDEGlobal::locale()->setLanguage(TQString::fromLatin1("de"));
   kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
 
 
diff --git a/tdecore/tests/klocaletest.h b/tdecore/tests/klocaletest.h
index 83f4f5cef..6634b6107 100644
--- a/tdecore/tests/klocaletest.h
+++ b/tdecore/tests/klocaletest.h
@@ -7,7 +7,7 @@
 
 class TQLabel;
 
-/** test: a small test program for KLocale
+/** test: a small test program for TDELocale
     */
 class Test : public TQWidget
 {
diff --git a/tdecore/tests/kmacroexpandertest.cpp b/tdecore/tests/kmacroexpandertest.cpp
index 0c41a309b..e357b5801 100644
--- a/tdecore/tests/kmacroexpandertest.cpp
+++ b/tdecore/tests/kmacroexpandertest.cpp
@@ -1,7 +1,7 @@
 #include <kmacroexpander.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include <stdlib.h>
@@ -51,8 +51,8 @@ protected:
 
 int main(int argc, char *argv[])
 {
-  KCmdLineArgs::init(argc, argv, ":", "", "", "");
-  KApplication app(false,false);
+  TDECmdLineArgs::init(argc, argv, ":", "", "", "");
+  TDEApplication app(false,false);
   TQString s, s2;
 
   TQMap<TQChar,TQStringList> map1;
diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp
index e74d6f4b4..571d3f10b 100644
--- a/tdecore/tests/kmdcodectest.cpp
+++ b/tdecore/tests/kmdcodectest.cpp
@@ -27,9 +27,9 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <kmdcodec.h>
 
@@ -316,7 +316,7 @@ int main (int argc, char *argv[])
 {
     const char *version = "1.0";
     const char *description = "Unit test for md5, base64 encode/decode and uuencode/decode facilities";
-    KCmdLineOptions options[] =
+    TDECmdLineOptions options[] =
     {
         { "c <digest>", "compare <digest> with the calculated digest for a string or file.", 0 },
         { "d", "decode the given string or file using base64", 0 },
@@ -331,15 +331,15 @@ int main (int argc, char *argv[])
         { "x", "uudecode the given string or file", 0 },
         { "z", "run a preset message-digest test", 0 },
         { "+command", "[input1, input2,...]", 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
-    KCmdLineArgs::init( argc, argv, "kmdcodectest", description, version );
-    KCmdLineArgs::addCmdLineOptions( options );
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init( argc, argv, "kmdcodectest", description, version );
+    TDECmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     int count = args->count();
 
-    KApplication app;
+    TDEApplication app;
 
     if (!count)
     {
diff --git a/tdecore/tests/kmemtest.cpp b/tdecore/tests/kmemtest.cpp
index 83c452e50..f0115b569 100644
--- a/tdecore/tests/kmemtest.cpp
+++ b/tdecore/tests/kmemtest.cpp
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
@@ -235,9 +235,9 @@ int main(int argc, char *argv[])
   }
 //  showMem("second");
 
-    KApplication app(argc,argv,"kurltest");
+    TDEApplication app(argc,argv,"kurltest");
 
-//  showMem("After KApplication constructor");
+//  showMem("After TDEApplication constructor");
 
 //  malloc(10*1024);
 
diff --git a/tdecore/tests/knotifytest.cpp b/tdecore/tests/knotifytest.cpp
index 8eb0586c0..6c5af25a7 100644
--- a/tdecore/tests/knotifytest.cpp
+++ b/tdecore/tests/knotifytest.cpp
@@ -1,9 +1,9 @@
 #include <knotifyclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main( int argc, char **argv )
 {
-	KApplication app( argc, argv, "knotifytest" );
+	TDEApplication app( argc, argv, "knotifytest" );
     KNotifyClient::userEvent( "This is a notification to notify you :)", 
                               KNotifyClient::Messagebox,
                               KNotifyClient::Error );
diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp
index af04cd421..c81dada50 100644
--- a/tdecore/tests/kprocesstest.cpp
+++ b/tdecore/tests/kprocesstest.cpp
@@ -1,5 +1,5 @@
 //
-//  MAIN -- a little demo of the capabilities of the "KProcess" class
+//  MAIN -- a little demo of the capabilities of the "TDEProcess" class
 //
 //  version 0.2, Aug 2nd 1997
 //  $Id$
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <signal.h>
 
@@ -32,12 +32,12 @@ werke\nmerkt\nich\nund\nden\nbrauch\nund\nmit\ngeistesstaerke\ntu\nich\nwunder\n
 
 int main(int argc, char *argv[])
 {
- KProcess p1, p2, p3, p4;
+ TDEProcess p1, p2, p3, p4;
  Dummy dummy; 
- KApplication app(argc, argv, "kprocesstest");
+ TDEApplication app(argc, argv, "kprocesstest");
 
 
- printf("Welcome to the KProcess Demo Application!\n");
+ printf("Welcome to the TDEProcess Demo Application!\n");
 
  //
  // The kghostview demo -- Starts a kghostview instance blocking. -- After
@@ -46,39 +46,39 @@ int main(int argc, char *argv[])
  //
 
  p1 << "kghostview";
- TQObject::connect(&p1, TQT_SIGNAL(processExited(KProcess *)),  &dummy, TQT_SLOT(printMessage(KProcess *)));
+ TQObject::connect(&p1, TQT_SIGNAL(processExited(TDEProcess *)),  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
  
  printf("starting kghostview blocking (close to continue)\n");
- p1.start(KProcess::Block);
+ p1.start(TDEProcess::Block);
  printf("restarting kghostview non blocking\n");
  p1.start();
 
 
  //
  // A konsole with tcsh to demonstrate how to pass command line options to a process
- // with "KProcess" (is run blocking)
+ // with "TDEProcess" (is run blocking)
  //
 
  printf("Starting konsole with /bin/tcsh as shell (close to continue)\n");
  p2 << "konsole" << "-e" << "/bin/tcsh";
  p2.setWorkingDirectory("/tmp");
- TQObject::connect(&p2, TQT_SIGNAL(processExited(KProcess *)),  &dummy, TQT_SLOT(printMessage(KProcess *)));
- p2.start(KProcess::Block);
+ TQObject::connect(&p2, TQT_SIGNAL(processExited(TDEProcess *)),  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ p2.start(TDEProcess::Block);
 
  //
  // Getting the output from a process. "ls" with parameter "-l" is called and it output is captured
  //
 
  p3 << "ls" << "-l";
- TQObject::connect(&p3, TQT_SIGNAL(processExited(KProcess *)), 
-		  &dummy, TQT_SLOT(printMessage(KProcess *)));
+ TQObject::connect(&p3, TQT_SIGNAL(processExited(TDEProcess *)), 
+		  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
 
- TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int)));
- TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int)));
+ TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
 
- p3.start(KProcess::NotifyOnExit, KProcess::AllOutput);
+ p3.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
  
 
  //
@@ -93,18 +93,18 @@ int main(int argc, char *argv[])
  //
 
  p4 << "sort";
- TQObject::connect(&p4, TQT_SIGNAL(processExited(KProcess *)), 
-		  &dummy, TQT_SLOT(printMessage(KProcess *)));
+ TQObject::connect(&p4, TQT_SIGNAL(processExited(TDEProcess *)), 
+		  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
 
- TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int)));
- TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(KProcess *, char *, int)));
+ TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
 
- TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(KProcess *)),
-		  &dummy, TQT_SLOT(outputDone(KProcess *)));
+ TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(TDEProcess *)),
+		  &dummy, TQT_SLOT(outputDone(TDEProcess *)));
 
- p4.start(KProcess::NotifyOnExit, KProcess::All);
+ p4.start(TDEProcess::NotifyOnExit, TDEProcess::All);
  printf("after p4.start");
  p4.writeStdin(txt, strlen(txt)); 
 
diff --git a/tdecore/tests/kprocesstest.h b/tdecore/tests/kprocesstest.h
index 23ac443dd..5817af438 100644
--- a/tdecore/tests/kprocesstest.h
+++ b/tdecore/tests/kprocesstest.h
@@ -1,5 +1,5 @@
 //
-//  DUMMY -- A dummy class with a slot to demonstrate KProcess signals
+//  DUMMY -- A dummy class with a slot to demonstrate TDEProcess signals
 //
 //  version 0.2, Aug 2nd 1997
 //
@@ -20,20 +20,20 @@ class Dummy : public TQObject
  Q_OBJECT
 
  public slots:
-   void printMessage(KProcess *proc)
+   void printMessage(TDEProcess *proc)
    {
      printf("Process %d exited!\n", (int)proc->getPid()); 
    } 
  
-   void gotOutput(KProcess*, char *buffer, int len)
+   void gotOutput(TDEProcess*, char *buffer, int len)
    {
-    char result[1025];             // this is ugly since it relys on the internal buffer size of KProcess,
+    char result[1025];             // this is ugly since it relys on the internal buffer size of TDEProcess,
     memcpy(result, buffer, len);   // NEVER do that in your own application... ;-) 
     result[len] = '\0';
     printf("OUTPUT>>%s", result);
    }
 
-   void outputDone(KProcess *proc)
+   void outputDone(TDEProcess *proc)
      /*
        Slot Procedure for the "sort" example. -- If it is indicated that the "sort" command has
        absorbed all its input, we send an "EOF" to it to indicate that there is no more
diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp
index 446dacb30..ee7aaf2b7 100644
--- a/tdecore/tests/kprociotest.cpp
+++ b/tdecore/tests/kprociotest.cpp
@@ -1,5 +1,5 @@
 //
-//  MAIN -- a little demo of the capabilities of the "KProcess" class
+//  MAIN -- a little demo of the capabilities of the "TDEProcess" class
 //
 //  version 0.2, Aug 2nd 1997
 //  $Id$
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <signal.h>
 
@@ -32,7 +32,7 @@ werke\nmerkt\nich\nund\nden\nbrauch\nund\nmit\ngeistesstaerke\ntu\nich\nwunder\n
 int main(int argc, char *argv[])
 {
  Dummy dummy; 
- KApplication app(argc, argv, "kprociotest");
+ TDEApplication app(argc, argv, "kprociotest");
 
  printf("Welcome to the KProcIO Demo Application!\n");
 
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
  
  p << "rev";
  
- p.connect(&p, TQT_SIGNAL(processExited(KProcess*)), &dummy, TQT_SLOT(printMessage(KProcess*)));
+ p.connect(&p, TQT_SIGNAL(processExited(TDEProcess*)), &dummy, TQT_SLOT(printMessage(TDEProcess*)));
  p.connect(&p, TQT_SIGNAL(readReady(KProcIO*)), &dummy, TQT_SLOT(gotOutput(KProcIO*)));
 
  bool b;
diff --git a/tdecore/tests/kprociotest.h b/tdecore/tests/kprociotest.h
index 9f948e644..fd60bb87b 100644
--- a/tdecore/tests/kprociotest.h
+++ b/tdecore/tests/kprociotest.h
@@ -1,5 +1,5 @@
 //
-//  DUMMY -- A dummy class with a slot to demonstrate KProcess signals
+//  DUMMY -- A dummy class with a slot to demonstrate TDEProcess signals
 //
 //  version 0.2, Aug 2nd 1997
 //
@@ -20,7 +20,7 @@ class Dummy : public TQObject
  Q_OBJECT
 
  public slots:
-   void printMessage(KProcess *proc)
+   void printMessage(TDEProcess *proc)
    {
      printf("Process %d exited!\n", (int)proc->getPid()); 
    } 
diff --git a/tdecore/tests/krandomsequencetest.cpp b/tdecore/tests/krandomsequencetest.cpp
index 8f337c2f1..2ba0c72ae 100644
--- a/tdecore/tests/krandomsequencetest.cpp
+++ b/tdecore/tests/krandomsequencetest.cpp
@@ -19,14 +19,14 @@
 #include <tqptrlist.h>
 
 #include "krandomsequence.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include <stdio.h>
 
 int
 main(int argc, char *argv[])
 {
-   KApplication a(argc, argv, "krandomsequencetest");
+   TDEApplication a(argc, argv, "krandomsequencetest");
 
    long seed;
    KRandomSequence seq;
diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp
index 1c2272c11..0e05cab4e 100644
--- a/tdecore/tests/kresolvertest.cpp
+++ b/tdecore/tests/kresolvertest.cpp
@@ -40,8 +40,8 @@
 #include <ksocks.h>
 #include <ksockaddr.h>
 #include <kextsock.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "netsupp.h"
 
@@ -213,7 +213,7 @@ bool testKernel()
 
   printf("succeeded\n");
 
-  KSocketAddress *ksin = KExtendedSocket::localAddress(sock);
+  TDESocketAddress *ksin = KExtendedSocket::localAddress(sock);
   if (ksin != NULL)
     {
       printf("\tWe got socket %s\n", (const char*)ksin->pretty().latin1());
@@ -410,8 +410,8 @@ int TestApp::newInstance(TQValueList<TQCString> /*params*/)
 
 int main(int argc, char **argv)
 {
-  KAboutData about("socktest2", "SockTest", "1.0");
-  KCmdLineArgs::init(argc, argv, &about);
+  TDEAboutData about("socktest2", "SockTest", "1.0");
+  TDECmdLineArgs::init(argc, argv, &about);
   KUniqueApplication::addCmdLineOptions();
 
   /*  TestApp a;
diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp
index 368a1106f..94358a8f1 100644
--- a/tdecore/tests/krfcdatetest.cpp
+++ b/tdecore/tests/krfcdatetest.cpp
@@ -1,8 +1,8 @@
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
 #include <krfcdate.h>
@@ -21,7 +21,7 @@ bool check(TQString txt, time_t a, time_t b)
 
 int main(int argc, char *argv[])
 {
-  KApplication app(argc,argv,"kurltest",false,false);
+  TDEApplication app(argc,argv,"kurltest",false,false);
 
   time_t a;
   time_t b;
diff --git a/tdecore/tests/ksimpleconfigtest.cpp b/tdecore/tests/ksimpleconfigtest.cpp
index 699be34cf..8b0e4ef25 100644
--- a/tdecore/tests/ksimpleconfigtest.cpp
+++ b/tdecore/tests/ksimpleconfigtest.cpp
@@ -6,7 +6,7 @@
 // demonstrates use of KSimpleConfig class
 
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <unistd.h>
 #include <stdio.h>
 
@@ -20,7 +20,7 @@
 
 int main( int argc, char **argv )
 {
-  KApplication  a( argc, argv, "kconfigtest" );
+  TDEApplication  a( argc, argv, "tdeconfigtest" );
 
   KSimpleConfig aConfig( _PATH_TMP"/simpleconfig.cfg" );
 
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index fe33ec771..a1ce8f86b 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -17,14 +17,14 @@
 */
 
 #include "kuniqueapplication.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kdebug.h"
 #include "ksock.h"
 #include "ksockaddr.h"
 #include "kextsock.h"
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -57,11 +57,11 @@ bool check(TQString txt, TQString a, TQString b)
 int
 main(int argc, char *argv[])
 {
-   KAboutData about("socktest", "SockTest", "version");
-   KCmdLineArgs::init(argc, argv, &about);
-   KApplication::addCmdLineOptions();
+   TDEAboutData about("socktest", "SockTest", "version");
+   TDECmdLineArgs::init(argc, argv, &about);
+   TDEApplication::addCmdLineOptions();
 
-   KApplication app;
+   TDEApplication app;
 
    TQString host, port;
 
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
 
    printf("FD %d\n", sock2->fd());
 
-   KSocketAddress* addr = KExtendedSocket::peerAddress( sock2->fd() );
+   TDESocketAddress* addr = KExtendedSocket::peerAddress( sock2->fd() );
    check( "peerAddress:", addr->nodeName().latin1(), "213.203.58.36" );
 
    check( "isEqual:", addr->isEqual(KInetSocketAddress("213.203.58.36", 80)) ? "TRUE" : "FALSE", "TRUE");
diff --git a/tdecore/tests/kstdacceltest.cpp b/tdecore/tests/kstdacceltest.cpp
deleted file mode 100644
index ff8842139..000000000
--- a/tdecore/tests/kstdacceltest.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <config.h>
-
-#include <kapplication.h>
-#include <kdebug.h>
-#include <kstdaccel.h>
-#include <stdlib.h> // for exit
-
-static bool check(TQString txt, TQString a, TQString b)
-{
-  if (a.isEmpty())
-     a = TQString::null;
-  if (b.isEmpty())
-     b = TQString::null;
-  if (a == b) {
-    kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
-  }
-  else {
-    kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "KO !" << endl;
-    exit(1);
-  }
-  return true;
-}
-
-int main(int argc, char *argv[])
-{
-  KApplication::disableAutoDcopRegistration();
-  KApplication app(argc,argv,"kstdacceltest",false,false);
-
-  check( "shortcutDefault FullScreen", KStdAccel::shortcutDefault( KStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
-  check( "shortcutDefault BeginningOfLine", KStdAccel::shortcutDefault( KStdAccel::BeginningOfLine ).toString(), "Home" );
-  check( "shortcutDefault EndOfLine", KStdAccel::shortcutDefault( KStdAccel::EndOfLine ).toString(), "End" );
-
-  check( "name BeginningOfLine", KStdAccel::name( KStdAccel::BeginningOfLine ), "BeginningOfLine" );
-  check( "name EndOfLine", KStdAccel::name( KStdAccel::EndOfLine ), "EndOfLine" );
-
-  check( "shortcut method", KStdAccel::shortcut( KStdAccel::ZoomIn ).toString(), KStdAccel::zoomIn().toString() );
-
-  return 0;
-}
diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/kstddirstest.cpp
index 69e9a0200..ae6ea16bd 100644
--- a/tdecore/tests/kstddirstest.cpp
+++ b/tdecore/tests/kstddirstest.cpp
@@ -1,14 +1,14 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 int main(int argc, char **argv)
 {
-  KApplication a(argc, argv, "whatever", false);
-  KStandardDirs t;
-  KConfig config; // to add custom entries - a bit tricky :/
+  TDEApplication a(argc, argv, "whatever", false);
+  TDEStandardDirs t;
+  TDEConfig config; // to add custom entries - a bit tricky :/
 
   TQStringList list;
   TQString s;
diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp
index 60404f03a..5c2354fff 100644
--- a/tdecore/tests/ktempfiletest.cpp
+++ b/tdecore/tests/ktempfiletest.cpp
@@ -16,8 +16,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "ktempfile.h"
-#include "kapplication.h"
+#include "tdetempfile.h"
+#include "tdeapplication.h"
 #include "kstandarddirs.h"
 #include <tqstring.h>
 
@@ -28,8 +28,8 @@
 int
 main(int argc, char *argv[])
 {
-   KApplication a(argc, argv, "ktempfiletest");
-   printf("Making tempfile after KApplication constructor.\n");
+   TDEApplication a(argc, argv, "ktempfiletest");
+   printf("Making tempfile after TDEApplication constructor.\n");
    KTempFile f4;
    printf("Filename = %s\n", f4.name().ascii());
 
diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp
index 650cc0512..5eaf5a4fb 100644
--- a/tdecore/tests/ktimezonestest.cpp
+++ b/tdecore/tests/ktimezonestest.cpp
@@ -1,11 +1,11 @@
 #include "ktimezones.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 int main(int argc, char *argv[]) 
 {
-  KInstance instance("ktimezonestest");
+  TDEInstance instance("ktimezonestest");
 
   if ((argc==2) && (strcmp(argv[1], "local")==0))
   {
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index b1d700c8b..13b8ca534 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -17,13 +17,13 @@
 */
 
 #include "kuniqueapplication.h"
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 class TestApp : public KUniqueApplication
 {
@@ -43,8 +43,8 @@ TestApp::newInstance( )
 int
 main(int argc, char *argv[])
 {
-   KAboutData about("kuniqueapptest", "kuniqueapptest", "version");
-   KCmdLineArgs::init(argc, argv, &about);
+   TDEAboutData about("kuniqueapptest", "kuniqueapptest", "version");
+   TDECmdLineArgs::init(argc, argv, &about);
    KUniqueApplication::addCmdLineOptions();
 
    if (!TestApp::start())
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index 563eb8937..0f57dd97c 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -2,15 +2,15 @@
 
 #include <kurl.h>
 #include <stdio.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
 #include <tqdatastream.h>
 #include <assert.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static bool check(TQString txt, TQString a, TQString b)
 {
@@ -81,9 +81,9 @@ void testAdjustPath()
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
-  KCmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 );
-  KApplication app( false, false );
+  TDEApplication::disableAutoDcopRegistration();
+  TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 );
+  TDEApplication app( false, false );
 
   KURL::List lst;
 
@@ -125,8 +125,8 @@ int main(int argc, char *argv[])
   baseURL = "http://www.foo.bar/top//test2/file2.html";
   check( "KURL::url()", baseURL.url(), "http://www.foo.bar/top//test2/file2.html" );
 
-  baseURL = "file:/usr/local/src/kde2/////tdelibs/kio";
-  check( "KURL::url()", baseURL.url(), "file:///usr/local/src/kde2/////tdelibs/kio" );
+  baseURL = "file:/usr/local/src/kde2/////tdelibs/tdeio";
+  check( "KURL::url()", baseURL.url(), "file:///usr/local/src/kde2/////tdelibs/tdeio" );
 
   baseURL = "http://www.foo.bar";
   KURL rel_url2( baseURL, "mailto:bastian@kde.org" );
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
   baseURL = "mailto:bastian@kde.org?subject=hello";
   check( "KURL::url()", baseURL.url(), "mailto:bastian@kde.org?subject=hello" );
 
-  baseURL = "file:/usr/local/src/kde2/tdelibs/kio/";
+  baseURL = "file:/usr/local/src/kde2/tdelibs/tdeio/";
   KURL url2( baseURL, "../../////tdebase/konqueror" );
   check( "KURL::url()", url2.url(), "file:///usr/local/src/kde2/////tdebase/konqueror" );
 
@@ -318,8 +318,8 @@ int main(int argc, char *argv[])
           "http://www.google.com/foo%20%20%20%20%20%20 bar/");
 
   KURL carsten;
-  carsten.setPath("/home/gis/src/kde/tdelibs/kfile/.#kfiledetailview.cpp.1.18");
-  check("KURL::path()", carsten.path(), "/home/gis/src/kde/tdelibs/kfile/.#kfiledetailview.cpp.1.18");
+  carsten.setPath("/home/gis/src/kde/tdelibs/tdefile/.#tdefiledetailview.cpp.1.18");
+  check("KURL::path()", carsten.path(), "/home/gis/src/kde/tdelibs/tdefile/.#tdefiledetailview.cpp.1.18");
 
   KURL charles;
   charles.setPath( "/home/charles/foo%20moo" );
@@ -817,9 +817,9 @@ int main(int argc, char *argv[])
   check("path",ulong.path(),"/servlet/CookieAccepted");
 
 #if TQT_VERSION < 300
-  qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) );
+  qt_set_locale_codec( TDEGlobal::charsets()->codecForName( "iso-8859-1" ) );
 #else
-  TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "iso-8859-1" ) );
+  TQTextCodec::setCodecForLocale( TDEGlobal::charsets()->codecForName( "iso-8859-1" ) );
 #endif
   TQString raw = "data:text/html,%00%2540%00";
   check("data URL: encode-decode of %00", KURL(raw).url(), raw );
@@ -862,9 +862,9 @@ int main(int argc, char *argv[])
   testAdjustPath();
 
 #if TQT_VERSION < 300
-  qt_set_locale_codec( KGlobal::charsets()->codecForName( "koi8-r" ) );
+  qt_set_locale_codec( TDEGlobal::charsets()->codecForName( "koi8-r" ) );
 #else
-  TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) );
+  TQTextCodec::setCodecForLocale( TDEGlobal::charsets()->codecForName( "koi8-r" ) );
 #endif
   baseURL = "file:/home/coolo";
   KURL russian = baseURL.directory(false, true) + TQString::fromLocal8Bit( "ÆÇÎ7" );
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index 93e6716ef..67c535cec 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -16,21 +16,21 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <stdio.h>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 
 int
 main(int argc, char *argv[])
 {
-   KAboutData about("kapptest", "kapptest", "version");
-   KCmdLineArgs::init(argc, argv, &about);
+   TDEAboutData about("kapptest", "kapptest", "version");
+   TDECmdLineArgs::init(argc, argv, &about);
 
-   KApplication a;
+   TDEApplication a;
 
    TQString error;
    TQCString dcopService;
diff --git a/tdecore/tests/kconfigtest.cpp b/tdecore/tests/tdeconfigtest.cpp
index 384a328cc..d9c89d6d4 100644
--- a/tdecore/tests/kconfigtest.cpp
+++ b/tdecore/tests/tdeconfigtest.cpp
@@ -17,12 +17,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kunittest/tester.h>
-#include <kunittest/module.h>
+#include <tdeunittest/tester.h>
+#include <tdeunittest/module.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
-class KConfigTest : public KUnitTest::Tester
+class TDEConfigTest : public KUnitTest::Tester
 {
 public:
     void allTests();
@@ -31,8 +31,8 @@ private:
     void revertEntries();
 };
 
-KUNITTEST_MODULE( kunittest_kconfig, "KConfigTest" )
-KUNITTEST_MODULE_REGISTER_TESTER( KConfigTest )
+KUNITTEST_MODULE( tdeunittest_tdeconfig, "TDEConfigTest" )
+KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
 
 // test data
 #define BOOLENTRY1 true
@@ -50,9 +50,9 @@ KUNITTEST_MODULE_REGISTER_TESTER( KConfigTest )
 #define DATETIMEENTRY TQDateTime( TQDate( 2002, 06, 23 ), TQTime( 12, 55, 40 ) )
 #define STRINGLISTENTRY TQStringList( "Hello," )
 
-void KConfigTest::writeConfigFile()
+void TDEConfigTest::writeConfigFile()
 {
-  KConfig sc( "kconfigtest" );
+  TDEConfig sc( "tdeconfigtest" );
 
   sc.setGroup("AAA");
   sc.writeEntry("stringEntry1", STRINGENTRY1, true, true);
@@ -86,10 +86,10 @@ void KConfigTest::writeConfigFile()
 }
 
 // ### TODO: call this, and test the state of things afterwards
-void KConfigTest::revertEntries()
+void TDEConfigTest::revertEntries()
 {
   tqWarning("Reverting entries");
-  KConfig sc( "kconfigtest" );
+  TDEConfig sc( "tdeconfigtest" );
 
   sc.setGroup("Hello");
   sc.revertToDefault( "boolEntry1");
@@ -105,13 +105,13 @@ void KConfigTest::revertEntries()
   sc.sync();
 }
 
-void KConfigTest::allTests()
+void TDEConfigTest::allTests()
 {
   writeConfigFile();
 
-  KConfig sc2( "kconfigtest" );
+  TDEConfig sc2( "tdeconfigtest" );
 
-  KConfigGroup sc3( &sc2, "AAA");
+  TDEConfigGroup sc3( &sc2, "AAA");
   bool bImmutable = sc3.entryIsImmutable("stringEntry1");
 
   CHECK( bImmutable, false );
diff --git a/tdecore/tests/kconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp
index af560b496..d1e2d5393 100644
--- a/tdecore/tests/kconfigtestgui.cpp
+++ b/tdecore/tests/tdeconfigtestgui.cpp
@@ -17,19 +17,19 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kconfigtestgui.h"
-#include "kconfigtestgui.moc"
+#include "tdeconfigtestgui.h"
+#include "tdeconfigtestgui.moc"
 
 //
 // configtest.cpp: libKDEcore example
 //
-// demonstrates use of KConfig class
+// demonstrates use of TDEConfig class
 //
 // adapted from Qt widgets demo
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdialog.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -45,7 +45,7 @@
 #include <tqpushbutton.h>
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>
@@ -56,10 +56,10 @@
 #endif
 
 //
-// Construct the KConfigTestView with buttons
+// Construct the TDEConfigTestView with buttons
 //
 
-KConfigTestView::KConfigTestView( TQWidget *parent, const char *name )
+TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
     : TQDialog( parent, name ),
       pConfig( 0L ),
       pFile( 0L ),
@@ -67,7 +67,7 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name )
 {
   // Set the window caption/title
 
-  setCaption( "KConfig test" );
+  setCaption( "TDEConfig test" );
 
   // Label and edit for the app config file
   pAppFileLabel = new TQLabel( this, "appconfiglabel" );
@@ -123,18 +123,18 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name )
   pQuitButton->setGeometry( 340, 60, 60, 60 );
   connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) );
 
-  // create a default KConfig object in order to be able to start right away
-  pConfig = new KConfig( TQString::null );
+  // create a default TDEConfig object in order to be able to start right away
+  pConfig = new TDEConfig( TQString::null );
 }
 
-KConfigTestView::~KConfigTestView()
+TDEConfigTestView::~TDEConfigTestView()
 {
     delete pConfig;
     delete pFile;
     delete pStream;
 }
 
-void KConfigTestView::appConfigEditReturnPressed()
+void TDEConfigTestView::appConfigEditReturnPressed()
 {
     // if there already was a config object, delete it and its associated data
     delete pConfig;
@@ -146,12 +146,12 @@ void KConfigTestView::appConfigEditReturnPressed()
 
   // create a new config object
   if( !pAppFileEdit->text().isEmpty() )
-	  pConfig = new KConfig( pAppFileEdit->text() );
+	  pConfig = new TDEConfig( pAppFileEdit->text() );
 
   pInfoLabel2->setText( "New config object created." );
 }
 
-void KConfigTestView::groupEditReturnPressed()
+void TDEConfigTestView::groupEditReturnPressed()
 {
   pConfig->setGroup( pGroupEdit->text() );
   // according to the Qt doc, this is begging for trouble, but for a
@@ -162,7 +162,7 @@ void KConfigTestView::groupEditReturnPressed()
   pInfoLabel2->setText( aText );
 }
 
-void KConfigTestView::keyEditReturnPressed()
+void TDEConfigTestView::keyEditReturnPressed()
 {
   TQString aValue = pConfig->readEntry( pKeyEdit->text() );
   // just checking aValue.isNull() would be easier here, but this is
@@ -181,7 +181,7 @@ void KConfigTestView::keyEditReturnPressed()
     }
 }
 
-void KConfigTestView::writeButtonClicked()
+void TDEConfigTestView::writeButtonClicked()
 {
   pConfig->writeEntry( pKeyEdit->text(), TQString( pValueEdit->text() ) );
   pInfoLabel2->setText( "Entry written" );
@@ -192,9 +192,9 @@ void KConfigTestView::writeButtonClicked()
 
 int main( int argc, char **argv )
 {
-  KApplication a( argc, argv, "bla" );
+  TDEApplication a( argc, argv, "bla" );
 
-  KConfigTestView *w = new KConfigTestView();
+  TDEConfigTestView *w = new TDEConfigTestView();
   a.setMainWidget( w );
   return w->exec();
 }
diff --git a/tdecore/tests/kconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h
index 7655c8142..4aa50cb5f 100644
--- a/tdecore/tests/kconfigtestgui.h
+++ b/tdecore/tests/tdeconfigtestgui.h
@@ -19,7 +19,7 @@
 #ifndef _KCONFIG_TEST_H
 #define _KCONFIG_TEST_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqdialog.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -33,18 +33,18 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 //
-// KConfigTestView contains lots of Qt widgets.
+// TDEConfigTestView contains lots of Qt widgets.
 //
 
-class KConfigTestView : public TQDialog
+class TDEConfigTestView : public TQDialog
 {
   Q_OBJECT
 public:
-  KConfigTestView( TQWidget *parent=0, const char *name=0 );
-  ~KConfigTestView();
+  TDEConfigTestView( TQWidget *parent=0, const char *name=0 );
+  ~TDEConfigTestView();
 
 private slots:
   void appConfigEditReturnPressed();
@@ -64,7 +64,7 @@ private:
   TQLabel* pInfoLabel1, *pInfoLabel2;
   TQPushButton* pQuitButton;
 
-  KConfig* pConfig;
+  TDEConfig* pConfig;
   TQFile* pFile;
   TQTextStream* pStream;
 };
diff --git a/tdecore/tests/tdestdacceltest.cpp b/tdecore/tests/tdestdacceltest.cpp
new file mode 100644
index 000000000..7a1fe8697
--- /dev/null
+++ b/tdecore/tests/tdestdacceltest.cpp
@@ -0,0 +1,39 @@
+#include <config.h>
+
+#include <tdeapplication.h>
+#include <kdebug.h>
+#include <tdestdaccel.h>
+#include <stdlib.h> // for exit
+
+static bool check(TQString txt, TQString a, TQString b)
+{
+  if (a.isEmpty())
+     a = TQString::null;
+  if (b.isEmpty())
+     b = TQString::null;
+  if (a == b) {
+    kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
+  }
+  else {
+    kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "KO !" << endl;
+    exit(1);
+  }
+  return true;
+}
+
+int main(int argc, char *argv[])
+{
+  TDEApplication::disableAutoDcopRegistration();
+  TDEApplication app(argc,argv,"tdestdacceltest",false,false);
+
+  check( "shortcutDefault FullScreen", TDEStdAccel::shortcutDefault( TDEStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
+  check( "shortcutDefault BeginningOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::BeginningOfLine ).toString(), "Home" );
+  check( "shortcutDefault EndOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::EndOfLine ).toString(), "End" );
+
+  check( "name BeginningOfLine", TDEStdAccel::name( TDEStdAccel::BeginningOfLine ), "BeginningOfLine" );
+  check( "name EndOfLine", TDEStdAccel::name( TDEStdAccel::EndOfLine ), "EndOfLine" );
+
+  check( "shortcut method", TDEStdAccel::shortcut( TDEStdAccel::ZoomIn ).toString(), TDEStdAccel::zoomIn().toString() );
+
+  return 0;
+}
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index c9e933c51..d69b3f6f4 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -1,5 +1,5 @@
 /*
- testqtargs -- is there really a bug in KCmdLineArgs or am I on crack?
+ testqtargs -- is there really a bug in TDECmdLineArgs or am I on crack?
 
   I used the following compile options:
 
@@ -28,7 +28,7 @@
   --bg is aliased to --background but If you try it with --background or 
   -background, you get the same thing.
 
-  in tdecore/kapplication.cpp, KCmdLineOption qt_options is defined and used 
+  in tdecore/tdeapplication.cpp, TDECmdLineOption qt_options is defined and used 
   by the static method Kapplication::addCmdLineOptions to add the Qt options
   but its' entries look like this:
 
@@ -43,15 +43,15 @@ application palette (light and dark shades are\ncalculated)."), 0},
 
 */
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "hello ", I18N_NOOP("Says hello"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc, char *argv[])
@@ -60,23 +60,23 @@ int main(int argc, char *argv[])
   {
     tqDebug("argv[%d] = %s", i, argv[i]);
   }
-  KAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
-    "1.0", I18N_NOOP("testqtargs"), KAboutData::License_GPL,
+  TDEAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
+    "1.0", I18N_NOOP("testqtargs"), TDEAboutData::License_GPL,
     "", "", "", "");
 
-  KCmdLineArgs::init(argc, argv, &aboutData);
-  KCmdLineArgs::addCmdLineOptions(options);
+  TDECmdLineArgs::init(argc, argv, &aboutData);
+  TDECmdLineArgs::addCmdLineOptions(options);
 
-  KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
+  TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
   for (int i = 0; i < qtargs->count(); i++)
   {
     tqDebug("qt arg[%d] = %s", i, qtargs->arg(i));
   }
 
-  KApplication app;
+  TDEApplication app;
 
-  KCmdLineArgs *kdeargs = KCmdLineArgs::parsedArgs("tde");
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *kdeargs = TDECmdLineArgs::parsedArgs("tde");
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   // An arg set by Qt
   if(qtargs->isSet("background"))
diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp
index 63cdc761f..e96c25011 100644
--- a/tdecore/twin.cpp
+++ b/tdecore/twin.cpp
@@ -35,18 +35,18 @@
 
 #include "config.h"
 #include "twin.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
 #include <kdatastream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #ifdef Q_WS_X11
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <kxerrorhandler.h>
 
 #include <X11/Xlib.h>
@@ -483,8 +483,8 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags )
 	    if( XGetClassHint( tqt_xdisplay(), win, &hint ) ) {
 	        TQString className = hint.res_class;
 
-	        TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth,
-								          KIcon::DefaultState, 0, true );
+	        TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon( className.lower(), TDEIcon::Small, iconWidth,
+								          TDEIcon::DefaultState, 0, true );
 	        if( scale && !pm.isNull() )
 		    result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) );
 	        else
@@ -500,8 +500,8 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags )
 	// If the icon is still a null pixmap, load the 'xapp' icon
 	// as a last resort:
 	if ( result.isNull() ) {
-	    TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon(  "xapp", KIcon::Small, iconWidth,
-								       KIcon::DefaultState, 0, true );
+	    TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(  "xapp", TDEIcon::Small, iconWidth,
+								       TDEIcon::DefaultState, 0, true );
 	    if( scale && !pm.isNull() )
 		result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) );
 	    else
@@ -731,7 +731,7 @@ void KWin::lowerWindow( WId win )
 void KWin::appStarted()
 {
 #ifdef Q_WS_X11
-    KStartupInfo::appStarted();
+    TDEStartupInfo::appStarted();
 #endif
 }
 
diff --git a/tdecore/twin.h b/tdecore/twin.h
index c7aa37a6a..141edeffc 100644
--- a/tdecore/twin.h
+++ b/tdecore/twin.h
@@ -509,7 +509,7 @@ private:
 #endif
     /**
      * @deprecated
-     * Use KStartupInfo::appStarted
+     * Use TDEStartupInfo::appStarted
      */
     static void appStarted() KDE_DEPRECATED;
 };
diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp
index adc20f218..a37370e58 100644
--- a/tdecore/twinmodule.cpp
+++ b/tdecore/twinmodule.cpp
@@ -26,11 +26,11 @@
 #include "twinmodule.h"
 #include "twin.h"
 #include <X11/Xatom.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kdebug.h"
 #include <tqtl.h>
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "netwm.h"
 
diff --git a/kfile-plugins/CMakeLists.txt b/tdefile-plugins/CMakeLists.txt
index 61e9dd6a3..61e9dd6a3 100644
--- a/kfile-plugins/CMakeLists.txt
+++ b/tdefile-plugins/CMakeLists.txt
diff --git a/kfile-plugins/elf/CMakeLists.txt b/tdefile-plugins/elf/CMakeLists.txt
index 91e9d5e32..04bec18fe 100644
--- a/kfile-plugins/elf/CMakeLists.txt
+++ b/tdefile-plugins/elf/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_BINARY_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${LIBR_INCLUDEDIR}
 )
 
@@ -29,14 +29,14 @@ link_directories(
 
 #### other data #################################
 
-install( FILES kfile_elf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_elf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kfile_elf (module) #########################
+#### tdefile_elf (module) #########################
 
-tde_add_kpart( kfile_elf AUTOMOC
-  SOURCES kfile_elf.cpp
+tde_add_kpart( tdefile_elf AUTOMOC
+  SOURCES tdefile_elf.cpp
   EMBED tdelficon-static
-  LINK kio-shared ${LIBR_LIBRARIES}
+  LINK tdeio-shared ${LIBR_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kfile-plugins/elf/kfile_elf.cpp b/tdefile-plugins/elf/tdefile_elf.cpp
index 2357f0617..7308a40d1 100644
--- a/kfile-plugins/elf/kfile_elf.cpp
+++ b/tdefile-plugins/elf/tdefile_elf.cpp
@@ -18,10 +18,10 @@
  */
 
 #include <config.h>
-#include "kfile_elf.h"
+#include "tdefile_elf.h"
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
 #include <kdebug.h>
@@ -43,7 +43,7 @@ typedef unsigned short uint16_t;
 
 typedef KGenericFactory<KElfPlugin> ElfFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_elf, ElfFactory( "kfile_elf" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_elf, ElfFactory( "tdefile_elf" ))
 
 KElfPlugin::KElfPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -130,4 +130,4 @@ bool KElfPlugin::readInfo( KFileMetaInfo& info, uint what)
 	return true;
 }
 
-#include "kfile_elf.moc"
+#include "tdefile_elf.moc"
diff --git a/kfile-plugins/elf/kfile_elf.desktop b/tdefile-plugins/elf/tdefile_elf.desktop
index cc993d36a..d51d3c312 100644
--- a/kfile-plugins/elf/kfile_elf.desktop
+++ b/tdefile-plugins/elf/tdefile_elf.desktop
@@ -60,7 +60,7 @@ Name[zh_HK]=ELF 資訊
 Name[zh_TW]=ELF 資訊
 Name[zu]=Ulwazi lwe-ELF
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_elf
+X-TDE-Library=tdefile_elf
 MimeType=application/x-executable
 PreferredItems=Name,Description,License,Copyright,Authors,Product,Organization,Version,DateTime,Notes"
 SupportsThumbnail=false
\ No newline at end of file
diff --git a/kfile-plugins/elf/kfile_elf.h b/tdefile-plugins/elf/tdefile_elf.h
index 1e6247a46..cd72afc87 100644
--- a/kfile-plugins/elf/kfile_elf.h
+++ b/tdefile-plugins/elf/tdefile_elf.h
@@ -17,10 +17,10 @@
  *
  */
 
-#ifndef __KFILE_BMP_H__
-#define __KFILE_BMP_H__
+#ifndef __TDEFILE_BMP_H__
+#define __TDEFILE_BMP_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 // Elven things
 extern "C" {
diff --git a/tdefx/CMakeLists.txt b/tdefx/CMakeLists.txt
index 1aa52627f..60d81fe38 100644
--- a/tdefx/CMakeLists.txt
+++ b/tdefx/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
 
 install( FILES
     kpixmap.h kpixmapsplitter.h kpixmapeffect.h
-    kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
+    kimageeffect.h kdrawutil.h tdestyle.h kcpuinfo.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
@@ -37,7 +37,7 @@ set( target tdefx )
 
 set( ${target}_SRCS
   kpixmap.cpp kpixmapsplitter.cpp kpixmapeffect.cpp
-  kimageeffect.cpp kdrawutil.cpp kstyle.cpp kcpuinfo.cpp
+  kimageeffect.cpp kdrawutil.cpp tdestyle.cpp kcpuinfo.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tdefx/Mainpage.dox b/tdefx/Mainpage.dox
index 65fcadfc8..6352e6198 100644
--- a/tdefx/Mainpage.dox
+++ b/tdefx/Mainpage.dox
@@ -23,7 +23,7 @@
  * architecture extensions that are useful when processing images,
  * such as MMX, SSE, 3DNow! and AltiVec.
  *
- * KStyle is the base class for the %Trinity widget styles. It simplifies
+ * TDEStyle is the base class for the %Trinity widget styles. It simplifies
  * and extends the QStyle API in order to make style coding easier.
  * It also provides an internal menu transparency and drop shadow
  * engine, which means that all styles inheriting this class will
diff --git a/tdefx/Makefile.am b/tdefx/Makefile.am
index 2b588ba54..7fb97e400 100644
--- a/tdefx/Makefile.am
+++ b/tdefx/Makefile.am
@@ -30,10 +30,10 @@ libtdefx_la_NMCHECKWEAK = $(srcdir)/libtdefx_weak.nmcheck $(top_srcdir)/tdecore/
 	$(top_srcdir)/tdecore/standard_weak.nmcheck
 
 include_HEADERS = kpixmap.h kpixmapsplitter.h \
-	kpixmapeffect.h kimageeffect.h kdrawutil.h kstyle.h kcpuinfo.h
+	kpixmapeffect.h kimageeffect.h kdrawutil.h tdestyle.h kcpuinfo.h
 
 libtdefx_la_SOURCES = kpixmap.cpp kpixmapsplitter.cpp \
-		kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp kstyle.cpp \
+		kpixmapeffect.cpp kimageeffect.cpp kdrawutil.cpp tdestyle.cpp \
 		kcpuinfo.cpp
 
 METASOURCES = AUTO
diff --git a/tdefx/kdrawutil.h b/tdefx/kdrawutil.h
index a229625a4..909792817 100644
--- a/tdefx/kdrawutil.h
+++ b/tdefx/kdrawutil.h
@@ -33,7 +33,7 @@
  */
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @c \#include @c <kdrawutil.h>
  *
  * Draws a Next-style button (solid black shadow with light and midlight highlight).
@@ -49,7 +49,7 @@ TDEFX_EXPORT void kDrawNextButton(TQPainter *p, const TQRect &r, const TQColorGr
                      bool sunken=false, const TQBrush *fill=0);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @overload
  */
 TDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
@@ -57,7 +57,7 @@ TDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
                      const TQBrush *fill=0);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @c \#include @c <kdrawutil.h>
  *
  * Draws a Be-style button.
@@ -73,7 +73,7 @@ TDEFX_EXPORT void kDrawBeButton(TQPainter *p, TQRect &r, const TQColorGroup &g,
                    bool sunken=false, const TQBrush *fill=0);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @c \#include @c <kdrawutil.h>
  * @overload
  */
@@ -82,7 +82,7 @@ TDEFX_EXPORT void kDrawBeButton(TQPainter *p, int x, int y, int w, int h,
                    const TQBrush *fill=0);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @c \#include @c <kdrawutil.h>
  *
  * Draws a rounded oval button. This function doesn't fill the button.
@@ -97,14 +97,14 @@ TDEFX_EXPORT void kDrawRoundButton(TQPainter *p, const TQRect &r, const TQColorG
                       bool sunken=false);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @overload
  */
 TDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h,
                       const TQColorGroup &g, bool sunken=false);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @c \#include @c <kdrawutil.h>
  *
  * Sets a region to the pixels covered by a round button of the given
@@ -121,7 +121,7 @@ TDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h,
 TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @c \#include @c <kdrawutil.h>
  *
  * Paints the pixels covered by a round button of the given size with
@@ -138,7 +138,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
 TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @c \#include @c <kdrawutil.h>
  *
  * Paints the provided bitmaps in the painter, using the supplied colorgroup for
@@ -167,7 +167,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int
                    TQBitmap *blackColor=0, TQBitmap *whiteColor=0);
 
 /**
- * @relates KStyle
+ * @relates TDEStyle
  * @c \#include @c <kdrawutil.h>
  * @overload
  */
diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp
index dfdc04698..1da7f28fb 100644
--- a/tdefx/kimageeffect.cpp
+++ b/tdefx/kimageeffect.cpp
@@ -69,7 +69,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define MOD(x, y) ((x) < 0 ? ((y) - 1 - ((y) - 1 - (x)) % (y)) : (x) % (y))
 
 /**
- * \relates KGlobal
+ * \relates TDEGlobal
  * A typesafe function that returns x if it's between low and high values.
  * low if x is smaller than then low and high if x is bigger than high.
  */
diff --git a/tdefx/kstyle.cpp b/tdefx/tdestyle.cpp
index dde47eeb2..0c6a7f1fe 100644
--- a/tdefx/kstyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * KStyle
+ * TDEStyle
  * Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
  *
  * TQWindowsStyle CC_ListView and style images were kindly donated by TrollTech,
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "kstyle.h"
+#include "tdestyle.h"
 
 #include <tqapplication.h>
 #include <tqbitmap.h>
@@ -124,7 +124,7 @@ namespace
 	static bool useDropShadow(TQWidget* w)
 	{
 		return w && w->metaObject() && 
-			w->metaObject()->findProperty("KStyleMenuDropShadow") != -1;
+			w->metaObject()->findProperty("TDEStyleMenuDropShadow") != -1;
 	}
 }
 
@@ -133,7 +133,7 @@ namespace
 class TransparencyHandler : public TQObject
 {
 	public:
-		TransparencyHandler(KStyle* style, TransparencyEngine tEngine,
+		TransparencyHandler(TDEStyle* style, TransparencyEngine tEngine,
 							float menuOpacity, bool useDropShadow);
 		~TransparencyHandler();
 		bool eventFilter(TQObject* object, TQEvent* event);
@@ -154,12 +154,12 @@ class TransparencyHandler : public TQObject
 		bool    dropShadow;
 		float   opacity;
 		TQPixmap pix;
-		KStyle* kstyle;
+		TDEStyle* kstyle;
 		TransparencyEngine te;
 };
 } // namespace
 
-struct KStylePrivate
+struct TDEStylePrivate
 {
 	bool  highcolor                : 1;
 	bool  useFilledFrameWorkaround : 1;
@@ -174,9 +174,9 @@ struct KStylePrivate
 	float menuOpacity;
 
 	TransparencyEngine   transparencyEngine;
-	KStyle::KStyleScrollBarType  scrollbarType;
+	TDEStyle::TDEStyleScrollBarType  scrollbarType;
 	TransparencyHandler* menuHandler;
-	KStyle::KStyleFlags flags;
+	TDEStyle::TDEStyleFlags flags;
 	
 	//For KPE_ListViewBranch
 	TQBitmap *verticalLine;
@@ -186,8 +186,8 @@ struct KStylePrivate
 // -----------------------------------------------------------------------------
 
 
-KStyle::KStyle( KStyleFlags flags, KStyleScrollBarType sbtype )
-	: TQCommonStyle(), d(new KStylePrivate)
+TDEStyle::TDEStyle( TDEStyleFlags flags, TDEStyleScrollBarType sbtype )
+	: TQCommonStyle(), d(new TDEStylePrivate)
 {
 	d->flags = flags;
 	bool useMenuTransparency    = (flags & AllowMenuTransparency);
@@ -197,18 +197,18 @@ KStyle::KStyle( KStyleFlags flags, KStyleScrollBarType sbtype )
 
 	// Read style settings
 	TQSettings settings;
-	d->popupMenuDelay       = settings.readNumEntry ("/KStyle/Settings/PopupMenuDelay", 256);
-	d->sloppySubMenus       = settings.readBoolEntry("/KStyle/Settings/SloppySubMenus", false);
-	d->etchDisabledText     = settings.readBoolEntry("/KStyle/Settings/EtchDisabledText", true);
-	d->menuAltKeyNavigation = settings.readBoolEntry("/KStyle/Settings/MenuAltKeyNavigation", true);
-	d->scrollablePopupmenus = settings.readBoolEntry("/KStyle/Settings/ScrollablePopupMenus", false);
-	d->autoHideAccelerators = settings.readBoolEntry("/KStyle/Settings/AutoHideAccelerators", false);
-	d->menuDropShadow       = settings.readBoolEntry("/KStyle/Settings/MenuDropShadow", false);
-	d->semiTransparentRubberband = settings.readBoolEntry("/KStyle/Settings/SemiTransparentRubberband", false);
+	d->popupMenuDelay       = settings.readNumEntry ("/TDEStyle/Settings/PopupMenuDelay", 256);
+	d->sloppySubMenus       = settings.readBoolEntry("/TDEStyle/Settings/SloppySubMenus", false);
+	d->etchDisabledText     = settings.readBoolEntry("/TDEStyle/Settings/EtchDisabledText", true);
+	d->menuAltKeyNavigation = settings.readBoolEntry("/TDEStyle/Settings/MenuAltKeyNavigation", true);
+	d->scrollablePopupmenus = settings.readBoolEntry("/TDEStyle/Settings/ScrollablePopupMenus", false);
+	d->autoHideAccelerators = settings.readBoolEntry("/TDEStyle/Settings/AutoHideAccelerators", false);
+	d->menuDropShadow       = settings.readBoolEntry("/TDEStyle/Settings/MenuDropShadow", false);
+	d->semiTransparentRubberband = settings.readBoolEntry("/TDEStyle/Settings/SemiTransparentRubberband", false);
 	d->menuHandler = NULL;
 
 	if (useMenuTransparency) {
-		TQString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled");
+		TQString effectEngine = settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled");
 
 #ifdef HAVE_XRENDER
 		if (effectEngine == "XRender")
@@ -226,7 +226,7 @@ KStyle::KStyle( KStyleFlags flags, KStyleScrollBarType sbtype )
 
 		if (d->transparencyEngine != Disabled) {
 			// Create an instance of the menu transparency handler
-			d->menuOpacity = settings.readDoubleEntry("/KStyle/Settings/MenuOpacity", 0.90);
+			d->menuOpacity = settings.readDoubleEntry("/TDEStyle/Settings/MenuOpacity", 0.90);
 			d->menuHandler = new TransparencyHandler(this, d->transparencyEngine,
 													 d->menuOpacity, d->menuDropShadow);
 		}
@@ -241,7 +241,7 @@ KStyle::KStyle( KStyleFlags flags, KStyleScrollBarType sbtype )
 }
 
 
-KStyle::~KStyle()
+TDEStyle::~TDEStyle()
 {
 	delete d->verticalLine;
 	delete d->horizontalLine;
@@ -253,7 +253,7 @@ KStyle::~KStyle()
 }
 
 
-TQString KStyle::defaultStyle()
+TQString TDEStyle::defaultStyle()
 {
 	if (TQPixmap::defaultDepth() > 8)
 	   return TQString("plastik");
@@ -261,7 +261,7 @@ TQString KStyle::defaultStyle()
 	   return TQString("light, 3rd revision");
 }
 
-void KStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
+void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
 	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 		TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
@@ -285,7 +285,7 @@ void KStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlag
 }
 
 
-void KStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
+void TDEStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
 	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 		TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
@@ -304,7 +304,7 @@ void KStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFl
 
 
 // Style changes (should) always re-polish popups.
-void KStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
+void TDEStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
     if ( !(ceData.windowState & WState_Polished ) ) {
         widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
@@ -324,26 +324,26 @@ void KStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlEl
 
 
 // -----------------------------------------------------------------------------
-// KStyle extensions
+// TDEStyle extensions
 // -----------------------------------------------------------------------------
 
-void KStyle::setScrollBarType(KStyleScrollBarType sbtype)
+void TDEStyle::setScrollBarType(TDEStyleScrollBarType sbtype)
 {
 	d->scrollbarType = sbtype;
 }
 
-KStyle::KStyleFlags KStyle::styleFlags() const
+TDEStyle::TDEStyleFlags TDEStyle::styleFlags() const
 {
 	return d->flags;
 }
 
-void KStyle::renderMenuBlendPixmap( KPixmap &pix, const TQColorGroup &cg,
+void TDEStyle::renderMenuBlendPixmap( KPixmap &pix, const TQColorGroup &cg,
 	const TQPopupMenu* /* popup */ ) const
 {
 	pix.fill(cg.button());	// Just tint as the default behavior
 }
 
-void KStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 								  TQPainter* p,
 								  const TQWidget* widget,
 								  const TQRect &r,
@@ -352,10 +352,10 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe,
 								  const TQStyleOption &opt ) const
 {
 	TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption());
-	drawKStylePrimitive(kpe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, opt);
+	drawTDEStylePrimitive(kpe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, opt);
 }
 
-void KStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 								  TQPainter* p,
 								  const TQStyleControlElementData &ceData,
 								  ControlElementFlags elementFlags,
@@ -543,7 +543,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe,
 }
 
 
-int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const
+int TDEStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const
 {
 	int value;
 	switch(kpm)
@@ -571,7 +571,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData
 
 // #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times.  Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
 
-//void KStyle::drawPrimitive( TQ_ControlElement pe,
+//void TDEStyle::drawPrimitive( TQ_ControlElement pe,
 //							TQPainter* p,
 // 							const TQStyleControlElementData &ceData,
 // 							ControlElementFlags elementFlags,
@@ -591,7 +591,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData
 
 // -----------------------------------------------------------------------------
 
-void KStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
 							TQPainter* p,
 							const TQStyleControlElementData &ceData,
 							ControlElementFlags elementFlags,
@@ -619,16 +619,16 @@ void KStyle::drawPrimitive( TQ_PrimitiveElement pe,
 			(parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) ))	// Collapsed dock
 
 			// Draw a toolbar handle
-			drawKStylePrimitive( KPE_ToolBarHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
+			drawTDEStylePrimitive( KPE_ToolBarHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
 
 		else if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING))
 
 			// Draw a dock window handle
-			drawKStylePrimitive( KPE_DockWindowHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
+			drawTDEStylePrimitive( KPE_DockWindowHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
 
 		else
 			// General handle, probably a kicker applet handle.
-			drawKStylePrimitive( KPE_GeneralHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
+			drawTDEStylePrimitive( KPE_GeneralHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
 #if TQT_VERSION >= 0x030300
 #ifdef HAVE_XRENDER
 	} else if ( d->semiTransparentRubberband && pe == TQStyle::PE_RubberBand ) {
@@ -686,7 +686,7 @@ void KStyle::drawPrimitive( TQ_PrimitiveElement pe,
 
 
 
-void KStyle::drawControl( TQ_ControlElement element,
+void TDEStyle::drawControl( TQ_ControlElement element,
 						  TQPainter* p,
 						  const TQStyleControlElementData &ceData,
 						  ControlElementFlags elementFlags,
@@ -988,7 +988,7 @@ void KStyle::drawControl( TQ_ControlElement element,
 }
 
 
-TQRect KStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const
+TQRect TDEStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const
 {
 	switch(r)
 	{
@@ -1010,7 +1010,7 @@ TQRect KStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const
 }
 
 
-int KStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* widget) const
+int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* widget) const
 {
 	switch(m)
 	{
@@ -1132,7 +1132,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
     return sibling;
 }
 
-void KStyle::drawComplexControl( TQ_ComplexControl control,
+void TDEStyle::drawComplexControl( TQ_ComplexControl control,
 								 TQPainter* p,
 								 const TQStyleControlElementData &ceData,
 								 ControlElementFlags elementFlags,
@@ -1248,7 +1248,7 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
 
 			// Draw slider groove
 			if ((controls & SC_SliderGroove) && groove.isValid()) {
-				drawKStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, flags, opt, widget );
+				drawTDEStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, flags, opt, widget );
 
 				// Draw the focus rect around the groove
 				if (elementFlags & CEF_HasFocus) {
@@ -1265,7 +1265,7 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
 			if ((controls & SC_SliderHandle) && handle.isValid()) {
 				if (active == SC_SliderHandle)
 					flags |= Style_Active;
-				drawKStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, flags, opt, widget );
+				drawTDEStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, flags, opt, widget );
 			}
 
 			p2.end();
@@ -1352,8 +1352,8 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
 							boxrect = TQRect( bx-4, linebot-4, 9, 9 );
 							boxflags = child->isOpen() ? TQStyle::Style_Off : TQStyle::Style_On;
 
-							// KStyle extension: Draw the box and expand/collapse indicator
-							drawKStylePrimitive( KPE_ListViewExpander, p, ceData, elementFlags, boxrect, cg, boxflags, opt, NULL );
+							// TDEStyle extension: Draw the box and expand/collapse indicator
+							drawTDEStylePrimitive( KPE_ListViewExpander, p, ceData, elementFlags, boxrect, cg, boxflags, opt, NULL );
 
 							// dotlinery
 							p->setPen( cg.mid() );
@@ -1406,8 +1406,8 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
 						branchrect  = TQRect( point, other-(thickness/2), end-point, thickness );
 						branchflags = TQStyle::Style_Horizontal;
 
-						// KStyle extension: Draw the horizontal branch
-						drawKStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
+						// TDEStyle extension: Draw the horizontal branch
+						drawTDEStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
 
 					} else {
 						// Vertical branch
@@ -1422,8 +1422,8 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
 						else
 							branchflags = TQStyle::Style_Default;
 
-						// KStyle extension: Draw the vertical branch
-						drawKStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
+						// TDEStyle extension: Draw the vertical branch
+						drawTDEStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL );
 					}
 				}
 			}
@@ -1438,7 +1438,7 @@ void KStyle::drawComplexControl( TQ_ComplexControl control,
 }
 
 
-TQStyle::SubControl KStyle::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control,
 											const TQStyleControlElementData &ceData,
 											ControlElementFlags elementFlags,
 											const TQPoint &pos,
@@ -1456,7 +1456,7 @@ TQStyle::SubControl KStyle::querySubControl( TQ_ComplexControl control,
 }
 
 
-TQRect KStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect TDEStyle::querySubControlMetrics( TQ_ComplexControl control,
 									  const TQStyleControlElementData &ceData,
 									  ControlElementFlags elementFlags,
 									  SubControl sc,
@@ -1842,7 +1842,7 @@ static const char* const critical_xpm[]={
 "...........aaaaaaaaaaa..........",
 ".............aaaaaaa............"};
 
-TQPixmap KStyle::stylePixmap( StylePixmap stylepixmap,
+TQPixmap TDEStyle::stylePixmap( StylePixmap stylepixmap,
 						  const TQStyleControlElementData &ceData,
 						  ControlElementFlags elementFlags,
 						  const TQStyleOption& opt,
@@ -1876,7 +1876,7 @@ TQPixmap KStyle::stylePixmap( StylePixmap stylepixmap,
 }
 
 
-int KStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					   const TQStyleOption &opt, TQStyleHintReturn* shr, const TQWidget* w) const
 {
 	switch (sh)
@@ -1935,7 +1935,7 @@ int KStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData,
 }
 
 
-bool KStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
+bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
 	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
 		TQObject* object = reinterpret_cast<TQObject*>(source);
@@ -1990,10 +1990,10 @@ bool KStyle::objectEventHandler( const TQStyleControlElementData &ceData, Contro
 
 
 // -----------------------------------------------------------------------------
-// I N T E R N A L -  KStyle menu transparency handler
+// I N T E R N A L -  TDEStyle menu transparency handler
 // -----------------------------------------------------------------------------
 
-TransparencyHandler::TransparencyHandler( KStyle* style,
+TransparencyHandler::TransparencyHandler( TDEStyle* style,
 	TransparencyEngine tEngine, float menuOpacity, bool useDropShadow )
 	: TQObject()
 {
@@ -2401,7 +2401,7 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
 }
 #endif
 
-void KStyle::virtual_hook( int, void* )
+void TDEStyle::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 // HACK for gtk-qt-engine
@@ -2409,10 +2409,10 @@ void KStyle::virtual_hook( int, void* )
 extern "C" KDE_EXPORT
 void kde_kstyle_set_scrollbar_type_windows( void* style )
 {
-    ((KStyle*)style)->setScrollBarType( KStyle::WindowsStyleScrollBar );
+    ((TDEStyle*)style)->setScrollBarType( TDEStyle::WindowsStyleScrollBar );
 }
 
 // vim: set noet ts=4 sw=4:
 // kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off;
 
-#include "kstyle.moc"
+#include "tdestyle.moc"
diff --git a/tdefx/kstyle.h b/tdefx/tdestyle.h
index c8a704381..9c3867bb3 100644
--- a/tdefx/kstyle.h
+++ b/tdefx/tdestyle.h
@@ -1,7 +1,7 @@
 /*
  * $Id$
  * 
- * KStyle
+ * TDEStyle
  * Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org>
  * 
  * TQWindowsStyle CC_ListView and style images were kindly donated by TrollTech,
@@ -38,11 +38,11 @@
 
 class KPixmap;
 
-struct KStylePrivate;
+struct TDEStylePrivate;
 /** 
  * Simplifies and extends the TQStyle API to make style coding easier.
  *  
- * The KStyle class provides a simple internal menu transparency engine
+ * The TDEStyle class provides a simple internal menu transparency engine
  * which attempts to use XRender for accelerated blending where requested,
  * or falls back to fast internal software tinting/blending routines.
  * It also simplifies more complex portions of the TQStyle API, such as
@@ -54,7 +54,7 @@ struct KStylePrivate;
  * @author Karol Szwed (gallium@kde.org)
  * @version $Id$
  */
-class TDEFX_EXPORT KStyle: public TQCommonStyle
+class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 {
 	Q_OBJECT
 	
@@ -62,12 +62,12 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 	public:
 
 		/**
-		 * KStyle Flags:
+		 * TDEStyle Flags:
 		 * 
 		 * @li Default - Default style setting, where menu transparency
 		 * and the FilledFrameWorkaround are disabled.
 		 * 
-		 * @li AllowMenuTransparency - Enable this flag to use KStyle's 
+		 * @li AllowMenuTransparency - Enable this flag to use TDEStyle's 
 		 * internal menu transparency engine.
 		 * 
 		 * @li FilledFrameWorkaround - Enable this flag to facilitate 
@@ -77,15 +77,15 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 		 * this workaround to enable painting of gradients in menubars and 
 		 * toolbars.
 		 */
-		typedef uint KStyleFlags;
-		enum KStyleOption {
+		typedef uint TDEStyleFlags;
+		enum TDEStyleOption {
 			Default 	      =		0x00000000, //!< All options disabled
 			AllowMenuTransparency =		0x00000001, //!< Internal transparency enabled
 			FilledFrameWorkaround = 	0x00000002  //!< Filled frames enabled
 		};
 
 		/**
-		 * KStyle ScrollBarType:
+		 * TDEStyle ScrollBarType:
 		 *
 		 * Allows the style writer to easily select what type of scrollbar
 		 * should be used without having to duplicate large amounts of source
@@ -105,9 +105,9 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 		 * @li NextStyleScrollBar - Similar to the PlatinumStyle scroll bar, but
 		 * with the buttons grouped on the opposite end of the scrollbar.
 		 *
-		 * @see KStyle::KStyle()
+		 * @see TDEStyle::TDEStyle()
 		 */
-		enum KStyleScrollBarType {
+		enum TDEStyleScrollBarType {
 			WindowsStyleScrollBar  = 	0x00000000, //!< two button, windows style
 			PlatinumStyleScrollBar = 	0x00000001, //!< two button, platinum style
 			ThreeButtonScrollBar   = 	0x00000002, //!< three buttons, %KDE style
@@ -115,31 +115,31 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 		};
 
 		/** 
-		 * Constructs a KStyle object.
+		 * Constructs a TDEStyle object.
 		 *
-		 * Select the appropriate KStyle flags and scrollbar type
+		 * Select the appropriate TDEStyle flags and scrollbar type
 		 * for your style. The user's style preferences selected in KControl
 		 * are read by using TQSettings and are automatically applied to the style.
-		 * As a fallback, KStyle paints progressbars and tabbars. It inherits from
+		 * As a fallback, TDEStyle paints progressbars and tabbars. It inherits from
 		 * TQCommonStyle for speed, so don't expect much to be implemented. 
 		 *
 		 * It is advisable to use a currently implemented style such as the HighColor
-		 * style as a foundation for any new KStyle, so the limited number of
+		 * style as a foundation for any new TDEStyle, so the limited number of
 		 * drawing fallbacks should not prove problematic.
 		 *
 		 * @param flags the style to be applied
 		 * @param sbtype the scroll bar type
-		 * @see KStyle::KStyleFlags
-		 * @see KStyle::KStyleScrollBarType
+		 * @see TDEStyle::TDEStyleFlags
+		 * @see TDEStyle::TDEStyleScrollBarType
 		 * @author Karol Szwed (gallium@kde.org)
 		 */
-		KStyle( KStyleFlags flags = KStyle::Default, 
-			KStyleScrollBarType sbtype = KStyle::WindowsStyleScrollBar );
+		TDEStyle( TDEStyleFlags flags = TDEStyle::Default, 
+			TDEStyleScrollBarType sbtype = TDEStyle::WindowsStyleScrollBar );
 
 		/** 
-		 * Destructs the KStyle object.
+		 * Destructs the TDEStyle object.
 		 */
-		~KStyle();
+		~TDEStyle();
 
 		/**
 		 * Returns the default widget style depending on color depth.
@@ -152,19 +152,19 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 		 * This function is only provided for convenience. It allows
 		 * you to make a late decision about what scrollbar type to use for the
 		 * style after performing some processing in your style's constructor.
-		 * In most situations however, setting the scrollbar type via the KStyle
+		 * In most situations however, setting the scrollbar type via the TDEStyle
 		 * constructor should suffice.
 		 * @param sbtype the scroll bar type
-		 * @see KStyle::KStyleScrollBarType
+		 * @see TDEStyle::TDEStyleScrollBarType
 		 */
-		void setScrollBarType(KStyleScrollBarType sbtype);
+		void setScrollBarType(TDEStyleScrollBarType sbtype);
 
 		/**
-		 * Returns the KStyle flags used to initialize the style.
+		 * Returns the TDEStyle flags used to initialize the style.
 		 *
 		 * This is used solely for the kcmstyle module, and hence is internal.
 		 */
-		KStyleFlags styleFlags() const;
+		TDEStyleFlags styleFlags() const;
 
 		// ---------------------------------------------------------------------------
 
@@ -173,7 +173,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 		 * menu and the background to create different menu transparency effects.
 		 * For example, you can fill the pixmap "pix" with a gradient based on the
 		 * popup's colorGroup, a texture, or some other fancy painting routine.
-		 * KStyle will then internally blend this pixmap with a snapshot of the
+		 * TDEStyle will then internally blend this pixmap with a snapshot of the
 		 * background behind the popupMenu to create the illusion of transparency.
 		 * 
 		 * This virtual is never called if XRender/Software blending is disabled by
@@ -183,20 +183,20 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 						    const TQPopupMenu* popup ) const;
 
 		/**
-		 * KStyle Primitive Elements:
+		 * TDEStyle Primitive Elements:
 		 *
-		 * The KStyle class extends the Qt's Style API by providing certain 
-		 * simplifications for parts of TQStyle. To do this, the KStylePrimitive
+		 * The TDEStyle class extends the Qt's Style API by providing certain 
+		 * simplifications for parts of TQStyle. To do this, the TDEStylePrimitive
 		 * elements were defined, which are very similar to Qt's PrimitiveElement.
 		 * 
 		 * The first three Handle primitives simplify and extend PE_DockWindowHandle, 
-		 * so do not reimplement PE_DockWindowHandle if you want the KStyle handle 
+		 * so do not reimplement PE_DockWindowHandle if you want the TDEStyle handle 
 		 * simplifications to be operable. Similarly do not reimplement CC_Slider,
-		 * SC_SliderGroove and SC_SliderHandle when using the KStyle slider
-		 * primitives. KStyle automatically double-buffers slider painting
-		 * when they are drawn via these KStyle primitives to avoid flicker.
+		 * SC_SliderGroove and SC_SliderHandle when using the TDEStyle slider
+		 * primitives. TDEStyle automatically double-buffers slider painting
+		 * when they are drawn via these TDEStyle primitives to avoid flicker.
 		 *
-		 * @li KPE_DockWindowHandle - This primitive is already implemented in KStyle,
+		 * @li KPE_DockWindowHandle - This primitive is already implemented in TDEStyle,
 		 * and paints a bevelled rect with the DockWindow caption text. Re-implement
 		 * this primitive to perform other more fancy effects when drawing the dock window
 		 * handle.
@@ -218,14 +218,14 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 		 * paint the slider handle. The default implementation paints a filled rect of
 		 * arbitrary color.
 		 *
-		 * @li KPE_ListViewExpander - This primitive is already implemented in KStyle. It
+		 * @li KPE_ListViewExpander - This primitive is already implemented in TDEStyle. It
 		 * is used to draw the Expand/Collapse element in QListViews. To indicate the 
 		 * expanded state, the style flags are set to Style_Off, while Style_On implies collapsed.
 		 *
-		 * @li KPE_ListViewBranch - This primitive is already implemented in KStyle. It is
+		 * @li KPE_ListViewBranch - This primitive is already implemented in TDEStyle. It is
 		 * used to draw the ListView branches where necessary.
 		 */
-		enum KStylePrimitive {
+		enum TDEStylePrimitive {
 			KPE_DockWindowHandle,
 			KPE_ToolBarHandle,
 			KPE_GeneralHandle,
@@ -239,7 +239,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 
 		// Old API
 		// DEPRECATED
-		virtual void drawKStylePrimitive( KStylePrimitive kpe,
+		virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 					TQPainter* p,
 					const TQWidget* widget,
 					const TQRect &r,
@@ -250,13 +250,13 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 		/**
 		 * This function is identical to Qt's TQStyle::tqdrawPrimitive(), except that 
 		 * it adds one further parameter, 'widget', that can be used to determine 
-		 * the widget state of the KStylePrimitive in question.
+		 * the widget state of the TDEStylePrimitive in question.
 		 *
-		 * @see KStyle::KStylePrimitive
+		 * @see TDEStyle::TDEStylePrimitive
 		 * @see TQStyle::tqdrawPrimitive
 		 * @see TQStyle::drawComplexControl
 		 */
-		virtual void drawKStylePrimitive( KStylePrimitive kpe,
+		virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -267,7 +267,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 					const TQWidget* widget = 0 ) const;
 
 
-		enum KStylePixelMetric {
+		enum TDEStylePixelMetric {
 			KPM_MenuItemSeparatorHeight		= 0x00000001,
 			KPM_MenuItemHMargin			= 0x00000002,
 			KPM_MenuItemVMargin			= 0x00000004,
@@ -279,7 +279,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 			KPM_ListViewBranchThickness		= 0x00000100
 		};
 
-		int kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const;
+		int kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const;
 
 		// ---------------------------------------------------------------------------
 
@@ -368,13 +368,13 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
 
 	private:
 		// Disable copy constructor and = operator
-		KStyle( const KStyle & );
-		KStyle& operator=( const KStyle & );
+		TDEStyle( const TDEStyle & );
+		TDEStyle& operator=( const TDEStyle & );
 
 	protected:
 		virtual void virtual_hook( int id, void* data );
 	private:
-		KStylePrivate *d;
+		TDEStylePrivate *d;
 };
 
 
diff --git a/khtml/.emacs-dirvars b/tdehtml/.emacs-dirvars
index 36219bd6b..36219bd6b 100644
--- a/khtml/.emacs-dirvars
+++ b/tdehtml/.emacs-dirvars
diff --git a/khtml/CMakeLists.txt b/tdehtml/CMakeLists.txt
index 2c5e58a4b..de151a6e3 100644
--- a/khtml/CMakeLists.txt
+++ b/tdehtml/CMakeLists.txt
@@ -20,14 +20,14 @@ add_subdirectory( rendering )
 add_subdirectory( pics )
 add_subdirectory( java )
 add_subdirectory( ecma )
-add_subdirectory( kmultipart )
+add_subdirectory( tdemultipart )
 
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/kjs
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}
@@ -35,12 +35,12 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
-  ${CMAKE_SOURCE_DIR}/kutils
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/tdeprint
 )
 
@@ -52,32 +52,32 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    khtmlview.h khtml_part.h khtml_events.h
-    khtml_settings.h khtmldefaults.h
+    tdehtmlview.h tdehtml_part.h tdehtml_events.h
+    tdehtml_settings.h tdehtmldefaults.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
 ##### other data ################################
 
-install( FILES khtml.desktop khtmlimage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES khtml.rc khtml_browser.rc khtml_popupmenu.rc DESTINATION ${DATA_INSTALL_DIR}/khtml )
+install( FILES tdehtml.desktop tdehtmlimage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdehtml.rc tdehtml_browser.rc tdehtml_popupmenu.rc DESTINATION ${DATA_INSTALL_DIR}/tdehtml )
 
 
-##### khtml #####################################
+##### tdehtml #####################################
 
-set( target khtml )
+set( target tdehtml )
 
 set( ${target}_SRCS
-  khtmlview.cpp khtml_part.cpp khtml_run.cpp
-  khtml_factory.cpp khtml_settings.cc khtml_events.cpp
-  khtml_ext.cpp khtml_pagecache.cpp khtml_iface.cc
-  khtml_printsettings.cpp khtmlimage.cpp kjserrordlg.ui
-  htmlpageinfo.ui khtml_iface.skel
+  tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp
+  tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp
+  tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.cc
+  tdehtml_printsettings.cpp tdehtmlimage.cpp kjserrordlg.ui
+  htmlpageinfo.ui tdehtml_iface.skel
 )
 
 ### FIXME what is this?
 ### if include_VERSION_SCRIPT
-### VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map
+### VSCRIPT = -Wl,--version-script=$(srcdir)/libtdehtml.map
 ### endif
 
 ### FIXME what about java?
@@ -86,17 +86,17 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
-  LINK ${VSCRIPT} kjava-static kjs_html-static khtmldom-static khtmlcss-static
-    khtmlhtml-static khtmlxml-static khtmlrender-static khtmlmisc-static
-    kutils-shared tdeprint-shared kjs-shared ${JPEG_LIBRARIES}
+  LINK ${VSCRIPT} kjava-static kjs_html-static tdehtmldom-static tdehtmlcss-static
+    tdehtmlhtml-static tdehtmlxml-static tdehtmlrender-static tdehtmlmisc-static
+    tdeutils-shared tdeprint-shared kjs-shared ${JPEG_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
 
 
-##### libkhtmlpart ##############################
+##### libtdehtmlpart ##############################
 
-set( target libkhtmlpart )
+set( target libtdehtmlpart )
 
 set( ${target}_SRCS
   dummy.cpp
@@ -104,20 +104,20 @@ set( ${target}_SRCS
 
 file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
 "#include <tdelibs_export.h>
-extern \"C\" KDE_EXPORT void* init_libkhtml();
-extern \"C\" KDE_EXPORT void* init_libkhtmlpart() { return init_libkhtml(); }
+extern \"C\" KDE_EXPORT void* init_libtdehtml();
+extern \"C\" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); }
 " )
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### khtmlimagepart ############################
+##### tdehtmlimagepart ############################
 
-set( target khtmlimagepart )
+set( target tdehtmlimagepart )
 
 set( ${target}_SRCS
   imgdummy.cpp
@@ -126,12 +126,12 @@ set( ${target}_SRCS
 file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/imgdummy.cpp
 "
 #include <tdelibs_export.h>
-extern \"C\"  KDE_EXPORT void* init_khtmlimagefactory();
-extern \"C\"  KDE_EXPORT void* init_khtmlimagepart() { return init_khtmlimagefactory(); }
+extern \"C\"  KDE_EXPORT void* init_tdehtmlimagefactory();
+extern \"C\"  KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); }
 " )
 
 tde_add_kpart( ${target}
   SOURCES ${${target}_SRCS}
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/khtml/ChangeLog b/tdehtml/ChangeLog
index 8c7c88bb9..302c414de 100644
--- a/khtml/ChangeLog
+++ b/tdehtml/ChangeLog
@@ -33,7 +33,7 @@
 	* ecma/kjs_window.cpp (executeOpenWindow): fixed location href
 	and pathname for about:blank windows
 
-	* khtml_part.cpp (findFrameParent): made frame name lookup locale
+	* tdehtml_part.cpp (findFrameParent): made frame name lookup locale
 	independant. Was mostly problematic with non-ascii names.
 
 	* html/html_formimpl.cpp (gatherWalletData): prevent crash occuring
@@ -48,7 +48,7 @@
         * rendering/render_object.h: New functions scrollsOverflowX() and scrollsOverflowY
         * rendering/render_layer.h: Remove depricated function moveScrollbarsAside()
         * rendering/render_layer.cpp: More fine grained creation of scrollbars
-        * khtmlview.cpp: More fine grained creation of scrollbars
+        * tdehtmlview.cpp: More fine grained creation of scrollbars
         * rendering/render_block.cpp: Use new functions
         * rendering/render_box.cpp: Use new functions
         * rendering/bidi.cpp: Use new functions
@@ -83,7 +83,7 @@
 
         * html/html_baseimpl.{h,cpp} (HTMLIFrameElementImpl::parseAttribute): parse frameborder attribute. Defaults to true as per specification.
         (HTMLIFrameElementImpl::updateFrame/attach): apply/remove frameborder style at attachment time.
-        * khtmlview.cpp (drawContents): fix counter-mask problem. Widget geometry is not accurate before painting, so we must
+        * tdehtmlview.cpp (drawContents): fix counter-mask problem. Widget geometry is not accurate before painting, so we must
         use the RenderObject's.
         * rendering/render_frames.h (paddingTop/paddingBottom/paddingLeft/paddingRight): reimplement. Frames have no padding.
         (RenderPartObject::canHaveBorder): reimplement. True.
@@ -219,7 +219,7 @@
 
         Improve the CSS :lang() selector to match clarified specification
 
-        * khtml_part.cpp: parse HTTP content-language
+        * tdehtml_part.cpp: parse HTTP content-language
         * xml/dom_docimpl.cpp: parse HTTP-EQUIV content-language
         * css/cssstyleselector.cpp: match :lang() against parents and ultimately the document
 
@@ -227,7 +227,7 @@
 
         Scope: relayout/repaint/widget masks fixes. Refine stacking context exploration. Optimise.
 
-        * khtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated)
+        * tdehtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated)
         Check if widget is in the dirty rect before doing any work.
 
         * rendering/render_block.cpp (layoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to
@@ -243,9 +243,9 @@
         stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box.
         (enclosingStackingContext) new. Returns the layer defining current stacking context.
 
-        * rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets.
+        * rendering/render_replaced.{h,cpp} (isTDEHTMLWidget): new flag for TDEHTML-proxied widgets.
         (detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's
-        Only allow !khtml widgets to register in the view (only those need masking).
+        Only allow !tdehtml widgets to register in the view (only those need masking).
 
 2006-03-05  Charles Samuels  <charles@kde.org>
 	* link not accessable with negative text-indent (#96275)
@@ -259,7 +259,7 @@
 
         get iframes, objects and some other overlaid widgets to obey their stacking context (#31121)
 
-        * khtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets,
+        * tdehtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets,
         when they ought to).
 
         * rendering/render_canvas.{cpp,h}: update widget masks after pos child layout/positioning;
@@ -314,7 +314,7 @@
 2005-12-09  Germain Garand  <germain@ebooksfrance.org>
 
         implement quirky HTML alignment ; introduce special float values
-        -khtml-left/-khtml-right to this effect.
+        -tdehtml-left/-tdehtml-right to this effect.
 
         * css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
         * css/cssstyleselector.cpp: ditto.
@@ -377,7 +377,7 @@
 
 2005-10-14  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp: show accesskeys for all frames
+        * tdehtmlview.cpp: show accesskeys for all frames
 
 2005-10-13  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -441,7 +441,7 @@
 
         Implementation of real page-breaking algorithm respecting the CSS 2.1 specification.
 
-        * khtmlview.cpp:
+        * tdehtmlview.cpp:
         Do layout for page-breaks before printing.
         Use screen resolution as default instead of 72DPI.
         * css/html4.css: Add the print media default styles
@@ -473,7 +473,7 @@
 
 2005-08-10  Dawit Alemayehu <adawit@kde.org>
         * ecma/xmlhttprequest.cpp: Convert a 304 (Not Modified) HTTP response in
-          XMLHttpRequest to a 200 (OK) response to make KHTML conform to IE's and
+          XMLHttpRequest to a 200 (OK) response to make TDEHTML conform to IE's and
           Mozilla's behavior. BUG: 110272
 
         * ecma/xmlhttprequest.cpp: Factored out the HTTP status line parsing code
@@ -490,7 +490,7 @@
         * rendering/render_line.{h,cpp}: ditto
         * rendering/render_object.{h,cpp}: ditto
         * rendering/render_form.cpp:
-        * khtml/rendering/render_table.cpp:
+        * tdehtml/rendering/render_table.cpp:
 
 2005-08-02  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -499,7 +499,7 @@
 2005-07-26  Andreas Kling <kling@impul.se>
 
         * html/htmlparser.cpp: Block <input type="image"> elements if SRC attribute is ad-filtered.
-        * khtml_part.cpp: Include <input type="image"> elements in AdBlocK filter runs.
+        * tdehtml_part.cpp: Include <input type="image"> elements in AdBlocK filter runs.
 
 2005-07-25  Dawit Alemayehu <adawit@kde.org>
         * ecma/xmlhttprequest.cpp: Use the charset provided by the remote host through the HTTP headers.
@@ -509,8 +509,8 @@
         Make new ad filters have instant effect (either hide affected elements
         replace them with the "blocked" pixmap.)
 
-        * khtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration()
-        * khtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters.
+        * tdehtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration()
+        * tdehtml_ext.cpp: Call TDEHTMLPart::reparseConfiguration() after adding new filters.
         * misc/loader.cpp: Create blockedPixmap in Cache::init() instead of the CachedImage constructor.
 
 2005-07-19  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -526,9 +526,9 @@
 
         "Block IFrame..." context menu option
 
-        * khtml_ext.{cpp,h}: Added "blockiframe" to context popup menu
-        * khtml_popupmenu.rc: Same
-        * khtml_part.h: added KHTMLPopupGUIClient to friend classes
+        * tdehtml_ext.{cpp,h}: Added "blockiframe" to context popup menu
+        * tdehtml_popupmenu.rc: Same
+        * tdehtml_part.h: added TDEHTMLPopupGUIClient to friend classes
 
 2005-07-08  Germain Garand  <germain@ebooksfrance.org>
 
@@ -544,11 +544,11 @@
 
 2005-07-07  Allan Sandfeld Jensen <kde@carewolf.com>
 
-        There is nothing KHTML specific about keypress events. They might not be DOM2 or 3,
+        There is nothing TDEHTML specific about keypress events. They might not be DOM2 or 3,
         but MSIE, Mozilla and Safari all handles them as a valid event class.
 
         * xml/dom2_eventsimpl.{h,cpp}: Allow KEYPRESS as a valid event type
-        * ./.: Rename KHTML_KEYPRESS_EVENT to KEYPRESS_EVENT
+        * ./.: Rename TDEHTML_KEYPRESS_EVENT to KEYPRESS_EVENT
 
 2005-07-05  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -580,7 +580,7 @@
         * html/html_tableimpl.cpp (appendChild): Improve fix for bug #105586 to avoid
         side effects with tfoot.
 
-        * khtml_run.cpp (foundMimeType): Mark child object (e.g. <embed>) as completed
+        * tdehtml_run.cpp (foundMimeType): Mark child object (e.g. <embed>) as completed
         after saving, running in external viewer, or cancelling, so that e.g. scheduled redirects
         can happen. Patch by Andreas Kling <kling@impul.se>.
 
@@ -633,7 +633,7 @@
 
         * ecma/domparser.{h,cpp}: Implementation
         * ecma/kjs_window.{h,cpp}: Exposing DOMParser
-        * misc/shared.h: khtml::SharedPtr<>
+        * misc/shared.h: tdehtml::SharedPtr<>
 
 2005-06-08  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -662,7 +662,7 @@
         Implement ideographic enumeration including the CSS 2.1 cjk-ideographic and several from CSS 3 List (working draft).
         Also add three more numeric: (Lao, Thai and Tibetan)
 
-        * css/cssvalues.in: Add new CSS3 values with -khtml-
+        * css/cssvalues.in: Add new CSS3 values with -tdehtml-
         * rendering/render_style.h: Add new enums
         * rendering/enumerate.cpp: Implement the ideographic algorithm.
 
@@ -708,7 +708,7 @@
 	from innerHTML() and innerText()
 
 2005-05-14  Ivor Hewitt <ivor@ivor.org>
-        * khtml_settings.cc: Support full wildcard expressions in AdblocK
+        * tdehtml_settings.cc: Support full wildcard expressions in AdblocK
 
 2005-05-12  Luciano Montanaro <mikelima@cirulla.net>
 	* html/html_formimpl.cpp: Make a return keypress activate form
@@ -718,7 +718,7 @@
 
 2005-05-12  David Faure  <faure@kde.org>
 
-        * khtmlview.cpp (dispatchKeyEvent): Don't send DOM keypress if
+        * tdehtmlview.cpp (dispatchKeyEvent): Don't send DOM keypress if
         the DOM keydown that precedes it was blocked by javascript, as in IE.
 
         * rendering/render_replaced.cpp (handleEvent): send Qt::KeyPress to the
@@ -749,9 +749,9 @@
 
         fix #15848: First implementation of AdBlocK.
 
-        * khtml_ext.{cpp,h}: Add Blockimage to context popup menu
-        * khtml_popupmenu.rc: ditto
-        * khtml_settings.{cc,h}: Add adFilter settings and helper functions
+        * tdehtml_ext.{cpp,h}: Add Blockimage to context popup menu
+        * tdehtml_popupmenu.rc: ditto
+        * tdehtml_settings.{cc,h}: Add adFilter settings and helper functions
         * html/htmlparser.cpp: Strip blocked IMG tags
         * misc/loader.{cpp,h}: Return replacement blocked images and refuse to load blocked scripts.
         * misc/blocked_icon.{cpp,png}: Image for above
@@ -805,15 +805,15 @@
 
 2005-04-15  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.{h,cpp}: Assign unused accesskeys automatically to elements
+        * tdehtmlview.{h,cpp}: Assign unused accesskeys automatically to elements
         without accesskeys.
 
 2005-04-06  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.{h,cpp}: Use KActions for type ahead find.
-        * khtml_part.{h,cpp}: ditto.
-        * khtml_part.{h,cpp}: Add Find Previous action.
-        * khtml_part.cpp (findTextNext): Fix changing direction while searching text.
+        * tdehtmlview.{h,cpp}: Use TDEActions for type ahead find.
+        * tdehtml_part.{h,cpp}: ditto.
+        * tdehtml_part.{h,cpp}: Add Find Previous action.
+        * tdehtml_part.cpp (findTextNext): Fix changing direction while searching text.
 
 2005-04-05  Lubos Lunak <l.lunak@kde.org>
 
@@ -821,7 +821,7 @@
 
 2005-04-04  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp: Don't use keyboard grab for type-ahead find.
+        * tdehtmlview.cpp: Don't use keyboard grab for type-ahead find.
 
 2005-04-03  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -1031,7 +1031,7 @@
 
 2005-02-16  Leo Savernik  <l.savernik@aon.at>
 
-	* khtmlview.cpp (dispatchMouseEvent): Walk upwards the parent chain
+	* tdehtmlview.cpp (dispatchMouseEvent): Walk upwards the parent chain
 	from the target node and set the focus to the nearest focusable
 	ancestor (merged from WebCore).
 
@@ -1045,7 +1045,7 @@
         * html/htmltokenizer.{h,cpp} (setAutoClose/timerEvent/...): add timer driven auto-close mode for
           e.g cross-frame scripts.
 
-        * khtml_part.{h,cpp} (resetFromScript): reset the part to a sane state before reopening
+        * tdehtml_part.{h,cpp} (resetFromScript): reset the part to a sane state before reopening
           a closed document.
 
         * xml/dom_docimpl.cpp (write): ditto.
@@ -1108,7 +1108,7 @@
 
 2005-02-12  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (slotRedirect): No reload should happen when redirecting
+        * tdehtml_part.cpp (slotRedirect): No reload should happen when redirecting
         to sameurl#anchor via Javascript or META refresh. This happened due to the
         setRedirectedRequest(true), which wasn't necessary for the webmin tree.cgi
         fix - setRedirectedRequest is called by KonqRun for that one.
@@ -1129,7 +1129,7 @@
 
 2005-02-08  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (executeScript): Handle immediate redirects, scheduled
+        * tdehtml_part.cpp (executeScript): Handle immediate redirects, scheduled
         by JS with e.g. location='foo', as soon as the current script finishes.
 
 2005-02-07  Leo Savernik  <l.savernik@aon.at>
@@ -1200,7 +1200,7 @@
 
 2005-01-25  Germain Garand  <germain@ebooksfrance.org>
 
-        * khtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first relayout (avoids blanking the view).
+        * tdehtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first relayout (avoids blanking the view).
          Also support Horizontal wheel events (needs qt-copy/patch #61).
 
 2005-01-25  Germain Garand  <germain@ebooksfrance.org>
@@ -1232,7 +1232,7 @@
 
 2005-01-06  Allan Sandfeld Jensen <kde@carewolf.com>
 
-        * khtml_part.cpp: Fix selection by selecting the text in the cleaned string rather
+        * tdehtml_part.cpp: Fix selection by selecting the text in the cleaned string rather
         than in the DOM.
         * xml/dom_textimpl.{h,cpp}: Add renderString() to return the possibly transformed string.
 
@@ -1262,7 +1262,7 @@
 
         memory allocation fixes
 
-        * khtml_factory.cpp: cleanup the global Arena freelist after the last khtml part gets unloaded
+        * tdehtml_factory.cpp: cleanup the global Arena freelist after the last tdehtml part gets unloaded
 
         * misc/arena.{cpp,h} (InitArenaPool): change arenasize from 4096 to kMax(8192, 2*pagesize).
         (ArenaAllocate): when a single pool grows over a 256*initial size threshold, switch to fractional allocation
@@ -1307,7 +1307,7 @@
         Pragmatic incremental repaints: be accurate on layered objects, conservative on
         objects in normal flow. Fix performance issues on repeated relayouts (#53114)
 
-        * khtmlview.{cpp,h}: add needsFullRepaint flag, mostly similar to WebCore's.
+        * tdehtmlview.{cpp,h}: add needsFullRepaint flag, mostly similar to WebCore's.
         (layout): don't repaint the canvas systematically anymore.
 
         * rendering/bidi.cpp (layoutInlineChildren): schedule a repaint on
@@ -1344,12 +1344,12 @@
         slots to avoid undeterministic calling order and redundant
         connections(#94783, 3.3.2 regression of #57360).
 
-        * khtml_part.cpp (restoreURL/openURL/slotData/restoreState): ditto.
+        * tdehtml_part.cpp (restoreURL/openURL/slotData/restoreState): ditto.
         (checkCompleted): don't setContentsPos here
 
-        * khtml_part.h: remove private gotoAnchor slot
+        * tdehtml_part.h: remove private gotoAnchor slot
 
-        * khtmlpart_p.h: add boolean to record whether we need to restore a
+        * tdehtmlpart_p.h: add boolean to record whether we need to restore a
         stored scroll offset or honour an anchor
 
 2004-12-09  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -1364,7 +1364,7 @@
         Merge encoding detection from WebCore
 
         * misc/decoder.{h,cpp}: Detect XML-encoding, comments in headers and other merges
-        * khtml_part.cpp: Frames inherits parents encoding as their default
+        * tdehtml_part.cpp: Frames inherits parents encoding as their default
 
 2004-12-08  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -1372,7 +1372,7 @@
 
         * css/cssstyleselector.cpp: Uncomment :target handling
         * xml/dom_docimpl.{h,cpp}: Add (set)cssTarget.
-        * khtml_part.cpp: Call setCssTarget on anchors
+        * tdehtml_part.cpp: Call setCssTarget on anchors
 
 2004-12-07  Allan Sandfeld Jensen <kde@carewolf.com>
 
@@ -1393,8 +1393,8 @@
         * rendering/render_list.cpp: New algorithms for hiragana, katakana,
             armenian, georgian and decimal-leading-zero.
             Also fix greek and latin list-styles for larger values.
-        * css/cssvalues.cpp: Parse box, -khtml-diamond, -khtml-arabic-indic,
-            -khtml-persian, -khtml-urdu and -khtml-upper-greek
+        * css/cssvalues.cpp: Parse box, -tdehtml-diamond, -tdehtml-arabic-indic,
+            -tdehtml-persian, -tdehtml-urdu and -tdehtml-upper-greek
         * rendering/render_style.h: Expand list-style enum
 
 2004-11-30  Germain Garand  <germain@ebooksfrance.org>
@@ -1451,10 +1451,10 @@
 
         Implement CSS border on form-widgets
 
-        * css/cssvalues.in: Add -khtml-native
-        * css/cssparser.cpp: Accept -khtml-native as a border-type
+        * css/cssvalues.in: Add -tdehtml-native
+        * css/cssparser.cpp: Accept -tdehtml-native as a border-type
         * css/cssstyleselector.cpp: BNATIVE and not BNONE is now lowest border-style
-        * css/html4.css: Make -khtml-native default border-style for form-widgets
+        * css/html4.css: Make -tdehtml-native default border-style for form-widgets
         * render/render_style.h: Add BNATIVE
         * render/render_object.cpp: Treat BNATIVE like BNONE
         * render/render_replaced.cpp: Remove native, and paint CSS border when allowed
@@ -1463,7 +1463,7 @@
 
         float and flowAroundFloat fixes.
 
-        * css/html4.css: make fieldset -khtml-around-floats (#92979)
+        * css/html4.css: make fieldset -tdehtml-around-floats (#92979)
 
         * rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats
         logic. Merges: add better RTL layouting of fAFs.
@@ -1512,7 +1512,7 @@
 
 2004-11-16  Stephan Kulow  <coolo@kde.org>
 
-        * rendering/break_lines.cpp (khtml): adding patch by Otto Pattara to support
+        * rendering/break_lines.cpp (tdehtml): adding patch by Otto Pattara to support
         libthai for correct line breaks
 
 2004-11-15  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -1555,7 +1555,7 @@
 
 2004-11-05  Germain Garand  <germain@ebooksfrance.org>
 
-        * khtml_part.cpp (closeURL/slotData/restoreState): avoid triggering
+        * tdehtml_part.cpp (closeURL/slotData/restoreState): avoid triggering
         full repaints of the view before the first layout is done.
 
 2004-11-05  Germain Garand  <germain@ebooksfrance.com>
@@ -1571,7 +1571,7 @@
 
 2004-11-03  Germain Garand  <germain@ebooksfrance.com>
 
-        * khtmlview.cpp (slotScrollBarMoved): make sure we are layouted before
+        * tdehtmlview.cpp (slotScrollBarMoved): make sure we are layouted before
         scrolling if we are still loading (#51473)
 
 2004-11-02  Stephan Kulow  <coolo@kde.org>
@@ -1629,12 +1629,12 @@
 
 2004-10-26  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (urlSelected): Only call recursiveFrameRequest if target is
+        * tdehtml_part.cpp (urlSelected): Only call recursiveFrameRequest if target is
         different from _self, _top, _blank and _parent. See tests/frames/target/*.
 
 2004-10-25  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (processObjectRequest): connect to completed(bool) for <embed>
+        * tdehtml_part.cpp (processObjectRequest): connect to completed(bool) for <embed>
         too, to avoid a never-ending-spinning-wheel on the following testcase
         <META HTTP-EQUIV="Refresh" content="10;URL=www.kde.org"><EMBED>
 
@@ -1648,7 +1648,7 @@
         * rendering/render_image.cpp: Pass through the CachedObject so we can
         use the suggested filename possibly provided by the HTTP headers.
 
-	* khtml_ext.cpp: Make use of the suggested filename for images.
+	* tdehtml_ext.cpp: Make use of the suggested filename for images.
 
 2004-10-24  David Faure  <faure@kde.org>
 
@@ -1731,7 +1731,7 @@
         * html/html_formimpl.cpp (defaultEventHandler): propagate events to
         QScrollView
 
-        * khtmlview.{cpp,h}: QScrollview needs fast repaints. Fix
+        * tdehtmlview.{cpp,h}: QScrollview needs fast repaints. Fix
         background color of QFrames.
 
         * rendering/render_form.cpp (createListBox/TextAreaWidget):
@@ -1806,7 +1806,7 @@
         Break on page-break-before and -after.
         * rendering/render_canvas.{h,cpp}:
         Merge bestTruncatedAt from WebCore.
-        * khtmlview.cpp (print):
+        * tdehtmlview.cpp (print):
         Use bestTruncatedAt for detect truncated pages.
 
 2004-10-07  David Faure  <faure@kde.org>
@@ -1831,7 +1831,7 @@
 
 2004-10-04  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (processObjectRequest):
+        * tdehtml_part.cpp (processObjectRequest):
         Fixed showing of iframe hidden with display=none (#84332).
 
 2004-09-16  Leo Savernik  <l.savernik@aon.at>
@@ -1855,7 +1855,7 @@
 
 2004-09-11  David Faure  <faure@kde.org>
 
-        * khtml_part.cpp (defaultEncoding, encoding, createDecoder):
+        * tdehtml_part.cpp (defaultEncoding, encoding, createDecoder):
         Make default charset latin1 over HTTP, keep default to locale on other protocols.
 
 2004-09-02  Leo Savernik  <l.savernik@aon.at>
@@ -1875,7 +1875,7 @@
         scope: - more accurate completed() signal.
                - anchor jumps (#57360)
 
-        * khtml_part.cpp (openURL): when restoring a previous scroll
+        * tdehtml_part.cpp (openURL): when restoring a previous scroll
         position on reload, avoid jumping to anchors.
         (gotoAnchor): keep jumping at least while we are parsing.
         (gotoAnchor): "top" and "" anchors mean top of document.
@@ -1883,7 +1883,7 @@
         (checkCompleted): entrust the view to emit completed on our behalf
         after any pending layout/repaint is done.
 
-        * khtmlview.{cpp,h}: ditto
+        * tdehtmlview.{cpp,h}: ditto
 
         * xml/dom_nodeimpl.cpp (getUpperLeftCorner/getLowerRightCorner):
         use inlineYPos for text objects (#57360 c.#17).
@@ -1951,7 +1951,7 @@
 
 2004-08-04  Germain Garand <germain@ebooksfrance.org>
 
-	* khtmlview.cpp (resizeEvent): take care, in case we are shrinking,
+	* tdehtmlview.cpp (resizeEvent): take care, in case we are shrinking,
         not to pass past the content limits yet. Next layout will calculate
         if we positively need scrollbars or not (#84798).
 
@@ -1959,7 +1959,7 @@
         instead, account for a scrollbar hysteresis level when sizing the content (#61730).
 
 2004-07-30  Jean-Baptiste Mardelle <bj@altern.org>
-	* khtmlview.{cpp,h} (displayAccessKeys): When accesskeys are activated,
+	* tdehtmlview.{cpp,h} (displayAccessKeys): When accesskeys are activated,
 	small tooltips appear showing existing accesskeys on the page.
 
 2004-07-28  Stephan Kulow  <coolo@kde.org>
@@ -1969,16 +1969,16 @@
 
 2004-07-28  Leo Savernik  <l.savernik@aon.at>
 
-	* khtmlview.{cpp,h} (KHTMLToolTip::maybeTip): Query <area> elements
+	* tdehtmlview.{cpp,h} (TDEHTMLToolTip::maybeTip): Query <area> elements
 	of image maps.
 	(dispatchMouseEvent): Added parameter innerNonSharedNode.
-	* khtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse.
+	* tdehtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse.
 	* xml/dom_docimpl.cpp (prepareMouseEvent): Initialize
 	innerNonSharedNode in DOM mouse event.
 	* xml/dom_nodeimpl.h: Added innerNonSharedNode to
 	NodeImpl::MouseEvent.
 	* html/html_imageimpl.h: Added cachedRegion() for being able to
-	retrieve the region in KHTMLToolTip.
+	retrieve the region in TDEHTMLToolTip.
 
 2004-07-20  Stephan Kulow  <coolo@kde.org>
 
@@ -1986,12 +1986,12 @@
         They have to be ignored (css1/test11.htm)
 
 2004-07-14 Jean-Baptiste Mardelle <bj@altern.org>
-	* khtmlview.{cpp,h}: Accesskeys now activated when pressing & releasing
+	* tdehtmlview.{cpp,h}: Accesskeys now activated when pressing & releasing
 	the crtl key (#83053).
 
 2004-07-12 Jean-Baptiste Mardelle <bj@altern.org>
 	* html/html_formimpl.{h,cpp}: Make form labels clickable (#59489)
-	* khtmlview.cpp (focusNodeWithAccessKey): Make accesskeys work for labels
+	* tdehtmlview.cpp (focusNodeWithAccessKey): Make accesskeys work for labels
 
 2004-07-12 Germain Garand <germain@ebooksfrance.org>
 
@@ -2007,7 +2007,7 @@
         posClipRect in effect (#67665/#72994).
 
 2004-06-30  Tobias Anton  <anton@stud.fbi.fh-darmstadt.de>
-	* khtmlview.{cpp,h}:
+	* tdehtmlview.{cpp,h}:
 	integrated keyboard tabbing with mouse scrolling.
 	Hitting tab skips at most one page, but respects
 	the tabindex ordering of the document.
@@ -2092,17 +2092,17 @@
 
 2004-06-13  Leo Savernik  <l.savernik@aon.at>
 
-	* khtml_part.cpp: (clear) Stopping marquees.
+	* tdehtml_part.cpp: (clear) Stopping marquees.
 	* css/cssparser.cpp: (parserValue) Parse overflow: marquee.
 	Inserted CSS3 Properties section.
-	Moved -khtml-user-input to CSS3 Properties.
-	Added parsing of -khtml-marquee{,-direction,-increment,-style,-repetition,
+	Moved -tdehtml-user-input to CSS3 Properties.
+	Added parsing of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
 	-speed}.
 	* css/cssproperties.{c,h}: Regenerated.
-	* css/cssproperties.in: Added -khtml-marquee{,-direction,-increment,
+	* css/cssproperties.in: Added -tdehtml-marquee{,-direction,-increment,
 	-style,-repetition,	-speed} keywords.
 	* css/cssstyleselector: (applyRule) Handle overflow: marquee.
-	Handle applying of -khtml-marquee{,-direction,-increment,-style,-repetition,
+	Handle applying of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
 	-speed}.
 	* css/cssvalues.{c,h}: Regenerated.
 	* css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse,
@@ -2197,7 +2197,7 @@
 2004-06-08  Zack Rusin  <zack@kde.org>
 
         * html/htmltokenizer.cpp (parseEntity): Fix to make 8-character
-        hexadecimal entities work in khtml from Darin Adler. Testcase at
+        hexadecimal entities work in tdehtml from Darin Adler. Testcase at
         http://www.alanwood.net/unicode/deseret.html
 
 2004-06-06  Zack Rusin  <zack@kde.org>
@@ -2297,7 +2297,7 @@
 
 2004-05-06  Tobias Anton  <anton@stud.fbi.fh-darmstadt.de>
 
-	* html/htmlparser.cpp (class KHTMLParser): use setCurrent() after reset()
+	* html/htmlparser.cpp (class TDEHTMLParser): use setCurrent() after reset()
 	to avoid a memleak whenever the parser is used on a DocumentFragment.
 
 2004-05-04  Leo Savernik  <l.savernik@aon.at>
@@ -2341,24 +2341,24 @@
 
 2004-04-18  Leo Savernik  <l.savernik@aon.at>
 
-	* khtml_part.cpp: (extendSelectionTo): Fixed deselection of whole
+	* tdehtml_part.cpp: (extendSelectionTo): Fixed deselection of whole
 	word/line at line boundaries in ExtendByWord/ExtendByLine mode.
 
 2004-04-18  Leo Savernik  <l.savernik@aon.at>
 
-	* khtml_part.cpp: Merged firstRunAt, lastRunAt from WebCore.
-	(khtmlMouse{Press,DoubleClick,Move,Release}Event): Support extending selection
+	* tdehtml_part.cpp: Merged firstRunAt, lastRunAt from WebCore.
+	(tdehtmlMouse{Press,DoubleClick,Move,Release}Event): Support extending selection
 	by word and by line as mandated by the KDE style guide.
-	(khtmlMousePressDoubleClickEvent): Fixed automatic scrolling when mouse
+	(tdehtmlMousePressDoubleClickEvent): Fixed automatic scrolling when mouse
 	moves off the view while selecting.
 	(extendSelection): Make it support extending by line by merging
 	WebCore's startAndEndLineNodesIncludingNode into it.
 	Fixed issue with double word selection when between two words.
 
-	* khtmlpart_p.h: added m_initialNode, m_initialOffset and
+	* tdehtmlpart_p.h: added m_initialNode, m_initialOffset and
 	m_extendMode.
 
-	* khtmlview.cpp (extendSelection): Initialize all relevant fields for selection.
+	* tdehtmlview.cpp (extendSelection): Initialize all relevant fields for selection.
 
 	* rendering/render_text.h: Merged inlineTextBoxes function, needed by
 	firstRunAt, lastRunAt.
@@ -2366,12 +2366,12 @@
 
 2004-04-15  Leo Savernik  <l.savernik@aon.at>
 
-	* khtml_caret{.cpp,_p.h}: Vast changes.
+	* tdehtml_caret{.cpp,_p.h}: Vast changes.
 	Added classes CaretBox, CaretBoxLine, CaretBoxIterator,
 	EditableCaretBoxIterator. Changed every other class.
 
-	* khtmlview.[cpp,h}: (class KHTMLView) Adapt to khtml_caret* changes.
-	(KHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.
+	* tdehtmlview.[cpp,h}: (class TDEHTMLView) Adapt to tdehtml_caret* changes.
+	(TDEHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.
 
 	* rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos)
 	Handle outside caret positions.
@@ -2408,22 +2408,22 @@
 
 2004-03-23  Dirk Mueller  <mueller@kde.org>
 
-	* khtml_part.cpp (checkLinkSecurity): Be stricter.
+	* tdehtml_part.cpp (checkLinkSecurity): Be stricter.
 
 	* rendering/render_frames.cpp (updateWidget): readd the recursion protection.
 
 2004-03-21  Arend van Beelen jr. <arend@auton.nl>
-	* khtml_part.cpp/.h: if text in a link is highlighted, the link now receives
+	* tdehtml_part.cpp/.h: if text in a link is highlighted, the link now receives
 	focus.
 
-	* khtmlview.cpp: made type-ahead find more aggressive by grabbing the keyboard
+	* tdehtmlview.cpp: made type-ahead find more aggressive by grabbing the keyboard
 	when active, this way it temporarily overrules single-letter shortcuts as seen
 	in KMail. Note it immediately releases the keyboard when it looses focus.
 
 2004-03-20  Arend van Beelen jr. <arend@auton.nl>
-	* khtml_part.cpp/.h: finished new searching API.
+	* tdehtml_part.cpp/.h: finished new searching API.
 
-	* khtmlview.cpp/.h: implemented type-ahead find (#51259).
+	* tdehtmlview.cpp/.h: implemented type-ahead find (#51259).
 
 2004-03-21  Dirk Mueller  <mueller@kde.org>
 
@@ -2439,7 +2439,7 @@
 
 2004-03-18  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp, xml/dom_docimpl.cpp: accesskey attribute support
+        * tdehtmlview.cpp, xml/dom_docimpl.cpp: accesskey attribute support
 
 2004-03-03  Dirk Mueller  <mueller@kde.org>
 
@@ -2500,7 +2500,7 @@
 	repaint handling over here, since TableSections don't inherit RenderBox,
 	but still have a background.
 
-	* khtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements
+	* tdehtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements
 	get font-size: small instead.
 
 2004-02-24  Dirk Mueller  <mueller@kde.org>
@@ -2508,7 +2508,7 @@
 	* ecma/xmlhttprequest.h/cpp: Implement asynchronous interface
 	enough to pass the tests on http://www.mozilla.org/xmlextras/tests.html
 
-	* xml/dom2_eventsimpl.h (EventImpl): rename KHTML_KEYUP/DOWN_EVENT
+	* xml/dom2_eventsimpl.h (EventImpl): rename TDEHTML_KEYUP/DOWN_EVENT
 	to KEYUP/DOWN_EVENT. Add events needed for XMLHttpRequest.
 
 	* rendering/render_object.h (class RenderObject): introduce a PaintInfo
@@ -2523,10 +2523,10 @@
 
 2004-02-22  Frerich Raabe  <raabe@kde.org>
 
-	* khtml_part.cpp/.h (openURL): In case the call is a reload, do a stat
+	* tdehtml_part.cpp/.h (openURL): In case the call is a reload, do a stat
 	on the user-defined stylesheet and reload it in case it changed in
 	the meanwhile (#39962).
-	* khtmlpart_p.h (class KHTMLPartPrivate): Added
+	* tdehtmlpart_p.h (class TDEHTMLPartPrivate): Added
 	m_userStyleSheetLastModified variable which keeps track of the
 	mtime of the user-defined sheet.
 
@@ -2550,7 +2550,7 @@
 	whether the given URL references the user-defined stylesheet. If so,
 	use DOCLOADER_SECCHECK(false) to disable the check for invalid
 	redirections (it's not useful for the user-defined URL).
-	* khtml_part.cpp (PartStyleSheetLoader ctor): pass true to
+	* tdehtml_part.cpp (PartStyleSheetLoader ctor): pass true to
 	DocLoader::requestStyleSheet to indicate that the user-stylesheet is
 	loaded. Fixes seemingly ignored user-defined stylesheet. (#69697)
 
@@ -2721,7 +2721,7 @@
 	image are fully loaded. do a repaint when the new image finished loading, so
 	that it actually updates. avoid reloading images on news.google.com on hover.
 
-	* khtmlview.cpp (scheduleRepaint): make scheduling not starvating repaints.
+	* tdehtmlview.cpp (scheduleRepaint): make scheduling not starvating repaints.
 	Fix repainting logic to optimize for reduced X server load and minimum CPU
 	usage in traversing the render tree (#72575).
 
@@ -2769,7 +2769,7 @@
 
 2004-01-22  Lubos Lunak <l.lunak@kde.org>
 
-        * khtmlview.cpp: make Ctrl only temporary suspend Shift+Down scrolling
+        * tdehtmlview.cpp: make Ctrl only temporary suspend Shift+Down scrolling
 
 2004-01-22  David Faure  <faure@kde.org>
 
@@ -2787,7 +2787,7 @@
 
 2004-01-21  Leo Savernik <l.savernik@aon.at>
 
-	* khtml_part.cpp (checkCompleted): do not explicitly set focus to
+	* tdehtml_part.cpp (checkCompleted): do not explicitly set focus to
 	the document if m_focusNodeNumber is not set (fixes dict.leo.org)
 
 2004-01-21  Stephan Kulow  <coolo@kde.org>
@@ -2825,7 +2825,7 @@
 
 2004-01-18  Dirk Mueller  <mueller@kde.org>
 
-	* khtmlpart_p.h (class KHTMLPartPrivate): experimental:
+	* tdehtmlpart_p.h (class TDEHTMLPartPrivate): experimental:
 	copy encoding information from parent frame. helps on
 	http://www.pfl.ru/ when manually setting the correct encoding.
 
@@ -2954,12 +2954,12 @@
 
 	* css/cssstyleselector.cpp (reparseConfiguration): implement.
 
-	* khtml_part.cpp (reparseConfiguration): call CSSStyleSelector::reparseConfiguration
+	* tdehtml_part.cpp (reparseConfiguration): call CSSStyleSelector::reparseConfiguration
 	instead of ::clear(). much less crashy. (#68141)
 
 2003-12-27  Simon Perreault  <nomis80@nomis80.org>
 
-	* khtml_part.cpp: Remove unused zoom actions. Assign CTRL + Key_Plus to
+	* tdehtml_part.cpp: Remove unused zoom actions. Assign CTRL + Key_Plus to
 	zooming in and CTRL + Key_Minus to zooming out.
 
 2003-12-27  Luis Pedro Coelho <luis@luispedro.org>
@@ -2979,7 +2979,7 @@
 
 2003-12-10  Germain Garand  <germain@ebooksfrance.org>
 
-        * rendering/render_replaced.cpp (updateFromElement): don't use setEraseColor for __khtml
+        * rendering/render_replaced.cpp (updateFromElement): don't use setEraseColor for __tdehtml
         widgets as it changes the background mode and induces flicker (#69130)
         (copyWidget): retrieve background color from the widget's palette.
 
@@ -2993,7 +2993,7 @@
 
 2003-12-08  Zack Rusin  <zack@kde.org>
 
-	* khtmlview.*, html/html_formimpl.cpp (submit):  Fixing 67179 -
+	* tdehtmlview.*, html/html_formimpl.cpp (submit):  Fixing 67179 -
 	Possibility to avoid saving form data for certain sites.
 
 2003-12-05  David Faure  <faure@kde.org>
@@ -3006,7 +3006,7 @@
 	* dom/dom_node.cpp (dispatchEvent): Return !defaultPrevented as mandated by
 	the DOM, now that NodeImpl doesn't do it anymore.
 	* rendering/render_replaced.cpp (eventFilter): Adapted to new logic
-	* khtmlview.cpp (dispatchKeyEventHelper): Adapted to new logic
+	* tdehtmlview.cpp (dispatchKeyEventHelper): Adapted to new logic
 
 2003-12-05  Stephan Kulow  <coolo@kde.org>
 
@@ -3014,7 +3014,7 @@
 
 2003-12-05  Lubos Lunak  <l.lunak@kde.org>
 
-	* khtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_replaced.cpp :
+	* tdehtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_replaced.cpp :
             fix mapping between Qt and DOM key events
 
 2003-12-05  Germain Garand  <germain@ebooksfrance.org>
@@ -3077,7 +3077,7 @@
 
 2003-11-26  Lubos Lunak  <l.lunak@kde.org>
 
-	* khtmlview.cpp, xml/dom2_eventsimpl.cpp : generate correctly keydown,keypress and keyup events
+	* tdehtmlview.cpp, xml/dom2_eventsimpl.cpp : generate correctly keydown,keypress and keyup events
 
 2003-11-26  Dirk Mueller  <mueller@kde.org>
 
@@ -3108,7 +3108,7 @@
 
 2003-11-25  Germain Garand  <germain@ebooksfrance.org>
 
-        * khtml_part.cpp (checkCompleted): prepend "Automatic Detection" entry to
+        * tdehtml_part.cpp (checkCompleted): prepend "Automatic Detection" entry to
         "Use Stylesheet" menu.
         (slotUseStylesheet): set m_sheetUsed to null string if autodetect is on.
         Fixes #54335.
@@ -3142,7 +3142,7 @@
 
 	* html/htmlparser.cpp (getElement, processCloseTag): Allow only one
 	non-empty <title> tag, discard any following <title> tag. This matches
-	both IE and Mozilla. Testcases khtmltests/regression/tests/ecma/title*
+	both IE and Mozilla. Testcases tdehtmltests/regression/tests/ecma/title*
 
 	* html/html_headimpl.cpp (childrenChanged): Set title immediately, like
 	other browsers do.
@@ -3201,7 +3201,7 @@
 
 2003-11-17  David Faure  <faure@kde.org>
 
-	* khtml_part.cpp (processObjectRequest):
+	* tdehtml_part.cpp (processObjectRequest):
 	Stop the spinning wheel on <frame src="">.
 	Testcase: webcore's fast/frames/empty-frame-src.html
 
@@ -3249,7 +3249,7 @@
 
 2003-11-10  David Faure  <faure@kde.org>
 
-	* khtml_part.cpp: Ask the user "open or save?" before embedding a
+	* tdehtml_part.cpp: Ask the user "open or save?" before embedding a
 	non-usual mimetype into a frame (e.g. ZIP files or PS files).
 	(html and images are the 'usual' exceptions)
 	Includes a dontshowagain checkbox, so this shouldn't be too annoying.
@@ -3287,7 +3287,7 @@
 
 2003-11-04  Leo Savernik <l.savernik@aon.at>
 
-	* khtml_part.{cpp,h} (selection): Added new overloaded function to
+	* tdehtml_part.{cpp,h} (selection): Added new overloaded function to
 	return selection boundaries.
 
 2003-11-04  Dirk Mueller  <mueller@kde.org>
@@ -3332,7 +3332,7 @@
 	* rendering/render_form.cpp (setStyle): check for direction (#57626)
 	on RenderLineEdit and RenderTextArea.
 
-	* khtmlview.cpp (viewportWheelEvent): toggle Font zooming orientation (#61862).
+	* tdehtmlview.cpp (viewportWheelEvent): toggle Font zooming orientation (#61862).
 
 	* rendering/render_box.cpp (paintBackgroundExtended): implement. needed
 	for inline elements background drawing somewhen.
@@ -3382,7 +3382,7 @@
 
 2003-10-29  Leo Savernik <l.savernik@aon.at>
 
-	* khtml_part.cpp (khtmlMousePressEvent): Fixed occasional selection
+	* tdehtml_part.cpp (tdehtmlMousePressEvent): Fixed occasional selection
 	of image on which a drag had been initiated.
 
 2003-10-29  David Faure  <faure@kde.org>
@@ -3392,7 +3392,7 @@
 
 2003-10-28  David Faure  <faure@kde.org>
 
-	* khtmlview.cpp (viewportMouseDoubleClickEvent): Set bool in MouseEventImpl
+	* tdehtmlview.cpp (viewportMouseDoubleClickEvent): Set bool in MouseEventImpl
 	when handling a double click. The DOM API only has "number of clicks at the
 	same place" notion, but not whether they happened quick or over a long time.
 	Added support for small mouse movement when double-clicking, like in mousePressEvent.
@@ -3406,7 +3406,7 @@
 
 2003-10-28  Stephan Kulow  <coolo@kde.org>
 
-       * khtml_part.cpp (reparseConfiguration): clear the style selector
+       * tdehtml_part.cpp (reparseConfiguration): clear the style selector
 
 2003-10-28  Leo Savernik  <l.savernik@aon.at>
 
@@ -3428,7 +3428,7 @@
 
 2003-10-27  David Faure  <faure@kde.org>
 
-	* khtmlview.cpp (dispatchKeyEvent): Generate keypress, keydown and keyup
+	* tdehtmlview.cpp (dispatchKeyEvent): Generate keypress, keydown and keyup
 	events for the document if no node has the focus. Factorized code in
 	a new method, dispatchKeyEvent. Cleaned up old unused variables d->lastKeyNode
 	and d->lastKeyPress. #42918 and #43072, google keys.
@@ -3733,7 +3733,7 @@
 2003-10-19  Dirk Mueller  <mueller@kde.org>
 
 	* html/htmltokenizer.cpp (parseEntity): when entity is terminated and result
-	is not-ascii, require ending ';'. khtmltests/html/parser/obscure_entity_tokenizing.html
+	is not-ascii, require ending ';'. tdehtmltests/html/parser/obscure_entity_tokenizing.html
 
 2003-10-18  Dirk Mueller  <mueller@kde.org>
 
@@ -3804,7 +3804,7 @@
 
 2003-10-07 Germain Garand <germain@ebooksfrance.org>
 
-	* khtmlview.cpp (viewportMouseReleaseEvent/viewportMouseMoveEvent): forward
+	* tdehtmlview.cpp (viewportMouseReleaseEvent/viewportMouseMoveEvent): forward
 	meaningful peripheral mouse events to focused widget to restore correct
 	mouse handling in proxied widgets. #65216 (selection part)
 
@@ -3826,16 +3826,16 @@
 
 2003-10-06  Dirk Mueller  <mueller@kde.org>
 
-	* khtml_part.cpp (jScript): remove broken #ifdef'ery.
+	* tdehtml_part.cpp (jScript): remove broken #ifdef'ery.
 	(popupMenu): add a QGuardedPtr to detect the case when we're destructed
 	before the popup menu is closed. avoid accessing any "this" then.
 	#43389
 
-	* khtmlview.cpp (viewportMousePressEvent): reorder afaik unrelated code
+	* tdehtmlview.cpp (viewportMousePressEvent): reorder afaik unrelated code
 	to make the one call entering a local event loop the last, so that we can
 	cleanly exit when it the view is already deleted.
 
-	* khtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent
+	* tdehtml_ext.cpp (TDEHTMLPopupGUIClient): pass QObject parent
 
 2003-10-05  Dirk Mueller  <mueller@kde.org>
 
@@ -3852,14 +3852,14 @@
 
 2003-10-04  Dirk Mueller  <mueller@kde.org>
 
-	* html/htmlparser.h (class KHTMLParser): keep "current" NodeImpl referenced
+	* html/htmlparser.h (class TDEHTMLParser): keep "current" NodeImpl referenced
 	to avoid ugly crashes when DHTML deletes the node while we're still parsing.
 	#57020, testcase alja.html
 
 
 2003-10-04  Dirk Mueller  <mueller@kde.org>
 
-	* khtml_settings.cc (init): change default for JS debugger to off.
+	* tdehtml_settings.cc (init): change default for JS debugger to off.
 
 	* html/html_elementimpl.cpp (createContextualFragment): Fix memory
 	leaks. Adjust code style. Adjust return to avoid dangling return leaks.
diff --git a/khtml/DESIGN.html b/tdehtml/DESIGN.html
index 16484d4f1..3907a56d0 100644
--- a/khtml/DESIGN.html
+++ b/tdehtml/DESIGN.html
@@ -1,23 +1,23 @@
 <html>
 <head>
-<title>Internal design of khtml</title>
+<title>Internal design of tdehtml</title>
 <style>
 dt { font-weight: bold; }
 </style>
 <body bgcolor=white>
-<h1>Internal design of khtml</h1>
+<h1>Internal design of tdehtml</h1>
 
 <p>
-This document tries to give a short overview about the internal design of the khtml
+This document tries to give a short overview about the internal design of the tdehtml
 library. I've written this, because the lib has gotten quite big, and it is hard at first to find your
-way in the source code. This doesn't mean that you'll understand khtml after reading this
+way in the source code. This doesn't mean that you'll understand tdehtml after reading this
 document, but it'll hopefully make it easier for you to read the source code.
 </p>
 <p>
 The library is build up out of several different parts. Basically, when you use the lib, you
-create an instance of a KHTMLPart, and feed data to it. That's more or less all you need to 
-know if you want to use khtml for another application. If you want to start hacking khtml,
-here's a sketch of the objects that will get constructed, when eg. running testkhtml with
+create an instance of a TDEHTMLPart, and feed data to it. That's more or less all you need to 
+know if you want to use tdehtml for another application. If you want to start hacking tdehtml,
+here's a sketch of the objects that will get constructed, when eg. running testtdehtml with
 a url argument.
 </p>
 <p>
@@ -52,14 +52,14 @@ compatible to IE.
 </blockquote>
 
 <p>
-<a href="khtml_part.h">KHTMLPart</a> creates one instance of a
-<a href="khtmlview.h">KHTMLView</a> (derived from TQScrollView),
+<a href="tdehtml_part.h">TDEHTMLPart</a> creates one instance of a
+<a href="tdehtmlview.h">TDEHTMLView</a> (derived from TQScrollView),
 the widget showing the whole thing.  At the same time a DOM tree
 is built up from the HTML or XML found in the specified file.
 <p>
 Let me describe this with an example.
 <p>
-khtml makes use of the document object model (DOM) for storing the document
+tdehtml makes use of the document object model (DOM) for storing the document
 in a tree like structure. Imagine some html like
 <pre>
 &lt;html&gt;
@@ -91,14 +91,14 @@ more or less in parallel.
 <p>
 The first thing that happens when you start parsing a new document is that a
 DocumentImpl* (for XML documents) or an HTMLDocumentImpl* object will get
-created by the Part (in khtml_part.cpp::begin()). A Tokenizer*
+created by the Part (in tdehtml_part.cpp::begin()). A Tokenizer*
 object is created as soon as DocumentImpl::open() is called by the part, also
 in begin() (can be either an XMLTokenizer or an HTMLTokenizer).
 <p>
 The XMLTokenizer uses the QXML classes in Qt to parse the document, and it's SAX interface 
-to parse the stuff into khtmls DOM.
+to parse the stuff into tdehtmls DOM.
 <p>
-For HTML, the tokenizer is located in khtmltokenizer.cpp. The tokenizer uses the contents
+For HTML, the tokenizer is located in tdehtmltokenizer.cpp. The tokenizer uses the contents
 of a HTML-file as input and breaks this contents up in a linked list of
 tokens. The tokenizer recognizes HTML-entities and HTML-tags. Text between
 begin- and end-tags is handled distinctly for several tags. The distinctions
@@ -116,7 +116,7 @@ and constructs the tree of Nodes representing the document according
 to the Document Object Model.
 <p>
 
-<h2>The DOM in khtml</h2>
+<h2>The DOM in tdehtml</h2>
 <p>
 Parsing the document given above gives the following DOM tree:
 
@@ -159,7 +159,7 @@ case the root element gets deleted (as long as there's no interface class
 holding a pointer to the Implementation).
 <p>
 The interface classes (the ones without the Impl) are defined in the <code>dom/</code>
-subdirectory, and are not used by khtml itself at all. The only place they are used are in the
+subdirectory, and are not used by tdehtml itself at all. The only place they are used are in the
 javascript bindings, which uses them to access the DOM tree. The big advantage of having this 
 separation between interface classes and imlementation classes, is that we can have several 
 interface objects pointing to the same implementation. This implements the requirement of
@@ -173,8 +173,8 @@ classes. In the implementation classes we have added a few more intermediate cla
 not be seen from the outside for various reasons (make implementation of shared features easier
 or to reduce memory consumption).
 <p>
-In C++, you can access the whole DOM tree from outside KHTML by using the interface classes. 
-For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/khtml/index.html">introduction to khtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>.
+In C++, you can access the whole DOM tree from outside TDEHTML by using the interface classes. 
+For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdehtml/index.html">introduction to tdehtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>.
 
 One thing that has been omitted in the discussion above is the style sheet defined inside the 
 <code>&lt;style&gt;</code> element (as an example of a style sheet) and the image element 
@@ -261,8 +261,8 @@ RenderRoot*
 A call to of <a href="rendering/render_root.cpp">layout()</a> on the
 <a href="rendering/render_root.h">RenderRoot </a> (the root of the rendering tree)
 object causes the rendering tree to layout itself into the available space
-(width) given by the the KHTMLView. After that, the drawContents() method of
-KHTMLView can call RenderRoot->print() with appropriate parameters to actually
+(width) given by the the TDEHTMLView. After that, the drawContents() method of
+TDEHTMLView can call RenderRoot->print() with appropriate parameters to actually
 paint the document. This is not 100% correct, when parsing incrementally, but
 is exactly what happens when you resize the document.
 
@@ -274,7 +274,7 @@ text". For an explanation why this is done, see the CSS specs.
 
 <h2>Directory structure</h2>
 
-A short explanation of the subdirectories in khtml.
+A short explanation of the subdirectories in tdehtml.
 <dl>
 <dt><a href="css/">css:</a>
 <dd>Contains all the stuff relevant to the CSS part of DOM Level2 (implementation classes only), 
@@ -283,14 +283,14 @@ RenderStyle object out of Nodes and the CSS style sheets.
 <dt><a href="dom/">dom: </a>
 <dd>Contains the external DOM API (the DOM interface classes) for all of the DOM
 <dt><a href="ecma/">ecma:</a>
-<dd>The javascript bindings to the DOM and khtml.
+<dd>The javascript bindings to the DOM and tdehtml.
 <dt><a href="html/">html:</a>
 <dd>The html subpart of the DOM (implementation only), the HTML tokenizer and parser and a class
 that defines the DTD to use for HTML (used mainly in the parser).
 <dt><a href="java/">java:</a>
 <dd>Java related stuff.
 <dt><a href="misc/">misc:</a>
-<dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the
+<dd>Some misc stuff needed in tdehtml. Contains the image loader, some misc definitions and the
 decoder class that converts the incoming stream to unicode.
 <dt><a href="rendering">rendering:</a>
 <dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains
@@ -301,45 +301,45 @@ the definition of the objects used in the rendering tree, the layouting code, an
 
 <h2>Exception handling</h2>
 To save on library size, C++-exceptions are only enabled in the dom/ subdirectory,
-since exceptions are mandated by the DOM API. In the rest of KHTML's code,
+since exceptions are mandated by the DOM API. In the rest of TDEHTML's code,
 we pass an error flag (usually called "exceptionCode"), and the class that
 is part of dom/* checks for this flag and throws the exception.
   
 <h2>Final words...</h2>
 <p>
-All the above is to give you a quick introduction into the way khtml brings an HTML/XML file to the screen.
+All the above is to give you a quick introduction into the way tdehtml brings an HTML/XML file to the screen.
 It is by no way complete or even 100% correct. I left out many problems, I will perhaps add either on request
 or when I find some time to do so. Let me name some of the missing things:
 <ul>
 <li>The decoder to convert the incoming stream to Unicode
 <li>interaction with konqueror/applications
 <li>javascript
-<li>dynamic reflow and how to use the DOM to manipulate khtmls visual output
+<li>dynamic reflow and how to use the DOM to manipulate tdehtmls visual output
 <li>mouse/event handling
 <li>real interactions when parsing incrementally
 <li>java
 </ul>
 
-Still I hope that this short introduction will make it easier for you to get a first hold of khtml and the way it works.
+Still I hope that this short introduction will make it easier for you to get a first hold of tdehtml and the way it works.
 <p>
-Now before I finish let me add a small <b>warning</b> and <b>advice</b> to all of you who plan hacking khtml themselves:
+Now before I finish let me add a small <b>warning</b> and <b>advice</b> to all of you who plan hacking tdehtml themselves:
 <p>
-khtml is by now a quite big library and it takes some time to understand how it works. Don't let yourself get frustrated
+tdehtml is by now a quite big library and it takes some time to understand how it works. Don't let yourself get frustrated
 if you don't immediately understand how it works. On the other hand, it is by now one of the libraries that
 get used a lot, that probably has the biggest number of remaining bugs (even though it's sometimes hard to
 know if some behavior is really a bug).
 <blockquote>
 Some parts of it's code are however <b>extremely touchy</b> (especially the layouting algorithms), 
 and making changes there (that might fix a bug on one web page) might introduce severe bugs.
-All the people developing khtml have already spend huge amounts of time searching for such bugs,
+All the people developing tdehtml have already spend huge amounts of time searching for such bugs,
 that only showed up on some web pages, and thus were found only a week after the change that
 introduced the bug was made. This can be very frustrating for us, and we'd appreciate if people
-that are not completely familiar with khtml post changes touching these critical regions to kfm-devel
+that are not completely familiar with tdehtml post changes touching these critical regions to kfm-devel
 for review before applying them.
 </blockquote>
 
 <div style="margin-top: 2em; font-size: large;">
-And now have fun hacking khtml.
+And now have fun hacking tdehtml.
 <div style="margin-left: 10em; margin-bottom: 1em;">Lars</div>
 </div>
 </body>
diff --git a/khtml/Mainpage.dox b/tdehtml/Mainpage.dox
index 02ac5c5dd..5de4d53a2 100644
--- a/khtml/Mainpage.dox
+++ b/tdehtml/Mainpage.dox
@@ -1,19 +1,19 @@
 /** @mainpage Trinity HTML Parser and Widget
 
 If you want a fully-fledged HTML browser widget in your application,
-you can use KHTMLPart to do so.
+you can use TDEHTMLPart to do so.
 
 @code
 KUrl url = "http://www.trinitydesktop.org";
-KHTMLPart *w = new KHTMLPart();
+TDEHTMLPart *w = new TDEHTMLPart();
 w->openUrl(url);
 w->view()->resize(500, 400);
 w->show();
 @endcode
 
-For more information, see the documentation for KHTMLPart.
+For more information, see the documentation for TDEHTMLPart.
 
-Note that using KHTMLPart may introduce security vulnerabilities
+Note that using TDEHTMLPart may introduce security vulnerabilities
 and unnecessary bloat to your application.  Qt's text widgets are
 rich-text capable, and will interpret a limited subset of HTML.
 
@@ -30,7 +30,7 @@ George Staikos \<staikos@kde.org\><br>
 Allan Sandfeld Jensen \<kde@carewolf.com\><br>
 Germain Garand \<germain@ebooksfrance.org\><br>
 Maksim Orlovich \<maksim@kde.org\><br>
-KHTML has also heavily benefited from the work of Apple Computer, Inc.
+TDEHTML has also heavily benefited from the work of Apple Computer, Inc.
 @maintainers
 Allan Sandfeld Jensen <br>
 Germain Garand<br>
@@ -40,7 +40,7 @@ Maksim Orlovich
 @lgpl
 
 */
-// DOXYGEN_REFERENCES = tdecore tdeui kio kparts kjs
+// DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs
 // DOXYGEN_EXCLUDE =  test*.* html rendering xml misc ecma css imload pics test 
-// DOXYGEN_SET_PROJECT_NAME = KHTML
+// DOXYGEN_SET_PROJECT_NAME = TDEHTML
 // vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
new file mode 100644
index 000000000..2143fd90a
--- /dev/null
+++ b/tdehtml/Makefile.am
@@ -0,0 +1,133 @@
+#    This file is part of the KDE libraries
+#    Copyright (C) 1997 Martin Jones (mjones@kde.org)
+#              (C) 1997 Torben Weis (weis@kde.org)
+
+#    This library is free software; you can redistribute it and/or
+#    modify it under the terms of the GNU Library General Public
+#    License as published by the Free Software Foundation; either
+#    version 2 of the License, or (at your option) any later version.
+
+#    This library is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Library General Public License for more details.
+
+#    You should have received a copy of the GNU Library General Public License
+#    along with this library; see the file COPYING.LIB.  If not, write to
+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#    Boston, MA 02110-1301, USA.
+
+KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
+
+if DOJAVA
+JAVA_SUBDIR=java
+LIBKJAVA=
+endif
+
+SUBDIRS = misc dom css xml html rendering pics $(JAVA_SUBDIR) ecma . tdemultipart
+
+CLEANFILES = dummy.cpp
+
+lib_LTLIBRARIES = libtdehtml.la
+kde_module_LTLIBRARIES = libtdehtmlpart.la tdehtmlimagepart.la
+
+libtdehtml_la_SOURCES = kjserrordlg.ui tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp\
+			tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp \
+			tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.skel \
+			tdehtml_iface.cc tdehtml_printsettings.cpp htmlpageinfo.ui \
+			tdehtmlimage.cpp
+
+libtdehtml_la_METASOURCES = AUTO
+
+include_HEADERS = tdehtmlview.h tdehtml_part.h tdehtml_events.h tdehtml_settings.h tdehtmldefaults.h
+
+noinst_HEADERS = design.h testtdehtml.h test_regression.h tdehtml_ext.h \
+		 tdehtml_pagecache.h tdehtmlimage.h tdehtmlpart_p.h tdehtml_printsettings.h \
+		kjserrordlg.ui.h
+
+if include_VERSION_SCRIPT
+VSCRIPT = -Wl,--version-script=$(srcdir)/libtdehtml.map
+endif
+
+libtdehtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
+libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \
+	./rendering/libtdehtmlrender.la ./css/libtdehtmlcss.la \
+	./misc/libtdehtmlmisc.la ecma/libkjs_html.la ./dom/libtdehtmldom.la $(LIBKJAVA) \
+	$(LIB_KPARTS) \
+	$(LIBTHAI) \
+	$(top_builddir)/tdeprint/libtdeprint.la  \
+	$(top_builddir)/tdeutils/libtdeutils.la \
+	$(top_builddir)/tdewallet/client/libtdewalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
+
+# init_libtdehtml is in libtdehtml.so; init_libtdehtmlpart needs to be in the part
+dummy.cpp: $(srcdir)/Makefile.am
+	echo '#include <tdelibs_export.h>' > $@
+	echo 'extern "C" KDE_EXPORT void* init_libtdehtml();' >> $@
+	echo 'extern "C" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); } ' >> $@
+
+libtdehtmlpart_la_SOURCES = dummy.cpp
+libtdehtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+libtdehtmlpart_la_LIBADD = libtdehtml.la $(LIB_QT)
+
+# init_tdehtmlimagefactory is in libtdehtml.so; init_tdehtmlimagepart needs to be in the part
+imgdummy.cpp: $(srcdir)/Makefile.am
+	echo '#include <tdelibs_export.h>' > $@
+	echo 'extern "C"  KDE_EXPORT void* init_tdehtmlimagefactory();' >> $@
+	echo 'extern "C"  KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); } ' >> $@
+
+tdehtmlimagepart_la_SOURCES = imgdummy.cpp
+tdehtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
+tdehtmlimagepart_la_LIBADD = libtdehtml.la $(LIB_QT)
+
+INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
+	-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
+	-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
+	-I$(top_srcdir)/libltdl \
+	-I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
+	-I$(top_srcdir)/tdeprint \
+	-I$(top_srcdir)/interfaces \
+	-I$(top_srcdir)/interfaces/kregexpeditor \
+        -I$(top_srcdir)/tdewallet/client \
+	-I$(top_srcdir)/tdeutils \
+	-I$(top_srcdir) $(all_includes)
+
+servicedir = $(kde_servicesdir)
+service_DATA = tdehtml.desktop tdehtmlimage.desktop
+
+rcdir = $(kde_datadir)/tdehtml
+rc_DATA = tdehtml.rc tdehtml_browser.rc tdehtml_popupmenu.rc
+
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
+
+## generate lib documentation
+srcdoc:
+	$(mkinstalldirs) $(SRCDOC_DEST)
+	kdoc -H -d $(SRCDOC_DEST) tdecore \
+	         $(include_HEADERS) -lqt
+
+EXTRA_DIST =  CHANGES DESIGN README.HTMLWidget README.tags 
+
+parser:
+	cd $(srcdir) && \
+	perl scripts/makeattrs && \
+	bash scripts/maketags && \
+	bash scripts/makeprop
+
+## test program
+check_PROGRAMS 	= testtdehtml
+EXTRA_PROGRAMS = testtdehtml_static testregression
+testtdehtml_SOURCES = testtdehtml.cpp domtreeview.cpp
+testtdehtml_LDADD = libtdehtml.la 
+testtdehtml_static_SOURCES = testtdehtml.cpp domtreeview.cpp 
+testtdehtml_static_LDADD = libtdehtml.la
+testtdehtml_static_LDFLAGS = -static
+testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp
+testregression_LDADD = libtdehtml.la
+
+DOXYGEN_REFERENCES = tdecore tdeui kio tdefx tdeparts
+DOXYGEN_EXCLUDE =  test*.* css ecma html java tdemultipart misc pics rendering test xml
+
+include ../admin/Doxyfile.am
+
+.PHONY: parser
+
diff --git a/khtml/README.HTMLWidget b/tdehtml/README.HTMLWidget
index 571d4a947..cae4a3c58 100644
--- a/khtml/README.HTMLWidget
+++ b/tdehtml/README.HTMLWidget
@@ -25,11 +25,11 @@ Lars Knoll, Dirk Mueller and Antti Koivisto.
 Revision History
 ----------------
 
-This library is called libkhtml.
-This library used to be called libkhtmlw. With the release of KDE 1.1 a 
-source incompatible version called libkhtml has been created. 
-libkhtmlw will not be maintained any more, all application writers are 
-urgently requested to make use of the new libkhtml library.
+This library is called libtdehtml.
+This library used to be called libtdehtmlw. With the release of KDE 1.1 a 
+source incompatible version called libtdehtml has been created. 
+libtdehtmlw will not be maintained any more, all application writers are 
+urgently requested to make use of the new libtdehtml library.
 
 
 Starting Point
@@ -37,13 +37,13 @@ Starting Point
 
 You can add the widget to your program by doing something like:
 
-#include <khtml.h>
+#include <tdehtml.h>
 
    .
    .
    .
 
-    KHTMLWidget *view = new KHTMLWidget( parent, "Name" );
+    TDEHTMLWidget *view = new TDEHTMLWidget( parent, "Name" );
 	view->show();
 
 	view->begin( "file:/tmp/test.html" );
diff --git a/khtml/SAFARI_MERGE b/tdehtml/SAFARI_MERGE
index 7ef67e134..427c3d1c8 100644
--- a/khtml/SAFARI_MERGE
+++ b/tdehtml/SAFARI_MERGE
@@ -1,12 +1,12 @@
 
 This is a short document with the progress of patches in the Safari codebase
-being merged into khtml. 
+being merged into tdehtml. 
 
 its ordered by directory and by files. Add here the parts that cannot be
 immediately merged and need further negotiation. 
 
 Its recommended to add a //FIXME_SAFARI comment to places which need merging
-in the khtml sourcecode. 
+in the tdehtml sourcecode. 
 
 ===========================================================================
 # css
diff --git a/khtml/TODO b/tdehtml/TODO
index 8cf22e9eb..d22e3f83d 100644
--- a/khtml/TODO
+++ b/tdehtml/TODO
@@ -22,7 +22,7 @@ DOM:
 	* Implementation of NamedAttrMapImpl and Attributes in DOMElementImpl
 	  is ugly. MOve aatributes to the elementImpl and make the namedNodeMap
 	  point to an element. Think of creating AttrImpl's directly in
-	  khtmltoken.cpp
+	  tdehtmltoken.cpp
 
 XML:
 	* lots of stuff in the Impl classes
diff --git a/khtml/configure.in.in b/tdehtml/configure.in.in
index b85dd8474..b85dd8474 100644
--- a/khtml/configure.in.in
+++ b/tdehtml/configure.in.in
diff --git a/khtml/css/CMakeLists.txt b/tdehtml/css/CMakeLists.txt
index 50ca11815..37a5fccf3 100644
--- a/khtml/css/CMakeLists.txt
+++ b/tdehtml/css/CMakeLists.txt
@@ -15,25 +15,25 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 
 ##### other data ################################
 
-install( FILES html4.css quirks.css DESTINATION ${DATA_INSTALL_DIR}/khtml/css )
+install( FILES html4.css quirks.css DESTINATION ${DATA_INSTALL_DIR}/tdehtml/css )
 
 
-##### khtmlcss (static) #########################
+##### tdehtmlcss (static) #########################
 
-set( target khtmlcss )
+set( target tdehtmlcss )
 
 set( ${target}_SRCS
   css_stylesheetimpl.cpp css_ruleimpl.cpp css_valueimpl.cpp
diff --git a/khtml/css/Makefile.am b/tdehtml/css/Makefile.am
index 47653ca8f..fadf66961 100644
--- a/khtml/css/Makefile.am
+++ b/tdehtml/css/Makefile.am
@@ -21,14 +21,14 @@ KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
 YACC=bison
 
-noinst_LTLIBRARIES = libkhtmlcss.la
-libkhtmlcss_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlcss.la
+libtdehtmlcss_la_SOURCES = \
 	css_stylesheetimpl.cpp css_ruleimpl.cpp css_valueimpl.cpp css_base.cpp \
 	cssparser.cpp cssstyleselector.cpp csshelper.cpp parser.cpp \
 	css_renderstyledeclarationimpl.cpp
 
-#libkhtmlcss_la_LDFLAGS = -no-undefined 
-libkhtmlcss_la_METASOURCES = AUTO
+#libtdehtmlcss_la_LDFLAGS = -no-undefined 
+libtdehtmlcss_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
 	css_extensionsimpl.h  css_stylesheetimpl.h  cssparser.h \
@@ -36,15 +36,15 @@ noinst_HEADERS = \
 	cssstyleselector.h csshelper.h parser.h   \
 	css_renderstyledeclarationimpl.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \
- -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
+ -I$(top_srcdir)/tdehtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \
+ -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \
  $(all_includes)
 
-cssdir = $(kde_datadir)/khtml/css
+cssdir = $(kde_datadir)/tdehtml/css
 css_DATA = html4.css quirks.css
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 EXTRA_DIST = parser.y
 
diff --git a/khtml/css/css_base.cpp b/tdehtml/css/css_base.cpp
index 699ff6554..a4dda95a0 100644
--- a/khtml/css/css_base.cpp
+++ b/tdehtml/css/css_base.cpp
@@ -172,10 +172,10 @@ void CSSSelector::extractPseudoType() const
         value = value.lower();
         switch (value[0]) {
             case '-':
-                if (value == "-khtml-replaced")
+                if (value == "-tdehtml-replaced")
                     _pseudoType = PseudoReplaced;
                 else
-                if (value == "-khtml-marker")
+                if (value == "-tdehtml-marker")
                     _pseudoType = PseudoMarker;
                 element = true;
                 break;
diff --git a/khtml/css/css_base.h b/tdehtml/css/css_base.h
index 9a8774107..d2ab4f63f 100644
--- a/khtml/css/css_base.h
+++ b/tdehtml/css/css_base.h
@@ -191,7 +191,7 @@ namespace DOM {
     };
 
     // a style class which has a parent (almost all have)
-    class StyleBaseImpl : public khtml::TreeShared<StyleBaseImpl>
+    class StyleBaseImpl : public tdehtml::TreeShared<StyleBaseImpl>
     {
     public:
 	StyleBaseImpl()  { m_parent = 0; hasInlinedDecl = false; strictParsing = true; multiLength = false; }
diff --git a/khtml/css/css_extensionsimpl.cpp b/tdehtml/css/css_extensionsimpl.cpp
index e0e17e207..e0e17e207 100644
--- a/khtml/css/css_extensionsimpl.cpp
+++ b/tdehtml/css/css_extensionsimpl.cpp
diff --git a/khtml/css/css_extensionsimpl.h b/tdehtml/css/css_extensionsimpl.h
index dba74e217..dba74e217 100644
--- a/khtml/css/css_extensionsimpl.h
+++ b/tdehtml/css/css_extensionsimpl.h
diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/tdehtml/css/css_renderstyledeclarationimpl.cpp
index daf607a9e..00e6f5382 100644
--- a/khtml/css/css_renderstyledeclarationimpl.cpp
+++ b/tdehtml/css/css_renderstyledeclarationimpl.cpp
@@ -28,7 +28,7 @@
 #include "cssvalues.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // List of all properties we know how to compute, omitting shorthands.
 static const int computedProperties[] = {
@@ -41,8 +41,8 @@ static const int computedProperties[] = {
     CSS_PROP_BACKGROUND_POSITION_Y,
     CSS_PROP_BORDER_COLLAPSE,
     CSS_PROP_BORDER_SPACING,
-    CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
-    CSS_PROP__KHTML_BORDER_VERTICAL_SPACING,
+    CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
+    CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING,
     CSS_PROP_BORDER_TOP_COLOR,
     CSS_PROP_BORDER_RIGHT_COLOR,
     CSS_PROP_BORDER_BOTTOM_COLOR,
@@ -80,10 +80,10 @@ static const int computedProperties[] = {
     CSS_PROP_MARGIN_RIGHT,
     CSS_PROP_MARGIN_BOTTOM,
     CSS_PROP_MARGIN_LEFT,
-    CSS_PROP__KHTML_MARQUEE_DIRECTION,
-    CSS_PROP__KHTML_MARQUEE_INCREMENT,
-    CSS_PROP__KHTML_MARQUEE_REPETITION,
-    CSS_PROP__KHTML_MARQUEE_STYLE,
+    CSS_PROP__TDEHTML_MARQUEE_DIRECTION,
+    CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
+    CSS_PROP__TDEHTML_MARQUEE_REPETITION,
+    CSS_PROP__TDEHTML_MARQUEE_STYLE,
     CSS_PROP_MAX_HEIGHT,
     CSS_PROP_MAX_WIDTH,
     CSS_PROP_MIN_HEIGHT,
@@ -136,27 +136,27 @@ static CSSValueImpl *valueForLength(const Length &length, int max)
 static CSSValueImpl *valueForBorderStyle(EBorderStyle style)
 {
     switch (style) {
-    case khtml::BNATIVE:
-        return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NATIVE);
-    case khtml::BNONE:
+    case tdehtml::BNATIVE:
+        return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NATIVE);
+    case tdehtml::BNONE:
         return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
-    case khtml::BHIDDEN:
+    case tdehtml::BHIDDEN:
         return new CSSPrimitiveValueImpl(CSS_VAL_HIDDEN);
-    case khtml::INSET:
+    case tdehtml::INSET:
         return new CSSPrimitiveValueImpl(CSS_VAL_INSET);
-    case khtml::GROOVE:
+    case tdehtml::GROOVE:
         return new CSSPrimitiveValueImpl(CSS_VAL_GROOVE);
-    case khtml::RIDGE:
+    case tdehtml::RIDGE:
          return new CSSPrimitiveValueImpl(CSS_VAL_RIDGE);
-    case khtml::OUTSET:
+    case tdehtml::OUTSET:
         return new CSSPrimitiveValueImpl(CSS_VAL_OUTSET);
-    case khtml::DOTTED:
+    case tdehtml::DOTTED:
         return new CSSPrimitiveValueImpl(CSS_VAL_DOTTED);
-    case khtml::DASHED:
+    case tdehtml::DASHED:
         return new CSSPrimitiveValueImpl(CSS_VAL_DASHED);
-    case khtml::SOLID:
+    case tdehtml::SOLID:
         return new CSSPrimitiveValueImpl(CSS_VAL_SOLID);
-    case khtml::DOUBLE:
+    case tdehtml::DOUBLE:
         return new CSSPrimitiveValueImpl(CSS_VAL_DOUBLE);
     }
     Q_ASSERT( 0 );
@@ -166,101 +166,101 @@ static CSSValueImpl *valueForBorderStyle(EBorderStyle style)
 static CSSValueImpl *valueForTextAlign(ETextAlign align)
 {
     switch (align) {
-    case khtml::TAAUTO:
+    case tdehtml::TAAUTO:
         return new CSSPrimitiveValueImpl(CSS_VAL_AUTO);
-    case khtml::LEFT:
+    case tdehtml::LEFT:
         return new CSSPrimitiveValueImpl(CSS_VAL_LEFT);
-    case khtml::RIGHT:
+    case tdehtml::RIGHT:
         return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT);
-    case khtml::CENTER:
+    case tdehtml::CENTER:
         return new CSSPrimitiveValueImpl(CSS_VAL_CENTER);
-    case khtml::JUSTIFY:
+    case tdehtml::JUSTIFY:
         return new CSSPrimitiveValueImpl(CSS_VAL_JUSTIFY);
-    case khtml::KHTML_LEFT:
-        return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
-    case khtml::KHTML_RIGHT:
-        return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
-    case khtml::KHTML_CENTER:
-        return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_CENTER);
+    case tdehtml::TDEHTML_LEFT:
+        return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
+    case tdehtml::TDEHTML_RIGHT:
+        return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
+    case tdehtml::TDEHTML_CENTER:
+        return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_CENTER);
     }
     Q_ASSERT( 0 );
     return 0;
 }
 
-DOMString khtml::stringForListStyleType(EListStyleType type)
+DOMString tdehtml::stringForListStyleType(EListStyleType type)
 {
     switch (type) {
-        case khtml::LDISC:
+        case tdehtml::LDISC:
             return "disc";
-        case khtml::LCIRCLE:
+        case tdehtml::LCIRCLE:
             return "circle";
-        case khtml::LSQUARE:
+        case tdehtml::LSQUARE:
             return "square";
-        case khtml::LBOX:
+        case tdehtml::LBOX:
             return "box";
-        case khtml::LDIAMOND:
-            return "-khtml-diamond";
-        case khtml::LDECIMAL:
+        case tdehtml::LDIAMOND:
+            return "-tdehtml-diamond";
+        case tdehtml::LDECIMAL:
             return "decimal";
-        case khtml::DECIMAL_LEADING_ZERO:
+        case tdehtml::DECIMAL_LEADING_ZERO:
             return "decimal-leading-zero";
-        case khtml::ARABIC_INDIC:
-            return "-khtml-arabic-indic";
-        case khtml::LAO:
-            return "-khtml-lao";
-        case khtml::PERSIAN:
-            return "-khtml-persian";
-        case khtml::URDU:
-            return "-khtml-urdu";
-        case khtml::THAI:
-            return "-khtml-thai";
-        case khtml::TIBETAN:
-            return "-khtml-tibetan";
-        case khtml::LOWER_ROMAN:
+        case tdehtml::ARABIC_INDIC:
+            return "-tdehtml-arabic-indic";
+        case tdehtml::LAO:
+            return "-tdehtml-lao";
+        case tdehtml::PERSIAN:
+            return "-tdehtml-persian";
+        case tdehtml::URDU:
+            return "-tdehtml-urdu";
+        case tdehtml::THAI:
+            return "-tdehtml-thai";
+        case tdehtml::TIBETAN:
+            return "-tdehtml-tibetan";
+        case tdehtml::LOWER_ROMAN:
             return "lower-roman";
-        case khtml::UPPER_ROMAN:
+        case tdehtml::UPPER_ROMAN:
             return "upper-roman";
-        case khtml::HEBREW:
+        case tdehtml::HEBREW:
             return "hebrew";
-        case khtml::ARMENIAN:
+        case tdehtml::ARMENIAN:
             return "armenian";
-        case khtml::GEORGIAN:
+        case tdehtml::GEORGIAN:
             return "georgian";
-        case khtml::CJK_IDEOGRAPHIC:
+        case tdehtml::CJK_IDEOGRAPHIC:
             return "cjk-ideographic";
-        case khtml::JAPANESE_FORMAL:
-            return "-khtml-japanese-formal";
-        case khtml::JAPANESE_INFORMAL:
-            return "-khtml-japanese-informal";
-        case khtml::SIMP_CHINESE_FORMAL:
-            return "-khtml-simp-chinese-formal";
-        case khtml::SIMP_CHINESE_INFORMAL:
-            return "-khtml-simp-chinese-informal";
-        case khtml::TRAD_CHINESE_FORMAL:
-            return "-khtml-trad-chinese-formal";
-        case khtml::TRAD_CHINESE_INFORMAL:
-            return "-khtml-trad-chinese-informal";
-        case khtml::LOWER_GREEK:
+        case tdehtml::JAPANESE_FORMAL:
+            return "-tdehtml-japanese-formal";
+        case tdehtml::JAPANESE_INFORMAL:
+            return "-tdehtml-japanese-informal";
+        case tdehtml::SIMP_CHINESE_FORMAL:
+            return "-tdehtml-simp-chinese-formal";
+        case tdehtml::SIMP_CHINESE_INFORMAL:
+            return "-tdehtml-simp-chinese-informal";
+        case tdehtml::TRAD_CHINESE_FORMAL:
+            return "-tdehtml-trad-chinese-formal";
+        case tdehtml::TRAD_CHINESE_INFORMAL:
+            return "-tdehtml-trad-chinese-informal";
+        case tdehtml::LOWER_GREEK:
             return "lower-greek";
-        case khtml::UPPER_GREEK:
-            return "-khtml-upper-greek";
-        case khtml::LOWER_ALPHA:
+        case tdehtml::UPPER_GREEK:
+            return "-tdehtml-upper-greek";
+        case tdehtml::LOWER_ALPHA:
             return "lower-alpha";
-        case khtml::UPPER_ALPHA:
+        case tdehtml::UPPER_ALPHA:
             return "upper-alpha";
-        case khtml::LOWER_LATIN:
+        case tdehtml::LOWER_LATIN:
             return "lower-latin";
-        case khtml::UPPER_LATIN:
+        case tdehtml::UPPER_LATIN:
             return "upper-latin";
-        case khtml::HIRAGANA:
+        case tdehtml::HIRAGANA:
             return "hiragana";
-        case khtml::KATAKANA:
+        case tdehtml::KATAKANA:
             return "katakana";
-        case khtml::HIRAGANA_IROHA:
+        case tdehtml::HIRAGANA_IROHA:
             return "hiragana-iroha";
-        case khtml::KATAKANA_IROHA:
+        case tdehtml::KATAKANA_IROHA:
             return "katakana_iroha";
-        case khtml::LNONE:
+        case tdehtml::LNONE:
             return "none";
     }
     Q_ASSERT( 0 );
@@ -272,7 +272,7 @@ static CSSPrimitiveValueImpl* valueForColor(TQColor color)
     if (color.isValid())
         return new CSSPrimitiveValueImpl(color.rgb());//### KDE4: use rgba!
     else
-        return new CSSPrimitiveValueImpl(khtml::transparentColor);
+        return new CSSPrimitiveValueImpl(tdehtml::transparentColor);
 }
 
 static CSSValueImpl* valueForShadow(const ShadowData *shadow)
@@ -391,13 +391,13 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
         return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
     case CSS_PROP_BACKGROUND_REPEAT:
         switch (style->backgroundRepeat()) {
-        case khtml::REPEAT:
+        case tdehtml::REPEAT:
             return new CSSPrimitiveValueImpl(CSS_VAL_REPEAT);
-        case khtml::REPEAT_X:
+        case tdehtml::REPEAT_X:
             return new CSSPrimitiveValueImpl(CSS_VAL_REPEAT_X);
-        case khtml::REPEAT_Y:
+        case tdehtml::REPEAT_Y:
             return new CSSPrimitiveValueImpl(CSS_VAL_REPEAT_Y);
-        case khtml::NO_REPEAT:
+        case tdehtml::NO_REPEAT:
             return new CSSPrimitiveValueImpl(CSS_VAL_NO_REPEAT);
         default:
             Q_ASSERT( 0 );
@@ -440,10 +440,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
                        "px");
         return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING);
     }
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
+    case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
         return new CSSPrimitiveValueImpl(style->borderHorizontalSpacing(),
                                          CSSPrimitiveValue::CSS_PX);
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
+    case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
         return new CSSPrimitiveValueImpl(style->borderVerticalSpacing(),
                                          CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_BORDER_TOP_COLOR:
@@ -614,9 +614,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
         case FRIGHT:
             return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT);
         case FLEFT_ALIGN:
-            return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
+            return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
         case FRIGHT_ALIGN:
-            return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
+            return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
         }
     }
     case CSS_PROP_FONT_FAMILY:
@@ -706,10 +706,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
         return valueForLength(style->marginBottom(), renderer->contentHeight());
     case CSS_PROP_MARGIN_LEFT:
         return valueForLength(style->marginLeft(), renderer->contentWidth());
-    case CSS_PROP__KHTML_MARQUEE:
+    case CSS_PROP__TDEHTML_MARQUEE:
         // FIXME: unimplemented
         break;
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION:
+    case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
         switch (style->marqueeDirection()) {
         case MFORWARD:
             return new CSSPrimitiveValueImpl(CSS_VAL_FORWARDS);
@@ -728,16 +728,16 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
         }
         Q_ASSERT(0);
         return 0;
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT:
+    case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
         return valueForLength(style->marqueeIncrement(), renderer->contentWidth());
-    case CSS_PROP__KHTML_MARQUEE_REPETITION:
+    case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
         if (style->marqueeLoopCount() < 0)
             return new CSSPrimitiveValueImpl(CSS_VAL_INFINITE);
         return new CSSPrimitiveValueImpl(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER);
-    case CSS_PROP__KHTML_MARQUEE_SPEED:
+    case CSS_PROP__TDEHTML_MARQUEE_SPEED:
         // FIXME: unimplemented
         break;
-    case CSS_PROP__KHTML_MARQUEE_STYLE:
+    case CSS_PROP__TDEHTML_MARQUEE_STYLE:
         switch (style->marqueeBehavior()) {
         case MNONE:
             return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
@@ -889,19 +889,19 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
     case CSS_PROP_TEXT_DECORATION:
     {
         TQString string;
-        if (style->textDecoration() & khtml::UNDERLINE)
+        if (style->textDecoration() & tdehtml::UNDERLINE)
             string += "underline";
-        if (style->textDecoration() & khtml::OVERLINE) {
+        if (style->textDecoration() & tdehtml::OVERLINE) {
             if (string.length() > 0)
                 string += " ";
             string += "overline";
         }
-        if (style->textDecoration() & khtml::LINE_THROUGH) {
+        if (style->textDecoration() & tdehtml::LINE_THROUGH) {
             if (string.length() > 0)
                 string += " ";
             string += "line-through";
         }
-        if (style->textDecoration() & khtml::BLINK) {
+        if (style->textDecoration() & tdehtml::BLINK) {
             if (string.length() > 0)
                 string += " ";
             string += "blink";
@@ -960,7 +960,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
         case BOTTOM:
             return new CSSPrimitiveValueImpl(CSS_VAL_BOTTOM);
         case BASELINE_MIDDLE:
-            return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_BASELINE_MIDDLE);
+            return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_BASELINE_MIDDLE);
         case LENGTH:
             return valueForLength(style->verticalAlignLength(), renderer->contentWidth());
         }
@@ -969,11 +969,11 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
     }
     case CSS_PROP_VISIBILITY:
         switch (style->visibility()) {
-            case khtml::VISIBLE:
+            case tdehtml::VISIBLE:
                 return new CSSPrimitiveValueImpl(CSS_VAL_VISIBLE);
-            case khtml::HIDDEN:
+            case tdehtml::HIDDEN:
                 return new CSSPrimitiveValueImpl(CSS_VAL_HIDDEN);
-            case khtml::COLLAPSE:
+            case tdehtml::COLLAPSE:
                 return new CSSPrimitiveValueImpl(CSS_VAL_COLLAPSE);
         }
         Q_ASSERT(0);
@@ -991,8 +991,8 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
             return new CSSPrimitiveValueImpl(CSS_VAL_PRE_LINE);
         case NOWRAP:
             return new CSSPrimitiveValueImpl(CSS_VAL_NOWRAP);
-        case KHTML_NOWRAP:
-            return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NOWRAP);
+        case TDEHTML_NOWRAP:
+            return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NOWRAP);
         }
         Q_ASSERT(0);
         break;
@@ -1060,9 +1060,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
         break;
     case CSS_PROP_SCROLLBAR_ARROW_COLOR:
         break;
-    case CSS_PROP__KHTML_FLOW_MODE:
+    case CSS_PROP__TDEHTML_FLOW_MODE:
         break;
-    case CSS_PROP__KHTML_USER_INPUT:
+    case CSS_PROP__TDEHTML_USER_INPUT:
         break;
     default:
         Q_ASSERT( 0 );
diff --git a/khtml/css/css_renderstyledeclarationimpl.h b/tdehtml/css/css_renderstyledeclarationimpl.h
index d35983993..a751ceda1 100644
--- a/khtml/css/css_renderstyledeclarationimpl.h
+++ b/tdehtml/css/css_renderstyledeclarationimpl.h
@@ -30,13 +30,13 @@ namespace DOM {
     class NodeImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderObject;
 
 
 // Used by DOM::Counter::listStyle()
-DOM::DOMString stringForListStyleType(khtml::EListStyleType type);
+DOM::DOMString stringForListStyleType(tdehtml::EListStyleType type);
 
 class RenderStyleDeclarationImpl : public DOM::CSSStyleDeclarationImpl
 {
diff --git a/khtml/css/css_ruleimpl.cpp b/tdehtml/css/css_ruleimpl.cpp
index 0bf675484..0edd3a511 100644
--- a/khtml/css/css_ruleimpl.cpp
+++ b/tdehtml/css/css_ruleimpl.cpp
@@ -171,7 +171,7 @@ void CSSImportRuleImpl::init()
 {
     m_loading = 0;
     m_done = false;
-    khtml::DocLoader *docLoader = 0;
+    tdehtml::DocLoader *docLoader = 0;
     StyleBaseImpl *root = this;
     StyleBaseImpl *parent;
     while ( ( parent = root->parent()) )
diff --git a/khtml/css/css_ruleimpl.h b/tdehtml/css/css_ruleimpl.h
index 2753fcf83..63d0f96a1 100644
--- a/khtml/css/css_ruleimpl.h
+++ b/tdehtml/css/css_ruleimpl.h
@@ -30,7 +30,7 @@
 #include "misc/loader_client.h"
 #include "misc/shared.h"
 
-namespace khtml {
+namespace tdehtml {
     class CachedCSSStyleSheet;
 }
 
@@ -95,7 +95,7 @@ protected:
 };
 
 
-class CSSImportRuleImpl : public khtml::CachedObjectClient, public CSSRuleImpl
+class CSSImportRuleImpl : public tdehtml::CachedObjectClient, public CSSRuleImpl
 {
 public:
     CSSImportRuleImpl( StyleBaseImpl *parent, const DOM::DOMString &href,
@@ -122,14 +122,14 @@ protected:
     DOMString m_strHref;
     MediaListImpl *m_lstMedia;
     CSSStyleSheetImpl *m_styleSheet;
-    khtml::CachedCSSStyleSheet *m_cachedSheet;
+    tdehtml::CachedCSSStyleSheet *m_cachedSheet;
     bool m_loading;
     bool m_done;
 };
 
 class MediaList;
 
-class CSSRuleListImpl : public khtml::Shared<CSSRuleListImpl>
+class CSSRuleListImpl : public tdehtml::Shared<CSSRuleListImpl>
 {
 public:
     CSSRuleListImpl() {}
diff --git a/khtml/css/css_stylesheetimpl.cpp b/tdehtml/css/css_stylesheetimpl.cpp
index 8189a6846..40fa0dc0c 100644
--- a/khtml/css/css_stylesheetimpl.cpp
+++ b/tdehtml/css/css_stylesheetimpl.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 // --------------------------------------------------------------------------------
 
 StyleSheetImpl::StyleSheetImpl(StyleSheetImpl *parentSheet, DOMString href)
diff --git a/khtml/css/css_stylesheetimpl.h b/tdehtml/css/css_stylesheetimpl.h
index 656b59ca9..8b59003ed 100644
--- a/khtml/css/css_stylesheetimpl.h
+++ b/tdehtml/css/css_stylesheetimpl.h
@@ -31,7 +31,7 @@
 #include "misc/loader_client.h"
 #include "xml/dom_docimpl.h"
 
-namespace khtml {
+namespace tdehtml {
     class CachedCSSStyleSheet;
     class DocLoader;
 }
@@ -55,7 +55,7 @@ public:
     StyleSheetImpl(DOM::NodeImpl *ownerNode, DOM::DOMString href = DOMString());
     StyleSheetImpl(StyleSheetImpl *parentSheet, DOM::DOMString href = DOMString());
     StyleSheetImpl(StyleBaseImpl *owner, DOM::DOMString href  = DOMString());
-    StyleSheetImpl(khtml::CachedCSSStyleSheet *cached, DOM::DOMString href  = DOMString());
+    StyleSheetImpl(tdehtml::CachedCSSStyleSheet *cached, DOM::DOMString href  = DOMString());
     virtual ~StyleSheetImpl();
 
     virtual bool isStyleSheet() const { return true; }
@@ -115,7 +115,7 @@ public:
     virtual void checkLoaded() const;
 
     // ### remove? (clients should use sheet->doc()->docLoader())
-    khtml::DocLoader *docLoader() const
+    tdehtml::DocLoader *docLoader() const
     { return m_doc ? m_doc->docLoader() : 0; }
 
     DocumentImpl *doc() const { return m_doc; }
@@ -130,7 +130,7 @@ protected:
 
 // ----------------------------------------------------------------------------
 
-class StyleSheetListImpl : public khtml::Shared<StyleSheetListImpl>
+class StyleSheetListImpl : public tdehtml::Shared<StyleSheetListImpl>
 {
 public:
     StyleSheetListImpl() {}
diff --git a/khtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp
index a6150c78b..b515388dc 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/tdehtml/css/css_valueimpl.cpp
@@ -48,7 +48,7 @@
 // Hack for debugging purposes
 extern DOM::DOMString getPropertyName(unsigned short id);
 
-using khtml::FontDef;
+using tdehtml::FontDef;
 
 using namespace DOM;
 
@@ -308,9 +308,10 @@ bool CSSStyleDeclarationImpl::setProperty(int id, const DOMString &value, bool i
 
     CSSParser parser( strictParsing );
     bool success = parser.parseValue( this, id, value, important, nonCSSHint );
-    if(!success)
+    if(!success) {
 	kdDebug( 6080 ) << "CSSStyleDeclarationImpl::setProperty invalid property: [" << getPropertyName(id).string()
 			<< "] value: [" << value.string() << "]"<< endl;
+    }
     else
         setChanged();
     return success;
@@ -549,7 +550,7 @@ void CSSPrimitiveValueImpl::cleanup()
     m_type = 0;
 }
 
-int CSSPrimitiveValueImpl::computeLength( khtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics )
+int CSSPrimitiveValueImpl::computeLength( tdehtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics )
 {
     double result = computeLengthFloat( style, devMetrics );
     // This conversion is imprecise, often resulting in values of, e.g., 44.99998.  We
@@ -558,14 +559,14 @@ int CSSPrimitiveValueImpl::computeLength( khtml::RenderStyle *style, TQPaintDevi
     return intResult;
 }
 
-double CSSPrimitiveValueImpl::computeLengthFloat( khtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics )
+double CSSPrimitiveValueImpl::computeLengthFloat( tdehtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics )
 {
     unsigned short type = primitiveType();
 
     double dpiY = 72.; // fallback
     if ( devMetrics )
         dpiY = devMetrics->logicalDpiY();
-    if ( !khtml::printpainter && dpiY < 96 )
+    if ( !tdehtml::printpainter && dpiY < 96 )
         dpiY = 96.;
 
     double factor = 1.;
@@ -758,7 +759,7 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const
         }
 	case CSSPrimitiveValue::CSS_RGBCOLOR:
 	    if (tqAlpha(m_value.rgbcolor) != 0xFF) {
-		if (m_value.rgbcolor == khtml::transparentColor)
+		if (m_value.rgbcolor == tdehtml::transparentColor)
 		    text = "transparent";
 		else
 		    text = "rgba(" + TQString::number(tqRed  (m_value.rgbcolor)) + "," 
@@ -854,7 +855,7 @@ void PairImpl::setSecond(CSSPrimitiveValueImpl* second)
 CSSImageValueImpl::CSSImageValueImpl(const DOMString &url, const StyleBaseImpl* style)
     : CSSPrimitiveValueImpl(url, CSSPrimitiveValue::CSS_URI)
 {
-    khtml::DocLoader *docLoader = 0;
+    tdehtml::DocLoader *docLoader = 0;
     const StyleBaseImpl *root = style;
     while (root->parent())
 	root = root->parent();
@@ -891,7 +892,7 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
     parsedFontName.replace(braceReg, TQString());
 
 #ifndef APPLE_CHANGES
-    const TQString &available = KHTMLSettings::availableFamilies();
+    const TQString &available = TDEHTMLSettings::availableFamilies();
 
     parsedFontName = parsedFontName.lower();
     // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl;
diff --git a/khtml/css/css_valueimpl.h b/tdehtml/css/css_valueimpl.h
index 3566c00cb..9a6203c86 100644
--- a/khtml/css/css_valueimpl.h
+++ b/tdehtml/css/css_valueimpl.h
@@ -32,7 +32,7 @@
 
 #include <tqintdict.h>
 
-namespace khtml {
+namespace tdehtml {
     class RenderStyle;
     class CachedImage;
 }
@@ -182,9 +182,9 @@ public:
      * this is screen/printer dependent, so we probably need a config option for this,
      * and some tool to calibrate.
      */
-    int computeLength( khtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics );
+    int computeLength( tdehtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics );
 
-    double computeLengthFloat( khtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics );
+    double computeLengthFloat( tdehtml::RenderStyle *style, TQPaintDeviceMetrics *devMetrics );
 
     // use with care!!!
     void setPrimitiveType(unsigned short type) { m_type = type; }
@@ -252,7 +252,7 @@ public:
     virtual bool isQuirkValue() const { return true; }
 };
 
-class CounterImpl : public khtml::Shared<CounterImpl> {
+class CounterImpl : public tdehtml::Shared<CounterImpl> {
 public:
     CounterImpl() : m_listStyle(0) { }
     DOMString identifier() const { return m_identifier; }
@@ -264,7 +264,7 @@ public:
     DOMString m_separator;
 };
 
-class RectImpl : public khtml::Shared<RectImpl> {
+class RectImpl : public tdehtml::Shared<RectImpl> {
 public:
     RectImpl();
     ~RectImpl();
@@ -289,7 +289,7 @@ protected:
 // and border-spacing (all of which are space-separated sets of two values).  At the moment we are only using it for
 // border-radius and background-size, but (FIXME) border-spacing and background-position could be converted over to use
 // it (eliminating some extra -webkit- internal properties).
-class PairImpl : public khtml::Shared<PairImpl> {
+class PairImpl : public tdehtml::Shared<PairImpl> {
 public:
     PairImpl() : m_first(0), m_second(0) { }
     PairImpl(CSSPrimitiveValueImpl* first, CSSPrimitiveValueImpl* second)
@@ -308,16 +308,16 @@ protected:
 };
 
 
-class CSSImageValueImpl : public CSSPrimitiveValueImpl, public khtml::CachedObjectClient
+class CSSImageValueImpl : public CSSPrimitiveValueImpl, public tdehtml::CachedObjectClient
 {
 public:
     CSSImageValueImpl(const DOMString &url, const StyleBaseImpl *style);
     CSSImageValueImpl();
     virtual ~CSSImageValueImpl();
 
-    khtml::CachedImage *image() { return m_image; }
+    tdehtml::CachedImage *image() { return m_image; }
 protected:
-    khtml::CachedImage *m_image;
+    tdehtml::CachedImage *m_image;
 };
 
 class FontFamilyValueImpl : public CSSPrimitiveValueImpl
diff --git a/khtml/css/csshelper.cpp b/tdehtml/css/csshelper.cpp
index b388d2215..a6ea9c38b 100644
--- a/khtml/css/csshelper.cpp
+++ b/tdehtml/css/csshelper.cpp
@@ -28,7 +28,7 @@
 #include <tqfontdatabase.h>
 
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_style.h"
@@ -36,13 +36,13 @@
 #include "dom/css_value.h"
 #include "misc/helper.h"
 #include "xml/dom_stringimpl.h"
-#include "khtml_settings.h"
+#include "tdehtml_settings.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 
-DOMString khtml::parseURL(const DOMString &url)
+DOMString tdehtml::parseURL(const DOMString &url)
 {
     DOMStringImpl* i = url.implementation();
     if(!i) return DOMString();
diff --git a/khtml/css/csshelper.h b/tdehtml/css/csshelper.h
index 1ab8ac3ce..5bc5194d0 100644
--- a/khtml/css/csshelper.h
+++ b/tdehtml/css/csshelper.h
@@ -28,14 +28,14 @@
 #include "dom/dom_string.h"
 
 class TQPaintDeviceMetrics;
-class KHTMLSettings;
+class TDEHTMLSettings;
 
 namespace DOM
 {
     class CSSPrimitiveValueImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
     class RenderStyle;
 
diff --git a/khtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index b4480ab7d..8b11c78d2 100644
--- a/khtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -26,7 +26,7 @@
 #define YYDEBUG 0
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 
 #include "cssparser.h"
@@ -184,13 +184,13 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
 {
     styleElement = sheet;
 
-    const char khtml_rule[] = "@-khtml-rule{";
-    int length = string.length() + 4 + strlen(khtml_rule);
+    const char tdehtml_rule[] = "@-tdehtml-rule{";
+    int length = string.length() + 4 + strlen(tdehtml_rule);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
-    for ( unsigned int i = 0; i < strlen(khtml_rule); i++ )
-        data[i] = khtml_rule[i];
-    memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
+    for ( unsigned int i = 0; i < strlen(tdehtml_rule); i++ )
+        data[i] = tdehtml_rule[i];
+    memcpy( data + strlen( tdehtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
     // tqDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
     data[length-4] = '}';
 
@@ -212,13 +212,13 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
 
     styleElement = declaration->stylesheet();
 
-    const char khtml_value[] = "@-khtml-value{";
-    int length = string.length() + 4 + strlen(khtml_value);
+    const char tdehtml_value[] = "@-tdehtml-value{";
+    int length = string.length() + 4 + strlen(tdehtml_value);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
-    for ( unsigned int i = 0; i < strlen(khtml_value); i++ )
-        data[i] = khtml_value[i];
-    memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
+    for ( unsigned int i = 0; i < strlen(tdehtml_value); i++ )
+        data[i] = tdehtml_value[i];
+    memcpy( data + strlen( tdehtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
     data[length-4] = '}';
     // tqDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
 
@@ -254,13 +254,13 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
 
     styleElement = declaration->stylesheet();
 
-    const char khtml_decls[] = "@-khtml-decls{";
-    int length = string.length() + 4 + strlen(khtml_decls);
+    const char tdehtml_decls[] = "@-tdehtml-decls{";
+    int length = string.length() + 4 + strlen(tdehtml_decls);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
-    for ( unsigned int i = 0; i < strlen(khtml_decls); i++ )
-        data[i] = khtml_decls[i];
-    memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
+    for ( unsigned int i = 0; i < strlen(tdehtml_decls); i++ )
+        data[i] = tdehtml_decls[i];
+    memcpy( data + strlen( tdehtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
     data[length-4] = '}';
 
     nonCSSHint = _nonCSSHint;
@@ -530,10 +530,10 @@ bool CSSParser::parseValue( int propId, bool important )
         break;
 
     /* Start of supported CSS properties with validation. This is needed for parseShortHand to work
-     * correctly and allows optimization in khtml::applyRule(..)
+     * correctly and allows optimization in tdehtml::applyRule(..)
      */
     case CSS_PROP_CAPTION_SIDE:         // top | bottom | left | right | inherit
-        // Left and right were deprecated in CSS 2.1 and never supported by KHTML
+        // Left and right were deprecated in CSS 2.1 and never supported by TDEHTML
         if ( /* id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || */
             id == CSS_VAL_TOP || id == CSS_VAL_BOTTOM)
             valid_primitive = true;
@@ -567,12 +567,12 @@ bool CSSParser::parseValue( int propId, bool important )
         // upper-roman | lower-greek | lower-alpha | lower-latin | upper-alpha |
         // upper-latin | hebrew | armenian | georgian | cjk-ideographic | hiragana |
         // katakana | hiragana-iroha | katakana-iroha | none | inherit
-        if ((id >= CSS_VAL_DISC && id <= CSS_VAL__KHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
+        if ((id >= CSS_VAL_DISC && id <= CSS_VAL__TDEHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
             valid_primitive = true;
         break;
 
     case CSS_PROP_DISPLAY:
-        // inline | block | list-item | run-in | inline-block | -khtml-ruler | table |
+        // inline | block | list-item | run-in | inline-block | -tdehtml-ruler | table |
         // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
         // table-column-group | table-column | table-cell | table-caption | none | inherit
         if ((id >= CSS_VAL_INLINE && id <= CSS_VAL_TABLE_CAPTION) || id == CSS_VAL_NONE)
@@ -589,9 +589,9 @@ bool CSSParser::parseValue( int propId, bool important )
             valid_primitive = true;
         break;
 
-    case CSS_PROP_FLOAT:                // left | right | none | khtml_left | khtml_right | inherit + center for buggy CSS
-        if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__KHTML_LEFT ||
-             id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
+    case CSS_PROP_FLOAT:                // left | right | none | tdehtml_left | tdehtml_right | inherit + center for buggy CSS
+        if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__TDEHTML_LEFT ||
+             id == CSS_VAL__TDEHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
             valid_primitive = true;
         break;
 
@@ -602,8 +602,8 @@ bool CSSParser::parseValue( int propId, bool important )
         break;
 
     case CSS_PROP_TEXT_ALIGN:
-        // left | right | center | justify | khtml_left | khtml_right | khtml_center | <string> | inherit
-        if ( ( id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER ) ||
+        // left | right | center | justify | tdehtml_left | tdehtml_right | tdehtml_center | <string> | inherit
+        if ( ( id >= CSS_VAL__TDEHTML_AUTO && id <= CSS_VAL__TDEHTML_CENTER ) ||
              value->unit == CSSPrimitiveValue::CSS_STRING )
             valid_primitive = true;
         break;
@@ -611,9 +611,9 @@ bool CSSParser::parseValue( int propId, bool important )
     case CSS_PROP_OUTLINE_STYLE:        // <border-style> | inherit
     case CSS_PROP_BORDER_TOP_STYLE:     //// <border-style> | inherit
     case CSS_PROP_BORDER_RIGHT_STYLE:   //   Defined as:    none | hidden | dotted | dashed |
-    case CSS_PROP_BORDER_BOTTOM_STYLE:  //   solid | double | groove | ridge | inset | outset | -khtml-native
+    case CSS_PROP_BORDER_BOTTOM_STYLE:  //   solid | double | groove | ridge | inset | outset | -tdehtml-native
     case CSS_PROP_BORDER_LEFT_STYLE:    ////
-        if (id >= CSS_VAL__KHTML_NATIVE && id <= CSS_VAL_DOUBLE)
+        if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
             valid_primitive = true;
         break;
 
@@ -636,8 +636,8 @@ bool CSSParser::parseValue( int propId, bool important )
 
     case CSS_PROP_BORDER_SPACING:
     {
-        const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
-                                    CSS_PROP__KHTML_BORDER_VERTICAL_SPACING };
+        const int properties[2] = { CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
+                                    CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING };
         if (num == 1) {
             ShorthandScope scope(this, CSS_PROP_BORDER_SPACING);
             if (!parseValue(properties[0], important)) return false;
@@ -653,8 +653,8 @@ bool CSSParser::parseValue( int propId, bool important )
         }
         return false;
     }
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
+    case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
+    case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
         valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint));
         break;
 
@@ -682,10 +682,10 @@ bool CSSParser::parseValue( int propId, bool important )
     case CSS_PROP_BORDER_BOTTOM_COLOR:  // <color> | inherit
     case CSS_PROP_BORDER_LEFT_COLOR:    // <color> | inherit
     case CSS_PROP_COLOR:                // <color> | inherit
-        if ( id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_MENU ||
+        if ( id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_MENU ||
              (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT ) ||
              id == CSS_VAL_TRANSPARENT ||
-             (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && (nonCSSHint|!strict) ) ) {
+             (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && (nonCSSHint|!strict) ) ) {
             valid_primitive = true;
         } else {
             parsedValue = parseColor();
@@ -707,13 +707,13 @@ bool CSSParser::parseValue( int propId, bool important )
         break;
 
     case CSS_PROP_BACKGROUND_ATTACHMENT:
-    case CSS_PROP__KHTML_BACKGROUND_CLIP:
+    case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
     case CSS_PROP_BACKGROUND_IMAGE:
-    case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+    case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
     case CSS_PROP_BACKGROUND_POSITION:
     case CSS_PROP_BACKGROUND_POSITION_X:
     case CSS_PROP_BACKGROUND_POSITION_Y:
-    case CSS_PROP__KHTML_BACKGROUND_SIZE:
+    case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
     case CSS_PROP_BACKGROUND_REPEAT: {
         CSSValueImpl *val1 = 0, *val2 = 0;
         int propId1, propId2;
@@ -732,7 +732,7 @@ bool CSSParser::parseValue( int propId, bool important )
         }
         else if (value->unit == CSSPrimitiveValue::CSS_URI ) {
             // ### allow string in non strict mode?
-            DOMString uri = khtml::parseURL( domString( value->string ) );
+            DOMString uri = tdehtml::parseURL( domString( value->string ) );
             if (!uri.isEmpty()) {
                 parsedValue = new CSSImageValueImpl(
                     DOMString(KURL( styleElement->baseURL(), uri.string()).url()),
@@ -769,7 +769,7 @@ bool CSSParser::parseValue( int propId, bool important )
     case CSS_PROP_PADDING_RIGHT:        //  <padding-width> | inherit
     case CSS_PROP_PADDING_BOTTOM:       //   Which is defined as
     case CSS_PROP_PADDING_LEFT:         //   <length> | <percentage>
-    case CSS_PROP__KHTML_PADDING_START:
+    case CSS_PROP__TDEHTML_PADDING_START:
         valid_primitive = ( !id && validUnit( value, FLength|FPercent|FNonNeg, strict&(!nonCSSHint) ) );
         break;
 
@@ -807,7 +807,7 @@ bool CSSParser::parseValue( int propId, bool important )
             // baseline | sub | super | top | text-top | middle | bottom | text-bottom |
         // <percentage> | <length> | inherit
 
-        if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__KHTML_BASELINE_MIDDLE )
+        if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__TDEHTML_BASELINE_MIDDLE )
             valid_primitive = true;
         else
             valid_primitive = ( !id && validUnit( value, FLength|FPercent, strict&(!nonCSSHint) ) );
@@ -830,7 +830,7 @@ bool CSSParser::parseValue( int propId, bool important )
     case CSS_PROP_MARGIN_RIGHT:         //   Which is defined as
     case CSS_PROP_MARGIN_BOTTOM:        //   <length> | <percentage> | auto | inherit
     case CSS_PROP_MARGIN_LEFT:          ////
-    case CSS_PROP__KHTML_MARGIN_START:
+    case CSS_PROP__TDEHTML_MARGIN_START:
         if ( id == CSS_VAL_AUTO )
             valid_primitive = true;
         else
@@ -912,8 +912,8 @@ bool CSSParser::parseValue( int propId, bool important )
             valid_primitive = true;
         break;
 
-    case CSS_PROP__KHTML_FLOW_MODE:
-        if ( id == CSS_VAL__KHTML_NORMAL || id == CSS_VAL__KHTML_AROUND_FLOATS )
+    case CSS_PROP__TDEHTML_FLOW_MODE:
+        if ( id == CSS_VAL__TDEHTML_NORMAL || id == CSS_VAL__TDEHTML_AROUND_FLOATS )
             valid_primitive = true;
         break;
 
@@ -934,41 +934,41 @@ bool CSSParser::parseValue( int propId, bool important )
     case CSS_PROP_OPACITY:
         valid_primitive = validUnit(value, FNumber, strict);
         break;
-    case CSS_PROP__KHTML_USER_INPUT:        // none | enabled | disabled | inherit
+    case CSS_PROP__TDEHTML_USER_INPUT:        // none | enabled | disabled | inherit
         if ( id == CSS_VAL_NONE || id == CSS_VAL_ENABLED || id == CSS_VAL_DISABLED )
             valid_primitive = true;
-//        kdDebug(6080) << "CSS_PROP__KHTML_USER_INPUT: " << valid_primitive << endl;
+//        kdDebug(6080) << "CSS_PROP__TDEHTML_USER_INPUT: " << valid_primitive << endl;
         break;
-    case CSS_PROP__KHTML_MARQUEE: {
-        const int properties[5] = { CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__KHTML_MARQUEE_INCREMENT,
-                                    CSS_PROP__KHTML_MARQUEE_REPETITION,
-                                    CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__KHTML_MARQUEE_SPEED };
+    case CSS_PROP__TDEHTML_MARQUEE: {
+        const int properties[5] = { CSS_PROP__TDEHTML_MARQUEE_DIRECTION, CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
+                                    CSS_PROP__TDEHTML_MARQUEE_REPETITION,
+                                    CSS_PROP__TDEHTML_MARQUEE_STYLE, CSS_PROP__TDEHTML_MARQUEE_SPEED };
         return parseShortHand(propId, properties, 5, important);
     }
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION:
+    case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
         if (id == CSS_VAL_FORWARDS || id == CSS_VAL_BACKWARDS || id == CSS_VAL_AHEAD ||
             id == CSS_VAL_REVERSE || id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL_DOWN ||
             id == CSS_VAL_UP || id == CSS_VAL_AUTO)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT:
+    case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
         if (id == CSS_VAL_SMALL || id == CSS_VAL_LARGE || id == CSS_VAL_MEDIUM)
             valid_primitive = true;
         else
             valid_primitive = validUnit(value, FLength|FPercent, strict&(!nonCSSHint));
         break;
-    case CSS_PROP__KHTML_MARQUEE_STYLE:
+    case CSS_PROP__TDEHTML_MARQUEE_STYLE:
         if (id == CSS_VAL_NONE || id == CSS_VAL_SLIDE || id == CSS_VAL_SCROLL || id == CSS_VAL_ALTERNATE ||
             id == CSS_VAL_UNFURL)
             valid_primitive = true;
         break;
-    case CSS_PROP__KHTML_MARQUEE_REPETITION:
+    case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
         if (id == CSS_VAL_INFINITE)
             valid_primitive = true;
         else
             valid_primitive = validUnit(value, FInteger|FNonNeg, strict&(!nonCSSHint));
         break;
-    case CSS_PROP__KHTML_MARQUEE_SPEED:
+    case CSS_PROP__TDEHTML_MARQUEE_SPEED:
         if (id == CSS_VAL_NORMAL || id == CSS_VAL_SLOW || id == CSS_VAL_FAST)
             valid_primitive = true;
         else
@@ -1137,11 +1137,11 @@ bool CSSParser::parseBackgroundShorthand(bool important)
 {
     // Position must come before color in this array because a plain old "0" is a legal color
     // in quirks mode but it's usually the X coordinate of a position.
-    // FIXME: Add CSS_PROP__KHTML_BACKGROUND_SIZE to the shorthand.
+    // FIXME: Add CSS_PROP__TDEHTML_BACKGROUND_SIZE to the shorthand.
     const int numProperties = 7;
     const int properties[numProperties] = { CSS_PROP_BACKGROUND_IMAGE, CSS_PROP_BACKGROUND_REPEAT,
-        CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION,  CSS_PROP__KHTML_BACKGROUND_CLIP,
-        CSS_PROP__KHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
+        CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION,  CSS_PROP__TDEHTML_BACKGROUND_CLIP,
+        CSS_PROP__TDEHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
 
     ShorthandScope scope(this, CSS_PROP_BACKGROUND);
 
@@ -1336,7 +1336,7 @@ bool CSSParser::parseContent( int propId, bool important )
         parsedValue = 0;
         if ( val->unit == CSSPrimitiveValue::CSS_URI ) {
             // url
-            DOMString value = khtml::parseURL(domString(val->string));
+            DOMString value = tdehtml::parseURL(domString(val->string));
             parsedValue = new CSSImageValueImpl(
                 DOMString(KURL( styleElement->baseURL(), value.string()).url() ), styleElement );
 #ifdef CSS_DEBUG
@@ -1427,7 +1427,7 @@ CSSValueImpl* CSSParser::parseCounterContent(ValueList *args, bool counters)
         if (i->unit != Value::Operator || i->iValue != ',') goto invalid;
         i = args->next();
         if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
-        if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__KHTML_CLOSE_QUOTE) goto invalid;
+        if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__TDEHTML_CLOSE_QUOTE) goto invalid;
         counter->m_listStyle = i->id - CSS_VAL_DISC;
     }
     return new CSSPrimitiveValueImpl(counter);
@@ -1439,9 +1439,9 @@ invalid:
 CSSValueImpl* CSSParser::parseBackgroundColor()
 {
     int id = valueList->current()->id;
-    if (id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
+    if (id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
         (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) || id == CSS_VAL_MENU ||
-        (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && !strict))
+        (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && !strict))
        return new CSSPrimitiveValueImpl(id);
     return parseColor();
 }
@@ -1451,7 +1451,7 @@ CSSValueImpl* CSSParser::parseBackgroundImage()
     if (valueList->current()->id == CSS_VAL_NONE)
         return new CSSImageValueImpl();
     if (valueList->current()->unit == CSSPrimitiveValue::CSS_URI) {
-        DOMString uri = khtml::parseURL(domString(valueList->current()->string));
+        DOMString uri = tdehtml::parseURL(domString(valueList->current()->string));
         if (!uri.isEmpty())
             return new CSSImageValueImpl(DOMString(KURL(styleElement->baseURL(), uri.string()).url()),
                                          styleElement);
@@ -1615,8 +1615,8 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
                     if (currValue)
                         valueList->next();
                     break;
-                case CSS_PROP__KHTML_BACKGROUND_CLIP:
-                case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+                case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
+                case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
                     if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) {
                         currValue = new CSSPrimitiveValueImpl(val->id);
                         valueList->next();
@@ -1646,7 +1646,7 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
                         valueList->next();
                     }
                     break;
-                case CSS_PROP__KHTML_BACKGROUND_SIZE:
+                case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
                     currValue = parseBackgroundSize();
                     if (currValue)
                         valueList->next();
@@ -2101,7 +2101,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor()
 
 CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
 {
-    QRgb c = khtml::transparentColor;
+    QRgb c = tdehtml::transparentColor;
     if ( !strict && value->unit == CSSPrimitiveValue::CSS_NUMBER &&
               value->fValue >= 0. && value->fValue < 1000000. ) {
         TQString str;
@@ -2144,7 +2144,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         double colorValues[3];
         if (!parseHSLParameters(value, colorValues, false))
             return 0;
-        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
+        c = tdehtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
     } else if (value->unit == Value::Function &&
                 value->function->args != 0 &&
                 value->function->args->size() == 7 /* hsla + three commas */ &&
@@ -2152,7 +2152,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         double colorValues[4];
         if (!parseHSLParameters(value, colorValues, true))
             return 0;
-        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+        c = tdehtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
     }
     else
         return 0;
@@ -2268,7 +2268,7 @@ bool CSSParser::parseShadow(int propId, bool important)
             // The only other type of value that's ok is a color value.
             CSSPrimitiveValueImpl* parsedColor = 0;
             bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU ||
-                           (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KHTML_TEXT && !strict));
+                           (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__TDEHTML_TEXT && !strict));
 	    if (!context.allowColor)
                 return context.failed();
 
diff --git a/khtml/css/cssparser.h b/tdehtml/css/cssparser.h
index 0e00ebc16..0e00ebc16 100644
--- a/khtml/css/cssparser.h
+++ b/tdehtml/css/cssparser.h
diff --git a/khtml/css/cssproperties.c b/tdehtml/css/cssproperties.c
index c86f2d326..384982aba 100644
--- a/khtml/css/cssproperties.c
+++ b/tdehtml/css/cssproperties.c
@@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len)
 #line 104 "cssproperties.gperf"
       {"text-indent", CSS_PROP_TEXT_INDENT},
 #line 69 "cssproperties.gperf"
-      {"-khtml-margin-start", CSS_PROP__KHTML_MARGIN_START},
+      {"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
 #line 14 "cssproperties.gperf"
       {"background-color", CSS_PROP_BACKGROUND_COLOR},
 #line 100 "cssproperties.gperf"
@@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len)
 #line 47 "cssproperties.gperf"
       {"counter-reset", CSS_PROP_COUNTER_RESET},
 #line 93 "cssproperties.gperf"
-      {"-khtml-padding-start", CSS_PROP__KHTML_PADDING_START},
+      {"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
 #line 15 "cssproperties.gperf"
       {"background-image", CSS_PROP_BACKGROUND_IMAGE},
 #line 96 "cssproperties.gperf"
@@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len)
 #line 52 "cssproperties.gperf"
       {"float", CSS_PROP_FLOAT},
 #line 21 "cssproperties.gperf"
-      {"-khtml-background-clip", CSS_PROP__KHTML_BACKGROUND_CLIP},
+      {"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
 #line 70 "cssproperties.gperf"
-      {"-khtml-marquee", CSS_PROP__KHTML_MARQUEE},
+      {"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
 #line 27 "cssproperties.gperf"
-      {"-khtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING},
+      {"-tdehtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
 #line 46 "cssproperties.gperf"
       {"counter-increment", CSS_PROP_COUNTER_INCREMENT},
 #line 128 "cssproperties.gperf"
@@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len)
 #line 31 "cssproperties.gperf"
       {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
 #line 22 "cssproperties.gperf"
-      {"-khtml-background-origin", CSS_PROP__KHTML_BACKGROUND_ORIGIN},
+      {"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
 #line 17 "cssproperties.gperf"
       {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
 #line 126 "cssproperties.gperf"
@@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len)
 #line 68 "cssproperties.gperf"
       {"margin-left", CSS_PROP_MARGIN_LEFT},
 #line 142 "cssproperties.gperf"
-      {"-khtml-user-input", CSS_PROP__KHTML_USER_INPUT},
+      {"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
 #line 79 "cssproperties.gperf"
       {"min-width", CSS_PROP_MIN_WIDTH},
 #line 127 "cssproperties.gperf"
@@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len)
 #line 92 "cssproperties.gperf"
       {"padding-left", CSS_PROP_PADDING_LEFT},
 #line 71 "cssproperties.gperf"
-      {"-khtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION},
+      {"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
 #line 73 "cssproperties.gperf"
-      {"-khtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION},
+      {"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
 #line 95 "cssproperties.gperf"
       {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
 #line 74 "cssproperties.gperf"
-      {"-khtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED},
+      {"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
 #line 94 "cssproperties.gperf"
       {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
 #line 81 "cssproperties.gperf"
@@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len)
 #line 134 "cssproperties.gperf"
       {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
 #line 72 "cssproperties.gperf"
-      {"-khtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT},
+      {"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
 #line 116 "cssproperties.gperf"
       {"word-spacing", CSS_PROP_WORD_SPACING},
 #line 111 "cssproperties.gperf"
@@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len)
 #line 32 "cssproperties.gperf"
       {"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
 #line 26 "cssproperties.gperf"
-      {"-khtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING},
+      {"-tdehtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
 #line 33 "cssproperties.gperf"
       {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
 #line 34 "cssproperties.gperf"
       {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
 #line 23 "cssproperties.gperf"
-      {"-khtml-background-size", CSS_PROP__KHTML_BACKGROUND_SIZE},
+      {"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
 #line 135 "cssproperties.gperf"
       {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
 #line 129 "cssproperties.gperf"
@@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len)
 #line 84 "cssproperties.gperf"
       {"outline-style", CSS_PROP_OUTLINE_STYLE},
 #line 141 "cssproperties.gperf"
-      {"-khtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE},
+      {"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
 #line 87 "cssproperties.gperf"
       {"overflow-x", CSS_PROP_OVERFLOW_X},
 #line 113 "cssproperties.gperf"
@@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len)
 #line 83 "cssproperties.gperf"
       {"outline-offset", CSS_PROP_OUTLINE_OFFSET},
 #line 75 "cssproperties.gperf"
-      {"-khtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE},
+      {"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
 #line 55 "cssproperties.gperf"
       {"font-style", CSS_PROP_FONT_STYLE},
 #line 35 "cssproperties.gperf"
@@ -544,13 +544,13 @@ static const char * const propertyList[] = {
 "background-position", 
 "background-position-x", 
 "background-position-y", 
-"-khtml-background-clip", 
-"-khtml-background-origin", 
-"-khtml-background-size", 
+"-tdehtml-background-clip", 
+"-tdehtml-background-origin", 
+"-tdehtml-background-size", 
 "border-collapse", 
 "border-spacing", 
-"-khtml-border-horizontal-spacing", 
-"-khtml-border-vertical-spacing", 
+"-tdehtml-border-horizontal-spacing", 
+"-tdehtml-border-vertical-spacing", 
 "border-top-color", 
 "border-right-color", 
 "border-bottom-color", 
@@ -592,13 +592,13 @@ static const char * const propertyList[] = {
 "margin-right", 
 "margin-bottom", 
 "margin-left", 
-"-khtml-margin-start", 
-"-khtml-marquee", 
-"-khtml-marquee-direction", 
-"-khtml-marquee-increment", 
-"-khtml-marquee-repetition", 
-"-khtml-marquee-speed", 
-"-khtml-marquee-style", 
+"-tdehtml-margin-start", 
+"-tdehtml-marquee", 
+"-tdehtml-marquee-direction", 
+"-tdehtml-marquee-increment", 
+"-tdehtml-marquee-repetition", 
+"-tdehtml-marquee-speed", 
+"-tdehtml-marquee-style", 
 "max-height", 
 "max-width", 
 "min-height", 
@@ -616,7 +616,7 @@ static const char * const propertyList[] = {
 "padding-right", 
 "padding-bottom", 
 "padding-left", 
-"-khtml-padding-start", 
+"-tdehtml-padding-start", 
 "page-break-after", 
 "page-break-before", 
 "page-break-inside", 
@@ -664,8 +664,8 @@ static const char * const propertyList[] = {
 "scrollbar-darkshadow-color", 
 "scrollbar-track-color", 
 "scrollbar-arrow-color", 
-"-khtml-flow-mode", 
-"-khtml-user-input", 
+"-tdehtml-flow-mode", 
+"-tdehtml-user-input", 
     0
 };
 DOMString getPropertyName(unsigned short id)
diff --git a/khtml/css/cssproperties.h b/tdehtml/css/cssproperties.h
index be92d93d4..c06431c62 100644
--- a/khtml/css/cssproperties.h
+++ b/tdehtml/css/cssproperties.h
@@ -15,13 +15,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_PROP_BACKGROUND_POSITION 5
 #define CSS_PROP_BACKGROUND_POSITION_X 6
 #define CSS_PROP_BACKGROUND_POSITION_Y 7
-#define CSS_PROP__KHTML_BACKGROUND_CLIP 8
-#define CSS_PROP__KHTML_BACKGROUND_ORIGIN 9
-#define CSS_PROP__KHTML_BACKGROUND_SIZE 10
+#define CSS_PROP__TDEHTML_BACKGROUND_CLIP 8
+#define CSS_PROP__TDEHTML_BACKGROUND_ORIGIN 9
+#define CSS_PROP__TDEHTML_BACKGROUND_SIZE 10
 #define CSS_PROP_BORDER_COLLAPSE 11
 #define CSS_PROP_BORDER_SPACING 12
-#define CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING 13
-#define CSS_PROP__KHTML_BORDER_VERTICAL_SPACING 14
+#define CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING 13
+#define CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING 14
 #define CSS_PROP_BORDER_TOP_COLOR 15
 #define CSS_PROP_BORDER_RIGHT_COLOR 16
 #define CSS_PROP_BORDER_BOTTOM_COLOR 17
@@ -63,13 +63,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_PROP_MARGIN_RIGHT 53
 #define CSS_PROP_MARGIN_BOTTOM 54
 #define CSS_PROP_MARGIN_LEFT 55
-#define CSS_PROP__KHTML_MARGIN_START 56
-#define CSS_PROP__KHTML_MARQUEE 57
-#define CSS_PROP__KHTML_MARQUEE_DIRECTION 58
-#define CSS_PROP__KHTML_MARQUEE_INCREMENT 59
-#define CSS_PROP__KHTML_MARQUEE_REPETITION 60
-#define CSS_PROP__KHTML_MARQUEE_SPEED 61
-#define CSS_PROP__KHTML_MARQUEE_STYLE 62
+#define CSS_PROP__TDEHTML_MARGIN_START 56
+#define CSS_PROP__TDEHTML_MARQUEE 57
+#define CSS_PROP__TDEHTML_MARQUEE_DIRECTION 58
+#define CSS_PROP__TDEHTML_MARQUEE_INCREMENT 59
+#define CSS_PROP__TDEHTML_MARQUEE_REPETITION 60
+#define CSS_PROP__TDEHTML_MARQUEE_SPEED 61
+#define CSS_PROP__TDEHTML_MARQUEE_STYLE 62
 #define CSS_PROP_MAX_HEIGHT 63
 #define CSS_PROP_MAX_WIDTH 64
 #define CSS_PROP_MIN_HEIGHT 65
@@ -87,7 +87,7 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_PROP_PADDING_RIGHT 77
 #define CSS_PROP_PADDING_BOTTOM 78
 #define CSS_PROP_PADDING_LEFT 79
-#define CSS_PROP__KHTML_PADDING_START 80
+#define CSS_PROP__TDEHTML_PADDING_START 80
 #define CSS_PROP_PAGE_BREAK_AFTER 81
 #define CSS_PROP_PAGE_BREAK_BEFORE 82
 #define CSS_PROP_PAGE_BREAK_INSIDE 83
@@ -135,8 +135,8 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 125
 #define CSS_PROP_SCROLLBAR_TRACK_COLOR 126
 #define CSS_PROP_SCROLLBAR_ARROW_COLOR 127
-#define CSS_PROP__KHTML_FLOW_MODE 128
-#define CSS_PROP__KHTML_USER_INPUT 129
+#define CSS_PROP__TDEHTML_FLOW_MODE 128
+#define CSS_PROP__TDEHTML_USER_INPUT 129
 
 #define CSS_PROP_MAX CSS_PROP_Z_INDEX
 #define CSS_PROP_TOTAL 130
diff --git a/khtml/css/cssproperties.in b/tdehtml/css/cssproperties.in
index 251eb5e3d..27e452322 100644
--- a/khtml/css/cssproperties.in
+++ b/tdehtml/css/cssproperties.in
@@ -3,7 +3,7 @@
 #
 # aural properties are commented out, as we don't support them anyway.
 #
-# some properties are used in khtml, but are not part of CSS. They are used to get
+# some properties are used in tdehtml, but are not part of CSS. They are used to get
 # HTML4 compatibility in the rendering engine.
 #
 # Mircosoft extensions are documented here:
@@ -20,14 +20,14 @@ background-position
 background-position-x
 background-position-y
 # CSS3 Extensions
--khtml-background-clip
--khtml-background-origin
--khtml-background-size
+-tdehtml-background-clip
+-tdehtml-background-origin
+-tdehtml-background-size
 
 border-collapse
 border-spacing
--khtml-border-horizontal-spacing
--khtml-border-vertical-spacing
+-tdehtml-border-horizontal-spacing
+-tdehtml-border-vertical-spacing
 border-top-color
 border-right-color
 border-bottom-color
@@ -69,13 +69,13 @@ margin-top
 margin-right
 margin-bottom
 margin-left
--khtml-margin-start
--khtml-marquee
--khtml-marquee-direction
--khtml-marquee-increment
--khtml-marquee-repetition
--khtml-marquee-speed
--khtml-marquee-style
+-tdehtml-margin-start
+-tdehtml-marquee
+-tdehtml-marquee-direction
+-tdehtml-marquee-increment
+-tdehtml-marquee-repetition
+-tdehtml-marquee-speed
+-tdehtml-marquee-style
 max-height
 max-width
 min-height
@@ -93,7 +93,7 @@ padding-top
 padding-right
 padding-bottom
 padding-left
--khtml-padding-start
+-tdehtml-padding-start
 #page
 page-break-after
 page-break-before
@@ -143,6 +143,6 @@ scrollbar-3dlight-color
 scrollbar-darkshadow-color
 scrollbar-track-color
 scrollbar-arrow-color
-# khtml internals
--khtml-flow-mode
--khtml-user-input
+# tdehtml internals
+-tdehtml-flow-mode
+-tdehtml-user-input
diff --git a/khtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index fc125b5e2..79f8ba251 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -36,29 +36,29 @@
 #include "xml/dom_restyler.h"
 #include "dom/css_rule.h"
 #include "dom/css_value.h"
-#include "khtml_factory.h"
-#include "khtmlpart_p.h"
-using namespace khtml;
+#include "tdehtml_factory.h"
+#include "tdehtmlpart_p.h"
+using namespace tdehtml;
 using namespace DOM;
 
 #include "css/cssproperties.h"
 #include "css/cssvalues.h"
 
-#include "misc/khtmllayout.h"
-#include "khtml_settings.h"
+#include "misc/tdehtmllayout.h"
+#include "tdehtml_settings.h"
 #include "misc/htmlhashes.h"
 #include "misc/helper.h"
 #include "misc/loader.h"
 
 #include "rendering/font.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include <kstandarddirs.h>
 #include <kcharsets.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <tqfile.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
@@ -195,7 +195,7 @@ else \
 HANDLE_INHERIT_ON_INHERITED_PROPERTY(prop, Prop)
 
 
-namespace khtml {
+namespace tdehtml {
 
 CSSStyleSelectorList *CSSStyleSelector::s_defaultStyle;
 CSSStyleSelectorList *CSSStyleSelector::s_defaultQuirksStyle;
@@ -211,7 +211,7 @@ static PseudoState pseudoState;
 CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, StyleSheetListImpl *styleSheets,
                                     const KURL &url, bool _strictParsing )
 {
-    KHTMLView* view = doc->view();
+    TDEHTMLView* view = doc->view();
 
     init(view ? view->part()->settings() : 0, doc);
 
@@ -225,7 +225,7 @@ CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet,
     userSheet = 0;
     paintDeviceMetrics = doc->paintDeviceMetrics();
 
-    if(paintDeviceMetrics) // this may be null, not everyone uses khtmlview (Niko)
+    if(paintDeviceMetrics) // this may be null, not everyone uses tdehtmlview (Niko)
         computeFontSizes(paintDeviceMetrics, view ? view->part()->zoomFactor() : 100);
 
     if ( !userStyleSheet.isEmpty() ) {
@@ -273,14 +273,14 @@ CSSStyleSelector::CSSStyleSelector( CSSStyleSheetImpl *sheet )
 {
     init(0L, 0L);
 
-    KHTMLView *view = sheet->doc()->view();
+    TDEHTMLView *view = sheet->doc()->view();
     m_medium = view ? view->mediaType() : "screen";
 
     authorStyle = new CSSStyleSelectorList();
     authorStyle->append( sheet, m_medium );
 }
 
-void CSSStyleSelector::init(const KHTMLSettings* _settings, DocumentImpl* doc)
+void CSSStyleSelector::init(const TDEHTMLSettings* _settings, DocumentImpl* doc)
 {
     element = 0;
     settings = _settings;
@@ -308,17 +308,17 @@ CSSStyleSelector::~CSSStyleSelector()
 
 void CSSStyleSelector::addSheet( CSSStyleSheetImpl *sheet )
 {
-    KHTMLView *view = sheet->doc()->view();
+    TDEHTMLView *view = sheet->doc()->view();
     m_medium = view ? view->mediaType() : "screen";
     authorStyle->append( sheet, m_medium );
 }
 
-void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *doc)
+void CSSStyleSelector::loadDefaultStyle(const TDEHTMLSettings *s, DocumentImpl *doc)
 {
     if(s_defaultStyle) return;
 
     {
-	TQFile f(locate( "data", "khtml/css/html4.css" ) );
+	TQFile f(locate( "data", "tdehtml/css/html4.css" ) );
 	f.open(IO_ReadOnly);
 
 	TQCString file( f.size()+1 );
@@ -343,7 +343,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
 	s_defaultPrintStyle->append( s_defaultSheet, "print" );
     }
     {
-	TQFile f(locate( "data", "khtml/css/quirks.css" ) );
+	TQFile f(locate( "data", "tdehtml/css/quirks.css" ) );
 	f.open(IO_ReadOnly);
 
 	TQCString file( f.size()+1 );
@@ -415,7 +415,7 @@ void CSSStyleSelector::computeFontSizesFor(TQPaintDeviceMetrics* paintDeviceMetr
     static const float fontFactors[] =      {3./5., 3./4., 8./9., 1., 6./5., 3./2., 2., 3.};
     static const float smallFontFactors[] = {3./4., 5./6., 8./9., 1., 6./5., 3./2., 2., 3.};
     float mediumFontSize, minFontSize, factor;
-    if (!khtml::printpainter) {
+    if (!tdehtml::printpainter) {
         scale *= zoomFactor / 100.0;
 #ifdef APPLE_CHANGES
 	if (isFixed)
@@ -883,9 +883,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
         cleanpath( u );
     }
     //completeURL( attr.string() );
-    bool contains = KHTMLFactory::vLinks()->contains( u );
+    bool contains = TDEHTMLFactory::vLinks()->contains( u );
     if ( !contains && u.contains('/')==2 )
-      contains = KHTMLFactory::vLinks()->contains( u+'/' );
+      contains = TDEHTMLFactory::vLinks()->contains( u+'/' );
     return contains ? PseudoVisited : PseudoLink;
 }
 
@@ -2076,7 +2076,7 @@ static TQColor colorForCSSValue( int css_value )
 	else if ( css_value == CSS_VAL_INFOTEXT )
 	    return TQToolTip::palette().inactive().foreground();
 	else if ( css_value == CSS_VAL_BACKGROUND ) {
-	    KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
+	    TDEConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
 	    bckgrConfig.setGroup("Desktop0");
 	    // Desktop background.
 	    return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
@@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value )
     TQColor c = pal.color( uicol->group, uicol->role );
 #ifndef APPLE_CHANGES
     if ( uicol->configEntry ) {
-	KConfig *globalConfig = KGlobal::config();
+	TDEConfig *globalConfig = TDEGlobal::config();
 	globalConfig->setGroup( uicol->configGroup );
 	c = globalConfig->readColorEntry( uicol->configEntry, &c );
     }
@@ -2136,9 +2136,9 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
                      (!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT);
 
     // These properties are used to set the correct margins/padding on RTL lists.
-    if (id == CSS_PROP__KHTML_MARGIN_START)
+    if (id == CSS_PROP__TDEHTML_MARGIN_START)
         id = style->direction() == LTR ? CSS_PROP_MARGIN_LEFT : CSS_PROP_MARGIN_RIGHT;
-    else if (id == CSS_PROP__KHTML_PADDING_START)
+    else if (id == CSS_PROP__TDEHTML_PADDING_START)
         id = style->direction() == LTR ? CSS_PROP_PADDING_LEFT : CSS_PROP_PADDING_RIGHT;
 
     // What follows is a list that maps the CSS properties into their corresponding front-end
@@ -2150,16 +2150,16 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
     case CSS_PROP_BACKGROUND_ATTACHMENT:
         HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value)
         break;
-    case CSS_PROP__KHTML_BACKGROUND_CLIP:
+    case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
         HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value)
         break;
-    case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
+    case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
         HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value)
         break;
     case CSS_PROP_BACKGROUND_REPEAT:
         HANDLE_BACKGROUND_VALUE(backgroundRepeat, BackgroundRepeat, value)
         break;
-    case CSS_PROP__KHTML_BACKGROUND_SIZE:
+    case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
         HANDLE_BACKGROUND_VALUE(backgroundSize, BackgroundSize, value)
         break;
     case CSS_PROP_BORDER_COLLAPSE:
@@ -2181,27 +2181,27 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
     case CSS_PROP_BORDER_TOP_STYLE:
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderTopStyle, BorderTopStyle, BorderStyle)
         if (!primitiveValue) return;
-        style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+        style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
         break;
     case CSS_PROP_BORDER_RIGHT_STYLE:
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderRightStyle, BorderRightStyle, BorderStyle)
         if (!primitiveValue) return;
-        style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+        style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
         break;
     case CSS_PROP_BORDER_BOTTOM_STYLE:
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderBottomStyle, BorderBottomStyle, BorderStyle)
         if (!primitiveValue) return;
-        style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+        style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
         break;
     case CSS_PROP_BORDER_LEFT_STYLE:
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderLeftStyle, BorderLeftStyle, BorderStyle)
         if (!primitiveValue) return;
-        style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+        style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
         break;
     case CSS_PROP_OUTLINE_STYLE:
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle)
         if (!primitiveValue) return;
-        style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
+        style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
         break;
     case CSS_PROP_CAPTION_SIDE:
     {
@@ -2279,11 +2279,11 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         EFloat f;
         switch(primitiveValue->getIdent())
         {
-        case CSS_VAL__KHTML_LEFT:
+        case CSS_VAL__TDEHTML_LEFT:
             f = FLEFT_ALIGN; break;
         case CSS_VAL_LEFT:
             f = FLEFT; break;
-        case CSS_VAL__KHTML_RIGHT:
+        case CSS_VAL__TDEHTML_RIGHT:
             f = FRIGHT_ALIGN; break;
         case CSS_VAL_RIGHT:
             f = FRIGHT; break;
@@ -2659,8 +2659,8 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
 
         EWhiteSpace s;
         switch(primitiveValue->getIdent()) {
-        case CSS_VAL__KHTML_NOWRAP:
-            s = KHTML_NOWRAP;
+        case CSS_VAL__TDEHTML_NOWRAP:
+            s = TDEHTML_NOWRAP;
             break;
         case CSS_VAL_NOWRAP:
             s = NOWRAP;
@@ -2700,14 +2700,14 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         style->setBorderVerticalSpacing(parentStyle->borderVerticalSpacing());
         break;
     }
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: {
+    case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: {
         HANDLE_INHERIT_AND_INITIAL(borderHorizontalSpacing, BorderHorizontalSpacing)
         if (!primitiveValue) break;
         short spacing =  primitiveValue->computeLength(style, paintDeviceMetrics);
         style->setBorderHorizontalSpacing(spacing);
         break;
     }
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: {
+    case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: {
         HANDLE_INHERIT_AND_INITIAL(borderVerticalSpacing, BorderVerticalSpacing)
         if (!primitiveValue) break;
         short spacing =  primitiveValue->computeLength(style, paintDeviceMetrics);
@@ -2759,7 +2759,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
 		return;
 	    int ident = primitiveValue->getIdent();
 	    if ( ident ) {
-		if ( ident == CSS_VAL__KHTML_TEXT )
+		if ( ident == CSS_VAL__TDEHTML_TEXT )
 		    col = element->getDocument()->textColor();
   		// ### should be eliminated
 		else if ( ident == CSS_VAL_TRANSPARENT
@@ -3132,7 +3132,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         HANDLE_INHERIT_AND_INITIAL(verticalAlign, VerticalAlign)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent()) {
-	  khtml::EVerticalAlign align;
+	  tdehtml::EVerticalAlign align;
 
 	  switch(primitiveValue->getIdent())
 	    {
@@ -3152,7 +3152,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
 		    align = SUB; break;
 		case CSS_VAL_SUPER:
 		    align = SUPER; break;
-		case CSS_VAL__KHTML_BASELINE_MIDDLE:
+		case CSS_VAL__TDEHTML_BASELINE_MIDDLE:
 		    align = BASELINE_MIDDLE; break;
 		default:
 		    return;
@@ -3210,7 +3210,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
             case CSS_VAL_LARGE:    size = int( fontSizes[4] ); break;
             case CSS_VAL_X_LARGE:  size = int( fontSizes[5] ); break;
             case CSS_VAL_XX_LARGE: size = int( fontSizes[6] ); break;
-            case CSS_VAL__KHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
+            case CSS_VAL__TDEHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
             case CSS_VAL_LARGER:
                 size = nextFontSize(fontSizes, oldSize, false);
                 break;
@@ -3224,7 +3224,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         } else {
             int type = primitiveValue->primitiveType();
             if(type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG) {
-                if ( !khtml::printpainter && type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS &&
+                if ( !tdehtml::printpainter && type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS &&
                      view && view->part())
                     size = int( primitiveValue->computeLengthFloat(parentStyle, paintDeviceMetrics) *
                                 view->part()->zoomFactor() ) / 100;
@@ -3304,7 +3304,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         else if (type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG) {
             // Scale for the font zoom factor only for types other than "em" and "ex", since those are
             // already based on the font size.
-		if ( !khtml::printpainter && type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS &&
+		if ( !tdehtml::printpainter && type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS &&
                     view && view->part())
                     lineHeight = Length(primitiveValue->computeLength(style, paintDeviceMetrics) *
                                         view->part()->zoomFactor()/100, Fixed );
@@ -3326,7 +3326,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent())
-            style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO) );
+            style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__TDEHTML_AUTO) );
 	return;
     }
 
@@ -3581,15 +3581,15 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
 	style->setTextDecoration(t);
         break;
     }
-    case CSS_PROP__KHTML_FLOW_MODE:
+    case CSS_PROP__TDEHTML_FLOW_MODE:
         HANDLE_INHERIT_AND_INITIAL(flowAroundFloats, FlowAroundFloats)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent()) {
-            style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KHTML_AROUND_FLOATS );
+            style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__TDEHTML_AROUND_FLOATS );
             return;
         }
         break;
-    case CSS_PROP__KHTML_USER_INPUT: {
+    case CSS_PROP__TDEHTML_USER_INPUT: {
         if(value->cssValueType() == CSSValue::CSS_INHERIT)
         {
             if(!parentNode) return;
@@ -3821,7 +3821,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
             int x = item->x->computeLength(style, paintDeviceMetrics);
             int y = item->y->computeLength(style, paintDeviceMetrics);
             int blur = item->blur ? item->blur->computeLength(style, paintDeviceMetrics) : 0;
-            TQColor col = khtml::transparentColor;
+            TQColor col = tdehtml::transparentColor;
             if (item->color) {
                 int ident = item->color->getIdent();
                 if (ident)
@@ -3843,7 +3843,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         // Clamp opacity to the range 0-1
         style->setOpacity(kMin(1.0f, kMax(0.0f, (float)primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))));
         break;
-    case CSS_PROP__KHTML_MARQUEE:
+    case CSS_PROP__TDEHTML_MARQUEE:
         if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return;
         style->setMarqueeDirection(parentStyle->marqueeDirection());
         style->setMarqueeIncrement(parentStyle->marqueeIncrement());
@@ -3851,7 +3851,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         style->setMarqueeLoopCount(parentStyle->marqueeLoopCount());
         style->setMarqueeBehavior(parentStyle->marqueeBehavior());
         break;
-    case CSS_PROP__KHTML_MARQUEE_REPETITION: {
+    case CSS_PROP__TDEHTML_MARQUEE_REPETITION: {
         HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent() == CSS_VAL_INFINITE)
@@ -3860,7 +3860,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
             style->setMarqueeLoopCount((int)(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE_SPEED: {
+    case CSS_PROP__TDEHTML_MARQUEE_SPEED: {
         HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent()) {
@@ -3885,7 +3885,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
             style->setMarqueeSpeed(int(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT: {
+    case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: {
         HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement)
         if (!primitiveValue) return;
         if (primitiveValue->getIdent()) {
@@ -3910,7 +3910,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         }
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE_STYLE: {
+    case CSS_PROP__TDEHTML_MARQUEE_STYLE: {
         HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior)
         if (!primitiveValue || !primitiveValue->getIdent()) return;
         switch (primitiveValue->getIdent())
@@ -3933,7 +3933,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         }
         break;
     }
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION: {
+    case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: {
         HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection)
         if (!primitiveValue || !primitiveValue->getIdent()) return;
         switch (primitiveValue->getIdent())
@@ -3964,7 +3964,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         }
         break;
     case CSS_PROP_TEXT_OVERFLOW: {
-        // This property is supported by WinIE, and so we leave off the "-khtml-" in order to
+        // This property is supported by WinIE, and so we leave off the "-tdehtml-" in order to
         // work with WinIE-specific pages that use the property.
         HANDLE_INHERIT_AND_INITIAL(textOverflow, TextOverflow)
         if (!primitiveValue || !primitiveValue->getIdent())
@@ -4214,4 +4214,4 @@ void CSSStyleSelector::checkForGenericFamilyChange(RenderStyle* aStyle, RenderSt
 }
 #endif
 
-} // namespace khtml
+} // namespace tdehtml
diff --git a/khtml/css/cssstyleselector.h b/tdehtml/css/cssstyleselector.h
index 1b076337e..f826c0323 100644
--- a/khtml/css/cssstyleselector.h
+++ b/tdehtml/css/cssstyleselector.h
@@ -30,10 +30,10 @@
 #include "dom/dom_string.h"
 #include "xml/dom_restyler.h"
 
-class KHTMLSettings;
-class KHTMLView;
-class KHTMLPart;
-class KHTMLFactory;
+class TDEHTMLSettings;
+class TDEHTMLView;
+class TDEHTMLPart;
+class TDEHTMLFactory;
 class KURL;
 
 namespace DOM {
@@ -50,7 +50,7 @@ namespace DOM {
     class CSSValueImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
     class CSSStyleSelectorList;
     class CSSOrderedRule;
@@ -127,7 +127,7 @@ namespace khtml
         KDE_EXPORT static void clear();
         static void reparseConfiguration();
 
-	static void loadDefaultStyle(const KHTMLSettings *s, DOM::DocumentImpl *doc);
+	static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc);
 
 	RenderStyle *styleForElement(DOM::ElementImpl *e);
 
@@ -189,7 +189,7 @@ namespace khtml
 public:
 
     private:
-        void init(const KHTMLSettings* settings, DOM::DocumentImpl* doc);
+        void init(const TDEHTMLSettings* settings, DOM::DocumentImpl* doc);
 
         void mapBackgroundAttachment(BackgroundLayer* layer, DOM::CSSValueImpl* value);
         void mapBackgroundClip(BackgroundLayer* layer, DOM::CSSValueImpl* value);
@@ -246,9 +246,9 @@ public:
 	RenderStyle *parentStyle;
 	DOM::ElementImpl *element;
 	DOM::NodeImpl *parentNode;
-	KHTMLView *view;
-	KHTMLPart *part;
-	const KHTMLSettings *settings;
+	TDEHTMLView *view;
+	TDEHTMLPart *part;
+	const TDEHTMLSettings *settings;
 	TQPaintDeviceMetrics *paintDeviceMetrics;
         TQValueVector<int>     m_fontSizes;
 	TQValueVector<int>     m_fixedFontSizes;
diff --git a/khtml/css/cssvalues.c b/tdehtml/css/cssvalues.c
index 7368d1869..a90b32120 100644
--- a/khtml/css/cssvalues.c
+++ b/tdehtml/css/cssvalues.c
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.2 */
+/* ANSI-C code produced by gperf version 3.0.3 */
 /* Command-line: gperf -L ANSI-C -E -c -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -40,7 +40,7 @@ struct css_value {
 };
 
 static const css_value* findValue (register const char *str, register unsigned int len);
-/* maximum key range = 2876, duplicates = 0 */
+/* maximum key range = 2576, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -54,38 +54,44 @@ hash_val (register const char *str, register unsigned int len)
 {
   static const unsigned short asso_values[] =
     {
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876,  420,   23, 2876,    0,    0,
-       105,  100,   40,   35,   20,   15,   10,    5, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876,  175,   60,    0,
-        20,   45,   18,  380,  270,    5,    3,   65,    0,   35,
-         0,    5,  265,  465,  100,   20,    5,  195,   18,   13,
-         3,  133,   10, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
-      2876, 2876, 2876, 2876, 2876, 2876, 2876
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576,   80,  315, 2576,    0,    0,
+       105,  100,   40,   35,   20,   15,   10,    5, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576,  175,   60,    0,
+        20,   45,   23,  340,  160,    5,   73,   35,    0,   35,
+         0,    5,    3,  108,  100,   20,    5,  300,  203,  350,
+       460,   18,  425, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
+      2576, 2576, 2576, 2576, 2576, 2576, 2576
     };
   register int hval = 0;
 
   switch (len)
     {
       default:
+        hval += asso_values[(unsigned char)str[29]];
+      /*FALLTHROUGH*/
+      case 29:
+        hval += asso_values[(unsigned char)str[28]];
+      /*FALLTHROUGH*/
+      case 28:
         hval += asso_values[(unsigned char)str[27]];
       /*FALLTHROUGH*/
       case 27:
@@ -175,6 +181,9 @@ hash_val (register const char *str, register unsigned int len)
 
 #ifdef __GNUC__
 __inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
 #endif
 const struct css_value *
 findValue (register const char *str, register unsigned int len)
@@ -183,9 +192,9 @@ findValue (register const char *str, register unsigned int len)
     {
       TOTAL_KEYWORDS = 275,
       MIN_WORD_LENGTH = 2,
-      MAX_WORD_LENGTH = 28,
+      MAX_WORD_LENGTH = 30,
       MIN_HASH_VALUE = 0,
-      MAX_HASH_VALUE = 2875
+      MAX_HASH_VALUE = 2575
     };
 
   static const struct css_value wordlist_value[] =
@@ -194,6 +203,8 @@ findValue (register const char *str, register unsigned int len)
       {"100", CSS_VAL_100},
 #line 48 "cssvalues.gperf"
       {"900", CSS_VAL_900},
+#line 28 "cssvalues.gperf"
+      {"icon", CSS_VAL_ICON},
 #line 47 "cssvalues.gperf"
       {"800", CSS_VAL_800},
 #line 46 "cssvalues.gperf"
@@ -202,773 +213,748 @@ findValue (register const char *str, register unsigned int len)
       {"600", CSS_VAL_600},
 #line 216 "cssvalues.gperf"
       {"ltr", CSS_VAL_LTR},
-#line 277 "cssvalues.gperf"
-      {"down", CSS_VAL_DOWN},
 #line 146 "cssvalues.gperf"
       {"disc", CSS_VAL_DISC},
 #line 44 "cssvalues.gperf"
       {"500", CSS_VAL_500},
 #line 43 "cssvalues.gperf"
       {"400", CSS_VAL_400},
-#line 252 "cssvalues.gperf"
-      {"loud", CSS_VAL_LOUD},
 #line 259 "cssvalues.gperf"
       {"scroll", CSS_VAL_SCROLL},
 #line 83 "cssvalues.gperf"
       {"lime", CSS_VAL_LIME},
 #line 17 "cssvalues.gperf"
       {"none", CSS_VAL_NONE},
+#line 255 "cssvalues.gperf"
+      {"mix", CSS_VAL_MIX},
 #line 19 "cssvalues.gperf"
       {"inset", CSS_VAL_INSET},
-#line 118 "cssvalues.gperf"
-      {"window", CSS_VAL_WINDOW},
 #line 287 "cssvalues.gperf"
       {"content", CSS_VAL_CONTENT},
 #line 147 "cssvalues.gperf"
       {"circle", CSS_VAL_CIRCLE},
-#line 86 "cssvalues.gperf"
-      {"olive", CSS_VAL_OLIVE},
+#line 213 "cssvalues.gperf"
+      {"text", CSS_VAL_TEXT},
 #line 33 "cssvalues.gperf"
       {"italic", CSS_VAL_ITALIC},
+#line 284 "cssvalues.gperf"
+      {"clip", CSS_VAL_CLIP},
 #line 145 "cssvalues.gperf"
       {"inside", CSS_VAL_INSIDE},
+#line 149 "cssvalues.gperf"
+      {"box", CSS_VAL_BOX},
 #line 25 "cssvalues.gperf"
       {"solid", CSS_VAL_SOLID},
-#line 281 "cssvalues.gperf"
-      {"slide", CSS_VAL_SLIDE},
 #line 183 "cssvalues.gperf"
       {"inline", CSS_VAL_INLINE},
 #line 262 "cssvalues.gperf"
       {"static", CSS_VAL_STATIC},
-#line 204 "cssvalues.gperf"
-      {"move", CSS_VAL_MOVE},
+#line 184 "cssvalues.gperf"
+      {"block", CSS_VAL_BLOCK},
 #line 42 "cssvalues.gperf"
       {"300", CSS_VAL_300},
-#line 250 "cssvalues.gperf"
-      {"level", CSS_VAL_LEVEL},
 #line 41 "cssvalues.gperf"
       {"200", CSS_VAL_200},
-#line 69 "cssvalues.gperf"
-      {"serif", CSS_VAL_SERIF},
+#line 241 "cssvalues.gperf"
+      {"crop", CSS_VAL_CROP},
 #line 91 "cssvalues.gperf"
       {"teal", CSS_VAL_TEAL},
+#line 244 "cssvalues.gperf"
+      {"fixed", CSS_VAL_FIXED},
+#line 69 "cssvalues.gperf"
+      {"serif", CSS_VAL_SERIF},
 #line 51 "cssvalues.gperf"
       {"small", CSS_VAL_SMALL},
-#line 120 "cssvalues.gperf"
-      {"windowtext", CSS_VAL_WINDOWTEXT},
+#line 133 "cssvalues.gperf"
+      {"top", CSS_VAL_TOP},
 #line 37 "cssvalues.gperf"
       {"bold", CSS_VAL_BOLD},
-#line 77 "cssvalues.gperf"
-      {"blue", CSS_VAL_BLUE},
-#line 239 "cssvalues.gperf"
-      {"blink", CSS_VAL_BLINK},
-#line 221 "cssvalues.gperf"
-      {"visible", CSS_VAL_VISIBLE},
+#line 228 "cssvalues.gperf"
+      {"pre", CSS_VAL_PRE},
+#line 285 "cssvalues.gperf"
+      {"ellipsis", CSS_VAL_ELLIPSIS},
 #line 217 "cssvalues.gperf"
       {"rtl", CSS_VAL_RTL},
+#line 242 "cssvalues.gperf"
+      {"cross", CSS_VAL_CROSS},
 #line 243 "cssvalues.gperf"
       {"embed", CSS_VAL_EMBED},
-#line 26 "cssvalues.gperf"
-      {"double", CSS_VAL_DOUBLE},
 #line 128 "cssvalues.gperf"
       {"middle", CSS_VAL_MIDDLE},
-#line 253 "cssvalues.gperf"
-      {"lower", CSS_VAL_LOWER},
-#line 237 "cssvalues.gperf"
-      {"below", CSS_VAL_BELOW},
+#line 76 "cssvalues.gperf"
+      {"black", CSS_VAL_BLACK},
+#line 281 "cssvalues.gperf"
+      {"slide", CSS_VAL_SLIDE},
 #line 63 "cssvalues.gperf"
       {"condensed", CSS_VAL_CONDENSED},
-#line 78 "cssvalues.gperf"
-      {"crimson", CSS_VAL_CRIMSON},
 #line 14 "cssvalues.gperf"
       {"inherit", CSS_VAL_INHERIT},
-#line 248 "cssvalues.gperf"
-      {"invert", CSS_VAL_INVERT},
-#line 255 "cssvalues.gperf"
-      {"mix", CSS_VAL_MIX},
-#line 76 "cssvalues.gperf"
-      {"black", CSS_VAL_BLACK},
-#line 213 "cssvalues.gperf"
-      {"text", CSS_VAL_TEXT},
+#line 131 "cssvalues.gperf"
+      {"text-top", CSS_VAL_TEXT_TOP},
+#line 239 "cssvalues.gperf"
+      {"blink", CSS_VAL_BLINK},
+#line 185 "cssvalues.gperf"
+      {"list-item", CSS_VAL_LIST_ITEM},
+#line 187 "cssvalues.gperf"
+      {"compact", CSS_VAL_COMPACT},
 #line 89 "cssvalues.gperf"
       {"red", CSS_VAL_RED},
-#line 256 "cssvalues.gperf"
-      {"overline", CSS_VAL_OVERLINE},
-#line 15 "cssvalues.gperf"
-      {"initial", CSS_VAL_INITIAL},
-#line 214 "cssvalues.gperf"
-      {"wait", CSS_VAL_WAIT},
-#line 149 "cssvalues.gperf"
-      {"box", CSS_VAL_BOX},
 #line 139 "cssvalues.gperf"
       {"center", CSS_VAL_CENTER},
 #line 279 "cssvalues.gperf"
       {"fast", CSS_VAL_FAST},
-#line 59 "cssvalues.gperf"
-      {"wider", CSS_VAL_WIDER},
-#line 129 "cssvalues.gperf"
-      {"sub", CSS_VAL_SUB},
-#line 244 "cssvalues.gperf"
-      {"fixed", CSS_VAL_FIXED},
-#line 90 "cssvalues.gperf"
-      {"silver", CSS_VAL_SILVER},
 #line 189 "cssvalues.gperf"
       {"table", CSS_VAL_TABLE},
+#line 252 "cssvalues.gperf"
+      {"loud", CSS_VAL_LOUD},
 #line 270 "cssvalues.gperf"
       {"enabled", CSS_VAL_ENABLED},
-#line 93 "cssvalues.gperf"
-      {"yellow", CSS_VAL_YELLOW},
+#line 202 "cssvalues.gperf"
+      {"pointer", CSS_VAL_POINTER},
+#line 78 "cssvalues.gperf"
+      {"crimson", CSS_VAL_CRIMSON},
 #line 36 "cssvalues.gperf"
       {"normal", CSS_VAL_NORMAL},
+#line 264 "cssvalues.gperf"
+      {"thin", CSS_VAL_THIN},
 #line 84 "cssvalues.gperf"
       {"maroon", CSS_VAL_MAROON},
+#line 215 "cssvalues.gperf"
+      {"help", CSS_VAL_HELP},
 #line 286 "cssvalues.gperf"
       {"border", CSS_VAL_BORDER},
-#line 49 "cssvalues.gperf"
-      {"xx-small", CSS_VAL_XX_SMALL},
+#line 246 "cssvalues.gperf"
+      {"hide", CSS_VAL_HIDE},
+#line 230 "cssvalues.gperf"
+      {"pre-line", CSS_VAL_PRE_LINE},
 #line 57 "cssvalues.gperf"
       {"smaller", CSS_VAL_SMALLER},
-#line 207 "cssvalues.gperf"
-      {"nw-resize", CSS_VAL_NW_RESIZE},
+#line 15 "cssvalues.gperf"
+      {"initial", CSS_VAL_INITIAL},
 #line 38 "cssvalues.gperf"
       {"bolder", CSS_VAL_BOLDER},
-#line 284 "cssvalues.gperf"
-      {"clip", CSS_VAL_CLIP},
-#line 28 "cssvalues.gperf"
-      {"icon", CSS_VAL_ICON},
-#line 264 "cssvalues.gperf"
-      {"thin", CSS_VAL_THIN},
-#line 29 "cssvalues.gperf"
-      {"menu", CSS_VAL_MENU},
-#line 210 "cssvalues.gperf"
-      {"sw-resize", CSS_VAL_SW_RESIZE},
-#line 23 "cssvalues.gperf"
-      {"dotted", CSS_VAL_DOTTED},
-#line 206 "cssvalues.gperf"
-      {"ne-resize", CSS_VAL_NE_RESIZE},
-#line 278 "cssvalues.gperf"
-      {"slow", CSS_VAL_SLOW},
+#line 132 "cssvalues.gperf"
+      {"text-bottom", CSS_VAL_TEXT_BOTTOM},
+#line 188 "cssvalues.gperf"
+      {"inline-block", CSS_VAL_INLINE_BLOCK},
+#line 263 "cssvalues.gperf"
+      {"thick", CSS_VAL_THICK},
+#line 18 "cssvalues.gperf"
+      {"hidden", CSS_VAL_HIDDEN},
+#line 222 "cssvalues.gperf"
+      {"collapse", CSS_VAL_COLLAPSE},
+#line 73 "cssvalues.gperf"
+      {"monospace", CSS_VAL_MONOSPACE},
+#line 27 "cssvalues.gperf"
+      {"caption", CSS_VAL_CAPTION},
 #line 151 "cssvalues.gperf"
       {"decimal", CSS_VAL_DECIMAL},
-#line 71 "cssvalues.gperf"
-      {"cursive", CSS_VAL_CURSIVE},
-#line 134 "cssvalues.gperf"
-      {"bottom", CSS_VAL_BOTTOM},
-#line 209 "cssvalues.gperf"
-      {"se-resize", CSS_VAL_SE_RESIZE},
-#line 85 "cssvalues.gperf"
-      {"navy", CSS_VAL_NAVY},
+#line 276 "cssvalues.gperf"
+      {"up", CSS_VAL_UP},
+#line 64 "cssvalues.gperf"
+      {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
+#line 77 "cssvalues.gperf"
+      {"blue", CSS_VAL_BLUE},
+#line 257 "cssvalues.gperf"
+      {"portrait", CSS_VAL_PORTRAIT},
+#line 129 "cssvalues.gperf"
+      {"sub", CSS_VAL_SUB},
+#line 221 "cssvalues.gperf"
+      {"visible", CSS_VAL_VISIBLE},
+#line 86 "cssvalues.gperf"
+      {"olive", CSS_VAL_OLIVE},
 #line 271 "cssvalues.gperf"
       {"disabled", CSS_VAL_DISABLED},
+#line 26 "cssvalues.gperf"
+      {"double", CSS_VAL_DOUBLE},
 #line 127 "cssvalues.gperf"
       {"baseline", CSS_VAL_BASELINE},
-#line 92 "cssvalues.gperf"
-      {"white", CSS_VAL_WHITE},
-#line 111 "cssvalues.gperf"
-      {"menutext", CSS_VAL_MENUTEXT},
-#line 263 "cssvalues.gperf"
-      {"thick", CSS_VAL_THICK},
-#line 52 "cssvalues.gperf"
-      {"medium", CSS_VAL_MEDIUM},
-#line 140 "cssvalues.gperf"
-      {"justify", CSS_VAL_JUSTIFY},
-#line 246 "cssvalues.gperf"
-      {"hide", CSS_VAL_HIDE},
-#line 275 "cssvalues.gperf"
-      {"reverse", CSS_VAL_REVERSE},
-#line 272 "cssvalues.gperf"
-      {"forwards", CSS_VAL_FORWARDS},
+#line 197 "cssvalues.gperf"
+      {"table-cell", CSS_VAL_TABLE_CELL},
+#line 245 "cssvalues.gperf"
+      {"hand", CSS_VAL_HAND},
+#line 88 "cssvalues.gperf"
+      {"purple", CSS_VAL_PURPLE},
+#line 278 "cssvalues.gperf"
+      {"slow", CSS_VAL_SLOW},
 #line 112 "cssvalues.gperf"
       {"scrollbar", CSS_VAL_SCROLLBAR},
-#line 228 "cssvalues.gperf"
-      {"pre", CSS_VAL_PRE},
-#line 18 "cssvalues.gperf"
-      {"hidden", CSS_VAL_HIDDEN},
-#line 184 "cssvalues.gperf"
-      {"block", CSS_VAL_BLOCK},
-#line 220 "cssvalues.gperf"
-      {"lowercase", CSS_VAL_LOWERCASE},
-#line 285 "cssvalues.gperf"
-      {"ellipsis", CSS_VAL_ELLIPSIS},
-#line 242 "cssvalues.gperf"
-      {"cross", CSS_VAL_CROSS},
-#line 202 "cssvalues.gperf"
-      {"pointer", CSS_VAL_POINTER},
-#line 258 "cssvalues.gperf"
-      {"relative", CSS_VAL_RELATIVE},
+#line 256 "cssvalues.gperf"
+      {"overline", CSS_VAL_OVERLINE},
+#line 29 "cssvalues.gperf"
+      {"menu", CSS_VAL_MENU},
+#line 31 "cssvalues.gperf"
+      {"small-caption", CSS_VAL_SMALL_CAPTION},
 #line 137 "cssvalues.gperf"
       {"left", CSS_VAL_LEFT},
-#line 119 "cssvalues.gperf"
-      {"windowframe", CSS_VAL_WINDOWFRAME},
-#line 265 "cssvalues.gperf"
-      {"underline", CSS_VAL_UNDERLINE},
+#line 35 "cssvalues.gperf"
+      {"small-caps", CSS_VAL_SMALL_CAPS},
+#line 23 "cssvalues.gperf"
+      {"dotted", CSS_VAL_DOTTED},
 #line 82 "cssvalues.gperf"
       {"indigo", CSS_VAL_INDIGO},
 #line 280 "cssvalues.gperf"
       {"infinite", CSS_VAL_INFINITE},
-#line 110 "cssvalues.gperf"
-      {"infotext", CSS_VAL_INFOTEXT},
-#line 187 "cssvalues.gperf"
-      {"compact", CSS_VAL_COMPACT},
-#line 60 "cssvalues.gperf"
-      {"narrower", CSS_VAL_NARROWER},
-#line 276 "cssvalues.gperf"
-      {"up", CSS_VAL_UP},
-#line 22 "cssvalues.gperf"
-      {"outset", CSS_VAL_OUTSET},
-#line 106 "cssvalues.gperf"
-      {"inactiveborder", CSS_VAL_INACTIVEBORDER},
-#line 245 "cssvalues.gperf"
-      {"hand", CSS_VAL_HAND},
-#line 161 "cssvalues.gperf"
-      {"hebrew", CSS_VAL_HEBREW},
-#line 133 "cssvalues.gperf"
-      {"top", CSS_VAL_TOP},
 #line 236 "cssvalues.gperf"
       {"avoid", CSS_VAL_AVOID},
-#line 144 "cssvalues.gperf"
-      {"outside", CSS_VAL_OUTSIDE},
-#line 234 "cssvalues.gperf"
-      {"absolute", CSS_VAL_ABSOLUTE},
-#line 162 "cssvalues.gperf"
-      {"armenian", CSS_VAL_ARMENIAN},
-#line 235 "cssvalues.gperf"
-      {"always", CSS_VAL_ALWAYS},
-#line 101 "cssvalues.gperf"
-      {"buttontext", CSS_VAL_BUTTONTEXT},
-#line 185 "cssvalues.gperf"
-      {"list-item", CSS_VAL_LIST_ITEM},
-#line 240 "cssvalues.gperf"
-      {"both", CSS_VAL_BOTH},
+#line 90 "cssvalues.gperf"
+      {"silver", CSS_VAL_SILVER},
+#line 134 "cssvalues.gperf"
+      {"bottom", CSS_VAL_BOTTOM},
 #line 72 "cssvalues.gperf"
       {"fantasy", CSS_VAL_FANTASY},
 #line 24 "cssvalues.gperf"
       {"dashed", CSS_VAL_DASHED},
-#line 81 "cssvalues.gperf"
-      {"green", CSS_VAL_GREEN},
-#line 222 "cssvalues.gperf"
-      {"collapse", CSS_VAL_COLLAPSE},
-#line 227 "cssvalues.gperf"
-      {"nowrap", CSS_VAL_NOWRAP},
-#line 269 "cssvalues.gperf"
-      {"content-box", CSS_VAL_CONTENT_BOX},
-#line 73 "cssvalues.gperf"
-      {"monospace", CSS_VAL_MONOSPACE},
+#line 140 "cssvalues.gperf"
+      {"justify", CSS_VAL_JUSTIFY},
+#line 138 "cssvalues.gperf"
+      {"right", CSS_VAL_RIGHT},
+#line 204 "cssvalues.gperf"
+      {"move", CSS_VAL_MOVE},
+#line 250 "cssvalues.gperf"
+      {"level", CSS_VAL_LEVEL},
+#line 249 "cssvalues.gperf"
+      {"landscape", CSS_VAL_LANDSCAPE},
+#line 93 "cssvalues.gperf"
+      {"yellow", CSS_VAL_YELLOW},
+#line 190 "cssvalues.gperf"
+      {"inline-table", CSS_VAL_INLINE_TABLE},
+#line 52 "cssvalues.gperf"
+      {"medium", CSS_VAL_MEDIUM},
+#line 39 "cssvalues.gperf"
+      {"lighter", CSS_VAL_LIGHTER},
+#line 123 "cssvalues.gperf"
+      {"repeat", CSS_VAL_REPEAT},
+#line 121 "cssvalues.gperf"
+      {"grey", CSS_VAL_GREY},
+#line 277 "cssvalues.gperf"
+      {"down", CSS_VAL_DOWN},
 #line 233 "cssvalues.gperf"
       {"above", CSS_VAL_ABOVE},
-#line 208 "cssvalues.gperf"
-      {"n-resize", CSS_VAL_N_RESIZE},
+#line 186 "cssvalues.gperf"
+      {"run-in", CSS_VAL_RUN_IN},
+#line 70 "cssvalues.gperf"
+      {"sans-serif", CSS_VAL_SANS_SERIF},
+#line 237 "cssvalues.gperf"
+      {"below", CSS_VAL_BELOW},
+#line 198 "cssvalues.gperf"
+      {"table-caption", CSS_VAL_TABLE_CAPTION},
+#line 162 "cssvalues.gperf"
+      {"armenian", CSS_VAL_ARMENIAN},
+#line 248 "cssvalues.gperf"
+      {"invert", CSS_VAL_INVERT},
+#line 81 "cssvalues.gperf"
+      {"green", CSS_VAL_GREEN},
+#line 74 "cssvalues.gperf"
+      {"transparent", CSS_VAL_TRANSPARENT},
+#line 107 "cssvalues.gperf"
+      {"inactivecaption", CSS_VAL_INACTIVECAPTION},
+#line 80 "cssvalues.gperf"
+      {"gray", CSS_VAL_GRAY},
+#line 240 "cssvalues.gperf"
+      {"both", CSS_VAL_BOTH},
+#line 141 "cssvalues.gperf"
+      {"-tdehtml-left", CSS_VAL__TDEHTML_LEFT},
 #line 261 "cssvalues.gperf"
       {"show", CSS_VAL_SHOW},
-#line 199 "cssvalues.gperf"
-      {"auto", CSS_VAL_AUTO},
 #line 21 "cssvalues.gperf"
       {"ridge", CSS_VAL_RIDGE},
-#line 212 "cssvalues.gperf"
-      {"w-resize", CSS_VAL_W_RESIZE},
-#line 257 "cssvalues.gperf"
-      {"portrait", CSS_VAL_PORTRAIT},
-#line 211 "cssvalues.gperf"
-      {"s-resize", CSS_VAL_S_RESIZE},
-#line 87 "cssvalues.gperf"
-      {"orange", CSS_VAL_ORANGE},
-#line 107 "cssvalues.gperf"
-      {"inactivecaption", CSS_VAL_INACTIVECAPTION},
-#line 205 "cssvalues.gperf"
-      {"e-resize", CSS_VAL_E_RESIZE},
-#line 215 "cssvalues.gperf"
-      {"help", CSS_VAL_HELP},
-#line 53 "cssvalues.gperf"
-      {"large", CSS_VAL_LARGE},
-#line 241 "cssvalues.gperf"
-      {"crop", CSS_VAL_CROP},
-#line 121 "cssvalues.gperf"
-      {"grey", CSS_VAL_GREY},
-#line 50 "cssvalues.gperf"
-      {"x-small", CSS_VAL_X_SMALL},
-#line 188 "cssvalues.gperf"
-      {"inline-block", CSS_VAL_INLINE_BLOCK},
 #line 114 "cssvalues.gperf"
       {"threedface", CSS_VAL_THREEDFACE},
-#line 64 "cssvalues.gperf"
-      {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
-#line 273 "cssvalues.gperf"
-      {"backwards", CSS_VAL_BACKWARDS},
-#line 138 "cssvalues.gperf"
-      {"right", CSS_VAL_RIGHT},
-#line 108 "cssvalues.gperf"
-      {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
-#line 27 "cssvalues.gperf"
-      {"caption", CSS_VAL_CAPTION},
+#line 265 "cssvalues.gperf"
+      {"underline", CSS_VAL_UNDERLINE},
+#line 85 "cssvalues.gperf"
+      {"navy", CSS_VAL_NAVY},
+#line 59 "cssvalues.gperf"
+      {"wider", CSS_VAL_WIDER},
+#line 87 "cssvalues.gperf"
+      {"orange", CSS_VAL_ORANGE},
 #line 274 "cssvalues.gperf"
       {"ahead", CSS_VAL_AHEAD},
+#line 34 "cssvalues.gperf"
+      {"oblique", CSS_VAL_OBLIQUE},
+#line 130 "cssvalues.gperf"
+      {"super", CSS_VAL_SUPER},
+#line 226 "cssvalues.gperf"
+      {"open-quote", CSS_VAL_OPEN_QUOTE},
+#line 125 "cssvalues.gperf"
+      {"repeat-y", CSS_VAL_REPEAT_Y},
+#line 53 "cssvalues.gperf"
+      {"large", CSS_VAL_LARGE},
+#line 200 "cssvalues.gperf"
+      {"crosshair", CSS_VAL_CROSSHAIR},
+#line 288 "cssvalues.gperf"
+      {"padding", CSS_VAL_PADDING},
+#line 71 "cssvalues.gperf"
+      {"cursive", CSS_VAL_CURSIVE},
+#line 234 "cssvalues.gperf"
+      {"absolute", CSS_VAL_ABSOLUTE},
+#line 214 "cssvalues.gperf"
+      {"wait", CSS_VAL_WAIT},
+#line 253 "cssvalues.gperf"
+      {"lower", CSS_VAL_LOWER},
+#line 223 "cssvalues.gperf"
+      {"close-quote", CSS_VAL_CLOSE_QUOTE},
+#line 258 "cssvalues.gperf"
+      {"relative", CSS_VAL_RELATIVE},
+#line 247 "cssvalues.gperf"
+      {"higher", CSS_VAL_HIGHER},
+#line 203 "cssvalues.gperf"
+      {"progress", CSS_VAL_PROGRESS},
+#line 92 "cssvalues.gperf"
+      {"white", CSS_VAL_WHITE},
+#line 154 "cssvalues.gperf"
+      {"-tdehtml-lao", CSS_VAL__TDEHTML_LAO},
+#line 208 "cssvalues.gperf"
+      {"n-resize", CSS_VAL_N_RESIZE},
+#line 196 "cssvalues.gperf"
+      {"table-column", CSS_VAL_TABLE_COLUMN},
+#line 143 "cssvalues.gperf"
+      {"-tdehtml-center", CSS_VAL__TDEHTML_CENTER},
+#line 148 "cssvalues.gperf"
+      {"square", CSS_VAL_SQUARE},
+#line 106 "cssvalues.gperf"
+      {"inactiveborder", CSS_VAL_INACTIVEBORDER},
+#line 211 "cssvalues.gperf"
+      {"s-resize", CSS_VAL_S_RESIZE},
+#line 75 "cssvalues.gperf"
+      {"aqua", CSS_VAL_AQUA},
+#line 269 "cssvalues.gperf"
+      {"content-box", CSS_VAL_CONTENT_BOX},
+#line 260 "cssvalues.gperf"
+      {"separate", CSS_VAL_SEPARATE},
+#line 22 "cssvalues.gperf"
+      {"outset", CSS_VAL_OUTSET},
+#line 58 "cssvalues.gperf"
+      {"larger", CSS_VAL_LARGER},
+#line 205 "cssvalues.gperf"
+      {"e-resize", CSS_VAL_E_RESIZE},
 #line 126 "cssvalues.gperf"
       {"no-repeat", CSS_VAL_NO_REPEAT},
-#line 80 "cssvalues.gperf"
-      {"gray", CSS_VAL_GRAY},
-#line 197 "cssvalues.gperf"
-      {"table-cell", CSS_VAL_TABLE_CELL},
-#line 39 "cssvalues.gperf"
-      {"lighter", CSS_VAL_LIGHTER},
-#line 98 "cssvalues.gperf"
-      {"buttonface", CSS_VAL_BUTTONFACE},
+#line 144 "cssvalues.gperf"
+      {"outside", CSS_VAL_OUTSIDE},
+#line 20 "cssvalues.gperf"
+      {"groove", CSS_VAL_GROOVE},
+#line 161 "cssvalues.gperf"
+      {"hebrew", CSS_VAL_HEBREW},
 #line 79 "cssvalues.gperf"
       {"fuchsia", CSS_VAL_FUCHSIA},
-#line 249 "cssvalues.gperf"
-      {"landscape", CSS_VAL_LANDSCAPE},
+#line 275 "cssvalues.gperf"
+      {"reverse", CSS_VAL_REVERSE},
+#line 272 "cssvalues.gperf"
+      {"forwards", CSS_VAL_FORWARDS},
+#line 150 "cssvalues.gperf"
+      {"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
+#line 238 "cssvalues.gperf"
+      {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
+#line 254 "cssvalues.gperf"
+      {"marquee", CSS_VAL_MARQUEE},
+#line 118 "cssvalues.gperf"
+      {"window", CSS_VAL_WINDOW},
+#line 227 "cssvalues.gperf"
+      {"nowrap", CSS_VAL_NOWRAP},
+#line 158 "cssvalues.gperf"
+      {"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
+#line 50 "cssvalues.gperf"
+      {"x-small", CSS_VAL_X_SMALL},
+#line 194 "cssvalues.gperf"
+      {"table-row", CSS_VAL_TABLE_ROW},
+#line 266 "cssvalues.gperf"
+      {"-tdehtml-normal", CSS_VAL__TDEHTML_NORMAL},
+#line 199 "cssvalues.gperf"
+      {"auto", CSS_VAL_AUTO},
+#line 60 "cssvalues.gperf"
+      {"narrower", CSS_VAL_NARROWER},
+#line 219 "cssvalues.gperf"
+      {"uppercase", CSS_VAL_UPPERCASE},
+#line 157 "cssvalues.gperf"
+      {"-tdehtml-thai", CSS_VAL__TDEHTML_THAI},
+#line 155 "cssvalues.gperf"
+      {"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN},
 #line 102 "cssvalues.gperf"
       {"captiontext", CSS_VAL_CAPTIONTEXT},
-#line 58 "cssvalues.gperf"
-      {"larger", CSS_VAL_LARGER},
-#line 132 "cssvalues.gperf"
-      {"text-bottom", CSS_VAL_TEXT_BOTTOM},
-#line 186 "cssvalues.gperf"
-      {"run-in", CSS_VAL_RUN_IN},
-#line 55 "cssvalues.gperf"
-      {"xx-large", CSS_VAL_XX_LARGE},
-#line 103 "cssvalues.gperf"
-      {"graytext", CSS_VAL_GRAYTEXT},
-#line 268 "cssvalues.gperf"
-      {"border-box", CSS_VAL_BORDER_BOX},
+#line 176 "cssvalues.gperf"
+      {"upper-latin", CSS_VAL_UPPER_LATIN},
+#line 32 "cssvalues.gperf"
+      {"status-bar", CSS_VAL_STATUS_BAR},
+#line 229 "cssvalues.gperf"
+      {"pre-wrap", CSS_VAL_PRE_WRAP},
 #line 282 "cssvalues.gperf"
       {"alternate", CSS_VAL_ALTERNATE},
-#line 174 "cssvalues.gperf"
-      {"lower-latin", CSS_VAL_LOWER_LATIN},
-#line 194 "cssvalues.gperf"
-      {"table-row", CSS_VAL_TABLE_ROW},
-#line 94 "cssvalues.gperf"
-      {"activeborder", CSS_VAL_ACTIVEBORDER},
+#line 235 "cssvalues.gperf"
+      {"always", CSS_VAL_ALWAYS},
+#line 220 "cssvalues.gperf"
+      {"lowercase", CSS_VAL_LOWERCASE},
+#line 268 "cssvalues.gperf"
+      {"border-box", CSS_VAL_BORDER_BOX},
+#line 110 "cssvalues.gperf"
+      {"infotext", CSS_VAL_INFOTEXT},
 #line 66 "cssvalues.gperf"
       {"expanded", CSS_VAL_EXPANDED},
-#line 74 "cssvalues.gperf"
-      {"transparent", CSS_VAL_TRANSPARENT},
-#line 88 "cssvalues.gperf"
-      {"purple", CSS_VAL_PURPLE},
-#line 190 "cssvalues.gperf"
-      {"inline-table", CSS_VAL_INLINE_TABLE},
-#line 34 "cssvalues.gperf"
-      {"oblique", CSS_VAL_OBLIQUE},
-#line 20 "cssvalues.gperf"
-      {"groove", CSS_VAL_GROOVE},
+#line 174 "cssvalues.gperf"
+      {"lower-latin", CSS_VAL_LOWER_LATIN},
 #line 201 "cssvalues.gperf"
       {"default", CSS_VAL_DEFAULT},
-#line 148 "cssvalues.gperf"
-      {"square", CSS_VAL_SQUARE},
-#line 130 "cssvalues.gperf"
-      {"super", CSS_VAL_SUPER},
-#line 70 "cssvalues.gperf"
-      {"sans-serif", CSS_VAL_SANS_SERIF},
-#line 75 "cssvalues.gperf"
-      {"aqua", CSS_VAL_AQUA},
-#line 123 "cssvalues.gperf"
-      {"repeat", CSS_VAL_REPEAT},
-#line 230 "cssvalues.gperf"
-      {"pre-line", CSS_VAL_PRE_LINE},
-#line 283 "cssvalues.gperf"
-      {"unfurl", CSS_VAL_UNFURL},
-#line 238 "cssvalues.gperf"
-      {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
-#line 196 "cssvalues.gperf"
-      {"table-column", CSS_VAL_TABLE_COLUMN},
-#line 131 "cssvalues.gperf"
-      {"text-top", CSS_VAL_TEXT_TOP},
+#line 16 "cssvalues.gperf"
+      {"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE},
+#line 111 "cssvalues.gperf"
+      {"menutext", CSS_VAL_MENUTEXT},
+#line 98 "cssvalues.gperf"
+      {"buttonface", CSS_VAL_BUTTONFACE},
+#line 225 "cssvalues.gperf"
+      {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
+#line 65 "cssvalues.gperf"
+      {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
+#line 95 "cssvalues.gperf"
+      {"activecaption", CSS_VAL_ACTIVECAPTION},
+#line 224 "cssvalues.gperf"
+      {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
+#line 136 "cssvalues.gperf"
+      {"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO},
 #line 218 "cssvalues.gperf"
       {"capitalize", CSS_VAL_CAPITALIZE},
+#line 232 "cssvalues.gperf"
+      {"break-word", CSS_VAL_BREAK_WORD},
+#line 160 "cssvalues.gperf"
+      {"upper-roman", CSS_VAL_UPPER_ROMAN},
+#line 273 "cssvalues.gperf"
+      {"backwards", CSS_VAL_BACKWARDS},
+#line 122 "cssvalues.gperf"
+      {"-tdehtml-text", CSS_VAL__TDEHTML_TEXT},
+#line 212 "cssvalues.gperf"
+      {"w-resize", CSS_VAL_W_RESIZE},
+#line 104 "cssvalues.gperf"
+      {"highlight", CSS_VAL_HIGHLIGHT},
+#line 206 "cssvalues.gperf"
+      {"ne-resize", CSS_VAL_NE_RESIZE},
 #line 159 "cssvalues.gperf"
       {"lower-roman", CSS_VAL_LOWER_ROMAN},
-#line 288 "cssvalues.gperf"
-      {"padding", CSS_VAL_PADDING},
-#line 95 "cssvalues.gperf"
-      {"activecaption", CSS_VAL_ACTIVECAPTION},
+#line 163 "cssvalues.gperf"
+      {"georgian", CSS_VAL_GEORGIAN},
+#line 135 "cssvalues.gperf"
+      {"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
+#line 164 "cssvalues.gperf"
+      {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
+#line 124 "cssvalues.gperf"
+      {"repeat-x", CSS_VAL_REPEAT_X},
+#line 96 "cssvalues.gperf"
+      {"appworkspace", CSS_VAL_APPWORKSPACE},
+#line 209 "cssvalues.gperf"
+      {"se-resize", CSS_VAL_SE_RESIZE},
 #line 117 "cssvalues.gperf"
       {"threedshadow", CSS_VAL_THREEDSHADOW},
-#line 200 "cssvalues.gperf"
-      {"crosshair", CSS_VAL_CROSSHAIR},
-#line 247 "cssvalues.gperf"
-      {"higher", CSS_VAL_HIGHER},
-#line 100 "cssvalues.gperf"
-      {"buttonshadow", CSS_VAL_BUTTONSHADOW},
-#line 232 "cssvalues.gperf"
-      {"break-word", CSS_VAL_BREAK_WORD},
-#line 254 "cssvalues.gperf"
-      {"marquee", CSS_VAL_MARQUEE},
-#line 31 "cssvalues.gperf"
-      {"small-caption", CSS_VAL_SMALL_CAPTION},
-#line 35 "cssvalues.gperf"
-      {"small-caps", CSS_VAL_SMALL_CAPS},
-#line 122 "cssvalues.gperf"
-      {"-khtml-text", CSS_VAL__KHTML_TEXT},
-#line 141 "cssvalues.gperf"
-      {"-khtml-left", CSS_VAL__KHTML_LEFT},
+#line 108 "cssvalues.gperf"
+      {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
+#line 103 "cssvalues.gperf"
+      {"graytext", CSS_VAL_GRAYTEXT},
+#line 283 "cssvalues.gperf"
+      {"unfurl", CSS_VAL_UNFURL},
+#line 177 "cssvalues.gperf"
+      {"hiragana", CSS_VAL_HIRAGANA},
+#line 181 "cssvalues.gperf"
+      {"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
 #line 97 "cssvalues.gperf"
       {"background", CSS_VAL_BACKGROUND},
+#line 94 "cssvalues.gperf"
+      {"activeborder", CSS_VAL_ACTIVEBORDER},
+#line 142 "cssvalues.gperf"
+      {"-tdehtml-right", CSS_VAL__TDEHTML_RIGHT},
+#line 182 "cssvalues.gperf"
+      {"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
 #line 178 "cssvalues.gperf"
       {"katakana", CSS_VAL_KATAKANA},
-#line 260 "cssvalues.gperf"
-      {"separate", CSS_VAL_SEPARATE},
-#line 32 "cssvalues.gperf"
-      {"status-bar", CSS_VAL_STATUS_BAR},
-#line 65 "cssvalues.gperf"
-      {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
-#line 62 "cssvalues.gperf"
-      {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
-#line 198 "cssvalues.gperf"
-      {"table-caption", CSS_VAL_TABLE_CAPTION},
-#line 154 "cssvalues.gperf"
-      {"-khtml-lao", CSS_VAL__KHTML_LAO},
-#line 143 "cssvalues.gperf"
-      {"-khtml-center", CSS_VAL__KHTML_CENTER},
+#line 153 "cssvalues.gperf"
+      {"-tdehtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
+#line 231 "cssvalues.gperf"
+      {"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
+#line 61 "cssvalues.gperf"
+      {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
+#line 119 "cssvalues.gperf"
+      {"windowframe", CSS_VAL_WINDOWFRAME},
+#line 175 "cssvalues.gperf"
+      {"upper-alpha", CSS_VAL_UPPER_ALPHA},
+#line 156 "cssvalues.gperf"
+      {"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU},
+#line 101 "cssvalues.gperf"
+      {"buttontext", CSS_VAL_BUTTONTEXT},
+#line 173 "cssvalues.gperf"
+      {"lower-alpha", CSS_VAL_LOWER_ALPHA},
+#line 251 "cssvalues.gperf"
+      {"line-through", CSS_VAL_LINE_THROUGH},
 #line 54 "cssvalues.gperf"
       {"x-large", CSS_VAL_X_LARGE},
-#line 30 "cssvalues.gperf"
-      {"message-box", CSS_VAL_MESSAGE_BOX},
-#line 203 "cssvalues.gperf"
-      {"progress", CSS_VAL_PROGRESS},
-#line 16 "cssvalues.gperf"
-      {"-khtml-native", CSS_VAL__KHTML_NATIVE},
-#line 177 "cssvalues.gperf"
-      {"hiragana", CSS_VAL_HIRAGANA},
+#line 120 "cssvalues.gperf"
+      {"windowtext", CSS_VAL_WINDOWTEXT},
 #line 171 "cssvalues.gperf"
       {"lower-greek", CSS_VAL_LOWER_GREEK},
-#line 150 "cssvalues.gperf"
-      {"-khtml-diamond", CSS_VAL__KHTML_DIAMOND},
-#line 224 "cssvalues.gperf"
-      {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
-#line 61 "cssvalues.gperf"
-      {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
-#line 158 "cssvalues.gperf"
-      {"-khtml-tibetan", CSS_VAL__KHTML_TIBETAN},
-#line 124 "cssvalues.gperf"
-      {"repeat-x", CSS_VAL_REPEAT_X},
-#line 266 "cssvalues.gperf"
-      {"-khtml-normal", CSS_VAL__KHTML_NORMAL},
+#line 30 "cssvalues.gperf"
+      {"message-box", CSS_VAL_MESSAGE_BOX},
+#line 167 "cssvalues.gperf"
+      {"-tdehtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
+#line 168 "cssvalues.gperf"
+      {"-tdehtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
+#line 207 "cssvalues.gperf"
+      {"nw-resize", CSS_VAL_NW_RESIZE},
+#line 62 "cssvalues.gperf"
+      {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
+#line 193 "cssvalues.gperf"
+      {"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP},
+#line 210 "cssvalues.gperf"
+      {"sw-resize", CSS_VAL_SW_RESIZE},
 #line 113 "cssvalues.gperf"
       {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
-#line 219 "cssvalues.gperf"
-      {"uppercase", CSS_VAL_UPPERCASE},
-#line 136 "cssvalues.gperf"
-      {"-khtml-auto", CSS_VAL__KHTML_AUTO},
-#line 163 "cssvalues.gperf"
-      {"georgian", CSS_VAL_GEORGIAN},
-#line 229 "cssvalues.gperf"
-      {"pre-wrap", CSS_VAL_PRE_WRAP},
-#line 125 "cssvalues.gperf"
-      {"repeat-y", CSS_VAL_REPEAT_Y},
+#line 267 "cssvalues.gperf"
+      {"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
 #line 109 "cssvalues.gperf"
       {"infobackground", CSS_VAL_INFOBACKGROUND},
-#line 157 "cssvalues.gperf"
-      {"-khtml-thai", CSS_VAL__KHTML_THAI},
-#line 226 "cssvalues.gperf"
-      {"open-quote", CSS_VAL_OPEN_QUOTE},
-#line 173 "cssvalues.gperf"
-      {"lower-alpha", CSS_VAL_LOWER_ALPHA},
-#line 156 "cssvalues.gperf"
-      {"-khtml-urdu", CSS_VAL__KHTML_URDU},
-#line 223 "cssvalues.gperf"
-      {"close-quote", CSS_VAL_CLOSE_QUOTE},
-#line 104 "cssvalues.gperf"
-      {"highlight", CSS_VAL_HIGHLIGHT},
-#line 225 "cssvalues.gperf"
-      {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
-#line 231 "cssvalues.gperf"
-      {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
-#line 67 "cssvalues.gperf"
-      {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
+#line 100 "cssvalues.gperf"
+      {"buttonshadow", CSS_VAL_BUTTONSHADOW},
+#line 165 "cssvalues.gperf"
+      {"-tdehtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
+#line 166 "cssvalues.gperf"
+      {"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
+#line 49 "cssvalues.gperf"
+      {"xx-small", CSS_VAL_XX_SMALL},
+#line 115 "cssvalues.gperf"
+      {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
+#line 195 "cssvalues.gperf"
+      {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
 #line 105 "cssvalues.gperf"
       {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
-#line 155 "cssvalues.gperf"
-      {"-khtml-persian", CSS_VAL__KHTML_PERSIAN},
+#line 169 "cssvalues.gperf"
+      {"-tdehtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
+#line 170 "cssvalues.gperf"
+      {"-tdehtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
 #line 116 "cssvalues.gperf"
       {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
-#line 96 "cssvalues.gperf"
-      {"appworkspace", CSS_VAL_APPWORKSPACE},
-#line 68 "cssvalues.gperf"
-      {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
-#line 176 "cssvalues.gperf"
-      {"upper-latin", CSS_VAL_UPPER_LATIN},
-#line 164 "cssvalues.gperf"
-      {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
-#line 251 "cssvalues.gperf"
-      {"line-through", CSS_VAL_LINE_THROUGH},
-#line 142 "cssvalues.gperf"
-      {"-khtml-right", CSS_VAL__KHTML_RIGHT},
-#line 160 "cssvalues.gperf"
-      {"upper-roman", CSS_VAL_UPPER_ROMAN},
-#line 135 "cssvalues.gperf"
-      {"-khtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
-#line 153 "cssvalues.gperf"
-      {"-khtml-arabic-indic", CSS_VAL__KHTML_ARABIC_INDIC},
-#line 152 "cssvalues.gperf"
-      {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
-#line 115 "cssvalues.gperf"
-      {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
+#line 172 "cssvalues.gperf"
+      {"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK},
+#line 179 "cssvalues.gperf"
+      {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
+#line 191 "cssvalues.gperf"
+      {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
 #line 180 "cssvalues.gperf"
       {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
+#line 152 "cssvalues.gperf"
+      {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
+#line 192 "cssvalues.gperf"
+      {"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
+#line 68 "cssvalues.gperf"
+      {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
 #line 99 "cssvalues.gperf"
       {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
+#line 55 "cssvalues.gperf"
+      {"xx-large", CSS_VAL_XX_LARGE},
+#line 67 "cssvalues.gperf"
+      {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
 #line 56 "cssvalues.gperf"
-      {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
-#line 267 "cssvalues.gperf"
-      {"-khtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
-#line 191 "cssvalues.gperf"
-      {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
-#line 182 "cssvalues.gperf"
-      {"-khtml-close-quote", CSS_VAL__KHTML_CLOSE_QUOTE},
-#line 179 "cssvalues.gperf"
-      {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
-#line 193 "cssvalues.gperf"
-      {"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP},
-#line 195 "cssvalues.gperf"
-      {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
-#line 175 "cssvalues.gperf"
-      {"upper-alpha", CSS_VAL_UPPER_ALPHA},
-#line 181 "cssvalues.gperf"
-      {"-khtml-open-quote", CSS_VAL__KHTML_OPEN_QUOTE},
-#line 165 "cssvalues.gperf"
-      {"-khtml-japanese-formal", CSS_VAL__KHTML_JAPANESE_FORMAL},
-#line 166 "cssvalues.gperf"
-      {"-khtml-japanese-informal", CSS_VAL__KHTML_JAPANESE_INFORMAL},
-#line 192 "cssvalues.gperf"
-      {"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
-#line 169 "cssvalues.gperf"
-      {"-khtml-trad-chinese-formal", CSS_VAL__KHTML_TRAD_CHINESE_FORMAL},
-#line 170 "cssvalues.gperf"
-      {"-khtml-trad-chinese-informal", CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL},
-#line 167 "cssvalues.gperf"
-      {"-khtml-simp-chinese-formal", CSS_VAL__KHTML_SIMP_CHINESE_FORMAL},
-#line 168 "cssvalues.gperf"
-      {"-khtml-simp-chinese-informal", CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL},
-#line 172 "cssvalues.gperf"
-      {"-khtml-upper-greek", CSS_VAL__KHTML_UPPER_GREEK}
+      {"-tdehtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE}
     };
 
   static const short lookup[] =
     {
-        0,  -1,  -1,  -1,  -1,   1,  -1,  -1,  -1,  -1,
-        2,  -1,  -1,  -1,  -1,   3,  -1,  -1,  -1,  -1,
-        4,  -1,  -1,  -1,  -1,   5,  -1,  -1,   6,  -1,
+        0,  -1,  -1,  -1,  -1,   1,  -1,  -1,   2,  -1,
+        3,  -1,  -1,  -1,  -1,   4,  -1,  -1,  -1,  -1,
+        5,  -1,  -1,  -1,  -1,   6,  -1,  -1,  -1,  -1,
         7,  -1,  -1,  -1,  -1,   8,  -1,  -1,  -1,  -1,
-        9,  -1,  -1,  10,  -1,  11,  -1,  -1,  -1,  -1,
-       12,  -1,  -1,  -1,  -1,  13,  -1,  -1,  -1,  -1,
-       14,  15,  -1,  -1,  -1,  16,  -1,  -1,  -1,  -1,
-       17,  18,  -1,  -1,  -1,  19,  -1,  -1,  -1,  -1,
-       20,  -1,  -1,  -1,  -1,  21,  -1,  -1,  22,  -1,
+        9,  -1,  -1,  -1,  -1,  10,  -1,  -1,  -1,  -1,
+       11,  -1,  -1,  -1,  -1,  12,  -1,  -1,  13,  -1,
+       14,  -1,  -1,  -1,  -1,  15,  -1,  -1,  -1,  -1,
+       16,  -1,  -1,  17,  -1,  18,  19,  -1,  -1,  -1,
+       20,  -1,  -1,  21,  -1,  22,  -1,  -1,  -1,  -1,
        23,  -1,  -1,  -1,  -1,  24,  -1,  -1,  25,  -1,
-       26,  -1,  -1,  27,  -1,  28,  -1,  -1,  29,  -1,
-       30,  -1,  -1,  -1,  -1,  31,  -1,  -1,  -1,  32,
-       33,  -1,  -1,  34,  -1,  -1,  -1,  -1,  35,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  36,  -1,
-       37,  -1,  -1,  -1,  -1,  38,  -1,  -1,  39,  -1,
-       40,  -1,  -1,  41,  -1,  -1,  -1,  -1,  42,  -1,
-       43,  -1,  -1,  44,  -1,  45,  -1,  -1,  46,  -1,
-       -1,  -1,  -1,  47,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  48,  -1,  -1,  49,  -1,
-       50,  51,  -1,  52,  -1,  -1,  53,  -1,  54,  -1,
-       55,  -1,  -1,  56,  -1,  -1,  -1,  -1,  57,  -1,
-       -1,  -1,  -1,  -1,  -1,  58,  -1,  -1,  -1,  -1,
-       -1,  59,  -1,  60,  -1,  61,  -1,  -1,  -1,  -1,
-       62,  63,  -1,  -1,  -1,  64,  -1,  -1,  -1,  -1,
-       65,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       66,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  67,
-       68,  69,  -1,  -1,  -1,  70,  -1,  -1,  71,  -1,
-       72,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  73,  -1,
-       74,  75,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       76,  -1,  -1,  77,  -1,  -1,  -1,  -1,  78,  -1,
-       79,  -1,  -1,  80,  -1,  81,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  82,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  83,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       84,  -1,  -1,  -1,  -1,  85,  86,  -1,  87,  -1,
-       -1,  -1,  -1,  88,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       89,  -1,  -1,  -1,  90,  91,  -1,  -1,  92,  -1,
-       -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       94,  -1,  -1,  95,  -1,  96,  -1,  -1,  -1,  -1,
-       97,  -1,  -1,  98,  -1,  99,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 100,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 101,  -1,  -1,  -1,  -1, 102,  -1,
-      103,  -1,  -1,  -1, 104, 105,  -1,  -1,  -1,  -1,
-      106,  -1,  -1,  -1,  -1, 107,  -1,  -1, 108,  -1,
-      109,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 110,  -1,
-      111,  -1,  -1,  -1,  -1, 112,  -1,  -1, 113,  -1,
-      114,  -1,  -1, 115,  -1, 116,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 117,  -1, 118,  -1,  -1,  -1,  -1,
-      119,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      120,  -1,  -1,  -1,  -1,  -1, 121,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 122,  -1,
-       -1,  -1,  -1,  -1,  -1, 123,  -1,  -1,  -1,  -1,
-      124, 125,  -1,  -1,  -1, 126,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 127,  -1, 128,  -1,  -1, 129,  -1,
-       -1,  -1,  -1, 130,  -1, 131,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 132,  -1, 133,  -1,  -1, 134,  -1,
-      135,  -1,  -1,  -1,  -1, 136,  -1,  -1, 137,  -1,
-      138,  -1,  -1,  -1,  -1, 139,  -1,  -1,  -1,  -1,
-      140,  -1,  -1, 141,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      142,  -1,  -1,  -1,  -1, 143,  -1,  -1,  -1,  -1,
-      144,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      145, 146,  -1,  -1,  -1,  -1,  -1,  -1, 147,  -1,
-      148,  -1,  -1, 149,  -1, 150,  -1,  -1, 151,  -1,
-      152, 153,  -1,  -1,  -1, 154,  -1,  -1, 155,  -1,
-       -1,  -1,  -1, 156,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 157,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      158,  -1,  -1,  -1,  -1, 159,  -1,  -1, 160,  -1,
-       -1,  -1,  -1, 161,  -1, 162,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 163,  -1,  -1,  -1,  -1,  -1,  -1,
-      164,  -1,  -1, 165,  -1, 166,  -1,  -1,  -1, 167,
-       -1, 168,  -1,  -1,  -1,  -1,  -1,  -1, 169,  -1,
-      170,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 171,  -1,
-       -1,  -1,  -1, 172,  -1,  -1,  -1,  -1, 173,  -1,
-       -1,  -1,  -1, 174,  -1, 175,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      176,  -1,  -1,  -1,  -1, 177,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      178,  -1,  -1, 179,  -1,  -1,  -1,  -1,  -1,  -1,
-      180,  -1,  -1, 181,  -1, 182,  -1,  -1, 183,  -1,
-       -1,  -1,  -1, 184,  -1, 185,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       26,  -1,  -1,  -1,  -1,  27,  28,  -1,  -1,  -1,
+       29,  30,  -1,  31,  -1,  32,  -1,  -1,  33,  -1,
+       34,  -1,  -1,  -1,  -1,  -1,  35,  -1,  -1,  -1,
+       -1,  -1,  -1,  36,  -1,  -1,  -1,  -1,  -1,  -1,
+       37,  -1,  -1,  38,  -1,  39,  -1,  -1,  -1,  -1,
+       40,  -1,  -1,  -1,  -1,  41,  -1,  -1,  42,  -1,
+       43,  -1,  -1,  -1,  -1,  44,  45,  -1,  46,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  47,  -1,  -1,  48,  -1,
+       49,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       50,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  51,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  52,  -1,  -1,  53,  -1,
+       54,  55,  -1,  56,  -1,  57,  -1,  -1,  58,  -1,
+       59,  -1,  -1,  60,  -1,  -1,  -1,  -1,  -1,  -1,
+       61,  -1,  -1,  -1,  -1,  62,  63,  -1,  -1,  -1,
+       64,  -1,  -1,  65,  -1,  66,  -1,  -1,  67,  -1,
+       68,  -1,  -1,  69,  -1,  70,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  71,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  72,  -1,  -1,  -1,  -1,  73,  -1,
+       74,  -1,  -1,  75,  -1,  76,  -1,  -1,  77,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  78,  -1,
+       79,  -1,  -1,  80,  -1,  -1,  81,  -1,  -1,  -1,
+       82,  -1,  -1,  83,  -1,  84,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       85,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       86,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  87,  -1,  88,  -1,  -1,  -1,  -1,  -1,  -1,
+       89,  90,  -1,  -1,  -1,  91,  -1,  -1,  92,  -1,
+       93,  -1,  -1,  94,  -1,  95,  -1,  -1,  -1,  -1,
+       96,  -1,  -1,  -1,  -1,  97,  98,  -1,  99,  -1,
+      100,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1, 101,  -1,  -1,  -1, 102,  -1,  -1,  -1, 103,
+      104,  -1,  -1,  -1,  -1, 105,  -1,  -1,  -1,  -1,
+      106,  -1,  -1, 107,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 108,  -1, 109,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 110,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 111,  -1,  -1, 112,  -1,
+       -1, 113,  -1,  -1,  -1, 114, 115,  -1,  -1,  -1,
+      116,  -1,  -1, 117,  -1, 118,  -1,  -1, 119,  -1,
+      120,  -1,  -1,  -1,  -1, 121,  -1,  -1, 122,  -1,
+       -1,  -1,  -1, 123,  -1,  -1, 124,  -1, 125,  -1,
+       -1,  -1,  -1,  -1,  -1, 126,  -1,  -1, 127,  -1,
+       -1,  -1,  -1, 128,  -1, 129,  -1,  -1, 130,  -1,
+      131,  -1,  -1, 132,  -1, 133,  -1,  -1,  -1,  -1,
+      134,  -1,  -1, 135,  -1,  -1,  -1,  -1, 136,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 137, 138,  -1, 139,  -1,  -1,  -1,
+      140,  -1,  -1, 141,  -1,  -1,  -1,  -1, 142,  -1,
+       -1,  -1,  -1, 143,  -1, 144,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 145,  -1,  -1,  -1,  -1,  -1,  -1,
+      146, 147,  -1, 148,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      149, 150,  -1, 151,  -1, 152,  -1,  -1,  -1,  -1,
+      153,  -1,  -1,  -1,  -1, 154,  -1,  -1,  -1,  -1,
+      155, 156,  -1, 157,  -1,  -1,  -1,  -1,  -1,  -1,
+      158, 159,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      160,  -1,  -1, 161,  -1, 162,  -1,  -1,  -1,  -1,
+      163,  -1,  -1,  -1,  -1, 164,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 165,  -1, 166, 167,  -1,  -1,  -1,
+      168,  -1,  -1, 169,  -1, 170,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 171,  -1, 172,  -1,  -1, 173,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 174,  -1,
+       -1,  -1,  -1,  -1,  -1, 175,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 176,  -1,  -1,  -1,  -1,  -1,  -1,
+      177,  -1,  -1,  -1,  -1, 178,  -1,  -1,  -1,  -1,
+      179,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      180,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      181,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 182, 183,  -1,  -1,  -1,
+      184,  -1,  -1, 185,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1, 186,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1, 187,  -1,  -1,  -1, 188,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1, 189,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 190,  -1,  -1, 191,  -1,
+      192,  -1,  -1,  -1,  -1, 193,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 194,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 195,  -1, 196,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 197,  -1,  -1, 198,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      187,  -1,  -1, 188,  -1,  -1,  -1,  -1,  -1,  -1,
-      189,  -1,  -1, 190,  -1, 191,  -1,  -1, 192,  -1,
-      193,  -1,  -1, 194,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 195,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      199,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 200,  -1,  -1, 201,  -1, 202,  -1,
+       -1, 203,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 204,  -1,  -1,  -1,  -1,  -1,  -1,
+      205,  -1,  -1, 206,  -1,  -1,  -1,  -1, 207,  -1,
+       -1, 208,  -1,  -1,  -1, 209,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      210,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      211,  -1,  -1,  -1,  -1, 212,  -1,  -1,  -1,  -1,
+      213,  -1,  -1,  -1,  -1, 214,  -1,  -1, 215,  -1,
+      216, 217,  -1,  -1,  -1,  -1,  -1,  -1, 218, 219,
+      220,  -1,  -1,  -1,  -1, 221,  -1,  -1,  -1,  -1,
+       -1, 222,  -1, 223,  -1,  -1,  -1,  -1,  -1,  -1,
+      224,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      225, 226,  -1,  -1,  -1, 227,  -1,  -1, 228,  -1,
+       -1,  -1,  -1,  -1,  -1, 229,  -1,  -1, 230,  -1,
+      231,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      232,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 233,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 196,  -1,  -1,  -1,  -1,
-      197,  -1,  -1, 198,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1, 199,  -1,  -1,  -1,
-      200,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      201,  -1,  -1,  -1,  -1, 202,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 203,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 204,  -1,
-      205,  -1,  -1,  -1,  -1, 206,  -1,  -1,  -1,  -1,
-      207,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      234,  -1,  -1, 235,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      208,  -1,  -1, 209,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 236,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 210,  -1,  -1,  -1,  -1,  -1,  -1,
-      211,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 237,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 238,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      212,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 213,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 214,  -1,
+       -1,  -1,  -1, 239,  -1, 240,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 241,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 215,  -1, 216,  -1,  -1, 217,  -1,
-      218,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 219,  -1,
-      220,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      242,  -1,  -1,  -1,  -1, 243,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 221,  -1,  -1,  -1,  -1,  -1,  -1,
-      222,  -1,  -1,  -1,  -1, 223,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 224,  -1,
-       -1,  -1,  -1,  -1,  -1, 225,  -1,  -1, 226,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      227,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      228,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      229,  -1,  -1,  -1,  -1,  -1, 230,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 231,  -1,
-      232,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 233,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 234,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 235,  -1,
-      236,  -1,  -1,  -1,  -1, 237,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 238,  -1,  -1, 239,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 240,  -1,
-       -1, 241,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 242,  -1,  -1,  -1,  -1,  -1,  -1,
+      244,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1, 245,  -1,  -1,  -1,  -1, 246,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 247,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 248, 249,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 250,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      243,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 244,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 251,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 252,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 245,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 253,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      254,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 255,
+       -1,  -1,  -1,  -1, 256,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 246,  -1,
+       -1,  -1,  -1,  -1,  -1, 257,  -1,  -1,  -1,  -1,
+      258,  -1,  -1, 259,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 247,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 248,  -1,  -1,  -1,  -1,  -1,  -1,
-      249,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      250,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      260,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 261,  -1,
+       -1,  -1,  -1, 262,  -1, 263,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1, 264,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 265,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 266,  -1,
+       -1,  -1,  -1,  -1,  -1, 267,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      268,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 251,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 269,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 252,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 270,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 253,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 254,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      255,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      256,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 271,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 257,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 258,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 259,  -1,
+       -1,  -1,  -1,  -1,  -1, 272,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 273,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 260,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 261,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 262,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 263,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 264,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -981,13 +967,10 @@ findValue (register const char *str, register unsigned int len)
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 265,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      266,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1, 267,  -1,  -1,  -1,  -1, 268,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -1010,7 +993,6 @@ findValue (register const char *str, register unsigned int len)
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 269,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -1024,10 +1006,7 @@ findValue (register const char *str, register unsigned int len)
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 270,  -1,
-       -1,  -1,  -1, 271,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 272,  -1,  -1,  -1,  -1, 273,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -1059,7 +1038,7 @@ static const char * const valueList[] = {
 "",
 "inherit", 
 "initial", 
-"-khtml-native", 
+"-tdehtml-native", 
 "none", 
 "hidden", 
 "inset", 
@@ -1099,7 +1078,7 @@ static const char * const valueList[] = {
 "large", 
 "x-large", 
 "xx-large", 
-"-khtml-xxx-large", 
+"-tdehtml-xxx-large", 
 "smaller", 
 "larger", 
 "wider", 
@@ -1165,7 +1144,7 @@ static const char * const valueList[] = {
 "windowframe", 
 "windowtext", 
 "grey", 
-"-khtml-text", 
+"-tdehtml-text", 
 "repeat", 
 "repeat-x", 
 "repeat-y", 
@@ -1178,44 +1157,44 @@ static const char * const valueList[] = {
 "text-bottom", 
 "top", 
 "bottom", 
-"-khtml-baseline-middle", 
-"-khtml-auto", 
+"-tdehtml-baseline-middle", 
+"-tdehtml-auto", 
 "left", 
 "right", 
 "center", 
 "justify", 
-"-khtml-left", 
-"-khtml-right", 
-"-khtml-center", 
+"-tdehtml-left", 
+"-tdehtml-right", 
+"-tdehtml-center", 
 "outside", 
 "inside", 
 "disc", 
 "circle", 
 "square", 
 "box", 
-"-khtml-diamond", 
+"-tdehtml-diamond", 
 "decimal", 
 "decimal-leading-zero", 
-"-khtml-arabic-indic", 
-"-khtml-lao", 
-"-khtml-persian", 
-"-khtml-urdu", 
-"-khtml-thai", 
-"-khtml-tibetan", 
+"-tdehtml-arabic-indic", 
+"-tdehtml-lao", 
+"-tdehtml-persian", 
+"-tdehtml-urdu", 
+"-tdehtml-thai", 
+"-tdehtml-tibetan", 
 "lower-roman", 
 "upper-roman", 
 "hebrew", 
 "armenian", 
 "georgian", 
 "cjk-ideographic", 
-"-khtml-japanese-formal", 
-"-khtml-japanese-informal", 
-"-khtml-simp-chinese-formal", 
-"-khtml-simp-chinese-informal", 
-"-khtml-trad-chinese-formal", 
-"-khtml-trad-chinese-informal", 
+"-tdehtml-japanese-formal", 
+"-tdehtml-japanese-informal", 
+"-tdehtml-simp-chinese-formal", 
+"-tdehtml-simp-chinese-informal", 
+"-tdehtml-trad-chinese-formal", 
+"-tdehtml-trad-chinese-informal", 
 "lower-greek", 
-"-khtml-upper-greek", 
+"-tdehtml-upper-greek", 
 "lower-alpha", 
 "lower-latin", 
 "upper-alpha", 
@@ -1224,8 +1203,8 @@ static const char * const valueList[] = {
 "katakana", 
 "hiragana-iroha", 
 "katakana-iroha", 
-"-khtml-open-quote", 
-"-khtml-close-quote", 
+"-tdehtml-open-quote", 
+"-tdehtml-close-quote", 
 "inline", 
 "block", 
 "list-item", 
@@ -1274,7 +1253,7 @@ static const char * const valueList[] = {
 "pre", 
 "pre-wrap", 
 "pre-line", 
-"-khtml-nowrap", 
+"-tdehtml-nowrap", 
 "break-word", 
 "above", 
 "absolute", 
@@ -1309,8 +1288,8 @@ static const char * const valueList[] = {
 "thick", 
 "thin", 
 "underline", 
-"-khtml-normal", 
-"-khtml-around-floats", 
+"-tdehtml-normal", 
+"-tdehtml-around-floats", 
 "border-box", 
 "content-box", 
 "enabled", 
diff --git a/khtml/css/cssvalues.h b/tdehtml/css/cssvalues.h
index 36a365754..12d606acc 100644
--- a/khtml/css/cssvalues.h
+++ b/tdehtml/css/cssvalues.h
@@ -11,7 +11,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_VAL_MIN 1
 #define CSS_VAL_INHERIT 1
 #define CSS_VAL_INITIAL 2
-#define CSS_VAL__KHTML_NATIVE 3
+#define CSS_VAL__TDEHTML_NATIVE 3
 #define CSS_VAL_NONE 4
 #define CSS_VAL_HIDDEN 5
 #define CSS_VAL_INSET 6
@@ -51,7 +51,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_VAL_LARGE 40
 #define CSS_VAL_X_LARGE 41
 #define CSS_VAL_XX_LARGE 42
-#define CSS_VAL__KHTML_XXX_LARGE 43
+#define CSS_VAL__TDEHTML_XXX_LARGE 43
 #define CSS_VAL_SMALLER 44
 #define CSS_VAL_LARGER 45
 #define CSS_VAL_WIDER 46
@@ -117,7 +117,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_VAL_WINDOWFRAME 106
 #define CSS_VAL_WINDOWTEXT 107
 #define CSS_VAL_GREY 108
-#define CSS_VAL__KHTML_TEXT 109
+#define CSS_VAL__TDEHTML_TEXT 109
 #define CSS_VAL_REPEAT 110
 #define CSS_VAL_REPEAT_X 111
 #define CSS_VAL_REPEAT_Y 112
@@ -130,44 +130,44 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_VAL_TEXT_BOTTOM 119
 #define CSS_VAL_TOP 120
 #define CSS_VAL_BOTTOM 121
-#define CSS_VAL__KHTML_BASELINE_MIDDLE 122
-#define CSS_VAL__KHTML_AUTO 123
+#define CSS_VAL__TDEHTML_BASELINE_MIDDLE 122
+#define CSS_VAL__TDEHTML_AUTO 123
 #define CSS_VAL_LEFT 124
 #define CSS_VAL_RIGHT 125
 #define CSS_VAL_CENTER 126
 #define CSS_VAL_JUSTIFY 127
-#define CSS_VAL__KHTML_LEFT 128
-#define CSS_VAL__KHTML_RIGHT 129
-#define CSS_VAL__KHTML_CENTER 130
+#define CSS_VAL__TDEHTML_LEFT 128
+#define CSS_VAL__TDEHTML_RIGHT 129
+#define CSS_VAL__TDEHTML_CENTER 130
 #define CSS_VAL_OUTSIDE 131
 #define CSS_VAL_INSIDE 132
 #define CSS_VAL_DISC 133
 #define CSS_VAL_CIRCLE 134
 #define CSS_VAL_SQUARE 135
 #define CSS_VAL_BOX 136
-#define CSS_VAL__KHTML_DIAMOND 137
+#define CSS_VAL__TDEHTML_DIAMOND 137
 #define CSS_VAL_DECIMAL 138
 #define CSS_VAL_DECIMAL_LEADING_ZERO 139
-#define CSS_VAL__KHTML_ARABIC_INDIC 140
-#define CSS_VAL__KHTML_LAO 141
-#define CSS_VAL__KHTML_PERSIAN 142
-#define CSS_VAL__KHTML_URDU 143
-#define CSS_VAL__KHTML_THAI 144
-#define CSS_VAL__KHTML_TIBETAN 145
+#define CSS_VAL__TDEHTML_ARABIC_INDIC 140
+#define CSS_VAL__TDEHTML_LAO 141
+#define CSS_VAL__TDEHTML_PERSIAN 142
+#define CSS_VAL__TDEHTML_URDU 143
+#define CSS_VAL__TDEHTML_THAI 144
+#define CSS_VAL__TDEHTML_TIBETAN 145
 #define CSS_VAL_LOWER_ROMAN 146
 #define CSS_VAL_UPPER_ROMAN 147
 #define CSS_VAL_HEBREW 148
 #define CSS_VAL_ARMENIAN 149
 #define CSS_VAL_GEORGIAN 150
 #define CSS_VAL_CJK_IDEOGRAPHIC 151
-#define CSS_VAL__KHTML_JAPANESE_FORMAL 152
-#define CSS_VAL__KHTML_JAPANESE_INFORMAL 153
-#define CSS_VAL__KHTML_SIMP_CHINESE_FORMAL 154
-#define CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL 155
-#define CSS_VAL__KHTML_TRAD_CHINESE_FORMAL 156
-#define CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL 157
+#define CSS_VAL__TDEHTML_JAPANESE_FORMAL 152
+#define CSS_VAL__TDEHTML_JAPANESE_INFORMAL 153
+#define CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL 154
+#define CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL 155
+#define CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL 156
+#define CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL 157
 #define CSS_VAL_LOWER_GREEK 158
-#define CSS_VAL__KHTML_UPPER_GREEK 159
+#define CSS_VAL__TDEHTML_UPPER_GREEK 159
 #define CSS_VAL_LOWER_ALPHA 160
 #define CSS_VAL_LOWER_LATIN 161
 #define CSS_VAL_UPPER_ALPHA 162
@@ -176,8 +176,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_VAL_KATAKANA 165
 #define CSS_VAL_HIRAGANA_IROHA 166
 #define CSS_VAL_KATAKANA_IROHA 167
-#define CSS_VAL__KHTML_OPEN_QUOTE 168
-#define CSS_VAL__KHTML_CLOSE_QUOTE 169
+#define CSS_VAL__TDEHTML_OPEN_QUOTE 168
+#define CSS_VAL__TDEHTML_CLOSE_QUOTE 169
 #define CSS_VAL_INLINE 170
 #define CSS_VAL_BLOCK 171
 #define CSS_VAL_LIST_ITEM 172
@@ -226,7 +226,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_VAL_PRE 215
 #define CSS_VAL_PRE_WRAP 216
 #define CSS_VAL_PRE_LINE 217
-#define CSS_VAL__KHTML_NOWRAP 218
+#define CSS_VAL__TDEHTML_NOWRAP 218
 #define CSS_VAL_BREAK_WORD 219
 #define CSS_VAL_ABOVE 220
 #define CSS_VAL_ABSOLUTE 221
@@ -261,8 +261,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_VAL_THICK 250
 #define CSS_VAL_THIN 251
 #define CSS_VAL_UNDERLINE 252
-#define CSS_VAL__KHTML_NORMAL 253
-#define CSS_VAL__KHTML_AROUND_FLOATS 254
+#define CSS_VAL__TDEHTML_NORMAL 253
+#define CSS_VAL__TDEHTML_AROUND_FLOATS 254
 #define CSS_VAL_BORDER_BOX 255
 #define CSS_VAL_CONTENT_BOX 256
 #define CSS_VAL_ENABLED 257
diff --git a/khtml/css/cssvalues.in b/tdehtml/css/cssvalues.in
index 1ad99c38d..30ed44475 100644
--- a/khtml/css/cssvalues.in
+++ b/tdehtml/css/cssvalues.in
@@ -16,7 +16,7 @@ initial
 # CSS_PROP_BORDER_TOP_STYLE
 # CSS_PROP_BORDER_BOTTOM_STYLE
 # CSS_PROP_BORDER_LEFT_STYLE
--khtml-native
+-tdehtml-native
 none
 hidden
 inset
@@ -73,7 +73,7 @@ medium
 large
 x-large
 xx-large
--khtml-xxx-large
+-tdehtml-xxx-large
 smaller
 larger
 #
@@ -156,7 +156,7 @@ windowtext
 #
 # colors in non strict mode
 grey
--khtml-text
+-tdehtml-text
 #
 # CSS_PROP_BACKGROUND_REPEAT:
 #
@@ -176,18 +176,18 @@ text-bottom
 top
 bottom
 # HTML alignment MIDDLE has no corresponding CSS alignment
--khtml-baseline-middle
+-tdehtml-baseline-middle
 #
 # CSS_PROP_TEXT_ALIGN:
 #
--khtml-auto
+-tdehtml-auto
 left
 right
 center
 justify
--khtml-left
--khtml-right
--khtml-center
+-tdehtml-left
+-tdehtml-right
+-tdehtml-center
 #
 # CSS_PROP_LIST_STYLE_POSITION:
 #
@@ -200,29 +200,29 @@ disc
 circle
 square
 box
--khtml-diamond
+-tdehtml-diamond
 decimal
 decimal-leading-zero
--khtml-arabic-indic
--khtml-lao
--khtml-persian
--khtml-urdu
--khtml-thai
--khtml-tibetan
+-tdehtml-arabic-indic
+-tdehtml-lao
+-tdehtml-persian
+-tdehtml-urdu
+-tdehtml-thai
+-tdehtml-tibetan
 lower-roman
 upper-roman
 hebrew
 armenian
 georgian
 cjk-ideographic
--khtml-japanese-formal
--khtml-japanese-informal
--khtml-simp-chinese-formal
--khtml-simp-chinese-informal
--khtml-trad-chinese-formal
--khtml-trad-chinese-informal
+-tdehtml-japanese-formal
+-tdehtml-japanese-informal
+-tdehtml-simp-chinese-formal
+-tdehtml-simp-chinese-informal
+-tdehtml-trad-chinese-formal
+-tdehtml-trad-chinese-informal
 lower-greek
--khtml-upper-greek
+-tdehtml-upper-greek
 lower-alpha
 lower-latin
 upper-alpha
@@ -231,8 +231,8 @@ hiragana
 katakana
 hiragana-iroha
 katakana-iroha
--khtml-open-quote
--khtml-close-quote
+-tdehtml-open-quote
+-tdehtml-close-quote
 #none
 #
 # CSS_PROP_DISPLAY:
@@ -307,7 +307,7 @@ nowrap
 pre
 pre-wrap
 pre-line
--khtml-nowrap
+-tdehtml-nowrap
 #
 # CSS_PROP_WORD_WRAP
 #
@@ -350,16 +350,16 @@ thick
 thin
 underline
 #
-# CSS_PROP__KHTML_FLOW_MODE
--khtml-normal
--khtml-around-floats
+# CSS_PROP__TDEHTML_FLOW_MODE
+-tdehtml-normal
+-tdehtml-around-floats
 
 # CSS3 Values
-# CSS_PROP__KHTML_BOX_SIZING
+# CSS_PROP__TDEHTML_BOX_SIZING
 border-box
 content-box
 
-# CSS_PROP__KHTML_USER_INPUT
+# CSS_PROP__TDEHTML_USER_INPUT
 enabled
 disabled
 #none
diff --git a/khtml/css/html4.css b/tdehtml/css/html4.css
index c3fd1a347..ffd599601 100644
--- a/khtml/css/html4.css
+++ b/tdehtml/css/html4.css
@@ -1,8 +1,8 @@
 /*
- * The default style sheet used by khtml to render HTML pages
+ * The default style sheet used by tdehtml to render HTML pages
  * (C) 2000-2003 Lars Knoll (knoll@kde.org)
  *
- * Konqueror/khtml relies on the existence of this style sheet for
+ * Konqueror/tdehtml relies on the existence of this style sheet for
  * rendering. Do not remove or modify this file unless you know
  * what you are doing.
  */
@@ -11,7 +11,7 @@
 
 html {
 	display: block;
-	color: -khtml-text;
+	color: -tdehtml-text;
 }
 
 /*
@@ -99,7 +99,7 @@ q:after  {
 center {
 	display: block;
 	/* special centering to be able to emulate the html4/netscape behavior */
-	text-align: -khtml-center;
+	text-align: -tdehtml-center;
 }
 
 hr  {
@@ -107,7 +107,7 @@ hr  {
         margin: 12px auto;
         border-style: inset;
         border-width: 1px;
-        -khtml-flow-mode: -khtml-around-floats
+        -tdehtml-flow-mode: -tdehtml-around-floats
 }
 
 map {
@@ -171,7 +171,7 @@ table {
 	display: table;
 	border-collapse: separate;
 	border-spacing: 2px;
-        -khtml-flow-mode: -khtml-around-floats;
+        -tdehtml-flow-mode: -tdehtml-around-floats;
         box-sizing: border-box;
 }
 
@@ -181,11 +181,11 @@ table[align="center"] {
 }
 
 table[align="left"] {
-	float: -khtml-left;
+	float: -tdehtml-left;
 }
 
 table[align="right"] {
-	float: -khtml-right;
+	float: -tdehtml-right;
 }
 
 thead {
@@ -232,7 +232,7 @@ th {
 
 caption {
 	display: table-caption;
-	text-align: -khtml-center;
+	text-align: -tdehtml-center;
 }
 
 /*
@@ -243,19 +243,19 @@ ul, menu, dir {
         display: block;
         list-style-type: disc;
         margin: 1__qem 0 1em 0;
-        -khtml-padding-start: 40px
+        -tdehtml-padding-start: 40px
 }
 
 ol {
         display: block;
         list-style-type: decimal;
         margin: 1__qem 0 1em 0;
-        -khtml-padding-start: 40px
+        -tdehtml-padding-start: 40px
 }
 
 li {
         display: list-item;
-        -khtml-flow-mode: -khtml-around-floats;
+        -tdehtml-flow-mode: -tdehtml-around-floats;
 }
 
 
@@ -273,7 +273,7 @@ dd {
 }
 
 dl > dd {
-	-khtml-margin-start: 40px;
+	-tdehtml-margin-start: 40px;
 }
 
 dl {
@@ -329,7 +329,7 @@ fieldset {
         padding: 0.75em 0.625em;
 	margin: 1.0em 0;
         border: 2px groove threedface;
-        -khtml-flow-mode: -khtml-around-floats
+        -tdehtml-flow-mode: -tdehtml-around-floats
 }
 
 button {
@@ -346,7 +346,7 @@ button:active {
 }
 
 input, textarea {
-        text-align: -khtml-auto;
+        text-align: -tdehtml-auto;
 }
 
 input, textarea, select, button {
@@ -357,7 +357,7 @@ input, textarea, select, button {
 input { color: windowtext;
         font-family: sans-serif;
         font-size: small;
-        border: 2px -khtml-native;
+        border: 2px -tdehtml-native;
 }
 
 input[type="hidden"] {
@@ -396,7 +396,7 @@ select {
 textarea {
         color: windowtext;
         font-family: monospace;
-        border: 2px -khtml-native;
+        border: 2px -tdehtml-native;
 }
 
 /*
diff --git a/khtml/css/makeprop b/tdehtml/css/makeprop
index a1a30ac97..a1a30ac97 100644
--- a/khtml/css/makeprop
+++ b/tdehtml/css/makeprop
diff --git a/khtml/css/makevalues b/tdehtml/css/makevalues
index 0f81f1612..a61da67da 100755
--- a/khtml/css/makevalues
+++ b/tdehtml/css/makevalues
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #   This file is part of the KDE libraries
 #
 #   Copyright (C) 1999 Waldo Bastian (bastian@kde.org)
diff --git a/khtml/css/parser.cpp b/tdehtml/css/parser.cpp
index 8b2e008d8..4cc238ee2 100644
--- a/khtml/css/parser.cpp
+++ b/tdehtml/css/parser.cpp
@@ -1,31 +1,37 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
-
-/*  Skeleton parser for Yacc-like parsing with Bison,
-    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2, or (at your option)
-    any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
+
+/* Bison implementation for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
@@ -37,128 +43,32 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.5"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Pure parsers.  */
 #define YYPURE 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
-#define yyparse cssyyparse
-#define yylex   cssyylex
-#define yyerror cssyyerror
-#define yylval  cssyylval
-#define yychar  cssyychar
-#define yydebug cssyydebug
-#define yynerrs cssyynerrs
+/* Push parsers.  */
+#define YYPUSH 0
 
+/* Pull parsers.  */
+#define YYPULL 1
 
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     UNIMPORTANT_TOK = 258,
-     S = 259,
-     SGML_CD = 260,
-     INCLUDES = 261,
-     DASHMATCH = 262,
-     BEGINSWITH = 263,
-     ENDSWITH = 264,
-     CONTAINS = 265,
-     STRING = 266,
-     IDENT = 267,
-     NTH = 268,
-     HASH = 269,
-     IMPORT_SYM = 270,
-     PAGE_SYM = 271,
-     MEDIA_SYM = 272,
-     FONT_FACE_SYM = 273,
-     CHARSET_SYM = 274,
-     NAMESPACE_SYM = 275,
-     KHTML_RULE_SYM = 276,
-     KHTML_DECLS_SYM = 277,
-     KHTML_VALUE_SYM = 278,
-     IMPORTANT_SYM = 279,
-     QEMS = 280,
-     EMS = 281,
-     EXS = 282,
-     PXS = 283,
-     CMS = 284,
-     MMS = 285,
-     INS = 286,
-     PTS = 287,
-     PCS = 288,
-     DEGS = 289,
-     RADS = 290,
-     GRADS = 291,
-     MSECS = 292,
-     SECS = 293,
-     HERZ = 294,
-     KHERZ = 295,
-     DIMEN = 296,
-     PERCENTAGE = 297,
-     FLOAT = 298,
-     INTEGER = 299,
-     URI = 300,
-     FUNCTION = 301,
-     NOTFUNCTION = 302,
-     UNICODERANGE = 303
-   };
-#endif
-#define UNIMPORTANT_TOK 258
-#define S 259
-#define SGML_CD 260
-#define INCLUDES 261
-#define DASHMATCH 262
-#define BEGINSWITH 263
-#define ENDSWITH 264
-#define CONTAINS 265
-#define STRING 266
-#define IDENT 267
-#define NTH 268
-#define HASH 269
-#define IMPORT_SYM 270
-#define PAGE_SYM 271
-#define MEDIA_SYM 272
-#define FONT_FACE_SYM 273
-#define CHARSET_SYM 274
-#define NAMESPACE_SYM 275
-#define KHTML_RULE_SYM 276
-#define KHTML_DECLS_SYM 277
-#define KHTML_VALUE_SYM 278
-#define IMPORTANT_SYM 279
-#define QEMS 280
-#define EMS 281
-#define EXS 282
-#define PXS 283
-#define CMS 284
-#define MMS 285
-#define INS 286
-#define PTS 287
-#define PCS 288
-#define DEGS 289
-#define RADS 290
-#define GRADS 291
-#define MSECS 292
-#define SECS 293
-#define HERZ 294
-#define KHERZ 295
-#define DIMEN 296
-#define PERCENTAGE 297
-#define FLOAT 298
-#define INTEGER 299
-#define URI 300
-#define FUNCTION 301
-#define NOTFUNCTION 302
-#define UNICODERANGE 303
-
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
+/* Substitute the variable and function names.  */
+#define yyparse         cssyyparse
+#define yylex           cssyylex
+#define yyerror         cssyyerror
+#define yylval          cssyylval
+#define yychar          cssyychar
+#define yydebug         cssyydebug
+#define yynerrs         cssyynerrs
 
 
 /* Copy the first part of user declarations.  */
@@ -246,6 +156,7 @@ static inline int getValueID(const char *tagStr, int len)
 #define YYPARSE_PARAM parser
 
 
+
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -259,9 +170,74 @@ static inline int getValueID(const char *tagStr, int len)
 # define YYERROR_VERBOSE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     UNIMPORTANT_TOK = 258,
+     S = 259,
+     SGML_CD = 260,
+     INCLUDES = 261,
+     DASHMATCH = 262,
+     BEGINSWITH = 263,
+     ENDSWITH = 264,
+     CONTAINS = 265,
+     STRING = 266,
+     IDENT = 267,
+     NTH = 268,
+     HASH = 269,
+     IMPORT_SYM = 270,
+     PAGE_SYM = 271,
+     MEDIA_SYM = 272,
+     FONT_FACE_SYM = 273,
+     CHARSET_SYM = 274,
+     NAMESPACE_SYM = 275,
+     TDEHTML_RULE_SYM = 276,
+     TDEHTML_DECLS_SYM = 277,
+     TDEHTML_VALUE_SYM = 278,
+     IMPORTANT_SYM = 279,
+     QEMS = 280,
+     EMS = 281,
+     EXS = 282,
+     PXS = 283,
+     CMS = 284,
+     MMS = 285,
+     INS = 286,
+     PTS = 287,
+     PCS = 288,
+     DEGS = 289,
+     RADS = 290,
+     GRADS = 291,
+     MSECS = 292,
+     SECS = 293,
+     HERZ = 294,
+     KHERZ = 295,
+     DIMEN = 296,
+     PERCENTAGE = 297,
+     FLOAT = 298,
+     INTEGER = 299,
+     URI = 300,
+     FUNCTION = 301,
+     NOTFUNCTION = 302,
+     UNICODERANGE = 303
+   };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
 
-typedef union YYSTYPE {
     CSSRuleImpl *rule;
     CSSSelector *selector;
     TQPtrList<CSSSelector> *selectorList;
@@ -281,16 +257,16 @@ typedef union YYSTYPE {
     char tok;
     Value value;
     ValueList *valueList;
-} YYSTYPE;
-/* Line 191 of yacc.c.  */
 
+
+
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
-
 /* Copy the second part of user declarations.  */
 
 
@@ -313,58 +289,171 @@ static int cssyylex( YYSTYPE *yylval ) {
 
 
 
-/* Line 214 of yacc.c.  */
 
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
 
-# ifndef YYFREE
-#  define YYFREE free
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
 # endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
 # endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
+#endif
+{
+  return yyi;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_USE_ALLOCA
 #  if YYSTACK_USE_ALLOCA
-#   define YYSTACK_ALLOC alloca
-#  endif
-# else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
 #  endif
+# else
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -372,74 +461,72 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  register YYSIZE_T yyi;		\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (0)
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
-#endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
 
-/* YYFINAL -- State number of the termination state. */
+/* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  16
 /* YYLAST -- Last index in YYTABLE.  */
 #define YYLAST   479
 
-/* YYNTOKENS -- Number of terminals. */
+/* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  67
-/* YYNNTS -- Number of nonterminals. */
+/* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  54
-/* YYNRULES -- Number of rules. */
+/* YYNRULES -- Number of rules.  */
 #define YYNRULES  162
-/* YYNRULES -- Number of states. */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  305
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   303
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -477,7 +564,7 @@ static const unsigned char yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short int yyprhs[] =
+static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     9,    12,    15,    18,    25,    28,    34,
       35,    38,    39,    42,    45,    46,    52,    56,    60,    61,
@@ -498,8 +585,8 @@ static const unsigned short int yyprhs[] =
      530,   534,   536
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
 {
       68,     0,    -1,    74,    73,    75,    77,    80,    -1,    69,
       72,    -1,    70,    72,    -1,    71,    72,    -1,    26,    54,
@@ -558,7 +645,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
        0,   257,   257,   258,   259,   260,   264,   271,   277,   302,
      303,   306,   308,   309,   312,   314,   319,   320,   323,   325,
@@ -580,24 +667,24 @@ static const unsigned short int yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "UNIMPORTANT_TOK", "S", "SGML_CD",
   "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING",
   "IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM",
   "PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM",
-  "KHTML_RULE_SYM", "KHTML_DECLS_SYM", "KHTML_VALUE_SYM", "IMPORTANT_SYM",
-  "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS",
-  "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE",
-  "FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE",
-  "'{'", "'}'", "';'", "','", "'+'", "'~'", "'>'", "'-'", "']'", "'='",
-  "')'", "'/'", "'@'", "$accept", "stylesheet", "khtml_rule",
-  "khtml_decls", "khtml_value", "maybe_space", "maybe_sgml",
-  "maybe_charset", "import_list", "import", "namespace_list", "namespace",
-  "maybe_ns_prefix", "rule_list", "rule", "string_or_uri",
+  "TDEHTML_RULE_SYM", "TDEHTML_DECLS_SYM", "TDEHTML_VALUE_SYM",
+  "IMPORTANT_SYM", "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS",
+  "PCS", "DEGS", "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ",
+  "DIMEN", "PERCENTAGE", "FLOAT", "INTEGER", "URI", "FUNCTION",
+  "NOTFUNCTION", "UNICODERANGE", "'{'", "'}'", "';'", "','", "'+'", "'~'",
+  "'>'", "'-'", "']'", "'='", "')'", "'/'", "'@'", "$accept", "stylesheet",
+  "tdehtml_rule", "tdehtml_decls", "tdehtml_value", "maybe_space",
+  "maybe_sgml", "maybe_charset", "import_list", "import", "namespace_list",
+  "namespace", "maybe_ns_prefix", "rule_list", "rule", "string_or_uri",
   "maybe_media_list", "media_list", "media", "ruleset_list", "medium",
   "page", "font_face", "combinator", "unary_operator", "ruleset",
   "selector_list", "selector", "namespace_selector", "simple_selector",
@@ -612,7 +699,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,    58,    46,    91,    42,   124,
@@ -625,7 +712,7 @@ static const unsigned short int yytoknum[] =
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+static const yytype_uint8 yyr1[] =
 {
        0,    67,    68,    68,    68,    68,    69,    70,    71,    72,
       72,    73,    73,    73,    74,    74,    74,    74,    75,    75,
@@ -647,7 +734,7 @@ static const unsigned char yyr1[] =
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
+static const yytype_uint8 yyr2[] =
 {
        0,     2,     5,     2,     2,     2,     6,     2,     5,     0,
        2,     0,     2,     2,     0,     5,     3,     3,     0,     3,
@@ -668,10 +755,10 @@ static const unsigned char yyr2[] =
        3,     1,     3
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned char yydefact[] =
+static const yytype_uint8 yydefact[] =
 {
       14,     0,     0,     0,     0,     0,     9,     9,     9,    11,
        0,     0,     9,     9,     7,     9,     1,     3,     4,     5,
@@ -706,8 +793,8 @@ static const unsigned char yydefact[] =
        0,    90,    46,     9,    48
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
 {
       -1,     5,     6,     7,     8,   232,    20,     9,    31,    92,
       93,   169,   253,   170,   218,   208,   269,   270,   219,   300,
@@ -720,7 +807,7 @@ static const short int yydefgoto[] =
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -167
-static const short int yypact[] =
+static const yytype_int16 yypact[] =
 {
      252,    19,   -46,   -32,   -20,    44,  -167,  -167,  -167,  -167,
      147,   183,  -167,  -167,  -167,  -167,  -167,    96,    96,    96,
@@ -756,7 +843,7 @@ static const short int yypact[] =
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
+static const yytype_int16 yypgoto[] =
 {
     -167,  -167,  -167,  -167,  -167,    -1,   -82,  -167,  -167,   163,
     -167,  -167,  -167,  -167,  -167,    82,  -167,    76,  -167,  -167,
@@ -768,10 +855,9 @@ static const short int yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -120
-static const short int yytable[] =
+static const yytype_int16 yytable[] =
 {
       11,   200,    24,    23,   222,    17,    18,    19,    12,    24,
      167,    26,    27,   123,    28,   118,   206,   120,    24,   187,
@@ -823,7 +909,13 @@ static const short int yytable[] =
       70,    71,    72,    73,    74,    75,     0,    77,    78,    79
 };
 
-static const short int yycheck[] =
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-167))
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+
+static const yytype_int16 yycheck[] =
 {
        1,   158,     4,    10,   170,     6,     7,     8,    54,     4,
       92,    12,    13,    47,    15,    44,    11,    46,     4,   114,
@@ -877,7 +969,7 @@ static const short int yycheck[] =
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
 {
        0,    24,    26,    27,    28,    68,    69,    70,    71,    74,
        1,    72,    54,    54,   106,    54,     0,    72,    72,    72,
@@ -912,22 +1004,6 @@ static const unsigned char yystos[] =
       86,    62,    55,    92,    72
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -940,9 +1016,18 @@ static const unsigned char yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -952,31 +1037,54 @@ do								\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
+
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)		\
-   ((Current).first_line   = (Rhs)[1].first_line,	\
-    (Current).first_column = (Rhs)[1].first_column,	\
-    (Current).last_line    = (Rhs)[N].last_line,	\
-    (Current).last_column  = (Rhs)[N].last_column)
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
 
+
+/* This macro is provided for backward compatibility. */
+
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -997,43 +1105,100 @@ while (0)
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
 
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
 
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 #else
 static void
-yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
@@ -1041,45 +1206,52 @@ yy_stack_print (bottom, top)
 do {								\
   if (yydebug)							\
     yy_stack_print ((Bottom), (Top));				\
-} while (0)
+} while (YYID (0))
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
 #else
 static void
-yy_reduce_print (yyrule)
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
     int yyrule;
 #endif
 {
+  int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      YYFPRINTF (stderr, "\n");
+    }
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -1094,61 +1266,58 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
 
 
-
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
 {
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
     continue;
-
-  return yys - yystr - 1;
+  return yylen;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static char *
-#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#   else
+#else
+static char *
 yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -1158,144 +1327,292 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
-
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
 
+  if (! yyres)
+    return yystrlen (yystr);
 
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                if (! (yysize <= yysize1
+                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  return 2;
+                yysize = yysize1;
+              }
+        }
+    }
 
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
     }
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-  switch (yytype)
+  yysize1 = yysize + yystrlen (yyformat);
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    return 2;
+  yysize = yysize1;
+
+  if (*yymsg_alloc < yysize)
     {
-      default:
-        break;
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
-  YYFPRINTF (yyoutput, ")");
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
+#endif /* YYERROR_VERBOSE */
 
-#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {
-      case 83: /* maybe_media_list */
+      case 83: /* "maybe_media_list" */
 
-        { delete yyvaluep->mediaList; yyvaluep->mediaList = 0; };
+	{ delete (yyvaluep->mediaList); (yyvaluep->mediaList) = 0; };
 
-        break;
-      case 84: /* media_list */
+	break;
+      case 84: /* "media_list" */
 
-        { delete yyvaluep->mediaList; yyvaluep->mediaList = 0; };
+	{ delete (yyvaluep->mediaList); (yyvaluep->mediaList) = 0; };
 
-        break;
-      case 86: /* ruleset_list */
+	break;
+      case 86: /* "ruleset_list" */
 
-        { delete yyvaluep->ruleList; yyvaluep->ruleList = 0; };
+	{ delete (yyvaluep->ruleList); (yyvaluep->ruleList) = 0; };
 
-        break;
-      case 93: /* selector_list */
+	break;
+      case 93: /* "selector_list" */
 
-        { delete yyvaluep->selectorList; yyvaluep->selectorList = 0; };
+	{ delete (yyvaluep->selectorList); (yyvaluep->selectorList) = 0; };
 
-        break;
-      case 94: /* selector */
+	break;
+      case 94: /* "selector" */
 
-        { delete yyvaluep->selector; yyvaluep->selector = 0; };
+	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
 
-        break;
-      case 96: /* simple_selector */
+	break;
+      case 96: /* "simple_selector" */
 
-        { delete yyvaluep->selector; yyvaluep->selector = 0; };
+	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
 
-        break;
-      case 98: /* specifier_list */
+	break;
+      case 98: /* "specifier_list" */
 
-        { delete yyvaluep->selector; yyvaluep->selector = 0; };
+	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
 
-        break;
-      case 99: /* specifier */
+	break;
+      case 99: /* "specifier" */
 
-        { delete yyvaluep->selector; yyvaluep->selector = 0; };
+	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
 
-        break;
-      case 100: /* class */
+	break;
+      case 100: /* "class" */
 
-        { delete yyvaluep->selector; yyvaluep->selector = 0; };
+	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
 
-        break;
-      case 102: /* attrib */
+	break;
+      case 102: /* "attrib" */
 
-        { delete yyvaluep->selector; yyvaluep->selector = 0; };
+	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
 
-        break;
-      case 105: /* pseudo */
+	break;
+      case 105: /* "pseudo" */
 
-        { delete yyvaluep->selector; yyvaluep->selector = 0; };
+	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
 
-        break;
-      case 111: /* expr */
+	break;
+      case 111: /* "expr" */
 
-        { delete yyvaluep->valueList; yyvaluep->valueList = 0; };
+	{ delete (yyvaluep->valueList); (yyvaluep->valueList) = 0; };
 
-        break;
+	break;
 
       default:
-        break;
+	break;
     }
 }
 
 
 /* Prevent warnings from -Wmissing-prototypes.  */
-
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
-# else
+#else
 int yyparse ();
-# endif
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void);
 #else
 int yyparse ();
@@ -1303,23 +1620,23 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
-
-
-
-
 /*----------.
 | yyparse.  |
 `----------*/
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
 #else
@@ -1329,72 +1646,78 @@ yyparse ()
 #endif
 #endif
 {
-  /* The lookahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
-/* Number of syntax errors so far.  */
-int yynerrs;
+    /* Number of syntax errors so far.  */
+    int yynerrs;
 
-  register int yystate;
-  register int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *yyssp;
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
 
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
 
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;
 
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
-
   yyssp = yyss;
   yyvsp = yyvs;
 
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1402,8 +1725,7 @@ int yynerrs;
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
@@ -1416,21 +1738,19 @@ int yynerrs;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* Give user a chance to reallocate the stack.  Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
-
+	yytype_int16 *yyss1 = yyss;
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1438,24 +1758,23 @@ int yynerrs;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1466,7 +1785,6 @@ int yynerrs;
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1476,6 +1794,9 @@ int yynerrs;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
   goto yybackup;
 
 /*-----------.
@@ -1483,14 +1804,12 @@ int yynerrs;
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
 
   /* First try to decide what to do without reference to lookahead token.  */
-
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1510,7 +1829,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1521,31 +1840,26 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
   yystate = yyn;
+  *++yyvsp = yylval;
+
   goto yynewstate;
 
 
@@ -1584,23 +1898,23 @@ yyreduce:
 
     {
         CSSParser *p = static_cast<CSSParser *>(parser);
-	p->rule = yyvsp[-2].rule;
-    ;}
+	p->rule = (yyvsp[(4) - (6)].rule);
+    }
     break;
 
   case 7:
 
     {
 	/* can be empty */
-    ;}
+    }
     break;
 
   case 8:
 
     {
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( yyvsp[-1].valueList ) {
-	    p->valueList = yyvsp[-1].valueList;
+	if ( (yyvsp[(4) - (5)].valueList) ) {
+	    p->valueList = (yyvsp[(4) - (5)].valueList);
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got property for " << p->id <<
 		(p->important?" important":"")<< endl;
@@ -1618,223 +1932,223 @@ yyreduce:
 #endif
 	delete p->valueList;
 	p->valueList = 0;
-    ;}
+    }
     break;
 
   case 15:
 
     {
 #ifdef CSS_DEBUG
-     kdDebug( 6080 ) << "charset rule: " << qString(yyvsp[-2].string) << endl;
+     kdDebug( 6080 ) << "charset rule: " << qString((yyvsp[(3) - (5)].string)) << endl;
 #endif
- ;}
+ }
     break;
 
   case 19:
 
     {
      CSSParser *p = static_cast<CSSParser *>(parser);
-     if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
-	 p->styleElement->append( yyvsp[-1].rule );
+     if ( (yyvsp[(2) - (3)].rule) && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
+	 p->styleElement->append( (yyvsp[(2) - (3)].rule) );
      } else {
-	 delete yyvsp[-1].rule;
+	 delete (yyvsp[(2) - (3)].rule);
      }
- ;}
+ }
     break;
 
   case 20:
 
     {
 #ifdef CSS_DEBUG
-	kdDebug( 6080 ) << "@import: " << qString(yyvsp[-3].string) << endl;
+	kdDebug( 6080 ) << "@import: " << qString((yyvsp[(3) - (6)].string)) << endl;
 #endif
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( yyvsp[-1].mediaList && p->styleElement && p->styleElement->isCSSStyleSheet() )
-	    yyval.rule = new CSSImportRuleImpl( p->styleElement, domString(yyvsp[-3].string), yyvsp[-1].mediaList );
+	if ( (yyvsp[(5) - (6)].mediaList) && p->styleElement && p->styleElement->isCSSStyleSheet() )
+	    (yyval.rule) = new CSSImportRuleImpl( p->styleElement, domString((yyvsp[(3) - (6)].string)), (yyvsp[(5) - (6)].mediaList) );
 	else
-	    yyval.rule = 0;
-    ;}
+	    (yyval.rule) = 0;
+    }
     break;
 
   case 21:
 
     {
-        yyval.rule = 0;
-    ;}
+        (yyval.rule) = 0;
+    }
     break;
 
   case 22:
 
     {
-        yyval.rule = 0;
-    ;}
+        (yyval.rule) = 0;
+    }
     break;
 
   case 25:
 
     {
 #ifdef CSS_DEBUG
-    kdDebug( 6080 ) << "@namespace: " << qString(yyvsp[-2].string) << endl;
+    kdDebug( 6080 ) << "@namespace: " << qString((yyvsp[(4) - (6)].string)) << endl;
 #endif
       CSSParser *p = static_cast<CSSParser *>(parser);
     if (p->styleElement && p->styleElement->isCSSStyleSheet())
-        static_cast<CSSStyleSheetImpl*>(p->styleElement)->addNamespace(p, domString(yyvsp[-3].string), domString(yyvsp[-2].string));
- ;}
+        static_cast<CSSStyleSheetImpl*>(p->styleElement)->addNamespace(p, domString((yyvsp[(3) - (6)].string)), domString((yyvsp[(4) - (6)].string)));
+ }
     break;
 
   case 28:
 
-    { yyval.string.string = 0; ;}
+    { (yyval.string).string = 0; }
     break;
 
   case 29:
 
-    { yyval.string = yyvsp[-1].string; ;}
+    { (yyval.string) = (yyvsp[(1) - (2)].string); }
     break;
 
   case 31:
 
     {
      CSSParser *p = static_cast<CSSParser *>(parser);
-     if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
-	 p->styleElement->append( yyvsp[-1].rule );
+     if ( (yyvsp[(2) - (3)].rule) && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
+	 p->styleElement->append( (yyvsp[(2) - (3)].rule) );
      } else {
-	 delete yyvsp[-1].rule;
+	 delete (yyvsp[(2) - (3)].rule);
      }
- ;}
+ }
     break;
 
   case 38:
 
-    { delete yyvsp[-1].rule; yyval.rule = 0; ;}
+    { delete (yyvsp[(1) - (2)].rule); (yyval.rule) = 0; }
     break;
 
   case 41:
 
     {
-	yyval.mediaList = new MediaListImpl();
-    ;}
+	(yyval.mediaList) = new MediaListImpl();
+    }
     break;
 
   case 43:
 
     {
-	yyval.mediaList = new MediaListImpl();
-	yyval.mediaList->appendMedium( domString(yyvsp[0].string).lower() );
-    ;}
+	(yyval.mediaList) = new MediaListImpl();
+	(yyval.mediaList)->appendMedium( domString((yyvsp[(1) - (1)].string)).lower() );
+    }
     break;
 
   case 44:
 
     {
-	yyval.mediaList = yyvsp[-3].mediaList;
-	if (yyval.mediaList)
-	    yyval.mediaList->appendMedium( domString(yyvsp[0].string).lower() );
-    ;}
+	(yyval.mediaList) = (yyvsp[(1) - (4)].mediaList);
+	if ((yyval.mediaList))
+	    (yyval.mediaList)->appendMedium( domString((yyvsp[(4) - (4)].string)).lower() );
+    }
     break;
 
   case 45:
 
     {
-       delete yyvsp[-1].mediaList;
-       yyval.mediaList = 0;
-    ;}
+       delete (yyvsp[(1) - (2)].mediaList);
+       (yyval.mediaList) = 0;
+    }
     break;
 
   case 46:
 
     {
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( yyvsp[-4].mediaList && yyvsp[-1].ruleList &&
+	if ( (yyvsp[(3) - (7)].mediaList) && (yyvsp[(6) - (7)].ruleList) &&
 	     p->styleElement && p->styleElement->isCSSStyleSheet() ) {
-	    yyval.rule = new CSSMediaRuleImpl( static_cast<CSSStyleSheetImpl*>(p->styleElement), yyvsp[-4].mediaList, yyvsp[-1].ruleList );
+	    (yyval.rule) = new CSSMediaRuleImpl( static_cast<CSSStyleSheetImpl*>(p->styleElement), (yyvsp[(3) - (7)].mediaList), (yyvsp[(6) - (7)].ruleList) );
 	} else {
-	    yyval.rule = 0;
-	    delete yyvsp[-4].mediaList;
-	    delete yyvsp[-1].ruleList;
+	    (yyval.rule) = 0;
+	    delete (yyvsp[(3) - (7)].mediaList);
+	    delete (yyvsp[(6) - (7)].ruleList);
 	}
-    ;}
+    }
     break;
 
   case 47:
 
-    { yyval.ruleList = 0; ;}
+    { (yyval.ruleList) = 0; }
     break;
 
   case 48:
 
     {
-      yyval.ruleList = yyvsp[-2].ruleList;
-      if ( yyvsp[-1].rule ) {
-	  if ( !yyval.ruleList ) yyval.ruleList = new CSSRuleListImpl();
-	  yyval.ruleList->append( yyvsp[-1].rule );
+      (yyval.ruleList) = (yyvsp[(1) - (3)].ruleList);
+      if ( (yyvsp[(2) - (3)].rule) ) {
+	  if ( !(yyval.ruleList) ) (yyval.ruleList) = new CSSRuleListImpl();
+	  (yyval.ruleList)->append( (yyvsp[(2) - (3)].rule) );
       }
-  ;}
+  }
     break;
 
   case 49:
 
     {
-      yyval.string = yyvsp[-1].string;
-  ;}
+      (yyval.string) = (yyvsp[(1) - (2)].string);
+  }
     break;
 
   case 50:
 
     {
-      yyval.rule = 0;
-    ;}
+      (yyval.rule) = 0;
+    }
     break;
 
   case 51:
 
     {
-      yyval.rule = 0;
-    ;}
+      (yyval.rule) = 0;
+    }
     break;
 
   case 52:
 
     {
-      yyval.rule = 0;
-    ;}
+      (yyval.rule) = 0;
+    }
     break;
 
   case 53:
 
     {
-      yyval.rule = 0;
-    ;}
+      (yyval.rule) = 0;
+    }
     break;
 
   case 54:
 
-    { yyval.relation = CSSSelector::DirectAdjacent; ;}
+    { (yyval.relation) = CSSSelector::DirectAdjacent; }
     break;
 
   case 55:
 
-    { yyval.relation = CSSSelector::IndirectAdjacent; ;}
+    { (yyval.relation) = CSSSelector::IndirectAdjacent; }
     break;
 
   case 56:
 
-    { yyval.relation = CSSSelector::Child; ;}
+    { (yyval.relation) = CSSSelector::Child; }
     break;
 
   case 57:
 
-    { yyval.relation = CSSSelector::Descendant; ;}
+    { (yyval.relation) = CSSSelector::Descendant; }
     break;
 
   case 58:
 
-    { yyval.val = -1; ;}
+    { (yyval.val) = -1; }
     break;
 
   case 59:
 
-    { yyval.val = 1; ;}
+    { (yyval.val) = 1; }
     break;
 
   case 60:
@@ -1844,174 +2158,174 @@ yyreduce:
 	kdDebug( 6080 ) << "got ruleset" << endl << "  selector:" << endl;
 #endif
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( yyvsp[-1].selectorList && yyvsp[0].ok && p->numParsedProperties ) {
+	if ( (yyvsp[(1) - (2)].selectorList) && (yyvsp[(2) - (2)].ok) && p->numParsedProperties ) {
 	    CSSStyleRuleImpl *rule = new CSSStyleRuleImpl( p->styleElement );
 	    CSSStyleDeclarationImpl *decl = p->createStyleDeclaration( rule );
-	    rule->setSelector( yyvsp[-1].selectorList );
+	    rule->setSelector( (yyvsp[(1) - (2)].selectorList) );
 	    rule->setDeclaration(decl);
-	    yyval.rule = rule;
+	    (yyval.rule) = rule;
 	} else {
-	    yyval.rule = 0;
-	    delete yyvsp[-1].selectorList;
+	    (yyval.rule) = 0;
+	    delete (yyvsp[(1) - (2)].selectorList);
 	    p->clearProperties();
 	}
-    ;}
+    }
     break;
 
   case 61:
 
     {
-	if ( yyvsp[0].selector ) {
-	    yyval.selectorList = new TQPtrList<CSSSelector>;
-            yyval.selectorList->setAutoDelete( true );
+	if ( (yyvsp[(1) - (1)].selector) ) {
+	    (yyval.selectorList) = new TQPtrList<CSSSelector>;
+            (yyval.selectorList)->setAutoDelete( true );
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
-	    yyvsp[0].selector->print();
+	    (yyvsp[(1) - (1)].selector)->print();
 #endif
-	    yyval.selectorList->append( yyvsp[0].selector );
-	    khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
+	    (yyval.selectorList)->append( (yyvsp[(1) - (1)].selector) );
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), (yyvsp[(1) - (1)].selector));
 	} else {
-	    yyval.selectorList = 0;
+	    (yyval.selectorList) = 0;
 	}
-    ;}
+    }
     break;
 
   case 62:
 
     {
-	if ( yyvsp[-3].selectorList && yyvsp[0].selector ) {
-	    yyval.selectorList = yyvsp[-3].selectorList;
-	    yyval.selectorList->append( yyvsp[0].selector );
-	    khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
+	if ( (yyvsp[(1) - (4)].selectorList) && (yyvsp[(4) - (4)].selector) ) {
+	    (yyval.selectorList) = (yyvsp[(1) - (4)].selectorList);
+	    (yyval.selectorList)->append( (yyvsp[(4) - (4)].selector) );
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), (yyvsp[(4) - (4)].selector));
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
-	    yyvsp[0].selector->print();
+	    (yyvsp[(4) - (4)].selector)->print();
 #endif
 	} else {
-	    delete yyvsp[-3].selectorList;
-	    delete yyvsp[0].selector;
-	    yyval.selectorList = 0;
+	    delete (yyvsp[(1) - (4)].selectorList);
+	    delete (yyvsp[(4) - (4)].selector);
+	    (yyval.selectorList) = 0;
 	}
-    ;}
+    }
     break;
 
   case 63:
 
     {
-	delete yyvsp[-1].selectorList;
-	yyval.selectorList = 0;
-    ;}
+	delete (yyvsp[(1) - (2)].selectorList);
+	(yyval.selectorList) = 0;
+    }
     break;
 
   case 64:
 
     {
-	yyval.selector = yyvsp[0].selector;
-    ;}
+	(yyval.selector) = (yyvsp[(1) - (1)].selector);
+    }
     break;
 
   case 65:
 
     {
-	if ( !yyvsp[-2].selector || !yyvsp[0].selector ) {
-	    delete yyvsp[-2].selector;
-	    delete yyvsp[0].selector;
-	    yyval.selector = 0;
+	if ( !(yyvsp[(1) - (3)].selector) || !(yyvsp[(3) - (3)].selector) ) {
+	    delete (yyvsp[(1) - (3)].selector);
+	    delete (yyvsp[(3) - (3)].selector);
+	    (yyval.selector) = 0;
 	} else {
-	    yyval.selector = yyvsp[0].selector;
-	    CSSSelector *end = yyvsp[0].selector;
+	    (yyval.selector) = (yyvsp[(3) - (3)].selector);
+	    CSSSelector *end = (yyvsp[(3) - (3)].selector);
 	    while( end->tagHistory )
 		end = end->tagHistory;
-	    end->relation = yyvsp[-1].relation;
-	    end->tagHistory = yyvsp[-2].selector;
+	    end->relation = (yyvsp[(2) - (3)].relation);
+	    end->tagHistory = (yyvsp[(1) - (3)].selector);
 	}
-    ;}
+    }
     break;
 
   case 66:
 
     {
-	delete yyvsp[-1].selector;
-	yyval.selector = 0;
-    ;}
+	delete (yyvsp[(1) - (2)].selector);
+	(yyval.selector) = 0;
+    }
     break;
 
   case 67:
 
-    { yyval.string.string = 0; yyval.string.length = 0; ;}
+    { (yyval.string).string = 0; (yyval.string).length = 0; }
     break;
 
   case 68:
 
-    { static unsigned short star = '*'; yyval.string.string = &star; yyval.string.length = 1; ;}
+    { static unsigned short star = '*'; (yyval.string).string = &star; (yyval.string).length = 1; }
     break;
 
   case 69:
 
-    { yyval.string = yyvsp[-1].string; ;}
+    { (yyval.string) = (yyvsp[(1) - (2)].string); }
     break;
 
   case 70:
 
     {
-	yyval.selector = new CSSSelector();
-	yyval.selector->tag = yyvsp[-1].element;
-    ;}
+	(yyval.selector) = new CSSSelector();
+	(yyval.selector)->tag = (yyvsp[(1) - (2)].element);
+    }
     break;
 
   case 71:
 
     {
-	yyval.selector = yyvsp[-1].selector;
-        if ( yyval.selector )
-	    yyval.selector->tag = yyvsp[-2].element;
-    ;}
+	(yyval.selector) = (yyvsp[(2) - (3)].selector);
+        if ( (yyval.selector) )
+	    (yyval.selector)->tag = (yyvsp[(1) - (3)].element);
+    }
     break;
 
   case 72:
 
     {
-	yyval.selector = yyvsp[-1].selector;
-        if ( yyval.selector )
-            yyval.selector->tag = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
-    ;}
+	(yyval.selector) = (yyvsp[(1) - (2)].selector);
+        if ( (yyval.selector) )
+            (yyval.selector)->tag = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
+    }
     break;
 
   case 73:
 
     {
-        yyval.selector = new CSSSelector();
-        yyval.selector->tag = yyvsp[-1].element;
+        (yyval.selector) = new CSSSelector();
+        (yyval.selector)->tag = (yyvsp[(2) - (3)].element);
 	CSSParser *p = static_cast<CSSParser *>(parser);
         if (p->styleElement && p->styleElement->isCSSStyleSheet())
-            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->tag, domString(yyvsp[-2].string));
-    ;}
+            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->tag, domString((yyvsp[(1) - (3)].string)));
+    }
     break;
 
   case 74:
 
     {
-        yyval.selector = yyvsp[-1].selector;
-        if (yyval.selector) {
-            yyval.selector->tag = yyvsp[-2].element;
+        (yyval.selector) = (yyvsp[(3) - (4)].selector);
+        if ((yyval.selector)) {
+            (yyval.selector)->tag = (yyvsp[(2) - (4)].element);
             CSSParser *p = static_cast<CSSParser *>(parser);
             if (p->styleElement && p->styleElement->isCSSStyleSheet())
-                static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->tag, domString(yyvsp[-3].string));
+                static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->tag, domString((yyvsp[(1) - (4)].string)));
         }
-    ;}
+    }
     break;
 
   case 75:
 
     {
-        yyval.selector = yyvsp[-1].selector;
-        if (yyval.selector) {
-            yyval.selector->tag = makeId(anyNamespace, anyLocalName);
+        (yyval.selector) = (yyvsp[(2) - (3)].selector);
+        if ((yyval.selector)) {
+            (yyval.selector)->tag = makeId(anyNamespace, anyLocalName);
             CSSParser *p = static_cast<CSSParser *>(parser);
             if (p->styleElement && p->styleElement->isCSSStyleSheet())
-                static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->tag, domString(yyvsp[-2].string));
+                static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->tag, domString((yyvsp[(1) - (3)].string)));
         }
-    ;}
+    }
     break;
 
   case 76:
@@ -2019,76 +2333,76 @@ yyreduce:
     {
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	DOM::DocumentImpl *doc = p->document();
-	TQString tag = qString(yyvsp[0].string);
+	QString tag = qString((yyvsp[(1) - (1)].string));
 	if ( doc ) {
 	    if (doc->isHTMLDocument())
 		tag = tag.lower();
 	    const DOMString dtag(tag);
-            yyval.element = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
+            (yyval.element) = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
 	} else {
-	    yyval.element = makeId(p->defaultNamespace(), khtml::getTagID(tag.lower().ascii(), tag.length()));
+	    (yyval.element) = makeId(p->defaultNamespace(), tdehtml::getTagID(tag.lower().ascii(), tag.length()));
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown tags
 // 	    assert($$ != 0);
 	}
-    ;}
+    }
     break;
 
   case 77:
 
     {
-	yyval.element = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
-    ;}
+	(yyval.element) = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
+    }
     break;
 
   case 78:
 
     {
-	yyval.selector = yyvsp[0].selector;
-	yyval.selector->nonCSSHint = static_cast<CSSParser *>(parser)->nonCSSHint;
-    ;}
+	(yyval.selector) = (yyvsp[(1) - (1)].selector);
+	(yyval.selector)->nonCSSHint = static_cast<CSSParser *>(parser)->nonCSSHint;
+    }
     break;
 
   case 79:
 
     {
-	yyval.selector = yyvsp[-1].selector;
-	if ( yyval.selector ) {
-            CSSSelector *end = yyvsp[-1].selector;
+	(yyval.selector) = (yyvsp[(1) - (2)].selector);
+	if ( (yyval.selector) ) {
+            CSSSelector *end = (yyvsp[(1) - (2)].selector);
             while( end->tagHistory )
                 end = end->tagHistory;
             end->relation = CSSSelector::SubSelector;
-            end->tagHistory = yyvsp[0].selector;
+            end->tagHistory = (yyvsp[(2) - (2)].selector);
 	}
-    ;}
+    }
     break;
 
   case 80:
 
     {
-	delete yyvsp[-1].selector;
-	yyval.selector = 0;
-    ;}
+	delete (yyvsp[(1) - (2)].selector);
+	(yyval.selector) = 0;
+    }
     break;
 
   case 81:
 
     {
-	yyval.selector = new CSSSelector();
-	yyval.selector->match = CSSSelector::Id;
-	yyval.selector->attr = ATTR_ID;
-	yyval.selector->value = domString(yyvsp[0].string);
-    ;}
+	(yyval.selector) = new CSSSelector();
+	(yyval.selector)->match = CSSSelector::Id;
+	(yyval.selector)->attr = ATTR_ID;
+	(yyval.selector)->value = domString((yyvsp[(1) - (1)].string));
+    }
     break;
 
   case 85:
 
     {
-	yyval.selector = new CSSSelector();
-	yyval.selector->match = CSSSelector::Class;
-	yyval.selector->attr = ATTR_CLASS;
-	yyval.selector->value = domString(yyvsp[0].string);
-    ;}
+	(yyval.selector) = new CSSSelector();
+	(yyval.selector)->match = CSSSelector::Class;
+	(yyval.selector)->attr = ATTR_CLASS;
+	(yyval.selector)->value = domString((yyvsp[(2) - (2)].string));
+    }
     break;
 
   case 86:
@@ -2097,564 +2411,572 @@ yyreduce:
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	DOM::DocumentImpl *doc = p->document();
 
-	TQString attr = qString(yyvsp[-1].string);
+	QString attr = qString((yyvsp[(1) - (2)].string));
 	if ( doc ) {
 	    if (doc->isHTMLDocument())
 		attr = attr.lower();
 	    const DOMString dattr(attr);
 #ifdef APPLE_CHANGES
-            yyval.attribute = doc->attrId(0, dattr.implementation(), false);
+            (yyval.attribute) = doc->attrId(0, dattr.implementation(), false);
 #else
-	    yyval.attribute = doc->getId(NodeImpl::AttributeId, dattr.implementation(), false, true);
+	    (yyval.attribute) = doc->getId(NodeImpl::AttributeId, dattr.implementation(), false, true);
 #endif
 	} else {
-	    yyval.attribute = khtml::getAttrID(attr.lower().ascii(), attr.length());
+	    (yyval.attribute) = tdehtml::getAttrID(attr.lower().ascii(), attr.length());
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown attributes
-	    assert(yyval.attribute != 0);
+	    assert((yyval.attribute) != 0);
 	    }
-    ;}
+    }
     break;
 
   case 87:
 
     {
-	yyval.selector = new CSSSelector();
-	yyval.selector->attr = yyvsp[-1].attribute;
-	yyval.selector->match = CSSSelector::Set;
-    ;}
+	(yyval.selector) = new CSSSelector();
+	(yyval.selector)->attr = (yyvsp[(3) - (4)].attribute);
+	(yyval.selector)->match = CSSSelector::Set;
+    }
     break;
 
   case 88:
 
     {
-	yyval.selector = new CSSSelector();
-	yyval.selector->attr = yyvsp[-5].attribute;
-	yyval.selector->match = yyvsp[-4].match;
-	yyval.selector->value = domString(yyvsp[-2].string);
-    ;}
+	(yyval.selector) = new CSSSelector();
+	(yyval.selector)->attr = (yyvsp[(3) - (8)].attribute);
+	(yyval.selector)->match = (yyvsp[(4) - (8)].match);
+	(yyval.selector)->value = domString((yyvsp[(6) - (8)].string));
+    }
     break;
 
   case 89:
 
     {
-        yyval.selector = new CSSSelector();
-        yyval.selector->attr = yyvsp[-1].attribute;
-        yyval.selector->match = CSSSelector::Set;
+        (yyval.selector) = new CSSSelector();
+        (yyval.selector)->attr = (yyvsp[(4) - (5)].attribute);
+        (yyval.selector)->match = CSSSelector::Set;
         CSSParser *p = static_cast<CSSParser *>(parser);
         if (p->styleElement && p->styleElement->isCSSStyleSheet())
-            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->attr, domString(yyvsp[-2].string));
-    ;}
+            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->attr, domString((yyvsp[(3) - (5)].string)));
+    }
     break;
 
   case 90:
 
     {
-        yyval.selector = new CSSSelector();
-        yyval.selector->attr = yyvsp[-5].attribute;
-        yyval.selector->match = (CSSSelector::Match)yyvsp[-4].match;
-        yyval.selector->value = domString(yyvsp[-2].string);
+        (yyval.selector) = new CSSSelector();
+        (yyval.selector)->attr = (yyvsp[(4) - (9)].attribute);
+        (yyval.selector)->match = (CSSSelector::Match)(yyvsp[(5) - (9)].match);
+        (yyval.selector)->value = domString((yyvsp[(7) - (9)].string));
         CSSParser *p = static_cast<CSSParser *>(parser);
         if (p->styleElement && p->styleElement->isCSSStyleSheet())
-            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->attr, domString(yyvsp[-6].string));
-   ;}
+            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->attr, domString((yyvsp[(3) - (9)].string)));
+   }
     break;
 
   case 91:
 
     {
-	yyval.match = CSSSelector::Exact;
-    ;}
+	(yyval.match) = CSSSelector::Exact;
+    }
     break;
 
   case 92:
 
     {
-	yyval.match = CSSSelector::List;
-    ;}
+	(yyval.match) = CSSSelector::List;
+    }
     break;
 
   case 93:
 
     {
-	yyval.match = CSSSelector::Hyphen;
-    ;}
+	(yyval.match) = CSSSelector::Hyphen;
+    }
     break;
 
   case 94:
 
     {
-	yyval.match = CSSSelector::Begin;
-    ;}
+	(yyval.match) = CSSSelector::Begin;
+    }
     break;
 
   case 95:
 
     {
-	yyval.match = CSSSelector::End;
-    ;}
+	(yyval.match) = CSSSelector::End;
+    }
     break;
 
   case 96:
 
     {
-	yyval.match = CSSSelector::Contain;
-    ;}
+	(yyval.match) = CSSSelector::Contain;
+    }
     break;
 
   case 99:
 
     {
-	yyval.selector = new CSSSelector();
-	yyval.selector->match = CSSSelector::PseudoClass;
-	yyval.selector->value = domString(yyvsp[0].string);
-    ;}
+	(yyval.selector) = new CSSSelector();
+	(yyval.selector)->match = CSSSelector::PseudoClass;
+	(yyval.selector)->value = domString((yyvsp[(2) - (2)].string));
+    }
     break;
 
   case 100:
 
     {
-	yyval.selector = new CSSSelector();
-	yyval.selector->match = CSSSelector::PseudoElement;
-        yyval.selector->value = domString(yyvsp[0].string);
-    ;}
+	(yyval.selector) = new CSSSelector();
+	(yyval.selector)->match = CSSSelector::PseudoElement;
+        (yyval.selector)->value = domString((yyvsp[(3) - (3)].string));
+    }
     break;
 
   case 101:
 
     {
-        yyval.selector = new CSSSelector();
-        yyval.selector->match = CSSSelector::PseudoClass;
-        yyval.selector->string_arg = domString(yyvsp[-1].string);
-        yyval.selector->value = domString(yyvsp[-2].string);
-    ;}
+        (yyval.selector) = new CSSSelector();
+        (yyval.selector)->match = CSSSelector::PseudoClass;
+        (yyval.selector)->string_arg = domString((yyvsp[(3) - (4)].string));
+        (yyval.selector)->value = domString((yyvsp[(2) - (4)].string));
+    }
     break;
 
   case 102:
 
     {
-        yyval.selector = new CSSSelector();
-        yyval.selector->match = CSSSelector::PseudoClass;
-        yyval.selector->string_arg = TQString::number(yyvsp[-1].val);
-        yyval.selector->value = domString(yyvsp[-2].string);
-    ;}
+        (yyval.selector) = new CSSSelector();
+        (yyval.selector)->match = CSSSelector::PseudoClass;
+        (yyval.selector)->string_arg = QString::number((yyvsp[(3) - (4)].val));
+        (yyval.selector)->value = domString((yyvsp[(2) - (4)].string));
+    }
     break;
 
   case 103:
 
     {
-        yyval.selector = new CSSSelector();
-        yyval.selector->match = CSSSelector::PseudoClass;
-        yyval.selector->string_arg = domString(yyvsp[-1].string);
-        yyval.selector->value = domString(yyvsp[-2].string);
-    ;}
+        (yyval.selector) = new CSSSelector();
+        (yyval.selector)->match = CSSSelector::PseudoClass;
+        (yyval.selector)->string_arg = domString((yyvsp[(3) - (4)].string));
+        (yyval.selector)->value = domString((yyvsp[(2) - (4)].string));
+    }
     break;
 
   case 104:
 
     {
-        yyval.selector = new CSSSelector();
-        yyval.selector->match = CSSSelector::PseudoClass;
-        yyval.selector->string_arg = domString(yyvsp[-1].string);
-        yyval.selector->value = domString(yyvsp[-2].string);
-    ;}
+        (yyval.selector) = new CSSSelector();
+        (yyval.selector)->match = CSSSelector::PseudoClass;
+        (yyval.selector)->string_arg = domString((yyvsp[(3) - (4)].string));
+        (yyval.selector)->value = domString((yyvsp[(2) - (4)].string));
+    }
     break;
 
   case 105:
 
     {
-        yyval.selector = new CSSSelector();
-        yyval.selector->match = CSSSelector::PseudoClass;
-        yyval.selector->simpleSelector = yyvsp[-1].selector;
-        yyval.selector->value = domString(yyvsp[-3].string);
-    ;}
+        (yyval.selector) = new CSSSelector();
+        (yyval.selector)->match = CSSSelector::PseudoClass;
+        (yyval.selector)->simpleSelector = (yyvsp[(4) - (5)].selector);
+        (yyval.selector)->value = domString((yyvsp[(2) - (5)].string));
+    }
     break;
 
   case 106:
 
     {
-	yyval.ok = yyvsp[-1].ok;
-    ;}
+	(yyval.ok) = (yyvsp[(3) - (4)].ok);
+    }
     break;
 
   case 107:
 
     {
-	yyval.ok = false;
-    ;}
+	(yyval.ok) = false;
+    }
     break;
 
   case 108:
 
     {
-	yyval.ok = yyvsp[-1].ok;
-    ;}
+	(yyval.ok) = (yyvsp[(3) - (4)].ok);
+    }
     break;
 
   case 109:
 
     {
-	yyval.ok = yyvsp[-2].ok;
-	if ( yyvsp[-1].ok )
-	    yyval.ok = yyvsp[-1].ok;
-    ;}
+	(yyval.ok) = (yyvsp[(3) - (5)].ok);
+	if ( (yyvsp[(4) - (5)].ok) )
+	    (yyval.ok) = (yyvsp[(4) - (5)].ok);
+    }
     break;
 
   case 110:
 
     {
-	yyval.ok = yyvsp[-2].ok;
-    ;}
+	(yyval.ok) = (yyvsp[(3) - (5)].ok);
+    }
     break;
 
   case 111:
 
     {
-	yyval.ok = yyvsp[-2].ok;
-    ;}
+	(yyval.ok) = (yyvsp[(1) - (3)].ok);
+    }
     break;
 
   case 112:
 
     {
-        yyval.ok = false;
-    ;}
+        (yyval.ok) = false;
+    }
     break;
 
   case 113:
 
     {
-	yyval.ok = yyvsp[-3].ok;
-	if ( yyvsp[-2].ok )
-	    yyval.ok = yyvsp[-2].ok;
-    ;}
+	(yyval.ok) = (yyvsp[(1) - (4)].ok);
+	if ( (yyvsp[(2) - (4)].ok) )
+	    (yyval.ok) = (yyvsp[(2) - (4)].ok);
+    }
     break;
 
   case 114:
 
     {
-        yyval.ok = yyvsp[-3].ok;
-    ;}
+        (yyval.ok) = (yyvsp[(1) - (4)].ok);
+    }
     break;
 
   case 115:
 
     {
-	yyval.ok = false;
+	(yyval.ok) = false;
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( yyvsp[-4].prop_id && yyvsp[-1].valueList ) {
-	    p->valueList = yyvsp[-1].valueList;
+	if ( (yyvsp[(1) - (5)].prop_id) && (yyvsp[(4) - (5)].valueList) ) {
+	    p->valueList = (yyvsp[(4) - (5)].valueList);
 #ifdef CSS_DEBUG
-	    kdDebug( 6080 ) << "   got property: " << yyvsp[-4].prop_id <<
-		(yyvsp[0].b?" important":"")<< endl;
+	    kdDebug( 6080 ) << "   got property: " << (yyvsp[(1) - (5)].prop_id) <<
+		((yyvsp[(5) - (5)].b)?" important":"")<< endl;
 #endif
-	        bool ok = p->parseValue( yyvsp[-4].prop_id, yyvsp[0].b );
+	        bool ok = p->parseValue( (yyvsp[(1) - (5)].prop_id), (yyvsp[(5) - (5)].b) );
                 if ( ok )
-		    yyval.ok = ok;
+		    (yyval.ok) = ok;
 #ifdef CSS_DEBUG
 	        else
 		    kdDebug( 6080 ) << "     couldn't parse value!" << endl;
 #endif
 	} else {
-            delete yyvsp[-1].valueList;
+            delete (yyvsp[(4) - (5)].valueList);
         }
 	delete p->valueList;
 	p->valueList = 0;
-    ;}
+    }
     break;
 
   case 116:
 
     {
-        yyval.ok = false;
-    ;}
+        (yyval.ok) = false;
+    }
     break;
 
   case 117:
 
     {
-	TQString str = qString(yyvsp[-1].string);
-	yyval.prop_id = getPropertyID( str.lower().latin1(), str.length() );
-    ;}
+	QString str = qString((yyvsp[(1) - (2)].string));
+	(yyval.prop_id) = getPropertyID( str.lower().latin1(), str.length() );
+    }
     break;
 
   case 118:
 
-    { yyval.b = true; ;}
+    { (yyval.b) = true; }
     break;
 
   case 119:
 
-    { yyval.b = false; ;}
+    { (yyval.b) = false; }
     break;
 
   case 120:
 
     {
-	yyval.valueList = new ValueList;
-	yyval.valueList->addValue( yyvsp[0].value );
-    ;}
+	(yyval.valueList) = new ValueList;
+	(yyval.valueList)->addValue( (yyvsp[(1) - (1)].value) );
+    }
     break;
 
   case 121:
 
     {
-	yyval.valueList = yyvsp[-2].valueList;
-	if ( yyval.valueList ) {
-	    if ( yyvsp[-1].tok ) {
+	(yyval.valueList) = (yyvsp[(1) - (3)].valueList);
+	if ( (yyval.valueList) ) {
+	    if ( (yyvsp[(2) - (3)].tok) ) {
 		Value v;
 		v.id = 0;
 		v.unit = Value::Operator;
-		v.iValue = yyvsp[-1].tok;
-		yyval.valueList->addValue( v );
+		v.iValue = (yyvsp[(2) - (3)].tok);
+		(yyval.valueList)->addValue( v );
 	    }
-	    yyval.valueList->addValue( yyvsp[0].value );
+	    (yyval.valueList)->addValue( (yyvsp[(3) - (3)].value) );
 	}
-    ;}
+    }
     break;
 
   case 122:
 
     {
-	yyval.tok = '/';
-    ;}
+	(yyval.tok) = '/';
+    }
     break;
 
   case 123:
 
     {
-	yyval.tok = ',';
-    ;}
+	(yyval.tok) = ',';
+    }
     break;
 
   case 124:
 
     {
-        yyval.tok = 0;
-  ;}
+        (yyval.tok) = 0;
+  }
     break;
 
   case 125:
 
-    { yyval.value = yyvsp[0].value; ;}
+    { (yyval.value) = (yyvsp[(1) - (1)].value); }
     break;
 
   case 126:
 
-    { yyval.value = yyvsp[0].value; yyval.value.fValue *= yyvsp[-1].val; ;}
+    { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].val); }
     break;
 
   case 127:
 
-    { yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION; ;}
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; }
     break;
 
   case 128:
 
-    { yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_STRING; ;}
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_STRING; }
     break;
 
   case 129:
 
     {
-      TQString str = qString( yyvsp[-1].string );
-      yyval.value.id = getValueID( str.lower().latin1(), str.length() );
-      yyval.value.unit = CSSPrimitiveValue::CSS_IDENT;
-      yyval.value.string = yyvsp[-1].string;
-  ;}
+      QString str = qString( (yyvsp[(1) - (2)].string) );
+      (yyval.value).id = getValueID( str.lower().latin1(), str.length() );
+      (yyval.value).unit = CSSPrimitiveValue::CSS_IDENT;
+      (yyval.value).string = (yyvsp[(1) - (2)].string);
+  }
     break;
 
   case 130:
 
-    { yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_URI; ;}
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_URI; }
     break;
 
   case 131:
 
-    { yyval.value.id = 0; yyval.value.iValue = 0; yyval.value.unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ ;}
+    { (yyval.value).id = 0; (yyval.value).iValue = 0; (yyval.value).unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ }
     break;
 
   case 132:
 
-    { yyval.value.id = 0; yyval.value.string = yyvsp[0].string; yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;}
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (1)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_RGBCOLOR; }
     break;
 
   case 133:
 
     {
-      yyval.value = yyvsp[0].value;
-  ;}
+      (yyval.value) = (yyvsp[(1) - (1)].value);
+  }
     break;
 
   case 134:
 
-    { yyval.value.id = 0; yyval.value.isInt = true; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;}
+    { (yyval.value).id = 0; (yyval.value).isInt = true; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; }
     break;
 
   case 135:
 
-    { yyval.value.id = 0; yyval.value.isInt = false; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;}
+    { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; }
     break;
 
   case 136:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_PERCENTAGE; }
     break;
 
   case 137:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_PX; }
     break;
 
   case 138:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_CM; }
     break;
 
   case 139:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_MM; }
     break;
 
   case 140:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_IN; }
     break;
 
   case 141:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_PT; }
     break;
 
   case 142:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_PC; }
     break;
 
   case 143:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_DEG; }
     break;
 
   case 144:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_RAD; }
     break;
 
   case 145:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_GRAD; }
     break;
 
   case 146:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_MS; }
     break;
 
   case 147:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_S; }
     break;
 
   case 148:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_HZ; }
     break;
 
   case 149:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_KHZ; }
     break;
 
   case 150:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_EMS; }
     break;
 
   case 151:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = Value::Q_EMS; }
     break;
 
   case 152:
 
-    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;}
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_EXS; }
     break;
 
   case 153:
 
     {
       Function *f = new Function;
-      f->name = yyvsp[-4].string;
-      f->args = yyvsp[-2].valueList;
-      yyval.value.id = 0;
-      yyval.value.unit = Value::Function;
-      yyval.value.function = f;
-  ;}
+      f->name = (yyvsp[(1) - (5)].string);
+      f->args = (yyvsp[(3) - (5)].valueList);
+      (yyval.value).id = 0;
+      (yyval.value).unit = Value::Function;
+      (yyval.value).function = f;
+  }
     break;
 
   case 154:
 
     {
       Function *f = new Function;
-      f->name = yyvsp[-2].string;
+      f->name = (yyvsp[(1) - (3)].string);
       f->args = 0;
-      yyval.value.id = 0;
-      yyval.value.unit = Value::Function;
-      yyval.value.function = f;
-  ;}
+      (yyval.value).id = 0;
+      (yyval.value).unit = Value::Function;
+      (yyval.value).function = f;
+  }
     break;
 
   case 155:
 
-    { yyval.string = yyvsp[-1].string; ;}
+    { (yyval.string) = (yyvsp[(1) - (2)].string); }
     break;
 
   case 156:
 
     {
-	yyval.rule = 0;
+	(yyval.rule) = 0;
 #ifdef CSS_DEBUG
 	kdDebug( 6080 ) << "skipped invalid @-rule" << endl;
 #endif
-    ;}
+    }
     break;
 
   case 157:
 
     {
-	yyval.rule = 0;
+	(yyval.rule) = 0;
 #ifdef CSS_DEBUG
 	kdDebug( 6080 ) << "skipped invalid @-rule" << endl;
 #endif
-    ;}
+    }
     break;
 
   case 158:
 
     {
-	yyval.rule = 0;
+	(yyval.rule) = 0;
 #ifdef CSS_DEBUG
 	kdDebug( 6080 ) << "skipped invalid rule" << endl;
 #endif
-    ;}
-    break;
-
-
     }
+    break;
 
-/* Line 1010 of yacc.c.  */
-
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
 
 
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
-
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -2674,70 +2996,48 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  const char* yyprefix;
-	  char *yymsg;
-	  int yyx;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 0;
-
-	  yyprefix = ", expecting ";
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-		yycount += 1;
-		if (yycount == 5)
-		  {
-		    yysize = 0;
-		    break;
-		  }
-	      }
-	  yysize += (sizeof ("syntax error, unexpected ")
-		     + yystrlen (yytname[yytype]));
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			yyp = yystpcpy (yyp, yyprefix);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
     }
 
 
@@ -2748,25 +3048,16 @@ yyerrlab:
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
-        {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
+	{
+	  /* Return failure if at end of input.  */
 	  if (yychar == YYEOF)
-	     for (;;)
-	       {
-		 YYPOPSTACK;
-		 if (yyssp == yyss)
-		   YYABORT;
-		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-		 yydestruct (yystos[*yyssp], yyvsp);
-	       }
-        }
+	    YYABORT;
+	}
       else
 	{
-	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-	  yydestruct (yytoken, &yylval);
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
 	  yychar = YYEMPTY;
-
 	}
     }
 
@@ -2780,15 +3071,17 @@ yyerrlab:
 `---------------------------------------------------*/
 yyerrorlab:
 
-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
-  if (0)
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
-#endif
 
-  yyvsp -= yylen;
-  yyssp -= yylen;
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
   yystate = *yyssp;
   goto yyerrlab1;
 
@@ -2802,7 +3095,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -2817,21 +3110,20 @@ yyerrlab1:
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      YYPOPSTACK;
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -2850,22 +3142,45 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+#if !defined(yyoverflow) || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 
diff --git a/tdehtml/css/parser.h b/tdehtml/css/parser.h
new file mode 100644
index 000000000..251c1b0c6
--- /dev/null
+++ b/tdehtml/css/parser.h
@@ -0,0 +1,126 @@
+/* A Bison parser, made by GNU Bison 2.5.  */
+
+/* Bison interface for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     UNIMPORTANT_TOK = 258,
+     S = 259,
+     SGML_CD = 260,
+     INCLUDES = 261,
+     DASHMATCH = 262,
+     BEGINSWITH = 263,
+     ENDSWITH = 264,
+     CONTAINS = 265,
+     STRING = 266,
+     IDENT = 267,
+     NTH = 268,
+     HASH = 269,
+     IMPORT_SYM = 270,
+     PAGE_SYM = 271,
+     MEDIA_SYM = 272,
+     FONT_FACE_SYM = 273,
+     CHARSET_SYM = 274,
+     NAMESPACE_SYM = 275,
+     TDEHTML_RULE_SYM = 276,
+     TDEHTML_DECLS_SYM = 277,
+     TDEHTML_VALUE_SYM = 278,
+     IMPORTANT_SYM = 279,
+     QEMS = 280,
+     EMS = 281,
+     EXS = 282,
+     PXS = 283,
+     CMS = 284,
+     MMS = 285,
+     INS = 286,
+     PTS = 287,
+     PCS = 288,
+     DEGS = 289,
+     RADS = 290,
+     GRADS = 291,
+     MSECS = 292,
+     SECS = 293,
+     HERZ = 294,
+     KHERZ = 295,
+     DIMEN = 296,
+     PERCENTAGE = 297,
+     FLOAT = 298,
+     INTEGER = 299,
+     URI = 300,
+     FUNCTION = 301,
+     NOTFUNCTION = 302,
+     UNICODERANGE = 303
+   };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+
+    CSSRuleImpl *rule;
+    CSSSelector *selector;
+    TQPtrList<CSSSelector> *selectorList;
+    bool ok;
+    MediaListImpl *mediaList;
+    CSSMediaRuleImpl *mediaRule;
+    CSSRuleListImpl *ruleList;
+    ParseString string;
+    float val;
+    int prop_id;
+    unsigned int attribute;
+    unsigned int element;
+    unsigned int ns;
+    CSSSelector::Relation relation;
+    CSSSelector::Match match;
+    bool b;
+    char tok;
+    Value value;
+    ValueList *valueList;
+
+
+
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+
+
diff --git a/khtml/css/parser.y b/tdehtml/css/parser.y
index 33e6fd730..9bb993ac1 100644
--- a/khtml/css/parser.y
+++ b/tdehtml/css/parser.y
@@ -86,7 +86,7 @@ static inline int getValueID(const char *tagStr, int len)
 %union {
     CSSRuleImpl *rule;
     CSSSelector *selector;
-    QPtrList<CSSSelector> *selectorList;
+    TQPtrList<CSSSelector> *selectorList;
     bool ok;
     MediaListImpl *mediaList;
     CSSMediaRuleImpl *mediaRule;
@@ -164,9 +164,9 @@ static int cssyylex( YYSTYPE *yylval ) {
 %token FONT_FACE_SYM
 %token CHARSET_SYM
 %token NAMESPACE_SYM
-%token KHTML_RULE_SYM
-%token KHTML_DECLS_SYM
-%token KHTML_VALUE_SYM
+%token TDEHTML_RULE_SYM
+%token TDEHTML_DECLS_SYM
+%token TDEHTML_VALUE_SYM
 
 %token IMPORTANT_SYM
 
@@ -255,26 +255,26 @@ static int cssyylex( YYSTYPE *yylval ) {
 
 stylesheet:
     maybe_charset maybe_sgml import_list namespace_list rule_list
-  | khtml_rule maybe_space
-  | khtml_decls maybe_space
-  | khtml_value maybe_space
+  | tdehtml_rule maybe_space
+  | tdehtml_decls maybe_space
+  | tdehtml_value maybe_space
   ;
 
-khtml_rule:
-    KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
+tdehtml_rule:
+    TDEHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
         CSSParser *p = static_cast<CSSParser *>(parser);
 	p->rule = $4;
     }
 ;
 
-khtml_decls:
-    KHTML_DECLS_SYM declaration_block {
+tdehtml_decls:
+    TDEHTML_DECLS_SYM declaration_block {
 	/* can be empty */
     }
 ;
 
-khtml_value:
-    KHTML_VALUE_SYM '{' maybe_space expr '}' {
+tdehtml_value:
+    TDEHTML_VALUE_SYM '{' maybe_space expr '}' {
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	if ( $4 ) {
 	    p->valueList = $4;
@@ -525,14 +525,14 @@ ruleset:
 selector_list:
     selector %prec UNIMPORTANT_TOK {
 	if ( $1 ) {
-	    $$ = new QPtrList<CSSSelector>;
+	    $$ = new TQPtrList<CSSSelector>;
             $$->setAutoDelete( true );
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
 	    $1->print();
 #endif
 	    $$->append( $1 );
-	    khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $1);
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $1);
 	} else {
 	    $$ = 0;
 	}
@@ -541,7 +541,7 @@ selector_list:
 	if ( $1 && $4 ) {
 	    $$ = $1;
 	    $$->append( $4 );
-	    khtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $4);
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), $4);
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
 	    $4->print();
@@ -641,7 +641,7 @@ element_name:
 	    const DOMString dtag(tag);
             $$ = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
 	} else {
-	    $$ = makeId(p->defaultNamespace(), khtml::getTagID(tag.lower().ascii(), tag.length()));
+	    $$ = makeId(p->defaultNamespace(), tdehtml::getTagID(tag.lower().ascii(), tag.length()));
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown tags
 // 	    assert($$ != 0);
@@ -710,7 +710,7 @@ attrib_id:
 	    $$ = doc->getId(NodeImpl::AttributeId, dattr.implementation(), false, true);
 #endif
 	} else {
-	    $$ = khtml::getAttrID(attr.lower().ascii(), attr.length());
+	    $$ = tdehtml::getAttrID(attr.lower().ascii(), attr.length());
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown attributes
 	    assert($$ != 0);
diff --git a/khtml/css/quirks.css b/tdehtml/css/quirks.css
index 6a02ee0bd..b979b77c9 100644
--- a/khtml/css/quirks.css
+++ b/tdehtml/css/quirks.css
@@ -1,8 +1,8 @@
 /*
- * This style sheet is used by khtml to render HTML pages in quirks mode
+ * This style sheet is used by tdehtml to render HTML pages in quirks mode
  * (C) 2000-2003 Lars Knoll (knoll@kde.org)
  *
- * Konqueror/khtml relies on the existence of this style sheet for
+ * Konqueror/tdehtml relies on the existence of this style sheet for
  * rendering. Do not remove or modify this file unless you know
  * what you are doing.
  */
@@ -21,10 +21,10 @@ img[align="right"] {
 table {
     white-space: normal;
     line-height: normal;
-    color: -khtml-text;
+    color: -tdehtml-text;
     font-size: medium;
     empty-cells: hide;
-    text-align: -khtml-auto;
+    text-align: -tdehtml-auto;
     font-weight: initial;
 }
 
diff --git a/tdehtml/css/tokenizer.cpp b/tdehtml/css/tokenizer.cpp
new file mode 100644
index 000000000..cb1f893c1
--- /dev/null
+++ b/tdehtml/css/tokenizer.cpp
@@ -0,0 +1,1378 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/* This file is mostly data generated by flex. Unfortunately flex
+   can't handle 16bit strings directly, so we just copy the part of
+   the code we need and modify it to our needs.
+
+   Most of the defines below are to make sure we can easily use the
+   flex generated code, using as little editing as possible.
+
+   The flex syntax to generate the lexer are more or less directly
+   copied from the CSS2.1 specs, with some fixes for comments and
+   the important symbol.
+
+   To regenerate, run flex on tokenizer.flex. After this, copy the
+   data tables and the YY_DECL method over to this file. Remove the
+   init code from YY_DECL and change the YY_END_OF_BUFFER to only call
+   yyterminate().
+
+*/
+
+#define flex_int16_t short int
+#define flex_int32_t int
+
+// --------- begin generated code -------------------
+#define YY_NUM_RULES 51
+#define YY_END_OF_BUFFER 52
+static yyconst flex_int16_t yy_accept[333] =
+    {   0,
+        0,    0,   52,   50,    2,    2,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   42,   50,   50,   11,   11,
+       11,   50,   50,   50,   50,    2,    0,    0,    0,   10,
+        0,   13,    0,    8,    0,    0,    9,    0,    0,   11,
+       11,    0,   43,    0,   41,    0,    0,   42,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   12,   40,   40,
+       37,    0,   40,    0,    0,    0,    0,    0,    0,    0,
+        0,   47,   11,    0,    0,   11,   11,    0,   11,   11,
+       11,    7,    6,    5,    0,    0,    0,   10,    0,    0,
+       13,   13,    0,    0,   10,    0,    0,    4,   12,    0,
+
+        0,   40,    0,   28,   40,   24,   26,   40,   38,   30,
+       40,   29,   36,   40,   32,   31,   27,   40,   40,   40,
+       40,    0,    0,    0,    0,    0,    0,    0,    0,   11,
+       11,   12,   11,   11,   48,   48,   11,   11,    0,    0,
+        0,   13,    0,    0,    0,    1,   40,   40,   33,   40,
+       39,   12,   34,   40,   40,    3,    0,    0,    0,    0,
+        0,    0,    0,   11,   44,    0,   48,   48,   48,   47,
+       11,    0,    0,   13,    0,    0,    0,   40,   35,   40,
+       40,    0,    0,    0,    0,    0,    0,   15,   11,   49,
+       48,   48,   48,   48,    0,    0,    0,    0,   46,    0,
+
+       11,    0,    0,   13,    0,   40,   40,   25,    0,    0,
+        0,    0,   16,    0,   11,   49,   48,   48,   48,   48,
+       48,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       46,    0,    0,   11,    0,    0,   13,    0,   40,   40,
+        0,    0,    0,   14,    0,   11,   49,   48,   48,   48,
+       48,   48,   48,    0,   45,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   11,    0,    0,   13,
+        0,   40,   40,    0,   18,    0,    0,   11,   49,   48,
+       48,   48,   48,   48,   48,   48,    0,   45,    0,    0,
+        0,   45,    0,    0,    0,    0,   40,    0,    0,    0,
+
+       49,    0,    0,    0,   23,    0,   17,   19,   49,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   20,    0,   21,
+       22,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    4,    5,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    6,    7,    8,    9,   10,   11,   12,   13,   14,
+       15,   16,   17,   12,   18,   19,   20,   21,   21,   21,
+       21,   21,   21,   21,   21,   21,   21,   12,   12,   22,
+       23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
+       33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+       43,   44,   45,   46,   47,   48,   36,   49,   36,   50,
+       12,   51,   12,   52,   53,   12,   54,   28,   55,   56,
+
+       57,   58,   59,   60,   61,   36,   62,   63,   64,   65,
+       66,   67,   68,   69,   70,   71,   72,   73,   36,   74,
+       36,   75,   12,   76,   12,   77,    1,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78
+    } ;
+
+static yyconst flex_int32_t yy_meta[79] =
+    {   0,
+        1,    2,    3,    3,    3,    4,    4,    4,    4,    4,
+        4,    4,    4,    5,    4,    4,    4,    6,    4,    4,
+        7,    4,    4,    4,    8,    4,    9,    9,    9,    9,
+        9,    9,   10,   10,   10,   10,   10,   10,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+       10,    4,   10,    9,    9,    9,    9,    9,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
+       10,   10,   10,   10,   10,    4,    4,   10
+    } ;
+
+static yyconst flex_int16_t yy_base[368] =
+    {   0,
+        0,    0,  811, 3602,   77,   82,   87,   86,  758,  785,
+       82,  784,   78,  785,  788,  138,  786,  199,   83,   84,
+       94,  246,  769,  767,  766,  101,  218,   75,  101, 3602,
+      303,  737,  341, 3602,  100,  398, 3602,  763,   79,   96,
+      103,  436,  206,  769, 3602,  732,  761,    0,  730,   76,
+       85,  191,  175,   80,  178,  198,  217,  197,  243,  232,
+      729,  474,   73,  760,   82,   98,  195,  206,  133,  242,
+      255, 3602,  109,  512,  745,  270,  274,  739,  285,  271,
+      569, 3602, 3602, 3602,  248,  244,  229,  242,  626,  683,
+      712,  740,  313,  299,  300,  797,  854, 3602,  144,  739,
+
+      321,  703,  892,  702,  296,  701,  700,  292,  699,  698,
+      277,  697,  696,  289,  685,  684,  682,  288,  681,  949,
+      323,  713,  319,  311,  302,  311,  326,  324,  346,  362,
+     1006,  705,  363,  366,  365,  700,  367, 1044,  344,  381,
+     1082, 1120,  373, 1158,  708, 3602,  658, 1215,  656,  364,
+      655,  371,  646, 1253,  385, 3602,  376,  343,  360,  368,
+      386,  404,  412, 1291, 3602,    0,  419,  665,  664,  468,
+     1329,  379, 1367, 1405, 1443,  603,  388, 1481,  566, 1519,
+      411,  417,  414,  568,  416,  453,  441, 3602, 1557,    0,
+      420,  530,  528,  483,  510,  543,  431,  427, 3602, 1614,
+
+     1652,  450, 1690, 1728, 1766, 1804, 1842,  448,  451,  467,
+      468,  463, 3602,  468, 1880,    0,  502,  463,  462,  433,
+      368,  574,  438,  600, 1937,  428, 1994,  657,  714,  771,
+      828, 2051, 2108, 2146,  509, 2184, 2222, 2260, 2298, 2336,
+      498,  511,  511, 3602,  527, 2374,    0,  534,  272,  226,
+      210,  208,  121,  606, 3602,  584,  509,  885, 2431, 2488,
+      582,  537,  912, 2545, 2602, 2640, 2678,  551, 2716, 2754,
+     2792, 2830, 2868,  555, 3602,  584,  585,  639,    0,  123,
+     3602, 3602, 3602, 3602, 3602, 3602,  980,  556,  628, 2906,
+     1015,  571,  624, 2944, 2982,  600,  646,   94,  607,  635,
+
+        0, 3020, 3058, 3096, 3602,  791, 3602, 3602, 3602, 3134,
+     3172, 3210,  636,  622,  641, 3248, 3286, 3324,  644,  638,
+      640,  754,  810,  658,  643,  651,  660, 3602,  671, 3602,
+     3602, 3602, 3381, 3386, 3395, 3400, 3406, 3413, 3422, 3429,
+     3438, 3448, 3450, 3455, 3462, 3469, 3473, 3482, 3489, 3494,
+     3503, 3507, 3511, 3519, 3523, 3527, 3535, 3544, 3553, 3557,
+     3561, 3569, 3578, 3582, 3586, 3589, 3592
+    } ;
+
+static yyconst flex_int16_t yy_def[368] =
+    {   0,
+      332,    1,  332,  332,  332,  332,  332,  333,  334,  332,
+      335,  332,  336,  332,  332,  332,  332,  332,  337,  337,
+      337,  338,  332,  332,  332,  332,  332,  332,  333,  332,
+      339,  334,  340,  332,  335,  341,  332,  332,  332,  337,
+      337,  338,   16,  342,  332,  343,  332,   16,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  345,  344,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  337,  346,  332,  337,  337,  347,  337,  337,
+      337,  332,  332,  332,  332,  333,  333,  333,  333,  339,
+      334,  334,  335,  335,  335,  335,  341,  332,  332,  342,
+
+      348,  344,  349,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  332,  332,  332,  332,  332,  332,  332,  332,  337,
+       81,  332,  337,  337,  350,  332,  337,   81,  332,  333,
+       89,   92,  335,   96,  351,  332,  344,  120,  344,  344,
+      344,  344,  344,  120,  344,  332,  332,  332,  332,  332,
+      332,  332,  332,  131,  332,  352,  353,  332,  332,  354,
+       81,  332,   89,   92,   96,  351,  348,  148,  344,  120,
+      344,  332,  332,  332,  332,  332,  332,  332,  131,  355,
+      356,  332,  332,  332,  354,  354,  357,  358,  332,  359,
+
+       81,  332,   89,   92,   96,  148,  120,  344,  332,  332,
+      332,  332,  332,  332,  131,  360,  361,  332,  332,  332,
+      332,  332,  357,  332,  362,  358,  363,  354,  354,  354,
+      354,  354,  359,   81,  332,   89,   92,   96,  148,  120,
+      332,  332,  332,  332,  332,  131,  364,  365,  332,  332,
+      332,  332,  332,  332,  332,  357,  357,  357,  357,  362,
+      358,  358,  358,  358,  363,  232,   81,  332,   89,   92,
+       96,  148,  120,  332,  332,  332,  332,  267,  366,  332,
+      332,  332,  332,  332,  332,  332,  357,  357,  357,  259,
+      358,  358,  358,  264,  232,  332,  273,  332,  332,  332,
+
+      367,  259,  264,  232,  332,  332,  332,  332,  332,  259,
+      264,  232,  332,  332,  332,  259,  264,  232,  332,  332,
+      332,  357,  358,  332,  332,  332,  332,  332,  332,  332,
+      332,    0,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332
+    } ;
+
+static yyconst flex_int16_t yy_nxt[3681] =
+    {   0,
+        4,    5,    6,    5,    5,    5,    7,    8,    9,   10,
+        4,    4,   11,    4,    4,   12,    4,   13,   14,   15,
+       16,   17,    4,    4,    4,   18,   19,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   19,   19,   19,   20,
+       19,   19,   19,   19,   19,   19,   21,   19,   19,   19,
+       22,   23,   19,   19,   19,   19,   19,   19,   19,   19,
+       19,   19,   19,   19,   20,   19,   19,   19,   19,   19,
+       19,   21,   19,   19,   19,   24,   25,   19,   26,   26,
+       26,   26,   26,   26,   26,   26,   26,   26,   27,   27,
+       27,   27,   27,   30,   30,   38,   72,   72,   39,   39,
+
+       75,   76,   26,   26,   26,   26,   26,   72,   30,   72,
+       78,  306,   30,   85,  104,  105,   72,   41,   99,   75,
+       76,   28,   72,  103,   77,  121,  103,  123,   42,  109,
+      103,  124,   36,   74,   74,  103,   31,   79,   85,  104,
+      166,  105,   41,   99,   74,  286,   74,   28,   45,   77,
+       36,   31,  123,   74,  109,   46,   47,  124,   48,   74,
+       75,   75,   79,  127,   49,   49,   50,   51,   52,   49,
+       53,   54,   55,   49,   56,   49,   57,   58,   49,   59,
+       49,   60,   61,   49,   49,   49,   49,   49,   62,  127,
+       63,   49,   50,   51,   52,   49,   53,   54,   55,   56,
+
+       49,   57,   58,   49,   59,   49,   60,   61,   49,   49,
+       49,   49,   49,   75,  114,   49,   65,  110,  108,   27,
+       27,   27,   27,   27,  332,  103,   43,   66,  103,  106,
+       67,  111,  285,   68,  284,  125,   30,   69,   70,  107,
+       71,  103,  110,  108,  126,   49,   29,  103,  103,   30,
+      283,   30,   28,   66,  106,  112,   67,  111,  118,   68,
+      125,  113,   69,   70,  107,   71,   81,  103,  128,  126,
+       49,  115,   81,   81,   81,   81,   81,   81,   28,   31,
+      112,  129,  103,   72,   72,  118,  113,   72,  116,  139,
+      133,  117,   31,  103,   31,  128,  282,  115,   72,   81,
+
+       81,   81,   81,   81,   29,   29,   29,   86,  129,  152,
+       88,   30,   30,  116,  139,   35,  117,  153,  150,  134,
+       74,   74,  137,   89,   74,   30,  151,  103,  149,   89,
+       89,   89,   89,   89,   89,   74,  101,  158,  103,  103,
+      146,  159,  103,  153,  134,  150,  103,  137,  157,   36,
+       36,  151,  160,   90,  149,  161,   89,   89,   89,   89,
+       89,   92,  162,   36,  158,  155,  159,   92,   92,   92,
+       92,   92,   92,  103,  157,   72,   72,  160,  163,  165,
+      170,  161,  166,  133,  172,   30,  183,  162,   30,  168,
+      155,  152,  253,  179,   92,   92,   92,   92,   92,   35,
+
+       35,   35,   93,  177,  163,  184,  182,  146,  185,  172,
+       95,  183,   74,   74,  103,  181,   74,   74,   96,  179,
+      186,  103,  202,   36,   96,   96,   96,   96,   96,   96,
+      184,   31,  182,  185,  187,  103,  166,  166,  224,  224,
+      224,  181,  188,  192,  218,  224,  186,  202,   97,  208,
+      209,   96,   96,   96,   96,   96,   81,  252,  210,  212,
+      187,  103,   81,   81,   81,   81,   81,   81,  188,  195,
+      195,  195,  195,  195,  208,  197,  209,  227,  227,  213,
+      198,  225,  199,  210,  212,  214,  251,  250,  225,   81,
+       81,   81,   81,   81,  120,  235,  241,  242,  103,  243,
+
+      120,  120,  120,  120,  120,  120,  213,  221,  244,  245,
+      214,  195,  195,  195,  195,  195,  224,  197,  200,  166,
+      235,  241,  198,  242,  199,  243,  249,  120,  120,  120,
+      120,  120,  131,  244,  245,  268,  274,  276,  131,  131,
+      131,  131,  131,  131,  222,  222,  222,  222,  222,  224,
+      332,  166,  220,  277,  219,  332,  275,  199,  281,  225,
+      200,  274,  268,  224,  276,  131,  131,  131,  131,  131,
+       80,   80,   80,   80,   80,  222,  222,  222,  222,  222,
+      277,  275,   72,  224,  226,  211,  223,  227,  199,  138,
+      296,  224,  298,  200,  224,  138,  138,  138,  138,  138,
+
+      138,  254,  254,  254,  254,  254,  225,  254,  254,  254,
+      254,  254,  299,  300,  255,  296,  103,  298,  177,   74,
+      255,  227,  138,  138,  138,  138,  138,   87,  140,  140,
+      140,   87,  227,   30,  225,  224,  224,  307,  299,  300,
+      130,  130,  130,  130,  130,  305,  141,  147,  147,  147,
+      147,  147,  141,  141,  141,  141,  141,  141,  222,  222,
+      222,  222,  222,  307,  332,  308,  319,  321,  320,  332,
+      305,  199,  324,  328,  227,  325,   31,  326,  225,  141,
+      141,  141,  141,  141,   29,   29,   29,   86,  194,  193,
+       88,  308,  319,  320,  321,  327,  103,  329,  324,  328,
+
+      325,  331,  326,   89,  330,  103,  103,  200,  103,   89,
+       89,   89,   89,   89,   89,  222,  222,  222,  222,  222,
+      327,  332,  329,  177,  169,  132,  332,  331,  199,  330,
+      156,  103,  103,   90,  103,  103,   89,   89,   89,   89,
+       89,   91,   91,   91,   91,   91,  103,  103,  103,  103,
+      103,  103,  103,  103,  101,  257,  289,  289,  289,  257,
+      142,  224,   33,  136,  200,  132,  142,  142,  142,  142,
+      142,  142,  222,  222,  222,  222,  222,  122,  332,  103,
+      103,   43,   62,  332,  101,  199,   98,   33,   84,   83,
+       33,   82,   64,  142,  142,  142,  142,  142,   94,  143,
+
+      143,  143,   94,   44,  225,   43,   37,   34,   33,   30,
+      332,  262,  293,  293,  293,  262,  332,  144,  332,  332,
+      313,  200,  224,  144,  144,  144,  144,  144,  144,  222,
+      222,  222,  222,  222,  314,  332,  332,  332,  315,  332,
+      332,  332,  199,  332,  332,  332,  313,   36,  332,  332,
+      144,  144,  144,  144,  144,   35,   35,   35,   93,  314,
+      227,  332,  332,  315,  332,  332,   95,  332,  332,  332,
+      332,  332,  332,  332,   96,  332,  332,  332,  200,  332,
+       96,   96,   96,   96,   96,   96,  287,  254,  254,  254,
+      287,  332,  224,  332,  332,  332,  332,  332,  332,  288,
+
+      332,  332,  332,  332,   97,  332,  332,   96,   96,   96,
+       96,   96,  148,  291,  254,  254,  254,  291,  148,  148,
+      148,  148,  148,  148,  224,  332,  292,  332,  332,  332,
+      332,  332,  332,  332,  332,  225,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  148,  148,  148,  148,  148,
+      119,  119,  119,  119,  119,  332,  332,  332,  332,  332,
+      332,  332,  227,  332,  332,  332,  332,  332,  332,  154,
+      332,  332,  332,  332,  332,  154,  154,  154,  154,  154,
+      154,  287,  254,  254,  254,  287,  332,  224,  332,  332,
+      332,  332,  332,  332,  288,  332,  332,  332,  332,  103,
+
+      332,  332,  154,  154,  154,  154,  154,  130,  130,  130,
+      130,  130,  332,  332,  332,  332,  291,  254,  254,  254,
+      291,  332,  332,  332,  332,  332,  164,  224,  332,  292,
+      225,  332,  164,  164,  164,  164,  164,  164,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  164,
+      164,  164,  164,  164,  171,  227,  332,  332,  332,  332,
+      171,  171,  171,  171,  171,  171,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  171,  171,  171,
+
+      171,  171,  173,  332,  332,  332,  332,  332,  173,  173,
+      173,  173,  173,  173,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  173,  173,  173,  173,  173,
+      174,  332,  332,  332,  332,  332,  174,  174,  174,  174,
+      174,  174,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  174,  174,  174,  174,  174,  175,  332,
+      332,  332,  332,  332,  175,  175,  175,  175,  175,  175,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  175,  175,  175,  175,  175,  147,  147,  147,  147,
+      147,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  178,  332,  332,  332,  332,
+      332,  178,  178,  178,  178,  178,  178,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  178,  178,
+      178,  178,  178,  180,  332,  332,  332,  332,  332,  180,
+      180,  180,  180,  180,  180,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  332,  332,  180,  180,  180,  180,
+      180,  189,  332,  332,  332,  332,  332,  189,  189,  189,
+      189,  189,  189,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  189,  189,  189,  189,  189,  201,
+      332,  332,  332,  332,  332,  201,  201,  201,  201,  201,
+      201,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  201,  201,  201,  201,  201,  203,  332,  332,
+      332,  332,  332,  203,  203,  203,  203,  203,  203,  332,
+
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      203,  203,  203,  203,  203,  204,  332,  332,  332,  332,
+      332,  204,  204,  204,  204,  204,  204,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  204,  204,
+      204,  204,  204,  205,  332,  332,  332,  332,  332,  205,
+      205,  205,  205,  205,  205,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  205,  205,  205,  205,
+
+      205,  206,  332,  332,  332,  332,  332,  206,  206,  206,
+      206,  206,  206,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  206,  206,  206,  206,  206,  207,
+      332,  332,  332,  332,  332,  207,  207,  207,  207,  207,
+      207,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  207,  207,  207,  207,  207,  215,  332,  332,
+      332,  332,  332,  215,  215,  215,  215,  215,  215,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      215,  215,  215,  215,  215,  222,  222,  222,  222,  228,
+      332,  230,  332,  332,  332,  332,  230,  230,  231,  332,
+      332,  332,  332,  332,  232,  332,  332,  332,  332,  332,
+      232,  232,  232,  232,  232,  232,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  233,  332,  332,  232,  232,  232,
+      232,  232,  234,  332,  332,  332,  332,  332,  234,  234,
+      234,  234,  234,  234,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  332,  234,  234,  234,  234,  234,
+      236,  332,  332,  332,  332,  332,  236,  236,  236,  236,
+      236,  236,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  236,  236,  236,  236,  236,  237,  332,
+      332,  332,  332,  332,  237,  237,  237,  237,  237,  237,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  237,  237,  237,  237,  237,  238,  332,  332,  332,
+      332,  332,  238,  238,  238,  238,  238,  238,  332,  332,
+
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  238,
+      238,  238,  238,  238,  239,  332,  332,  332,  332,  332,
+      239,  239,  239,  239,  239,  239,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  239,  239,  239,
+      239,  239,  240,  332,  332,  332,  332,  332,  240,  240,
+      240,  240,  240,  240,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  240,  240,  240,  240,  240,
+
+      246,  332,  332,  332,  332,  332,  246,  246,  246,  246,
+      246,  246,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  246,  246,  246,  246,  246,  223,  223,
+      223,  256,  332,  332,  258,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  259,  332,  332,
+      332,  332,  332,  259,  259,  259,  259,  259,  259,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  260,  332,  332,
+      259,  259,  259,  259,  259,  226,  226,  226,  261,  332,
+
+      332,  332,  332,  332,  332,  332,  263,  332,  332,  332,
+      332,  332,  332,  332,  264,  332,  332,  332,  332,  332,
+      264,  264,  264,  264,  264,  264,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  265,  332,  332,  264,  264,  264,
+      264,  264,  228,  228,  228,  228,  228,  332,  332,  332,
+      332,  332,  332,  332,  332,  199,  332,  332,  332,  332,
+      332,  266,  332,  332,  332,  332,  332,  266,  266,  266,
+      266,  266,  266,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  200,  332,  332,  266,  266,  266,  266,  266,  222,
+      222,  222,  222,  228,  332,  230,  332,  332,  332,  332,
+      230,  230,  231,  332,  332,  332,  332,  332,  232,  332,
+      332,  332,  332,  332,  232,  232,  232,  232,  232,  232,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  233,  332,
+      332,  232,  232,  232,  232,  232,  267,  332,  332,  332,
+      332,  332,  267,  267,  267,  267,  267,  267,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  267,
+
+      267,  267,  267,  267,  269,  332,  332,  332,  332,  332,
+      269,  269,  269,  269,  269,  269,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  269,  269,  269,
+      269,  269,  270,  332,  332,  332,  332,  332,  270,  270,
+      270,  270,  270,  270,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  270,  270,  270,  270,  270,
+      271,  332,  332,  332,  332,  332,  271,  271,  271,  271,
+      271,  271,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  271,  271,  271,  271,  271,  272,  332,
+      332,  332,  332,  332,  272,  272,  272,  272,  272,  272,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  272,  272,  272,  272,  272,  273,  332,  332,  332,
+      332,  332,  273,  273,  273,  273,  273,  273,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  273,
+      273,  273,  273,  273,  278,  332,  332,  332,  332,  332,
+
+      278,  278,  278,  278,  278,  278,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  278,  278,  278,
+      278,  278,  257,  289,  289,  289,  257,  332,  224,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  290,  332,  332,  332,  332,  332,  290,  290,  290,
+      290,  290,  290,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  225,  332,  332,  290,  290,  290,  290,  290,  223,
+      223,  223,  256,  332,  332,  258,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  332,  332,  332,  332,  259,  332,
+      332,  332,  332,  332,  259,  259,  259,  259,  259,  259,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  260,  332,
+      332,  259,  259,  259,  259,  259,  262,  293,  293,  293,
+      262,  332,  332,  332,  332,  332,  332,  224,  332,  332,
+      332,  332,  332,  332,  332,  294,  332,  332,  332,  332,
+      332,  294,  294,  294,  294,  294,  294,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  227,  332,  332,  294,  294,
+
+      294,  294,  294,  226,  226,  226,  261,  332,  332,  332,
+      332,  332,  332,  332,  263,  332,  332,  332,  332,  332,
+      332,  332,  264,  332,  332,  332,  332,  332,  264,  264,
+      264,  264,  264,  264,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  265,  332,  332,  264,  264,  264,  264,  264,
+      295,  332,  332,  332,  332,  332,  295,  295,  295,  295,
+      295,  295,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  295,  295,  295,  295,  295,   73,  332,
+
+      332,  332,  332,  332,   73,   73,   73,   73,   73,   73,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,   73,   73,   73,   73,   73,   29,  332,  332,  332,
+      332,  332,   29,   29,   29,   29,   29,   29,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,   29,
+       29,   29,   29,   29,   32,  332,  332,  332,  332,  332,
+       32,   32,   32,   32,   32,   32,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  332,  332,  332,   32,   32,   32,
+       32,   32,   35,  332,  332,  332,  332,  332,   35,   35,
+       35,   35,   35,   35,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,   35,   35,   35,   35,   35,
+      297,  332,  332,  332,  332,  332,  297,  297,  297,  297,
+      297,  297,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  297,  297,  297,  297,  297,  102,  332,
+      332,  332,  332,  332,  102,  102,  102,  102,  102,  102,
+
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  102,  102,  102,  102,  102,  302,  332,  332,  332,
+      332,  332,  302,  302,  302,  302,  302,  302,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  302,
+      302,  302,  302,  302,  303,  332,  332,  332,  332,  332,
+      303,  303,  303,  303,  303,  303,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  303,  303,  303,
+
+      303,  303,  304,  332,  332,  332,  332,  332,  304,  304,
+      304,  304,  304,  304,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  304,  304,  304,  304,  304,
+      310,  332,  332,  332,  332,  332,  310,  310,  310,  310,
+      310,  310,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  310,  310,  310,  310,  310,  311,  332,
+      332,  332,  332,  332,  311,  311,  311,  311,  311,  311,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  311,  311,  311,  311,  311,  312,  332,  332,  332,
+      332,  332,  312,  312,  312,  312,  312,  312,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  312,
+      312,  312,  312,  312,  316,  332,  332,  332,  332,  332,
+      316,  316,  316,  316,  316,  316,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  316,  316,  316,
+      316,  316,  317,  332,  332,  332,  332,  332,  317,  317,
+
+      317,  317,  317,  317,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  317,  317,  317,  317,  317,
+      318,  332,  332,  332,  332,  332,  318,  318,  318,  318,
+      318,  318,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  318,  318,  318,  318,  318,  322,  332,
+      332,  332,  332,  332,  322,  322,  322,  322,  322,  322,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+
+      332,  322,  322,  322,  322,  322,  323,  332,  332,  332,
+      332,  332,  323,  323,  323,  323,  323,  323,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  323,
+      323,  323,  323,  323,  196,  332,  332,  332,  332,  332,
+      196,  196,  196,  196,  196,  196,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  196,  196,  196,
+      196,  196,   29,  332,   29,   29,   29,   29,   29,   29,
+       29,   32,   32,  332,   32,   32,   35,  332,   35,   35,
+
+       35,   35,   35,   35,   35,   40,   40,  332,   40,   40,
+       73,   73,   73,  332,   73,   73,   80,   80,   80,   80,
+       80,   80,   80,   87,   87,   87,   87,   87,   87,   87,
+       87,   87,   91,   91,   91,   91,   91,   91,   91,   94,
+       94,   94,   94,   94,   94,   94,   94,   94,  100,  100,
+      100,  100,  100,  100,  100,  100,  100,  100,   49,   49,
+      102,  102,  332,  102,  102,  119,  119,  119,  119,  119,
+      119,  119,  130,  130,  130,  130,  130,  130,  130,  135,
+      135,  135,  145,  145,  145,  145,  145,  145,  145,  145,
+      145,  145,  147,  147,  147,  147,  147,  147,  147,  167,
+
+      167,  167,  167,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  190,  332,  190,  191,  191,  191,  191,
+      196,  196,  196,  332,  196,  196,  196,  196,  196,  216,
+      332,  216,  217,  217,  217,  217,  223,  332,  223,  223,
+      223,  223,  223,  223,  223,  226,  332,  226,  226,  226,
+      226,  226,  226,  226,  229,  229,  229,  229,  229,  229,
+      229,  229,  229,  247,  332,  247,  248,  248,  248,  248,
+      257,  257,  257,  257,  257,  257,  257,  257,  257,  262,
+      262,  262,  262,  262,  262,  262,  262,  262,  279,  332,
+      279,  280,  280,  280,  280,  301,  332,  301,  309,  332,
+
+      309,    3,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332
+    } ;
+
+static yyconst flex_int16_t yy_chk[3681] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    5,    5,
+        5,    5,    5,    6,    6,    6,    6,    6,    7,    7,
+        7,    7,    7,    8,   11,   13,   19,   20,   13,   39,
+
+       20,   20,   26,   26,   26,   26,   26,   21,   29,   40,
+       21,  298,   35,   28,   50,   51,   41,   13,   39,   41,
+       41,    7,   73,   63,   20,   63,   50,   65,   13,   54,
+       54,   66,   11,   19,   20,   51,    8,   21,   28,   50,
+      280,   51,   13,   39,   21,  253,   40,    7,   16,   20,
+       35,   29,   65,   41,   54,   16,   16,   66,   16,   73,
+       99,   99,   21,   69,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   16,   16,   16,   16,   16,   16,   69,
+       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
+
+       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   58,   58,   16,   18,   55,   53,   27,
+       27,   27,   27,   27,   43,   53,   43,   18,   55,   52,
+       18,   56,  252,   18,  251,   67,   87,   18,   18,   52,
+       18,   52,   55,   53,   68,   43,   86,   58,   56,   88,
+      250,   86,   27,   18,   52,   57,   18,   56,   60,   18,
+       67,   57,   18,   18,   52,   18,   22,   57,   70,   68,
+       43,   59,   22,   22,   22,   22,   22,   22,   27,   87,
+       57,   71,   60,   76,   80,   60,   57,   77,   59,   85,
+       76,   59,   88,   59,   86,   70,  249,   59,   79,   22,
+
+       22,   22,   22,   22,   31,   31,   31,   31,   71,  114,
+       31,   94,   95,   59,   85,   93,   59,  118,  108,   77,
+       76,   80,   79,   31,   77,   93,  111,  111,  105,   31,
+       31,   31,   31,   31,   31,   79,  101,  124,  118,  114,
+      101,  125,  108,  118,   77,  108,  105,   79,  123,   94,
+       95,  111,  126,   31,  105,  127,   31,   31,   31,   31,
+       31,   33,  128,   93,  124,  121,  125,   33,   33,   33,
+       33,   33,   33,  121,  123,  130,  133,  126,  129,  134,
+      137,  127,  135,  133,  139,  143,  158,  128,  140,  135,
+      121,  152,  221,  150,   33,   33,   33,   33,   33,   36,
+
+       36,   36,   36,  177,  129,  159,  157,  177,  160,  139,
+       36,  158,  130,  133,  150,  155,  134,  137,   36,  150,
+      161,  152,  172,  143,   36,   36,   36,   36,   36,   36,
+      159,  140,  157,  160,  162,  155,  167,  191,  197,  198,
+      226,  155,  163,  167,  191,  223,  161,  172,   36,  181,
+      182,   36,   36,   36,   36,   36,   42,  220,  183,  185,
+      162,  181,   42,   42,   42,   42,   42,   42,  163,  170,
+      170,  170,  170,  170,  181,  170,  182,  198,  226,  186,
+      170,  197,  170,  183,  185,  187,  219,  218,  223,   42,
+       42,   42,   42,   42,   62,  202,  209,  210,  208,  211,
+
+       62,   62,   62,   62,   62,   62,  186,  194,  212,  214,
+      187,  195,  195,  195,  195,  195,  257,  195,  170,  217,
+      202,  209,  195,  210,  195,  211,  217,   62,   62,   62,
+       62,   62,   74,  212,  214,  235,  241,  243,   74,   74,
+       74,   74,   74,   74,  196,  196,  196,  196,  196,  262,
+      196,  248,  193,  245,  192,  196,  242,  196,  248,  257,
+      195,  241,  235,  288,  243,   74,   74,   74,   74,   74,
+       81,   81,   81,   81,   81,  222,  222,  222,  222,  222,
+      245,  242,   81,  292,  261,  184,  256,  262,  222,   81,
+      268,  256,  274,  196,  261,   81,   81,   81,   81,   81,
+
+       81,  224,  224,  224,  224,  224,  288,  254,  254,  254,
+      254,  254,  276,  277,  224,  268,  179,  274,  176,   81,
+      254,  292,   81,   81,   81,   81,   81,   89,   89,   89,
+       89,   89,  261,   89,  256,  289,  293,  299,  276,  277,
+      278,  278,  278,  278,  278,  296,   89,  297,  297,  297,
+      297,  297,   89,   89,   89,   89,   89,   89,  228,  228,
+      228,  228,  228,  299,  228,  300,  313,  315,  314,  228,
+      296,  228,  319,  325,  293,  320,   89,  321,  289,   89,
+       89,   89,   89,   89,   90,   90,   90,   90,  169,  168,
+       90,  300,  313,  314,  315,  324,  153,  326,  319,  325,
+
+      320,  329,  321,   90,  327,  151,  149,  228,  147,   90,
+       90,   90,   90,   90,   90,  229,  229,  229,  229,  229,
+      324,  229,  326,  145,  136,  132,  229,  329,  229,  327,
+      122,  119,  117,   90,  116,  115,   90,   90,   90,   90,
+       90,   92,   92,   92,   92,   92,  113,  112,  110,  109,
+      107,  106,  104,  102,  100,  322,  322,  322,  322,  322,
+       92,  322,   91,   78,  229,   75,   92,   92,   92,   92,
+       92,   92,  230,  230,  230,  230,  230,   64,  230,   61,
+       49,   47,   46,  230,   44,  230,   38,   32,   25,   24,
+       92,   23,   17,   92,   92,   92,   92,   92,   96,   96,
+
+       96,   96,   96,   15,  322,   14,   12,   10,    9,   96,
+        3,  323,  323,  323,  323,  323,    0,   96,    0,    0,
+      306,  230,  323,   96,   96,   96,   96,   96,   96,  231,
+      231,  231,  231,  231,  306,  231,    0,    0,  306,    0,
+      231,    0,  231,    0,    0,    0,  306,   96,    0,    0,
+       96,   96,   96,   96,   96,   97,   97,   97,   97,  306,
+      323,    0,    0,  306,    0,    0,   97,    0,    0,    0,
+        0,    0,    0,    0,   97,    0,    0,    0,  231,    0,
+       97,   97,   97,   97,   97,   97,  258,  258,  258,  258,
+      258,    0,  258,    0,    0,    0,    0,    0,    0,  258,
+
+        0,    0,    0,    0,   97,    0,    0,   97,   97,   97,
+       97,   97,  103,  263,  263,  263,  263,  263,  103,  103,
+      103,  103,  103,  103,  263,    0,  263,    0,    0,    0,
+        0,    0,    0,    0,    0,  258,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  103,  103,  103,  103,  103,
+      120,  120,  120,  120,  120,    0,    0,    0,    0,    0,
+        0,    0,  263,    0,    0,    0,    0,    0,    0,  120,
+        0,    0,    0,    0,    0,  120,  120,  120,  120,  120,
+      120,  287,  287,  287,  287,  287,    0,  287,    0,    0,
+        0,    0,    0,    0,  287,    0,    0,    0,    0,  120,
+
+        0,    0,  120,  120,  120,  120,  120,  131,  131,  131,
+      131,  131,    0,    0,    0,    0,  291,  291,  291,  291,
+      291,    0,    0,    0,    0,    0,  131,  291,    0,  291,
+      287,    0,  131,  131,  131,  131,  131,  131,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  131,
+      131,  131,  131,  131,  138,  291,    0,    0,    0,    0,
+      138,  138,  138,  138,  138,  138,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  138,  138,  138,
+
+      138,  138,  141,    0,    0,    0,    0,    0,  141,  141,
+      141,  141,  141,  141,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  141,  141,  141,  141,  141,
+      142,    0,    0,    0,    0,    0,  142,  142,  142,  142,
+      142,  142,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  142,  142,  142,  142,  142,  144,    0,
+        0,    0,    0,    0,  144,  144,  144,  144,  144,  144,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  144,  144,  144,  144,  144,  148,  148,  148,  148,
+      148,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  148,    0,    0,    0,    0,
+        0,  148,  148,  148,  148,  148,  148,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  148,  148,
+      148,  148,  148,  154,    0,    0,    0,    0,    0,  154,
+      154,  154,  154,  154,  154,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,  154,  154,  154,  154,
+      154,  164,    0,    0,    0,    0,    0,  164,  164,  164,
+      164,  164,  164,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  164,  164,  164,  164,  164,  171,
+        0,    0,    0,    0,    0,  171,  171,  171,  171,  171,
+      171,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  171,  171,  171,  171,  171,  173,    0,    0,
+        0,    0,    0,  173,  173,  173,  173,  173,  173,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      173,  173,  173,  173,  173,  174,    0,    0,    0,    0,
+        0,  174,  174,  174,  174,  174,  174,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  174,  174,
+      174,  174,  174,  175,    0,    0,    0,    0,    0,  175,
+      175,  175,  175,  175,  175,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  175,  175,  175,  175,
+
+      175,  178,    0,    0,    0,    0,    0,  178,  178,  178,
+      178,  178,  178,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  178,  178,  178,  178,  178,  180,
+        0,    0,    0,    0,    0,  180,  180,  180,  180,  180,
+      180,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  180,  180,  180,  180,  180,  189,    0,    0,
+        0,    0,    0,  189,  189,  189,  189,  189,  189,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      189,  189,  189,  189,  189,  200,  200,  200,  200,  200,
+        0,  200,    0,    0,    0,    0,  200,  200,  200,    0,
+        0,    0,    0,    0,  200,    0,    0,    0,    0,    0,
+      200,  200,  200,  200,  200,  200,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  200,    0,    0,  200,  200,  200,
+      200,  200,  201,    0,    0,    0,    0,    0,  201,  201,
+      201,  201,  201,  201,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,  201,  201,  201,  201,  201,
+      203,    0,    0,    0,    0,    0,  203,  203,  203,  203,
+      203,  203,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  203,  203,  203,  203,  203,  204,    0,
+        0,    0,    0,    0,  204,  204,  204,  204,  204,  204,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  204,  204,  204,  204,  204,  205,    0,    0,    0,
+        0,    0,  205,  205,  205,  205,  205,  205,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  205,
+      205,  205,  205,  205,  206,    0,    0,    0,    0,    0,
+      206,  206,  206,  206,  206,  206,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  206,  206,  206,
+      206,  206,  207,    0,    0,    0,    0,    0,  207,  207,
+      207,  207,  207,  207,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  207,  207,  207,  207,  207,
+
+      215,    0,    0,    0,    0,    0,  215,  215,  215,  215,
+      215,  215,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  215,  215,  215,  215,  215,  225,  225,
+      225,  225,    0,    0,  225,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  225,    0,    0,
+        0,    0,    0,  225,  225,  225,  225,  225,  225,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  225,    0,    0,
+      225,  225,  225,  225,  225,  227,  227,  227,  227,    0,
+
+        0,    0,    0,    0,    0,    0,  227,    0,    0,    0,
+        0,    0,    0,    0,  227,    0,    0,    0,    0,    0,
+      227,  227,  227,  227,  227,  227,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  227,    0,    0,  227,  227,  227,
+      227,  227,  232,  232,  232,  232,  232,    0,  232,    0,
+        0,    0,    0,  232,    0,  232,    0,    0,    0,    0,
+        0,  232,    0,    0,    0,    0,    0,  232,  232,  232,
+      232,  232,  232,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,  232,    0,    0,  232,  232,  232,  232,  232,  233,
+      233,  233,  233,  233,    0,  233,    0,    0,    0,    0,
+      233,  233,  233,    0,    0,    0,    0,    0,  233,    0,
+        0,    0,    0,    0,  233,  233,  233,  233,  233,  233,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  233,    0,
+        0,  233,  233,  233,  233,  233,  234,    0,    0,    0,
+        0,    0,  234,  234,  234,  234,  234,  234,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  234,
+
+      234,  234,  234,  234,  236,    0,    0,    0,    0,    0,
+      236,  236,  236,  236,  236,  236,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  236,  236,  236,
+      236,  236,  237,    0,    0,    0,    0,    0,  237,  237,
+      237,  237,  237,  237,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  237,  237,  237,  237,  237,
+      238,    0,    0,    0,    0,    0,  238,  238,  238,  238,
+      238,  238,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  238,  238,  238,  238,  238,  239,    0,
+        0,    0,    0,    0,  239,  239,  239,  239,  239,  239,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  239,  239,  239,  239,  239,  240,    0,    0,    0,
+        0,    0,  240,  240,  240,  240,  240,  240,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  240,
+      240,  240,  240,  240,  246,    0,    0,    0,    0,    0,
+
+      246,  246,  246,  246,  246,  246,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  246,  246,  246,
+      246,  246,  259,  259,  259,  259,  259,    0,  259,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  259,    0,    0,    0,    0,    0,  259,  259,  259,
+      259,  259,  259,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  259,    0,    0,  259,  259,  259,  259,  259,  260,
+      260,  260,  260,    0,    0,  260,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,  260,    0,
+        0,    0,    0,    0,  260,  260,  260,  260,  260,  260,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  260,    0,
+        0,  260,  260,  260,  260,  260,  264,  264,  264,  264,
+      264,    0,    0,    0,    0,    0,    0,  264,    0,    0,
+        0,    0,    0,    0,    0,  264,    0,    0,    0,    0,
+        0,  264,  264,  264,  264,  264,  264,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  264,    0,    0,  264,  264,
+
+      264,  264,  264,  265,  265,  265,  265,    0,    0,    0,
+        0,    0,    0,    0,  265,    0,    0,    0,    0,    0,
+        0,    0,  265,    0,    0,    0,    0,    0,  265,  265,
+      265,  265,  265,  265,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  265,    0,    0,  265,  265,  265,  265,  265,
+      266,    0,    0,    0,    0,    0,  266,  266,  266,  266,
+      266,  266,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  266,  266,  266,  266,  266,  267,    0,
+
+        0,    0,    0,    0,  267,  267,  267,  267,  267,  267,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  267,  267,  267,  267,  267,  269,    0,    0,    0,
+        0,    0,  269,  269,  269,  269,  269,  269,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  269,
+      269,  269,  269,  269,  270,    0,    0,    0,    0,    0,
+      270,  270,  270,  270,  270,  270,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,  270,  270,  270,
+      270,  270,  271,    0,    0,    0,    0,    0,  271,  271,
+      271,  271,  271,  271,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  271,  271,  271,  271,  271,
+      272,    0,    0,    0,    0,    0,  272,  272,  272,  272,
+      272,  272,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  272,  272,  272,  272,  272,  273,    0,
+        0,    0,    0,    0,  273,  273,  273,  273,  273,  273,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  273,  273,  273,  273,  273,  290,    0,    0,    0,
+        0,    0,  290,  290,  290,  290,  290,  290,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  290,
+      290,  290,  290,  290,  294,    0,    0,    0,    0,    0,
+      294,  294,  294,  294,  294,  294,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  294,  294,  294,
+
+      294,  294,  295,    0,    0,    0,    0,    0,  295,  295,
+      295,  295,  295,  295,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  295,  295,  295,  295,  295,
+      302,    0,    0,    0,    0,    0,  302,  302,  302,  302,
+      302,  302,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  302,  302,  302,  302,  302,  303,    0,
+        0,    0,    0,    0,  303,  303,  303,  303,  303,  303,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  303,  303,  303,  303,  303,  304,    0,    0,    0,
+        0,    0,  304,  304,  304,  304,  304,  304,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  304,
+      304,  304,  304,  304,  310,    0,    0,    0,    0,    0,
+      310,  310,  310,  310,  310,  310,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  310,  310,  310,
+      310,  310,  311,    0,    0,    0,    0,    0,  311,  311,
+
+      311,  311,  311,  311,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  311,  311,  311,  311,  311,
+      312,    0,    0,    0,    0,    0,  312,  312,  312,  312,
+      312,  312,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  312,  312,  312,  312,  312,  316,    0,
+        0,    0,    0,    0,  316,  316,  316,  316,  316,  316,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,  316,  316,  316,  316,  316,  317,    0,    0,    0,
+        0,    0,  317,  317,  317,  317,  317,  317,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  317,
+      317,  317,  317,  317,  318,    0,    0,    0,    0,    0,
+      318,  318,  318,  318,  318,  318,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  318,  318,  318,
+      318,  318,  333,    0,  333,  333,  333,  333,  333,  333,
+      333,  334,  334,    0,  334,  334,  335,    0,  335,  335,
+
+      335,  335,  335,  335,  335,  336,  336,    0,  336,  336,
+      337,  337,  337,    0,  337,  337,  338,  338,  338,  338,
+      338,  338,  338,  339,  339,  339,  339,  339,  339,  339,
+      339,  339,  340,  340,  340,  340,  340,  340,  340,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  342,  342,
+      342,  342,  342,  342,  342,  342,  342,  342,  343,  343,
+      344,  344,    0,  344,  344,  345,  345,  345,  345,  345,
+      345,  345,  346,  346,  346,  346,  346,  346,  346,  347,
+      347,  347,  348,  348,  348,  348,  348,  348,  348,  348,
+      348,  348,  349,  349,  349,  349,  349,  349,  349,  350,
+
+      350,  350,  350,  351,  351,  351,  351,  351,  351,  351,
+      351,  351,  351,  352,    0,  352,  353,  353,  353,  353,
+      354,  354,  354,    0,  354,  354,  354,  354,  354,  355,
+        0,  355,  356,  356,  356,  356,  357,    0,  357,  357,
+      357,  357,  357,  357,  357,  358,    0,  358,  358,  358,
+      358,  358,  358,  358,  359,  359,  359,  359,  359,  359,
+      359,  359,  359,  360,    0,  360,  361,  361,  361,  361,
+      362,  362,  362,  362,  362,  362,  362,  362,  362,  363,
+      363,  363,  363,  363,  363,  363,  363,  363,  364,    0,
+      364,  365,  365,  365,  365,  366,    0,  366,  367,    0,
+
+      367,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
+      332,  332,  332,  332,  332,  332,  332,  332,  332,  332
+    } ;
+
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register short unsigned int *yy_cp;
+	register short unsigned int *yy_bp;
+	register int yy_act;
+    
+// #line 25 "tokenizer.flex"
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of yytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 333 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 3602 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+// #line 27 "tokenizer.flex"
+/* ignore comments */
+	YY_BREAK
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+#line 29 "tokenizer.flex"
+{yyTok = S; return yyTok;}
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 31 "tokenizer.flex"
+{yyTok = SGML_CD; return yyTok;}
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 32 "tokenizer.flex"
+{yyTok = SGML_CD; return yyTok;}
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 33 "tokenizer.flex"
+{yyTok = INCLUDES; return yyTok;}
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 34 "tokenizer.flex"
+{yyTok = DASHMATCH; return yyTok;}
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 35 "tokenizer.flex"
+{yyTok = BEGINSWITH; return yyTok;}
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 36 "tokenizer.flex"
+{yyTok = ENDSWITH; return yyTok;}
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 37 "tokenizer.flex"
+{yyTok = CONTAINS; return yyTok;}
+	YY_BREAK
+case 10:
+/* rule 10 can match eol */
+YY_RULE_SETUP
+#line 39 "tokenizer.flex"
+{yyTok = STRING; return yyTok;}
+	YY_BREAK
+case 11:
+/* rule 11 can match eol */
+YY_RULE_SETUP
+#line 41 "tokenizer.flex"
+{yyTok = IDENT; return yyTok;}
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 43 "tokenizer.flex"
+{yyTok = NTH; return yyTok;}
+	YY_BREAK
+case 13:
+/* rule 13 can match eol */
+YY_RULE_SETUP
+#line 45 "tokenizer.flex"
+{yyTok = HASH; return yyTok;}
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 47 "tokenizer.flex"
+{yyTok = IMPORT_SYM; return yyTok;}
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 48 "tokenizer.flex"
+{yyTok = PAGE_SYM; return yyTok;}
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 49 "tokenizer.flex"
+{yyTok = MEDIA_SYM; return yyTok;}
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 50 "tokenizer.flex"
+{yyTok = FONT_FACE_SYM; return yyTok;}
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 51 "tokenizer.flex"
+{yyTok = CHARSET_SYM; return yyTok;}
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 52 "tokenizer.flex"
+{yyTok = NAMESPACE_SYM; return yyTok; }
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 53 "tokenizer.flex"
+{yyTok = TDEHTML_RULE_SYM; return yyTok; }
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 54 "tokenizer.flex"
+{yyTok = TDEHTML_DECLS_SYM; return yyTok; }
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 55 "tokenizer.flex"
+{yyTok = TDEHTML_VALUE_SYM; return yyTok; }
+	YY_BREAK
+case 23:
+/* rule 23 can match eol */
+YY_RULE_SETUP
+#line 57 "tokenizer.flex"
+{yyTok = IMPORTANT_SYM; return yyTok;}
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 59 "tokenizer.flex"
+{yyTok = EMS; return yyTok;}
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 60 "tokenizer.flex"
+{yyTok = QEMS; return yyTok;} /* quirky ems */
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 61 "tokenizer.flex"
+{yyTok = EXS; return yyTok;}
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 62 "tokenizer.flex"
+{yyTok = PXS; return yyTok;}
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+#line 63 "tokenizer.flex"
+{yyTok = CMS; return yyTok;}
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 64 "tokenizer.flex"
+{yyTok = MMS; return yyTok;}
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+#line 65 "tokenizer.flex"
+{yyTok = INS; return yyTok;}
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 66 "tokenizer.flex"
+{yyTok = PTS; return yyTok;}
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 67 "tokenizer.flex"
+{yyTok = PCS; return yyTok;}
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+#line 68 "tokenizer.flex"
+{yyTok = DEGS; return yyTok;}
+	YY_BREAK
+case 34:
+YY_RULE_SETUP
+#line 69 "tokenizer.flex"
+{yyTok = RADS; return yyTok;}
+	YY_BREAK
+case 35:
+YY_RULE_SETUP
+#line 70 "tokenizer.flex"
+{yyTok = GRADS; return yyTok;}
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 71 "tokenizer.flex"
+{yyTok = MSECS; return yyTok;}
+	YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 72 "tokenizer.flex"
+{yyTok = SECS; return yyTok;}
+	YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 73 "tokenizer.flex"
+{yyTok = HERZ; return yyTok;}
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 74 "tokenizer.flex"
+{yyTok = KHERZ; return yyTok;}
+	YY_BREAK
+case 40:
+/* rule 40 can match eol */
+YY_RULE_SETUP
+#line 75 "tokenizer.flex"
+{yyTok = DIMEN; return yyTok;}
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+#line 76 "tokenizer.flex"
+{yyTok = PERCENTAGE; return yyTok;}
+	YY_BREAK
+case 42:
+YY_RULE_SETUP
+#line 77 "tokenizer.flex"
+{yyTok = INTEGER; return yyTok;}
+	YY_BREAK
+case 43:
+YY_RULE_SETUP
+#line 78 "tokenizer.flex"
+{yyTok = FLOAT; return yyTok;}
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+#line 81 "tokenizer.flex"
+{yyTok = NOTFUNCTION; return yyTok;}
+	YY_BREAK
+case 45:
+/* rule 45 can match eol */
+YY_RULE_SETUP
+#line 82 "tokenizer.flex"
+{yyTok = URI; return yyTok;}
+	YY_BREAK
+case 46:
+/* rule 46 can match eol */
+YY_RULE_SETUP
+#line 83 "tokenizer.flex"
+{yyTok = URI; return yyTok;}
+	YY_BREAK
+case 47:
+/* rule 47 can match eol */
+YY_RULE_SETUP
+#line 84 "tokenizer.flex"
+{yyTok = FUNCTION; return yyTok;}
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 86 "tokenizer.flex"
+{yyTok = UNICODERANGE; return yyTok;}
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
+#line 87 "tokenizer.flex"
+{yyTok = UNICODERANGE; return yyTok;}
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 89 "tokenizer.flex"
+{yyTok = *yytext; return yyTok;}
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 91 "tokenizer.flex"
+ECHO;
+	YY_BREAK
+#line 1926 "lex.yy.c"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+        yy_c_buf_p = yytext;
+        yy_act = YY_STATE_EOF(YY_START);
+        goto do_action;
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of yylex */
diff --git a/khtml/css/tokenizer.flex b/tdehtml/css/tokenizer.flex
index 3c24d8e07..330d13042 100644
--- a/khtml/css/tokenizer.flex
+++ b/tdehtml/css/tokenizer.flex
@@ -50,9 +50,9 @@ nth             (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n)
 "@font-face"            {yyTok = FONT_FACE_SYM; return yyTok;}
 "@charset"              {yyTok = CHARSET_SYM; return yyTok;}
 "@namespace"		{yyTok = NAMESPACE_SYM; return yyTok; }
-"@-khtml-rule"    {yyTok = KHTML_RULE_SYM; return yyTok; }
-"@-khtml-decls"   {yyTok = KHTML_DECLS_SYM; return yyTok; }
-"@-khtml-value"   {yyTok = KHTML_VALUE_SYM; return yyTok; }
+"@-tdehtml-rule"    {yyTok = TDEHTML_RULE_SYM; return yyTok; }
+"@-tdehtml-decls"   {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
+"@-tdehtml-value"   {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
 
 "!"{w}"important"         {yyTok = IMPORTANT_SYM; return yyTok;}
 
diff --git a/khtml/design.h b/tdehtml/design.h
index 5f54c3137..f287a5ef9 100644
--- a/khtml/design.h
+++ b/tdehtml/design.h
@@ -36,11 +36,11 @@
  * If you want to add to your application a widget that only needs simple text
  * browsing, you can also use the KTextBrowser widget in tdeui.
  *
- * KHTMLPart :
- *   The main part/widget for using khtml.
+ * TDEHTMLPart :
+ *   The main part/widget for using tdehtml.
  *
  * DOM :
- *   The dom implementation used in khtml.
+ *   The dom implementation used in tdehtml.
  *
  */
 
diff --git a/khtml/dom/CMakeLists.txt b/tdehtml/dom/CMakeLists.txt
index 83dd88c5c..e781a62a8 100644
--- a/khtml/dom/CMakeLists.txt
+++ b/tdehtml/dom/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
 )
 
 
@@ -38,9 +38,9 @@ install( FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}/dom )
 
 
-##### khtmldom-static ############################
+##### tdehtmldom-static ############################
 
-set( target khtmldom )
+set( target tdehtmldom )
 
 set( ${target}_SRCS
   dom_misc.cpp html_block.cpp html_inline.cpp css_rule.cpp
diff --git a/khtml/dom/Makefile.am b/tdehtml/dom/Makefile.am
index cb8b1de8c..0b9f587f1 100644
--- a/khtml/dom/Makefile.am
+++ b/tdehtml/dom/Makefile.am
@@ -19,8 +19,8 @@
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmldom.la
-libkhtmldom_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmldom.la
+libtdehtmldom_la_SOURCES = \
 	dom_misc.cpp        html_block.cpp      html_inline.cpp \
 	css_rule.cpp        dom_node.cpp        html_document.cpp   html_list.cpp \
 	css_stylesheet.cpp  dom_string.cpp      html_element.cpp    html_misc.cpp \
@@ -31,7 +31,7 @@ libkhtmldom_la_SOURCES = \
 	dom2_views.cpp
 #	css_extensions.cpp
 
-libkhtmldom_la_METASOURCES = AUTO
+libtdehtmldom_la_METASOURCES = AUTO
 
 myincludedir = $(includedir)/dom
 myinclude_HEADERS = \
@@ -46,10 +46,10 @@ myinclude_HEADERS = \
 	dom2_views.h
 #	css_extensions.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/khtml -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
+ -I$(top_srcdir)/tdehtml -I$(top_srcdir) $(all_includes)
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 ## generate lib documentation
 srcdoc:
diff --git a/khtml/dom/css_extensions.cpp b/tdehtml/dom/css_extensions.cpp
index 23f7739dc..23f7739dc 100644
--- a/khtml/dom/css_extensions.cpp
+++ b/tdehtml/dom/css_extensions.cpp
diff --git a/khtml/dom/css_extensions.h b/tdehtml/dom/css_extensions.h
index a6cdb2149..a6cdb2149 100644
--- a/khtml/dom/css_extensions.h
+++ b/tdehtml/dom/css_extensions.h
diff --git a/khtml/dom/css_rule.cpp b/tdehtml/dom/css_rule.cpp
index e73ff493a..e73ff493a 100644
--- a/khtml/dom/css_rule.cpp
+++ b/tdehtml/dom/css_rule.cpp
diff --git a/khtml/dom/css_rule.h b/tdehtml/dom/css_rule.h
index 5f27e8f8a..9059eecd7 100644
--- a/khtml/dom/css_rule.h
+++ b/tdehtml/dom/css_rule.h
@@ -49,7 +49,7 @@ class CSSRuleImpl;
  * interface.
  *
  */
-class KHTML_EXPORT CSSRule
+class TDEHTML_EXPORT CSSRule
 {
 public:
     CSSRule();
@@ -72,7 +72,7 @@ public:
         MEDIA_RULE = 4,
         FONT_FACE_RULE = 5,
         PAGE_RULE = 6,
-	QUIRKS_RULE = 100 // KHTML CSS Extension
+	QUIRKS_RULE = 100 // TDEHTML CSS Extension
     };
 
     /**
@@ -146,7 +146,7 @@ class CSSCharsetRuleImpl;
  * be used to define the encoding of the style sheet.
  *
  */
-class KHTML_EXPORT CSSCharsetRule : public CSSRule
+class TDEHTML_EXPORT CSSCharsetRule : public CSSRule
 {
 public:
     CSSCharsetRule();
@@ -190,7 +190,7 @@ class CSSFontFaceRuleImpl;
  * rule is used to hold a set of font descriptions.
  *
  */
-class KHTML_EXPORT CSSFontFaceRule : public CSSRule
+class TDEHTML_EXPORT CSSFontFaceRule : public CSSRule
 {
 public:
     CSSFontFaceRule();
@@ -220,7 +220,7 @@ class CSSImportRuleImpl;
  * rule is used to import style rules from other style sheets.
  *
  */
-class KHTML_EXPORT CSSImportRule : public CSSRule
+class TDEHTML_EXPORT CSSImportRule : public CSSRule
 {
 public:
     CSSImportRule();
@@ -267,7 +267,7 @@ class CSSMediaRuleImpl;
  * can be used to delimit style rules for specific media types.
  *
  */
-class KHTML_EXPORT CSSMediaRule : public CSSRule
+class TDEHTML_EXPORT CSSMediaRule : public CSSRule
 {
 public:
     CSSMediaRule();
@@ -359,7 +359,7 @@ class CSSPageRuleImpl;
  * page box for paged media.
  *
  */
-class KHTML_EXPORT CSSPageRule : public CSSRule
+class TDEHTML_EXPORT CSSPageRule : public CSSRule
 {
 public:
     CSSPageRule();
@@ -408,7 +408,7 @@ class CSSStyleRuleImpl;
  * in a CSS style sheet.
  *
  */
-class KHTML_EXPORT CSSStyleRule : public CSSRule
+class TDEHTML_EXPORT CSSStyleRule : public CSSRule
 {
 public:
     CSSStyleRule();
@@ -458,7 +458,7 @@ class CSSUnknownRuleImpl;
  * not supported by this user agent.
  *
  */
-class KHTML_EXPORT CSSUnknownRule : public CSSRule
+class TDEHTML_EXPORT CSSUnknownRule : public CSSRule
 {
 public:
     CSSUnknownRule();
@@ -481,7 +481,7 @@ class StyleListImpl;
  * of an ordered collection of CSS rules.
  *
  */
-class KHTML_EXPORT CSSRuleList
+class TDEHTML_EXPORT CSSRuleList
 {
 public:
     CSSRuleList();
diff --git a/khtml/dom/css_stylesheet.cpp b/tdehtml/dom/css_stylesheet.cpp
index ab5ce1451..ab5ce1451 100644
--- a/khtml/dom/css_stylesheet.cpp
+++ b/tdehtml/dom/css_stylesheet.cpp
diff --git a/khtml/dom/css_stylesheet.h b/tdehtml/dom/css_stylesheet.h
index d220ffa76..884c6bec5 100644
--- a/khtml/dom/css_stylesheet.h
+++ b/tdehtml/dom/css_stylesheet.h
@@ -55,7 +55,7 @@ class DocumentImpl;
  * instruction </a> .
  *
  */
-class KHTML_EXPORT StyleSheet
+class TDEHTML_EXPORT StyleSheet
 {
 public:
     StyleSheet();
@@ -170,7 +170,7 @@ protected:
  * This exception is raised when a specific CSS operation is impossible
  * to perform.
  */
-class KHTML_EXPORT CSSException
+class TDEHTML_EXPORT CSSException
 {
 public:
     CSSException(unsigned short _code) { code = _code; }
@@ -204,7 +204,7 @@ class CSSRuleList;
  * content type is "text/css".
  *
  */
-class KHTML_EXPORT CSSStyleSheet : public StyleSheet
+class TDEHTML_EXPORT CSSStyleSheet : public StyleSheet
 {
 public:
     CSSStyleSheet();
@@ -306,7 +306,7 @@ class StyleSheet;
  * abstraction of an ordered collection of style sheets.
  *
  */
-class KHTML_EXPORT StyleSheetList
+class TDEHTML_EXPORT StyleSheetList
 {
 public:
     StyleSheetList();
@@ -360,7 +360,7 @@ class CSSStyleSheet;
  * strings.
  *
  */
-class KHTML_EXPORT MediaList
+class TDEHTML_EXPORT MediaList
 {
 public:
     MediaList();
@@ -444,7 +444,7 @@ protected:
 
 class LinkStyleImpl;
 
-class KHTML_EXPORT LinkStyle
+class TDEHTML_EXPORT LinkStyle
 {
 public:
     LinkStyle();
@@ -466,7 +466,7 @@ protected:
 
 class DocumentStyleImpl;
 
-class KHTML_EXPORT DocumentStyle
+class TDEHTML_EXPORT DocumentStyle
 {
 public:
     DocumentStyle();
diff --git a/khtml/dom/css_value.cpp b/tdehtml/dom/css_value.cpp
index 90d1b1570..4e365644a 100644
--- a/khtml/dom/css_value.cpp
+++ b/tdehtml/dom/css_value.cpp
@@ -453,7 +453,7 @@ DOMString Counter::identifier() const
 DOMString Counter::listStyle() const
 {
   if (!impl) return DOMString();
-  return khtml::stringForListStyleType((khtml::EListStyleType)impl->listStyle());
+  return tdehtml::stringForListStyleType((tdehtml::EListStyleType)impl->listStyle());
 }
 
 DOMString Counter::separator() const
diff --git a/khtml/dom/css_value.h b/tdehtml/dom/css_value.h
index 5d4a043c7..e2028feac 100644
--- a/khtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
@@ -57,7 +57,7 @@ class CSSValue;
  * interface.
  *
  */
-class KHTML_EXPORT CSSStyleDeclaration
+class TDEHTML_EXPORT CSSStyleDeclaration
 {
 public:
     CSSStyleDeclaration();
@@ -240,7 +240,7 @@ class CSSValueImpl;
  * complexe value.
  *
  */
-class KHTML_EXPORT CSSValue
+class TDEHTML_EXPORT CSSValue
 {
 public:
     CSSValue();
@@ -313,7 +313,7 @@ class CSSValue;
  * of an ordered collection of CSS values.
  *
  */
-class KHTML_EXPORT CSSValueList : public CSSValue
+class TDEHTML_EXPORT CSSValueList : public CSSValue
 {
 public:
     CSSValueList();
@@ -370,7 +370,7 @@ class Rect;
  * \c CSSStyleDeclaration interface.
  *
  */
-class KHTML_EXPORT CSSPrimitiveValue : public CSSValue
+class TDEHTML_EXPORT CSSPrimitiveValue : public CSSValue
 {
 public:
     CSSPrimitiveValue();
@@ -588,7 +588,7 @@ public:
  * interface modify the style property.
  *
  */
-class KHTML_EXPORT RGBColor
+class TDEHTML_EXPORT RGBColor
 {
 public:
     RGBColor();
@@ -639,7 +639,7 @@ class RectImpl;
  * interface modify the style property.
  *
  */
-class KHTML_EXPORT Rect
+class TDEHTML_EXPORT Rect
 {
     friend class CSSPrimitiveValue;
 public:
@@ -696,7 +696,7 @@ class CounterImpl;
  * made through this interface modify the style property.
  *
  */
-class KHTML_EXPORT Counter
+class TDEHTML_EXPORT Counter
 {
     friend class CSSPrimitiveValue;
 public:
diff --git a/khtml/dom/dom2_events.cpp b/tdehtml/dom/dom2_events.cpp
index 898a73bc3..898a73bc3 100644
--- a/khtml/dom/dom2_events.cpp
+++ b/tdehtml/dom/dom2_events.cpp
diff --git a/khtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h
index 285a0c10e..3b68eafaa 100644
--- a/khtml/dom/dom2_events.h
+++ b/tdehtml/dom/dom2_events.h
@@ -61,7 +61,7 @@ class MutationEventImpl;
  * add them manually.
  *
  */
-class KHTML_EXPORT EventListener : public DomShared {
+class TDEHTML_EXPORT EventListener : public DomShared {
 public:
     EventListener();
     virtual ~EventListener();
@@ -108,7 +108,7 @@ protected:
  * implemented by the object passed to the event listener.
  *
  */
-class KHTML_EXPORT Event {
+class TDEHTML_EXPORT Event {
     friend class Document;
     friend class NodeImpl;
     friend class DocumentImpl;
@@ -259,7 +259,7 @@ protected:
  * descriptions.
  *
  */
-class KHTML_EXPORT EventException
+class TDEHTML_EXPORT EventException
 {
 public:
     EventException(unsigned short _code);
@@ -291,7 +291,7 @@ public:
  * with User Interface events.
  *
  */
-class KHTML_EXPORT UIEvent : public Event {
+class TDEHTML_EXPORT UIEvent : public Event {
 public:
     UIEvent();
     UIEvent(const UIEvent &other);
@@ -396,7 +396,7 @@ protected:
  * obtain notification of mouse events which occur within its descendent elements.
  *
  */
-class KHTML_EXPORT MouseEvent : public UIEvent {
+class TDEHTML_EXPORT MouseEvent : public UIEvent {
 public:
     MouseEvent();
     MouseEvent(const MouseEvent &other);
@@ -552,7 +552,7 @@ protected:
  * as specified in current DOM3 Events revision. This is doing heavy emulation
  * at the moment
  */
-class KHTML_EXPORT TextEvent : public UIEvent {
+class TDEHTML_EXPORT TextEvent : public UIEvent {
 public:
     TextEvent();
     TextEvent(const TextEvent &other);
@@ -735,7 +735,7 @@ protected:
  * associated with Mutation events.
  *
  */
-class KHTML_EXPORT MutationEvent : public Event {
+class TDEHTML_EXPORT MutationEvent : public Event {
 public:
     MutationEvent();
     MutationEvent(const MutationEvent &other);
diff --git a/khtml/dom/dom2_range.cpp b/tdehtml/dom/dom2_range.cpp
index 87bdab145..87bdab145 100644
--- a/khtml/dom/dom2_range.cpp
+++ b/tdehtml/dom/dom2_range.cpp
diff --git a/khtml/dom/dom2_range.h b/tdehtml/dom/dom2_range.h
index 290f4f48c..1f69b4a99 100644
--- a/khtml/dom/dom2_range.h
+++ b/tdehtml/dom/dom2_range.h
@@ -44,7 +44,7 @@ class RangeImpl;
 class DOMException;
 
 // Introduced in DOM Level 2:
-class KHTML_EXPORT RangeException {
+class TDEHTML_EXPORT RangeException {
 public:
     RangeException(unsigned short _code) { code = _code; }
     RangeException(const RangeException &other) { code = other.code; }
@@ -67,7 +67,7 @@ public:
 };
 
 
-class KHTML_EXPORT Range
+class TDEHTML_EXPORT Range
 {
     friend class DocumentImpl;
     friend class Document;
diff --git a/khtml/dom/dom2_traversal.cpp b/tdehtml/dom/dom2_traversal.cpp
index c0a09435b..c0a09435b 100644
--- a/khtml/dom/dom2_traversal.cpp
+++ b/tdehtml/dom/dom2_traversal.cpp
diff --git a/khtml/dom/dom2_traversal.h b/tdehtml/dom/dom2_traversal.h
index ea3d3521b..a1fc86bb3 100644
--- a/khtml/dom/dom2_traversal.h
+++ b/tdehtml/dom/dom2_traversal.h
@@ -57,7 +57,7 @@ class CustomNodeFilterImpl;
  * interface.
  *
  */
-class KHTML_EXPORT NodeIterator
+class TDEHTML_EXPORT NodeIterator
 {
     friend class NodeIteratorImpl;
     friend class Document;
@@ -181,7 +181,7 @@ protected:
  * an instance of it to the NodeFilter. For more details see the
  * CustomNodeFilter class
  */
-class KHTML_EXPORT NodeFilter
+class TDEHTML_EXPORT NodeFilter
 {
     friend class NodeIterator;
     friend class NodeIteratorImpl;
@@ -292,7 +292,7 @@ protected:
  *
  */
 
-class KHTML_EXPORT CustomNodeFilter : public DomShared {
+class TDEHTML_EXPORT CustomNodeFilter : public DomShared {
 public:
     CustomNodeFilter();
     virtual ~CustomNodeFilter();
@@ -336,7 +336,7 @@ protected:
  * how deeply nested the structure of the original document.
  *
  */
-class KHTML_EXPORT TreeWalker
+class TDEHTML_EXPORT TreeWalker
 {
     friend class Document;
     friend class TreeWalkerImpl;
diff --git a/khtml/dom/dom2_views.cpp b/tdehtml/dom/dom2_views.cpp
index 11b07fbb0..11b07fbb0 100644
--- a/khtml/dom/dom2_views.cpp
+++ b/tdehtml/dom/dom2_views.cpp
diff --git a/khtml/dom/dom2_views.h b/tdehtml/dom/dom2_views.h
index 6f326aaa3..dcba1cb40 100644
--- a/khtml/dom/dom2_views.h
+++ b/tdehtml/dom/dom2_views.h
@@ -38,7 +38,7 @@ class DOMString;
  * A base interface that all views shall derive from.
  *
  */
-class KHTML_EXPORT AbstractView {
+class TDEHTML_EXPORT AbstractView {
     friend class Event;
     friend class UIEvent;
     friend class MouseEvent;
diff --git a/khtml/dom/dom_core.h b/tdehtml/dom/dom_core.h
index c3c8f2893..c3c8f2893 100644
--- a/khtml/dom/dom_core.h
+++ b/tdehtml/dom/dom_core.h
diff --git a/khtml/dom/dom_doc.cpp b/tdehtml/dom/dom_doc.cpp
index 0ff123444..b38a01401 100644
--- a/khtml/dom/dom_doc.cpp
+++ b/tdehtml/dom/dom_doc.cpp
@@ -438,7 +438,7 @@ void Document::setSelectedStylesheetSet(const DOMString& s)
 }
 
 
-KHTMLView *Document::view() const
+TDEHTMLView *Document::view() const
 {
     if (!impl) return 0;
 
diff --git a/khtml/dom/dom_doc.h b/tdehtml/dom/dom_doc.h
index 9a5331295..cef6692c5 100644
--- a/khtml/dom/dom_doc.h
+++ b/tdehtml/dom/dom_doc.h
@@ -32,8 +32,8 @@
 #include <dom/dom_node.h>
 #include <dom/css_stylesheet.h>
 
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
 
 namespace DOM {
 
@@ -74,7 +74,7 @@ class HTMLDocument;
  * DOM Level 2 and newer provide means for creating documents directly,
  * which was not possible with DOM Level 1.
  */
-class KHTML_EXPORT DOMImplementation
+class TDEHTML_EXPORT DOMImplementation
 {
    friend class Document;
 public:
@@ -242,10 +242,10 @@ protected:
  * context they were created.
  *
  */
-class KHTML_EXPORT Document : public Node
+class TDEHTML_EXPORT Document : public Node
 {
-    friend class ::KHTMLView;
-    friend class ::KHTMLPart;
+    friend class ::TDEHTMLView;
+    friend class ::TDEHTMLPart;
     friend class AbstractView;
     friend class DOMImplementation;
     friend class HTMLFrameElement;
@@ -786,9 +786,9 @@ public:
     void removeStyleSheet(const StyleSheet &sheet);
     
     /**
-     * @return The KHTML view widget of this document.
+     * @return The TDEHTML view widget of this document.
      */
-    KHTMLView *view() const;
+    TDEHTMLView *view() const;
 
     /**
      * Introduced in DOM Level 2
@@ -988,7 +988,7 @@ class DocumentFragmentImpl;
  * \c insertBefore() and \c appendChild() .
  *
  */
-class KHTML_EXPORT DocumentFragment : public Node
+class TDEHTML_EXPORT DocumentFragment : public Node
 {
     friend class Document;
     friend class HTMLElementImpl;
@@ -1025,7 +1025,7 @@ class DOMString;
  * nodes.
  *
  */
-class KHTML_EXPORT DocumentType : public Node
+class TDEHTML_EXPORT DocumentType : public Node
 {
     friend class Document;
     friend class DOMImplementation;
diff --git a/khtml/dom/dom_element.cpp b/tdehtml/dom/dom_element.cpp
index 54c322e25..d9872e37c 100644
--- a/khtml/dom/dom_element.cpp
+++ b/tdehtml/dom/dom_element.cpp
@@ -147,7 +147,7 @@ DOMString Element::tagName() const
 DOMString Element::getAttribute( const DOMString &name )
 {
     // ### getAttribute() and getAttributeNS() are supposed to return the empty string if the attribute
-    // does not exist. However, there are a number of places around khtml that expect a null string
+    // does not exist. However, there are a number of places around tdehtml that expect a null string
     // for nonexistent attributes. These need to be changed to use hasAttribute() instead.
     if (!impl) throw DOMException(DOMException::NOT_FOUND_ERR);
     if (!name.implementation()) throw DOMException(DOMException::NOT_FOUND_ERR);
@@ -364,7 +364,7 @@ void Element::setContentEditable(bool enabled) {
     static_cast<ElementImpl *>(impl)->setContentEditable(enabled);
 }
 
-bool Element::khtmlValidAttrName(const DOMString &name)
+bool Element::tdehtmlValidAttrName(const DOMString &name)
 {
     // Check if name is valid
     // http://www.w3.org/TR/2000/REC-xml-20001006#NT-Name
@@ -384,25 +384,25 @@ bool Element::khtmlValidAttrName(const DOMString &name)
     return true;
 }
 
-bool Element::khtmlValidPrefix(const DOMString &name)
+bool Element::tdehtmlValidPrefix(const DOMString &name)
 {
-    // Null prefix is ok. If not null, reuse code from khtmlValidAttrName
-    return !name.implementation() || khtmlValidAttrName(name);
+    // Null prefix is ok. If not null, reuse code from tdehtmlValidAttrName
+    return !name.implementation() || tdehtmlValidAttrName(name);
 }
 
-bool Element::khtmlValidQualifiedName(const DOMString &name)
+bool Element::tdehtmlValidQualifiedName(const DOMString &name)
 {
-    return khtmlValidAttrName(name);
+    return tdehtmlValidAttrName(name);
 }
 
-bool Element::khtmlMalformedQualifiedName(const DOMString &name)
+bool Element::tdehtmlMalformedQualifiedName(const DOMString &name)
 {
     // #### Not clearly defined in the DOM spec...
     // But we know for sure that a null qualified name is malformed
     return name.isNull();
 }
 
-bool Element::khtmlMalformedPrefix(const DOMString &/*name*/)
+bool Element::tdehtmlMalformedPrefix(const DOMString &/*name*/)
 {
     // ####
     return false;
diff --git a/khtml/dom/dom_element.h b/tdehtml/dom/dom_element.h
index 5a5f2986b..8df181c17 100644
--- a/khtml/dom/dom_element.h
+++ b/tdehtml/dom/dom_element.h
@@ -86,7 +86,7 @@ class DocumentImpl;
  * unknown, there are no tokenized attribute values.
  *
  */
-class KHTML_EXPORT Attr : public Node
+class TDEHTML_EXPORT Attr : public Node
 {
     friend class Element;
     friend class Document;
@@ -207,7 +207,7 @@ class DOMString;
  * access an attribute value can safely be used as a convenience.
  *
  */
-class KHTML_EXPORT Element : public Node
+class TDEHTML_EXPORT Element : public Node
 {
     friend class Document;
     friend class HTMLDocument;
@@ -579,19 +579,19 @@ public:
     bool isHTMLElement() const;
 
     /**
-     * KHTML extension to DOM
+     * TDEHTML extension to DOM
      * This method returns the associated form element.
      * returns null if this element is not a form-like element
      * or if this elment is not in the scope of a form element.
      */
     Element form() const;
 
-    static bool khtmlValidAttrName(const DOMString &name);
-    static bool khtmlValidPrefix(const DOMString &name);
-    static bool khtmlValidQualifiedName(const DOMString &name);
+    static bool tdehtmlValidAttrName(const DOMString &name);
+    static bool tdehtmlValidPrefix(const DOMString &name);
+    static bool tdehtmlValidQualifiedName(const DOMString &name);
 
-    static bool khtmlMalformedQualifiedName(const DOMString &name);
-    static bool khtmlMalformedPrefix(const DOMString &name);
+    static bool tdehtmlMalformedQualifiedName(const DOMString &name);
+    static bool tdehtmlMalformedPrefix(const DOMString &name);
 protected:
     Element(ElementImpl *_impl);
 };
diff --git a/khtml/dom/dom_exception.h b/tdehtml/dom/dom_exception.h
index cef032206..f4c4b4e75 100644
--- a/khtml/dom/dom_exception.h
+++ b/tdehtml/dom/dom_exception.h
@@ -54,7 +54,7 @@ namespace DOM {
  * the corresponding method descriptions.
  *
  */
-class KHTML_EXPORT DOMException
+class TDEHTML_EXPORT DOMException
 {
 public:
     DOMException(unsigned short _code) { code = _code; }
diff --git a/khtml/dom/dom_html.h b/tdehtml/dom/dom_html.h
index f8aa02e99..f8aa02e99 100644
--- a/khtml/dom/dom_html.h
+++ b/tdehtml/dom/dom_html.h
diff --git a/khtml/dom/dom_misc.cpp b/tdehtml/dom/dom_misc.cpp
index d296b954a..d296b954a 100644
--- a/khtml/dom/dom_misc.cpp
+++ b/tdehtml/dom/dom_misc.cpp
diff --git a/khtml/dom/dom_misc.h b/tdehtml/dom/dom_misc.h
index 4cded0f00..494ab2704 100644
--- a/khtml/dom/dom_misc.h
+++ b/tdehtml/dom/dom_misc.h
@@ -33,7 +33,7 @@ namespace DOM {
  * Other objects should overload deleteMe() to fit their needs. The default
  * implementation deletes the object if the ref count drops to 0.
  */
-class KHTML_EXPORT DomShared
+class TDEHTML_EXPORT DomShared
 {
 public:
   DomShared() : _ref( 0 ) {}
diff --git a/khtml/dom/dom_node.cpp b/tdehtml/dom/dom_node.cpp
index 9971bdb00..9971bdb00 100644
--- a/khtml/dom/dom_node.cpp
+++ b/tdehtml/dom/dom_node.cpp
diff --git a/khtml/dom/dom_node.h b/tdehtml/dom/dom_node.h
index 594aa5e3e..b87997547 100644
--- a/khtml/dom/dom_node.h
+++ b/tdehtml/dom/dom_node.h
@@ -63,7 +63,7 @@ class Event;
  * imply that the DOM specifies an order to these Nodes.
  *
  */
-class KHTML_EXPORT NamedNodeMap
+class TDEHTML_EXPORT NamedNodeMap
 {
 public:
     NamedNodeMap();
@@ -271,7 +271,7 @@ class NodeImpl;
  * mechanisms to get and set the relevant information.
  *
  */
-class KHTML_EXPORT Node
+class TDEHTML_EXPORT Node
 {
     friend class NamedNodeMap;
     friend class NodeList;
@@ -775,7 +775,7 @@ public:
      *
      * @exception DOMException
      * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     * Note: KHTML will also raise this if setContent is called on things
+     * Note: TDEHTML will also raise this if setContent is called on things
      * that do not have child nodes.
      *
      * @since 3.5.7
@@ -928,7 +928,7 @@ class NodeListImpl;
  * integral index, starting from 0.
  *
  */
-class KHTML_EXPORT NodeList
+class TDEHTML_EXPORT NodeList
 {
     friend class Element;
     friend class Node;
diff --git a/khtml/dom/dom_string.cpp b/tdehtml/dom/dom_string.cpp
index 14bdc2613..14bdc2613 100644
--- a/khtml/dom/dom_string.cpp
+++ b/tdehtml/dom/dom_string.cpp
diff --git a/khtml/dom/dom_string.h b/tdehtml/dom/dom_string.h
index 3d4706b5a..a82d1018b 100644
--- a/khtml/dom/dom_string.h
+++ b/tdehtml/dom/dom_string.h
@@ -40,10 +40,10 @@ class DOMStringImpl;
  * that modifications to one instance will also modify all others. If you
  * wish to get a DOMString that is independent, use copy().
  */
-class KHTML_EXPORT DOMString
+class TDEHTML_EXPORT DOMString
 {
     friend class CharacterDataImpl;
-    friend KHTML_EXPORT bool operator==( const DOMString &a, const char *b );
+    friend TDEHTML_EXPORT bool operator==( const DOMString &a, const char *b );
 public:
     /**
      * default constructor. Gives an empty DOMString
@@ -128,17 +128,17 @@ inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &) {
 }
 #endif
 
-KHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );
-KHTML_EXPORT bool operator==( const DOMString &a, const TQString &b );
-KHTML_EXPORT bool operator==( const DOMString &a, const char *b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const TQString &b );
+TDEHTML_EXPORT bool operator==( const DOMString &a, const char *b );
 inline bool operator!=( const DOMString &a, const DOMString &b ) { return !(a==b); }
 inline bool operator!=( const DOMString &a, const TQString &b ) { return !(a==b); }
 inline bool operator!=( const DOMString &a, const char *b )  { return !(a==b); }
 inline bool strcmp( const DOMString &a, const DOMString &b ) { return a != b; }
 
 // returns false when equal, true otherwise (ignoring case)
-KHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b );
-KHTML_EXPORT bool strcasecmp( const DOMString& a, const char* b );
+TDEHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b );
+TDEHTML_EXPORT bool strcasecmp( const DOMString& a, const char* b );
 
 }
 #endif
diff --git a/khtml/dom/dom_text.cpp b/tdehtml/dom/dom_text.cpp
index af4584410..af4584410 100644
--- a/khtml/dom/dom_text.cpp
+++ b/tdehtml/dom/dom_text.cpp
diff --git a/khtml/dom/dom_text.h b/tdehtml/dom/dom_text.h
index c6f92fb1d..bc84f5902 100644
--- a/khtml/dom/dom_text.h
+++ b/tdehtml/dom/dom_text.h
@@ -46,7 +46,7 @@ class CharacterDataImpl;
  * <code>offset</code>s in this interface start from 0.
  *
  */
-class KHTML_EXPORT CharacterData : public Node
+class TDEHTML_EXPORT CharacterData : public Node
 {
     friend class CharacterDataImpl;
 
@@ -220,7 +220,7 @@ class CommentImpl;
  * the full SGML comment structure.
  *
  */
-class KHTML_EXPORT Comment : public CharacterData
+class TDEHTML_EXPORT Comment : public CharacterData
 {
     friend class Document;
     friend class TextImpl;
@@ -266,7 +266,7 @@ class TextImpl;
  * \c XPointers.
  *
  */
-class KHTML_EXPORT Text : public CharacterData
+class TDEHTML_EXPORT Text : public CharacterData
 {
     friend class Document;
     friend class TextImpl;
diff --git a/khtml/dom/dom_xml.cpp b/tdehtml/dom/dom_xml.cpp
index 524bbe218..524bbe218 100644
--- a/khtml/dom/dom_xml.cpp
+++ b/tdehtml/dom/dom_xml.cpp
diff --git a/khtml/dom/dom_xml.h b/tdehtml/dom/dom_xml.h
index 12e70d9e5..b2ef9f8e6 100644
--- a/khtml/dom/dom_xml.h
+++ b/tdehtml/dom/dom_xml.h
@@ -63,7 +63,7 @@ class ProcessingInstructionImpl;
  * merged by use of the Element.normalize() method.
  *
  */
-class KHTML_EXPORT CDATASection : public Text
+class TDEHTML_EXPORT CDATASection : public Text
 {
     friend class Document;
 public:
@@ -121,7 +121,7 @@ class DOMString;
  *  An \c Entity node does not have any parent.
  *
  */
-class KHTML_EXPORT Entity : public Node
+class TDEHTML_EXPORT Entity : public Node
 {
 public:
     Entity();
@@ -185,7 +185,7 @@ protected:
  * evaluation.
  *
  */
-class KHTML_EXPORT EntityReference : public Node
+class TDEHTML_EXPORT EntityReference : public Node
 {
     friend class Document;
 public:
@@ -219,7 +219,7 @@ class DOMString;
  *  A \c Notation node does not have any parent.
  *
  */
-class KHTML_EXPORT Notation : public Node
+class TDEHTML_EXPORT Notation : public Node
 {
 public:
     Notation();
@@ -256,7 +256,7 @@ protected:
  * processor-specific information in the text of the document.
  *
  */
-class KHTML_EXPORT ProcessingInstruction : public Node
+class TDEHTML_EXPORT ProcessingInstruction : public Node
 {
     friend class Document;
 public:
diff --git a/khtml/dom/html_base.cpp b/tdehtml/dom/html_base.cpp
index e35fdaa0a..e35fdaa0a 100644
--- a/khtml/dom/html_base.cpp
+++ b/tdehtml/dom/html_base.cpp
diff --git a/khtml/dom/html_base.h b/tdehtml/dom/html_base.h
index c7ed878ce..1ff3fb825 100644
--- a/khtml/dom/html_base.h
+++ b/tdehtml/dom/html_base.h
@@ -47,7 +47,7 @@ class DOMString;
  * BODY element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBodyElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBodyElement : public HTMLElement
 {
 public:
     HTMLBodyElement();
@@ -160,7 +160,7 @@ class DOMString;
  * FRAME element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFrameElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFrameElement : public HTMLElement
 {
 public:
     HTMLFrameElement();
@@ -306,7 +306,7 @@ class DOMString;
  * FRAMESET element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFrameSetElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFrameSetElement : public HTMLElement
 {
 public:
     HTMLFrameSetElement();
@@ -359,7 +359,7 @@ class HTMLIFrameElementImpl;
  * IFRAME element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLIFrameElement : public HTMLElement
+class TDEHTML_EXPORT HTMLIFrameElement : public HTMLElement
 {
 public:
     HTMLIFrameElement();
@@ -533,7 +533,7 @@ class DOMString;
  * HEAD element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLHeadElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHeadElement : public HTMLElement
 {
 public:
     HTMLHeadElement();
@@ -574,7 +574,7 @@ class DOMString;
  * HTML element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLHtmlElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHtmlElement : public HTMLElement
 {
 public:
     HTMLHtmlElement();
diff --git a/khtml/dom/html_block.cpp b/tdehtml/dom/html_block.cpp
index 9e499adb0..9e499adb0 100644
--- a/khtml/dom/html_block.cpp
+++ b/tdehtml/dom/html_block.cpp
diff --git a/khtml/dom/html_block.h b/tdehtml/dom/html_block.h
index 4283bafa2..fc3963716 100644
--- a/khtml/dom/html_block.h
+++ b/tdehtml/dom/html_block.h
@@ -47,7 +47,7 @@ class DOMString;
  * BLOCKQUOTE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBlockquoteElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBlockquoteElement : public HTMLElement
 {
 public:
     HTMLBlockquoteElement();
@@ -88,7 +88,7 @@ class DOMString;
  * DIV element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLDivElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDivElement : public HTMLElement
 {
 public:
     HTMLDivElement();
@@ -130,7 +130,7 @@ class DOMString;
  * HR element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLHRElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHRElement : public HTMLElement
 {
 public:
     HTMLHRElement();
@@ -214,7 +214,7 @@ class DOMString;
  * H1 element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLHeadingElement : public HTMLElement
+class TDEHTML_EXPORT HTMLHeadingElement : public HTMLElement
 {
 public:
     HTMLHeadingElement();
@@ -255,7 +255,7 @@ class DOMString;
  * element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLParagraphElement : public HTMLElement
+class TDEHTML_EXPORT HTMLParagraphElement : public HTMLElement
 {
 public:
     HTMLParagraphElement();
@@ -296,7 +296,7 @@ class HTMLPreElementImpl;
  * PRE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLPreElement : public HTMLElement
+class TDEHTML_EXPORT HTMLPreElement : public HTMLElement
 {
 public:
     HTMLPreElement();
@@ -334,7 +334,7 @@ class HTMLLayerElementImpl;
  * Behaves mostly like absolute positioned DIV-blocks.
  *
  */
-class KHTML_EXPORT HTMLLayerElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLayerElement : public HTMLElement
 {
 public:
     HTMLLayerElement();
diff --git a/khtml/dom/html_document.cpp b/tdehtml/dom/html_document.cpp
index c9a6c2541..0d0af0ab9 100644
--- a/khtml/dom/html_document.cpp
+++ b/tdehtml/dom/html_document.cpp
@@ -39,7 +39,7 @@ HTMLDocument::HTMLDocument() : Document(false) // create the impl here
 
 }
 
-HTMLDocument::HTMLDocument(KHTMLView *parent)
+HTMLDocument::HTMLDocument(TDEHTMLView *parent)
     : Document(false) // create the impl here
 {
     impl = DOMImplementationImpl::instance()->createHTMLDocument(parent);
@@ -102,7 +102,7 @@ DOMString HTMLDocument::referrer() const
 DOMString HTMLDocument::completeURL(const DOMString& str) const
 {
     if(!impl) return str;
-    DOMString parsed = khtml::parseURL(str);
+    DOMString parsed = tdehtml::parseURL(str);
     return ((HTMLDocumentImpl *)impl)->completeURL(parsed.string());
 }
 
diff --git a/khtml/dom/html_document.h b/tdehtml/dom/html_document.h
index aa53de96c..98a027297 100644
--- a/khtml/dom/html_document.h
+++ b/tdehtml/dom/html_document.h
@@ -35,8 +35,8 @@
 
 #include <tdelibs_export.h>
 
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
 
 namespace DOM {
 
@@ -70,10 +70,10 @@ class HTMLElement;
  *
  *
  */
-class KHTML_EXPORT HTMLDocument : public Document
+class TDEHTML_EXPORT HTMLDocument : public Document
 {
-    friend class ::KHTMLView;
-    friend class ::KHTMLPart;
+    friend class ::TDEHTMLView;
+    friend class ::TDEHTMLPart;
     friend class DOMImplementation;
 public:
     HTMLDocument();
@@ -82,7 +82,7 @@ public:
      * Rendering information (like sizes, etc...) is only created if
      * parent != 0
      */
-    HTMLDocument(KHTMLView *parent);
+    HTMLDocument(TDEHTMLView *parent);
     HTMLDocument(const HTMLDocument &other);
     HTMLDocument(const Node &other) : Document(false)
          {(*this)=other;}
diff --git a/khtml/dom/html_element.cpp b/tdehtml/dom/html_element.cpp
index 0063985ea..0063985ea 100644
--- a/khtml/dom/html_element.cpp
+++ b/tdehtml/dom/html_element.cpp
diff --git a/khtml/dom/html_element.h b/tdehtml/dom/html_element.h
index 1329793b2..719223777 100644
--- a/khtml/dom/html_element.h
+++ b/tdehtml/dom/html_element.h
@@ -32,7 +32,7 @@
 #include <dom/dom_element.h>
 #include <tdelibs_export.h>
 
-class KHTMLView;
+class TDEHTMLView;
 
 namespace DOM {
 
@@ -66,10 +66,10 @@ class HTMLCollection;
  * interface is reserved for future usage.
  *
  */
-class KHTML_EXPORT HTMLElement : public Element
+class TDEHTML_EXPORT HTMLElement : public Element
 {
     friend class HTMLDocument;
-    friend class ::KHTMLView;
+    friend class ::TDEHTMLView;
     friend class HTMLTableElement;
     friend class HTMLTableRowElement;
     friend class HTMLTableSectionElement;
diff --git a/khtml/dom/html_form.cpp b/tdehtml/dom/html_form.cpp
index 5d9aec633..5d9aec633 100644
--- a/khtml/dom/html_form.cpp
+++ b/tdehtml/dom/html_form.cpp
diff --git a/khtml/dom/html_form.h b/tdehtml/dom/html_form.h
index 0623e421b..d0e20da73 100644
--- a/khtml/dom/html_form.h
+++ b/tdehtml/dom/html_form.h
@@ -47,7 +47,7 @@ class DOMString;
  * BUTTON element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLButtonElement : public HTMLElement
+class TDEHTML_EXPORT HTMLButtonElement : public HTMLElement
 {
 public:
     HTMLButtonElement();
@@ -169,7 +169,7 @@ class HTMLFieldSetElementImpl;
  * FIELDSET element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFieldSetElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFieldSetElement : public HTMLElement
 {
 public:
     HTMLFieldSetElement();
@@ -203,7 +203,7 @@ class HTMLFormElementImpl;
  * FORM element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFormElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFormElement : public HTMLElement
 {
     friend class HTMLButtonElement;
     friend class HTMLFieldSetElement;
@@ -346,7 +346,7 @@ class HTMLInputElementImpl;
  * INPUT element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLInputElement : public HTMLElement
+class TDEHTML_EXPORT HTMLInputElement : public HTMLElement
 {
 public:
     HTMLInputElement();
@@ -707,7 +707,7 @@ class HTMLLabelElementImpl;
  * LABEL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLLabelElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLabelElement : public HTMLElement
 {
 public:
     HTMLLabelElement();
@@ -762,7 +762,7 @@ class HTMLLegendElementImpl;
  * LEGEND element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLLegendElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLegendElement : public HTMLElement
 {
 public:
     HTMLLegendElement();
@@ -821,7 +821,7 @@ class HTMLOptGroupElementImpl;
  * OPTGROUP element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLOptGroupElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOptGroupElement : public HTMLElement
 {
 public:
     HTMLOptGroupElement();
@@ -875,7 +875,7 @@ class HTMLSelectElementImpl;
  * SELECT element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLSelectElement : public HTMLElement
+class TDEHTML_EXPORT HTMLSelectElement : public HTMLElement
 {
 public:
     HTMLSelectElement();
@@ -1051,7 +1051,7 @@ class HTMLTextAreaElementImpl;
  * TEXTAREA element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTextAreaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTextAreaElement : public HTMLElement
 {
 public:
     HTMLTextAreaElement();
@@ -1266,7 +1266,7 @@ class HTMLOptionElementImpl;
  * OPTION element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLOptionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOptionElement : public HTMLElement
 {
 public:
     HTMLOptionElement();
@@ -1386,7 +1386,7 @@ class HTMLFormElement;
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLIsIndexElement : public HTMLElement
+class TDEHTML_EXPORT HTMLIsIndexElement : public HTMLElement
 {
 public:
     HTMLIsIndexElement();
diff --git a/khtml/dom/html_head.cpp b/tdehtml/dom/html_head.cpp
index e5e72e73b..e5e72e73b 100644
--- a/khtml/dom/html_head.cpp
+++ b/tdehtml/dom/html_head.cpp
diff --git a/khtml/dom/html_head.h b/tdehtml/dom/html_head.h
index e8dc52d21..08bd1bc1c 100644
--- a/khtml/dom/html_head.h
+++ b/tdehtml/dom/html_head.h
@@ -43,7 +43,7 @@ class DOMString;
  * BASE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBaseElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBaseElement : public HTMLElement
 {
 public:
     HTMLBaseElement();
@@ -98,7 +98,7 @@ class HTMLLinkElementImpl;
  * LINK element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLLinkElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLinkElement : public HTMLElement
 {
 public:
     HTMLLinkElement();
@@ -253,7 +253,7 @@ class HTMLMetaElementImpl;
  * META element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLMetaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMetaElement : public HTMLElement
 {
 public:
     HTMLMetaElement();
@@ -332,7 +332,7 @@ class HTMLScriptElementImpl;
  * SCRIPT element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLScriptElement : public HTMLElement
+class TDEHTML_EXPORT HTMLScriptElement : public HTMLElement
 {
 public:
     HTMLScriptElement();
@@ -446,7 +446,7 @@ class HTMLStyleElementImpl;
  * STYLE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLStyleElement : public HTMLElement
+class TDEHTML_EXPORT HTMLStyleElement : public HTMLElement
 {
 public:
     HTMLStyleElement();
@@ -519,7 +519,7 @@ class HTMLTitleElementImpl;
  * TITLE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTitleElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTitleElement : public HTMLElement
 {
 public:
     HTMLTitleElement();
diff --git a/khtml/dom/html_image.cpp b/tdehtml/dom/html_image.cpp
index f7c9dac26..f7c9dac26 100644
--- a/khtml/dom/html_image.cpp
+++ b/tdehtml/dom/html_image.cpp
diff --git a/khtml/dom/html_image.h b/tdehtml/dom/html_image.h
index 9f30aaa14..8258d7a63 100644
--- a/khtml/dom/html_image.h
+++ b/tdehtml/dom/html_image.h
@@ -44,7 +44,7 @@ class DOMString;
  * AREA element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLAreaElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAreaElement : public HTMLElement
 {
 public:
     HTMLAreaElement();
@@ -182,7 +182,7 @@ class HTMLImageElementImpl;
  * IMG element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLImageElement : public HTMLElement
+class TDEHTML_EXPORT HTMLImageElement : public HTMLElement
 {
 public:
     HTMLImageElement();
@@ -390,7 +390,7 @@ class DOMString;
  * MAP element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLMapElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMapElement : public HTMLElement
 {
 public:
     HTMLMapElement();
diff --git a/khtml/dom/html_inline.cpp b/tdehtml/dom/html_inline.cpp
index 568761685..568761685 100644
--- a/khtml/dom/html_inline.cpp
+++ b/tdehtml/dom/html_inline.cpp
diff --git a/khtml/dom/html_inline.h b/tdehtml/dom/html_inline.h
index f92ed6917..322282d1f 100644
--- a/khtml/dom/html_inline.h
+++ b/tdehtml/dom/html_inline.h
@@ -44,7 +44,7 @@ class DOMString;
  * element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLAnchorElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAnchorElement : public HTMLElement
 {
 public:
     HTMLAnchorElement();
@@ -256,7 +256,7 @@ class HTMLBRElementImpl;
  * element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBRElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBRElement : public HTMLElement
 {
 public:
     HTMLBRElement();
@@ -299,7 +299,7 @@ class DOMString;
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLFontElement : public HTMLElement
+class TDEHTML_EXPORT HTMLFontElement : public HTMLElement
 {
 public:
     HTMLFontElement();
@@ -369,7 +369,7 @@ class DOMString;
  * DEL </a> element definitions in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLModElement : public HTMLElement
+class TDEHTML_EXPORT HTMLModElement : public HTMLElement
 {
 public:
     HTMLModElement();
@@ -427,7 +427,7 @@ class HTMLQuoteElementImpl;
  * element. To resolve ambiquities, we use this one for the \c Q
  * element only.
  */
-class KHTML_EXPORT HTMLQuoteElement : public HTMLElement
+class TDEHTML_EXPORT HTMLQuoteElement : public HTMLElement
 {
 public:
     HTMLQuoteElement();
diff --git a/khtml/dom/html_list.cpp b/tdehtml/dom/html_list.cpp
index 8d66fe3fc..8d66fe3fc 100644
--- a/khtml/dom/html_list.cpp
+++ b/tdehtml/dom/html_list.cpp
diff --git a/khtml/dom/html_list.h b/tdehtml/dom/html_list.h
index 34c081cb5..59328ec26 100644
--- a/khtml/dom/html_list.h
+++ b/tdehtml/dom/html_list.h
@@ -49,7 +49,7 @@ class DOMString;
  * DL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLDListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDListElement : public HTMLElement
 {
 public:
     HTMLDListElement();
@@ -89,7 +89,7 @@ public:
  * in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLDirectoryElement : public HTMLElement
+class TDEHTML_EXPORT HTMLDirectoryElement : public HTMLElement
 {
 public:
     HTMLDirectoryElement();
@@ -128,7 +128,7 @@ public:
  * LI element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLLIElement : public HTMLElement
+class TDEHTML_EXPORT HTMLLIElement : public HTMLElement
 {
 public:
     HTMLLIElement();
@@ -183,7 +183,7 @@ public:
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLMenuElement : public HTMLElement
+class TDEHTML_EXPORT HTMLMenuElement : public HTMLElement
 {
 public:
     HTMLMenuElement();
@@ -223,7 +223,7 @@ public:
  * OL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLOListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLOListElement : public HTMLElement
 {
 public:
     HTMLOListElement();
@@ -291,7 +291,7 @@ public:
  * UL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLUListElement : public HTMLElement
+class TDEHTML_EXPORT HTMLUListElement : public HTMLElement
 {
 public:
     HTMLUListElement();
diff --git a/khtml/dom/html_misc.cpp b/tdehtml/dom/html_misc.cpp
index fb975b7cf..fb975b7cf 100644
--- a/khtml/dom/html_misc.cpp
+++ b/tdehtml/dom/html_misc.cpp
diff --git a/khtml/dom/html_misc.h b/tdehtml/dom/html_misc.h
index 643e5caf6..9cb6dc976 100644
--- a/khtml/dom/html_misc.h
+++ b/tdehtml/dom/html_misc.h
@@ -45,7 +45,7 @@ class HTMLCollectionImpl;
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLBaseFontElement : public HTMLElement
+class TDEHTML_EXPORT HTMLBaseFontElement : public HTMLElement
 {
 public:
     HTMLBaseFontElement();
@@ -123,7 +123,7 @@ public:
  * automatically updated when the underlying document is changed.
  *
  */
-class KHTML_EXPORT HTMLCollection
+class TDEHTML_EXPORT HTMLCollection
 {
     friend class HTMLDocument;
     friend class HTMLSelectElement;
@@ -201,7 +201,7 @@ protected:
     HTMLCollectionImpl *impl;
 };
 
-class KHTML_EXPORT HTMLFormCollection : public HTMLCollection
+class TDEHTML_EXPORT HTMLFormCollection : public HTMLCollection
 {
     friend class HTMLFormElement;
 protected:
@@ -211,7 +211,7 @@ protected:
 /**
   @internal. Not part of the public API
 */
-class KHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection
+class TDEHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection
 {
 public:
     HTMLMappedNameCollection(NodeImpl *base, int type, const DOMString &name );
diff --git a/khtml/dom/html_object.cpp b/tdehtml/dom/html_object.cpp
index 65ec2f34e..65ec2f34e 100644
--- a/khtml/dom/html_object.cpp
+++ b/tdehtml/dom/html_object.cpp
diff --git a/khtml/dom/html_object.h b/tdehtml/dom/html_object.h
index 9195a40f7..56c592fa3 100644
--- a/khtml/dom/html_object.h
+++ b/tdehtml/dom/html_object.h
@@ -47,7 +47,7 @@ class HTMLAppletElementImpl;
  * deprecated in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLAppletElement : public HTMLElement
+class TDEHTML_EXPORT HTMLAppletElement : public HTMLElement
 {
 public:
     HTMLAppletElement();
@@ -255,7 +255,7 @@ class HTMLObjectElementImpl;
  * OBJECT element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLObjectElement : public HTMLElement
+class TDEHTML_EXPORT HTMLObjectElement : public HTMLElement
 {
 public:
     HTMLObjectElement();
@@ -554,7 +554,7 @@ class HTMLParamElementImpl;
  * PARAM element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLParamElement : public HTMLElement
+class TDEHTML_EXPORT HTMLParamElement : public HTMLElement
 {
 public:
     HTMLParamElement();
diff --git a/khtml/dom/html_table.cpp b/tdehtml/dom/html_table.cpp
index b42c4fcd1..b42c4fcd1 100644
--- a/khtml/dom/html_table.cpp
+++ b/tdehtml/dom/html_table.cpp
diff --git a/khtml/dom/html_table.h b/tdehtml/dom/html_table.h
index 6b9a2d99d..fdc1119cb 100644
--- a/khtml/dom/html_table.h
+++ b/tdehtml/dom/html_table.h
@@ -44,7 +44,7 @@ class DOMString;
  * CAPTION element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableCaptionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableCaptionElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
@@ -88,7 +88,7 @@ class HTMLTableCellElementImpl;
  * TD element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableCellElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableCellElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
@@ -319,7 +319,7 @@ class HTMLTableColElementImpl;
  * COL element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableColElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableColElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
@@ -438,7 +438,7 @@ class DOMString;
  * TABLE element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableElement : public HTMLElement
 {
 public:
     HTMLTableElement();
@@ -722,7 +722,7 @@ class DOMString;
  * TR element definition </a> in HTML 4.0.
  *
  */
-class KHTML_EXPORT HTMLTableRowElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableRowElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
@@ -892,7 +892,7 @@ class DOMString;
  * elements.
  *
  */
-class KHTML_EXPORT HTMLTableSectionElement : public HTMLElement
+class TDEHTML_EXPORT HTMLTableSectionElement : public HTMLElement
 {
     friend class HTMLTableElement;
 
diff --git a/khtml/domtreeview.cpp b/tdehtml/domtreeview.cpp
index 61697a9f3..c68eb2007 100644
--- a/khtml/domtreeview.cpp
+++ b/tdehtml/domtreeview.cpp
@@ -15,11 +15,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include "domtreeview.moc"
 #include "xml/dom_nodeimpl.h"
 
-DOMTreeView::DOMTreeView(TQWidget *parent, KHTMLPart *currentpart, const char * name) : KListView(parent, name)
+DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : TDEListView(parent, name)
 {
     setCaption(name);
     setRootIsDecorated(true);
diff --git a/khtml/domtreeview.h b/tdehtml/domtreeview.h
index ef3d45c44..4156f083a 100644
--- a/khtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
@@ -18,17 +18,17 @@
 #ifndef DOMTREEVIEW_H
 #define DOMTREEVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <tqlistview.h>
 #include <tqptrdict.h>
 #include "dom/dom_core.h"
 
-class DOMTreeView : public KListView
+class DOMTreeView : public TDEListView
 {
     Q_OBJECT
     public: 
-	DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0);
+	DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0);
 	~DOMTreeView();
 
 	void recursive(const DOM::Node &pNode, const DOM::Node &node);
@@ -47,7 +47,7 @@ class DOMTreeView : public KListView
 	TQPtrDict<DOM::Node> m_nodedict;
 	DOM::Node document;
 
-	KHTMLPart *part;
+	TDEHTMLPart *part;
 
 };
 
diff --git a/khtml/ecma/AUTHORS b/tdehtml/ecma/AUTHORS
index 2a129330d..2a129330d 100644
--- a/khtml/ecma/AUTHORS
+++ b/tdehtml/ecma/AUTHORS
diff --git a/khtml/ecma/CMakeLists.txt b/tdehtml/ecma/CMakeLists.txt
index 77457436b..2d7366e28 100644
--- a/khtml/ecma/CMakeLists.txt
+++ b/tdehtml/ecma/CMakeLists.txt
@@ -16,17 +16,17 @@ include_directories(
   ${CMAKE_BINARY_DIR}/kjs
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/bookmarks
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/bookmarks
   ${CMAKE_SOURCE_DIR}/kjs
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 link_directories(
diff --git a/khtml/ecma/Makefile.am b/tdehtml/ecma/Makefile.am
index c88b51d33..ee3334668 100644
--- a/khtml/ecma/Makefile.am
+++ b/tdehtml/ecma/Makefile.am
@@ -16,7 +16,7 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/java -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdeio/bookmarks -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 
@@ -32,7 +32,7 @@ libkjs_html_la_SOURCES = kjs_binding.cpp kjs_dom.cpp kjs_html.cpp kjs_window.cpp
 	kjs_views.cpp kjs_debugwin.cpp kjs_mozilla.cpp xmlhttprequest.cpp \
         xmlserializer.cpp domparser.cpp
 #libkjs_html_la_LDFLAGS = -module -avoid-version $(all_libraries)
-libkjs_html_la_LIBADD = $(top_builddir)/kjs/libkjs.la # ../libkhtml.la
+libkjs_html_la_LIBADD = $(top_builddir)/kjs/libkjs.la # ../libtdehtml.la
 libkjs_html_la_METASOURCES = AUTO
 
 LUT_FILES = kjs_dom.lut.h kjs_html.lut.h kjs_css.lut.h kjs_events.lut.h kjs_navigator.lut.h \
@@ -86,5 +86,5 @@ CLEANFILES = $(LUT_FILES)
 # interactive test program
 #check_PROGRAMS = testecma
 #testecma_SOURCES = testecma.cpp
-#testecma_LDADD = ../libkhtml.la $(top_builddir)/kjs/libkjs.la
+#testecma_LDADD = ../libtdehtml.la $(top_builddir)/kjs/libkjs.la
 
diff --git a/khtml/ecma/README b/tdehtml/ecma/README
index 4c341699a..f44d663a0 100644
--- a/khtml/ecma/README
+++ b/tdehtml/ecma/README
@@ -1,7 +1,7 @@
 This module contains the ECMAScript a.k.a. JavaScript language bindings for
-the KHTML Part.
+the TDEHTML Part.
 
-The module is loaded into KHTML's address space on demand.
+The module is loaded into TDEHTML's address space on demand.
 
 To test the non-HTML DOM functions you may compile a little interactive
 interpreter called 'testecma' with 'make check' (see testecma.cpp for
diff --git a/khtml/ecma/THANKS b/tdehtml/ecma/THANKS
index b21dce741..b21dce741 100644
--- a/khtml/ecma/THANKS
+++ b/tdehtml/ecma/THANKS
diff --git a/khtml/ecma/TODO b/tdehtml/ecma/TODO
index 16a7152c5..16a7152c5 100644
--- a/khtml/ecma/TODO
+++ b/tdehtml/ecma/TODO
diff --git a/khtml/ecma/domparser.cpp b/tdehtml/ecma/domparser.cpp
index 672754a45..672754a45 100644
--- a/khtml/ecma/domparser.cpp
+++ b/tdehtml/ecma/domparser.cpp
diff --git a/khtml/ecma/domparser.h b/tdehtml/ecma/domparser.h
index 746514783..13a880837 100644
--- a/khtml/ecma/domparser.h
+++ b/tdehtml/ecma/domparser.h
@@ -36,7 +36,7 @@ namespace KJS {
     virtual bool implementsConstruct() const;
     virtual Object construct(ExecState *exec, const List &args);
 private:
-    khtml::SharedPtr<DOM::DocumentImpl> doc;
+    tdehtml::SharedPtr<DOM::DocumentImpl> doc;
   };
 
   class DOMParser : public DOMObject {
diff --git a/khtml/ecma/jsk.html b/tdehtml/ecma/jsk.html
index 917c083e8..917c083e8 100644
--- a/khtml/ecma/jsk.html
+++ b/tdehtml/ecma/jsk.html
diff --git a/khtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index 125401cae..d9f0b7b25 100644
--- a/khtml/ecma/kjs_binding.cpp
+++ b/tdehtml/ecma/kjs_binding.cpp
@@ -26,10 +26,10 @@
 #include "dom/dom_exception.h"
 #include "dom/dom2_range.h"
 #include "xml/dom2_eventsimpl.h"
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 
 #include <kdebug.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <assert.h>
 
@@ -173,7 +173,7 @@ Value DOMFunction::call(ExecState *exec, Object &thisObj, const List &args)
 typedef TQPtrList<ScriptInterpreter> InterpreterList;
 static InterpreterList *interpreterList;
 
-ScriptInterpreter::ScriptInterpreter( const Object &global, khtml::ChildFrame* frame )
+ScriptInterpreter::ScriptInterpreter( const Object &global, tdehtml::ChildFrame* frame )
   : Interpreter( global ), m_frame( frame ), m_domObjects(1021),
     m_evt( 0L ), m_inlineCode(false), m_timerCallback(false)
 {
@@ -232,7 +232,7 @@ bool ScriptInterpreter::isWindowOpenAllowed() const
     bool eventOk = ( // mouse events
       id == DOM::EventImpl::CLICK_EVENT ||
       id == DOM::EventImpl::MOUSEUP_EVENT || id == DOM::EventImpl::MOUSEDOWN_EVENT ||
-      id == DOM::EventImpl::KHTML_ECMA_CLICK_EVENT || id == DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT ||
+      id == DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT || id == DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT ||
       // keyboard events
       id == DOM::EventImpl::KEYDOWN_EVENT || id == DOM::EventImpl::KEYPRESS_EVENT ||
       id == DOM::EventImpl::KEYUP_EVENT ||
diff --git a/khtml/ecma/kjs_binding.h b/tdehtml/ecma/kjs_binding.h
index c55da21ce..9b69284ba 100644
--- a/khtml/ecma/kjs_binding.h
+++ b/tdehtml/ecma/kjs_binding.h
@@ -36,7 +36,7 @@ namespace KParts {
   class LiveConnectExtension;
 }
 
-namespace khtml {
+namespace tdehtml {
   class ChildFrame;
 }
 
@@ -93,7 +93,7 @@ namespace KJS {
   class KDE_EXPORT ScriptInterpreter : public Interpreter
   {
   public:
-    ScriptInterpreter( const Object &global, khtml::ChildFrame* frame );
+    ScriptInterpreter( const Object &global, tdehtml::ChildFrame* frame );
     virtual ~ScriptInterpreter();
 
     DOMObject* getDOMObject( void* objectHandle ) const {
@@ -143,7 +143,7 @@ namespace KJS {
     bool isWindowOpenAllowed() const;
 
   private:
-    khtml::ChildFrame* m_frame;
+    tdehtml::ChildFrame* m_frame;
     TQPtrDict<DOMObject> m_domObjects;
     TQPtrDict<void> m_customizedDomObjects; //Objects which had custom properties set,
                                            //and should not be GC'd. key is DOMObject*
diff --git a/khtml/ecma/kjs_css.cpp b/tdehtml/ecma/kjs_css.cpp
index b42f9dd02..b42f9dd02 100644
--- a/khtml/ecma/kjs_css.cpp
+++ b/tdehtml/ecma/kjs_css.cpp
diff --git a/khtml/ecma/kjs_css.h b/tdehtml/ecma/kjs_css.h
index 2b7d14712..2b7d14712 100644
--- a/khtml/ecma/kjs_css.h
+++ b/tdehtml/ecma/kjs_css.h
diff --git a/khtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 8e605d79c..b7bd23de3 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -41,31 +41,31 @@
 #include <tqpainter.h>
 #include <tqscrollbar.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
-#include <kpopupmenu.h>
-#include <kmenubar.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kglobalsettings.h>
-#include <kshortcut.h>
-#include <kconfig.h>
-#include <kconfigbase.h>
-#include <kapplication.h>
+#include <tdepopupmenu.h>
+#include <tdemenubar.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdeglobalsettings.h>
+#include <tdeshortcut.h>
+#include <tdeconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeapplication.h>
 #include <dcop/dcopclient.h>
 #include <kstringhandler.h> 
 
 #include "kjs_dom.h"
 #include "kjs_binding.h"
-#include "khtml_part.h"
-#include "khtmlview.h"
-#include "khtml_pagecache.h"
-#include "khtml_settings.h"
-#include "khtml_factory.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_pagecache.h"
+#include "tdehtml_settings.h"
+#include "tdehtml_factory.h"
 #include "misc/decoder.h"
 #include <kjs/ustring.h>
 #include <kjs/object.h>
@@ -73,15 +73,15 @@
 #include <kjs/interpreter.h>
 
 using namespace KJS;
-using namespace khtml;
+using namespace tdehtml;
 
 SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name)
   : TQScrollView(parent,name), m_currentLine(-1), m_sourceFile(0), m_debugWin(debugWin),
-    m_font(KGlobalSettings::fixedFont())
+    m_font(TDEGlobalSettings::fixedFont())
 {
   verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height());
   viewport()->setBackgroundMode(TQt::NoBackground);
-  m_breakpointIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
+  m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",TDEIcon::Small);
 }
 
 SourceDisplay::~SourceDisplay()
@@ -249,12 +249,12 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0;
 TQString SourceFile::getCode()
 {
   if (interpreter) {
-    KHTMLPart *part = ::tqqt_cast<KHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part());
-    if (part && url == part->url().url() && KHTMLPageCache::self()->isValid(part->cacheId())) {
+    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part());
+    if (part && url == part->url().url() && TDEHTMLPageCache::self()->isValid(part->cacheId())) {
       Decoder *decoder = part->createDecoder();
       TQByteArray data;
       TQDataStream stream(data,IO_WriteOnly);
-      KHTMLPageCache::self()->saveData(part->cacheId(),&stream);
+      TDEHTMLPageCache::self()->saveData(part->cacheId(),&stream);
       TQString str;
       if (data.size() == 0)
 	str = "";
@@ -296,9 +296,9 @@ KJSErrorDialog::KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, b
   setMainWidget(page);
 
   TQLabel *iconLabel = new TQLabel("",page);
-  iconLabel->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_critical",
-						       KIcon::NoGroup,KIcon::SizeMedium,
-						       KIcon::DefaultState,0,true));
+  iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_critical",
+						       TDEIcon::NoGroup,TDEIcon::SizeMedium,
+						       TDEIcon::DefaultState,0,true));
 
   TQWidget *contents = new TQWidget(page);
   TQLabel *label = new TQLabel(errorMessage,contents);
@@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
 }
 //-------------------------------------------------------------------------
 KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
-  : KMainWindow(parent, name, (WFlags)WType_TopLevel), KInstance("kjs_debugger")
+  : TDEMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
 {
   m_breakpoints = 0;
   m_breakpointCount = 0;
@@ -361,7 +361,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   m_execsAlloc = 0;
   m_steppingDepth = 0;
 
-  m_stopIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
+  m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",TDEIcon::Small);
   m_emptyIcon = TQPixmap(m_stopIcon.width(),m_stopIcon.height());
   TQBitmap emptyMask(m_stopIcon.width(),m_stopIcon.height(),true);
   m_emptyIcon.setMask(emptyMask);
@@ -376,7 +376,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   // frame list & code
   TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget);
   TQSplitter *vsplitter = new TQSplitter(hsplitter);
-  TQFont font(KGlobalSettings::fixedFont());
+  TQFont font(TDEGlobalSettings::fixedFont());
 
   TQWidget *contextContainer = new TQWidget(vsplitter);
 
@@ -436,27 +436,27 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   vl->addWidget(hsplitter);
 
   // actions
-  KPopupMenu *debugMenu = new KPopupMenu(this);
+  TDEPopupMenu *debugMenu = new TDEPopupMenu(this);
   menuBar()->insertItem("&Debug",debugMenu);
 
-  m_actionCollection = new KActionCollection(this);
+  m_actionCollection = new TDEActionCollection(this);
   m_actionCollection->setInstance(this);
 
   // Venkman use F12, KDevelop F10
-  KShortcut scNext = KShortcut(KKeySequence(KKey(Qt::Key_F12)));
+  TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12)));
   scNext.append(KKeySequence(KKey(Qt::Key_F10)));
-  m_nextAction       = new KAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
+  m_nextAction       = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
 				   m_actionCollection,"next");
-  m_stepAction       = new KAction(i18n("&Step"),"dbgstep",KShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
+  m_stepAction       = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
 				   m_actionCollection,"step");
   // Venkman use F5, Kdevelop F9
-  KShortcut scCont = KShortcut(KKeySequence(KKey(Qt::Key_F5)));
+  TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5)));
   scCont.append(KKeySequence(KKey(Qt::Key_F9)));
-  m_continueAction   = new KAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
+  m_continueAction   = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
 				   m_actionCollection,"cont");
-  m_stopAction       = new KAction(i18n("St&op"),"stop",KShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
+  m_stopAction       = new TDEAction(i18n("St&op"),"stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
 				   m_actionCollection,"stop");
-  m_breakAction      = new KAction(i18n("&Break at Next Statement"),"dbgrunto",KShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
+  m_breakAction      = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
 				   m_actionCollection,"breaknext");
 
 
@@ -721,7 +721,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId,
       KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part();
       if (m_nextSourceUrl == part->url().url()) {
 	// Only store the code here if it's not from the part's html page... in that
-	// case we can get it from KHTMLPageCache
+	// case we can get it from TDEHTMLPageCache
 	code = TQString::null;
       }
 
@@ -805,8 +805,8 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
     return true;
 
   KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part();
-  KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart*>(part);
-  if (khtmlpart && !khtmlpart->settings()->isJavaScriptErrorReportingEnabled())
+  TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart*>(part);
+  if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled())
     return true;
 
   TQWidget *dlgParent = (m_evalDepth == 0) ? (TQWidget*)part->widget() : (TQWidget*)this;
@@ -860,8 +860,8 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
   }
 
   if (dontShowAgain) {
-    KConfig *config = kapp->config();
-    KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
+    TDEConfig *config = kapp->config();
+    TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
     config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
     config->sync();
     TQByteArray data;
diff --git a/khtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index 8faf71d52..be6b31dda 100644
--- a/khtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
@@ -34,7 +34,7 @@
 #include <tqptrstack.h>
 #include <tqcheckbox.h>
 #include <kdialogbase.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqscrollview.h>
 
 #include <kjs/debugger.h>
@@ -43,8 +43,8 @@
 
 class TQListBox;
 class TQComboBox;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
 
 namespace KJS {
   class FunctionImp;
@@ -157,7 +157,7 @@ namespace KJS {
    *
    * There is only one debug window per program. This can be obtained by calling #instance
    */
-  class KJSDebugWin : public KMainWindow, public Debugger, public KInstance
+  class KJSDebugWin : public TDEMainWindow, public Debugger, public TDEInstance
   {
     Q_OBJECT
     friend class SourceDisplay;
@@ -259,17 +259,17 @@ namespace KJS {
     TQMap<int,SourceFragment*> m_sourceFragments; /* maps SourceId->SourceFragment */
     TQPtrList<SourceFile> m_sourceSelFiles; /* maps combobox index->SourceFile */
 
-    KActionCollection *m_actionCollection;
+    TDEActionCollection *m_actionCollection;
     TQPixmap m_stopIcon;
     TQPixmap m_emptyIcon;
     SourceDisplay *m_sourceDisplay;
     TQListBox *m_contextList;
 
-    KAction *m_stepAction;
-    KAction *m_nextAction;
-    KAction *m_continueAction;
-    KAction *m_stopAction;
-    KAction *m_breakAction;
+    TDEAction *m_stepAction;
+    TDEAction *m_nextAction;
+    TDEAction *m_continueAction;
+    TDEAction *m_stopAction;
+    TDEAction *m_breakAction;
 
     TQComboBox *m_sourceSel;
     EvalMultiLineEdit *m_evalEdit;
diff --git a/khtml/ecma/kjs_dom.cpp b/tdehtml/ecma/kjs_dom.cpp
index cc2f3c78a..77d4983da 100644
--- a/khtml/ecma/kjs_dom.cpp
+++ b/tdehtml/ecma/kjs_dom.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include "xml/dom2_eventsimpl.h"
 #include "rendering/render_canvas.h"
 #include "rendering/render_layer.h"
@@ -29,7 +29,7 @@
 #include "misc/htmlattrs.h" // ATTR_*
 #include "html/html_baseimpl.h"
 #include <kdebug.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include "kjs_dom.h"
 #include "kjs_html.h"
@@ -41,7 +41,7 @@
 #include "kjs_window.h"
 #include "dom/dom_exception.h"
 #include "kjs_dom.lut.h"
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 
 namespace KJS {
 
@@ -183,7 +183,7 @@ Value DOMNode::tryGet(ExecState *exec, const Identifier &propertyName) const
   return DOMObjectLookupGetValue<DOMNode, DOMObject>(exec, propertyName, &DOMNodeTable, this);
 }
 
-static khtml::RenderObject* handleBodyRootQuirk(const DOM::Node& node, khtml::RenderObject* rend, int token)
+static tdehtml::RenderObject* handleBodyRootQuirk(const DOM::Node& node, tdehtml::RenderObject* rend, int token)
 {
   //This emulates the quirks of various height/width properties on the viewport and root. Note that it 
   //is (mostly) IE-compatible in quirks, and mozilla-compatible in strict.
@@ -265,11 +265,11 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
   case OnChange:
     return getListener(DOM::EventImpl::CHANGE_EVENT);
   case OnClick:
-    return getListener(DOM::EventImpl::KHTML_ECMA_CLICK_EVENT);
+    return getListener(DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT);
   case OnDblClick:
-    return getListener(DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT);
+    return getListener(DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT);
   case OnDragDrop:
-    return getListener(DOM::EventImpl::KHTML_DRAGDROP_EVENT);
+    return getListener(DOM::EventImpl::TDEHTML_DRAGDROP_EVENT);
   case OnError:
     return getListener(DOM::EventImpl::ERROR_EVENT);
   case OnFocus:
@@ -293,7 +293,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
   case OnMouseUp:
     return getListener(DOM::EventImpl::MOUSEUP_EVENT);
   case OnMove:
-    return getListener(DOM::EventImpl::KHTML_MOVE_EVENT);
+    return getListener(DOM::EventImpl::TDEHTML_MOVE_EVENT);
   case OnReset:
     return getListener(DOM::EventImpl::RESET_EVENT);
   case OnResize:
@@ -328,7 +328,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
       docimpl->updateLayout();
     }
 
-    khtml::RenderObject *rend = node.handle()->renderer();
+    tdehtml::RenderObject *rend = node.handle()->renderer();
 
     //In quirks mode, may need to forward if to body.
     rend = handleBodyRootQuirk(node, rend, token);
@@ -344,7 +344,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
       return rend ? static_cast<Value>(  Number( rend->offsetHeight() ) ) : Number(0);
     case OffsetParent:
     {
-      khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
+      tdehtml::RenderObject* par = rend ? rend->offsetParent() : 0;
       return getDOMNode( exec, par ? par->element() : 0 );
     }
     case ClientWidth:
@@ -409,13 +409,13 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i
     setListener(exec,DOM::EventImpl::CHANGE_EVENT,value);
     break;
   case OnClick:
-    setListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT,value);
+    setListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT,value);
     break;
   case OnDblClick:
-    setListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT,value);
+    setListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,value);
     break;
   case OnDragDrop:
-    setListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT,value);
+    setListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT,value);
     break;
   case OnError:
     setListener(exec,DOM::EventImpl::ERROR_EVENT,value);
@@ -451,7 +451,7 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i
     setListener(exec,DOM::EventImpl::MOUSEUP_EVENT,value);
     break;
   case OnMove:
-    setListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT,value);
+    setListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT,value);
     break;
   case OnReset:
     setListener(exec,DOM::EventImpl::RESET_EVENT,value);
@@ -474,7 +474,7 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i
     if (docimpl)
       docimpl->updateLayout();
 
-    khtml::RenderObject *rend = node.handle() ? node.handle()->renderer() : 0L;
+    tdehtml::RenderObject *rend = node.handle() ? node.handle()->renderer() : 0L;
 
     //In quirks mode, may need to forward.
     rend = handleBodyRootQuirk(node, rend, token);
@@ -949,7 +949,7 @@ Value DOMDocument::getValueProperty(ExecState *exec, int token) const
     return getDOMStyleSheetList(exec, doc.styleSheets(), doc);
   case DOMDocument::DefaultView: // DOM2
     {
-    KHTMLView *view = node.handle()->getDocument()->view();
+    TDEHTMLView *view = node.handle()->getDocument()->view();
     if (view)
         return Window::retrieve(view->part());
     return getDOMAbstractView(exec, doc.defaultView());
@@ -963,7 +963,7 @@ Value DOMDocument::getValueProperty(ExecState *exec, int token) const
     DOM::DocumentImpl* docimpl = node.handle()->getDocument();
     if ( docimpl && docimpl->view() )
     {
-      KHTMLPart* part = docimpl->view()->part();
+      TDEHTMLPart* part = docimpl->view()->part();
       if ( part ) {
         if (part->d->m_bComplete) return String("complete");
         if (docimpl->parsing()) return String("loading");
@@ -1088,10 +1088,10 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List
     Window* active = Window::retrieveActive(exec);
     // Complete the URL using the "active part" (running interpreter). We do this for the security
     // check and to make sure we load exactly the same url as we have verified to be safe
-    KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart *>(active->part());
-    if (khtmlpart) {
+    TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(active->part());
+    if (tdehtmlpart) {
       // Security: only allow documents to be loaded from the same host
-      TQString dstUrl = khtmlpart->htmlDocument().completeURL(s).string();
+      TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string();
       KParts::ReadOnlyPart *part = static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part();
       if (part->url().host() == KURL(dstUrl).host()) {
 	kdDebug(6070) << "JavaScript: access granted for document.load() of " << dstUrl << endl;
@@ -1274,7 +1274,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c
   case DOMDOMImplementation::CreateDocument: { // DOM2
     // Initially set the URL to document of the creator... this is so that it resides in the same
     // host/domain for security checks. The URL will be updated if Document.load() is called.
-    KHTMLPart *part = ::tqqt_cast<KHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part());
+    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part());
     if (part) {
       Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2]));
       KURL url = static_cast<DocumentImpl*>(part->document().handle())->URL();
@@ -1526,7 +1526,7 @@ bool checkNodeSecurity(ExecState *exec, const DOM::Node& n)
   // Check to see if the currently executing interpreter is allowed to access the specified node
   if (n.isNull())
     return true;
-  KHTMLView *view = n.handle()->getDocument()->view();
+  TDEHTMLView *view = n.handle()->getDocument()->view();
   Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
   if ( !win || !win->isSafeScript(exec) )
     return false;
diff --git a/khtml/ecma/kjs_dom.h b/tdehtml/ecma/kjs_dom.h
index b17488592..b17488592 100644
--- a/khtml/ecma/kjs_dom.h
+++ b/tdehtml/ecma/kjs_dom.h
diff --git a/khtml/ecma/kjs_events.cpp b/tdehtml/ecma/kjs_events.cpp
index a0daf19c8..acf88f89a 100644
--- a/khtml/ecma/kjs_events.cpp
+++ b/tdehtml/ecma/kjs_events.cpp
@@ -30,7 +30,7 @@
 #include "rendering/render_object.h"
 #include "rendering/render_canvas.h"
 #include "xml/dom2_eventsimpl.h"
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 
 #include <kdebug.h>
 
@@ -63,7 +63,7 @@ void JSEventListener::handleEvent(DOM::Event &evt)
   if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession())
     return;
 #endif
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(static_cast<Window*>(win.imp())->part());
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part());
   KJSProxy *proxy = 0L;
   if (part)
     proxy = part->jScript();
@@ -114,9 +114,9 @@ void JSEventListener::handleEvent(DOM::Event &evt)
 DOM::DOMString JSEventListener::eventListenerType()
 {
     if (html)
-	return "_khtml_HTMLEventListener";
+	return "_tdehtml_HTMLEventListener";
     else
-	return "_khtml_JSEventListener";
+	return "_tdehtml_JSEventListener";
 }
 
 Object JSEventListener::listenerObj() const
@@ -163,7 +163,7 @@ Object JSLazyEventListener::listenerObj() const
 void JSLazyEventListener::parseCode() const
 {
   if (!parsed) {
-    KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(static_cast<Window*>(win.imp())->part());
+    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part());
     KJSProxy *proxy = 0L;
     if (part)
       proxy = part->jScript();
@@ -595,7 +595,7 @@ Value DOMMouseEvent::getValueProperty(ExecState *exec, int token) const
   case OffsetY: // MSIE extension
   {
     DOM::Node node = event.target();
-    khtml::RenderObject *rend = 0;
+    tdehtml::RenderObject *rend = 0;
     if (node.handle()) {
         node.handle()->getDocument()->updateRendering();
         rend = node.handle()->renderer();
@@ -631,7 +631,7 @@ Value DOMMouseEvent::getValueProperty(ExecState *exec, int token) const
     if ( exec->interpreter()->compatMode() == Interpreter::NetscapeCompat ) {
         return Number(static_cast<DOM::MouseEvent>(event).button());
     }
-    // Tricky. The DOM (and khtml) use 0 for LMB, 1 for MMB and 2 for RMB
+    // Tricky. The DOM (and tdehtml) use 0 for LMB, 1 for MMB and 2 for RMB
     // but MSIE uses 1=LMB, 2=RMB, 4=MMB, as a bitfield
     int domButton = static_cast<DOM::MouseEvent>(event).button();
     int button = domButton==0 ? 1 : domButton==1 ? 4 : domButton==2 ? 2 : 0;
diff --git a/khtml/ecma/kjs_events.h b/tdehtml/ecma/kjs_events.h
index e48276031..e48276031 100644
--- a/khtml/ecma/kjs_events.h
+++ b/tdehtml/ecma/kjs_events.h
diff --git a/khtml/ecma/kjs_html.cpp b/tdehtml/ecma/kjs_html.cpp
index 57762ffd3..abd059e75 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/tdehtml/ecma/kjs_html.cpp
@@ -38,10 +38,10 @@
 #include "html/html_miscimpl.h"
 #include "xml/dom2_eventsimpl.h"
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
-#include "khtml_part.h"
-#include "khtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
 
 #include "ecma/kjs_css.h"
 #include "ecma/kjs_events.h"
@@ -56,9 +56,9 @@
 #include "rendering/render_frames.h"
 #include "rendering/render_layer.h"
 
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdebug.h>
 
@@ -98,7 +98,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
   case HTMLDocument::Open:
     if (args.size() >= 3) // IE extension for document.open: it means window.open if it has 3 args or more
     {
-      KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
+      TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
       if ( view && view->part() ) {
         Window* win = Window::retrieveWindow(view->part());
         if( win ) {
@@ -110,7 +110,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
     doc.open();
     return Undefined();
   case HTMLDocument::Close:
-    // see khtmltests/ecma/tokenizer-script-recursion.html
+    // see tdehtmltests/ecma/tokenizer-script-recursion.html
     doc.close();
     return Undefined();
   case HTMLDocument::Write:
@@ -133,7 +133,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
   case HTMLDocument::GetSelection: {
     // NS4 and Mozilla specific. IE uses document.selection.createRange()
     // http://docs.sun.com/source/816-6408-10/document.htm#1195981
-    KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
+    TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
     if ( view && view->part() )
        return String(view->part()->selectedText());
     else
@@ -199,7 +199,7 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const
 #endif
   DOM::HTMLDocument doc = static_cast<DOM::HTMLDocument>(node);
   DOM::DocumentImpl* docImpl = static_cast<DOM::DocumentImpl*>(doc.handle());
-  KHTMLView *view = docImpl->view();
+  TDEHTMLView *view = docImpl->view();
   Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
   if ( !win || !win->isSafeScript(exec) )
     return false;
@@ -210,7 +210,7 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const
 
   if ( view && view->part() )
   {
-    KHTMLPart *kp = view->part()->findFrame( p.qstring() );
+    TDEHTMLPart *kp = view->part()->findFrame( p.qstring() );
     if (kp)
       return true;
   }
@@ -226,7 +226,7 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName)
 
   DOM::HTMLDocument doc = static_cast<DOM::HTMLDocument>(node);
   DOM::DocumentImpl* docImpl = static_cast<DOM::DocumentImpl*>(doc.handle());
-  KHTMLView *view = docImpl->view();
+  TDEHTMLView *view = docImpl->view();
 
   Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
   if ( !win || !win->isSafeScript(exec) )
@@ -261,7 +261,7 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName)
   {
     // ###### TODO return a collection in case several frames have the same name
     // (IE does that). Hard to do with findFrame :}
-    KHTMLPart *kp = view->part()->findFrame( propertyName.qstring() );
+    TDEHTMLPart *kp = view->part()->findFrame( propertyName.qstring() );
     if (kp)
       return Window::retrieve(kp);
   }
@@ -356,7 +356,7 @@ void KJS::HTMLDocument::tryPut(ExecState *exec, const Identifier &propertyName,
 #ifdef KJS_VERBOSE
   kdDebug(6070) << "KJS::HTMLDocument::tryPut " << propertyName.qstring() << endl;
 #endif
-  KHTMLView *view = static_cast<DOM::DocumentImpl*>(node.handle())->view();
+  TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(node.handle())->view();
 
   Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
   if ( !win || !win->isSafeScript(exec) )
@@ -394,7 +394,7 @@ void KJS::HTMLDocument::putValueProperty(ExecState *exec, int token, const Value
     break;
   case Location:
   {
-    KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
+    TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
     if ( view )
       Window::retrieveWindow(view->part())->goURL(exec, value.toString(exec).qstring(), false /*don't lock history*/);
     break;
@@ -1127,9 +1127,9 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
 static KParts::LiveConnectExtension *getLiveConnectExtension(const DOM::HTMLElement & element)
 {
   DOM::HTMLDocument doc = element.ownerDocument();
-  KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
+  TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
   if (view && element.handle())
-    return view->part()->liveConnectExtension(static_cast<khtml::RenderPart*>(element.handle()->renderer()));
+    return view->part()->liveConnectExtension(static_cast<tdehtml::RenderPart*>(element.handle()->renderer()));
   return 0L;
 }
 
@@ -1870,7 +1870,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
     case FrameContentDocument: return checkNodeSecurity(exec,frameElement.contentDocument()) ?
 				      getDOMNode(exec, frameElement.contentDocument()) : Undefined();
     case FrameContentWindow:   {
-        KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
+        TDEHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
         if (part) {
           Window *w = Window::retrieveWindow(part);
           if (w)
@@ -1892,7 +1892,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
     case FrameHeight:
       {
           frameElement.handle()->getDocument()->updateLayout();
-          khtml::RenderObject* r = frameElement.handle()->renderer();
+          tdehtml::RenderObject* r = frameElement.handle()->renderer();
           return Number( r ? (token == FrameWidth ? r->width() : r->height()) : 0 );
       }
     }
@@ -1905,7 +1905,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
     case IFrameContentDocument: return checkNodeSecurity(exec,iFrame.contentDocument()) ?
 				       getDOMNode(exec, iFrame.contentDocument()) : Undefined();
     case IFrameContentWindow:       {
-        KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
+        TDEHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
         if (part) {
           Window *w = Window::retrieveWindow(part);
           if (w)
@@ -2123,14 +2123,14 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
 
 
         DOM::HTMLDocument doc = element.ownerDocument();
-        KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
-        KHTMLSettings::KJSWindowOpenPolicy policy = KHTMLSettings::KJSWindowOpenAllow;
+        TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
+        TDEHTMLSettings::KJSWindowOpenPolicy policy = TDEHTMLSettings::KJSWindowOpenAllow;
 	if (view)
 	    policy = view->part()->settings()->windowOpenPolicy(view->part()->url().host());
 
         bool block = false;
 
-        if ( policy != KHTMLSettings::KJSWindowOpenAllow ) {
+        if ( policy != TDEHTMLSettings::KJSWindowOpenAllow ) {
           block = true;
 
          // if this is a form without a target, or a special target, don't block
@@ -2146,7 +2146,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
             if (!view->part()->url().host().isEmpty())
               caption = view->part()->url().host() + " - ";
             // search all (possibly nested) framesets
-            KHTMLPart *currentPart = view->part()->parentPart();
+            TDEHTMLPart *currentPart = view->part()->parentPart();
             while( currentPart != 0L ) {
               if( currentPart->frameExists( form.target().string() ) )
                 block = false;
@@ -2154,7 +2154,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
             }
           }
 
-          if ( block && policy == KHTMLSettings::KJSWindowOpenAsk && view ) {
+          if ( block && policy == TDEHTMLSettings::KJSWindowOpenAsk && view ) {
             if (view && view->part())
             emit view->part()->browserExtension()->requestFocus(view->part());
             caption += i18n( "Confirmation: JavaScript Popup" );
@@ -2167,7 +2167,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
                    caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes )
               block = false;
 
-          } else if ( block && policy == KHTMLSettings::KJSWindowOpenSmart ) {
+          } else if ( block && policy == TDEHTMLSettings::KJSWindowOpenSmart ) {
             if( static_cast<KJS::ScriptInterpreter *>(exec->interpreter())->isWindowOpenAllowed() ) {
               // This submission has been triggered by the user
               block = false;
diff --git a/khtml/ecma/kjs_html.h b/tdehtml/ecma/kjs_html.h
index 53da38462..53da38462 100644
--- a/khtml/ecma/kjs_html.h
+++ b/tdehtml/ecma/kjs_html.h
diff --git a/khtml/ecma/kjs_mozilla.cpp b/tdehtml/ecma/kjs_mozilla.cpp
index 1a5555c42..d26aabb5e 100644
--- a/khtml/ecma/kjs_mozilla.cpp
+++ b/tdehtml/ecma/kjs_mozilla.cpp
@@ -18,13 +18,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kjs_mozilla.h"
 #include "kjs/lookup.h"
 #include "kjs_binding.h"
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include "kjs_mozilla.lut.h"
 
 using namespace KJS;
@@ -40,7 +40,7 @@ const ClassInfo MozillaSidebarExtension::info = { "sidebar", 0, &MozillaSidebarE
 }
 IMPLEMENT_PROTOFUNC_DOM(MozillaSidebarExtensionFunc)
 
-MozillaSidebarExtension::MozillaSidebarExtension(ExecState *exec, KHTMLPart *p)
+MozillaSidebarExtension::MozillaSidebarExtension(ExecState *exec, TDEHTMLPart *p)
   : ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { }
 
 Value MozillaSidebarExtension::get(ExecState *exec, const Identifier &propertyName) const
@@ -66,7 +66,7 @@ Value MozillaSidebarExtensionFunc::tryCall(ExecState *exec, Object &thisObj, con
   KJS_CHECK_THIS( KJS::MozillaSidebarExtension, thisObj );
   MozillaSidebarExtension *mse = static_cast<MozillaSidebarExtension*>(thisObj.imp());
 
-  KHTMLPart *part = mse->part();
+  TDEHTMLPart *part = mse->part();
   if (!part)
     return Undefined();
 
diff --git a/khtml/ecma/kjs_mozilla.h b/tdehtml/ecma/kjs_mozilla.h
index 220094f63..112af1315 100644
--- a/khtml/ecma/kjs_mozilla.h
+++ b/tdehtml/ecma/kjs_mozilla.h
@@ -23,21 +23,21 @@
 
 #include <kjs/object.h>
 
-class KHTMLPart;
+class TDEHTMLPart;
 
 namespace KJS {
 
   class MozillaSidebarExtension : public ObjectImp {
   public:
-    MozillaSidebarExtension(ExecState *exec, KHTMLPart *p);
+    MozillaSidebarExtension(ExecState *exec, TDEHTMLPart *p);
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;
     Value getValueProperty(ExecState *exec, int token) const;
     virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
     enum { addPanel };
-    KHTMLPart *part() const { return m_part; }
+    TDEHTMLPart *part() const { return m_part; }
   private:
-    KHTMLPart *m_part;
+    TDEHTMLPart *m_part;
   };
 } // namespace
 
diff --git a/khtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index ee36ddd1b..296290744 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -21,20 +21,20 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
-#include <kio/kprotocolmanager.h>
-#include <kio/kmimetype.h>
-#include <kio/kservice.h>
-#include <kio/ktrader.h>
+#include <tdeio/tdeprotocolmanager.h>
+#include <tdeio/kmimetype.h>
+#include <tdeio/kservice.h>
+#include <tdeio/ktrader.h>
 #include "kjs_navigator.h"
 #include "kjs/lookup.h"
 #include "kjs_binding.h"
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include <sys/utsname.h>
 #include "kjs_navigator.lut.h"
 
@@ -165,7 +165,7 @@ const ClassInfo Navigator::info = { "Navigator", 0, &NavigatorTable, 0 };
 */
 IMPLEMENT_PROTOFUNC_DOM(NavigatorFunc)
 
-Navigator::Navigator(ExecState *exec, KHTMLPart *p)
+Navigator::Navigator(ExecState *exec, TDEHTMLPart *p)
   : ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { }
 
 Value Navigator::get(ExecState *exec, const Identifier &propertyName) const
@@ -219,7 +219,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
         return Undefined();
     }
     // We are acting straight
-    return String("Konqueror/khtml");
+    return String("Konqueror/tdehtml");
   case ProductSub:
     {
       int ix = userAgent.find("Gecko");
@@ -240,7 +240,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
   case BrowserLanguage:
   case Language:
   case UserLanguage:
-    return String(KGlobal::locale()->language());
+    return String(TDEGlobal::locale()->language());
   case UserAgent:
     return String(userAgent);
   case Platform:
@@ -291,9 +291,9 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
         plugins->setAutoDelete( true );
         mimes->setAutoDelete( true );
 
-        // read in using KTrader
-        KTrader::OfferList offers = KTrader::self()->query("Browser/View");
-        KTrader::OfferList::iterator it;
+        // read in using TDETrader
+        TDETrader::OfferList offers = TDETrader::self()->query("Browser/View");
+        TDETrader::OfferList::iterator it;
         for ( it = offers.begin(); it != offers.end(); ++it ) {
 
             TQVariant pluginsinfo = (**it).property( "X-TDE-BrowserView-PluginsInfo" );
@@ -306,7 +306,7 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
                     continue;
             }
             // read configuration
-            KConfig kc( locate ("data", pluginsinfo.toString()) );
+            TDEConfig kc( locate ("data", pluginsinfo.toString()) );
             unsigned num = (unsigned int) kc.readNumEntry("number");
             for ( unsigned n = 0; n < num; n++ ) {
                 kc.setGroup( TQString::number(n) );
diff --git a/khtml/ecma/kjs_navigator.h b/tdehtml/ecma/kjs_navigator.h
index ccd1ba63b..9298b3761 100644
--- a/khtml/ecma/kjs_navigator.h
+++ b/tdehtml/ecma/kjs_navigator.h
@@ -23,13 +23,13 @@
 
 #include <kjs/object.h>
 
-class KHTMLPart;
+class TDEHTMLPart;
 
 namespace KJS {
 
   class Navigator : public ObjectImp {
   public:
-    Navigator(ExecState *exec, KHTMLPart *p);
+    Navigator(ExecState *exec, TDEHTMLPart *p);
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;
     Value getValueProperty(ExecState *exec, int token) const;
     virtual const ClassInfo* classInfo() const { return &info; }
@@ -37,9 +37,9 @@ namespace KJS {
     enum { AppCodeName, AppName, AppVersion, Language, UserAgent, UserLanguage, Platform,
            _Plugins, _MimeTypes, Product,  ProductSub, Vendor, CookieEnabled, JavaEnabled, 
            BrowserLanguage, CpuClass };
-    KHTMLPart *part() const { return m_part; }
+    TDEHTMLPart *part() const { return m_part; }
   private:
-    KHTMLPart *m_part;
+    TDEHTMLPart *m_part;
   };
 
   // Hashtable enums
diff --git a/khtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp
index ca26c5a0b..bdd7183fe 100644
--- a/khtml/ecma/kjs_proxy.cpp
+++ b/tdehtml/ecma/kjs_proxy.cpp
@@ -36,12 +36,12 @@
 #include "kjs_events.h"
 #include "kjs_debugwin.h"
 #include "xml/dom_nodeimpl.h"
-#include "khtmlpart_p.h"
-#include <khtml_part.h>
-#include <kprotocolmanager.h>
+#include "tdehtmlpart_p.h"
+#include <tdehtml_part.h>
+#include <tdeprotocolmanager.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/time.h>
@@ -51,14 +51,14 @@
 using namespace KJS;
 
 extern "C" {
-  KJSProxy *kjs_html_init(khtml::ChildFrame *childframe);
+  KJSProxy *kjs_html_init(tdehtml::ChildFrame *childframe);
 }
 
 namespace KJS {
 
 class KJSProxyImpl : public KJSProxy {
 public:
-  KJSProxyImpl(khtml::ChildFrame *frame);
+  KJSProxyImpl(tdehtml::ChildFrame *frame);
   virtual ~KJSProxyImpl();
   virtual TQVariant evaluate(TQString filename, int baseLine, const TQString &, const DOM::Node &n,
 			    Completion *completion = 0);
@@ -89,7 +89,7 @@ private:
 int KJSProxyImpl::s_count = 0;
 #endif
 
-KJSProxyImpl::KJSProxyImpl(khtml::ChildFrame *frame)
+KJSProxyImpl::KJSProxyImpl(tdehtml::ChildFrame *frame)
 {
   m_script = 0;
   m_frame = frame;
@@ -355,7 +355,7 @@ void KJSProxyImpl::applyUserAgent()
     // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
     if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
         userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
-        userAgent.find(TQString::fromLatin1("KHTML")) == -1)
+        userAgent.find(TQString::fromLatin1("TDEHTML")) == -1)
     {
       m_script->setCompatMode(Interpreter::NetscapeCompat);
 #ifdef KJS_VERBOSE
@@ -365,14 +365,14 @@ void KJSProxyImpl::applyUserAgent()
 }
 
 // Helper method, so that all classes which need jScript() don't need to be added
-// as friend to KHTMLPart
-KJSProxy * KJSProxy::proxy( KHTMLPart *part )
+// as friend to TDEHTMLPart
+KJSProxy * KJSProxy::proxy( TDEHTMLPart *part )
 {
     return part->jScript();
 }
 
 // initialize HTML module
-KJSProxy *kjs_html_init(khtml::ChildFrame *childframe)
+KJSProxy *kjs_html_init(tdehtml::ChildFrame *childframe)
 {
   return new KJSProxyImpl(childframe);
 }
@@ -402,7 +402,7 @@ void KJSCPUGuard::stop()
 
 bool KJSCPUGuard::confirmTerminate() {
   kdDebug(6070) << "alarmhandler" << endl;
-  return KMessageBox::warningYesNo(0L, i18n("A script on this page is causing KHTML to freeze. If it continues to run, other applications may become less responsive.\nDo you want to abort the script?"), i18n("JavaScript"), i18n("&Abort"), KStdGuiItem::cont(), "kjscupguard_alarmhandler") == KMessageBox::Yes;
+  return KMessageBox::warningYesNo(0L, i18n("A script on this page is causing TDEHTML to freeze. If it continues to run, other applications may become less responsive.\nDo you want to abort the script?"), i18n("JavaScript"), i18n("&Abort"), KStdGuiItem::cont(), "kjscupguard_alarmhandler") == KMessageBox::Yes;
 }
 
 void KJSCPUGuard::alarmHandler(int) {
diff --git a/khtml/ecma/kjs_proxy.h b/tdehtml/ecma/kjs_proxy.h
index dde30b070..bac9e9579 100644
--- a/khtml/ecma/kjs_proxy.h
+++ b/tdehtml/ecma/kjs_proxy.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <sys/time.h>
 
-class KHTMLPart;
+class TDEHTMLPart;
 
 namespace DOM {
   class Node;
@@ -42,7 +42,7 @@ namespace KJS {
   class KJSDebugWin;
 }
 
-namespace khtml {
+namespace tdehtml {
   class ChildFrame;
 }
 
@@ -69,11 +69,11 @@ public:
 
   void setEventHandlerLineno(int lineno) { m_handlerLineno = lineno; }
 
-  khtml::ChildFrame *m_frame;
+  tdehtml::ChildFrame *m_frame;
   int m_handlerLineno;
 
-  // Helper method, to access the private KHTMLPart::jScript()
-  static KJSProxy *proxy( KHTMLPart *part );
+  // Helper method, to access the private TDEHTMLPart::jScript()
+  static KJSProxy *proxy( TDEHTMLPart *part );
 };
 
 class KJSCPUGuard {
diff --git a/khtml/ecma/kjs_range.cpp b/tdehtml/ecma/kjs_range.cpp
index bf148ffe8..bf148ffe8 100644
--- a/khtml/ecma/kjs_range.cpp
+++ b/tdehtml/ecma/kjs_range.cpp
diff --git a/khtml/ecma/kjs_range.h b/tdehtml/ecma/kjs_range.h
index fbf47020f..fbf47020f 100644
--- a/khtml/ecma/kjs_range.h
+++ b/tdehtml/ecma/kjs_range.h
diff --git a/khtml/ecma/kjs_traversal.cpp b/tdehtml/ecma/kjs_traversal.cpp
index 5b521b6d5..a01d469de 100644
--- a/khtml/ecma/kjs_traversal.cpp
+++ b/tdehtml/ecma/kjs_traversal.cpp
@@ -24,8 +24,8 @@
 #include <dom/dom_node.h>
 #include <xml/dom_nodeimpl.h>
 #include <xml/dom_docimpl.h>
-#include <khtmlview.h>
-#include <khtml_part.h>
+#include <tdehtmlview.h>
+#include <tdehtml_part.h>
 #include <kdebug.h>
 
 namespace KJS {
@@ -302,11 +302,11 @@ JSNodeFilter::~JSNodeFilter()
 
 short JSNodeFilter::acceptNode(const DOM::Node &n)
 {
-  KHTMLView *view = static_cast<DOM::DocumentImpl *>( n.handle()->docPtr() )->view();
+  TDEHTMLView *view = static_cast<DOM::DocumentImpl *>( n.handle()->docPtr() )->view();
   if (!view)
       return DOM::NodeFilter::FILTER_REJECT;
 
-  KHTMLPart *part = view->part();
+  TDEHTMLPart *part = view->part();
   KJSProxy *proxy = part->jScript();
   if (proxy) {
     ExecState *exec = proxy->interpreter()->globalExec();
diff --git a/khtml/ecma/kjs_traversal.h b/tdehtml/ecma/kjs_traversal.h
index fd7e064b1..fd7e064b1 100644
--- a/khtml/ecma/kjs_traversal.h
+++ b/tdehtml/ecma/kjs_traversal.h
diff --git a/khtml/ecma/kjs_views.cpp b/tdehtml/ecma/kjs_views.cpp
index dbf354ce8..dbf354ce8 100644
--- a/khtml/ecma/kjs_views.cpp
+++ b/tdehtml/ecma/kjs_views.cpp
diff --git a/khtml/ecma/kjs_views.h b/tdehtml/ecma/kjs_views.h
index 11e103fde..11e103fde 100644
--- a/khtml/ecma/kjs_views.h
+++ b/tdehtml/ecma/kjs_views.h
diff --git a/khtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 8d96380ab..554781cb9 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -21,10 +21,10 @@
  */
 #include "config.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
-#include "khtmlpart_p.h"
-#include "khtml_settings.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlpart_p.h"
+#include "tdehtml_settings.h"
 #include "xml/dom2_eventsimpl.h"
 #include "xml/dom_docimpl.h"
 #include "misc/htmltags.h"
@@ -36,11 +36,11 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kparts/browserinterface.h>
+#include <tdeparts/browserinterface.h>
 #include <twin.h>
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
@@ -50,7 +50,7 @@
 #ifndef KONQ_EMBEDDED
 #include <kbookmarkmanager.h>
 #endif
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <assert.h>
 #include <tqstyle.h>
 #include <tqobjectlist.h>
@@ -77,7 +77,7 @@ namespace KJS {
   class History : public ObjectImp {
     friend class HistoryFunc;
   public:
-    History(ExecState *exec, KHTMLPart *p)
+    History(ExecState *exec, TDEHTMLPart *p)
       : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;
     Value getValueProperty(ExecState *exec, int token) const;
@@ -85,31 +85,31 @@ namespace KJS {
     static const ClassInfo info;
     enum { Back, Forward, Go, Length };
   private:
-    TQGuardedPtr<KHTMLPart> part;
+    TQGuardedPtr<TDEHTMLPart> part;
   };
 
   class External : public ObjectImp {
     friend class ExternalFunc;
   public:
-    External(ExecState *exec, KHTMLPart *p)
+    External(ExecState *exec, TDEHTMLPart *p)
       : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;
     virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
     enum { AddFavorite };
   private:
-    TQGuardedPtr<KHTMLPart> part;
+    TQGuardedPtr<TDEHTMLPart> part;
   };
 
   class FrameArray : public ObjectImp {
   public:
-    FrameArray(ExecState *exec, KHTMLPart *p)
+    FrameArray(ExecState *exec, TDEHTMLPart *p)
       : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;
     virtual Value call(ExecState *exec, Object &thisObj, const List &args);
     virtual bool implementsCall() const { return true; }
   private:
-    TQGuardedPtr<KHTMLPart> part;
+    TQGuardedPtr<TDEHTMLPart> part;
   };
 
 #ifdef Q_WS_QWS
@@ -165,7 +165,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
   KWinModule info(0, KWinModule::INFO_DESKTOP);
 #endif
   TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget();
-  TQRect sg = KGlobalSettings::desktopGeometry(thisWidget);
+  TQRect sg = TDEGlobalSettings::desktopGeometry(thisWidget);
 
   switch( token ) {
   case Height:
@@ -404,7 +404,7 @@ const ClassInfo Window::info = { "Window", &DOMAbstractView::info, &WindowTable,
 */
 IMPLEMENT_PROTOFUNC_DOM(WindowFunc)
 
-Window::Window(khtml::ChildFrame *p)
+Window::Window(tdehtml::ChildFrame *p)
   : ObjectImp(/*no proto*/), m_frame(p), screen(0), history(0), external(0), m_frames(0), loc(0), m_evt(0)
 {
   winq = new WindowQObject(this);
@@ -421,7 +421,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p)
   Object obj = Object::dynamicCast( retrieve( p ) );
 #ifndef NDEBUG
   // obj should never be null, except when javascript has been disabled in that part.
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(p);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(p);
   if ( part && part->jScriptEnabled() )
   {
     assert( obj.isValid() );
@@ -448,10 +448,10 @@ Window *Window::retrieveActive(ExecState *exec)
 Value Window::retrieve(KParts::ReadOnlyPart *p)
 {
   assert(p);
-  KHTMLPart * part = ::tqqt_cast<KHTMLPart *>(p);
+  TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(p);
   KJSProxy *proxy = 0L;
   if (!part) {
-    part = ::tqqt_cast<KHTMLPart *>(p->parent());
+    part = ::tqqt_cast<TDEHTMLPart *>(p->parent());
     if (part)
       proxy = part->framejScript(p);
   } else
@@ -478,7 +478,7 @@ Location *Window::location() const
 
 ObjectImp* Window::frames( ExecState* exec ) const
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (part)
     return m_frames ? m_frames :
       (const_cast<Window*>(this)->m_frames = new FrameArray(exec, part));
@@ -516,7 +516,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const
   if (Lookup::findEntry(&WindowTable, p))
     return true;
 
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part)
       return false;
 
@@ -585,7 +585,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
   }
 
   const HashEntry* entry = Lookup::findEntry(&WindowTable, p);
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
 
   // properties that work on all windows
   if (entry) {
@@ -604,7 +604,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     }
     if (!part)
         return Undefined();
-    // KHTMLPart next
+    // TDEHTMLPart next
     switch(entry->value) {
     case Frames:
       return Value(frames(exec));
@@ -614,9 +614,9 @@ Value Window::get(ExecState *exec, const Identifier &p) const
       else                // doesn't work yet
         return retrieve(part->opener());
     case Parent:
-      return retrieve(part->parentPart() ? part->parentPart() : (KHTMLPart*)part);
+      return retrieve(part->parentPart() ? part->parentPart() : (TDEHTMLPart*)part);
     case Top: {
-      KHTMLPart *p = part;
+      TDEHTMLPart *p = part;
       while (p->parentPart())
         p = p->parentPart();
       return retrieve(p);
@@ -638,7 +638,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
       break;
     }
   } else if (!part) {
-    // not a  KHTMLPart
+    // not a  TDEHTMLPart
     TQString rvalue;
     KParts::LiveConnectExtension::Type rtype;
     unsigned long robjid;
@@ -828,12 +828,12 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case InnerHeight:
       if (!part->view())
         return Undefined();
-      khtml::RenderWidget::flushWidgetResizes(); // make sure frames have their final size
+      tdehtml::RenderWidget::flushWidgetResizes(); // make sure frames have their final size
       return Number(part->view()->visibleHeight());
     case InnerWidth:
       if (!part->view())
         return Undefined();
-      khtml::RenderWidget::flushWidgetResizes(); // make sure frames have their final size
+      tdehtml::RenderWidget::flushWidgetResizes(); // make sure frames have their final size
       return Number(part->view()->visibleWidth());
     case Length:
       return Number(part->frames().count());
@@ -882,14 +882,14 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case ScreenX: {
       if (!part->view())
         return Undefined();
-      TQRect sg = KGlobalSettings::desktopGeometry(part->view());
+      TQRect sg = TDEGlobalSettings::desktopGeometry(part->view());
       return Number(part->view()->mapToGlobal(TQPoint(0,0)).x() + sg.x());
     }
     case ScreenTop:
     case ScreenY: {
       if (!part->view())
         return Undefined();
-      TQRect sg = KGlobalSettings::desktopGeometry(part->view());
+      TQRect sg = TDEGlobalSettings::desktopGeometry(part->view());
       return Number(part->view()->mapToGlobal(TQPoint(0,0)).y() + sg.y());
     }
     case ScrollX: {
@@ -948,11 +948,11 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case Onchange:
       return getListener(exec,DOM::EventImpl::CHANGE_EVENT);
     case Onclick:
-      return getListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT);
+      return getListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT);
     case Ondblclick:
-      return getListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT);
+      return getListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT);
     case Ondragdrop:
-      return getListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT);
+      return getListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT);
     case Onerror:
       return getListener(exec,DOM::EventImpl::ERROR_EVENT);
     case Onfocus:
@@ -976,7 +976,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case Onmouseup:
       return getListener(exec,DOM::EventImpl::MOUSEUP_EVENT);
     case Onmove:
-      return getListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT);
+      return getListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT);
     case Onreset:
       return getListener(exec,DOM::EventImpl::RESET_EVENT);
     case Onresize:
@@ -1085,12 +1085,12 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
     default:
       break;
     }
-    KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
     if (part) {
     switch( entry->value ) {
     case Status: {
       if  (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host())
-		== KHTMLSettings::KJSWindowStatusAllow) {
+		== TDEHTMLSettings::KJSWindowStatusAllow) {
       String s = value.toString(exec);
       part->setJSStatusBarText(s.value().qstring());
       }
@@ -1098,7 +1098,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
     }
     case DefaultStatus: {
       if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host())
-		== KHTMLSettings::KJSWindowStatusAllow) {
+		== TDEHTMLSettings::KJSWindowStatusAllow) {
       String s = value.toString(exec);
       part->setJSDefaultStatusBarText(s.value().qstring());
       }
@@ -1118,15 +1118,15 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
       return;
     case Onclick:
       if (isSafeScript(exec))
-        setListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT,value);
+        setListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT,value);
       return;
     case Ondblclick:
       if (isSafeScript(exec))
-        setListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT,value);
+        setListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,value);
       return;
     case Ondragdrop:
       if (isSafeScript(exec))
-        setListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT,value);
+        setListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT,value);
       return;
     case Onerror:
       if (isSafeScript(exec))
@@ -1174,7 +1174,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
       return;
     case Onmove:
       if (isSafeScript(exec))
-        setListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT,value);
+        setListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT,value);
       return;
     case Onreset:
       if (isSafeScript(exec))
@@ -1222,7 +1222,7 @@ bool Window::toBoolean(ExecState *) const
 
 DOM::AbstractView Window::toAbstractView() const
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part)
     return DOM::AbstractView();
   return part->document().defaultView();
@@ -1240,9 +1240,9 @@ void Window::closeNow()
   if (m_frame.isNull() || m_frame->m_part.isNull()) {
     kdDebug(6070) << k_funcinfo << "part is deleted already" << endl;
   } else {
-    KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
     if (!part) {
-      kdDebug(6070) << "closeNow on non KHTML part" << endl;
+      kdDebug(6070) << "closeNow on non TDEHTML part" << endl;
     } else {
       //kdDebug(6070) << k_funcinfo << " -> closing window" << endl;
       // We want to make sure that window.open won't find this part by name.
@@ -1288,9 +1288,9 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
    if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem.
      return true;
 
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part)
-    return true; // not a KHTMLPart
+    return true; // not a TDEHTMLPart
 
   if ( part->document().isNull() )
     return true; // allow to access a window that was just created (e.g. with window.open("about:blank"))
@@ -1301,11 +1301,11 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
     return false;
   }
 
-  KHTMLPart *activeKHTMLPart = ::tqqt_cast<KHTMLPart *>(activePart);
-  if (!activeKHTMLPart)
-    return true; // not a KHTMLPart
+  TDEHTMLPart *activeTDEHTMLPart = ::tqqt_cast<TDEHTMLPart *>(activePart);
+  if (!activeTDEHTMLPart)
+    return true; // not a TDEHTMLPart
 
-  DOM::HTMLDocument actDocument = activeKHTMLPart->htmlDocument();
+  DOM::HTMLDocument actDocument = activeTDEHTMLPart->htmlDocument();
   if ( actDocument.isNull() ) {
     kdDebug(6070) << "Window::isSafeScript: active part has no document!" << endl;
     return false;
@@ -1327,7 +1327,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
 
 void Window::setListener(ExecState *exec, int eventId, Value func)
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part || !isSafeScript(exec))
     return;
   DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle());
@@ -1339,7 +1339,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func)
 
 Value Window::getListener(ExecState *exec, int eventId) const
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part || !isSafeScript(exec))
     return Undefined();
   DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle());
@@ -1357,7 +1357,7 @@ Value Window::getListener(ExecState *exec, int eventId) const
 JSEventListener *Window::getJSEventListener(const Value& val, bool html)
 {
   // This function is so hot that it's worth coding it directly with imps.
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part || val.type() != ObjectType)
     return 0;
 
@@ -1433,8 +1433,8 @@ void Window::setCurrentEvent( DOM::Event *evt )
 void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
 {
   Window* active = Window::retrieveActive(exec);
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
-  KHTMLPart *active_part = ::tqqt_cast<KHTMLPart *>(active->part());
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *active_part = ::tqqt_cast<TDEHTMLPart *>(active->part());
   // Complete the URL using the "active part" (running interpreter)
   if (active_part && part) {
     if (url[0] == TQChar('#')) {
@@ -1444,7 +1444,7 @@ void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
       kdDebug(6070) << "Window::goURL dstUrl=" << dstUrl << endl;
 
       // check if we're allowed to inject javascript
-      // SYNC check with khtml_part.cpp::slotRedirect!
+      // SYNC check with tdehtml_part.cpp::slotRedirect!
       if ( isSafeScript(exec) ||
             dstUrl.find(TQString::fromLatin1("javascript:"), 0, false) != 0 )
         part->scheduleRedirection(-1,
@@ -1470,7 +1470,7 @@ void Window::delayedGoHistory( int steps )
 
 void Window::goHistory( int steps )
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if(!part)
       // TODO history readonlypart
     return;
@@ -1488,7 +1488,7 @@ void Window::goHistory( int steps )
 
 void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if(!part)
       // TODO resizeTo readonlypart
     return;
@@ -1504,7 +1504,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
     return;
   }
 
-  TQRect sg = KGlobalSettings::desktopGeometry(tl);
+  TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
 
   if ( width > sg.width() || height > sg.height() ) {
     kdDebug(6070) << "Window::resizeTo refused, window would be too big ("<<width<<","<<height<<")" << endl;
@@ -1531,10 +1531,10 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
 
 Value Window::openWindow(ExecState *exec, const List& args)
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part)
     return Undefined();
-  KHTMLView *widget = part->view();
+  TDEHTMLView *widget = part->view();
   Value v = args[0];
   TQString str;
   if (v.isValid() && !v.isA(UndefinedType))
@@ -1544,7 +1544,7 @@ Value Window::openWindow(ExecState *exec, const List& args)
   KURL url;
   if (!str.isEmpty())
   {
-    KHTMLPart* p = ::tqqt_cast<KHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part);
+    TDEHTMLPart* p = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part);
     if ( p )
       url = p->htmlDocument().completeURL(str).string();
     if ( !p ||
@@ -1552,9 +1552,9 @@ Value Window::openWindow(ExecState *exec, const List& args)
       return Undefined();
   }
 
-  KHTMLSettings::KJSWindowOpenPolicy policy =
+  TDEHTMLSettings::KJSWindowOpenPolicy policy =
 		part->settings()->windowOpenPolicy(part->url().host());
-  if ( policy == KHTMLSettings::KJSWindowOpenAsk ) {
+  if ( policy == TDEHTMLSettings::KJSWindowOpenAsk ) {
     emit part->browserExtension()->requestFocus(part);
     TQString caption;
     if (!part->url().host().isEmpty())
@@ -1568,12 +1568,12 @@ Value Window::openWindow(ExecState *exec, const List& args)
                                     i18n( "<qt>This site is requesting to open<p>%1</p>in a new browser window via JavaScript.<br />"
                                           "Do you want to allow this?</qt>").arg(KStringHandler::csqueeze(url.htmlURL(),  100)),
                                     caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes )
-      policy = KHTMLSettings::KJSWindowOpenAllow;
-  } else if ( policy == KHTMLSettings::KJSWindowOpenSmart )
+      policy = TDEHTMLSettings::KJSWindowOpenAllow;
+  } else if ( policy == TDEHTMLSettings::KJSWindowOpenSmart )
   {
     // window.open disabled unless from a key/mouse event
     if (static_cast<ScriptInterpreter *>(exec->interpreter())->isWindowOpenAllowed())
-      policy = KHTMLSettings::KJSWindowOpenAllow;
+      policy = TDEHTMLSettings::KJSWindowOpenAllow;
   }
 
   TQString frameName = args.size() > 1 ? args[1].toString(exec).qstring() : TQString("_blank");
@@ -1587,7 +1587,7 @@ Value Window::openWindow(ExecState *exec, const List& args)
       features = features.mid(1, features.length()-2);
   }
 
-  if ( policy != KHTMLSettings::KJSWindowOpenAllow ) {
+  if ( policy != TDEHTMLSettings::KJSWindowOpenAllow ) {
     if ( url.isEmpty() )
       part->setSuppressedPopupIndicator(true, 0);
     else {
@@ -1602,8 +1602,8 @@ Value Window::openWindow(ExecState *exec, const List& args)
 
 Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features)
 {
-    KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(m_frame->m_part);
-    KHTMLView *widget = p->view();
+    TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+    TDEHTMLView *widget = p->view();
     KParts::WindowArgs winargs;
 
     // scan feature argument
@@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
         if (pos >= 0) {
           key = s.left(pos).stripWhiteSpace().lower();
           val = s.mid(pos + 1).stripWhiteSpace().lower();
-          TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget());
+          TQRect screen = TDEGlobalSettings::desktopGeometry(widget->topLevelWidget());
 
           if (key == "left" || key == "screenx") {
             winargs.x = (int)val.toFloat() + screen.x();
@@ -1703,27 +1703,27 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
     // request window (new or existing if framename is set)
     KParts::ReadOnlyPart *newPart = 0L;
     emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart);
-    if (newPart && ::tqqt_cast<KHTMLPart*>(newPart)) {
-      KHTMLPart *khtmlpart = static_cast<KHTMLPart*>(newPart);
+    if (newPart && ::tqqt_cast<TDEHTMLPart*>(newPart)) {
+      TDEHTMLPart *tdehtmlpart = static_cast<TDEHTMLPart*>(newPart);
       //tqDebug("opener set to %p (this Window's part) in new Window %p  (this Window=%p)",part,win,window);
-      khtmlpart->setOpener(p);
-      khtmlpart->setOpenedByJS(true);
-      if (khtmlpart->document().isNull()) {
-        khtmlpart->begin();
-        khtmlpart->write("<HTML><BODY>");
-        khtmlpart->end();
+      tdehtmlpart->setOpener(p);
+      tdehtmlpart->setOpenedByJS(true);
+      if (tdehtmlpart->document().isNull()) {
+        tdehtmlpart->begin();
+        tdehtmlpart->write("<HTML><BODY>");
+        tdehtmlpart->end();
         if ( p->docImpl() ) {
           //kdDebug(6070) << "Setting domain to " << p->docImpl()->domain().string() << endl;
-          khtmlpart->docImpl()->setDomain( p->docImpl()->domain());
-          khtmlpart->docImpl()->setBaseURL( p->docImpl()->baseURL() );
+          tdehtmlpart->docImpl()->setDomain( p->docImpl()->domain());
+          tdehtmlpart->docImpl()->setBaseURL( p->docImpl()->baseURL() );
         }
       }
       uargs.serviceType = TQString::null;
       if (uargs.frameName.lower() == "_blank")
         uargs.frameName = TQString::null;
       if (!url.isEmpty())
-        emit khtmlpart->browserExtension()->openURLRequest(url,uargs);
-      return Window::retrieve(khtmlpart); // global object
+        emit tdehtmlpart->browserExtension()->openURLRequest(url,uargs);
+      return Window::retrieve(tdehtmlpart); // global object
     } else
       return Undefined();
 }
@@ -1735,7 +1735,7 @@ void Window::forgetSuppressedWindows()
 
 void Window::showSuppressedWindows()
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>( m_frame->m_part );
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>( m_frame->m_part );
   KJS::Interpreter *interpreter = part->jScript()->interpreter();
   ExecState *exec = interpreter->globalExec();
 
@@ -1760,11 +1760,11 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
   Window *window = static_cast<Window *>(thisObj.imp());
   TQString str, str2;
 
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(window->m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part);
   if (!part)
     return Undefined();
 
-  KHTMLView *widget = part->view();
+  TDEHTMLView *widget = part->view();
   Value v = args[0];
   UString s;
   if (v.isValid() && !v.isA(UndefinedType)) {
@@ -1894,9 +1894,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     window->goURL(exec, args[0].toString(exec).qstring(), false /*don't lock history*/);
     return Undefined();
   case Window::Focus: {
-    KHTMLSettings::KJSWindowFocusPolicy policy =
+    TDEHTMLSettings::KJSWindowFocusPolicy policy =
 		part->settings()->windowFocusPolicy(part->url().host());
-    if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) {
+    if(policy == TDEHTMLSettings::KJSWindowFocusAllow && widget) {
       widget->topLevelWidget()->raise();
       KWin::deIconifyWindow( widget->topLevelWidget()->winId() );
       widget->setActiveWindow();
@@ -1944,14 +1944,14 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       widget->setContentsPos(args[0].toInt32(exec), args[1].toInt32(exec));
     return Undefined();
   case Window::MoveBy: {
-    KHTMLSettings::KJSWindowMovePolicy policy =
+    TDEHTMLSettings::KJSWindowMovePolicy policy =
 		part->settings()->windowMovePolicy(part->url().host());
-    if(policy == KHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget)
+    if(policy == TDEHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget)
     {
       KParts::BrowserExtension *ext = part->browserExtension();
       if (ext) {
         TQWidget * tl = widget->topLevelWidget();
-        TQRect sg = KGlobalSettings::desktopGeometry(tl);
+        TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
 
         TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) );
         // Security check (the spec talks about UniversalBrowserWrite to disable this check...)
@@ -1964,14 +1964,14 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     return Undefined();
   }
   case Window::MoveTo: {
-    KHTMLSettings::KJSWindowMovePolicy policy =
+    TDEHTMLSettings::KJSWindowMovePolicy policy =
 		part->settings()->windowMovePolicy(part->url().host());
-    if(policy == KHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget)
+    if(policy == TDEHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget)
     {
       KParts::BrowserExtension *ext = part->browserExtension();
       if (ext) {
         TQWidget * tl = widget->topLevelWidget();
-        TQRect sg = KGlobalSettings::desktopGeometry(tl);
+        TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
 
         TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() );
         // Security check (the spec talks about UniversalBrowserWrite to disable this check...)
@@ -1984,9 +1984,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     return Undefined();
   }
   case Window::ResizeBy: {
-    KHTMLSettings::KJSWindowResizePolicy policy =
+    TDEHTMLSettings::KJSWindowResizePolicy policy =
 		part->settings()->windowResizePolicy(part->url().host());
-    if(policy == KHTMLSettings::KJSWindowResizeAllow
+    if(policy == TDEHTMLSettings::KJSWindowResizeAllow
     		&& args.size() == 2 && widget)
     {
       TQWidget * tl = widget->topLevelWidget();
@@ -1998,9 +1998,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     return Undefined();
   }
   case Window::ResizeTo: {
-    KHTMLSettings::KJSWindowResizePolicy policy =
+    TDEHTMLSettings::KJSWindowResizePolicy policy =
                part->settings()->windowResizePolicy(part->url().host());
-    if(policy == KHTMLSettings::KJSWindowResizeAllow
+    if(policy == TDEHTMLSettings::KJSWindowResizeAllow
                && args.size() == 2 && widget)
     {
       TQWidget * tl = widget->topLevelWidget();
@@ -2114,7 +2114,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte
 
 bool ScheduledAction::execute(Window *window)
 {
-  KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(window->m_frame->m_part);
+  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part);
   if (!part || !part->jScriptEnabled())
     return false;
   ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter());
@@ -2432,7 +2432,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const
     if (node) {
       if (node->id() == ID_FRAME || node->id() == ID_IFRAME) {
         //Return the Window object.
-        KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(node)->contentPart();
+        TDEHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(node)->contentPart();
         if (part)
           return Value(Window::retrieveWindow(part));
         else
@@ -2483,7 +2483,7 @@ const ClassInfo Location::info = { "Location", 0, &LocationTable, 0 };
 @end
 */
 IMPLEMENT_PROTOFUNC_DOM(LocationFunc)
-Location::Location(khtml::ChildFrame *f) : m_frame(f)
+Location::Location(tdehtml::ChildFrame *f) : m_frame(f)
 {
   //kdDebug(6070) << "Location::Location " << this << " m_part=" << (void*)m_part << endl;
 }
@@ -2590,7 +2590,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att
     TQString str = v.toString(exec).qstring();
     switch (entry->value) {
     case Href: {
-      KHTMLPart* p =::tqqt_cast<KHTMLPart*>(Window::retrieveActive(exec)->part());
+      TDEHTMLPart* p =::tqqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part());
       if ( p )
         url = p->htmlDocument().completeURL( str ).string();
       else
@@ -2681,9 +2681,9 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
             id == Location::Replace);
     break;
   case Location::Reload: {
-    KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart *>(part);
-    if (khtmlpart)
-      khtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
+    TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(part);
+    if (tdehtmlpart)
+      tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
     else
       part->openURL(part->url());
     break;
@@ -2714,11 +2714,11 @@ Value ExternalFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
   KJS_CHECK_THIS( External, thisObj );
   External *external = static_cast<External *>(thisObj.imp());
 
-  KHTMLPart *part = external->part;
+  TDEHTMLPart *part = external->part;
   if (!part)
     return Undefined();
 
-  KHTMLView *widget = part->view();
+  TDEHTMLView *widget = part->view();
 
   switch (id) {
   case External::AddFavorite:
diff --git a/khtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h
index 2f5eb45f5..c30871692 100644
--- a/khtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -32,14 +32,14 @@
 #include "kjs_views.h"
 
 class TQTimer;
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
 
 namespace KParts {
   class ReadOnlyPart;
 }
 
-namespace khtml {
+namespace tdehtml {
   class ChildFrame;
 }
 
@@ -64,19 +64,19 @@ namespace KJS {
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;
     Value getValueProperty(ExecState *exec, int token) const;
   private:
-    KHTMLView *view;
+    TDEHTMLView *view;
     virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
   };
 
   class KDE_EXPORT Window : public ObjectImp {
-    friend TQGuardedPtr<KHTMLPart> getInstance();
+    friend TQGuardedPtr<TDEHTMLPart> getInstance();
     friend class Location;
     friend class WindowFunc;
     friend class WindowQObject;
     friend class ScheduledAction;
   public:
-    Window(khtml::ChildFrame *p);
+    Window(tdehtml::ChildFrame *p);
   public:
     ~Window();
     /**
@@ -178,7 +178,7 @@ namespace KJS {
 
     bool checkIsSafeScript( KParts::ReadOnlyPart* activePart ) const;
 
-    TQGuardedPtr<khtml::ChildFrame> m_frame;
+    TQGuardedPtr<tdehtml::ChildFrame> m_frame;
     Screen *screen;
     History *history;
     External *external;
@@ -285,22 +285,22 @@ namespace KJS {
     static const ClassInfo info;
   private:
     friend class Window;
-    Location(khtml::ChildFrame *f);
-    TQGuardedPtr<khtml::ChildFrame> m_frame;
+    Location(tdehtml::ChildFrame *f);
+    TQGuardedPtr<tdehtml::ChildFrame> m_frame;
   };
 
 #ifdef Q_WS_QWS
   class Konqueror : public ObjectImp {
     friend class KonquerorFunc;
   public:
-    Konqueror(KHTMLPart *p) : part(p) { }
+    Konqueror(TDEHTMLPart *p) : part(p) { }
     virtual Value get(ExecState *exec, const Identifier &propertyName) const;
     virtual bool hasProperty(ExecState *exec, const Identifier &p) const;
     virtual UString toString(ExecState *exec) const;
     virtual const ClassInfo* classInfo() const { return &info; }
     static const ClassInfo info;
   private:
-    KHTMLPart *part;
+    TDEHTMLPart *part;
   };
 #endif
 
diff --git a/khtml/ecma/testecma.cpp b/tdehtml/ecma/testecma.cpp
index 44cd7ecb0..3bd4bb88d 100644
--- a/khtml/ecma/testecma.cpp
+++ b/tdehtml/ecma/testecma.cpp
@@ -19,7 +19,7 @@
 
 /**
  * An interactive interpreter to test the ECMA Script language bindings
- * for the DOM of KHTML.
+ * for the DOM of TDEHTML.
  * The 'document' property is preset to an instance of Document and serves
  * as an entrypoint.
  *
diff --git a/khtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index 08ba07519..38c0b3ed1 100644
--- a/khtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -30,19 +30,19 @@
 #include "html/html_documentimpl.h"
 #include "xml/dom2_eventsimpl.h"
 
-#include "khtml_part.h"
-#include "khtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
 
-#include <kio/scheduler.h>
-#include <kio/job.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
 #include <tqobject.h>
 #include <kdebug.h>
 
 #ifdef APPLE_CHANGES
 #include "KWQLoader.h"
 #else
-#include <kio/netaccess.h>
-using KIO::NetAccess;
+#include <tdeio/netaccess.h>
+using TDEIO::NetAccess;
 #endif
 
 #define BANNED_HTTP_HEADERS "authorization,proxy-authorization,"\
@@ -53,7 +53,7 @@ using KIO::NetAccess;
                             "keep-alive,te,trailer,"\
                             "transfer-encoding,upgrade"
 
-using khtml::Decoder;
+using tdehtml::Decoder;
 
 namespace KJS {
 
@@ -81,23 +81,23 @@ XMLHttpRequestQObject::XMLHttpRequestQObject(XMLHttpRequest *_jsObject)
 }
 
 #ifdef APPLE_CHANGES
-void XMLHttpRequestQObject::slotData( KIO::Job* job, const char *data, int size )
+void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const char *data, int size )
 {
   jsObject->slotData(job, data, size);
 }
 #else
-void XMLHttpRequestQObject::slotData( KIO::Job* job, const TQByteArray &data )
+void XMLHttpRequestQObject::slotData( TDEIO::Job* job, const TQByteArray &data )
 {
   jsObject->slotData(job, data);
 }
 #endif
 
-void XMLHttpRequestQObject::slotFinished( KIO::Job* job )
+void XMLHttpRequestQObject::slotFinished( TDEIO::Job* job )
 {
   jsObject->slotFinished(job);
 }
 
-void XMLHttpRequestQObject::slotRedirection( KIO::Job* job, const KURL& url)
+void XMLHttpRequestQObject::slotRedirection( TDEIO::Job* job, const KURL& url)
 {
   jsObject->slotRedirection( job, url );
 }
@@ -344,7 +344,7 @@ void XMLHttpRequest::send(const TQString& _body)
 
   const TQString protocol = url.protocol().lower();
   // Abandon the request when the protocol is other than "http",
-  // instead of blindly doing a KIO::get on other protocols like file:/.
+  // instead of blindly doing a TDEIO::get on other protocols like file:/.
   if (!protocol.startsWith("http") && !protocol.startsWith("webdav"))
   {
     abort();
@@ -359,14 +359,14 @@ void XMLHttpRequest::send(const TQString& _body)
     TQCString str = _body.utf8();
     buf.duplicate(str.data(), str.size() - 1);
 
-    job = KIO::http_post( url, buf, false );
+    job = TDEIO::http_post( url, buf, false );
     if(contentType.isNull())
       job->addMetaData( "content-type", "Content-type: text/plain" );
     else
       job->addMetaData( "content-type", contentType );
   }
   else {
-    job = KIO::get( url, false, false );
+    job = TDEIO::get( url, false, false );
   }
 
   if (!requestHeaders.isEmpty()) {
@@ -393,7 +393,7 @@ void XMLHttpRequest::send(const TQString& _body)
 
   // Set the default referrer if one is not already supplied
   // through setRequestHeader. NOTE: the user can still disable
-  // this feature at the protocol level (kio_http).
+  // this feature at the protocol level (tdeio_http).
   // ### does find() ever succeed? the headers are stored in lower case!
   if (requestHeaders.find("Referer") == requestHeaders.end()) {
     KURL documentURL(doc->URL());
@@ -409,7 +409,7 @@ void XMLHttpRequest::send(const TQString& _body)
     TQString headers;
 
 #ifdef APPLE_CHANGES
-    data = KWQServeSynchronousRequest(khtml::Cache::loader(), doc->docLoader(), job, finalURL, headers);
+    data = KWQServeSynchronousRequest(tdehtml::Cache::loader(), doc->docLoader(), job, finalURL, headers);
 #else
     TQMap<TQString, TQString> metaData;
     if ( NetAccess::synchronousRun( job, 0, &data, &finalURL, &metaData ) ) {
@@ -421,22 +421,22 @@ void XMLHttpRequest::send(const TQString& _body)
     return;
   }
 
-  qObject->connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-		    TQT_SLOT( slotFinished( KIO::Job* ) ) );
+  qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+		    TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
 #ifdef APPLE_CHANGES
-  qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const char*, int ) ),
-		    TQT_SLOT( slotData( KIO::Job*, const char*, int ) ) );
+  qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
+		    TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
 #else
-  qObject->connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-		    TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+  qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+		    TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
 #endif
-  qObject->connect( job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ),
-		    TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) );
+  qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+		    TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
 
 #ifdef APPLE_CHANGES
-  KWQServeRequest(khtml::Cache::loader(), doc->docLoader(), job);
+  KWQServeRequest(tdehtml::Cache::loader(), doc->docLoader(), job);
 #else
-  KIO::Scheduler::scheduleJob( job );
+  TDEIO::Scheduler::scheduleJob( job );
 #endif
 }
 
@@ -476,7 +476,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val
 
   // Sanitize the request headers below and handle them as if they are
   // calls to open. Otherwise, we will end up ignoring them all together!
-  // TODO: Do something about "put" which kio_http sort of supports and
+  // TODO: Do something about "put" which tdeio_http sort of supports and
   // the webDAV headers such as PROPFIND etc...
   if (name == "get"  || name == "post") {
     KURL reqURL (doc->URL(), value.stripWhiteSpace());
@@ -610,7 +610,7 @@ void XMLHttpRequest::processSyncLoadResults(const TQByteArray &data, const KURL
   slotFinished(0);
 }
 
-void XMLHttpRequest::slotFinished(KIO::Job *)
+void XMLHttpRequest::slotFinished(TDEIO::Job *)
 {
   if (decoder) {
     response += decoder->flush();
@@ -625,7 +625,7 @@ void XMLHttpRequest::slotFinished(KIO::Job *)
   decoder = 0;
 }
 
-void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url)
+void XMLHttpRequest::slotRedirection(TDEIO::Job*, const KURL& url)
 {
   if (!urlMatchesDocumentDomain(url)) {
     abort();
@@ -633,9 +633,9 @@ void XMLHttpRequest::slotRedirection(KIO::Job*, const KURL& url)
 }
 
 #ifdef APPLE_CHANGES
-void XMLHttpRequest::slotData( KIO::Job*, const char *data, int len )
+void XMLHttpRequest::slotData( TDEIO::Job*, const char *data, int len )
 #else
-void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data)
+void XMLHttpRequest::slotData(TDEIO::Job*, const TQByteArray &_data)
 #endif
 {
   if (state < Loaded ) {
@@ -725,7 +725,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L
       }
 
       TQString method = args[0].toString(exec).qstring();
-      KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(Window::retrieveActive(exec)->part());
+      TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->part());
       if (!part)
         return Undefined();
       KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string());
diff --git a/khtml/ecma/xmlhttprequest.h b/tdehtml/ecma/xmlhttprequest.h
index 2c646708e..95a7c9cc2 100644
--- a/khtml/ecma/xmlhttprequest.h
+++ b/tdehtml/ecma/xmlhttprequest.h
@@ -24,7 +24,7 @@
 #include "ecma/kjs_binding.h"
 #include "ecma/kjs_dom.h"
 #include "misc/decoder.h"
-#include "kio/jobclasses.h"
+#include "tdeio/jobclasses.h"
 
 namespace KJS {
 
@@ -75,12 +75,12 @@ namespace KJS {
     XMLHttpRequestQObject *qObject;
 
 #ifdef APPLE_CHANGES
-    void slotData( KIO::Job* job, const char *data, int size );
+    void slotData( TDEIO::Job* job, const char *data, int size );
 #else
-    void slotData( KIO::Job* job, const TQByteArray &data );
+    void slotData( TDEIO::Job* job, const TQByteArray &data );
 #endif
-    void slotFinished( KIO::Job* );
-    void slotRedirection( KIO::Job*, const KURL& );
+    void slotFinished( TDEIO::Job* );
+    void slotRedirection( TDEIO::Job*, const KURL& );
 
     void processSyncLoadResults(const TQByteArray &data, const KURL &finalURL, const TQString &headers);
 
@@ -103,13 +103,13 @@ namespace KJS {
     TQString m_mimeTypeOverride;
     TQString contentType;
 
-    KIO::TransferJob * job;
+    TDEIO::TransferJob * job;
 
     XMLHttpRequestState state;
     JSEventListener *onReadyStateChangeListener;
     JSEventListener *onLoadListener;
 
-    khtml::Decoder *decoder;
+    tdehtml::Decoder *decoder;
     TQString encoding;
     TQString responseHeaders;
 
@@ -129,9 +129,9 @@ namespace KJS {
     XMLHttpRequestQObject(XMLHttpRequest *_jsObject);
 
   public slots:
-    void slotData( KIO::Job* job, const TQByteArray &data );
-    void slotFinished( KIO::Job* job );
-    void slotRedirection( KIO::Job* job, const KURL& url);
+    void slotData( TDEIO::Job* job, const TQByteArray &data );
+    void slotFinished( TDEIO::Job* job );
+    void slotRedirection( TDEIO::Job* job, const KURL& url);
 
   private:
     XMLHttpRequest *jsObject;
diff --git a/khtml/ecma/xmlserializer.cpp b/tdehtml/ecma/xmlserializer.cpp
index 856f35e1f..856f35e1f 100644
--- a/khtml/ecma/xmlserializer.cpp
+++ b/tdehtml/ecma/xmlserializer.cpp
diff --git a/khtml/ecma/xmlserializer.h b/tdehtml/ecma/xmlserializer.h
index 629d09afe..a86df3ed4 100644
--- a/khtml/ecma/xmlserializer.h
+++ b/tdehtml/ecma/xmlserializer.h
@@ -24,7 +24,7 @@
 #include "ecma/kjs_binding.h"
 #include "ecma/kjs_dom.h"
 #include "misc/decoder.h"
-#include "kio/jobclasses.h"
+#include "tdeio/jobclasses.h"
 
 namespace KJS {
 
diff --git a/khtml/html/AlwaysInline.h b/tdehtml/html/AlwaysInline.h
index 71fe82928..71fe82928 100644
--- a/khtml/html/AlwaysInline.h
+++ b/tdehtml/html/AlwaysInline.h
diff --git a/khtml/html/CMakeLists.txt b/tdehtml/html/CMakeLists.txt
index 8f47c06f8..a108b11f6 100644
--- a/khtml/html/CMakeLists.txt
+++ b/tdehtml/html/CMakeLists.txt
@@ -15,21 +15,21 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kio/kssl
-  ${CMAKE_SOURCE_DIR}/kutils
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
 )
 
-##### khtmlhtml-static ###########################
+##### tdehtmlhtml-static ###########################
 
-set( target khtmlhtml )
+set( target tdehtmlhtml )
 
 set( ${target}_SRCS
   htmlparser.cpp htmltokenizer.cpp dtd.cpp html_headimpl.cpp
diff --git a/khtml/html/Makefile.am b/tdehtml/html/Makefile.am
index ed7722517..ed6ca0114 100644
--- a/khtml/html/Makefile.am
+++ b/tdehtml/html/Makefile.am
@@ -19,8 +19,8 @@
 
 KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmlhtml.la
-libkhtmlhtml_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlhtml.la
+libtdehtmlhtml_la_SOURCES = \
 	htmlparser.cpp         htmltokenizer.cpp \
 	dtd.cpp                html_headimpl.cpp      html_blockimpl.cpp  \
 	html_elementimpl.cpp   html_inlineimpl.cpp    html_documentimpl.cpp \
@@ -28,7 +28,7 @@ libkhtmlhtml_la_SOURCES = \
 	html_miscimpl.cpp      html_formimpl.cpp      html_objectimpl.cpp \
 	html_tableimpl.cpp
 
-libkhtmlhtml_la_METASOURCES = AUTO
+libtdehtmlhtml_la_METASOURCES = AUTO
 
 
 noinst_HEADERS = \
@@ -40,9 +40,9 @@ noinst_HEADERS = \
 	html_formimpl.h      html_objectimpl.h
 
 INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/kio/kssl \
- -I$(top_srcdir)/kjs -I$(top_srcdir)/khtml -I$(top_srcdir) \
- -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \
+ -I$(top_srcdir)/tdeio/kssl \
+ -I$(top_srcdir)/kjs -I$(top_srcdir)/tdehtml -I$(top_srcdir) \
+ -I$(top_srcdir)/tdewallet/client -I$(top_srcdir)/tdeutils \
  $(all_includes)
 
 # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf
diff --git a/khtml/html/Platform.h b/tdehtml/html/Platform.h
index 3cdd7177b..3cdd7177b 100644
--- a/khtml/html/Platform.h
+++ b/tdehtml/html/Platform.h
diff --git a/khtml/html/RefPtr.h b/tdehtml/html/RefPtr.h
index 8754bbf94..8754bbf94 100644
--- a/khtml/html/RefPtr.h
+++ b/tdehtml/html/RefPtr.h
diff --git a/khtml/html/doctypes.cpp b/tdehtml/html/doctypes.cpp
index e12fc4db7..332ad18fd 100644
--- a/khtml/html/doctypes.cpp
+++ b/tdehtml/html/doctypes.cpp
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/tdelibs/khtml/html/doctypes.gperf  */
+/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,7 +28,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-#line 1 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 1 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
 struct PubIDInfo {
     enum eMode { 
         eQuirks,        /* always quirks mode, unless there's an internal subset */
@@ -351,7 +351,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 91 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 91 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"html", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -461,7 +461,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 81 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 81 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd w3 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -480,148 +480,148 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 48 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 48 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 28 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 28 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 73 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 73 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 45 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 45 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 35 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 35 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 33 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 33 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 43 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 43 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 29 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 29 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 41 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 41 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 27 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 27 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 37 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 37 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 69 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 69 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w30//dtd w3 html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 24 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 24 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 50 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 50 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 25 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 25 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 31 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 31 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 22 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 22 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 49 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 49 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 47 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 47 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 36 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 36 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 3//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 39 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 39 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 21 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 21 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 46 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 46 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 44 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 44 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 3//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 18 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 18 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 34 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 34 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 2//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 72 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 72 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 23 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 23 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.1e//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 75 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 75 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 4.0 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
-#line 30 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 30 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 0//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 20 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 20 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 42 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 42 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 2//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 85 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 85 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3o//dtd w3 html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 89 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 89 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//webtechs//dtd mozilla html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 86 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 86 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3o//dtd w3 html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 84 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 84 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd xhtml 1.1//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 38 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 38 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 0//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 70 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 70 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3 1995-03-24//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 87 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 87 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3o//dtd w3 html strict 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 17 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 17 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 32 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 32 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html level 1//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 26 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 26 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 19 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 19 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html 2.0 strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 40 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 40 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//ietf//dtd html strict level 1//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 77 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 77 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 4.01 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
-#line 71 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 71 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3.2 draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 74 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 74 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 3.2s draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 82 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 82 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd xhtml 1.0 frameset//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 80 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 80 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html experimental 970421//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 51 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 51 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//metrius//dtd metrius presentational//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 88 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 88 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//webtechs//dtd mozilla html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -639,17 +639,17 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 90 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 90 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-/w3c/dtd html 4.0 transitional/en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 76 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 76 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 4.0 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 79 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 79 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html experimental 19960712//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -670,22 +670,22 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 58 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 58 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//netscape comm. corp.//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 78 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 78 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd html 4.01 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 83 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 83 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//w3c//dtd xhtml 1.0 transitional//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 59 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 59 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//netscape comm. corp.//dtd strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 65 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 65 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//spyglass//dtd html 2.0 extended//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -702,9 +702,9 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 16 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 16 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//as//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 66 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 66 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//sq//dtd html 2.0 hotmetal + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -727,7 +727,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 67 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 67 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//sun microsystems corp.//dtd hotjava html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -735,7 +735,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 68 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 68 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//sun microsystems corp.//dtd hotjava strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -746,7 +746,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 60 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 60 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//o'reilly and associates//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -761,35 +761,35 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 56 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 56 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 3.0 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 53 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 53 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 2.0 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 55 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 55 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 3.0 html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 14 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 14 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"+//silmaril//dtd html pro v0r11 19970101//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 52 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 52 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 2.0 html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 57 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 57 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 3.0 tables//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 54 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 54 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//microsoft//dtd internet explorer 2.0 tables//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -879,12 +879,12 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 15 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 15 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//advasoft ltd//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 61 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 61 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//o'reilly and associates//dtd html extended 1.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -953,7 +953,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 62 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 62 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//o'reilly and associates//dtd html extended relaxed 1.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -1089,7 +1089,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 64 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 64 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -1154,7 +1154,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
       {"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 63 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
+#line 63 "/opt/src/kde/tdelibs/tdehtml/html/doctypes.gperf"
       {"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks}
     };
 
diff --git a/khtml/html/doctypes.gperf b/tdehtml/html/doctypes.gperf
index 97b10e258..97b10e258 100644
--- a/khtml/html/doctypes.gperf
+++ b/tdehtml/html/doctypes.gperf
diff --git a/khtml/html/dtd.cpp b/tdehtml/html/dtd.cpp
index accc8b855..d3ea86d51 100644
--- a/khtml/html/dtd.cpp
+++ b/tdehtml/html/dtd.cpp
@@ -26,7 +26,7 @@
 using namespace DOM;
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // priority of tags. Closing tags of higher priority close tags of lower
 // priority.
diff --git a/khtml/html/dtd.dtd b/tdehtml/html/dtd.dtd
index d6a5ac8f0..d6a5ac8f0 100644
--- a/khtml/html/dtd.dtd
+++ b/tdehtml/html/dtd.dtd
diff --git a/khtml/html/dtd.h b/tdehtml/html/dtd.h
index 4192ce51c..4192ce51c 100644
--- a/khtml/html/dtd.h
+++ b/tdehtml/html/dtd.h
diff --git a/khtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp
index 0ed4e4888..16ca7a23b 100644
--- a/khtml/html/html_baseimpl.cpp
+++ b/tdehtml/html/html_baseimpl.cpp
@@ -26,8 +26,8 @@
 #include "html/html_baseimpl.h"
 #include "html/html_documentimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include "rendering/render_frames.h"
 #include "rendering/render_body.h"
@@ -46,7 +46,7 @@
 #include <kdebug.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 HTMLBodyElementImpl::HTMLBodyElementImpl(DocumentImpl *doc)
     : HTMLElementImpl(doc),
@@ -72,7 +72,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
 
     case ATTR_BACKGROUND:
     {
-        TQString url = khtml::parseURL( attr->value() ).string();
+        TQString url = tdehtml::parseURL( attr->value() ).string();
         if (!url.isEmpty()) {
             url = getDocument()->completeURL( url );
             addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, "url('"+url+"')" );
@@ -85,7 +85,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
         break;
     }
     case ATTR_MARGINWIDTH: {
-	KHTMLView* w = getDocument()->view();
+	TDEHTMLView* w = getDocument()->view();
 	if (w)
 	    w->setMarginWidth( -1 ); // unset this, so it doesn't override the setting here
         addCSSLength(CSS_PROP_MARGIN_RIGHT, attr->value() );
@@ -95,7 +95,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
         addCSSLength(CSS_PROP_MARGIN_LEFT, attr->value() );
         break;
     case ATTR_MARGINHEIGHT: {
-	KHTMLView* w = getDocument()->view();
+	TDEHTMLView* w = getDocument()->view();
 	if (w)
 	    w->setMarginHeight( -1 ); // unset this, so it doesn't override the setting here
         addCSSLength(CSS_PROP_MARGIN_BOTTOM, attr->value());
@@ -185,7 +185,7 @@ void HTMLBodyElementImpl::insertedIntoDocument()
 {
     HTMLElementImpl::insertedIntoDocument();
 
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
     if(w && w->marginWidth() != -1) {
         TQString s;
         s.sprintf( "%d", w->marginWidth() );
@@ -263,7 +263,7 @@ void HTMLFrameElementImpl::parseAttribute(AttributeImpl *attr)
     switch(attr->id())
     {
     case ATTR_SRC:
-        setLocation(khtml::parseURL(attr->val()));
+        setLocation(tdehtml::parseURL(attr->val()));
         break;
     case ATTR_FRAMEBORDER:
     {
@@ -351,7 +351,7 @@ void HTMLFrameElementImpl::attach()
     if (!m_render)
         return;
 
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
     if (w) {
 	// we need a unique name for every frame in the frameset. Hope that's unique enough.
 	if(name.isEmpty() || w->part()->frameExists( name.string() ) )
@@ -380,9 +380,9 @@ void HTMLFrameElementImpl::setLocation( const DOMString& str )
         return;
 
     // load the frame contents
-    KHTMLView *w = getDocument()->view();
+    TDEHTMLView *w = getDocument()->view();
     if (w) {
-	KHTMLPart *part = w->part()->findFrame(  name.string() );
+	TDEHTMLPart *part = w->part()->findFrame(  name.string() );
 	if ( part ) {
 	    part->openURL( KURL( getDocument()->completeURL( url.string() ) ) );
 	} else {
@@ -399,7 +399,7 @@ bool HTMLFrameElementImpl::isFocusable() const
 void HTMLFrameElementImpl::setFocus(bool received)
 {
     HTMLElementImpl::setFocus(received);
-    khtml::RenderFrame *renderFrame = static_cast<khtml::RenderFrame *>(m_render);
+    tdehtml::RenderFrame *renderFrame = static_cast<tdehtml::RenderFrame *>(m_render);
     if (!renderFrame || !renderFrame->widget())
 	return;
     if (received)
@@ -414,20 +414,20 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const
 
     RenderPart* render = static_cast<RenderPart*>( m_render );
 
-    if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) )
-        return static_cast<KHTMLView*>( render->widget() )->part()->xmlDocImpl();
+    if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
+        return static_cast<TDEHTMLView*>( render->widget() )->part()->xmlDocImpl();
 
     return 0;
 }
 
-KHTMLPart*   HTMLFrameElementImpl::contentPart() const
+TDEHTMLPart*   HTMLFrameElementImpl::contentPart() const
 {
     if ( !m_render ) return 0;
 
     RenderPart* render = static_cast<RenderPart*>( m_render );
 
-    if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) )
-        return static_cast<KHTMLView*>( render->widget() )->part();
+    if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
+        return static_cast<TDEHTMLView*>( render->widget() )->part();
 
     return 0;
 }
@@ -551,7 +551,7 @@ void HTMLFrameSetElementImpl::attach()
 void HTMLFrameSetElementImpl::defaultEventHandler(EventImpl *evt)
 {
     if (evt->isMouseEvent() && !noresize && m_render)
-        static_cast<khtml::RenderFrameSet *>(m_render)->userResize(static_cast<MouseEventImpl*>(evt));
+        static_cast<tdehtml::RenderFrameSet *>(m_render)->userResize(static_cast<MouseEventImpl*>(evt));
 
     evt->setDefaultHandled();
     HTMLElementImpl::defaultEventHandler(evt);
@@ -688,7 +688,7 @@ void HTMLIFrameElementImpl::attach()
 
     if (m_render) {
         // we need a unique name for every frame in the frameset. Hope that's unique enough.
-        KHTMLView* w = getDocument()->view();
+        TDEHTMLView* w = getDocument()->view();
         if(w && (name.isEmpty() || w->part()->frameExists( name.string() )))
             name = DOMString(w->part()->requestFrameName());
 
diff --git a/khtml/html/html_baseimpl.h b/tdehtml/html/html_baseimpl.h
index b04afd749..8d7205732 100644
--- a/khtml/html/html_baseimpl.h
+++ b/tdehtml/html/html_baseimpl.h
@@ -29,14 +29,14 @@
 
 #include "html/dtd.h"
 #include "html/html_elementimpl.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 
 #include <tqscrollview.h>
 
-class KHTMLView;
-class KHTMLPart;
+class TDEHTMLView;
+class TDEHTMLPart;
 
-namespace khtml {
+namespace tdehtml {
     class RenderFrameSet;
     class RenderFrame;
     class RenderPartObject;
@@ -76,8 +76,8 @@ protected:
 
 class HTMLFrameElementImpl : public HTMLElementImpl
 {
-    friend class khtml::RenderFrame;
-    friend class khtml::RenderPartObject;
+    friend class tdehtml::RenderFrame;
+    friend class tdehtml::RenderPartObject;
 
 public:
     HTMLFrameElementImpl(DocumentImpl *doc);
@@ -96,7 +96,7 @@ public:
     virtual void setFocus(bool);
 
     DocumentImpl* contentDocument() const;
-    KHTMLPart*    contentPart() const;
+    TDEHTMLPart*    contentPart() const;
 
     DOMString url;
     DOMString name;
@@ -114,7 +114,7 @@ public:
 
 class HTMLFrameSetElementImpl : public HTMLElementImpl
 {
-    friend class khtml::RenderFrameSet;
+    friend class tdehtml::RenderFrameSet;
 public:
     HTMLFrameSetElementImpl(DocumentImpl *doc);
 
@@ -138,8 +138,8 @@ public:
     virtual void recalcStyle( StyleChange ch );
 
 protected:
-    khtml::Length* m_rows;
-    khtml::Length* m_cols;
+    tdehtml::Length* m_rows;
+    tdehtml::Length* m_cols;
 
     int m_totalRows;
     int m_totalCols;
diff --git a/khtml/html/html_blockimpl.cpp b/tdehtml/html/html_blockimpl.cpp
index 41cdaccea..47ceaa9fa 100644
--- a/khtml/html/html_blockimpl.cpp
+++ b/tdehtml/html/html_blockimpl.cpp
@@ -34,7 +34,7 @@
 
 #include <kdebug.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 void HTMLDivElementImpl::parseAttribute(AttributeImpl *attr)
@@ -45,11 +45,11 @@ void HTMLDivElementImpl::parseAttribute(AttributeImpl *attr)
     {
         DOMString v = attr->value().lower();
         if ( strcmp( v, "middle" ) == 0 || strcmp( v, "center" ) == 0 )
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_CENTER);
         else if (strcmp(v, "left") == 0)
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_LEFT);
         else if (strcmp(v, "right") == 0)
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_RIGHT);
         else
             addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
         break;
@@ -89,7 +89,7 @@ void HTMLHRElementImpl::parseAttribute(AttributeImpl *attr)
     {
         if(!attr->val()) break;
         // cheap hack to cause linebreaks
-        // khtmltests/html/strange_hr.html
+        // tdehtmltests/html/strange_hr.html
         bool ok;
         int v = attr->val()->toInt(&ok);
         if(ok && !v)
@@ -214,37 +214,37 @@ void HTMLMarqueeElementImpl::parseAttribute(AttributeImpl *attr)
             break;
         case ATTR_SCROLLAMOUNT:
             if (!attr->value().isEmpty())
-                addCSSLength(CSS_PROP__KHTML_MARQUEE_INCREMENT, attr->value());
+                addCSSLength(CSS_PROP__TDEHTML_MARQUEE_INCREMENT, attr->value());
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_INCREMENT);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_INCREMENT);
             break;
         case ATTR_SCROLLDELAY:
             if (!attr->value().isEmpty())
-                addCSSLength(CSS_PROP__KHTML_MARQUEE_SPEED, attr->value(), true);
+                addCSSLength(CSS_PROP__TDEHTML_MARQUEE_SPEED, attr->value(), true);
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_SPEED);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_SPEED);
             break;
         case ATTR_LOOP:
             if (!attr->value().isEmpty()) {
                 if (attr->value() == "-1" || strcasecmp(attr->value(), "infinite") == 0)
-                    addCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
+                    addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE);
                 else
-                    addCSSLength(CSS_PROP__KHTML_MARQUEE_REPETITION, attr->value().lower(), true);
+                    addCSSLength(CSS_PROP__TDEHTML_MARQUEE_REPETITION, attr->value().lower(), true);
             }
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION);
             break;
         case ATTR_BEHAVIOR:
             if (!attr->value().isEmpty())
-                addCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE, attr->value().lower());
+                addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE, attr->value().lower());
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE);
             break;
         case ATTR_DIRECTION:
             if (!attr->value().isEmpty())
-                addCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION, attr->value().lower());
+                addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION, attr->value().lower());
             else
-                removeCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION);
+                removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION);
             break;
         case ATTR_TRUESPEED:
             m_minimumDelay = attr->val() ? 0 : defaultMinimumDelay;
diff --git a/khtml/html/html_blockimpl.h b/tdehtml/html/html_blockimpl.h
index f560583db..f560583db 100644
--- a/khtml/html/html_blockimpl.h
+++ b/tdehtml/html/html_blockimpl.h
diff --git a/khtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index e2ee3ba57..52ada7a7b 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -29,27 +29,27 @@
 #include "html/html_miscimpl.h"
 #include "html/html_formimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
-#include "khtmlpart_p.h"
-#include "khtml_settings.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlpart_p.h"
+#include "tdehtml_settings.h"
 #include "misc/htmlattrs.h"
 #include "misc/htmlhashes.h"
 
 #include "xml/xml_tokenizer.h"
 #include "xml/dom2_eventsimpl.h"
 
-#include "khtml_factory.h"
+#include "tdehtml_factory.h"
 #include "rendering/render_object.h"
 #include "dom/dom_exception.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "css/cssproperties.h"
 #include "css/cssstyleselector.h"
@@ -66,10 +66,10 @@
 template class TQPtrStack<DOM::NodeImpl>;
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 
-HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
+HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v)
   : DocumentImpl(_implementation, v)
 {
 //    kdDebug( 6090 ) << "HTMLDocumentImpl constructor this = " << this << endl;
@@ -78,12 +78,12 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTML
     m_doAutoFill = false;
 
 /* dynamic history stuff to be fixed later (pfeiffer)
-    connect( KHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
+    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
              TQT_SLOT( slotHistoryChanged() ));
 */
-    connect( KHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
+    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
              TQT_SLOT( slotHistoryChanged() ));
-    connect( KHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
+    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
              TQT_SLOT( slotHistoryChanged() ));
 }
 
@@ -108,7 +108,7 @@ DOMString HTMLDocumentImpl::lastModified() const
 DOMString HTMLDocumentImpl::cookie() const
 {
     long windowId = 0;
-    KHTMLView *v = view ();
+    TDEHTMLView *v = view ();
 
     if ( v && v->topLevelWidget() )
       windowId = v->topLevelWidget()->winId();
@@ -140,7 +140,7 @@ DOMString HTMLDocumentImpl::cookie() const
 void HTMLDocumentImpl::setCookie( const DOMString & value )
 {
     long windowId = 0;
-    KHTMLView *v = view ();
+    TDEHTMLView *v = view ();
 
     if ( v && v->topLevelWidget() )
       windowId = v->topLevelWidget()->winId();
@@ -155,7 +155,7 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
                                   "addCookies(TQString,TQCString,long int)", params))
     {
          // Maybe it wasn't running (e.g. we're opening local html files)
-         KApplication::startServiceByDesktopName( "kcookiejar");
+         TDEApplication::startServiceByDesktopName( "kcookiejar");
          if (!kapp->dcopClient()->send("kcookiejar", "kcookiejar",
                                        "addCookies(TQString,TQCString,long int)", params))
              kdWarning(6010) << "Can't communicate with cookiejar!" << endl;
diff --git a/khtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h
index 01fdb2127..92f163076 100644
--- a/khtml/html/html_documentimpl.h
+++ b/tdehtml/html/html_documentimpl.h
@@ -29,7 +29,7 @@
 
 #include <tqmap.h>
 
-class KHTMLView;
+class TDEHTMLView;
 class TQString;
 
 namespace DOM {
@@ -45,7 +45,7 @@ class HTMLDocumentImpl : public DOM::DocumentImpl
 {
     Q_OBJECT
 public:
-    HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v = 0);
+    HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0);
     ~HTMLDocumentImpl();
 
     virtual bool isHTMLDocument() const { return true; }
@@ -58,7 +58,7 @@ public:
     HTMLElementImpl *body();
     void setBody(HTMLElementImpl *_body, int& exceptioncode);
 
-    virtual khtml::Tokenizer *createTokenizer();
+    virtual tdehtml::Tokenizer *createTokenizer();
 
     virtual bool childAllowed( NodeImpl *newChild );
 
diff --git a/khtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp
index 5c0e4ae0a..fc116caf3 100644
--- a/khtml/html/html_elementimpl.cpp
+++ b/tdehtml/html/html_elementimpl.cpp
@@ -37,8 +37,8 @@
 
 #include "misc/htmlhashes.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include "rendering/render_object.h"
 #include "rendering/render_replaced.h"
@@ -50,11 +50,11 @@
 #include "xml/dom2_eventsimpl.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "html_elementimpl.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 HTMLElementImpl::HTMLElementImpl(DocumentImpl *doc)
     : ElementImpl( doc )
@@ -212,11 +212,11 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
         break;
 // standard events
     case ATTR_ONCLICK:
-	setHTMLEventListener(EventImpl::KHTML_ECMA_CLICK_EVENT,
+	setHTMLEventListener(EventImpl::TDEHTML_ECMA_CLICK_EVENT,
 	    getDocument()->createHTMLEventListener(attr->value().string(), "onclick", this));
         break;
     case ATTR_ONDBLCLICK:
-	setHTMLEventListener(EventImpl::KHTML_ECMA_DBLCLICK_EVENT,
+	setHTMLEventListener(EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,
 	    getDocument()->createHTMLEventListener(attr->value().string(), "ondblclick", this));
         break;
     case ATTR_ONMOUSEDOWN:
@@ -436,8 +436,9 @@ void HTMLElementImpl::addHTMLColor( int id, const DOMString &c )
 
 	    color.sprintf("#%02x%02x%02x", colors[0], colors[1], colors[2] );
 // 	    tqDebug( "trying to add fixed color string '%s'", color.latin1() );
-	    if ( m_styleDecls->setProperty(id, DOMString(color), false, true) )
+	    if ( m_styleDecls->setProperty(id, DOMString(color), false, true) ) {
 		return;
+	    }
 	}
     }
     m_styleDecls->setProperty(id, CSS_VAL_BLACK, false, true);
@@ -640,7 +641,7 @@ void HTMLElementImpl::addHTMLAlignment( DOMString alignment )
     } else if ( strcasecmp( alignment, "top" ) == 0 ) {
 	propvalign = CSS_VAL_TOP;
     } else if ( strcasecmp( alignment, "middle" ) == 0 ) {
-	propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE;
+	propvalign = CSS_VAL__TDEHTML_BASELINE_MIDDLE;
     } else if ( strcasecmp( alignment, "center" ) == 0 ) {
 	propvalign = CSS_VAL_MIDDLE;
     } else if ( strcasecmp( alignment, "bottom" ) == 0 ) {
diff --git a/khtml/html/html_elementimpl.h b/tdehtml/html/html_elementimpl.h
index f71ae9b23..f71ae9b23 100644
--- a/khtml/html/html_elementimpl.h
+++ b/tdehtml/html/html_elementimpl.h
diff --git a/khtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index adf28d563..6fae233dd 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -28,10 +28,10 @@
 
 #include "html/html_formimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "html/html_documentimpl.h"
-#include "khtml_settings.h"
+#include "tdehtml_settings.h"
 #include "misc/htmlhashes.h"
 
 #include "css/cssstyleselector.h"
@@ -42,22 +42,22 @@
 #include "xml/dom_docimpl.h"
 #include "xml/dom2_eventsimpl.h"
 #include "xml/dom_restyler.h"
-#include "khtml_ext.h"
+#include "tdehtml_ext.h"
 
 #include "rendering/render_form.h"
 
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
-#include <kapplication.h>
-#include <klocale.h>
-#ifndef KHTML_NO_WALLET
-#include <kwallet.h>
+#include <tdemessagebox.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#ifndef TDEHTML_NO_WALLET
+#include <tdewallet.h>
 #endif
 #include <netaccess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqtextcodec.h>
@@ -70,7 +70,7 @@
 
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 HTMLFormElementImpl::HTMLFormElementImpl(DocumentImpl *doc, bool implicit)
     : HTMLElementImpl(doc)
@@ -83,7 +83,7 @@ HTMLFormElementImpl::HTMLFormElementImpl(DocumentImpl *doc, bool implicit)
     m_doingsubmit = false;
     m_inreset = false;
     m_enctype = "application/x-www-form-urlencoded";
-    m_boundary = "----------" + KApplication::randomString( 42 + 13 );
+    m_boundary = "----------" + TDEApplication::randomString( 42 + 13 );
     m_acceptcharset = "UNKNOWN";
     m_malformed = false;
 }
@@ -223,7 +223,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
     for(unsigned int i=0; i < strLength; ++i) if(str[i].latin1() == ',') str[i] = space;
     const TQStringList charsets = TQStringList::split(' ', str);
     TQTextCodec* codec = 0;
-    KHTMLView *view = getDocument()->view();
+    TDEHTMLView *view = getDocument()->view();
     {
         TQStringList::ConstIterator it = charsets.begin();
         const TQStringList::ConstIterator itEnd = charsets.end();
@@ -238,7 +238,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
                 if(view && view->part())
                     enc = view->part()->encoding();
             }
-            if((codec = KGlobal::charsets()->codecForName(enc.latin1())))
+            if((codec = TDEGlobal::charsets()->codecForName(enc.latin1())))
                 break;
         }
     }
@@ -259,13 +259,13 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
 
     for (TQPtrListIterator<HTMLGenericFormElementImpl> it(formElements); it.current(); ++it) {
         HTMLGenericFormElementImpl* const current = it.current();
-        khtml::encodingList lst;
+        tdehtml::encodingList lst;
 
         if (!current->disabled() && current->encoding(codec, lst, m_multipart))
         {
             //kdDebug(6030) << "adding name '" << current->name().string() << "'" << endl;
-            khtml::encodingList::ConstIterator it = lst.begin();
-            const khtml::encodingList::ConstIterator itEnd = lst.end();
+            tdehtml::encodingList::ConstIterator it = lst.begin();
+            const tdehtml::encodingList::ConstIterator itEnd = lst.end();
             for( it = lst.begin(); it != itEnd; ++it )
             {
                 if (!m_multipart)
@@ -305,8 +305,8 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
                         TQString val = static_cast<HTMLInputElementImpl*>(current)->value().string().stripWhiteSpace();
                         if (!val.isEmpty() &&
                             TQDir::isRelativePath(val) &&
-                            TQFile::exists(KGlobalSettings::documentPath() + val)) {
-                            path.setPath(KGlobalSettings::documentPath() + val);
+                            TQFile::exists(TDEGlobalSettings::documentPath() + val)) {
+                            path.setPath(TDEGlobalSettings::documentPath() + val);
                         } else {
                             path = KURL::fromPathOrURL(val);
                         }
@@ -425,7 +425,7 @@ static TQString calculateAutoFillKey(const HTMLFormElementImpl& e)
 
 void HTMLFormElementImpl::doAutoFill()
 {
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
     const TQString key = calculateAutoFillKey(*this);
 
     if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
@@ -435,12 +435,12 @@ void HTMLFormElementImpl::doAutoFill()
 
     // assert(view())
     getDocument()->view()->part()->openWallet(this);
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 
 void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
     assert(w);
     const TQString key = calculateAutoFillKey(*this);
     if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) {
@@ -463,7 +463,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
             }
         }
     }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 void HTMLFormElementImpl::submitFromKeyboard()
@@ -505,8 +505,8 @@ void HTMLFormElementImpl::submitFromKeyboard()
 
 void HTMLFormElementImpl::gatherWalletData()
 {
-#ifndef KHTML_NO_WALLET
-    KHTMLView* const view = getDocument()->view();
+#ifndef TDEHTML_NO_WALLET
+    TDEHTMLView* const view = getDocument()->view();
     // check if we have any password input's
     m_walletMap.clear();
     m_havePassword = false;
@@ -529,13 +529,13 @@ void HTMLFormElementImpl::gatherWalletData()
                 m_haveTextarea = true;
         }
     }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 
 bool HTMLFormElementImpl::prepareSubmit()
 {
-    KHTMLView* const view = getDocument()->view();
+    TDEHTMLView* const view = getDocument()->view();
     if(m_insubmit || !view || !view->part() || view->part()->onlyLocalReferences())
         return m_insubmit;
 
@@ -569,7 +569,7 @@ void HTMLFormElementImpl::submit(  )
 #endif
 
     bool ok;
-    KHTMLView* const view = getDocument()->view();
+    TDEHTMLView* const view = getDocument()->view();
     const TQByteArray form_data = formData(ok);
     const KURL formUrl(getDocument()->URL());
 
@@ -577,7 +577,7 @@ void HTMLFormElementImpl::submit(  )
         if (m_walletMap.isEmpty()) {
             gatherWalletData();
         }
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
         if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) {
             const TQString key = calculateAutoFillKey(*this);
             const bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::FormDataFolder(), key);
@@ -630,9 +630,9 @@ void HTMLFormElementImpl::submit(  )
                 }
             }
         }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 
-        const DOMString url(khtml::parseURL(getAttribute(ATTR_ACTION)));
+        const DOMString url(tdehtml::parseURL(getAttribute(ATTR_ACTION)));
         if(m_post) {
             view->part()->submitForm( "post", url.string(), form_data,
                                       m_target.string(),
@@ -652,7 +652,7 @@ void HTMLFormElementImpl::submit(  )
 
 void HTMLFormElementImpl::reset(  )
 {
-    KHTMLView* const view = getDocument()->view();
+    TDEHTMLView* const view = getDocument()->view();
     if(m_inreset || !view || !view->part()) return;
 
     m_inreset = true;
@@ -991,9 +991,9 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
     if (evt->target()==this && !m_disabled)
     {
         // Report focus in/out changes to the browser extension (editable widgets only)
-        KHTMLView* const view = getDocument()->view();
+        TDEHTMLView* const view = getDocument()->view();
         if (view && evt->id() == EventImpl::DOMFOCUSIN_EVENT && isEditable() && m_render && m_render->isWidget()) {
-            KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>(view->part()->browserExtension());
+            TDEHTMLPartBrowserExtension *ext = static_cast<TDEHTMLPartBrowserExtension *>(view->part()->browserExtension());
             TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
             if (ext)
                 ext->editableWidgetFocused(widget);
@@ -1038,7 +1038,7 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
 
 
 	if (view && evt->id() == EventImpl::DOMFOCUSOUT_EVENT && isEditable() && m_render && m_render->isWidget()) {
-	    KHTMLPartBrowserExtension* const ext = static_cast<KHTMLPartBrowserExtension *>(view->part()->browserExtension());
+	    TDEHTMLPartBrowserExtension* const ext = static_cast<TDEHTMLPartBrowserExtension *>(view->part()->browserExtension());
 	    TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
 	    if (ext)
 		ext->editableWidgetBlurred(widget);
@@ -1153,7 +1153,7 @@ void HTMLButtonElementImpl::click()
     dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
 }
 
-bool HTMLButtonElementImpl::encoding(const TQTextCodec* codec, khtml::encodingList& encoding, bool /*multipart*/)
+bool HTMLButtonElementImpl::encoding(const TQTextCodec* codec, tdehtml::encodingList& encoding, bool /*multipart*/)
 {
     if (m_type != SUBMIT || name().isEmpty() || !m_activeSubmit)
         return false;
@@ -1274,7 +1274,7 @@ void HTMLInputElementImpl::parseType(const DOMString& t)
         newType = IMAGE;
     else if ( strcasecmp( t, "button" ) == 0 )
         newType = BUTTON;
-    else if ( strcasecmp( t, "khtml_isindex" ) == 0 )
+    else if ( strcasecmp( t, "tdehtml_isindex" ) == 0 )
         newType = ISINDEX;
     else
         newType = TEXT;
@@ -1529,7 +1529,7 @@ DOMString HTMLInputElementImpl::altText() const
     return alt;
 }
 
-bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingList& encoding, bool multipart)
+bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, tdehtml::encodingList& encoding, bool multipart)
 {
     const TQString nme = name().string();
 
@@ -1601,7 +1601,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
 	case FILE: // hmm, we have the type FILE also.  bad choice here...
         {
             // don't submit if display: none or display: hidden
-            if(!renderer() || renderer()->style()->visibility() != khtml::VISIBLE)
+            if(!renderer() || renderer()->style()->visibility() != tdehtml::VISIBLE)
                 return false;
 
             TQString local;
@@ -1609,22 +1609,22 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
             TQString val = value().string();
             if (!val.isEmpty() &&
                 TQDir::isRelativePath(val) &&
-                TQFile::exists(KGlobalSettings::documentPath() + val)) {
-                fileurl.setPath(KGlobalSettings::documentPath() + val);
+                TQFile::exists(TDEGlobalSettings::documentPath() + val)) {
+                fileurl.setPath(TDEGlobalSettings::documentPath() + val);
             } else {
                 fileurl = KURL::fromPathOrURL(val);
             }
 
-            KIO::UDSEntry filestat;
+            TDEIO::UDSEntry filestat;
 
             // can't submit file in www-url-form encoded
             TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget();
             if (multipart) {
                 TQCString filearray( "" );
-                if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {
+                if ( TDEIO::NetAccess::stat(fileurl, filestat, toplevel)) {
                     const KFileItem fileitem(filestat, fileurl, true, false);
                     if ( fileitem.isFile() &&
-                         KIO::NetAccess::download(fileurl, local, toplevel) ) {
+                         TDEIO::NetAccess::download(fileurl, local, toplevel) ) {
                         TQFile file(local);
                         filearray.resize(file.size()+1);
                         if ( file.open( IO_ReadOnly ) ) {
@@ -1633,7 +1633,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
                                 filearray[readbytes] = '\0';
                             file.close();
                         }
-                        KIO::NetAccess::removeTempFile( local );
+                        TDEIO::NetAccess::removeTempFile( local );
                     }
                 }
                 encoding += filearray;
@@ -1772,7 +1772,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
 		m_render->absolutePosition(offsetX,offsetY);
 		xPos = me->clientX()-offsetX;
 		yPos = me->clientY()-offsetY;
-                KHTMLView* v = getDocument()->view();
+                TDEHTMLView* v = getDocument()->view();
                 if ( v ) {
                     xPos += v->contentsX();
                     yPos += v->contentsY();
@@ -2297,7 +2297,7 @@ void HTMLSelectElementImpl::attach()
     _style->deref();
 }
 
-bool HTMLSelectElementImpl::encoding(const TQTextCodec* codec, khtml::encodingList& encoded_values, bool)
+bool HTMLSelectElementImpl::encoding(const TQTextCodec* codec, tdehtml::encodingList& encoded_values, bool)
 {
     bool successful = false;
     const TQCString enc_name = fixUpfromUnicode(codec, name().string());
@@ -2419,7 +2419,7 @@ void HTMLSelectElementImpl::setRecalcListItems()
 {
     m_recalcListItems = true;
     if (m_render)
-        static_cast<khtml::RenderSelect*>(m_render)->setOptionsChanged(true);
+        static_cast<tdehtml::RenderSelect*>(m_render)->setOptionsChanged(true);
     setChanged();
 }
 
@@ -2502,7 +2502,7 @@ void HTMLKeygenElementImpl::parseAttribute(AttributeImpl* attr)
     }
 }
 
-bool HTMLKeygenElementImpl::encoding(const TQTextCodec* codec, khtml::encodingList& encoded_values, bool)
+bool HTMLKeygenElementImpl::encoding(const TQTextCodec* codec, tdehtml::encodingList& encoded_values, bool)
 {
     bool successful = false;
     const TQCString enc_name = fixUpfromUnicode(codec, name().string());
diff --git a/khtml/html/html_formimpl.h b/tdehtml/html/html_formimpl.h
index 40fefc9ee..8fe0ef1dd 100644
--- a/khtml/html/html_formimpl.h
+++ b/tdehtml/html/html_formimpl.h
@@ -34,10 +34,10 @@
 #include <tqcstring.h>
 #include <tqmemarray.h>
 
-class KHTMLView;
+class TDEHTMLView;
 class TQTextCodec;
 
-namespace khtml
+namespace tdehtml
 {
     class RenderFormElement;
     class RenderTextArea;
@@ -134,7 +134,7 @@ private:
 class HTMLGenericFormElementImpl : public HTMLElementImpl
 {
     friend class HTMLFormElementImpl;
-    friend class khtml::RenderFormElement;
+    friend class tdehtml::RenderFormElement;
 
 public:
     HTMLGenericFormElementImpl(DocumentImpl *doc, HTMLFormElementImpl *f = 0);
@@ -171,7 +171,7 @@ public:
      * for submitting
      * return true for a successful control (see HTML4-17.13.2)
      */
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool) { return false; }
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool) { return false; }
 
     virtual void defaultEventHandler(EventImpl *evt);
     virtual bool isEditable();
@@ -206,7 +206,7 @@ public:
     typeEnum buttonType() const { return m_type; }
     virtual void parseAttribute(AttributeImpl *attr);
     virtual void defaultEventHandler(EventImpl *evt);
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
     void activate();
     virtual void attach();
     void click();
@@ -241,9 +241,9 @@ public:
 
 class HTMLInputElementImpl : public HTMLGenericFormElementImpl
 {
-    friend class khtml::RenderLineEdit;
-    friend class khtml::RenderRadioButton;
-    friend class khtml::RenderFileButton;
+    friend class tdehtml::RenderLineEdit;
+    friend class tdehtml::RenderRadioButton;
+    friend class tdehtml::RenderFileButton;
 
 public:
     // do not change the order!
@@ -297,7 +297,7 @@ public:
     virtual void parseAttribute(AttributeImpl *attr);
 
     virtual void attach();
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
 
     typeEnum inputType() const { return m_type; }
     virtual void reset();
@@ -379,7 +379,7 @@ public:
 
 class HTMLSelectElementImpl : public HTMLGenericFormElementImpl
 {
-    friend class khtml::RenderSelect;
+    friend class tdehtml::RenderSelect;
 
 public:
     HTMLSelectElementImpl(DocumentImpl *doc, HTMLFormElementImpl *f = 0);
@@ -425,7 +425,7 @@ public:
     virtual void parseAttribute(AttributeImpl *attr);
 
     virtual void attach();
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
 
     // get the actual listbox index of the optionIndexth option
     int optionToListIndex(int optionIndex) const;
@@ -472,7 +472,7 @@ public:
     virtual bool isEnumeratable() const { return false; }
 
     virtual void parseAttribute(AttributeImpl *attr);
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
 
 };
 
@@ -492,7 +492,7 @@ public:
 
 class HTMLOptionElementImpl : public HTMLGenericFormElementImpl
 {
-    friend class khtml::RenderSelect;
+    friend class tdehtml::RenderSelect;
     friend class DOM::HTMLSelectElementImpl;
 
 public:
@@ -523,7 +523,7 @@ protected:
 
 class HTMLTextAreaElementImpl : public HTMLGenericFormElementImpl
 {
-    friend class khtml::RenderTextArea;
+    friend class tdehtml::RenderTextArea;
 
 public:
     enum WrapMethod {
@@ -555,7 +555,7 @@ public:
 
     virtual void parseAttribute(AttributeImpl *attr);
     virtual void attach();
-    virtual bool encoding(const TQTextCodec*, khtml::encodingList&, bool);
+    virtual bool encoding(const TQTextCodec*, tdehtml::encodingList&, bool);
     virtual void reset();
     DOMString value();
     void setValue(DOMString _value);
diff --git a/khtml/html/html_headimpl.cpp b/tdehtml/html/html_headimpl.cpp
index d7154e936..347f8c262 100644
--- a/khtml/html/html_headimpl.cpp
+++ b/tdehtml/html/html_headimpl.cpp
@@ -27,8 +27,8 @@
 #include "html/html_documentimpl.h"
 #include "xml/dom_textimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include "misc/htmlhashes.h"
 #include "misc/loader.h"
@@ -43,7 +43,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 NodeImpl::Id HTMLBaseElementImpl::id() const
 {
@@ -55,7 +55,7 @@ void HTMLBaseElementImpl::parseAttribute(AttributeImpl *attr)
     switch(attr->id())
     {
     case ATTR_HREF:
-	m_href = khtml::parseURL(attr->value());
+	m_href = tdehtml::parseURL(attr->value());
 	process();
 	break;
     case ATTR_TARGET:
@@ -116,7 +116,7 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr)
     switch (attr->id())
     {
     case ATTR_HREF:
-        m_url = getDocument()->completeURL( khtml::parseURL(attr->value()).string() );
+        m_url = getDocument()->completeURL( tdehtml::parseURL(attr->value()).string() );
 	process();
         break;
     case ATTR_REL:
@@ -175,7 +175,7 @@ void HTMLLinkElementImpl::process()
     TQString type = getAttribute(ATTR_TYPE).string().lower();
     TQString rel = getAttribute(ATTR_REL).string().lower();
 
-    KHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0;
+    TDEHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0;
 
     // IE extension: location of small icon for locationbar / bookmarks
     // Uses both "shortcut icon" and "icon"
@@ -408,7 +408,7 @@ void HTMLScriptElementImpl::evaluateScript(const TQString &URL, const DOMString
     if (m_evaluated)
         return;
 
-    KHTMLPart *part = getDocument()->part();
+    TDEHTMLPart *part = getDocument()->part();
     if (part) {
         KJSProxy *proxy = KJSProxy::proxy(part);
         if (proxy) {
diff --git a/khtml/html/html_headimpl.h b/tdehtml/html/html_headimpl.h
index d22f64434..8563de6a8 100644
--- a/khtml/html/html_headimpl.h
+++ b/tdehtml/html/html_headimpl.h
@@ -28,9 +28,9 @@
 #include "misc/loader_client.h"
 #include "css/css_stylesheetimpl.h"
 
-class KHTMLView;
+class TDEHTMLView;
 
-namespace khtml {
+namespace tdehtml {
     class CachedCSSStyleSheet;
     class CachedObject;
 }
@@ -68,7 +68,7 @@ protected:
 
 // -------------------------------------------------------------------------
 
-class HTMLLinkElementImpl : public khtml::CachedObjectClient, public HTMLElementImpl
+class HTMLLinkElementImpl : public tdehtml::CachedObjectClient, public HTMLElementImpl
 {
 public:
     HTMLLinkElementImpl(DocumentImpl *doc)
@@ -104,7 +104,7 @@ public:
 protected:
     void finished();
 
-    khtml::CachedCSSStyleSheet *m_cachedSheet;
+    tdehtml::CachedCSSStyleSheet *m_cachedSheet;
     CSSStyleSheetImpl *m_sheet;
     DOMString m_url;
     TQString m_media;
@@ -135,7 +135,7 @@ protected:
 
 // -------------------------------------------------------------------------
 
-class HTMLScriptElementImpl : public HTMLElementImpl, public khtml::CachedObjectClient
+class HTMLScriptElementImpl : public HTMLElementImpl, public tdehtml::CachedObjectClient
 {
 public:
     HTMLScriptElementImpl(DocumentImpl *doc);
@@ -143,7 +143,7 @@ public:
 
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
-    virtual void notifyFinished(khtml::CachedObject *finishedObj);
+    virtual void notifyFinished(tdehtml::CachedObject *finishedObj);
     virtual void childrenChanged();
 
     virtual Id id() const;
@@ -175,7 +175,7 @@ public:
     void setType(const DOMString &);
 
 private:
-    khtml::CachedScript *m_cachedScript;
+    tdehtml::CachedScript *m_cachedScript;
     bool m_createdByParser;
     bool m_evaluated;
 };
diff --git a/khtml/html/html_imageimpl.cpp b/tdehtml/html/html_imageimpl.cpp
index be13e93c2..a006b3bd0 100644
--- a/khtml/html/html_imageimpl.cpp
+++ b/tdehtml/html/html_imageimpl.cpp
@@ -25,11 +25,11 @@
 #include "html/html_documentimpl.h"
 
 #include "misc/htmlhashes.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include <kstringhandler.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_image.h"
@@ -48,7 +48,7 @@
 #include <tqpointarray.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // -------------------------------------------------------------------------
 
@@ -89,7 +89,7 @@ void HTMLImageElementImpl::parseAttribute(AttributeImpl *attr)
         //Start loading the image already, to generate events
         DOMString url = attr->value();
         if (!url.isEmpty()) { //### why do we not hide or something when setting this?
-            CachedImage* newImage = getDocument()->docLoader()->requestImage(khtml::parseURL(url));
+            CachedImage* newImage = getDocument()->docLoader()->requestImage(tdehtml::parseURL(url));
             if (newImage && newImage != m_image) {
                 CachedImage* oldImage = m_image;
                 loadEventSent = false;
@@ -147,7 +147,7 @@ void HTMLImageElementImpl::parseAttribute(AttributeImpl *attr)
         if ( attr->value()[0] == '#' )
             usemap = attr->value().lower();
         else {
-            TQString url = getDocument()->completeURL( khtml::parseURL( attr->value() ).string() );
+            TQString url = getDocument()->completeURL( tdehtml::parseURL( attr->value() ).string() );
             // ### we remove the part before the anchor and hope
             // the map is on the same html page....
             usemap = url;
@@ -410,7 +410,7 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr)
         } 
         else {
             // add name with full url:
-            TQString url = getDocument()->completeURL( khtml::parseURL( attr->value() ).string() );
+            TQString url = getDocument()->completeURL( tdehtml::parseURL( attr->value() ).string() );
             if(getDocument()->isHTMLDocument())
                 static_cast<HTMLDocumentImpl*>(getDocument())->mapMap[url] = this;
         }
diff --git a/khtml/html/html_imageimpl.h b/tdehtml/html/html_imageimpl.h
index 6f26cd2df..f36e61295 100644
--- a/khtml/html/html_imageimpl.h
+++ b/tdehtml/html/html_imageimpl.h
@@ -24,7 +24,7 @@
 #define HTML_IMAGEIMPL_H
 
 #include "html/html_inlineimpl.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 #include "misc/loader_client.h"
 #include "rendering/render_object.h"
 
@@ -36,7 +36,7 @@ class DOMString;
 class HTMLFormElementImpl;
 
 class HTMLImageElementImpl
-    : public HTMLElementImpl, public khtml::CachedObjectClient
+    : public HTMLElementImpl, public tdehtml::CachedObjectClient
 {
     friend class HTMLFormElementImpl;
 public:
@@ -75,13 +75,13 @@ public:
      * @return True if and only if the image is completely downloaded yet*/
     bool complete() const;
 
-    virtual void notifyFinished(khtml::CachedObject *finishedObj);
+    virtual void notifyFinished(tdehtml::CachedObject *finishedObj);
     void dispatchLoadEvent();
 protected:
     DOMString usemap;
     bool ismap : 1;
     bool loadEventSent : 1;
-    khtml::CachedImage  *m_image;
+    tdehtml::CachedImage  *m_image;
     HTMLFormElementImpl *m_form;
     DOMString            m_name;
 };
@@ -105,7 +105,7 @@ public:
     bool isDefault() const { return shape==Default; }
 
     bool mapMouseEvent(int x_, int y_, int width_, int height_,
-                       khtml::RenderObject::NodeInfo& info);
+                       tdehtml::RenderObject::NodeInfo& info);
 
     virtual TQRect getRect() const;
 
@@ -114,7 +114,7 @@ public:
 protected:
     TQRegion getRegion(int width_, int height) const;
     TQRegion region;
-    khtml::Length* m_coords;
+    tdehtml::Length* m_coords;
     int m_coordsLen;
     int lastw, lasth;
     Shape shape  : 3;
@@ -138,7 +138,7 @@ public:
     virtual void parseAttribute(AttributeImpl *attr);
 
     bool mapMouseEvent(int x_, int y_, int width_, int height_,
-                       khtml::RenderObject::NodeInfo& info);
+                       tdehtml::RenderObject::NodeInfo& info);
 private:
 
     TQString name;
diff --git a/khtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp
index 9d30a5b4e..f403a2385 100644
--- a/khtml/html/html_inlineimpl.cpp
+++ b/tdehtml/html/html_inlineimpl.cpp
@@ -29,8 +29,8 @@
 #include "html/html_documentimpl.h"
 
 #include "misc/htmlhashes.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "css/csshelper.h"
 #include "css/cssproperties.h"
 #include "css/cssvalues.h"
@@ -41,7 +41,7 @@
 
 #include <kdebug.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 NodeImpl::Id HTMLAnchorElementImpl::id() const
@@ -54,7 +54,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
     bool keydown = evt->id() == EventImpl::KEYDOWN_EVENT && evt->isKeyRelatedEvent();
 
     // React on clicks and on keypresses.
-    // Don't make this KEYUP_EVENT again, it makes khtml follow links
+    // Don't make this KEYUP_EVENT again, it makes tdehtml follow links
     // it shouldn't, when pressing Enter in the combo.
     if ( ( (evt->id() == EventImpl::CLICK_EVENT && !static_cast<MouseEventImpl*>(evt)->isDoubleClick()) ||
          ( keydown && m_focused)) && m_hasAnchor) {
@@ -84,7 +84,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
             if (k->qKeyEvent()) k->qKeyEvent()->accept();
         }
 
-        url = khtml::parseURL(getAttribute(ATTR_HREF)).string();
+        url = tdehtml::parseURL(getAttribute(ATTR_HREF)).string();
 
         utarget = getAttribute(ATTR_TARGET).string();
 
@@ -95,10 +95,10 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
             HTMLImageElementImpl* img = static_cast<HTMLImageElementImpl*>( evt->target() );
             if ( img && img->isServerMap() )
             {
-                khtml::RenderImage *r = static_cast<khtml::RenderImage *>(img->renderer());
+                tdehtml::RenderImage *r = static_cast<tdehtml::RenderImage *>(img->renderer());
                 if(r && e)
                 {
-                    KHTMLView* v = getDocument()->view();
+                    TDEHTMLView* v = getDocument()->view();
                     int x = e->clientX();
                     int y = e->clientY();
                     int absx = 0;
@@ -276,7 +276,7 @@ void HTMLFontElementImpl::parseAttribute(AttributeImpl *attr)
             case  6: size = CSS_VAL_XX_LARGE; break;
             default:
                 if (num > 6)
-                    size = CSS_VAL__KHTML_XXX_LARGE;
+                    size = CSS_VAL__TDEHTML_XXX_LARGE;
                 else
                     size = CSS_VAL_XX_SMALL;
             }
diff --git a/khtml/html/html_inlineimpl.h b/tdehtml/html/html_inlineimpl.h
index 252e64e41..252e64e41 100644
--- a/khtml/html/html_inlineimpl.h
+++ b/tdehtml/html/html_inlineimpl.h
diff --git a/khtml/html/html_listimpl.cpp b/tdehtml/html/html_listimpl.cpp
index e1650af46..1ad450f84 100644
--- a/khtml/html/html_listimpl.cpp
+++ b/tdehtml/html/html_listimpl.cpp
@@ -30,7 +30,7 @@ using namespace DOM;
 #include "misc/htmlhashes.h"
 #include "xml/dom_docimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
 NodeImpl::Id HTMLUListElementImpl::id() const
 {
diff --git a/khtml/html/html_listimpl.h b/tdehtml/html/html_listimpl.h
index d4a9f4436..d4a9f4436 100644
--- a/khtml/html/html_listimpl.h
+++ b/tdehtml/html/html_listimpl.h
diff --git a/khtml/html/html_miscimpl.cpp b/tdehtml/html/html_miscimpl.cpp
index 58804bff5..58804bff5 100644
--- a/khtml/html/html_miscimpl.cpp
+++ b/tdehtml/html/html_miscimpl.cpp
diff --git a/khtml/html/html_miscimpl.h b/tdehtml/html/html_miscimpl.h
index b28fef82a..b28fef82a 100644
--- a/khtml/html/html_miscimpl.h
+++ b/tdehtml/html/html_miscimpl.h
diff --git a/khtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp
index 2dc0f4288..f2cf8c1db 100644
--- a/khtml/html/html_objectimpl.cpp
+++ b/tdehtml/html/html_objectimpl.cpp
@@ -22,10 +22,10 @@
  */
 #include "html/html_objectimpl.h"
 
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include "dom/dom_string.h"
 #include "misc/htmlhashes.h"
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 #include <tqstring.h>
 #include <tqvariant.h>
 #include <tqmap.h>
@@ -45,7 +45,7 @@
 #include "xml/dom2_eventsimpl.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // -------------------------------------------------------------------------
 HTMLObjectBaseElementImpl::HTMLObjectBaseElementImpl(DocumentImpl *doc)
@@ -265,7 +265,7 @@ void HTMLAppletElementImpl::parseAttribute(AttributeImpl *attr)
 
 void HTMLAppletElementImpl::attach()
 {
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
 
 #ifndef Q_WS_QWS // FIXME?
     DOMString codeBase = getAttribute( ATTR_CODEBASE );
@@ -304,7 +304,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr)
   {
      case ATTR_CODE:
      case ATTR_SRC:
-         url = khtml::parseURL(attr->val()).string();
+         url = tdehtml::parseURL(attr->val()).string();
          needWidgetUpdate = true;
          break;
      case ATTR_BORDER:
@@ -346,7 +346,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr)
 
 void HTMLEmbedElementImpl::attach()
 {
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
 
     if (!w || !w->part()->pluginsEnabled())
         m_renderAlternative = true;
@@ -383,7 +383,7 @@ void HTMLObjectElementImpl::parseAttribute(AttributeImpl *attr)
   switch ( attr->id() )
   {
     case ATTR_DATA:
-      url = khtml::parseURL( attr->val() ).string();
+      url = tdehtml::parseURL( attr->val() ).string();
       needWidgetUpdate = true;
       break;
     case ATTR_CLASSID:
@@ -422,14 +422,14 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const
     if ( !m_render ) return 0;
     if ( !m_render->isWidget() ) return 0;
     TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget();
-    if( widget && ::tqqt_cast<KHTMLView*>( widget ) )
-        return static_cast<KHTMLView*>( widget )->part()->xmlDocImpl();
+    if( widget && ::tqqt_cast<TDEHTMLView*>( widget ) )
+        return static_cast<TDEHTMLView*>( widget )->part()->xmlDocImpl();
     return 0;
 }
 
 void HTMLObjectElementImpl::attach()
 {
-    KHTMLView* w = getDocument()->view();
+    TDEHTMLView* w = getDocument()->view();
 
     if (!w || !w->part()->pluginsEnabled())
         m_renderAlternative = true;
diff --git a/khtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h
index 4204e6ef3..d10e66356 100644
--- a/khtml/html/html_objectimpl.h
+++ b/tdehtml/html/html_objectimpl.h
@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 
-class KHTMLView;
+class TDEHTMLView;
 
 // -------------------------------------------------------------------------
 namespace DOM {
@@ -81,7 +81,7 @@ public:
     virtual void parseAttribute(AttributeImpl *token);
     virtual void attach();
 protected:
-    khtml::VAlign valign;
+    tdehtml::VAlign valign;
 };
 
 // -------------------------------------------------------------------------
diff --git a/khtml/html/html_tableimpl.cpp b/tdehtml/html/html_tableimpl.cpp
index 2c2e6567d..f14ad8583 100644
--- a/khtml/html/html_tableimpl.cpp
+++ b/tdehtml/html/html_tableimpl.cpp
@@ -32,8 +32,8 @@
 #include "dom/dom_node.h"
 
 #include "misc/htmlhashes.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include "css/cssstyleselector.h"
 #include "css/cssproperties.h"
@@ -43,9 +43,9 @@
 #include "rendering/render_table.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 HTMLTableElementImpl::HTMLTableElementImpl(DocumentImpl *doc)
@@ -63,7 +63,7 @@ HTMLTableElementImpl::HTMLTableElementImpl(DocumentImpl *doc)
     // only difference to 100% correct is that in strict mode <font> elements are propagated into tables.
     if ( getDocument()->parseMode() < DocumentImpl::Transitional ) {
         addCSSProperty( CSS_PROP_FONT_SIZE, CSS_VAL_MEDIUM );
-        addCSSProperty( CSS_PROP_COLOR, CSS_VAL__KHTML_TEXT );
+        addCSSProperty( CSS_PROP_COLOR, CSS_VAL__TDEHTML_TEXT );
     }
 }
 
@@ -464,7 +464,7 @@ void HTMLTableElementImpl::parseAttribute(AttributeImpl *attr)
     case ATTR_BACKGROUND:
     {
         if (!attr->value().isEmpty()) {
-            TQString url = khtml::parseURL( attr->value() ).string();
+            TQString url = tdehtml::parseURL( attr->value() ).string();
             url = getDocument()->completeURL( url );
             addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, "url('"+url+"')" );
         }
@@ -604,7 +604,7 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr)
     case ATTR_BACKGROUND:
     {
         if (attr->val()) {
-            TQString url = khtml::parseURL( attr->value() ).string();
+            TQString url = tdehtml::parseURL( attr->value() ).string();
             url = getDocument()->completeURL( url );
             addCSSProperty(CSS_PROP_BACKGROUND_IMAGE,  "url('"+url+"')" );
         }
@@ -627,13 +627,13 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr)
     {
         DOMString v = attr->value();
         if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_CENTER);
         else if (strcasecmp(attr->value(), "absmiddle") == 0)
             addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER);
         else if (strcasecmp(attr->value(), "left") == 0)
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_LEFT);
         else if (strcasecmp(attr->value(), "right") == 0)
-            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
+            addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_RIGHT);
         else
             addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
         break;
@@ -881,7 +881,7 @@ void HTMLTableCellElementImpl::parseAttribute(AttributeImpl *attr)
         break;
     case ATTR_NOWRAP:
         if (attr->val() != 0)
-	    addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__KHTML_NOWRAP);
+	    addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__TDEHTML_NOWRAP);
         else
 	    removeCSSProperty(CSS_PROP_WHITE_SPACE);
         break;
diff --git a/khtml/html/html_tableimpl.h b/tdehtml/html/html_tableimpl.h
index 76d81ce50..76d81ce50 100644
--- a/khtml/html/html_tableimpl.h
+++ b/tdehtml/html/html_tableimpl.h
diff --git a/khtml/html/htmlparser.cpp b/tdehtml/html/htmlparser.cpp
index 9da99f4b3..31d3d4c17 100644
--- a/khtml/html/htmlparser.cpp
+++ b/tdehtml/html/htmlparser.cpp
@@ -45,9 +45,9 @@
 #include "xml/dom_nodeimpl.h"
 #include "misc/htmlhashes.h"
 #include "html/htmltokenizer.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
-#include "khtml_factory.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtml_factory.h"
 #include "css/cssproperties.h"
 #include "css/cssvalues.h"
 #include "css/csshelper.h"
@@ -56,10 +56,10 @@
 
 #include "html/htmlparser.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 //----------------------------------------------------------------------------
 
@@ -125,7 +125,7 @@ public:
  *
  */
 
-KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc)
+TDEHTMLParser::TDEHTMLParser( TDEHTMLView *_parent, DocumentImpl *doc)
 {
     //kdDebug( 6035 ) << "parser constructor" << endl;
 #if SPEED_DEBUG > 0
@@ -144,7 +144,7 @@ KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc)
     reset();
 }
 
-KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
+TDEHTMLParser::TDEHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
 {
     HTMLWidget = 0;
     document = doc;
@@ -161,7 +161,7 @@ KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
     inBody = true;
 }
 
-KHTMLParser::~KHTMLParser()
+TDEHTMLParser::~TDEHTMLParser()
 {
 #if SPEED_DEBUG > 0
     kdDebug( ) << "TIME: parsing time was = " << qt.elapsed() << endl;
@@ -175,7 +175,7 @@ KHTMLParser::~KHTMLParser()
     delete isindex;
 }
 
-void KHTMLParser::reset()
+void TDEHTMLParser::reset()
 {
     setCurrent ( document );
 
@@ -201,7 +201,7 @@ void KHTMLParser::reset()
     discard_until = 0;
 }
 
-void KHTMLParser::parseToken(Token *t)
+void TDEHTMLParser::parseToken(Token *t)
 {
     if (t->tid > 2*ID_CLOSE_TAG)
     {
@@ -310,7 +310,7 @@ static bool isTableRelatedTag(int id)
             id == ID_TH);
 }
 
-bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
+bool TDEHTMLParser::insertNode(NodeImpl *n, bool flat)
 {
     int id = n->id();
 
@@ -821,7 +821,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
 }
 
 
-NodeImpl *KHTMLParser::getElement(Token* t)
+NodeImpl *TDEHTMLParser::getElement(Token* t)
 {
     NodeImpl *n = 0;
 
@@ -911,11 +911,11 @@ NodeImpl *KHTMLParser::getElement(Token* t)
         break;
     case ID_INPUT:
         if ( t->attrs &&
-             KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() &&
-             KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() &&
+             TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() &&
+             TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() &&
              !strcasecmp( t->attrs->getValue( ATTR_TYPE ), "image" ) )
         {
-            if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( khtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) ))
+            if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) ))
                 return 0;
         }
         n = new HTMLInputElementImpl(document, form);
@@ -1038,11 +1038,11 @@ NodeImpl *KHTMLParser::getElement(Token* t)
 // images
     case ID_IMG:
         if (t->attrs&&
-            KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&&
-            KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled())
+            TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&&
+            TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled())
         {
-            TQString url = doc()->completeURL( khtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() );
-            if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered(url))
+            TQString url = doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() );
+            if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(url))
                 return 0;
         }
         n = new HTMLImageElementImpl(document, form);
@@ -1200,7 +1200,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
     return n;
 }
 
-void KHTMLParser::processCloseTag(Token *t)
+void TDEHTMLParser::processCloseTag(Token *t)
 {
     // support for really broken html. Can't believe I'm supporting such crap (lars)
     switch(t->tid)
@@ -1244,7 +1244,7 @@ void KHTMLParser::processCloseTag(Token *t)
 #endif
 }
 
-bool KHTMLParser::isResidualStyleTag(int _id)
+bool TDEHTMLParser::isResidualStyleTag(int _id)
 {
     switch (_id) {
         case ID_A:
@@ -1274,7 +1274,7 @@ bool KHTMLParser::isResidualStyleTag(int _id)
     }
 }
 
-bool KHTMLParser::isAffectedByResidualStyle(int _id)
+bool TDEHTMLParser::isAffectedByResidualStyle(int _id)
 {
     if (isResidualStyleTag(_id))
         return true;
@@ -1304,7 +1304,7 @@ bool KHTMLParser::isAffectedByResidualStyle(int _id)
     }
 }
 
-void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
+void TDEHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
 {
     // Find the element that crosses over to a higher level.
     // ### For now, if there is more than one, we will only make sure we close the residual style.
@@ -1487,7 +1487,7 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
                                                     // if it becomes necessary to do so.
 }
 
-void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent)
+void TDEHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent)
 {
     // Loop for each tag that needs to be reopened.
     while (elem) {
@@ -1525,7 +1525,7 @@ void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* ma
     }
 }
 
-void KHTMLParser::pushBlock(int _id, int _level)
+void TDEHTMLParser::pushBlock(int _id, int _level)
 {
     HTMLStackElem *Elem = new HTMLStackElem(_id, _level, current, m_inline, blockStack);
 
@@ -1533,7 +1533,7 @@ void KHTMLParser::pushBlock(int _id, int _level)
     addForbidden(_id, forbiddenTag);
 }
 
-void KHTMLParser::popBlock( int _id )
+void TDEHTMLParser::popBlock( int _id )
 {
     HTMLStackElem *Elem = blockStack;
     int maxLevel = 0;
@@ -1619,7 +1619,7 @@ void KHTMLParser::popBlock( int _id )
     reopenResidualStyleTags(residualStyleStack, malformedTableParent);
 }
 
-void KHTMLParser::popOneBlock(bool delBlock)
+void TDEHTMLParser::popOneBlock(bool delBlock)
 {
     HTMLStackElem *Elem = blockStack;
 
@@ -1661,20 +1661,20 @@ void KHTMLParser::popOneBlock(bool delBlock)
         delete Elem;
 }
 
-void KHTMLParser::popInlineBlocks()
+void TDEHTMLParser::popInlineBlocks()
 {
     while(blockStack && current->isInline() && current->id() != ID_FONT)
         popOneBlock();
 }
 
-void KHTMLParser::freeBlock()
+void TDEHTMLParser::freeBlock()
 {
     while (blockStack)
         popOneBlock();
     blockStack = 0;
 }
 
-void KHTMLParser::createHead()
+void TDEHTMLParser::createHead()
 {
     if(head || !doc()->firstChild())
         return;
@@ -1692,7 +1692,7 @@ void KHTMLParser::createHead()
     }
 }
 
-NodeImpl *KHTMLParser::handleIsindex( Token *t )
+NodeImpl *TDEHTMLParser::handleIsindex( Token *t )
 {
     NodeImpl *n;
     HTMLFormElementImpl *myform = form;
@@ -1710,7 +1710,7 @@ NodeImpl *KHTMLParser::handleIsindex( Token *t )
     child = new TextImpl(document, text.implementation());
     n->addChild( child );
     child = new HTMLIsIndexElementImpl(document, myform);
-    static_cast<ElementImpl *>(child)->setAttribute(ATTR_TYPE, "khtml_isindex");
+    static_cast<ElementImpl *>(child)->setAttribute(ATTR_TYPE, "tdehtml_isindex");
     n->addChild( child );
     child = new HTMLHRElementImpl( document );
     n->addChild( child );
@@ -1718,7 +1718,7 @@ NodeImpl *KHTMLParser::handleIsindex( Token *t )
     return n;
 }
 
-void KHTMLParser::startBody()
+void TDEHTMLParser::startBody()
 {
     if(inBody) return;
 
diff --git a/khtml/html/htmlparser.h b/tdehtml/html/htmlparser.h
index d0ce549ef..79f2b14c7 100644
--- a/khtml/html/htmlparser.h
+++ b/tdehtml/html/htmlparser.h
@@ -44,7 +44,7 @@
 #include "html/html_documentimpl.h"
 #include "html/RefPtr.h"
 
-class KHTMLView;
+class TDEHTMLView;
 class HTMLStackElem;
 
 namespace DOM {
@@ -58,7 +58,7 @@ namespace DOM {
     class DocumentFragmentImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class Token;
 
@@ -66,12 +66,12 @@ class Token;
  * The parser for html. It receives a stream of tokens from the HTMLTokenizer, and
  * builds up the Document structure form it.
  */
-class KHTMLParser
+class TDEHTMLParser
 {
 public:
-    KHTMLParser( KHTMLView *w, DOM::DocumentImpl *i );
-    KHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc );
-    virtual ~KHTMLParser();
+    TDEHTMLParser( TDEHTMLView *w, DOM::DocumentImpl *i );
+    TDEHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc );
+    virtual ~TDEHTMLParser();
 
     /**
      * parses one token delivered by the tokenizer
@@ -92,7 +92,7 @@ public:
 
 protected:
 
-    KHTMLView *HTMLWidget;
+    TDEHTMLView *HTMLWidget;
     DOM::DocumentImpl *document;
 
     /*
@@ -186,7 +186,7 @@ private:
 #endif
 };
 
-} // namespace khtml
+} // namespace tdehtml
 
 #endif // HTMLPARSER_H
 
diff --git a/khtml/html/htmltokenizer.cpp b/tdehtml/html/htmltokenizer.cpp
index 2329e2325..292d1773d 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/tdehtml/html/htmltokenizer.cpp
@@ -44,13 +44,13 @@
 #include "misc/loader.h"
 #include "misc/htmlhashes.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "xml/dom_docimpl.h"
 #include "css/csshelper.h"
 #include "ecma/kjs_proxy.h"
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ctype.h>
 #include <assert.h>
 #include <tqvariant.h>
@@ -59,7 +59,7 @@
 
 #include "kentities.c"
 
-using namespace khtml;
+using namespace tdehtml;
 
 static const TQChar commentStart [] = { '<','!','-','-', TQChar::null };
 
@@ -69,9 +69,9 @@ static const char styleEnd [] =  "</style";
 static const char textareaEnd [] = "</textarea";
 static const char titleEnd [] = "</title";
 
-#define KHTML_ALLOC_QCHAR_VEC( N ) (TQChar*) malloc( sizeof(TQChar)*( N ) )
-#define KHTML_REALLOC_QCHAR_VEC(P, N ) (TQChar*) realloc(P, sizeof(TQChar)*( N ))
-#define KHTML_DELETE_QCHAR_VEC( P ) free((char*)( P ))
+#define TDEHTML_ALLOC_QCHAR_VEC( N ) (TQChar*) malloc( sizeof(TQChar)*( N ) )
+#define TDEHTML_REALLOC_QCHAR_VEC(P, N ) (TQChar*) realloc(P, sizeof(TQChar)*( N ))
+#define TDEHTML_DELETE_QCHAR_VEC( P ) free((char*)( P ))
 
 // Full support for MS Windows extensions to Latin-1.
 // Technically these extensions should only be activated for pages
@@ -123,14 +123,14 @@ static const char titleEnd [] = "</title";
 #endif
 // ----------------------------------------------------------------------------
 
-HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view)
+HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, TDEHTMLView *_view)
 {
     view = _view;
     buffer = 0;
     scriptCode = 0;
     scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
-    charsets = KGlobal::charsets();
-    parser = new KHTMLParser(_view, _doc);
+    charsets = TDEGlobal::charsets();
+    parser = new TDEHTMLParser(_view, _doc);
     m_executingScript = 0;
     m_autoCloseTimer = 0;
     onHold = false;
@@ -144,8 +144,8 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl
     buffer = 0;
     scriptCode = 0;
     scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
-    charsets = KGlobal::charsets();
-    parser = new KHTMLParser( i, _doc );
+    charsets = TDEGlobal::charsets();
+    parser = new TDEHTMLParser( i, _doc );
     m_executingScript = 0;
     m_autoCloseTimer = 0;
     onHold = false;
@@ -163,12 +163,12 @@ void HTMLTokenizer::reset()
         cachedScript.dequeue()->deref(this);
 
     if ( buffer )
-        KHTML_DELETE_QCHAR_VEC(buffer);
+        TDEHTML_DELETE_QCHAR_VEC(buffer);
     buffer = dest = 0;
     size = 0;
 
     if ( scriptCode )
-        KHTML_DELETE_QCHAR_VEC(scriptCode);
+        TDEHTML_DELETE_QCHAR_VEC(scriptCode);
     scriptCode = 0;
     scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
 
@@ -186,7 +186,7 @@ void HTMLTokenizer::begin()
     onHold = false;
     reset();
     size = 254;
-    buffer = KHTML_ALLOC_QCHAR_VEC( 255 );
+    buffer = TDEHTML_ALLOC_QCHAR_VEC( 255 );
     dest = buffer;
     tag = NoTag;
     pending = NonePending;
@@ -845,7 +845,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                         currToken.flat = true;
                 }
 
-                uint tagID = khtml::getTagID(ptr, len);
+                uint tagID = tdehtml::getTagID(ptr, len);
                 if (!tagID) {
 #ifdef TOKEN_DEBUG
                     TQCString tmp(ptr, len+1);
@@ -910,13 +910,13 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                     if(curchar <= ' ' || curchar == '=' || curchar == '>') {
                         unsigned int a;
                         cBuffer[cBufferPos] = '\0';
-                        a = khtml::getAttrID(cBuffer, cBufferPos);
+                        a = tdehtml::getAttrID(cBuffer, cBufferPos);
                         if ( !a ) {
                             // did we just get /> or e.g checked/>
                             if (curchar == '>' && cBufferPos >=1 && cBuffer[cBufferPos-1] == '/') {
                                 currToken.flat = true;
                                 if (cBufferPos>1)
-                                    a = khtml::getAttrID(cBuffer, cBufferPos-1);
+                                    a = tdehtml::getAttrID(cBuffer, cBufferPos-1);
                             }
                             if (!a)
                                 attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
@@ -1126,7 +1126,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                      parser->doc()->view()->part()->jScriptEnabled() /* jscript allowed at all? */
                     ) {
                     if ( ( a = currToken.attrs->getValue( ATTR_SRC ) ) )
-                        scriptSrc = parser->doc()->completeURL(khtml::parseURL( DOMString(a) ).string() );
+                        scriptSrc = parser->doc()->completeURL(tdehtml::parseURL( DOMString(a) ).string() );
                     if ( ( a = currToken.attrs->getValue( ATTR_CHARSET ) ) )
                         scriptSrcCharset = DOMString(a).string().stripWhiteSpace();
                     if ( scriptSrcCharset.isEmpty() && view)
@@ -1578,10 +1578,10 @@ void HTMLTokenizer::end()
         processToken();
 
     if(buffer)
-        KHTML_DELETE_QCHAR_VEC(buffer);
+        TDEHTML_DELETE_QCHAR_VEC(buffer);
 
     if(scriptCode)
-        KHTML_DELETE_QCHAR_VEC(scriptCode);
+        TDEHTML_DELETE_QCHAR_VEC(scriptCode);
 
     scriptCode = 0;
     scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
@@ -1621,7 +1621,7 @@ void HTMLTokenizer::finish()
             pos = TQConstString(scriptCode, scriptCodeSize).string().find('>');
             food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy
         }
-        KHTML_DELETE_QCHAR_VEC(scriptCode);
+        TDEHTML_DELETE_QCHAR_VEC(scriptCode);
         scriptCode = 0;
         scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
         if (script)
@@ -1720,7 +1720,7 @@ void HTMLTokenizer::enlargeBuffer(int len)
     int newsize = kMax(size*2, size+len);
     int oldoffs = (dest - buffer);
 
-    buffer = KHTML_REALLOC_QCHAR_VEC(buffer, newsize);
+    buffer = TDEHTML_REALLOC_QCHAR_VEC(buffer, newsize);
     dest = buffer + oldoffs;
     size = newsize;
 }
@@ -1728,7 +1728,7 @@ void HTMLTokenizer::enlargeBuffer(int len)
 void HTMLTokenizer::enlargeScriptBuffer(int len)
 {
     int newsize = kMax(scriptCodeMaxSize*2, scriptCodeMaxSize+len);
-    scriptCode = KHTML_REALLOC_QCHAR_VEC(scriptCode, newsize);
+    scriptCode = TDEHTML_REALLOC_QCHAR_VEC(scriptCode, newsize);
     scriptCodeMaxSize = newsize;
 }
 
diff --git a/khtml/html/htmltokenizer.h b/tdehtml/html/htmltokenizer.h
index 10ef76176..a79f65edf 100644
--- a/khtml/html/htmltokenizer.h
+++ b/tdehtml/html/htmltokenizer.h
@@ -41,16 +41,16 @@
 #include "xml/dom_docimpl.h"
 
 class KCharsets;
-class KHTMLView;
+class TDEHTMLView;
 
 namespace DOM {
     class DocumentImpl;
     class DocumentFragmentImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
     class CachedScript;
-    class KHTMLParser;
+    class TDEHTMLParser;
 
     /**
      * @internal
@@ -120,14 +120,14 @@ namespace khtml {
 
 class HTMLTokenizer : public Tokenizer, public CachedObjectClient
 {
-    friend class KHTMLParser;
+    friend class TDEHTMLParser;
 public:
-    HTMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0);
+    HTMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0);
     HTMLTokenizer(DOM::DocumentImpl *, DOM::DocumentFragmentImpl *frag);
     virtual ~HTMLTokenizer();
 
     void begin();
-    void write( const khtml::TokenizerString &str, bool appendData );
+    void write( const tdehtml::TokenizerString &str, bool appendData );
     void end();
     void finish();
     void timerEvent( TQTimerEvent *e );
@@ -141,16 +141,16 @@ protected:
     void reset();
     void addPending();
     void processToken();
-    void processListing(khtml::TokenizerString list);
-
-    void parseComment(khtml::TokenizerString &str);
-    void parseServer(khtml::TokenizerString &str);
-    void parseText(khtml::TokenizerString &str);
-    void parseListing(khtml::TokenizerString &str);
-    void parseSpecial(khtml::TokenizerString &str);
-    void parseTag(khtml::TokenizerString &str);
-    void parseEntity(khtml::TokenizerString &str, TQChar *&dest, bool start = false);
-    void parseProcessingInstruction(khtml::TokenizerString &str);
+    void processListing(tdehtml::TokenizerString list);
+
+    void parseComment(tdehtml::TokenizerString &str);
+    void parseServer(tdehtml::TokenizerString &str);
+    void parseText(tdehtml::TokenizerString &str);
+    void parseListing(tdehtml::TokenizerString &str);
+    void parseSpecial(tdehtml::TokenizerString &str);
+    void parseTag(tdehtml::TokenizerString &str);
+    void parseEntity(tdehtml::TokenizerString &str, TQChar *&dest, bool start = false);
+    void parseProcessingInstruction(tdehtml::TokenizerString &str);
     void scriptHandler();
     void scriptExecution(const TQString& script, const TQString& scriptURL = TQString::null, int baseLine = 0);
     void setSrc(const TokenizerString& source);
@@ -172,7 +172,7 @@ protected:
     void enlargeScriptBuffer(int len);
 
     // from CachedObjectClient
-    void notifyFinished(khtml::CachedObject *finishedObj);
+    void notifyFinished(tdehtml::CachedObject *finishedObj);
 
 protected:
     // Internal buffers
@@ -180,7 +180,7 @@ protected:
     TQChar *buffer;
     TQChar *dest;
 
-    khtml::Token currToken;
+    tdehtml::Token currToken;
 
     // the size of buffer
     int size;
@@ -321,7 +321,7 @@ protected:
     // true if we are executing a script while parsing a document. This causes the parsing of
     // the output of the script to be postponed until after the script has finished executing
     int m_executingScript;
-    TQPtrQueue<khtml::CachedScript> cachedScript;
+    TQPtrQueue<tdehtml::CachedScript> cachedScript;
     // you can pause the tokenizer if you need to display a dialog or something
     bool onHold;
     // you can ask the tokenizer to abort the current write() call, e.g. to redirect somewhere else
@@ -344,12 +344,12 @@ protected:
     unsigned int cBufferPos;
     unsigned int entityLen;
 
-    khtml::TokenizerString src;
+    tdehtml::TokenizerString src;
 
     KCharsets *charsets;
-    KHTMLParser *parser;
+    TDEHTMLParser *parser;
 
-    KHTMLView *view;
+    TDEHTMLView *view;
 };
 
 } // namespace
diff --git a/khtml/htmlpageinfo.ui b/tdehtml/htmlpageinfo.ui
index 5dd21cd6f..2315771ae 100644
--- a/khtml/htmlpageinfo.ui
+++ b/tdehtml/htmlpageinfo.ui
@@ -1,5 +1,5 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>KHTMLInfoDlg</class>
+<class>TDEHTMLInfoDlg</class>
 <comment>A dialog to display the HTTP headers for a given page.</comment>
 <author>George Staikos &lt;staikos@kde.org&gt;</author>
 <widget class="TQDialog">
diff --git a/khtml/java/CMakeLists.txt b/tdehtml/java/CMakeLists.txt
index abda3ed66..e1958d320 100644
--- a/khtml/java/CMakeLists.txt
+++ b/tdehtml/java/CMakeLists.txt
@@ -16,14 +16,14 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
@@ -71,6 +71,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/khtml/java/ChangeLog b/tdehtml/java/ChangeLog
index b276c27ac..b276c27ac 100644
--- a/khtml/java/ChangeLog
+++ b/tdehtml/java/ChangeLog
diff --git a/khtml/java/KJAS_GRAMMAR.txt b/tdehtml/java/KJAS_GRAMMAR.txt
index 5632f8de8..5632f8de8 100644
--- a/khtml/java/KJAS_GRAMMAR.txt
+++ b/tdehtml/java/KJAS_GRAMMAR.txt
diff --git a/khtml/java/Makefile.am b/tdehtml/java/Makefile.am
index a6b719262..2ae3cec13 100644
--- a/khtml/java/Makefile.am
+++ b/tdehtml/java/Makefile.am
@@ -14,8 +14,8 @@ METASOURCES = AUTO
 libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
 libkjava_la_LIBADD = $(LIB_KPARTS)
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/khtml \
-	-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdehtml \
+	-I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
 	$(all_includes) 
 
 kjavadata_DATA = kjava.jar kjava.policy pluginsinfo
@@ -32,6 +32,6 @@ kjavaappletviewer_la_SOURCES= kjavaapplet.cpp kjavaappletcontext.cpp \
         kjavadownloader.cpp kjavaappletviewer.cpp
 
 kjavaappletviewer_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
-kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
 
 kde_services_DATA= kjavaappletviewer.desktop
diff --git a/khtml/java/README b/tdehtml/java/README
index 5d64e742f..5d64e742f 100644
--- a/khtml/java/README
+++ b/tdehtml/java/README
diff --git a/khtml/java/TODO b/tdehtml/java/TODO
index 2b9289e59..3d707c898 100644
--- a/khtml/java/TODO
+++ b/tdehtml/java/TODO
@@ -5,11 +5,11 @@ a Java 1.1 security manager, please feel free and we can integrate
 both versions.
 
 - Get the keyboard focus issues fixed
-- Fix khtml_part to have one applet context per Document
+- Fix tdehtml_part to have one applet context per Document
 - add a context cache someplace so we can reload contexts-
   this will keep us from having to restart the jvm over
   and over- this is the biggest performance problem I think
-- fix khtml_part so it will start and stop applets??
+- fix tdehtml_part so it will start and stop applets??
 - Implement class loading via html proxies if one is set
 
 
diff --git a/khtml/java/build.properties b/tdehtml/java/build.properties
index c2c0016bc..c2c0016bc 100644
--- a/khtml/java/build.properties
+++ b/tdehtml/java/build.properties
diff --git a/khtml/java/build.xml b/tdehtml/java/build.xml
index 16b523588..16b523588 100644
--- a/khtml/java/build.xml
+++ b/tdehtml/java/build.xml
diff --git a/khtml/java/configure.in.in b/tdehtml/java/configure.in.in
index 32e7883ef..2ed75f6fe 100644
--- a/khtml/java/configure.in.in
+++ b/tdehtml/java/configure.in.in
@@ -1,5 +1,5 @@
 dnl don't remove
-dnl AC_OUTPUT(khtml/java/kjava.policy)
+dnl AC_OUTPUT(tdehtml/java/kjava.policy)
 KJAVA_POLICYPATH=${kde_datadir}/kjava/-
 KDE_EXPAND_MAKEVAR(KJAVA_POLICYPATH, KJAVA_POLICYPATH)
 AC_SUBST(KJAVA_POLICYPATH)
diff --git a/khtml/java/cr16-action-java.png b/tdehtml/java/cr16-action-java.png
index dca85a129..dca85a129 100644
--- a/khtml/java/cr16-action-java.png
+++ b/tdehtml/java/cr16-action-java.png
diff --git a/khtml/java/dummy/CMakeLists.txt b/tdehtml/java/dummy/CMakeLists.txt
index 5828f4b83..5828f4b83 100644
--- a/khtml/java/dummy/CMakeLists.txt
+++ b/tdehtml/java/dummy/CMakeLists.txt
diff --git a/khtml/java/dummy/Makefile.am b/tdehtml/java/dummy/Makefile.am
index 5438da6ad..5438da6ad 100644
--- a/khtml/java/dummy/Makefile.am
+++ b/tdehtml/java/dummy/Makefile.am
diff --git a/khtml/java/images/animbean.gif b/tdehtml/java/images/animbean.gif
index a842be25d..a842be25d 100644
--- a/khtml/java/images/animbean.gif
+++ b/tdehtml/java/images/animbean.gif
diff --git a/khtml/java/images/beanicon.png b/tdehtml/java/images/beanicon.png
index d1632c16e..d1632c16e 100644
--- a/khtml/java/images/beanicon.png
+++ b/tdehtml/java/images/beanicon.png
diff --git a/khtml/java/images/brokenbean.gif b/tdehtml/java/images/brokenbean.gif
index 9f46dc355..9f46dc355 100644
--- a/khtml/java/images/brokenbean.gif
+++ b/tdehtml/java/images/brokenbean.gif
diff --git a/khtml/java/kjava.jar b/tdehtml/java/kjava.jar
index afab6884b..afab6884b 100644
--- a/khtml/java/kjava.jar
+++ b/tdehtml/java/kjava.jar
diff --git a/khtml/java/kjava.policy.in b/tdehtml/java/kjava.policy.in
index 72197bb2e..72197bb2e 100644
--- a/khtml/java/kjava.policy.in
+++ b/tdehtml/java/kjava.policy.in
diff --git a/khtml/java/kjavaapplet.cpp b/tdehtml/java/kjavaapplet.cpp
index 879c8624e..a28e541e2 100644
--- a/khtml/java/kjavaapplet.cpp
+++ b/tdehtml/java/kjavaapplet.cpp
@@ -22,9 +22,9 @@
 #include "kjavaappletwidget.h"
 #include "kjavaappletcontext.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 
 
diff --git a/khtml/java/kjavaapplet.h b/tdehtml/java/kjavaapplet.h
index 8e02c5ba4..8e02c5ba4 100644
--- a/khtml/java/kjavaapplet.h
+++ b/tdehtml/java/kjavaapplet.h
diff --git a/khtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp
index 76914a5dc..b644b67ca 100644
--- a/khtml/java/kjavaappletcontext.cpp
+++ b/tdehtml/java/kjavaappletcontext.cpp
@@ -23,8 +23,8 @@
 #include "kjavaappletserver.h"
 #include "kjavaprocess.h"
 #include "kjavaapplet.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
diff --git a/khtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h
index 119699f23..8ccedfe38 100644
--- a/khtml/java/kjavaappletcontext.h
+++ b/tdehtml/java/kjavaappletcontext.h
@@ -30,7 +30,7 @@
  * @short Provides a context for KJavaAppletWidgets
  *
  * Applets run in a context- (see the Java documentation for more information
- * on contexts).  Currently, each document in KHTML creates one context, in
+ * on contexts).  Currently, each document in TDEHTML creates one context, in
  * which multiple applets can run.
  *
  * @author Richard J. Moore, rich@kde.org
@@ -112,12 +112,12 @@ signals:
     void showStatus  ( const TQString& txt );
 
     /**
-     * Signals the KHTML Part to show a url in a given target
+     * Signals the TDEHTML Part to show a url in a given target
      */
     void showDocument( const TQString& url, const TQString& target );
 
     /**
-     * Signals the KHTML Part an applet is loaded
+     * Signals the TDEHTML Part an applet is loaded
      **/
     void appletLoaded();
 
diff --git a/khtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 56e056a62..952fe143b 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -26,14 +26,14 @@
 #include "kjavadownloader.h"
 
 #include <kdebug.h>
-#include <kconfig.h>
-#include <klocale.h>
-#include <kparts/browserextension.h>
-#include <kapplication.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
+#include <tdeparts/browserextension.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
-#include <kio/job.h>
-#include <kio/kprotocolmanager.h>
+#include <tdeio/job.h>
+#include <tdeio/tdeprotocolmanager.h>
 #include <ksslcertificate.h>
 #include <ksslcertchain.h>
 #include <kssl.h>
@@ -87,7 +87,7 @@
 
 class JSStackFrame;
 
-typedef TQMap< int, KJavaKIOJob* > KIOJobMap;
+typedef TQMap< int, KJavaTDEIOJob* > TDEIOJobMap;
 typedef TQMap< int, JSStackFrame* > JSStack;
 
 class JSStackFrame {
@@ -121,7 +121,7 @@ private:
    TQMap< int, TQGuardedPtr<KJavaAppletContext> > contexts;
    TQString appletLabel;
    JSStack jsstack;
-   KIOJobMap kiojobs;
+   TDEIOJobMap kiojobs;
    bool javaProcessFailed;
    bool useKIO;
    KSSL * kssl;
@@ -193,7 +193,7 @@ void KJavaAppletServer::freeJavaServer()
         //instead of immediately quitting here, set a timer to kill us
         //if there are still no servers- give us one minute
         //this is to prevent repeated loading and unloading of the jvm
-        KConfig config( "konquerorrc", true );
+        TDEConfig config( "konquerorrc", true );
         config.setGroup( "Java/JavaScript Settings" );
         if( config.readBoolEntry( "ShutdownAppletServer", true )  )
         {
@@ -214,7 +214,7 @@ void KJavaAppletServer::checkShutdown()
 
 void KJavaAppletServer::setupJava( KJavaProcess *p )
 {
-    KConfig config ( "konquerorrc", true );
+    TDEConfig config ( "konquerorrc", true );
     config.setGroup( "Java/JavaScript Settings" );
 
     TQString jvm_path = "java";
@@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray&
 
 void KJavaAppletServer::removeDataJob( int loaderID )
 {
-    const KIOJobMap::iterator it = d->kiojobs.find( loaderID );
+    const TDEIOJobMap::iterator it = d->kiojobs.find( loaderID );
     if (it != d->kiojobs.end()) {
         it.data()->deleteLater();
         d->kiojobs.erase( it );
@@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     if (cmd_code == KJAS_PUT_DATA) {
         // rest of the data is for kio put
         if (ok) {
-            KIOJobMap::iterator it = d->kiojobs.find( ID_num );
+            TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
             if (ok && it != d->kiojobs.end()) {
                 TQByteArray qba;
                 qba.setRawData(qb.data() + index, qb.size() - index - 1);
@@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
         case KJAS_DATA_COMMAND:
             if (ok && !args.empty()) {
                 const int cmd = args.first().toInt( &ok );
-                KIOJobMap::iterator it = d->kiojobs.find( ID_num );
+                TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
                 if (ok && it != d->kiojobs.end())
                     it.data()->jobCommand( cmd );
                 kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl;
diff --git a/khtml/java/kjavaappletserver.h b/tdehtml/java/kjavaappletserver.h
index 63463b040..63463b040 100644
--- a/khtml/java/kjavaappletserver.h
+++ b/tdehtml/java/kjavaappletserver.h
diff --git a/khtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 5948dea22..f80690aa9 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -30,15 +30,15 @@
 #include <tqlabel.h>
 
 #include <klibloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kio/authinfo.h>
+#include <tdeconfig.h>
+#include <tdeio/authinfo.h>
 #include <dcopclient.h>
 
 #include "kjavaappletwidget.h"
@@ -48,10 +48,10 @@
 
 K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory)
 
-KInstance *KJavaAppletViewerFactory::s_instance = 0;
+TDEInstance *KJavaAppletViewerFactory::s_instance = 0;
 
 KJavaAppletViewerFactory::KJavaAppletViewerFactory () {
-    s_instance = new KInstance ("kjava");
+    s_instance = new TDEInstance ("kjava");
 }
 
 KJavaAppletViewerFactory::~KJavaAppletViewerFactory () {
@@ -223,7 +223,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
                                            new KJavaServerMaintainer);
     }
     m_view = new CoverWidget (wparent);
-    TQString classname, classid, codebase, khtml_codebase, src_param;
+    TQString classname, classid, codebase, tdehtml_codebase, src_param;
     int width = -1;
     int height = -1;
     KJavaApplet* const applet = m_view->appletWidget()->applet ();
@@ -241,15 +241,15 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
             kdDebug(6100) << "name=" << name << " value=" << value << endl;
             if (!name.isEmpty()) {
                 const TQString name_lower = name.lower ();
-                if (name == "__KHTML__PLUGINBASEURL") {
+                if (name == "__TDEHTML__PLUGINBASEURL") {
                     baseurl = KURL (KURL (value), TQString (".")).url ();
-                } else if (name == "__KHTML__CODEBASE")
-                    khtml_codebase = value;
+                } else if (name == "__TDEHTML__CODEBASE")
+                    tdehtml_codebase = value;
                 else if (name_lower == TQString::fromLatin1("codebase") ||
                          name_lower == TQString::fromLatin1("java_codebase")) {
                     if (!value.isEmpty ())
                         codebase = value;
-                } else if (name == "__KHTML__CLASSID")
+                } else if (name == "__TDEHTML__CLASSID")
                 //else if (name.lower()==TQString::fromLatin1("classid"))
                     classid = value;
                 else if (name_lower == TQString::fromLatin1("code") ||
@@ -267,7 +267,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
                     width = value.toInt();
                 else if (name_lower == TQString::fromLatin1("height"))
                     height = value.toInt();
-                if (!name.startsWith ("__KHTML__")) {
+                if (!name.startsWith ("__TDEHTML__")) {
                     applet->setParameter (name, value);
                 }
             }
@@ -278,7 +278,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         kdDebug(6100) << "classid=" << classid << classid.startsWith("clsid:")<< endl;
         if (classid.startsWith ("clsid:"))
             // codeBase contains the URL to the plugin page
-            khtml_codebase = baseurl;
+            tdehtml_codebase = baseurl;
         else if (classname.isEmpty () && classid.startsWith ("java:"))
             classname = classid.mid(5);
     }
@@ -287,9 +287,9 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
     else if (!src_param.isEmpty ())
         applet->setParameter (TQString ("SRC"), src_param);
     if (codebase.isEmpty ())
-        codebase = khtml_codebase;
+        codebase = tdehtml_codebase;
     if (baseurl.isEmpty ()) {
-        // not embeded in khtml
+        // not embeded in tdehtml
         TQString pwd = TQDir().absPath ();
         if (!pwd.endsWith (TQChar (TQDir::separator ())))
             pwd += TQDir::separator ();
@@ -315,12 +315,12 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
 
     if (!server->usingKIO ()) {
         /* if this page needs authentication */
-        KIO::AuthInfo info;
+        TDEIO::AuthInfo info;
         TQString errorMsg;
         TQCString replyType;
         TQByteArray params;
         TQByteArray reply;
-        KIO::AuthInfo authResult;
+        TDEIO::AuthInfo authResult;
 
         //(void) dcopClient(); // Make sure to have a dcop client.
         info.url = baseurl;
@@ -329,9 +329,9 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         TQDataStream stream(params, IO_WriteOnly);
         stream << info << m_view->topLevelWidget()->winId();
 
-        if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
+        if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
             kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
-        } else if ( replyType == "KIO::AuthInfo" ) {
+        } else if ( replyType == "TDEIO::AuthInfo" ) {
             TQDataStream stream2( reply, IO_ReadOnly );
             stream2 >> authResult;
             applet->setUser (authResult.username);
@@ -447,8 +447,8 @@ void KJavaAppletViewer::infoMessage (const TQString & msg) {
     m_browserextension->infoMessage(msg);
 }
 
-KAboutData* KJavaAppletViewer::createAboutData () {
-    return new KAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
+TDEAboutData* KJavaAppletViewer::createAboutData () {
+    return new TDEAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
 }
 
 //---------------------------------------------------------------------
diff --git a/khtml/java/kjavaappletviewer.desktop b/tdehtml/java/kjavaappletviewer.desktop
index 9a2d16355..9a2d16355 100644
--- a/khtml/java/kjavaappletviewer.desktop
+++ b/tdehtml/java/kjavaappletviewer.desktop
diff --git a/khtml/java/kjavaappletviewer.h b/tdehtml/java/kjavaappletviewer.h
index e12b3c1d9..9b32e3f21 100644
--- a/khtml/java/kjavaappletviewer.h
+++ b/tdehtml/java/kjavaappletviewer.h
@@ -23,10 +23,10 @@
 #ifndef KJAVAAPPLETVIEWER_H
 #define KJAVAAPPLETVIEWER_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/factory.h>
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <tqobject.h>
@@ -39,9 +39,9 @@ class TQTable;
 class TQLabel;
 class KJavaProcess;
 class KJavaAppletViewer;
-class KAboutData;
-class KInstance;
-class KConfig;
+class TDEAboutData;
+class TDEInstance;
+class TDEConfig;
 class CoverWidget;
 
 class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
@@ -86,7 +86,7 @@ public:
               TQObject * parent, const char * name, const TQStringList &args);
     ~KJavaAppletViewer ();
     CoverWidget * view () const { return m_view; }
-    static KAboutData* createAboutData ();
+    static TDEAboutData* createAboutData ();
 
     KJavaAppletViewerBrowserExtension * browserextension() const
         { return m_browserextension; }
@@ -107,7 +107,7 @@ private slots:
     void delayedCreateTimeOut ();
 private:
     TQGuardedPtr <CoverWidget> m_view;
-    KConfig * m_config;
+    TDEConfig * m_config;
     KJavaProcess * process;
     KJavaAppletViewerBrowserExtension * m_browserextension;
     KJavaAppletViewerLiveConnectExtension * m_liveconnect;
@@ -126,9 +126,9 @@ public:
         (TQWidget *wparent, const char *wname,
          TQObject *parent, const char *name,
          const char *className, const TQStringList &args);
-    static KInstance * instance () { return s_instance; }
+    static TDEInstance * instance () { return s_instance; }
 private:
-    static KInstance * s_instance;
+    static TDEInstance * s_instance;
 };
 
 class AppletParameterDialog : public KDialogBase {
diff --git a/khtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index c096261cd..a1f5b8f11 100644
--- a/khtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <twin.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 
diff --git a/khtml/java/kjavaappletwidget.h b/tdehtml/java/kjavaappletwidget.h
index e84f96039..e84f96039 100644
--- a/khtml/java/kjavaappletwidget.h
+++ b/tdehtml/java/kjavaappletwidget.h
diff --git a/khtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp
index 60334cbf0..5b1c55324 100644
--- a/khtml/java/kjavadownloader.cpp
+++ b/tdehtml/java/kjavadownloader.cpp
@@ -23,8 +23,8 @@
 #include "kjavaappletserver.h"
 
 #include <kurl.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kdebug.h>
 #include <tqfile.h>
 
@@ -41,9 +41,9 @@ static const int KJAS_STOP = 0;
 static const int KJAS_HOLD = 1;
 static const int KJAS_RESUME = 2;
 
-KJavaKIOJob::~KJavaKIOJob() {}
+KJavaTDEIOJob::~KJavaTDEIOJob() {}
 
-void KJavaKIOJob::data( const TQByteArray& )
+void KJavaTDEIOJob::data( const TQByteArray& )
 {
     kdError(6100) << "Job id mixup" << endl;
 }
@@ -58,13 +58,13 @@ public:
     ~KJavaDownloaderPrivate()
     {
         delete url;
-        if (job) job->kill(); // KIO::Job::kill deletes itself
+        if (job) job->kill(); // TDEIO::Job::kill deletes itself
     }
 private:
     int               loaderID;
     KURL*             url;
     TQByteArray        file;
-    KIO::TransferJob* job;
+    TDEIO::TransferJob* job;
     int               responseCode;
     bool              isfirstdata;
 };
@@ -79,16 +79,16 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url )
     d->loaderID = ID;
     d->url = new KURL( url );
 
-    d->job = KIO::get( *d->url, false, false );
+    d->job = TDEIO::get( *d->url, false, false );
     d->job->addMetaData("PropagateHttpHeader", "true");
-    connect( d->job,  TQT_SIGNAL(data( KIO::Job*, const TQByteArray& )),
-             this,    TQT_SLOT(slotData( KIO::Job*, const TQByteArray& )) );
-    connect( d->job, TQT_SIGNAL(connected(KIO::Job*)),
-             this, TQT_SLOT(slotConnected(KIO::Job*)));
-    connect( d->job, TQT_SIGNAL(mimetype(KIO::Job*, const TQString&)),
-             this, TQT_SLOT(slotMimetype(KIO::Job*, const TQString&)));
-    connect( d->job, TQT_SIGNAL(result(KIO::Job*)),
-             this,   TQT_SLOT(slotResult(KIO::Job*)) );
+    connect( d->job,  TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
+             this,    TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
+    connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)),
+             this, TQT_SLOT(slotConnected(TDEIO::Job*)));
+    connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
+             this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
+    connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
+             this,   TQT_SLOT(slotResult(TDEIO::Job*)) );
 }
 
 KJavaDownloader::~KJavaDownloader()
@@ -96,7 +96,7 @@ KJavaDownloader::~KJavaDownloader()
     delete d;
 }
 
-void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb )
+void KJavaDownloader::slotData( TDEIO::Job*, const TQByteArray& qb )
 {
     //kdDebug(6100) << "slotData(" << d->loaderID << ")" << endl;
 
@@ -116,17 +116,17 @@ void KJavaDownloader::slotData( KIO::Job*, const TQByteArray& qb )
     KJavaAppletServer::freeJavaServer();
 }
 
-void KJavaDownloader::slotConnected(KIO::Job*)
+void KJavaDownloader::slotConnected(TDEIO::Job*)
 {
     kdDebug(6100) << "slave connected" << endl;
     d->responseCode = d->job->error();
 }
 
-void KJavaDownloader::slotMimetype(KIO::Job*, const TQString & type) {
+void KJavaDownloader::slotMimetype(TDEIO::Job*, const TQString & type) {
     kdDebug(6100) << "slave mimetype " << type << endl;
 }
 
-void KJavaDownloader::slotResult( KIO::Job* )
+void KJavaDownloader::slotResult( TDEIO::Job* )
 {
     kdDebug(6100) << "slotResult(" << d->loaderID << ")" << endl;
 
@@ -149,7 +149,7 @@ void KJavaDownloader::slotResult( KIO::Job* )
     {
         server->sendURLData( d->loaderID, FINISHED, d->file );
     }
-    d->job = 0L; // signal KIO::Job::result deletes itself
+    d->job = 0L; // signal TDEIO::Job::result deletes itself
     server->removeDataJob( d->loaderID ); // will delete this
     KJavaAppletServer::freeJavaServer();
 }
@@ -161,7 +161,7 @@ void KJavaDownloader::jobCommand( int cmd )
         case KJAS_STOP: {
             kdDebug(6100) << "jobCommand(" << d->loaderID << ") stop" << endl;
             d->job->kill();
-            d->job = 0L; // KIO::Job::kill deletes itself
+            d->job = 0L; // TDEIO::Job::kill deletes itself
             KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer();
             server->removeDataJob( d->loaderID ); // will delete this
             KJavaAppletServer::freeJavaServer();
@@ -187,12 +187,12 @@ public:
     ~KJavaUploaderPrivate()
     {
         delete url;
-        if (job) job->kill(); // KIO::Job::kill deletes itself
+        if (job) job->kill(); // TDEIO::Job::kill deletes itself
     }
     int               loaderID;
     KURL*             url;
     TQByteArray        file;
-    KIO::TransferJob* job;
+    TDEIO::TransferJob* job;
     bool              finished;
 };
 
@@ -213,12 +213,12 @@ void KJavaUploader::start()
     kdDebug(6100) << "KJavaUploader::start(" << d->loaderID << ")" << endl;
     KJavaAppletServer* server = KJavaAppletServer::allocateJavaServer();
     // create a suspended job
-    d->job = KIO::put( *d->url, -1, false, false, false );
+    d->job = TDEIO::put( *d->url, -1, false, false, false );
     d->job->suspend();
-    connect( d->job, TQT_SIGNAL(dataReq( KIO::Job*, TQByteArray& )),
-            this,   TQT_SLOT(slotDataRequest( KIO::Job*, TQByteArray& )) );
-    connect( d->job, TQT_SIGNAL(result(KIO::Job*)),
-            this,   TQT_SLOT(slotResult(KIO::Job*)) );
+    connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
+            this,   TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
+    connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
+            this,   TQT_SLOT(slotResult(TDEIO::Job*)) );
     server->sendURLData( d->loaderID, CONNECTED, d->file );
     KJavaAppletServer::freeJavaServer();
 }
@@ -228,7 +228,7 @@ KJavaUploader::~KJavaUploader()
     delete d;
 }
 
-void KJavaUploader::slotDataRequest( KIO::Job*, TQByteArray& qb )
+void KJavaUploader::slotDataRequest( TDEIO::Job*, TQByteArray& qb )
 {
     // send our data and suspend
     kdDebug(6100) << "slotDataRequest(" << d->loaderID << ") finished:" << d->finished << endl;
@@ -256,7 +256,7 @@ void KJavaUploader::data( const TQByteArray& qb )
     d->job->resume();
 }
 
-void KJavaUploader::slotResult( KIO::Job* )
+void KJavaUploader::slotResult( TDEIO::Job* )
 {
     kdDebug(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl;
 
@@ -276,7 +276,7 @@ void KJavaUploader::slotResult( KIO::Job* )
     }
     else // shouldn't come here
         kdError(6100) << "slotResult(" << d->loaderID << ") job:" << d->job << endl;
-    d->job = 0L; // signal KIO::Job::result deletes itself
+    d->job = 0L; // signal TDEIO::Job::result deletes itself
     server->removeDataJob( d->loaderID ); // will delete this
     KJavaAppletServer::freeJavaServer();
 }
diff --git a/khtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h
index f9514304c..22690824c 100644
--- a/khtml/java/kjavadownloader.h
+++ b/tdehtml/java/kjavadownloader.h
@@ -27,29 +27,29 @@
 /**
  * @short A class for handling downloads from KIO
  *
- * This class handles a KIO::get job and passes the data
+ * This class handles a TDEIO::get job and passes the data
  * back to the AppletServer.
  *
  * @author Wynn Wilkes, wynnw@calderasystems.com
  */
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
 class KJavaDownloaderPrivate;
 class KJavaUploaderPrivate;
 
-class KJavaKIOJob : public TQObject
+class KJavaTDEIOJob : public TQObject
 {
 Q_OBJECT
 public:
-    virtual ~KJavaKIOJob();
+    virtual ~KJavaTDEIOJob();
     virtual void jobCommand( int cmd ) = 0;
     virtual void data( const TQByteArray& qb );
 };
 
-class KJavaDownloader : public KJavaKIOJob
+class KJavaDownloader : public KJavaTDEIOJob
 {
 Q_OBJECT
 
@@ -59,17 +59,17 @@ public:
 
     virtual void jobCommand( int cmd );
 protected slots:
-    void slotData( KIO::Job*, const TQByteArray& );
-    void slotConnected( KIO::Job* );
-    void slotMimetype( KIO::Job*, const TQString& );
-    void slotResult( KIO::Job* );
+    void slotData( TDEIO::Job*, const TQByteArray& );
+    void slotConnected( TDEIO::Job* );
+    void slotMimetype( TDEIO::Job*, const TQString& );
+    void slotResult( TDEIO::Job* );
 
 private:
     KJavaDownloaderPrivate* d;
 
 };
 
-class KJavaUploader : public KJavaKIOJob
+class KJavaUploader : public KJavaTDEIOJob
 {
 Q_OBJECT
 
@@ -81,8 +81,8 @@ public:
     virtual void data( const TQByteArray& qb );
     void start();
 protected slots:
-    void slotDataRequest( KIO::Job*, TQByteArray& );
-    void slotResult( KIO::Job* );
+    void slotDataRequest( TDEIO::Job*, TQByteArray& );
+    void slotResult( TDEIO::Job* );
 private:
     KJavaUploaderPrivate* d;
 
diff --git a/khtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index 48eb7b764..6b505c343 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -22,7 +22,7 @@
 #include "kjavaprocess.h"
 
 #include <kdebug.h>
-#include <kio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
 
 #include <tqtextstream.h>
 #include <tqmap.h>
@@ -46,20 +46,20 @@ private:
     bool processKilled;
 };
 
-KJavaProcess::KJavaProcess() : KProcess()
+KJavaProcess::KJavaProcess() : TDEProcess()
 {
     d = new KJavaProcessPrivate;
     d->BufferList.setAutoDelete( true );
     d->processKilled = false;
 
-    javaProcess = this; //new KProcess();
+    javaProcess = this; //new TDEProcess();
 
-    connect( javaProcess, TQT_SIGNAL( wroteStdin( KProcess * ) ),
+    connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ),
              this, TQT_SLOT( slotWroteData() ) );
     connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
              this, TQT_SLOT( slotReceivedData(int, int&) ) );
-    connect( javaProcess, TQT_SIGNAL( processExited (KProcess *) ),
-             this, TQT_SLOT( slotExited (KProcess *) ) );
+    connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ),
+             this, TQT_SLOT( slotExited (TDEProcess *) ) );
 
     d->jvmPath = "java";
     d->mainClass = "-help";
@@ -303,11 +303,11 @@ bool KJavaProcess::invokeJVM()
     tqCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) );
     kdDebug(6100) << argStr << endl;
 
-    KProcess::Communication flags =  (KProcess::Communication)
-                                     (KProcess::Stdin | KProcess::Stdout |
-                                      KProcess::NoRead);
+    TDEProcess::Communication flags =  (TDEProcess::Communication)
+                                     (TDEProcess::Stdin | TDEProcess::Stdout |
+                                      TDEProcess::NoRead);
 
-    const bool rval = javaProcess->start( KProcess::NotifyOnExit, flags );
+    const bool rval = javaProcess->start( TDEProcess::NotifyOnExit, flags );
     if( rval )
         javaProcess->resume(); //start processing stdout on the java process
     else
@@ -382,7 +382,7 @@ void KJavaProcess::slotReceivedData( int fd, int& len )
     len = num_bytes + num_bytes_msg;
 }
 
-void KJavaProcess::slotExited( KProcess *process )
+void KJavaProcess::slotExited( TDEProcess *process )
 {
   if (process == javaProcess) {
     int status = -1;
diff --git a/khtml/java/kjavaprocess.h b/tdehtml/java/kjavaprocess.h
index 280701233..4768bc382 100644
--- a/khtml/java/kjavaprocess.h
+++ b/tdehtml/java/kjavaprocess.h
@@ -39,7 +39,7 @@
  */
 
 class KJavaProcessPrivate;
-class KJavaProcess : public KProcess //QObject
+class KJavaProcess : public TDEProcess //QObject
 {
 Q_OBJECT
 
@@ -64,7 +64,7 @@ public:
 
     /**
      * Returns the status of the java Process- true if it's ok, false if it has died.
-     * It calls KProcess::isRunning()
+     * It calls TDEProcess::isRunning()
      */
     bool isRunning();
 
@@ -139,7 +139,7 @@ protected slots:
     /**
      * This slot is called when the Java Process exited.
      */
-    void slotExited( KProcess *process );
+    void slotExited( TDEProcess *process );
 
 protected:
     virtual bool invokeJVM();
@@ -150,7 +150,7 @@ protected:
     void        sendBuffer( TQByteArray* buff );
     void        storeSize( TQByteArray* buff );
 
-    KProcess* javaProcess;
+    TDEProcess* javaProcess;
 
 signals:
     void received( const TQByteArray& );
diff --git a/khtml/java/kqeventutil.cpp b/tdehtml/java/kqeventutil.cpp
index ff15e97da..ff15e97da 100644
--- a/khtml/java/kqeventutil.cpp
+++ b/tdehtml/java/kqeventutil.cpp
diff --git a/khtml/java/kqeventutil.h b/tdehtml/java/kqeventutil.h
index c7ec19bf0..c7ec19bf0 100644
--- a/khtml/java/kqeventutil.h
+++ b/tdehtml/java/kqeventutil.h
diff --git a/khtml/java/kxeventutil.cpp b/tdehtml/java/kxeventutil.cpp
index 9afa5a5ac..9afa5a5ac 100644
--- a/khtml/java/kxeventutil.cpp
+++ b/tdehtml/java/kxeventutil.cpp
diff --git a/khtml/java/kxeventutil.h b/tdehtml/java/kxeventutil.h
index 6eb0bf14b..6eb0bf14b 100644
--- a/khtml/java/kxeventutil.h
+++ b/tdehtml/java/kxeventutil.h
diff --git a/khtml/java/make-jar b/tdehtml/java/make-jar
index a817ec1f3..a817ec1f3 100755
--- a/khtml/java/make-jar
+++ b/tdehtml/java/make-jar
diff --git a/khtml/java/netscape/javascript/JSException.java b/tdehtml/java/netscape/javascript/JSException.java
index 222033e7a..222033e7a 100644
--- a/khtml/java/netscape/javascript/JSException.java
+++ b/tdehtml/java/netscape/javascript/JSException.java
diff --git a/khtml/java/netscape/javascript/JSObject.java b/tdehtml/java/netscape/javascript/JSObject.java
index f103d90c8..f103d90c8 100644
--- a/khtml/java/netscape/javascript/JSObject.java
+++ b/tdehtml/java/netscape/javascript/JSObject.java
diff --git a/khtml/java/netscape/plugin/Plugin.java b/tdehtml/java/netscape/plugin/Plugin.java
index c7be0e542..c7be0e542 100644
--- a/khtml/java/netscape/plugin/Plugin.java
+++ b/tdehtml/java/netscape/plugin/Plugin.java
diff --git a/khtml/java/netscape/security/ForbiddenTargetException.java b/tdehtml/java/netscape/security/ForbiddenTargetException.java
index 27879d05b..27879d05b 100644
--- a/khtml/java/netscape/security/ForbiddenTargetException.java
+++ b/tdehtml/java/netscape/security/ForbiddenTargetException.java
diff --git a/khtml/java/netscape/security/Principal.java b/tdehtml/java/netscape/security/Principal.java
index 1f93a8293..1f93a8293 100644
--- a/khtml/java/netscape/security/Principal.java
+++ b/tdehtml/java/netscape/security/Principal.java
diff --git a/khtml/java/netscape/security/PrivilegeManager.java b/tdehtml/java/netscape/security/PrivilegeManager.java
index c6555eaa0..c6555eaa0 100644
--- a/khtml/java/netscape/security/PrivilegeManager.java
+++ b/tdehtml/java/netscape/security/PrivilegeManager.java
diff --git a/khtml/java/netscape/security/Target.java b/tdehtml/java/netscape/security/Target.java
index 8b50040b5..8b50040b5 100644
--- a/khtml/java/netscape/security/Target.java
+++ b/tdehtml/java/netscape/security/Target.java
diff --git a/khtml/java/org/kde/javascript/JSObject.java b/tdehtml/java/org/kde/javascript/JSObject.java
index 11e7f9f99..11e7f9f99 100644
--- a/khtml/java/org/kde/javascript/JSObject.java
+++ b/tdehtml/java/org/kde/javascript/JSObject.java
diff --git a/khtml/java/org/kde/kjas/server/Console.java b/tdehtml/java/org/kde/kjas/server/Console.java
index d089f3cd8..d089f3cd8 100644
--- a/khtml/java/org/kde/kjas/server/Console.java
+++ b/tdehtml/java/org/kde/kjas/server/Console.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java b/tdehtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
index c6defa848..c6defa848 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAppletClassLoader.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletContext.java b/tdehtml/java/org/kde/kjas/server/KJASAppletContext.java
index f868b7b64..f868b7b64 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletContext.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAppletContext.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletPanel.java b/tdehtml/java/org/kde/kjas/server/KJASAppletPanel.java
index d7acbdaf9..d7acbdaf9 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletPanel.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAppletPanel.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAppletStub.java b/tdehtml/java/org/kde/kjas/server/KJASAppletStub.java
index e090183d7..e090183d7 100644
--- a/khtml/java/org/kde/kjas/server/KJASAppletStub.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAppletStub.java
diff --git a/khtml/java/org/kde/kjas/server/KJASAudioClip.java b/tdehtml/java/org/kde/kjas/server/KJASAudioClip.java
index 3a40cf6e0..3a40cf6e0 100644
--- a/khtml/java/org/kde/kjas/server/KJASAudioClip.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASAudioClip.java
diff --git a/khtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java b/tdehtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java
index aab1be4af..aab1be4af 100644
--- a/khtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASBrokenClassFixer.java
diff --git a/khtml/java/org/kde/kjas/server/KJASConsole.java b/tdehtml/java/org/kde/kjas/server/KJASConsole.java
index 51498b59b..51498b59b 100644
--- a/khtml/java/org/kde/kjas/server/KJASConsole.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASConsole.java
diff --git a/khtml/java/org/kde/kjas/server/KJASConsoleStream.java b/tdehtml/java/org/kde/kjas/server/KJASConsoleStream.java
index 2c1152ed4..2c1152ed4 100644
--- a/khtml/java/org/kde/kjas/server/KJASConsoleStream.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASConsoleStream.java
diff --git a/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java b/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
index f8b50a91d..f8b50a91d 100644
--- a/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
diff --git a/khtml/java/org/kde/kjas/server/KJASSecurityManager.java b/tdehtml/java/org/kde/kjas/server/KJASSecurityManager.java
index 0525bba0c..0525bba0c 100644
--- a/khtml/java/org/kde/kjas/server/KJASSecurityManager.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASSecurityManager.java
diff --git a/khtml/java/org/kde/kjas/server/KJASSoundPlayer.java b/tdehtml/java/org/kde/kjas/server/KJASSoundPlayer.java
index a37c2bbd4..a37c2bbd4 100644
--- a/khtml/java/org/kde/kjas/server/KJASSoundPlayer.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASSoundPlayer.java
diff --git a/khtml/java/org/kde/kjas/server/KJASSwingConsole.java b/tdehtml/java/org/kde/kjas/server/KJASSwingConsole.java
index fedda6c48..fedda6c48 100644
--- a/khtml/java/org/kde/kjas/server/KJASSwingConsole.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASSwingConsole.java
diff --git a/khtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java b/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
index 58c5ff518..58c5ff518 100644
--- a/khtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
diff --git a/khtml/java/org/kde/kjas/server/Main.java b/tdehtml/java/org/kde/kjas/server/Main.java
index 50ccb14f1..50ccb14f1 100644
--- a/khtml/java/org/kde/kjas/server/Main.java
+++ b/tdehtml/java/org/kde/kjas/server/Main.java
diff --git a/khtml/java/org/kde/kjas/server/StatusListener.java b/tdehtml/java/org/kde/kjas/server/StatusListener.java
index be17c2b29..be17c2b29 100644
--- a/khtml/java/org/kde/kjas/server/StatusListener.java
+++ b/tdehtml/java/org/kde/kjas/server/StatusListener.java
diff --git a/khtml/java/pluginsinfo b/tdehtml/java/pluginsinfo
index 7d37ed7c8..7d37ed7c8 100644
--- a/khtml/java/pluginsinfo
+++ b/tdehtml/java/pluginsinfo
diff --git a/khtml/java/tests/Makefile.am b/tdehtml/java/tests/Makefile.am
index ab392b874..55e6fc732 100644
--- a/khtml/java/tests/Makefile.am
+++ b/tdehtml/java/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/khtml/java -I$(top_srcdir)/khtml \
+INCLUDES = -I$(top_srcdir)/tdehtml/java -I$(top_srcdir)/tdehtml \
            -I$(top_srcdir) $(all_includes)
 
 check_PROGRAMS = testserver 
diff --git a/khtml/java/tests/badapplets/BadApplet.jar b/tdehtml/java/tests/badapplets/BadApplet.jar
index fc9c274a2..fc9c274a2 100644
--- a/khtml/java/tests/badapplets/BadApplet.jar
+++ b/tdehtml/java/tests/badapplets/BadApplet.jar
diff --git a/khtml/java/tests/badapplets/BadApplet.java b/tdehtml/java/tests/badapplets/BadApplet.java
index c8217d256..c8217d256 100644
--- a/khtml/java/tests/badapplets/BadApplet.java
+++ b/tdehtml/java/tests/badapplets/BadApplet.java
diff --git a/khtml/java/tests/badapplets/applet.html b/tdehtml/java/tests/badapplets/applet.html
index fe9e47ef9..fe9e47ef9 100644
--- a/khtml/java/tests/badapplets/applet.html
+++ b/tdehtml/java/tests/badapplets/applet.html
diff --git a/khtml/java/tests/good_sites b/tdehtml/java/tests/good_sites
index f9699fe2a..f9699fe2a 100644
--- a/khtml/java/tests/good_sites
+++ b/tdehtml/java/tests/good_sites
diff --git a/khtml/java/tests/testkjavaappletserver.cpp b/tdehtml/java/tests/testkjavaappletserver.cpp
index 2045f7512..641b06327 100644
--- a/khtml/java/tests/testkjavaappletserver.cpp
+++ b/tdehtml/java/tests/testkjavaappletserver.cpp
@@ -1,5 +1,5 @@
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tqstring.h>
 #include <stdio.h>
@@ -9,19 +9,19 @@
 #include "java/kjavaapplet.h"
 #include "java/kjavaappletwidget.h"
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+[tdelibs_path]", "path to tdelibs directory", 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
 {
-    KCmdLineArgs::init( argc, argv, "testKJASSever", "testKJASServer", "test program", "0.0" );
+    TDECmdLineArgs::init( argc, argv, "testKJASSever", "testKJASServer", "test program", "0.0" );
 
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TQString path_to_tdelibs = "/build/wynnw/kde-src";
 
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
 
     a->show();
 
-    a->applet()->setBaseURL( "file:" + path_to_tdelibs + "/tdelibs/khtml/test/" );
+    a->applet()->setBaseURL( "file:" + path_to_tdelibs + "/tdelibs/tdehtml/test/" );
     a->applet()->setAppletName( "Lake" );
     a->applet()->setAppletClass( "lake.class" );
     a->applet()->setParameter( "image", "konqi.gif" );
diff --git a/khtml/kjserrordlg.ui b/tdehtml/kjserrordlg.ui
index d5e9c7e28..d5e9c7e28 100644
--- a/khtml/kjserrordlg.ui
+++ b/tdehtml/kjserrordlg.ui
diff --git a/khtml/kjserrordlg.ui.h b/tdehtml/kjserrordlg.ui.h
index 50b73568e..50b73568e 100644
--- a/khtml/kjserrordlg.ui.h
+++ b/tdehtml/kjserrordlg.ui.h
diff --git a/khtml/libkhtml.map b/tdehtml/libtdehtml.map
index 65bafbfe2..7ffe30238 100644
--- a/khtml/libkhtml.map
+++ b/tdehtml/libtdehtml.map
@@ -17,6 +17,6 @@
     vtable*KJS::*;
     KJSProxy*;
     KJSCPUGuard*;
-    khtml::*
+    tdehtml::*
   };
 };
diff --git a/khtml/misc/CMakeLists.txt b/tdehtml/misc/CMakeLists.txt
index 3ef86c200..0babd6567 100644
--- a/khtml/misc/CMakeLists.txt
+++ b/tdehtml/misc/CMakeLists.txt
@@ -15,20 +15,20 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kutils
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
 )
 
 
-##### khtmlmisc-static ###########################
+##### tdehtmlmisc-static ###########################
 
-set( target khtmlmisc )
+set( target tdehtmlmisc )
 
 set( ${target}_SRCS
   decoder.cpp loader.cpp loader_jpeg.cpp guess_ja.cpp
diff --git a/khtml/misc/Makefile.am b/tdehtml/misc/Makefile.am
index f0dc1ab76..a26247035 100644
--- a/khtml/misc/Makefile.am
+++ b/tdehtml/misc/Makefile.am
@@ -19,22 +19,22 @@
 
 KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmlmisc.la
-libkhtmlmisc_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlmisc.la
+libtdehtmlmisc_la_SOURCES = \
 	decoder.cpp    loader.cpp loader_jpeg.cpp guess_ja.cpp\
 	htmlhashes.cpp helper.cpp arena.cpp stringit.cpp knsplugininstaller.cpp
-libkhtmlmisc_la_LIBADD = $(LIBJPEG)
-libkhtmlmisc_la_LDFLAGS = $(USER_LDFLAGS)
-libkhtmlmisc_la_METASOURCES = AUTO
+libtdehtmlmisc_la_LIBADD = $(LIBJPEG)
+libtdehtmlmisc_la_LDFLAGS = $(USER_LDFLAGS)
+libtdehtmlmisc_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
-	decoder.h khtmllayout.h loader_jpeg.h loader.h guess_ja.h\
+	decoder.h tdehtmllayout.h loader_jpeg.h loader.h guess_ja.h\
 	stringit.h htmlhashes.h helper.h shared.h arena.h knsplugininstaller.h
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \
-           -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/tdeio -I$(top_srcdir)/libltdl \
+           -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils $(all_includes)
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 ## generate lib documentation
 srcdoc:
diff --git a/khtml/misc/arena.cpp b/tdehtml/misc/arena.cpp
index 5efcaf98d..e2513ba36 100644
--- a/khtml/misc/arena.cpp
+++ b/tdehtml/misc/arena.cpp
@@ -45,7 +45,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "arena.h"
 
 #ifdef HAVE_GETPAGESIZE
@@ -61,7 +61,7 @@
 #include <stdio.h>
 #endif
 
-namespace khtml {
+namespace tdehtml {
 
 #ifdef DEBUG_ARENA_MALLOC
 static int i = 0;
diff --git a/khtml/misc/arena.h b/tdehtml/misc/arena.h
index 6415b00bb..1f9a1e69d 100644
--- a/khtml/misc/arena.h
+++ b/tdehtml/misc/arena.h
@@ -59,7 +59,7 @@
 
 typedef unsigned long uword;
 
-namespace khtml {
+namespace tdehtml {
 
 struct Arena {
     Arena* next; 	// next arena
diff --git a/khtml/misc/blocked_icon.cpp b/tdehtml/misc/blocked_icon.cpp
index 4136cd9cf..4136cd9cf 100644
--- a/khtml/misc/blocked_icon.cpp
+++ b/tdehtml/misc/blocked_icon.cpp
diff --git a/khtml/misc/blocked_icon.png b/tdehtml/misc/blocked_icon.png
index 0f545c393..0f545c393 100644
--- a/khtml/misc/blocked_icon.png
+++ b/tdehtml/misc/blocked_icon.png
diff --git a/khtml/misc/decoder.cpp b/tdehtml/misc/decoder.cpp
index f227f4014..28c8a5e9d 100644
--- a/khtml/misc/decoder.cpp
+++ b/tdehtml/misc/decoder.cpp
@@ -32,19 +32,19 @@
 #include "decoder.h"
 #include "guess_ja.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
 #include "htmlhashes.h"
 
 #include <tqregexp.h>
 #include <tqtextcodec.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <ctype.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
@@ -97,7 +97,7 @@ void Decoder::setEncoding(const char *_encoding, EncodingType type)
     if(enc == "visual") // hebrew visually ordered
         enc = "iso8859-8";
     bool b;
-    TQTextCodec *codec = KGlobal::charsets()->codecForName(enc, b);
+    TQTextCodec *codec = TDEGlobal::charsets()->codecForName(enc, b);
     if (!b)
         codec = 0;
 
@@ -351,7 +351,7 @@ TQString Decoder::decode(const char *data, int len)
                         len++;
                     }
 		    tmp[len] = 0;
-                    int id = khtml::getTagID(tmp, len);
+                    int id = tdehtml::getTagID(tmp, len);
                     if(end) id += ID_CLOSE_TAG;
 
                     switch( id ) {
diff --git a/khtml/misc/decoder.h b/tdehtml/misc/decoder.h
index 261daec90..163e44ca7 100644
--- a/khtml/misc/decoder.h
+++ b/tdehtml/misc/decoder.h
@@ -19,14 +19,14 @@
     Boston, MA 02110-1301, USA.
 
 */
-#ifndef KHTMLDECODER_H
-#define KHTMLDECODER_H
+#ifndef TDEHTMLDECODER_H
+#define TDEHTMLDECODER_H
 
 #include <tqstring.h>
 class TQTextCodec;
 class TQTextDecoder;
 
-namespace khtml {
+namespace tdehtml {
 
 class JapaneseCode;
 
diff --git a/khtml/misc/guess_ja.cpp b/tdehtml/misc/guess_ja.cpp
index 62934445b..2a4e82215 100644
--- a/khtml/misc/guess_ja.cpp
+++ b/tdehtml/misc/guess_ja.cpp
@@ -43,7 +43,7 @@
 #include "decoder.h"
 #include "guess_ja.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
 /* DFA tables */
 const dfa_table guess_eucj_st[] = {
diff --git a/khtml/misc/guess_ja.h b/tdehtml/misc/guess_ja.h
index 9dee907e6..a596d5c3a 100644
--- a/khtml/misc/guess_ja.h
+++ b/tdehtml/misc/guess_ja.h
@@ -38,7 +38,7 @@
 #ifndef GUESS_JA_H
 #define GUESS_JA_H
 
-namespace khtml {
+namespace tdehtml {
     class guess_arc {
     public:
         unsigned int next;          /* next state */
@@ -46,7 +46,7 @@ namespace khtml {
     };
 }
 
-using namespace khtml;
+using namespace tdehtml;
 
 typedef signed char dfa_table[256];
 
@@ -58,7 +58,7 @@ extern guess_arc guess_sjis_ar[6];
 extern const dfa_table guess_utf8_st[];
 extern guess_arc guess_utf8_ar[11];
 
-namespace khtml {
+namespace tdehtml {
 
     class guess_dfa {
     public:
diff --git a/khtml/misc/helper.cpp b/tdehtml/misc/helper.cpp
index 8c0b79ab5..b5191c7ca 100644
--- a/khtml/misc/helper.cpp
+++ b/tdehtml/misc/helper.cpp
@@ -21,7 +21,7 @@
  *
  */
 #include "helper.h"
-#include "khtmllayout.h"
+#include "tdehtmllayout.h"
 #include <tqmap.h>
 #include <tqpainter.h>
 #include <dom/dom_string.h>
@@ -29,18 +29,18 @@
 #include <rendering/render_object.h>
 #include <tqptrlist.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
-namespace khtml {
+namespace tdehtml {
   TQPainter *printpainter;
 }
 
-void khtml::setPrintPainter( TQPainter *printer )
+void tdehtml::setPrintPainter( TQPainter *printer )
 {
     printpainter = printer;
 }
@@ -66,7 +66,7 @@ double calcHue(double temp1, double temp2, double hueVal)
 // explanation available at http://en.wikipedia.org/wiki/HSL_color_space
 
 // all values are in the range of 0 to 1.0
-QRgb khtml::tqRgbaFromHsla(double h, double s, double l, double a)
+QRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a)
 {
     double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s;
     double temp1 = 2.0 * l - temp2;
@@ -78,7 +78,7 @@ QRgb khtml::tqRgbaFromHsla(double h, double s, double l, double a)
  * @param obj render object
  * @return the background color. It is guaranteed that a valid color is returned.
  */
-TQColor khtml::retrieveBackgroundColor(const RenderObject *obj)
+TQColor tdehtml::retrieveBackgroundColor(const RenderObject *obj)
 {
   TQColor result;
   while (!obj->isCanvas()) {
@@ -95,7 +95,7 @@ TQColor khtml::retrieveBackgroundColor(const RenderObject *obj)
 /** checks whether the given colors have enough contrast
  * @returns @p true if contrast is ok.
  */
-bool khtml::hasSufficientContrast(const TQColor &c1, const TQColor &c2)
+bool tdehtml::hasSufficientContrast(const TQColor &c1, const TQColor &c2)
 {
 // New version from Germain Garand, better suited for contrast measurement
 #if 1
diff --git a/khtml/misc/helper.h b/tdehtml/misc/helper.h
index 167a2a68e..10ffb8035 100644
--- a/khtml/misc/helper.h
+++ b/tdehtml/misc/helper.h
@@ -29,7 +29,7 @@ class TQPainter;
 
 
 
-namespace khtml
+namespace tdehtml
 {
     class RenderObject;
      const QRgb transparentColor = 0x00000000;
diff --git a/khtml/misc/htmlattrs.c b/tdehtml/misc/htmlattrs.c
index 779792e71..779792e71 100644
--- a/khtml/misc/htmlattrs.c
+++ b/tdehtml/misc/htmlattrs.c
diff --git a/khtml/misc/htmlattrs.h b/tdehtml/misc/htmlattrs.h
index d9aaff067..d9aaff067 100644
--- a/khtml/misc/htmlattrs.h
+++ b/tdehtml/misc/htmlattrs.h
diff --git a/khtml/misc/htmlattrs.in b/tdehtml/misc/htmlattrs.in
index 263b2fd7b..263b2fd7b 100644
--- a/khtml/misc/htmlattrs.in
+++ b/tdehtml/misc/htmlattrs.in
diff --git a/khtml/misc/htmlhashes.cpp b/tdehtml/misc/htmlhashes.cpp
index 593c1ce96..376007819 100644
--- a/khtml/misc/htmlhashes.cpp
+++ b/tdehtml/misc/htmlhashes.cpp
@@ -19,13 +19,13 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "htmlhashes.h"
 #include "htmltags.c"
 #include "htmlattrs.c"
 
-int khtml::getTagID(const char *tagStr, int len)
+int tdehtml::getTagID(const char *tagStr, int len)
 {
     const struct tags *tagPtr = findTag(tagStr, len);
     if (!tagPtr)
@@ -34,7 +34,7 @@ int khtml::getTagID(const char *tagStr, int len)
     return tagPtr->id;
 }
 
-int khtml::getAttrID(const char *tagStr, int len)
+int tdehtml::getAttrID(const char *tagStr, int len)
 {
     const struct attrs *tagPtr = findAttr(tagStr, len);
     if (!tagPtr)
diff --git a/khtml/misc/htmlhashes.h b/tdehtml/misc/htmlhashes.h
index bade18ffb..dfea9a289 100644
--- a/khtml/misc/htmlhashes.h
+++ b/tdehtml/misc/htmlhashes.h
@@ -5,7 +5,7 @@
 #include "htmlattrs.h"
 #include "htmltags.h"
 
-namespace khtml
+namespace tdehtml
 {
   int getTagID(const char *tagStr, int len);
   int getAttrID(const char *tagStr, int len);
diff --git a/khtml/misc/htmltags.c b/tdehtml/misc/htmltags.c
index 1342e62bf..1342e62bf 100644
--- a/khtml/misc/htmltags.c
+++ b/tdehtml/misc/htmltags.c
diff --git a/khtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index a2fb0fe55..bf9a8ded8 100644
--- a/khtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
@@ -1,11 +1,11 @@
 /* This file is automatically generated from htmltags.in by maketags, do not edit */
 /* Copyright 1999 Lars Knoll */
 
-#ifndef KHTML_TAGS_H
-#define KHTML_TAGS_H
+#ifndef TDEHTML_TAGS_H
+#define TDEHTML_TAGS_H
 
 #include "dom/dom_string.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 KDE_NO_EXPORT const char* getTagName(unsigned short id);
 
diff --git a/khtml/misc/htmltags.in b/tdehtml/misc/htmltags.in
index 9d686364a..9d686364a 100644
--- a/khtml/misc/htmltags.in
+++ b/tdehtml/misc/htmltags.in
diff --git a/khtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index f155008ee..b8b94cd6b 100644
--- a/khtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -24,11 +24,11 @@
 #include "knsplugininstaller.moc"
 
 #include <kdebug.h>
-#include <kdiroperator.h> 
-#include <klistview.h>
-#include <klocale.h>
+#include <tdediroperator.h> 
+#include <tdelistview.h>
+#include <tdelocale.h>
 #include <kstddirs.h>
-#include <ktempfile.h> 
+#include <tdetempfile.h> 
 #include <netaccess.h>
 
 #include <tqbuttongroup.h>
@@ -102,7 +102,7 @@ bool KNSPluginInstallEngine::isActive()
 {
     // check if we have a configuration key in the kde registry
     TQString pluginsListFile;
-    KConfig cfg("kcmnspluginrc", true);
+    TDEConfig cfg("kcmnspluginrc", true);
     cfg.setGroup("Misc");
     pluginsListFile = cfg.readPathEntry("PluginsListFile");
     return !pluginsListFile.isEmpty();
@@ -117,7 +117,7 @@ const TQValueList<KNSPluginInfo>& KNSPluginInstallEngine::pluginList() const
 bool KNSPluginInstallEngine::loadConfig()
 {
     TQString pluginsListFile;
-    KConfig cfg("kcmnspluginrc", true);
+    TDEConfig cfg("kcmnspluginrc", true);
     cfg.setGroup("Misc");
     pluginsListFile = cfg.readPathEntry("PluginsListFile");
     if(!pluginsListFile.isEmpty())
@@ -136,7 +136,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
     if(m_pluginsXmlConfig.isEmpty())
     {
         TQString tmpFile;
-        if(KIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
+        if(TDEIO::NetAccess::download(m_pluginsListFileURL, tmpFile, NULL)) {
             TQFile f(tmpFile);
             if(!f.open(IO_ReadOnly))
                 return false;
@@ -144,7 +144,7 @@ bool KNSPluginInstallEngine::loadXmlConfig()
             stream.setEncoding(TQTextStream::UnicodeUTF8);
             m_pluginsXmlConfig = stream.read();
             f.close();
-            KIO::NetAccess::removeTempFile(tmpFile);
+            TDEIO::NetAccess::removeTempFile(tmpFile);
         } else
             return false;
     }
@@ -232,20 +232,20 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info)
     tempFile.unlink();
     tempFile.close();
     // start the download job
-    m_downloadJob  = KIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
+    m_downloadJob  = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
     // connect signals 
-    connect(m_downloadJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(KIO::Job *, unsigned long)));
-    connect(m_downloadJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDownloadResult(KIO::Job *)) );
+    connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long)));
+    connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) );
     kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl;
 } 
 
-void KNSPluginInstallEngine::slotDownLoadProgress(KIO::Job *, unsigned long percent)
+void KNSPluginInstallEngine::slotDownLoadProgress(TDEIO::Job *, unsigned long percent)
 { 
     // propagate the download progression
     emit installProgress( ((int)percent)/3 );
 }
 
-void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
+void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job)
 { 
     // test if the download job suceed
     if(job->error()) {
@@ -279,9 +279,9 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
        for( it = pluginFileList.begin(); it != pluginFileList.end(); ++it ) {
            urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) );
         }
-       m_installFileJob  = KIO::copy(urlList , destURL, false );
-       connect(m_installFileJob, TQT_SIGNAL(percent (KIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(KIO::Job *, unsigned long)));
-       connect(m_installFileJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotCopyResult(KIO::Job *)) );
+       m_installFileJob  = TDEIO::copy(urlList , destURL, false );
+       connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long)));
+       connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) );
     }
     kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl;
 
@@ -289,13 +289,13 @@ void KNSPluginInstallEngine::slotDownloadResult(KIO::Job *job)
     m_downloadJob = NULL;
 }
 
-void KNSPluginInstallEngine::slotCopyProgress(KIO::Job *, unsigned long percent)
+void KNSPluginInstallEngine::slotCopyProgress(TDEIO::Job *, unsigned long percent)
 {
     // propagate the download progression
     emit installProgress( ((int)percent)/3 + 33 );
 } 
  
-void KNSPluginInstallEngine::slotCopyResult(KIO::Job *job)
+void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job)
 {
     // test if the download job suceed
     if(job->error()) {
@@ -376,7 +376,7 @@ void KNSPluginWizard::initConfirmationPage()
 
         m_confirmationVBox = new TQVBox(this);
         new TQLabel(i18n("The following plugins are available."), m_confirmationVBox);
-        m_pluginListView = new KListView(m_confirmationVBox);        
+        m_pluginListView = new TDEListView(m_confirmationVBox);        
         m_pluginListView->addColumn(i18n("Name"));
         m_pluginListView->setSelectionMode(TQListView::Single);
         new TQLabel(i18n("Click on next to install the selected plugin."), m_confirmationVBox);
@@ -501,14 +501,14 @@ void KNSPluginWizard::showPage(TQWidget *page)
         TQString tmpFile;
         if(info.licenceURL().isValid()) 
             // retrieve the licence if we have an url
-            if(KIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
+            if(TDEIO::NetAccess::download(info.licenceURL(), tmpFile, NULL)) {
                     TQFile f(tmpFile);
                     if(f.open(IO_ReadOnly)) {
                         TQTextStream stream(&f);
                         stream.setEncoding(TQTextStream::UnicodeUTF8);
                         licence  = stream.read();
                         f.close();
-                        KIO::NetAccess::removeTempFile(tmpFile);
+                        TDEIO::NetAccess::removeTempFile(tmpFile);
                     }
              } 
         // else display the licence found in the xml config
diff --git a/khtml/misc/knsplugininstaller.h b/tdehtml/misc/knsplugininstaller.h
index 0910a685b..f8caedf92 100644
--- a/khtml/misc/knsplugininstaller.h
+++ b/tdehtml/misc/knsplugininstaller.h
@@ -138,8 +138,8 @@ private:
     KMimeType::Ptr m_mime;
     KURL m_pluginsListFileURL;
     TQString m_tmpPluginFileName;
-    KIO::CopyJob *m_downloadJob;
-    KIO::CopyJob *m_installFileJob;
+    TDEIO::CopyJob *m_downloadJob;
+    TDEIO::CopyJob *m_installFileJob;
     KNSPluginInfo m_toInstallPluginInfo;
     TQProcess *m_scanProc;
     
@@ -151,12 +151,12 @@ signals:
    
 private slots:
     // Used to monitor the plugin downloading
-    void slotDownLoadProgress(KIO::Job *job, unsigned long percent);
-    void slotDownloadResult(KIO::Job *job);
+    void slotDownLoadProgress(TDEIO::Job *job, unsigned long percent);
+    void slotDownloadResult(TDEIO::Job *job);
     
     // Used to monitor the plugin installation
-    void slotCopyProgress(KIO::Job *job, unsigned long percent);
-    void slotCopyResult(KIO::Job *job);
+    void slotCopyProgress(TDEIO::Job *job, unsigned long percent);
+    void slotCopyResult(TDEIO::Job *job);
 
     // Used to monitor the plugins scan
     void readScanProcFromStdout();
@@ -222,7 +222,7 @@ private:
     TQWidget *m_finishWidget;
     
     // plugin list
-    KListView *m_pluginListView;
+    TDEListView *m_pluginListView;
     
     // licence stuff
     TQLabel *m_licencePageLabel;
diff --git a/khtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 7b085aab9..7621b5e4f 100644
--- a/khtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -56,22 +56,22 @@
 #include <tqmovie.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeglobal.h>
 #include <kimageio.h>
 #include <kcharsets.h>
 #include <kiconloader.h>
 #include <scheduler.h>
 #include <kdebug.h>
-#include "khtml_factory.h"
-#include "khtml_part.h"
+#include "tdehtml_factory.h"
+#include "tdehtml_part.h"
 
 #ifdef IMAGE_TITLES
 #include <tqfile.h>
-#include <kfilemetainfo.h>
-#include <ktempfile.h>
+#include <tdefilemetainfo.h>
+#include <tdetempfile.h>
 #endif
 
 #include "html/html_documentimpl.h"
@@ -80,7 +80,7 @@
 
 #include "blocked_icon.cpp"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 #define MAX_LRU_LISTS 20
@@ -194,7 +194,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte
     // Link or @charset
     if(!charset.isEmpty())
     {
-	TQTextCodec* c = KGlobal::charsets()->codecForName(charset);
+	TQTextCodec* c = TDEGlobal::charsets()->codecForName(charset);
         if(c->mibEnum() == 11)  {
             // iso8859-8 (visually ordered)
             c = TQTextCodec::codecForName("iso8859-8-i");
@@ -208,7 +208,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte
 
 // -------------------------------------------------------------------------------------------
 
-CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy,
+CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy,
 					 const char *accept)
     : CachedObject(url, CSSStyleSheet, _cachePolicy, 0)
 {
@@ -227,7 +227,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI
 }
 
 CachedCSSStyleSheet::CachedCSSStyleSheet(const DOMString &url, const TQString &stylesheet_data)
-    : CachedObject(url, CSSStyleSheet, KIO::CC_Verify, stylesheet_data.length())
+    : CachedObject(url, CSSStyleSheet, TDEIO::CC_Verify, stylesheet_data.length())
 {
     m_loading = false;
     m_status = Persistent;
@@ -256,7 +256,7 @@ void CachedCSSStyleSheet::data( TQBuffer &buffer, bool eof )
 //     TQString charset = checkCharset( buffer.buffer() );
     TQTextCodec* c = 0;
     if (!m_charset.isEmpty()) {
-        c = KGlobal::charsets()->codecForName(m_charset);
+        c = TDEGlobal::charsets()->codecForName(m_charset);
         if(c->mibEnum() == 11)  c = TQTextCodec::codecForName("iso8859-8-i");
     }
     else {
@@ -321,7 +321,7 @@ TQString CachedCSSStyleSheet::checkCharset(const TQByteArray& buffer ) const
 
 // -------------------------------------------------------------------------------------------
 
-CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
+CachedScript::CachedScript(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*)
     : CachedObject(url, Script, _cachePolicy, 0)
 {
     // It's javascript we want.
@@ -334,7 +334,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro
 }
 
 CachedScript::CachedScript(const DOMString &url, const TQString &script_data)
-    : CachedObject(url, Script, KIO::CC_Verify, script_data.length())
+    : CachedObject(url, Script, TDEIO::CC_Verify, script_data.length())
 {
     m_loading = false;
     m_status = Persistent;
@@ -377,7 +377,7 @@ void CachedScript::error( int /*err*/, const char* /*text*/ )
 
 // ------------------------------------------------------------------------------------------
 
-namespace khtml
+namespace tdehtml
 {
 
 class ImageSource : public TQDataSource
@@ -466,10 +466,10 @@ static TQString buildAcceptHeader()
 
 // -------------------------------------------------------------------------------------
 
-CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
+CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*)
     : TQObject(), CachedObject(url, Image, _cachePolicy, 0)
 {
-    static const TQString &acceptHeader = KGlobal::staticQString( buildAcceptHeader() );
+    static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() );
 
     m = 0;
     p = 0;
@@ -486,7 +486,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl
     setAccept( acceptHeader );
     m_showAnimations = dl->showAnimations();
 
-    if ( KHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
+    if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
         m_wasBlocked = true;
         CachedObject::finish();
     }
@@ -735,13 +735,13 @@ void CachedImage::movieStatus(int status)
     }
 
     if((status == TQMovie::EndOfMovie && (!m || m->frameNumber() <= 1)) ||
-       ((status == TQMovie::EndOfLoop) && (m_showAnimations == KHTMLSettings::KAnimationLoopOnce)) ||
-       ((status == TQMovie::EndOfFrame) && (m_showAnimations == KHTMLSettings::KAnimationDisabled))
+       ((status == TQMovie::EndOfLoop) && (m_showAnimations == TDEHTMLSettings::KAnimationLoopOnce)) ||
+       ((status == TQMovie::EndOfFrame) && (m_showAnimations == TDEHTMLSettings::KAnimationDisabled))
       )
     {
         if(imgSource)
         {
-            setShowAnimations( KHTMLSettings::KAnimationDisabled );
+            setShowAnimations( TDEHTMLSettings::KAnimationDisabled );
 
             // monochrome alphamasked images are usually about 10000 times
             // faster to draw, so this is worth the hack
@@ -779,10 +779,10 @@ void CachedImage::movieResize(const TQSize& /*s*/)
     do_notify(m->framePixmap(), TQRect());
 }
 
-void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
+void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations )
 {
     m_showAnimations = showAnimations;
-    if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) {
+    if ( (m_showAnimations == TDEHTMLSettings::KAnimationDisabled) && imgSource ) {
         imgSource->cleanBuffer();
         delete p;
         p = new TQPixmap(m->framePixmap());
@@ -941,13 +941,13 @@ Request::~Request()
 
 // ------------------------------------------------------------------------------------------
 
-DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc)
+DocLoader::DocLoader(TDEHTMLPart* part, DocumentImpl* doc)
 {
-    m_cachePolicy = KIO::CC_Verify;
+    m_cachePolicy = TDEIO::CC_Verify;
     m_expireDate = 0;
     m_creationDate = time(0);
     m_bautoloadImages = true;
-    m_showAnimations = KHTMLSettings::KAnimationEnabled;
+    m_showAnimations = TDEHTMLSettings::KAnimationEnabled;
     m_part = part;
     m_doc = doc;
 
@@ -985,13 +985,13 @@ void DocLoader::insertCachedObject( CachedObject* o ) const
         return;
     m_docObjects.insert( o, o );
     if ( m_docObjects.count() > 3 * m_docObjects.size() )
-        m_docObjects.resize(khtml::nextSeed( m_docObjects.size() ) );
+        m_docObjects.resize(tdehtml::nextSeed( m_docObjects.size() ) );
 }
 
 bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
 {
     bool reload = false;
-    if (m_cachePolicy == KIO::CC_Verify)
+    if (m_cachePolicy == TDEIO::CC_Verify)
     {
        if (!m_reloadedURLs.contains(fullURL))
        {
@@ -1003,7 +1003,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
           }
        }
     }
-    else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh))
+    else if ((m_cachePolicy == TDEIO::CC_Reload) || (m_cachePolicy == TDEIO::CC_Refresh))
     {
        if (!m_reloadedURLs.contains(fullURL))
        {
@@ -1052,8 +1052,8 @@ CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, co
 CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const TQString& charset)
 {
     DOCLOADER_SECCHECK(true);
-    if ( ! KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) ||
-           KHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url()))
+    if ( ! TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) ||
+           TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url()))
 	return 0L;
 
     CachedScript* s = Cache::requestObject<CachedScript, CachedObject::Script>( this, fullURL, 0 );
@@ -1086,7 +1086,7 @@ void DocLoader::setAutoloadImages( bool enable )
         }
 }
 
-void DocLoader::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
+void DocLoader::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations )
 {
     if ( showAnimations == m_showAnimations ) return;
     m_showAnimations = showAnimations;
@@ -1153,16 +1153,16 @@ void Loader::servePendingRequests()
 #endif
 
         KURL u(req->object->url().string());
-        KIO::TransferJob* job = KIO::get( u, false, false /*no GUI*/);
+        TDEIO::TransferJob* job = TDEIO::get( u, false, false /*no GUI*/);
 
-        job->addMetaData("cache", KIO::getCacheControlString(req->object->cachePolicy()));
+        job->addMetaData("cache", TDEIO::getCacheControlString(req->object->cachePolicy()));
         if (!req->object->accept().isEmpty())
             job->addMetaData("accept", req->object->accept());
         if ( req->m_docLoader )
         {
             job->addMetaData( "referrer",  req->m_docLoader->doc()->URL().url() );
 
-            KHTMLPart *part = req->m_docLoader->part();
+            TDEHTMLPart *part = req->m_docLoader->part();
             if (part )
             {
                 job->addMetaData( "cross-domain", part->toplevelURL().url() );
@@ -1171,21 +1171,21 @@ void Loader::servePendingRequests()
             }
         }
 
-        connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotFinished( KIO::Job * ) ) );
-        connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)),
-                 TQT_SLOT( slotData( KIO::Job*, const TQByteArray &)));
+        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) );
+        connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+                 TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
 
         if ( req->object->schedule() )
-            KIO::Scheduler::scheduleJob( job );
+            TDEIO::Scheduler::scheduleJob( job );
 
         m_requestsLoading.insert(job, req);
     }
 }
 
-void Loader::slotFinished( KIO::Job* job )
+void Loader::slotFinished( TDEIO::Job* job )
 {
   Request *r = m_requestsLoading.take( job );
-  KIO::TransferJob* j = static_cast<KIO::TransferJob*>(job);
+  TDEIO::TransferJob* j = static_cast<TDEIO::TransferJob*>(job);
 
   if ( !r )
     return;
@@ -1247,7 +1247,7 @@ void Loader::slotFinished( KIO::Job* job )
       m_timer.start(0, true);
 }
 
-void Loader::slotData( KIO::Job*job, const TQByteArray &data )
+void Loader::slotData( TDEIO::Job*job, const TQByteArray &data )
 {
     Request *r = m_requestsLoading[job];
     if(!r) {
@@ -1303,7 +1303,7 @@ void Loader::cancelRequests( DocLoader* dl )
         if ( lIt.current()->m_docLoader == dl )
         {
             //kdDebug( 6060 ) << "canceling loading request for " << lIt.current()->object->url().string() << endl;
-            KIO::Job *job = static_cast<KIO::Job *>( lIt.currentKey() );
+            TDEIO::Job *job = static_cast<TDEIO::Job *>( lIt.currentKey() );
             Cache::removeCacheEntry( lIt.current()->object );
             m_requestsLoading.remove( lIt.currentKey() );
             job->kill();
@@ -1314,7 +1314,7 @@ void Loader::cancelRequests( DocLoader* dl )
     }
 }
 
-KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
+TDEIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
 {
     TQPtrDictIterator<Request> it( m_requestsLoading );
 
@@ -1323,7 +1323,7 @@ KIO::Job *Loader::jobForRequest( const DOM::DOMString &url ) const
         CachedObject *obj = it.current()->object;
 
         if ( obj && obj->url() == url )
-            return static_cast<KIO::Job *>( it.currentKey() );
+            return static_cast<TDEIO::Job *>( it.currentKey() );
     }
 
     return 0;
@@ -1356,7 +1356,7 @@ void Cache::init()
         nullPixmap = new TQPixmap;
 
     if ( !brokenPixmap )
-        brokenPixmap = new TQPixmap(KHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState));
+        brokenPixmap = new TQPixmap(TDEHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", TDEIcon::Desktop, 16, TDEIcon::DisabledState));
 
     if ( !blockedPixmap ) {
         blockedPixmap = new TQPixmap();
@@ -1424,7 +1424,7 @@ void Cache::clear()
 template<typename CachedObjectType, enum CachedObject::Type CachedType>
 CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const char* accept )
 {
-    KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify;
+    TDEIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : TDEIO::CC_Verify;
 
     TQString url = kurl.url();
     CachedObject* o = cache->find(url);
diff --git a/khtml/misc/loader.h b/tdehtml/misc/loader.h
index e950f1767..f885ec33e 100644
--- a/khtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -23,8 +23,8 @@
     This class provides all functionality needed for loading images, style sheets and html
     pages from the web. It has a memory cache for these objects.
 */
-#ifndef _khtml_loader_h
-#define _khtml_loader_h
+#ifndef _tdehtml_loader_h
+#define _tdehtml_loader_h
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -49,15 +49,15 @@
 #include <tqtimer.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 #include <dom/dom_string.h>
 
 class TQMovie;
-class KHTMLPart;
+class TDEHTMLPart;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class TransferJob;
 }
@@ -68,7 +68,7 @@ namespace DOM
     class DocumentImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
     class CachedObject;
     class Request;
@@ -99,7 +99,7 @@ namespace khtml
 	    Cached        // regular case
 	};
 
-	CachedObject(const DOM::DOMString &url, Type type, KIO::CacheControl _cachePolicy, int size)
+	CachedObject(const DOM::DOMString &url, Type type, TDEIO::CacheControl _cachePolicy, int size)
             : m_url(url), m_type(type), m_cachePolicy(_cachePolicy),
               m_expireDate(0), m_size(size)
 	{
@@ -140,7 +140,7 @@ namespace khtml
 
         bool free() const { return m_free; }
 
-        KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
+        TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
 
         void setRequest(Request *_request);
 
@@ -169,7 +169,7 @@ namespace khtml
 	Type m_type;
 	Status m_status;
         int m_accessCount;
-	KIO::CacheControl m_cachePolicy;
+	TDEIO::CacheControl m_cachePolicy;
 	time_t m_expireDate;
 	int m_size;
         bool m_deleted : 1;
@@ -183,7 +183,7 @@ namespace khtml
         CachedObject* m_next;
         CachedObject* m_prev;
         friend class Cache;
-        friend class ::KHTMLPart;
+        friend class ::TDEHTMLPart;
     };
 
 
@@ -195,7 +195,7 @@ namespace khtml
     class CachedCSSStyleSheet : public CachedObject
     {
     public:
-	CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy,
+	CachedCSSStyleSheet(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy,
 			    const char *accept);
 	CachedCSSStyleSheet(const DOM::DOMString &url, const TQString &stylesheet_data);
 
@@ -226,7 +226,7 @@ namespace khtml
     class CachedScript : public CachedObject
     {
     public:
-	CachedScript(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept );
+	CachedScript(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept );
 	CachedScript(const DOM::DOMString &url, const TQString &script_data);
 
 	const DOM::DOMString &script() const { return m_script; }
@@ -257,7 +257,7 @@ namespace khtml
     {
 	Q_OBJECT
     public:
-	CachedImage(DocLoader* dl, const DOM::DOMString &url, KIO::CacheControl cachePolicy, const char* accept);
+	CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept);
 	virtual ~CachedImage();
 
 	const TQPixmap &pixmap() const;
@@ -286,7 +286,7 @@ namespace khtml
         const TQString& suggestedTitle() const { return m_suggestedFilename; }
 #endif
 
-        void setShowAnimations( KHTMLSettings::KAnimationAdvice );
+        void setShowAnimations( TDEHTMLSettings::KAnimationAdvice );
         void pauseAnimations();
         void resumeAnimations();
 
@@ -331,10 +331,10 @@ namespace khtml
 	bool typeChecked : 1;
         bool isFullyTransparent : 1;
         bool monochrome : 1;
-        KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
+        TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2;
 
         friend class Cache;
-        friend class ::KHTMLPart;
+        friend class ::TDEHTMLPart;
     };
 
     /**
@@ -345,7 +345,7 @@ namespace khtml
     class DocLoader
     {
     public:
- 	DocLoader(KHTMLPart*, DOM::DocumentImpl*);
+ 	DocLoader(TDEHTMLPart*, DOM::DocumentImpl*);
  	~DocLoader();
 
 	CachedImage *requestImage( const DOM::DOMString &url);
@@ -354,17 +354,17 @@ namespace khtml
         CachedScript *requestScript( const DOM::DOMString &url, const TQString& charset);
 
 	bool autoloadImages() const { return m_bautoloadImages; }
-        KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
-        KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
+        TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
+        TDEHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
         time_t expireDate() const { return m_expireDate; }
-        KHTMLPart* part() const { return m_part; }
+        TDEHTMLPart* part() const { return m_part; }
         DOM::DocumentImpl* doc() const { return m_doc; }
 
         void setCacheCreationDate( time_t );
         void setExpireDate( time_t, bool relative );
         void setAutoloadImages( bool );
-        void setCachePolicy( KIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
-        void setShowAnimations( KHTMLSettings::KAnimationAdvice );
+        void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
+        void setShowAnimations( TDEHTMLSettings::KAnimationAdvice );
         void pauseAnimations();
         void resumeAnimations();
         void insertCachedObject( CachedObject* o ) const;
@@ -375,16 +375,16 @@ namespace khtml
 
         friend class Cache;
         friend class DOM::DocumentImpl;
-        friend class ::KHTMLPart;
+        friend class ::TDEHTMLPart;
 
         TQStringList m_reloadedURLs;
         mutable TQPtrDict<CachedObject> m_docObjects;
 	time_t m_expireDate;
 	time_t m_creationDate;
-	KIO::CacheControl m_cachePolicy;
+	TDEIO::CacheControl m_cachePolicy;
         bool m_bautoloadImages : 1;
-        KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
-        KHTMLPart* m_part;
+        TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2;
+        TDEHTMLPart* m_part;
         DOM::DocumentImpl* m_doc;
     };
 
@@ -418,16 +418,16 @@ namespace khtml
         void cancelRequests( DocLoader* dl );
 
         // may return 0L
-        KIO::Job *jobForRequest( const DOM::DOMString &url ) const;
+        TDEIO::Job *jobForRequest( const DOM::DOMString &url ) const;
 
     signals:
-        void requestStarted( khtml::DocLoader* dl, khtml::CachedObject* obj );
-	void requestDone( khtml::DocLoader* dl, khtml::CachedObject *obj );
-	void requestFailed( khtml::DocLoader* dl, khtml::CachedObject *obj );
+        void requestStarted( tdehtml::DocLoader* dl, tdehtml::CachedObject* obj );
+	void requestDone( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj );
+	void requestFailed( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj );
 
     protected slots:
-	void slotFinished( KIO::Job * );
-	void slotData( KIO::Job *, const TQByteArray & );
+	void slotFinished( TDEIO::Job * );
+	void slotData( TDEIO::Job *, const TQByteArray & );
 	void servePendingRequests();
 
     protected:
diff --git a/khtml/misc/loader_client.h b/tdehtml/misc/loader_client.h
index 3e28f7e56..d61a52b51 100644
--- a/khtml/misc/loader_client.h
+++ b/tdehtml/misc/loader_client.h
@@ -4,7 +4,7 @@
 #include <tqpixmap.h>
 #include "dom/dom_string.h"
 
-namespace khtml {
+namespace tdehtml {
     class CachedObject;
     class CachedImage;
 
diff --git a/khtml/misc/loader_jpeg.cpp b/tdehtml/misc/loader_jpeg.cpp
index 15057e0be..9ee5378f9 100644
--- a/khtml/misc/loader_jpeg.cpp
+++ b/tdehtml/misc/loader_jpeg.cpp
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <setjmp.h>
 #include <tqdatetime.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 extern "C" {
 #define XMD_H
@@ -54,16 +54,16 @@ extern "C" {
 
 // -----------------------------------------------------------------------------
 
-struct khtml_error_mgr : public jpeg_error_mgr {
+struct tdehtml_error_mgr : public jpeg_error_mgr {
     jmp_buf setjmp_buffer;
 };
 
 extern "C" {
 
     static
-    void khtml_error_exit (j_common_ptr cinfo)
+    void tdehtml_error_exit (j_common_ptr cinfo)
     {
-        khtml_error_mgr* myerr = (khtml_error_mgr*) cinfo->err;
+        tdehtml_error_mgr* myerr = (tdehtml_error_mgr*) cinfo->err;
         char buffer[JMSG_LENGTH_MAX];
         (*cinfo->err->format_message)(cinfo, buffer);
 #ifdef JPEG_DEBUG
@@ -76,7 +76,7 @@ extern "C" {
 static const int max_buf = 32768;
 static const int max_consumingtime = 2000;
 
-struct khtml_jpeg_source_mgr : public jpeg_source_mgr {
+struct tdehtml_jpeg_source_mgr : public jpeg_source_mgr {
     JOCTET buffer[max_buf];
 
     int valid_buffer_len;
@@ -90,25 +90,25 @@ struct khtml_jpeg_source_mgr : public jpeg_source_mgr {
     bool do_progressive;
 
 public:
-    khtml_jpeg_source_mgr() KDE_NO_EXPORT;
+    tdehtml_jpeg_source_mgr() KDE_NO_EXPORT;
 };
 
 
 extern "C" {
 
     static
-    void khtml_j_decompress_dummy(j_decompress_ptr)
+    void tdehtml_j_decompress_dummy(j_decompress_ptr)
     {
     }
 
     static
-    boolean khtml_fill_input_buffer(j_decompress_ptr cinfo)
+    boolean tdehtml_fill_input_buffer(j_decompress_ptr cinfo)
     {
 #ifdef BUFFER_DEBUG
-        tqDebug("khtml_fill_input_buffer called!");
+        tqDebug("tdehtml_fill_input_buffer called!");
 #endif
 
-        khtml_jpeg_source_mgr* src = (khtml_jpeg_source_mgr*)cinfo->src;
+        tdehtml_jpeg_source_mgr* src = (tdehtml_jpeg_source_mgr*)cinfo->src;
 
         if ( src->ateof )
         {
@@ -127,16 +127,16 @@ extern "C" {
     }
 
     static
-    void khtml_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
+    void tdehtml_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
     {
         if(num_bytes <= 0)
             return; /* required noop */
 
 #ifdef BUFFER_DEBUG
-        tqDebug("khtml_skip_input_data (%d) called!", num_bytes);
+        tqDebug("tdehtml_skip_input_data (%d) called!", num_bytes);
 #endif
 
-        khtml_jpeg_source_mgr* src = (khtml_jpeg_source_mgr*)cinfo->src;
+        tdehtml_jpeg_source_mgr* src = (tdehtml_jpeg_source_mgr*)cinfo->src;
         src->skip_input_bytes += num_bytes;
 
         unsigned int skipbytes = kMin(src->bytes_in_buffer, src->skip_input_bytes);
@@ -166,13 +166,13 @@ extern "C" {
 }
 
 
-khtml_jpeg_source_mgr::khtml_jpeg_source_mgr()
+tdehtml_jpeg_source_mgr::tdehtml_jpeg_source_mgr()
 {
-    jpeg_source_mgr::init_source = khtml_j_decompress_dummy;
-    jpeg_source_mgr::fill_input_buffer = khtml_fill_input_buffer;
-    jpeg_source_mgr::skip_input_data = khtml_skip_input_data;
+    jpeg_source_mgr::init_source = tdehtml_j_decompress_dummy;
+    jpeg_source_mgr::fill_input_buffer = tdehtml_fill_input_buffer;
+    jpeg_source_mgr::skip_input_data = tdehtml_skip_input_data;
     jpeg_source_mgr::resync_to_restart = jpeg_resync_to_restart;
-    jpeg_source_mgr::term_source = khtml_j_decompress_dummy;
+    jpeg_source_mgr::term_source = tdehtml_j_decompress_dummy;
     bytes_in_buffer = 0;
     valid_buffer_len = 0;
     skip_input_bytes = 0;
@@ -211,8 +211,8 @@ private:
 
     // structs for the jpeglib
     struct jpeg_decompress_struct cinfo;
-    struct khtml_error_mgr jerr;
-    struct khtml_jpeg_source_mgr jsrc;
+    struct tdehtml_error_mgr jerr;
+    struct tdehtml_jpeg_source_mgr jsrc;
 };
 
 
@@ -224,7 +224,7 @@ KJPEGFormat::KJPEGFormat()
     cinfo.err = jpeg_std_error(&jerr);
     jpeg_create_decompress(&cinfo);
     cinfo.err = jpeg_std_error(&jerr);
-    jerr.error_exit = khtml_error_exit;
+    jerr.error_exit = tdehtml_error_exit;
     cinfo.src = &jsrc;
     state = Init;
 }
@@ -521,7 +521,7 @@ again:
 // -----------------------------------------------------------------------------
 // This is the factory that teaches TQt about progressive JPEG's
 
-TQImageFormat* khtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, int length)
+TQImageFormat* tdehtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, int length)
 {
     if(length < 3) return 0;
 
@@ -533,14 +533,14 @@ TQImageFormat* khtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, i
     return 0;
 }
 
-const char* khtml::KJPEGFormatType::formatName() const
+const char* tdehtml::KJPEGFormatType::formatName() const
 {
     return "JPEG";
 }
 
 #else
 #ifdef __GNUC__
-#warning You don't seem to have libJPEG. jpeg support in khtml won't work
+#warning You don't seem to have libJPEG. jpeg support in tdehtml won't work
 #endif
 #endif // HAVE_LIBJPEG
 
diff --git a/khtml/misc/loader_jpeg.h b/tdehtml/misc/loader_jpeg.h
index 87b18a8b5..568a29d44 100644
--- a/khtml/misc/loader_jpeg.h
+++ b/tdehtml/misc/loader_jpeg.h
@@ -23,12 +23,12 @@
     This is a helper for progressive loading of JPEG's. 
 */
 
-#ifndef _khtml_loader_jpeg_h
-#define _khtml_loader_jpeg_h
+#ifndef _tdehtml_loader_jpeg_h
+#define _tdehtml_loader_jpeg_h
 
 #include <tqasyncimageio.h>
 
-namespace khtml
+namespace tdehtml
 {
     /**
      * @internal
@@ -47,4 +47,4 @@ namespace khtml
 
 // -----------------------------------------------------------------------------
 
-#endif // _khtml_loader_jpeg_h
+#endif // _tdehtml_loader_jpeg_h
diff --git a/khtml/misc/makeattrs b/tdehtml/misc/makeattrs
index 48a02c045..935f350bd 100644
--- a/khtml/misc/makeattrs
+++ b/tdehtml/misc/makeattrs
@@ -22,7 +22,7 @@
 #
 #----------------------------------------------------------------------------
 #
-#  KDE HTML Widget -- Script to generate khtmlattrs.c and khtmlattrs.h
+#  KDE HTML Widget -- Script to generate tdehtmlattrs.c and tdehtmlattrs.h
 #
 open IN, "htmlattrs.in"
   or die "Can't open in\n";
diff --git a/khtml/misc/maketags b/tdehtml/misc/maketags
index a460cf8e4..8a6abf0ed 100644
--- a/khtml/misc/maketags
+++ b/tdehtml/misc/maketags
@@ -37,11 +37,11 @@ print header <<EOF;
 /* This file is automatically generated from htmltags.in by maketags, do not edit */
 /* Copyright 1999 Lars Knoll */
 
-#ifndef KHTML_TAGS_H
-#define KHTML_TAGS_H
+#ifndef TDEHTML_TAGS_H
+#define TDEHTML_TAGS_H
 
 #include "dom/dom_string.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 KDE_NO_EXPORT const char* getTagName(unsigned short id);
 
diff --git a/khtml/misc/multimap.h b/tdehtml/misc/multimap.h
index 125e8e07d..125e8e07d 100644
--- a/khtml/misc/multimap.h
+++ b/tdehtml/misc/multimap.h
diff --git a/khtml/misc/seed.h b/tdehtml/misc/seed.h
index e491cbaae..3041d1d95 100644
--- a/khtml/misc/seed.h
+++ b/tdehtml/misc/seed.h
@@ -23,9 +23,9 @@
 #ifndef html_seed_h
 #define html_seed_h
 
-#define khtml_MaxSeed 47963
+#define tdehtml_MaxSeed 47963
 
-namespace khtml {
+namespace tdehtml {
 
 static const int primes_t[] =
 {
diff --git a/khtml/misc/shared.h b/tdehtml/misc/shared.h
index 7dfd95ed0..d99b327c6 100644
--- a/khtml/misc/shared.h
+++ b/tdehtml/misc/shared.h
@@ -23,7 +23,7 @@
 #ifndef SHARED_H
 #define SHARED_H
 
-namespace khtml {
+namespace tdehtml {
 
 template<class type> class Shared
 {
diff --git a/khtml/misc/stringit.cpp b/tdehtml/misc/stringit.cpp
index 9b8fc5899..f4bea427f 100644
--- a/khtml/misc/stringit.cpp
+++ b/tdehtml/misc/stringit.cpp
@@ -21,7 +21,7 @@
 
 #include "stringit.h"
 
-namespace khtml {
+namespace tdehtml {
 
 uint TokenizerString::length() const
 {
diff --git a/khtml/misc/stringit.h b/tdehtml/misc/stringit.h
index 789f22af8..74cdd471e 100644
--- a/khtml/misc/stringit.h
+++ b/tdehtml/misc/stringit.h
@@ -23,8 +23,8 @@
 //
 // KDE HTML Widget -- String class
 
-#ifndef KHTMLSTRING_H
-#define KHTMLSTRING_H
+#ifndef TDEHTMLSTRING_H
+#define TDEHTMLSTRING_H
 
 #include "dom/dom_string.h"
 
@@ -35,7 +35,7 @@
 
 using namespace DOM;
 
-namespace khtml
+namespace tdehtml
 {
 
 class DOMStringIt
diff --git a/khtml/misc/khtmllayout.h b/tdehtml/misc/tdehtmllayout.h
index 1049d10c4..524cc5e74 100644
--- a/khtml/misc/khtmllayout.h
+++ b/tdehtml/misc/tdehtmllayout.h
@@ -28,7 +28,7 @@
  * this namespace contains definitions for various types needed for
  * layouting.
  */
-namespace khtml
+namespace tdehtml
 {
 
     const int UNDEFINED = -1;
diff --git a/khtml/pics/CMakeLists.txt b/tdehtml/pics/CMakeLists.txt
index 49e567671..17390707c 100644
--- a/khtml/pics/CMakeLists.txt
+++ b/tdehtml/pics/CMakeLists.txt
@@ -13,7 +13,7 @@
 
 tde_install_icons(
     bug images_display wallet_open
-  DESTINATION ${DATA_INSTALL_DIR}/khtml/icons )
+  DESTINATION ${DATA_INSTALL_DIR}/tdehtml/icons )
 
 tde_install_icons(
     dbgnext dbgrun dbgrunto dbgstep
diff --git a/khtml/pics/Makefile.am b/tdehtml/pics/Makefile.am
index 7914ee158..7477bfd51 100644
--- a/khtml/pics/Makefile.am
+++ b/tdehtml/pics/Makefile.am
@@ -1,5 +1,5 @@
-khtmliconsdir = $(kde_datadir)/khtml/icons
-khtmlicons_ICON = bug \
+tdehtmliconsdir = $(kde_datadir)/tdehtml/icons
+tdehtmlicons_ICON = bug \
                   images_display \
                   wallet_open
 
diff --git a/khtml/pics/cr128-action-bug.png b/tdehtml/pics/cr128-action-bug.png
index a39081d9a..a39081d9a 100644
--- a/khtml/pics/cr128-action-bug.png
+++ b/tdehtml/pics/cr128-action-bug.png
diff --git a/khtml/pics/cr16-action-bug.png b/tdehtml/pics/cr16-action-bug.png
index 827d5f8e6..827d5f8e6 100644
--- a/khtml/pics/cr16-action-bug.png
+++ b/tdehtml/pics/cr16-action-bug.png
diff --git a/khtml/pics/cr16-action-images_display.png b/tdehtml/pics/cr16-action-images_display.png
index 66f550e7a..66f550e7a 100644
--- a/khtml/pics/cr16-action-images_display.png
+++ b/tdehtml/pics/cr16-action-images_display.png
diff --git a/khtml/pics/cr16-action-wallet_open.png b/tdehtml/pics/cr16-action-wallet_open.png
index f0d309834..f0d309834 100644
--- a/khtml/pics/cr16-action-wallet_open.png
+++ b/tdehtml/pics/cr16-action-wallet_open.png
diff --git a/khtml/pics/cr22-action-bug.png b/tdehtml/pics/cr22-action-bug.png
index 3a3d1ea2b..3a3d1ea2b 100644
--- a/khtml/pics/cr22-action-bug.png
+++ b/tdehtml/pics/cr22-action-bug.png
diff --git a/khtml/pics/cr22-action-dbgnext.png b/tdehtml/pics/cr22-action-dbgnext.png
index ee94f5854..ee94f5854 100644
--- a/khtml/pics/cr22-action-dbgnext.png
+++ b/tdehtml/pics/cr22-action-dbgnext.png
diff --git a/khtml/pics/cr22-action-dbgrun.png b/tdehtml/pics/cr22-action-dbgrun.png
index 32f4badc5..32f4badc5 100644
--- a/khtml/pics/cr22-action-dbgrun.png
+++ b/tdehtml/pics/cr22-action-dbgrun.png
diff --git a/khtml/pics/cr22-action-dbgrunto.png b/tdehtml/pics/cr22-action-dbgrunto.png
index 861c549ab..861c549ab 100644
--- a/khtml/pics/cr22-action-dbgrunto.png
+++ b/tdehtml/pics/cr22-action-dbgrunto.png
diff --git a/khtml/pics/cr22-action-dbgstep.png b/tdehtml/pics/cr22-action-dbgstep.png
index c4a760435..c4a760435 100644
--- a/khtml/pics/cr22-action-dbgstep.png
+++ b/tdehtml/pics/cr22-action-dbgstep.png
diff --git a/khtml/pics/cr22-action-images_display.png b/tdehtml/pics/cr22-action-images_display.png
index 96ad00c41..96ad00c41 100644
--- a/khtml/pics/cr22-action-images_display.png
+++ b/tdehtml/pics/cr22-action-images_display.png
diff --git a/khtml/pics/cr32-action-bug.png b/tdehtml/pics/cr32-action-bug.png
index 597739255..597739255 100644
--- a/khtml/pics/cr32-action-bug.png
+++ b/tdehtml/pics/cr32-action-bug.png
diff --git a/khtml/pics/cr32-action-images_display.png b/tdehtml/pics/cr32-action-images_display.png
index ced97ac3f..ced97ac3f 100644
--- a/khtml/pics/cr32-action-images_display.png
+++ b/tdehtml/pics/cr32-action-images_display.png
diff --git a/khtml/pics/cr48-action-bug.png b/tdehtml/pics/cr48-action-bug.png
index 2565d767c..2565d767c 100644
--- a/khtml/pics/cr48-action-bug.png
+++ b/tdehtml/pics/cr48-action-bug.png
diff --git a/khtml/pics/cr64-action-bug.png b/tdehtml/pics/cr64-action-bug.png
index f2f45269e..f2f45269e 100644
--- a/khtml/pics/cr64-action-bug.png
+++ b/tdehtml/pics/cr64-action-bug.png
diff --git a/khtml/rendering/CMakeLists.txt b/tdehtml/rendering/CMakeLists.txt
index fe3301265..b8346501f 100644
--- a/khtml/rendering/CMakeLists.txt
+++ b/tdehtml/rendering/CMakeLists.txt
@@ -16,19 +16,19 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 
-##### khtmlrender-static #########################
+##### tdehtmlrender-static #########################
 
-set( target khtmlrender )
+set( target tdehtmlrender )
 
 set( ${target}_SRCS
   bidi.cpp break_lines.cpp render_block.cpp render_inline.cpp
diff --git a/khtml/rendering/Makefile.am b/tdehtml/rendering/Makefile.am
index d41638f27..16d30da53 100644
--- a/khtml/rendering/Makefile.am
+++ b/tdehtml/rendering/Makefile.am
@@ -19,8 +19,8 @@
 
 KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmlrender.la
-libkhtmlrender_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlrender.la
+libtdehtmlrender_la_SOURCES = \
 	bidi.cpp break_lines.cpp render_block.cpp render_inline.cpp \
 	render_style.cpp render_object.cpp render_container.cpp render_box.cpp \
 	render_flow.cpp render_text.cpp render_arena.cpp render_layer.cpp \
@@ -30,7 +30,7 @@ libkhtmlrender_la_SOURCES = \
 	render_body.cpp font.cpp render_line.cpp render_generated.cpp \
 	enumerate.cpp counter_tree.cpp
 
-libkhtmlrender_la_METASOURCES = AUTO
+libtdehtmlrender_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
 	bidi.h break_lines.h \
@@ -41,10 +41,10 @@ noinst_HEADERS = \
 	render_br.h render_applet.h font.h table_layout.h render_line.h \
 	render_generated.h enumerate.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
+ -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeutils -I$(top_srcdir) $(all_includes)
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 ## generate lib documentation
 srcdoc:
diff --git a/khtml/rendering/bidi.cpp b/tdehtml/rendering/bidi.cpp
index 2dcfe48c9..d9991c501 100644
--- a/khtml/rendering/bidi.cpp
+++ b/tdehtml/rendering/bidi.cpp
@@ -38,7 +38,7 @@
 //#define DEBUG_LINEBREAKS
 //#define PAGE_DEBUG
 
-namespace khtml {
+namespace tdehtml {
 
 
 // an iterator which goes through a BidiParagraph
@@ -618,7 +618,7 @@ InlineFlowBox* RenderBlock::createLineBoxes(RenderObject* obj)
 {
     // See if we have an unconstructed line box for this object that is also
     // the last item on the line.
-    KHTMLAssert(obj->isInlineFlow() || obj == this);
+    TDEHTMLAssert(obj->isInlineFlow() || obj == this);
     RenderFlow* flow = static_cast<RenderFlow*>(obj);
 
     // Get the last box we made for this render object.
@@ -633,7 +633,7 @@ InlineFlowBox* RenderBlock::createLineBoxes(RenderObject* obj)
         // We need to make a new box for this render object.  Once
         // made, we need to place it at the end of the current line.
         InlineBox* newBox = obj->createInlineBox(false, obj == this);
-        KHTMLAssert(newBox->isInlineFlowBox());
+        TDEHTMLAssert(newBox->isInlineFlowBox());
         box = static_cast<InlineFlowBox*>(newBox);
         box->setFirstLineStyleBit(m_firstLine);
 
@@ -673,7 +673,7 @@ InlineFlowBox* RenderBlock::constructLine(const BidiIterator &/*start*/, const B
 
     // We should have a root inline box.  It should be unconstructed and
     // be the last continuation of our line list.
-    KHTMLAssert(lastLineBox() && !lastLineBox()->isConstructed());
+    TDEHTMLAssert(lastLineBox() && !lastLineBox()->isConstructed());
 
     // Set bits on our inline flow boxes that indicate which sides should
     // paint borders/margins/padding.  This knowledge will ultimately be used when
@@ -719,7 +719,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
     int availableWidth = lineWidth(m_height);
     switch(style()->textAlign()) {
         case LEFT:
-        case KHTML_LEFT:
+        case TDEHTML_LEFT:
             numSpaces = 0;
             break;
         case JUSTIFY:
@@ -732,12 +732,12 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
             if (bidi.context->basicDir == TQChar::DirL)
                 break;
         case RIGHT:
-        case KHTML_RIGHT:
+        case TDEHTML_RIGHT:
             x += availableWidth - totWidth;
             numSpaces = 0;
             break;
         case CENTER:
-        case KHTML_CENTER:
+        case TDEHTML_CENTER:
             int xd = (availableWidth - totWidth)/2;
             x += xd >0 ? xd : 0;
             numSpaces = 0;
@@ -756,7 +756,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
                         spaces++;
                 }
 
-                KHTMLAssert(spaces <= numSpaces);
+                TDEHTMLAssert(spaces <= numSpaces);
 
                 // Only justify text with white-space: normal.
                 if (r->obj->style()->whiteSpace() == NORMAL) {
@@ -877,7 +877,7 @@ bool RenderBlock::clearLineOfPageBreaks(InlineFlowBox* lineBox)
                 lineBox->verticallyAlignBoxes(m_height);
             }
 #ifdef PAGE_DEBUG
-            kdDebug(6040) << "Cleared line " << lineBox->yPos() - oldYPos << "px" << endl;
+            kdDebug(6040) << "Cleared line " << lineBox->yPos() << "px" << endl;
 #endif
             setContainsPageBreak(true);
         }
@@ -1254,8 +1254,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
     }
 
 #if BIDI_DEBUG > 0
-    kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
-		  << ", eor=" << eor.obj << "/" << eor.pos << endl;
+//    kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
+//		  << ", eor=" << eor.obj << "/" << eor.pos << endl;
 #endif
     if ( !emptyRun && bidi.sor != bidi.current ) {
 	    bidi.eor = bidi.last;
@@ -1286,10 +1286,10 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
 #if BIDI_DEBUG > 0
     kdDebug(6041) << "lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl;
     kdDebug(6041) << "logical order is:" << endl;
-    TQPtrListIterator<BidiRun> it2(runs);
-    BidiRun *r2;
-    for ( ; (r2 = it2.current()); ++it2 )
-        kdDebug(6041) << "    " << r2 << "  start=" << r2->start << "  stop=" << r2->stop << "  level=" << (uint)r2->level << endl;
+//    TQPtrListIterator<BidiRun> it2(runs);
+//    BidiRun *r2;
+//    for ( ; (r2 = it2.current()); ++it2 )
+//        kdDebug(6041) << "    " << r2 << "  start=" << r2->start << "  stop=" << r2->stop << "  level=" << (uint)r2->level << endl;
 #endif
 
     int count = sBidiRunCount - 1;
@@ -1318,8 +1318,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
 
 #if BIDI_DEBUG > 0
     kdDebug(6041) << "visual order is:" << endl;
-    for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
-        kdDebug(6041) << "    " << curr << endl;
+//    for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
+//        kdDebug(6041) << "    " << curr << endl;
 #endif
 }
 
@@ -1986,7 +1986,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
                 }
             }
         } else
-            KHTMLAssert( false );
+            TDEHTMLAssert( false );
 
         InlineMinMaxIterator savedIt = lastIt;
         lastIt = it;
@@ -2198,7 +2198,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
 
 void RenderBlock::checkLinesForOverflow()
 {
-    for (RootInlineBox* curr = static_cast<khtml::RootInlineBox*>(firstLineBox()); curr; curr = static_cast<khtml::RootInlineBox*>(curr->nextLineBox())) {
+    for (RootInlineBox* curr = static_cast<tdehtml::RootInlineBox*>(firstLineBox()); curr; curr = static_cast<tdehtml::RootInlineBox*>(curr->nextLineBox())) {
 //         m_overflowLeft = min(curr->leftOverflow(), m_overflowLeft);
         m_overflowTop = kMin(curr->topOverflow(), m_overflowTop);
 //         m_overflowWidth = max(curr->rightOverflow(), m_overflowWidth);
diff --git a/khtml/rendering/bidi.h b/tdehtml/rendering/bidi.h
index c8776ce19..ec926d99a 100644
--- a/khtml/rendering/bidi.h
+++ b/tdehtml/rendering/bidi.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include "rendering/render_object.h"
 
-namespace khtml {
+namespace tdehtml {
     class RenderArena;
     class RenderBlock;
     class RenderObject;
diff --git a/khtml/rendering/break_lines.cpp b/tdehtml/rendering/break_lines.cpp
index a0d314cee..e82787eb8 100644
--- a/khtml/rendering/break_lines.cpp
+++ b/tdehtml/rendering/break_lines.cpp
@@ -6,7 +6,7 @@
 #include <config.h>
 
 
-/* If HAVE_LIBTHAI is defined, libkhtml will link against 
+/* If HAVE_LIBTHAI is defined, libtdehtml will link against 
  * libthai since compile time. Otherwise it will try to 
  * dlopen at run-time
  *
@@ -21,7 +21,7 @@ static th_brk_def th_brk;
 #include <thai/thbrk.h>
 #endif
 
-namespace khtml {
+namespace tdehtml {
     struct ThaiCache
     {
         ThaiCache() {
diff --git a/khtml/rendering/break_lines.h b/tdehtml/rendering/break_lines.h
index 5176e5fb0..34b733121 100644
--- a/khtml/rendering/break_lines.h
+++ b/tdehtml/rendering/break_lines.h
@@ -3,7 +3,7 @@
 
 #include <tqstring.h>
 
-namespace khtml {
+namespace tdehtml {
 
     /*
       array of unicode codes where breaking shouldn't occur.
diff --git a/khtml/rendering/counter_tree.cpp b/tdehtml/rendering/counter_tree.cpp
index 5b178d96e..931c54332 100644
--- a/khtml/rendering/counter_tree.cpp
+++ b/tdehtml/rendering/counter_tree.cpp
@@ -23,7 +23,7 @@
 #include "rendering/counter_tree.h"
 #include "rendering/render_object.h"
 
-namespace khtml {
+namespace tdehtml {
 
 CounterNode::CounterNode(RenderObject *o)
     : m_hasCounters(false), m_isVisual(false),
diff --git a/khtml/rendering/counter_tree.h b/tdehtml/rendering/counter_tree.h
index 55b924b80..0266dcc75 100644
--- a/khtml/rendering/counter_tree.h
+++ b/tdehtml/rendering/counter_tree.h
@@ -25,7 +25,7 @@
 #include "misc/shared.h"
 #include "rendering/render_object.h"
 
-namespace khtml {
+namespace tdehtml {
 
 class CounterReset;
 
diff --git a/khtml/rendering/enumerate.cpp b/tdehtml/rendering/enumerate.cpp
index 9cfe149ad..bd2ff3696 100644
--- a/khtml/rendering/enumerate.cpp
+++ b/tdehtml/rendering/enumerate.cpp
@@ -28,7 +28,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-namespace khtml {
+namespace tdehtml {
 
 namespace Enumerate {
 
diff --git a/khtml/rendering/enumerate.h b/tdehtml/rendering/enumerate.h
index c8df6549a..16b92f43c 100644
--- a/khtml/rendering/enumerate.h
+++ b/tdehtml/rendering/enumerate.h
@@ -26,7 +26,7 @@
 class TQChar;
 class TQString;
 
-namespace khtml {
+namespace tdehtml {
 
 namespace Enumerate {
 
diff --git a/khtml/rendering/font.cpp b/tdehtml/rendering/font.cpp
index 1a0591192..c70073940 100644
--- a/khtml/rendering/font.cpp
+++ b/tdehtml/rendering/font.cpp
@@ -29,17 +29,17 @@
 #endif
 
 #include "font.h"
-#include "khtml_factory.h"
-#include "khtml_settings.h"
+#include "tdehtml_factory.h"
+#include "tdehtml_settings.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqpainter.h>
 #include <tqfontdatabase.h>
 #include <tqpaintdevicemetrics.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 /** closes the current word and returns its width in pixels
  * @param fm metrics of font to be used
@@ -417,7 +417,7 @@ bool Font::isFontScalable(TQFontDatabase& db, const TQFont& font)
 
 void Font::update( TQPaintDeviceMetrics* devMetrics ) const
 {
-    f.setFamily( fontDef.family.isEmpty() ? KHTMLFactory::defaultHTMLSettings()->stdFontName() : fontDef.family );
+    f.setFamily( fontDef.family.isEmpty() ? TDEHTMLFactory::defaultHTMLSettings()->stdFontName() : fontDef.family );
     f.setItalic( fontDef.italic );
     f.setWeight( fontDef.weight );
 
@@ -433,7 +433,7 @@ void Font::update( TQPaintDeviceMetrics* devMetrics ) const
         const TQValueList<int>& pointSizes = (*scalSizesCache)[ScalKey(f)];
         // lets see if we find a nice looking font, which is not too far away
         // from the requested one.
-        // kdDebug(6080) << "khtml::setFontSize family = " << f.family() << " size requested=" << size << endl;
+        // kdDebug(6080) << "tdehtml::setFontSize family = " << f.family() << " size requested=" << size << endl;
 
 
         float diff = 1; // ### 100% deviation
diff --git a/khtml/rendering/font.h b/tdehtml/rendering/font.h
index 714b03829..e34f54207 100644
--- a/khtml/rendering/font.h
+++ b/tdehtml/rendering/font.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef KHTMLFONT_H
-#define KHTMLFONT_H
+#ifndef TDEHTMLFONT_H
+#define TDEHTMLFONT_H
 
 #include <tqfont.h>
 #include <tqfontmetrics.h>
@@ -33,7 +33,7 @@
 class TQFontDatabase;
 class TQPaintDeviceMetrics;
 
-namespace khtml
+namespace tdehtml
 {
 class RenderStyle;
 class CSSStyleSelector;
diff --git a/khtml/rendering/img-loading.png b/tdehtml/rendering/img-loading.png
index ae5a9732f..ae5a9732f 100644
--- a/khtml/rendering/img-loading.png
+++ b/tdehtml/rendering/img-loading.png
diff --git a/khtml/rendering/loading_icon.cpp b/tdehtml/rendering/loading_icon.cpp
index 218befcf8..218befcf8 100644
--- a/khtml/rendering/loading_icon.cpp
+++ b/tdehtml/rendering/loading_icon.cpp
diff --git a/khtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index fce22f7c8..eb9762897 100644
--- a/khtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -20,15 +20,15 @@
  *
  */
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdebug.h>
 
 #include "rendering/render_applet.h"
 #include "rendering/render_canvas.h"
 #include "xml/dom_docimpl.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
 #include <tqlabel.h>
 
@@ -38,7 +38,7 @@
 #include "misc/htmltags.h"
 #include "html/html_objectimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 RenderApplet::RenderApplet(HTMLElementImpl *applet, const TQMap<TQString, TQString> &args )
@@ -48,9 +48,9 @@ RenderApplet::RenderApplet(HTMLElementImpl *applet, const TQMap<TQString, TQStri
     setInline(true);
 
     KJavaAppletContext *context = 0;
-    KHTMLView *_view = applet->getDocument()->view();
+    TDEHTMLView *_view = applet->getDocument()->view();
     if ( _view ) {
-        KHTMLPart *part = _view->part();
+        TDEHTMLPart *part = _view->part();
         context = part->createJavaContext();
     }
 
@@ -89,8 +89,8 @@ void RenderApplet::layout()
 {
     //kdDebug(6100) << "RenderApplet::layout" << endl;
 
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
 
     calcWidth();
     calcHeight();
diff --git a/khtml/rendering/render_applet.h b/tdehtml/rendering/render_applet.h
index 184697a7c..62d023728 100644
--- a/khtml/rendering/render_applet.h
+++ b/tdehtml/rendering/render_applet.h
@@ -28,13 +28,13 @@
 #include <tqwidget.h>
 #include <tqmap.h>
 
-class KHTMLView;
+class TDEHTMLView;
 
 namespace DOM {
     class HTMLElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderApplet : public RenderWidget
 {
diff --git a/khtml/rendering/render_arena.cpp b/tdehtml/rendering/render_arena.cpp
index 99fbf4f4d..d3fe1676e 100644
--- a/khtml/rendering/render_arena.cpp
+++ b/tdehtml/rendering/render_arena.cpp
@@ -38,12 +38,12 @@
 #include <string.h>
 #include <assert.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
-namespace khtml {
+namespace tdehtml {
 
 //#ifdef NDEBUG
-#define KHTML_USE_ARENA_ALLOCATOR
+#define TDEHTML_USE_ARENA_ALLOCATOR
 //#endif
 
 typedef struct {
@@ -78,7 +78,7 @@ RenderArena::~RenderArena()
 
 void* RenderArena::allocate(size_t size)
 {
-#ifndef KHTML_USE_ARENA_ALLOCATOR
+#ifndef TDEHTML_USE_ARENA_ALLOCATOR
     // Use standard malloc so that memory debugging tools work.
     void *block = ::malloc(sizeof(RenderArenaDebugHeader) + size);
     RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)block;
@@ -89,10 +89,10 @@ void* RenderArena::allocate(size_t size)
     void* result = 0;
 
     // Ensure we have correct alignment for pointers.  Important for Tru64
-    size = KHTML_ROUNDUP(size, sizeof(void*));
+    size = TDEHTML_ROUNDUP(size, sizeof(void*));
 
     // Check recyclers first
-    if (size < KHTML_MAX_RECYCLED_SIZE) {
+    if (size < TDEHTML_MAX_RECYCLED_SIZE) {
         const int   index = size >> 2;
 
         result = m_recyclers[index];
@@ -117,7 +117,7 @@ void* RenderArena::allocate(size_t size)
 
 void RenderArena::free(size_t size, void* ptr)
 {
-#ifndef KHTML_USE_ARENA_ALLOCATOR
+#ifndef TDEHTML_USE_ARENA_ALLOCATOR
     // Use standard free so that memory debugging tools work.
     assert(this);
     RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)ptr - 1;
@@ -131,10 +131,10 @@ void RenderArena::free(size_t size, void* ptr)
 #endif
 
     // Ensure we have correct alignment for pointers.  Important for Tru64
-    size = KHTML_ROUNDUP(size, sizeof(void*));
+    size = TDEHTML_ROUNDUP(size, sizeof(void*));
 
     // See if it's a size that we recycle
-    if (size < KHTML_MAX_RECYCLED_SIZE) {
+    if (size < TDEHTML_MAX_RECYCLED_SIZE) {
         const int   index = size >> 2;
         void*       currentTop = m_recyclers[index];
         m_recyclers[index] = ptr;
diff --git a/khtml/rendering/render_arena.h b/tdehtml/rendering/render_arena.h
index 786cd208a..a0b00ab81 100644
--- a/khtml/rendering/render_arena.h
+++ b/tdehtml/rendering/render_arena.h
@@ -41,10 +41,10 @@
 
 #include <stdlib.h>
 
-namespace khtml {
+namespace tdehtml {
 
-#define KHTML_MAX_RECYCLED_SIZE 400
-#define KHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
+#define TDEHTML_MAX_RECYCLED_SIZE 400
+#define TDEHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
 
 class RenderArena: public Shared<RenderArena> {
 public:
@@ -61,7 +61,7 @@ private:
 
   // The recycler array is sparse with the indices being multiples of 4,
   // i.e., 0, 4, 8, 12, 16, 20, ...
-  void* m_recyclers[KHTML_MAX_RECYCLED_SIZE >> 2];
+  void* m_recyclers[TDEHTML_MAX_RECYCLED_SIZE >> 2];
 };
 
 
diff --git a/khtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp
index ccbb6fad0..593d5d8c0 100644
--- a/khtml/rendering/render_block.cpp
+++ b/tdehtml/rendering/render_block.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the render object implementation for KHTML.
+ * This file is part of the render object implementation for TDEHTML.
  *
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  *           (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
@@ -26,11 +26,11 @@
  *
  */
 
-//#define DEBUG
-//#define DEBUG_LAYOUT
-//#define BOX_DEBUG
-//#define FLOAT_DEBUG
-//#define PAGE_DEBUG
+// #define DEBUG
+// #define DEBUG_LAYOUT
+// #define BOX_DEBUG
+// #define FLOAT_DEBUG
+// #define PAGE_DEBUG
 
 #include <kdebug.h>
 #include "rendering/render_text.h"
@@ -44,11 +44,11 @@
 #include "html/html_formimpl.h"
 #include "misc/htmltags.h"
 
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 using namespace DOM;
 
-namespace khtml {
+namespace tdehtml {
 
 // -------------------------------------------------------------------------------------------------------
 
@@ -279,7 +279,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
     // needed in cases of things like anonymous tables.
     if (beforeChild && beforeChild->parent() != this) {
 
-        KHTMLAssert(beforeChild->parent());
+        TDEHTMLAssert(beforeChild->parent());
 
         // In the special case where we are prepending a block-level element before
         // something contained inside an anonymous block, we can just prepend it before
@@ -317,8 +317,8 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
 
         if (beforeChild && beforeChild->parent() != this) {
             beforeChild = beforeChild->parent();
-            KHTMLAssert(beforeChild->isAnonymousBlock());
-            KHTMLAssert(beforeChild->parent() == this);
+            TDEHTMLAssert(beforeChild->isAnonymousBlock());
+            TDEHTMLAssert(beforeChild->parent() == this);
         }
     }
     else if (!m_childrenInline && !newChild->isFloatingOrPositioned())
@@ -421,8 +421,8 @@ void RenderBlock::makeChildrenNonInline(RenderObject *insertionPoint)
     // means that we cannot coalesce inlines before |insertionPoint| with inlines following
     // |insertionPoint|, because the new child is going to be inserted in between the inlines,
     // splitting them.
-    KHTMLAssert(isReplacedBlock() || !isInline());
-    KHTMLAssert(!insertionPoint || insertionPoint->parent() == this);
+    TDEHTMLAssert(isReplacedBlock() || !isInline());
+    TDEHTMLAssert(!insertionPoint || insertionPoint->parent() == this);
 
     m_childrenInline = false;
 
@@ -454,8 +454,8 @@ void RenderBlock::makeChildrenNonInline(RenderObject *insertionPoint)
 
 void RenderBlock::makePageBreakAvoidBlocks()
 {
-    KHTMLAssert(!childrenInline());
-    KHTMLAssert(canvas()->pagedMode());
+    TDEHTMLAssert(!childrenInline());
+    TDEHTMLAssert(canvas()->pagedMode());
 
     RenderObject *breakAfter = firstChild();
     RenderObject *breakBefore = breakAfter ? breakAfter->nextSibling() : 0;
@@ -620,8 +620,8 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
     //    kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl;
     //     TQTime t;
     //     t.start();
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
 
     if (canvas()->pagedMode()) relayoutChildren = true;
 
@@ -737,7 +737,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
         // Check for an overhanging float first.
         // FIXME: This needs to look at the last flow, not the last child.
         if (lastChild() && lastChild()->hasOverhangingFloats() && !lastChild()->hasOverflowClip()) {
-            KHTMLAssert(lastChild()->isRenderBlock());
+            TDEHTMLAssert(lastChild()->isRenderBlock());
             m_height = lastChild()->yPos() + static_cast<RenderBlock*>(lastChild())->floatBottom();
             m_height += borderBottom() + paddingBottom();
         }
@@ -950,7 +950,7 @@ void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compac
         int compactYPos = child->yPos() + child->borderTop() + child->paddingTop()
                             - compactChild->paddingTop() - compactChild->borderTop();
         int adj = 0;
-        KHTMLAssert(child->isRenderBlock());
+        TDEHTMLAssert(child->isRenderBlock());
         InlineRunBox *b = static_cast<RenderBlock*>(child)->firstLineBox();
         InlineRunBox *c = static_cast<RenderBlock*>(compactChild)->firstLineBox();
         if (b && c) {
@@ -964,7 +964,7 @@ void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compac
                 adj = vpos;
             compactYPos += adj;
         }
-        Length newLineHeight( kMax(compactChild->lineHeight(true)+adj, (int)child->lineHeight(true)), khtml::Fixed);
+        Length newLineHeight( kMax(compactChild->lineHeight(true)+adj, (int)child->lineHeight(true)), tdehtml::Fixed);
         child->style()->setLineHeight( newLineHeight );
         child->setNeedsLayout( true, false );
         child->layout();
@@ -1162,8 +1162,8 @@ void RenderBlock::clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInf
 
 bool RenderBlock::canClear(RenderObject *child, PageBreakLevel level)
 {
-    KHTMLAssert(child->parent() && child->parent() == this);
-    KHTMLAssert(canvas()->pagedMode());
+    TDEHTMLAssert(child->parent() && child->parent() == this);
+    TDEHTMLAssert(canvas()->pagedMode());
 
     // Positioned elements cannot be moved. Only normal flow and floating.
     if (child->isPositioned() || child->isRelPositioned()) return false;
@@ -1190,8 +1190,8 @@ bool RenderBlock::canClear(RenderObject *child, PageBreakLevel level)
 
 void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom)
 {
-    KHTMLAssert(child->parent() && child->parent() == this);
-    KHTMLAssert(canvas()->pagedMode());
+    TDEHTMLAssert(child->parent() && child->parent() == this);
+    TDEHTMLAssert(canvas()->pagedMode());
 
     if (child->yPos() >= pageBottom) return;
 
@@ -1257,7 +1257,7 @@ void RenderBlock::determineHorizontalPosition(RenderObject* child)
         // to shift over as necessary to dodge any floats that might get in the way.
         if (child->flowAroundFloats()) {
             int leftOff = leftOffset(m_height);
-            if (style()->textAlign() != KHTML_CENTER && !child->style()->marginLeft().isVariable()) {
+            if (style()->textAlign() != TDEHTML_CENTER && !child->style()->marginLeft().isVariable()) {
                 if (child->marginLeft() < 0)
                     leftOff += child->marginLeft();
                 chPos = kMax(chPos, leftOff); // Let the float sit in the child's margin if it can fit.
@@ -1281,7 +1281,7 @@ void RenderBlock::determineHorizontalPosition(RenderObject* child)
         int chPos = xPos - (child->width() + child->marginRight());
         if (child->flowAroundFloats()) {
             int rightOff = rightOffset(m_height);
-            if (style()->textAlign() != KHTML_CENTER && !child->style()->marginRight().isVariable()) {
+            if (style()->textAlign() != TDEHTML_CENTER && !child->style()->marginRight().isVariable()) {
                 if (child->marginRight() < 0)
                     rightOff -= child->marginRight();
                 chPos = kMin(chPos, rightOff - child->width()); // Let the float sit in the child's margin if it can fit.
@@ -1789,7 +1789,7 @@ void RenderBlock::insertFloatingObject(RenderObject *o)
     else {
         // We should never get here, as insertFloatingObject() should only ever be called with floating
         // objects.
-        KHTMLAssert(false);
+        TDEHTMLAssert(false);
         newObj = 0; // keep gcc's uninitialized variable warnings happy
     }
 
@@ -2568,7 +2568,7 @@ bool RenderBlock::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
 
 void RenderBlock::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
 #ifdef DEBUG_LAYOUT
     kdDebug( 6040 ) << renderName() << "(RenderBlock)::calcMinMaxWidth() this=" << this << endl;
@@ -3151,5 +3151,5 @@ void RenderBlock::dump(TQTextStream &stream, const TQString &ind) const
 #undef DEBUG_LAYOUT
 #undef BOX_DEBUG
 
-} // namespace khtml
+} // namespace tdehtml
 
diff --git a/khtml/rendering/render_block.h b/tdehtml/rendering/render_block.h
index 2b0e49398..36d3f6cc4 100644
--- a/khtml/rendering/render_block.h
+++ b/tdehtml/rendering/render_block.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the render object implementation for KHTML.
+ * This file is part of the render object implementation for TDEHTML.
  *
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  *           (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
@@ -30,7 +30,7 @@
 
 #include "render_flow.h"
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderBlock : public RenderFlow
 {
diff --git a/khtml/rendering/render_body.cpp b/tdehtml/rendering/render_body.cpp
index 541c9676d..820b1b872 100644
--- a/khtml/rendering/render_body.cpp
+++ b/tdehtml/rendering/render_body.cpp
@@ -23,12 +23,12 @@
 #include "rendering/render_canvas.h"
 #include "html/html_baseimpl.h"
 #include "xml/dom_docimpl.h"
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 RenderBody::RenderBody(HTMLBodyElementImpl* element)
diff --git a/khtml/rendering/render_body.h b/tdehtml/rendering/render_body.h
index 7951f73e1..b7ac7c99a 100644
--- a/khtml/rendering/render_body.h
+++ b/tdehtml/rendering/render_body.h
@@ -29,7 +29,7 @@ namespace DOM
     class HTMLBodyElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderBody : public RenderBlock
 {
diff --git a/khtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp
index 7400752ac..85e1f6665 100644
--- a/khtml/rendering/render_box.cpp
+++ b/tdehtml/rendering/render_box.cpp
@@ -43,14 +43,14 @@
 #include "xml/dom_docimpl.h"
 #include "html/html_elementimpl.h"
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <assert.h>
 
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 #define TABLECELLMARGIN -0x4000
 
@@ -119,7 +119,7 @@ static inline bool overflowAppliesTo(RenderObject* o)
      // css 2.1-11.1.1
      // 1) overflow only applies to non-replaced block-level elements, table cells, and inline-block elements
      if (o->isRenderBlock() || o->isTableRow() || o->isTableSection())
-         // 2) overflow on root applies to the viewport (cf. KHTMLView::layout)
+         // 2) overflow on root applies to the viewport (cf. TDEHTMLView::layout)
          if (!o->isRoot())
              // 3) overflow on body may apply to the viewport...
              if (!o->isBody()
@@ -995,7 +995,7 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw
     {
         if ( (ml.isVariable() && mr.isVariable() && m_width<cw) ||
              (!ml.isVariable() && !mr.isVariable() &&
-                containingBlock()->style()->textAlign() == KHTML_CENTER) )
+                containingBlock()->style()->textAlign() == TDEHTML_CENTER) )
         {
             m_marginLeft = (cw - m_width)/2;
             if (m_marginLeft<0) m_marginLeft=0;
@@ -1003,14 +1003,14 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw
         }
         else if ( (mr.isVariable() && m_width<cw) ||
                  (!ml.isVariable() && containingBlock()->style()->direction() == RTL &&
-                  containingBlock()->style()->textAlign() == KHTML_LEFT))
+                  containingBlock()->style()->textAlign() == TDEHTML_LEFT))
         {
             m_marginLeft = ml.width(cw);
             m_marginRight = cw - m_width - m_marginLeft;
         }
         else if ( (ml.isVariable() && m_width<cw) ||
                  (!mr.isVariable() && containingBlock()->style()->direction() == LTR &&
-                  containingBlock()->style()->textAlign() == KHTML_RIGHT))
+                  containingBlock()->style()->textAlign() == TDEHTML_RIGHT))
         {
             m_marginRight = mr.width(cw);
             m_marginLeft = cw - m_width - m_marginRight;
@@ -2295,15 +2295,15 @@ void RenderBox::caretPos(int /*offset*/, int flags, int &_x, int &_y, int &width
         // ### regard direction
 	switch (s->textAlign()) {
 	case LEFT:
-	case KHTML_LEFT:
+	case TDEHTML_LEFT:
 	case TAAUTO:	// ### find out what this does
 	case JUSTIFY:
 	    break;
 	case CENTER:
-	case KHTML_CENTER:
+	case TDEHTML_CENTER:
 	    _x += contentWidth() / 2;
 	    break;
-	case KHTML_RIGHT:
+	case TDEHTML_RIGHT:
 	case RIGHT:
 	    _x += contentWidth();
 	    break;
diff --git a/khtml/rendering/render_box.h b/tdehtml/rendering/render_box.h
index c0c618d5c..0a65df72e 100644
--- a/khtml/rendering/render_box.h
+++ b/tdehtml/rendering/render_box.h
@@ -26,7 +26,7 @@
 
 #include "render_container.h"
 
-namespace khtml {
+namespace tdehtml {
 
 enum WidthType { Width, MinWidth, MaxWidth };
 enum HeightType { Height, MinHeight, MaxHeight };
diff --git a/khtml/rendering/render_br.cpp b/tdehtml/rendering/render_br.cpp
index 69984b760..f330e5f17 100644
--- a/khtml/rendering/render_br.cpp
+++ b/tdehtml/rendering/render_br.cpp
@@ -21,7 +21,7 @@
  */
 #include "render_br.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
 
 RenderBR::RenderBR(DOM::NodeImpl* node)
diff --git a/khtml/rendering/render_br.h b/tdehtml/rendering/render_br.h
index f4175015f..8e511c94f 100644
--- a/khtml/rendering/render_br.h
+++ b/tdehtml/rendering/render_br.h
@@ -28,7 +28,7 @@
  * The whole class here is a hack to get <br> working, as long as we don't have support for
  * CSS2 :before and :after pseudo elements
  */
-namespace khtml {
+namespace tdehtml {
 
 class RenderBR : public RenderText
 {
diff --git a/khtml/rendering/render_canvas.cpp b/tdehtml/rendering/render_canvas.cpp
index e8540eba6..862f374b2 100644
--- a/khtml/rendering/render_canvas.cpp
+++ b/tdehtml/rendering/render_canvas.cpp
@@ -26,17 +26,17 @@
 #include "rendering/render_layer.h"
 #include "xml/dom_docimpl.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 //#define BOX_DEBUG
 //#define SPEED_DEBUG
 
-RenderCanvas::RenderCanvas(DOM::NodeImpl* node, KHTMLView *view)
+RenderCanvas::RenderCanvas(DOM::NodeImpl* node, TDEHTMLView *view)
     : RenderBlock(node)
 {
     // init RenderObject attributes
@@ -103,7 +103,7 @@ void RenderCanvas::calcHeight()
 
 void RenderCanvas::calcWidth()
 {
-    // the width gets set by KHTMLView::print when printing to a printer.
+    // the width gets set by TDEHTMLView::print when printing to a printer.
     if(m_pagedMode || !m_view)
     {
         m_width = m_rootWidth;
@@ -125,7 +125,7 @@ void RenderCanvas::calcWidth()
 
 void RenderCanvas::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     RenderBlock::calcMinMaxWidth();
 
@@ -271,7 +271,7 @@ bool RenderCanvas::needsFullRepaint() const
 
 void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap)
 {
-  KHTMLAssert( view() );
+  TDEHTMLAssert( view() );
   view()->scheduleRepaint( x, y, w, h, asap );
 }
 
@@ -568,7 +568,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
     TQRect updateRect;
 
     // Don't use repaint() because it will cause all rects to
-    // be united (see khtmlview::scheduleRepaint()).  Instead
+    // be united (see tdehtmlview::scheduleRepaint()).  Instead
     // just draw damage rects for objects that have a change
     // in selection state.
     // ### for Qt, updateContents will unite them, too. This has to be
diff --git a/khtml/rendering/render_canvas.h b/tdehtml/rendering/render_canvas.h
index 17f279d7b..6c05a4945 100644
--- a/khtml/rendering/render_canvas.h
+++ b/tdehtml/rendering/render_canvas.h
@@ -25,10 +25,10 @@
 
 #include "render_block.h"
 
-class KHTMLView;
+class TDEHTMLView;
 class TQScrollView;
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderPage;
 class RenderStyle;
@@ -42,7 +42,7 @@ enum CanvasMode {
 class RenderCanvas : public RenderBlock
 {
 public:
-    RenderCanvas(DOM::NodeImpl* node, KHTMLView *view);
+    RenderCanvas(DOM::NodeImpl* node, TDEHTMLView *view);
     ~RenderCanvas();
 
     virtual const char *renderName() const { return "RenderCanvas"; }
@@ -59,7 +59,7 @@ public:
     int docHeight() const;
     int docWidth() const;
 
-    KHTMLView *view() const { return m_view; }
+    TDEHTMLView *view() const { return m_view; }
 
     virtual void repaint(Priority p=NormalPriority);
     virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
@@ -145,7 +145,7 @@ protected:
 
     virtual TQRect viewRect() const;
 
-    KHTMLView *m_view;
+    TDEHTMLView *m_view;
 
     RenderObject* m_selectionStart;
     RenderObject* m_selectionEnd;
diff --git a/khtml/rendering/render_container.cpp b/tdehtml/rendering/render_container.cpp
index 69f987477..bf0cd37ec 100644
--- a/khtml/rendering/render_container.cpp
+++ b/tdehtml/rendering/render_container.cpp
@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <assert.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 RenderContainer::RenderContainer(DOM::NodeImpl* node)
     : RenderObject(node)
@@ -127,7 +127,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
             break;
         case NONE:
             // RenderHtml and some others can have display:none
-            // KHTMLAssert(false);
+            // TDEHTMLAssert(false);
             break;
         }
     }
@@ -167,7 +167,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
 
 RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)
 {
-    KHTMLAssert(oldChild->parent() == this);
+    TDEHTMLAssert(oldChild->parent() == this);
 
     // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
     // that a positioned child got yanked).  We also repaint, so that the area exposed when the child
@@ -465,7 +465,7 @@ void RenderContainer::updateReplacedContent()
 
 void RenderContainer::appendChildNode(RenderObject* newChild)
 {
-    KHTMLAssert(newChild->parent() == 0);
+    TDEHTMLAssert(newChild->parent() == 0);
 
     newChild->setParent(this);
     RenderObject* lChild = lastChild();
@@ -499,10 +499,10 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
         return;
     }
 
-    KHTMLAssert(!child->parent());
+    TDEHTMLAssert(!child->parent());
     while ( beforeChild->parent() != this && beforeChild->parent()->isAnonymousBlock() )
 	beforeChild = beforeChild->parent();
-    KHTMLAssert(beforeChild->parent() == this);
+    TDEHTMLAssert(beforeChild->parent() == this);
 
     if(beforeChild == firstChild())
         setFirstChild(child);
@@ -526,8 +526,8 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
 
 void RenderContainer::layout()
 {
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
     const bool pagedMode = canvas()->pagedMode();
     RenderObject *child = firstChild();
     while( child ) {
diff --git a/khtml/rendering/render_container.h b/tdehtml/rendering/render_container.h
index 4cf386140..44ff88384 100644
--- a/khtml/rendering/render_container.h
+++ b/tdehtml/rendering/render_container.h
@@ -24,7 +24,7 @@
 
 #include "render_object.h"
 
-namespace khtml
+namespace tdehtml
 {
 
 
diff --git a/khtml/rendering/render_flow.cpp b/tdehtml/rendering/render_flow.cpp
index ae579bd46..a535b218e 100644
--- a/khtml/rendering/render_flow.cpp
+++ b/tdehtml/rendering/render_flow.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <assert.h>
 #include <tqpainter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_flow.h"
 #include "rendering/render_text.h"
@@ -41,10 +41,10 @@
 #include "misc/htmltags.h"
 #include "html/html_formimpl.h"
 
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 RenderFlow* RenderFlow::createFlow(DOM::NodeImpl* node, RenderStyle* style, RenderArena* arena)
 {
@@ -289,7 +289,7 @@ void RenderFlow::repaint(Priority prior)
         for (RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isInlineFlow() && inlineFlow != cb;
              inlineFlow = inlineFlow->parent()) {
              if (inlineFlow->style() && inlineFlow->style()->position() == RELATIVE && inlineFlow->layer()) {
-                KHTMLAssert(inlineFlow->isBox());
+                TDEHTMLAssert(inlineFlow->isBox());
                 static_cast<RenderBox*>(inlineFlow)->relativePositionOffset(left, top);
              }
         }
diff --git a/khtml/rendering/render_flow.h b/tdehtml/rendering/render_flow.h
index 1e23822bb..684968bc1 100644
--- a/khtml/rendering/render_flow.h
+++ b/tdehtml/rendering/render_flow.h
@@ -29,7 +29,7 @@
 #include "bidi.h"
 #include "render_line.h"
 
-namespace khtml {
+namespace tdehtml {
 
 /**
  * all geometry managing stuff is only in the block elements.
diff --git a/khtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index a0ac7b732..9d302bfc8 100644
--- a/khtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -23,18 +23,18 @@
  *
  */
 
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfind.h>
 #include <kfinddialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kreplace.h>
 #include <kreplacedialog.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kurlcompletion.h>
 #include <twin.h>
 
@@ -48,14 +48,14 @@
 #include "rendering/render_form.h"
 #include <assert.h>
 
-#include "khtmlview.h"
-#include "khtml_ext.h"
+#include "tdehtmlview.h"
+#include "tdehtml_ext.h"
 #include "xml/dom_docimpl.h"
 
 #include <tqpopupmenu.h>
 #include <tqbitmap.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 RenderFormElement::RenderFormElement(HTMLGenericFormElementImpl *element)
     : RenderWidget(element)
@@ -83,8 +83,8 @@ void RenderFormElement::updateFromElement()
 
 void RenderFormElement::layout()
 {
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
 
     // minimum height
     m_height = 0;
@@ -103,13 +103,13 @@ TQ_Alignment RenderFormElement::textAlignment() const
 {
     switch (style()->textAlign()) {
         case LEFT:
-        case KHTML_LEFT:
+        case TDEHTML_LEFT:
             return Qt::AlignLeft;
         case RIGHT:
-        case KHTML_RIGHT:
+        case TDEHTML_RIGHT:
             return Qt::AlignRight;
         case CENTER:
-        case KHTML_CENTER:
+        case TDEHTML_CENTER:
             return Qt::AlignHCenter;
         case JUSTIFY:
             // Just fall into the auto code for justify.
@@ -138,7 +138,7 @@ short RenderButton::baselinePosition( bool f ) const
 RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
     : RenderButton(element)
 {
-    TQCheckBox* b = new TQCheckBox(view()->viewport(), "__khtml");
+    TQCheckBox* b = new TQCheckBox(view()->viewport(), "__tdehtml");
     b->setAutoMask(true);
     b->setMouseTracking(true);
     setQWidget(b);
@@ -152,7 +152,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
 
 void RenderCheckBox::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget );
     TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ),
@@ -185,7 +185,7 @@ void RenderCheckBox::slotStateChanged(int state)
 RenderRadioButton::RenderRadioButton(HTMLInputElementImpl *element)
     : RenderButton(element)
 {
-    TQRadioButton* b = new TQRadioButton(view()->viewport(), "__khtml");
+    TQRadioButton* b = new TQRadioButton(view()->viewport(), "__tdehtml");
     b->setMouseTracking(true);
     setQWidget(b);
 
@@ -204,7 +204,7 @@ void RenderRadioButton::updateFromElement()
 
 void RenderRadioButton::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget );
     TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
@@ -230,7 +230,7 @@ void RenderRadioButton::slotToggled(bool activated)
 RenderSubmitButton::RenderSubmitButton(HTMLInputElementImpl *element)
     : RenderButton(element)
 {
-    TQPushButton* p = new TQPushButton(view()->viewport(), "__khtml");
+    TQPushButton* p = new TQPushButton(view()->viewport(), "__tdehtml");
     setQWidget(p);
     p->setAutoMask(true);
     p->setMouseTracking(true);
@@ -251,7 +251,7 @@ TQString RenderSubmitButton::rawText()
 
 void RenderSubmitButton::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     TQString raw = rawText();
     TQPushButton* pb = static_cast<TQPushButton*>(m_widget);
@@ -307,11 +307,11 @@ RenderResetButton::RenderResetButton(HTMLInputElementImpl *element)
 
 // -------------------------------------------------------------------------------
 
-LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, KHTMLView* view, TQWidget* parent)
-    : KLineEdit(parent, "__khtml"), m_input(input), m_view(view), m_spell(0)
+LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* view, TQWidget* parent)
+    : KLineEdit(parent, "__tdehtml"), m_input(input), m_view(view), m_spell(0)
 {
     setMouseTracking(true);
-    KActionCollection *ac = new KActionCollection(this);
+    TDEActionCollection *ac = new TDEActionCollection(this);
     m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac );
 }
 
@@ -505,7 +505,7 @@ void RenderLineEdit::highLightWord( unsigned int length, unsigned int pos )
 void RenderLineEdit::slotReturnPressed()
 {
     // don't submit the form when return was pressed in a completion-popup
-    KCompletionBox *box = widget()->completionBox(false);
+    TDECompletionBox *box = widget()->completionBox(false);
 
     if ( box && box->isVisible() && box->currentItem() != -1 ) {
       box->hide();
@@ -532,7 +532,7 @@ void RenderLineEdit::handleFocusOut()
 
 void RenderLineEdit::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     const TQFontMetrics &fm = style()->fontMetrics();
     TQSize s;
@@ -780,10 +780,10 @@ void RenderFieldset::setStyle(RenderStyle* _style)
 RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
     : RenderFormElement(element)
 {
-    KURLRequester* w = new KURLRequester( view()->viewport(), "__khtml" );
+    KURLRequester* w = new KURLRequester( view()->viewport(), "__tdehtml" );
 
     w->setMode(KFile::File | KFile::ExistingOnly);
-    w->completionObject()->setDir(KGlobalSettings::documentPath());
+    w->completionObject()->setDir(TDEGlobalSettings::documentPath());
 
     connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()));
     connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &)));
@@ -797,7 +797,7 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
 
 void RenderFileButton::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     const TQFontMetrics &fm = style()->fontMetrics();
     int size = element()->size();
@@ -877,7 +877,7 @@ RenderLegend::RenderLegend(HTMLGenericFormElementImpl *element)
 // -------------------------------------------------------------------------------
 
 ComboBoxWidget::ComboBoxWidget(TQWidget *parent)
-    : KComboBox(false, parent, "__khtml")
+    : KComboBox(false, parent, "__tdehtml")
 {
     setAutoMask(true);
     if (listBox()) listBox()->installEventFilter(this);
@@ -971,7 +971,7 @@ void RenderSelect::updateFromElement()
         }
 
         if (m_useListBox && oldMultiple != m_multiple) {
-            static_cast<KListBox*>(m_widget)->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
+            static_cast<TDEListBox*>(m_widget)->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
         }
         m_selectionChanged = true;
         m_optionsChanged = true;
@@ -985,7 +985,7 @@ void RenderSelect::updateFromElement()
         int listIndex;
 
         if(m_useListBox) {
-            static_cast<KListBox*>(m_widget)->clear();
+            static_cast<TDEListBox*>(m_widget)->clear();
         }
 
         else
@@ -999,7 +999,7 @@ void RenderSelect::updateFromElement()
 
                 if(m_useListBox) {
                     TQListBoxText *item = new TQListBoxText(TQString(text.implementation()->s, text.implementation()->l));
-                    static_cast<KListBox*>(m_widget)
+                    static_cast<TDEListBox*>(m_widget)
                         ->insertItem(item, listIndex);
                     item->setSelectable(false);
                 }
@@ -1022,7 +1022,7 @@ void RenderSelect::updateFromElement()
                 }
 
                 if(m_useListBox) {
-                    KListBox *l = static_cast<KListBox*>(m_widget);
+                    TDEListBox *l = static_cast<TDEListBox*>(m_widget);
                     l->insertItem(text, listIndex);
                     DOMString disabled = optElem->getAttribute(ATTR_DISABLED);
                     if (!disabled.isNull() && l->item( listIndex )) {
@@ -1032,7 +1032,7 @@ void RenderSelect::updateFromElement()
                     static_cast<KComboBox*>(m_widget)->insertItem(text, listIndex);
             }
             else
-                KHTMLAssert(false);
+                TDEHTMLAssert(false);
             m_selectionChanged = true;
         }
 
@@ -1058,7 +1058,7 @@ void RenderSelect::updateFromElement()
 
 void RenderSelect::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     if (m_optionsChanged)
         updateFromElement();
@@ -1074,8 +1074,8 @@ void RenderSelect::calcMinMaxWidth()
 
 void RenderSelect::layout( )
 {
-    KHTMLAssert(needsLayout());
-    KHTMLAssert(minMaxKnown());
+    TDEHTMLAssert(needsLayout());
+    TDEHTMLAssert(minMaxKnown());
 
     // ### maintain selection properly between type/size changes, and work
     // out how to handle multiselect->singleselect (probably just select
@@ -1083,7 +1083,7 @@ void RenderSelect::layout( )
 
     // calculate size
     if(m_useListBox) {
-        KListBox* w = static_cast<KListBox*>(m_widget);
+        TDEListBox* w = static_cast<TDEListBox*>(m_widget);
 
         TQListBoxItem* p = w->firstItem();
         int width = 0;
@@ -1105,7 +1105,7 @@ void RenderSelect::layout( )
         // the average of that is IMHO kMin(number of elements, 10)
         // so I did that ;-)
         if(size < 1)
-            size = kMin(static_cast<KListBox*>(m_widget)->count(), 10u);
+            size = kMin(static_cast<TDEListBox*>(m_widget)->count(), 10u);
 
         width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width();
         height = size*height + 2*w->frameWidth();
@@ -1137,7 +1137,7 @@ void RenderSelect::slotSelected(int index) // emitted by the combobox only
 {
     if ( m_ignoreSelectEvents ) return;
 
-    KHTMLAssert( !m_useListBox );
+    TDEHTMLAssert( !m_useListBox );
 
     TQMemArray<HTMLGenericFormElementImpl*> listItems = element()->listItems();
     if(index >= 0 && index < int(listItems.size()))
@@ -1208,7 +1208,7 @@ void RenderSelect::slotSelectionChanged() // emitted by the listbox only
         // again with updateSelection.
         if ( listItems[i]->id() == ID_OPTION )
             static_cast<HTMLOptionElementImpl*>( listItems[i] )
-                ->m_selected = static_cast<KListBox*>( m_widget )->isSelected( i );
+                ->m_selected = static_cast<TDEListBox*>( m_widget )->isSelected( i );
 
     ref();
     element()->onChange();
@@ -1220,9 +1220,9 @@ void RenderSelect::setOptionsChanged(bool _optionsChanged)
     m_optionsChanged = _optionsChanged;
 }
 
-KListBox* RenderSelect::createListBox()
+TDEListBox* RenderSelect::createListBox()
 {
-    KListBox *lb = new KListBox(view()->viewport(), "__khtml");
+    TDEListBox *lb = new TDEListBox(view()->viewport(), "__tdehtml");
     lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
     // ### looks broken
     //lb->setAutoMask(true);
@@ -1247,7 +1247,7 @@ void RenderSelect::updateSelection()
     int i;
     if (m_useListBox) {
         // if multi-select, we select only the new selected index
-        KListBox *listBox = static_cast<KListBox*>(m_widget);
+        TDEListBox *listBox = static_cast<TDEListBox*>(m_widget);
         for (i = 0; i < int(listItems.size()); i++)
             listBox->setSelected(i,listItems[i]->id() == ID_OPTION &&
                                  static_cast<HTMLOptionElementImpl*>(listItems[i])->selected());
@@ -1277,7 +1277,7 @@ void RenderSelect::updateSelection()
 // -------------------------------------------------------------------------
 
 TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
-    : KTextEdit(parent, "__khtml"), m_findDlg(0), m_find(0), m_repDlg(0), m_replace(0)
+    : KTextEdit(parent, "__tdehtml"), m_findDlg(0), m_find(0), m_repDlg(0), m_replace(0)
 {
     if(wrap != DOM::HTMLTextAreaElementImpl::ta_NoWrap) {
         setWordWrap(TQTextEdit::WidgetWidth);
@@ -1294,7 +1294,7 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
     setAutoMask(true);
     setMouseTracking(true);
 
-    KActionCollection *ac = new KActionCollection(this);
+    TDEActionCollection *ac = new TDEActionCollection(this);
     m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac );
     m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac );
     m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac );
@@ -1561,7 +1561,7 @@ void TextAreaWidget::slotFind()
     if ( m_findDlg ) {
       KWin::activateWindow( m_findDlg->winId() );
     } else {
-      m_findDlg = new KFindDialog(false, this, "KHTML Text Area Find Dialog");
+      m_findDlg = new KFindDialog(false, this, "TDEHTML Text Area Find Dialog");
       connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) );
     }
     m_findDlg->show();
@@ -1576,7 +1576,7 @@ void TextAreaWidget::slotReplace()
     if ( m_repDlg ) {
       KWin::activateWindow( m_repDlg->winId() );
     } else {
-      m_repDlg = new KReplaceDialog(this, "KHTMLText Area Replace Dialog", 0,
+      m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0,
                                     TQStringList(), TQStringList(), false);
       connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) );
     }
@@ -1614,7 +1614,7 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element)
 
     TextAreaWidget *edit = new TextAreaWidget(element->wrap(), view());
     setQWidget(edit);
-    const KHTMLSettings *settings = view()->part()->settings();
+    const TDEHTMLSettings *settings = view()->part()->settings();
     edit->setCheckSpellingEnabled( settings->autoSpellCheck() );
     edit->setTabChangesFocus( ! settings->allowTabulation() );
 
@@ -1645,7 +1645,7 @@ void RenderTextArea::handleFocusOut()
 
 void RenderTextArea::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget);
     const TQFontMetrics &m = style()->fontMetrics();
@@ -1680,7 +1680,7 @@ void RenderTextArea::setStyle(RenderStyle* _style)
 
 void RenderTextArea::layout()
 {
-    KHTMLAssert( needsLayout() );
+    TDEHTMLAssert( needsLayout() );
 
     RenderFormElement::layout();
 
diff --git a/khtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index db5088d20..d6124528d 100644
--- a/khtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -41,17 +41,17 @@ class QListboxItem;
 #include <tqradiobutton.h>
 #include <tqpushbutton.h>
 #include <tqhbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include "dom/dom_misc.h"
 
-class KHTMLPartBrowserExtension;
+class TDEHTMLPartBrowserExtension;
 class KSpell;
 class KFindDialog;
 class KReplaceDialog;
 class KFind;
 class KReplace;
-class KAction;
+class TDEAction;
 class KURLRequester;
 
 namespace DOM {
@@ -62,13 +62,13 @@ namespace DOM {
     class HTMLTextAreaElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class DocLoader;
 
 // -------------------------------------------------------------------------
 
-class RenderFormElement : public khtml::RenderWidget
+class RenderFormElement : public tdehtml::RenderWidget
 {
 public:
     RenderFormElement(DOM::HTMLGenericFormElementImpl* node);
@@ -256,7 +256,7 @@ class LineEditWidget : public KLineEdit
     Q_OBJECT
 public:
     LineEditWidget(DOM::HTMLInputElementImpl* input,
-                   KHTMLView* view, TQWidget* parent);
+                   TDEHTMLView* view, TQWidget* parent);
     ~LineEditWidget();
     void highLightWord( unsigned int length, unsigned int pos );
 
@@ -280,9 +280,9 @@ private:
         EditHistory
     };
     DOM::HTMLInputElementImpl* m_input;
-    KHTMLView* m_view;
+    TDEHTMLView* m_view;
     KSpell *m_spell;
-    KAction *m_spellAction;
+    TDEAction *m_spellAction;
 };
 
 // -------------------------------------------------------------------------
@@ -399,7 +399,7 @@ public:
     { return static_cast<DOM::HTMLSelectElementImpl*>(RenderObject::element()); }
 
 protected:
-    KListBox *createListBox();
+    TDEListBox *createListBox();
     ComboBoxWidget *createComboBox();
 
     unsigned  m_size;
@@ -440,9 +440,9 @@ private:
     KFind *m_find;
     KReplaceDialog *m_repDlg;
     KReplace *m_replace;
-    KAction *m_findAction;
-    KAction *m_findNextAction;
-    KAction *m_replaceAction;
+    TDEAction *m_findAction;
+    TDEAction *m_findNextAction;
+    TDEAction *m_replaceAction;
     int m_findIndex, m_findPara;
     int m_repIndex, m_repPara;
 };
diff --git a/khtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index bc3f00be4..68c66495a 100644
--- a/khtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -34,14 +34,14 @@
 #include "xml/dom2_eventsimpl.h"
 #include "xml/dom_docimpl.h"
 #include "misc/htmltags.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "misc/knsplugininstaller.h"
 
-#include <kapplication.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
@@ -49,7 +49,7 @@
 
 #include <assert.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 RenderFrameSet::RenderFrameSet( HTMLFrameSetElementImpl *frameSet)
@@ -101,11 +101,11 @@ bool RenderFrameSet::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _t
 
 void RenderFrameSet::layout( )
 {
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
 
     if ( !parent()->isFrameSet() ) {
-        KHTMLView* view = canvas()->view();
+        TDEHTMLView* view = canvas()->view();
         m_width = view ? view->visibleWidth() : 0;
         m_height = view ? view->visibleHeight() : 0;
     }
@@ -148,7 +148,7 @@ void RenderFrameSet::layout( )
         int countPercent = 0;
         int gridLen = m_gridLen[k];
         int* gridDelta = m_gridDelta[k];
-        khtml::Length* grid =  k ? element()->m_cols : element()->m_rows;
+        tdehtml::Length* grid =  k ? element()->m_cols : element()->m_rows;
         int* gridLayout = m_gridLayout[k];
 
         if (grid) {
@@ -509,7 +509,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
   if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT)
   {
       setResizing(true);
-      KApplication::setOverrideCursor(TQCursor(m_cursor));
+      TDEApplication::setOverrideCursor(TQCursor(m_cursor));
       m_vSplitPos = _x;
       m_hSplitPos = _y;
       m_oldpos = -1;
@@ -519,7 +519,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
   if(m_resizing && evt->id() == EventImpl::MOUSEUP_EVENT)
   {
     setResizing(false);
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 
     if(m_vSplit != -1 )
     {
@@ -545,7 +545,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
     setNeedsLayout(true);
   }
 
-  KHTMLView *view = canvas()->view();
+  TDEHTMLView *view = canvas()->view();
   if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) {
       TQPainter paint( view );
       paint.setPen( Qt::gray );
@@ -635,7 +635,7 @@ void RenderPart::setWidget( TQWidget *widget )
 
     setQWidget( widget );
     widget->setFocusPolicy(TQ_WheelFocus);
-    if(widget->inherits("KHTMLView"))
+    if(widget->inherits("TDEHTMLView"))
         connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) );
 
     setNeedsLayoutAndMinMaxRecalc();
@@ -645,7 +645,7 @@ void RenderPart::setWidget( TQWidget *widget )
     slotViewCleared();
 }
 
-bool RenderPart::partLoadingErrorNotify(khtml::ChildFrame *, const KURL& , const TQString& )
+bool RenderPart::partLoadingErrorNotify(tdehtml::ChildFrame *, const KURL& , const TQString& )
 {
     return false;
 }
@@ -683,11 +683,11 @@ void RenderFrame::slotViewCleared()
             view->setFrameStyle(TQFrame::NoFrame);
 	    view->setVScrollBarMode(element()->scrolling );
 	    view->setHScrollBarMode(element()->scrolling );
-        if(view->inherits("KHTMLView")) {
+        if(view->inherits("TDEHTMLView")) {
 #ifdef DEBUG_LAYOUT
-            kdDebug(6031) << "frame is a KHTMLview!" << endl;
+            kdDebug(6031) << "frame is a TDEHTMLview!" << endl;
 #endif
-            KHTMLView *htmlView = static_cast<KHTMLView *>(view);
+            TDEHTMLView *htmlView = static_cast<TDEHTMLView *>(view);
             if(element()->marginWidth != -1) htmlView->setMarginWidth(element()->marginWidth);
             if(element()->marginHeight != -1) htmlView->setMarginHeight(element()->marginHeight);
         }
@@ -706,7 +706,7 @@ RenderPartObject::RenderPartObject( DOM::HTMLElementImpl* element )
 void RenderPartObject::updateWidget()
 {
   TQString url;
-  KHTMLPart *part = m_view->part();
+  TDEHTMLPart *part = m_view->part();
 
   setNeedsLayoutAndMinMaxRecalc();
 
@@ -754,8 +754,8 @@ void RenderPartObject::updateWidget()
               }
           }
       }
-      params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
-      params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
+      params.append( TQString::fromLatin1("__TDEHTML__PLUGINEMBED=\"YES\"") );
+      params.append( TQString::fromLatin1("__TDEHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
 
       HTMLEmbedElementImpl *embed = 0;
       TQString classId;
@@ -775,8 +775,8 @@ void RenderPartObject::updateWidget()
               }
           classId = objbase->classId;
 
-          params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
-          params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
+          params.append( TQString::fromLatin1("__TDEHTML__CLASSID=\"%1\"").arg( classId ) );
+          params.append( TQString::fromLatin1("__TDEHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
           if (!objbase->getAttribute(ATTR_WIDTH).isEmpty())
               params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
           else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) {
@@ -812,7 +812,7 @@ void RenderPartObject::updateWidget()
                   // It is ActiveX, but the nsplugin system handling
                   // should also work, that's why we don't override the
                   // serviceType with application/x-activex-handler
-                  // but let the KTrader in khtmlpart::createPart() detect
+                  // but let the TDETrader in tdehtmlpart::createPart() detect
                   // the user's preference: launch with activex viewer or
                   // with nspluginviewer (Niko)
                   serviceType = "application/x-shockwave-flash";
@@ -855,9 +855,9 @@ void RenderPartObject::close()
 }
 
 
-bool RenderPartObject::partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType )
+bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType )
 {
-    KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part();
+    TDEHTMLPart *part = static_cast<TDEHTMLView *>(m_view)->part();
     kdDebug(6031) << "RenderPartObject::partLoadingErrorNotify serviceType=" << serviceType << endl;
     // Check if we just tried with e.g. nsplugin
     // and fallback to the activexhandler if there is a classid
@@ -925,7 +925,7 @@ void RenderPartObject::slotPartLoadingErrorNotify()
     // prepare for the local eventloop in KMessageBox
     ref();
 
-    KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part();
+    TDEHTMLPart *part = static_cast<TDEHTMLView *>(m_view)->part();
     KParts::BrowserExtension *ext = part->browserExtension();
     if( embed && !embed->pluginPage.isEmpty() && ext ) {
         // Prepare the mimetype to show in the question (comment if available, name as fallback)
@@ -976,8 +976,8 @@ void RenderPartObject::slotPartLoadingErrorNotify()
 
 void RenderPartObject::layout( )
 {
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
 
     calcWidth();
     calcHeight();
@@ -1009,11 +1009,11 @@ void RenderPartObject::slotViewCleared()
       view->setFrameStyle(frameStyle);
       view->setVScrollBarMode(scroll );
       view->setHScrollBarMode(scroll );
-      if(view->inherits("KHTMLView")) {
+      if(view->inherits("TDEHTMLView")) {
 #ifdef DEBUG_LAYOUT
-          kdDebug(6031) << "frame is a KHTMLview!" << endl;
+          kdDebug(6031) << "frame is a TDEHTMLview!" << endl;
 #endif
-          KHTMLView *htmlView = static_cast<KHTMLView *>(view);
+          TDEHTMLView *htmlView = static_cast<TDEHTMLView *>(view);
           htmlView->setIgnoreWheelEvents( element()->id() == ID_IFRAME );
           if(marginw != -1) htmlView->setMarginWidth(marginw);
           if(marginh != -1) htmlView->setMarginHeight(marginh);
diff --git a/khtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h
index 3dd7ed0d9..49d1e8dc1 100644
--- a/khtml/rendering/render_frames.h
+++ b/tdehtml/rendering/render_frames.h
@@ -26,7 +26,7 @@
 #include "rendering/render_replaced.h"
 #include "xml/dom_nodeimpl.h"
 #include "html/html_baseimpl.h"
-class KHTMLView;
+class TDEHTMLView;
 
 namespace DOM
 {
@@ -35,7 +35,7 @@ namespace DOM
   class MouseEventImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
     class ChildFrame;
 
@@ -91,7 +91,7 @@ private:
     bool m_clientresizing;
 };
 
-class RenderPart : public khtml::RenderWidget
+class RenderPart : public tdehtml::RenderWidget
 {
     Q_OBJECT
 public:
@@ -102,7 +102,7 @@ public:
     virtual void setWidget( TQWidget *widget );
 
     /**
-     * Called by KHTMLPart to notify the frame object that loading the
+     * Called by TDEHTMLPart to notify the frame object that loading the
      * part was not successfuly. (called either asyncroniously after a
      * after the servicetype of the given url (the one passed with requestObject)
      * has been determined or syncroniously from within requestObject)
@@ -112,7 +112,7 @@ public:
      * Return false in the normal case, return true if a fallback was found
      * and the url was successfully opened.
      */
-    virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType );
+    virtual bool partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType );
 
     virtual short intrinsicWidth() const;
     virtual int intrinsicHeight() const;
@@ -121,7 +121,7 @@ public slots:
     virtual void slotViewCleared();
 };
 
-class RenderFrame : public khtml::RenderPart
+class RenderFrame : public tdehtml::RenderPart
 {
     Q_OBJECT
 public:
@@ -144,7 +144,7 @@ public slots:
 };
 
 // I can hardly call the class RenderObject ;-)
-class RenderPartObject : public khtml::RenderPart
+class RenderPartObject : public tdehtml::RenderPart
 {
     Q_OBJECT
 public:
@@ -159,7 +159,7 @@ public:
     
     virtual bool canHaveBorder() const { return true; }
 
-    virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType );
+    virtual bool partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType );
 
 public slots:
     void slotViewCleared();
diff --git a/khtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp
index 17c65fc9c..d8e7a1be1 100644
--- a/khtml/rendering/render_generated.cpp
+++ b/tdehtml/rendering/render_generated.cpp
@@ -26,7 +26,7 @@
 #include "rendering/counter_tree.h"
 #include "css/css_valueimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace Enumerate;
 
 // -------------------------------------------------------------------------
@@ -38,7 +38,7 @@ RenderCounterBase::RenderCounterBase(DOM::NodeImpl* node)
 
 void RenderCounterBase::layout()
 {
-    KHTMLAssert( needsLayout() );
+    TDEHTMLAssert( needsLayout() );
 
     if ( !minMaxKnown() )
         calcMinMaxWidth();
@@ -48,7 +48,7 @@ void RenderCounterBase::layout()
 
 void RenderCounterBase::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     generateContent();
 
@@ -259,7 +259,7 @@ void RenderQuote::generateContent()
         visual = true;
 
     if (!m_counterNode)
-        m_counterNode = getCounter("-khtml-quotes", visual, false);
+        m_counterNode = getCounter("-tdehtml-quotes", visual, false);
 
     int value = m_counterNode->count();
     if (m_counterNode->isReset()) value = m_counterNode->value();
diff --git a/khtml/rendering/render_generated.h b/tdehtml/rendering/render_generated.h
index 6fa20e7cd..4e6aa6053 100644
--- a/khtml/rendering/render_generated.h
+++ b/tdehtml/rendering/render_generated.h
@@ -29,7 +29,7 @@ namespace DOM {
     class CounterImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
     class CounterNode;
 
 // -----------------------------------------------------------------------------
diff --git a/khtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index e387920d6..ad8f18bb3 100644
--- a/khtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -30,9 +30,9 @@
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "css/csshelper.h"
 #include "misc/helper.h"
@@ -45,14 +45,14 @@
 #include "xml/dom2_eventsimpl.h"
 #include "html/html_documentimpl.h"
 #include "html/html_objectimpl.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include <math.h>
 
 #include "loading_icon.cpp"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // -------------------------------------------------------------------------
 
@@ -64,7 +64,7 @@ RenderImage::RenderImage(NodeImpl *_element)
     m_selectionState = SelectionNone;
     berrorPic = false;
 
-    const KHTMLSettings *settings = _element->getDocument()->view()->part()->settings();
+    const TDEHTMLSettings *settings = _element->getDocument()->view()->part()->settings();
     bUnfinishedImageFrame = settings->unfinishedImageFrame();
 
     setIntrinsicWidth( 0 );
@@ -242,8 +242,8 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
     // paint frame around image as long as it is not completely loaded from web.
     if (bUnfinishedImageFrame && paintInfo.phase == PaintActionForeground && cWidth > 2 && cHeight > 2 && !complete()) {
         static TQPixmap *loadingIcon;
-        TQColor bg = khtml::retrieveBackgroundColor(this);
-        TQColor fg = khtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray :
+        TQColor bg = tdehtml::retrieveBackgroundColor(this);
+        TQColor fg = tdehtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray :
                     (hasSufficientContrast(Qt::white, bg) ? Qt::white : Qt::black);
 	paintInfo.p->setPen(TQPen(fg, 1));
 	paintInfo.p->setBrush( Qt::NoBrush );
@@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
             if ( !berrorPic ) {
                 //tqDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
                 qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight,
-                                 KApplication::palette().inactive(), true, 1 );
+                                 TDEApplication::palette().inactive(), true, 1 );
             }
             TQPixmap const* pix = i ? &i->pixmap() : 0;
             if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) )
@@ -378,8 +378,8 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
 
 void RenderImage::layout()
 {
-    KHTMLAssert( needsLayout());
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout());
+    TDEHTMLAssert( minMaxKnown() );
 
     short oldwidth = m_width;
     int oldheight = m_height;
@@ -478,7 +478,7 @@ void RenderImage::updateFromElement()
     if (!u.isEmpty() &&
         ( !m_cachedImage || m_cachedImage->url() != u ) ) {
         CachedImage *new_image = element()->getDocument()->docLoader()->
-                                 requestImage(khtml::parseURL(u));
+                                 requestImage(tdehtml::parseURL(u));
 
         if(new_image && new_image != m_cachedImage)
             updateImage( new_image );
diff --git a/khtml/rendering/render_image.h b/tdehtml/rendering/render_image.h
index 8c8bb9bef..9bd0bce4c 100644
--- a/khtml/rendering/render_image.h
+++ b/tdehtml/rendering/render_image.h
@@ -31,7 +31,7 @@
 #include <tqmap.h>
 #include <tqpixmap.h>
 
-namespace khtml {
+namespace tdehtml {
 
 class DocLoader;
 class CachedObject;
diff --git a/khtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp
index c3eb08d4b..15bc1b0df 100644
--- a/khtml/rendering/render_inline.cpp
+++ b/tdehtml/rendering/render_inline.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the render object implementation for KHTML.
+ * This file is part of the render object implementation for TDEHTML.
  *
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  *           (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
@@ -23,7 +23,7 @@
  *
  */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_arena.h"
 #include "rendering/render_inline.h"
@@ -32,7 +32,7 @@
 
 #include <tqvaluevector.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 void RenderInline::setStyle(RenderStyle* _style)
 {
@@ -760,7 +760,7 @@ void RenderInline::paintOutlinePath(TQPainter *p, int tx, int ty, const TQPoint
 
 void RenderInline::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
 #ifdef DEBUG_LAYOUT
     kdDebug( 6040 ) << renderName() << "(RenderInline)::calcMinMaxWidth() this=" << this << endl;
diff --git a/khtml/rendering/render_inline.h b/tdehtml/rendering/render_inline.h
index 5f4bf7b29..ab854543d 100644
--- a/khtml/rendering/render_inline.h
+++ b/tdehtml/rendering/render_inline.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the render object implementation for KHTML.
+ * This file is part of the render object implementation for TDEHTML.
  *
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  *           (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
@@ -28,7 +28,7 @@
 
 #include "render_flow.h"
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderInline : public RenderFlow
 {
diff --git a/khtml/rendering/render_layer.cpp b/tdehtml/rendering/render_layer.cpp
index 2b7e93f1f..2b6bbf027 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/tdehtml/rendering/render_layer.cpp
@@ -48,7 +48,7 @@
 #include "render_layer.h"
 #include <kdebug.h>
 #include <assert.h>
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 #include "render_canvas.h"
 #include "render_arena.h"
 #include "render_replaced.h"
@@ -63,7 +63,7 @@
 #include <tqstyle.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 #ifdef APPLE_CHANGES
 TQScrollBar* RenderLayer::gScrollBar = 0;
@@ -610,7 +610,7 @@ RenderLayer::showScrollbar(Qt::Orientation o, bool show)
 
     if (show && !sb) {
         TQScrollView* scrollView = m_object->document()->view();
-        sb = new TQScrollBar(o, scrollView, "__khtml");
+        sb = new TQScrollBar(o, scrollView, "__tdehtml");
         scrollView->addChild(sb, 0, -50000);
 	sb->setBackgroundMode(TQWidget::NoBackground);
         sb->show();
diff --git a/khtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h
index a8f1e5adc..ae5ddff65 100644
--- a/khtml/rendering/render_layer.h
+++ b/tdehtml/rendering/render_layer.h
@@ -53,7 +53,7 @@
 class TQScrollBar;
 template <class T> class TQPtrVector;
 
-namespace khtml {
+namespace tdehtml {
     class RenderStyle;
     class RenderTable;
     class CachedObject;
diff --git a/khtml/rendering/render_line.cpp b/tdehtml/rendering/render_line.cpp
index 2bcbe366e..d8bc8d0e2 100644
--- a/khtml/rendering/render_line.cpp
+++ b/tdehtml/rendering/render_line.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <assert.h>
 #include <tqpainter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "rendering/render_flow.h"
 #include "rendering/render_text.h"
@@ -37,16 +37,16 @@
 #include "xml/dom_docimpl.h"
 #include "html/html_formimpl.h"
 #include "misc/htmltags.h"
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 #ifndef NDEBUG
 static bool inInlineBoxDetach;
 #endif
 
-class khtml::EllipsisBox : public InlineBox
+class tdehtml::EllipsisBox : public InlineBox
 {
 public:
     EllipsisBox(RenderObject* obj, const DOM::DOMString& ellipsisStr, InlineFlowBox* p,
@@ -426,7 +426,7 @@ void InlineFlowBox::adjustMaxAscentAndDescent(int& maxAscent, int& maxDescent,
     for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
         // The computed lineheight needs to be extended for the
         // positioned elements
-        // see khtmltests/rendering/html_align.html
+        // see tdehtmltests/rendering/html_align.html
 
         if (curr->object()->isPositioned())
             continue; // Positioned placeholders don't affect calculations.
diff --git a/khtml/rendering/render_line.h b/tdehtml/rendering/render_line.h
index d42f2acb8..3dc066e10 100644
--- a/khtml/rendering/render_line.h
+++ b/tdehtml/rendering/render_line.h
@@ -22,7 +22,7 @@
 #ifndef RENDER_LINE_H
 #define RENDER_LINE_H
 
-namespace khtml {
+namespace tdehtml {
 
 class EllipsisBox;
 class InlineFlowBox;
diff --git a/khtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp
index 769b79670..cc9ba4e5b 100644
--- a/khtml/rendering/render_list.cpp
+++ b/tdehtml/rendering/render_list.cpp
@@ -35,12 +35,12 @@
 #include "xml/dom_docimpl.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqvaluelist.h>
 
 //#define BOX_DEBUG
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace Enumerate;
 
 const int cMarkerPadding = 7;
@@ -180,8 +180,8 @@ short RenderListItem::marginRight() const
 
 void RenderListItem::layout( )
 {
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
 
     updateMarkerLocation();
     RenderBlock::layout();
@@ -369,7 +369,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
 
 void RenderListMarker::layout()
 {
-    KHTMLAssert( needsLayout() );
+    TDEHTMLAssert( needsLayout() );
 
     if ( !minMaxKnown() )
         calcMinMaxWidth();
@@ -392,7 +392,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag
 
 void RenderListMarker::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     m_markerWidth = m_width = 0;
 
@@ -541,7 +541,7 @@ void RenderListMarker::calcMinMaxWidth()
     case LNONE:
         break;
     default:
-        KHTMLAssert(false);
+        TDEHTMLAssert(false);
     }
     m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". "));
     }
diff --git a/khtml/rendering/render_list.h b/tdehtml/rendering/render_list.h
index b70132671..9797d5114 100644
--- a/khtml/rendering/render_list.h
+++ b/tdehtml/rendering/render_list.h
@@ -33,7 +33,7 @@ namespace DOM
     class DocumentImpl;
 }
 
-namespace khtml
+namespace tdehtml
 {
 
 class RenderListItem;
diff --git a/khtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index f03039759..a979e1dc1 100644
--- a/khtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -45,14 +45,14 @@
 #include "misc/loader.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqpainter.h>
-#include "khtmlview.h"
-#include <khtml_part.h>
+#include "tdehtmlview.h"
+#include <tdehtml_part.h>
 
 #include <assert.h>
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 #define RED_LUMINOSITY        30
 #define GREEN_LUMINOSITY      59
@@ -96,7 +96,7 @@ void RenderObject::operator delete(void* ptr, size_t sz)
 RenderObject *RenderObject::createObject(DOM::NodeImpl* node,  RenderStyle* style)
 {
     RenderObject *o = 0;
-    khtml::RenderArena* arena = node->getDocument()->renderArena();
+    tdehtml::RenderArena* arena = node->getDocument()->renderArena();
     switch(style->display())
     {
     case NONE:
@@ -256,12 +256,12 @@ bool RenderObject::isHTMLMarquee() const
 
 void RenderObject::addChild(RenderObject* , RenderObject *)
 {
-    KHTMLAssert(0);
+    TDEHTMLAssert(0);
 }
 
 RenderObject* RenderObject::removeChildNode(RenderObject* )
 {
-    KHTMLAssert(0);
+    TDEHTMLAssert(0);
     return 0;
 }
 
@@ -273,12 +273,12 @@ void RenderObject::removeChild(RenderObject *o )
 
 void RenderObject::appendChildNode(RenderObject*)
 {
-    KHTMLAssert(0);
+    TDEHTMLAssert(0);
 }
 
 void RenderObject::insertChildNode(RenderObject*, RenderObject*)
 {
-    KHTMLAssert(0);
+    TDEHTMLAssert(0);
 }
 
 RenderObject *RenderObject::nextRenderer() const
@@ -1369,7 +1369,7 @@ bool RenderObject::attemptDirectLayerTranslation()
     // When the difference between two successive styles is only 'Position'
     // we may attempt to save a layout by directly updating the object position.
 
-    KHTMLAssert( m_style->position() != STATIC );
+    TDEHTMLAssert( m_style->position() != STATIC );
     if (!layer())
         return false;
     setInline(m_style->isDisplayInlineType());
@@ -1444,7 +1444,7 @@ void RenderObject::setOverhangingContents(bool p)
     if (p)
     {
         m_overhangingContents = true;
-        KHTMLAssert( cb != this || isCanvas());
+        TDEHTMLAssert( cb != this || isCanvas());
         if (cb && cb != this)
             cb->setOverhangingContents();
     }
@@ -1464,7 +1464,7 @@ void RenderObject::setOverhangingContents(bool p)
         else
         {
             m_overhangingContents = false;
-            KHTMLAssert( cb != this );
+            TDEHTMLAssert( cb != this );
             if (cb && cb != this)
                 cb->setOverhangingContents(false);
         }
@@ -1712,7 +1712,7 @@ FindSelectionResult RenderObject::checkSelectionPoint( int _x, int _y, int _tx,
 
 //        kdDebug(6040) << "iterating " << (child ? child->renderName() : "") << "@" << child << (child->isText() ? " contains: \"" + TQConstString(static_cast<RenderText *>(child)->text(), kMin(static_cast<RenderText *>(child)->length(), 10u)).string() + "\"" : TQString::null) << endl;
 //        kdDebug(6040) << "---------- checkSelectionPoint recursive -----------" << endl;
-        khtml::FindSelectionResult pos = child->checkSelectionPoint(_x, _y, _tx+xPos(), _ty+yPos(), nod, off, state);
+        tdehtml::FindSelectionResult pos = child->checkSelectionPoint(_x, _y, _tx+xPos(), _ty+yPos(), nod, off, state);
 //        kdDebug(6040) << "-------- end checkSelectionPoint recursive ---------" << endl;
 //        kdDebug(6030) << this << " child->findSelectionNode returned result=" << pos << " nod=" << nod << " off=" << off << endl;
         switch(pos) {
@@ -1935,7 +1935,7 @@ void RenderObject::invalidateVerticalPositions()
 
 void RenderObject::recalcMinMaxWidths()
 {
-    KHTMLAssert( m_recalcMinMax );
+    TDEHTMLAssert( m_recalcMinMax );
 
 #ifdef DEBUG_LAYOUT
     kdDebug( 6040 ) << renderName() << " recalcMinMaxWidths() this=" << this <<endl;
@@ -1974,7 +1974,7 @@ void RenderObject::recalcMinMaxWidths()
 void RenderObject::scheduleRelayout(RenderObject *clippedObj)
 {
     if (!isCanvas()) return;
-    KHTMLView *view = static_cast<RenderCanvas *>(this)->view();
+    TDEHTMLView *view = static_cast<RenderCanvas *>(this)->view();
     if ( view )
         view->scheduleRelayout(clippedObj);
 }
@@ -1986,7 +1986,7 @@ void RenderObject::removeLeftoverAnonymousBoxes()
 
 InlineBox* RenderObject::createInlineBox(bool /*makePlaceHolderBox*/, bool /*isRootLineBox*/)
 {
-    KHTMLAssert(false);
+    TDEHTMLAssert(false);
     return 0;
 }
 
@@ -2077,7 +2077,7 @@ bool RenderObject::hasCounter(const TQString& counter) const
                 element()->id() == ID_DIR))
             return true;
     } else
-    if (counter == "-khtml-quotes" && isQuote()) {
+    if (counter == "-tdehtml-quotes" && isQuote()) {
         return (static_cast<const RenderQuote*>(this)->quoteCount() != 0);
     }
     return false;
@@ -2146,7 +2146,7 @@ CounterNode* RenderObject::getCounter(const TQString& counter, bool view, bool c
 //             kdDebug( 6040 ) << renderName() << " counter-reset: " << counter << " " << val << endl;
         }
     }
-    else if (counter == "-khtml-quotes" && isQuote()) {
+    else if (counter == "-tdehtml-quotes" && isQuote()) {
         i = new CounterNode(this);
         val = static_cast<RenderQuote*>(this)->quoteCount();
     }
@@ -2221,7 +2221,7 @@ CounterNode* RenderObject::getCounter(const TQString& counter, bool view, bool c
 
 CounterNode* RenderObject::lookupCounter(const TQString& counter) const
 {
-    TQDict<khtml::CounterNode>* counters = document()->counters(this);
+    TQDict<tdehtml::CounterNode>* counters = document()->counters(this);
     if (counters)
         return counters->find(counter);
     else
@@ -2230,10 +2230,10 @@ CounterNode* RenderObject::lookupCounter(const TQString& counter) const
 
 void RenderObject::detachCounters()
 {
-    TQDict<khtml::CounterNode>* counters = document()->counters(this);
+    TQDict<tdehtml::CounterNode>* counters = document()->counters(this);
     if (!counters) return;
 
-    TQDictIterator<khtml::CounterNode> i(*counters);
+    TQDictIterator<tdehtml::CounterNode> i(*counters);
 
     while (i.current()) {
         (*i)->remove();
@@ -2245,10 +2245,10 @@ void RenderObject::detachCounters()
 
 void RenderObject::insertCounter(const TQString& counter, CounterNode* val)
 {
-    TQDict<khtml::CounterNode>* counters = document()->counters(this);
+    TQDict<tdehtml::CounterNode>* counters = document()->counters(this);
 
     if (!counters) {
-        counters = new TQDict<khtml::CounterNode>(11);
+        counters = new TQDict<tdehtml::CounterNode>(11);
         document()->setCounters(this, counters);
     }
 
diff --git a/khtml/rendering/render_object.h b/tdehtml/rendering/render_object.h
index e15dabbbc..bf120ff84 100644
--- a/khtml/rendering/render_object.h
+++ b/tdehtml/rendering/render_object.h
@@ -32,10 +32,10 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "xml/dom_docimpl.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 #include "misc/loader_client.h"
 #include "misc/helper.h"
 #include "rendering/render_style.h"
@@ -43,17 +43,17 @@
 class TQPainter;
 class TQTextStream;
 class CSSStyle;
-class KHTMLView;
+class TDEHTMLView;
 
 #ifndef NDEBUG
-#define KHTMLAssert( x ) if( !(x) ) { \
+#define TDEHTMLAssert( x ) if( !(x) ) { \
     const RenderObject *o = this; while( o->parent() ) o = o->parent(); \
     o->printTree(); \
     tqDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \
     assert( x ); \
 }
 #else
-#define KHTMLAssert( x )
+#define TDEHTMLAssert( x )
 #endif
 
 /*
@@ -112,7 +112,7 @@ namespace DOM {
     class EventImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
     class RenderFlow;
     class RenderStyle;
     class RenderTable;
diff --git a/khtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 6d6823455..2d991c3a2 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -35,20 +35,20 @@
 #include <tqevent.h>
 #include <tqapplication.h>
 #include <tqlineedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqobjectlist.h>
 #include <tqvaluevector.h>
 
-#include "khtml_ext.h"
-#include "khtmlview.h"
+#include "tdehtml_ext.h"
+#include "tdehtmlview.h"
 #include "xml/dom2_eventsimpl.h"
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 #include "xml/dom_docimpl.h"
 #include <kdebug.h>
 
-bool khtml::allowWidgetPaintEvents = false;
+bool tdehtml::allowWidgetPaintEvents = false;
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 
@@ -64,7 +64,7 @@ RenderReplaced::RenderReplaced(DOM::NodeImpl* node)
 
 void RenderReplaced::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown());
+    TDEHTMLAssert( !minMaxKnown());
 
 #ifdef DEBUG_LAYOUT
     kdDebug( 6040 ) << "RenderReplaced::calcMinMaxWidth() known=" << minMaxKnown() << endl;
@@ -102,7 +102,7 @@ RenderWidget::RenderWidget(DOM::NodeImpl* node)
     m_arena.reset(renderArena());
     m_resizePending = false;
     m_discardResizes = false;
-    m_isKHTMLWidget = false;
+    m_isTDEHTMLWidget = false;
     m_needsMask = false;
 
     // this is no real reference counting, its just there
@@ -131,7 +131,7 @@ void RenderWidget::detach()
 
 RenderWidget::~RenderWidget()
 {
-    KHTMLAssert( refCount() <= 0 );
+    TDEHTMLAssert( refCount() <= 0 );
 
     if(m_widget) {
         m_widget->hide();
@@ -157,7 +157,7 @@ void  RenderWidget::resizeWidget( int w, int h )
     w = kMin( w, 2000 );
 
     if (m_widget->width() != w || m_widget->height() != h) {
-        m_resizePending = isKHTMLWidget();
+        m_resizePending = isTDEHTMLWidget();
         ref();
         element()->ref();
         TQApplication::postEvent( this, new TQWidgetResizeEvent( w, h ) );
@@ -185,8 +185,8 @@ bool RenderWidget::event( TQEvent *e )
         m_widget->resize( re->w,  re->h );
         repaint();
     }
-    // eat all events - except if this is a frame (in which case KHTMLView handles it all)
-    if ( ::tqqt_cast<KHTMLView *>( m_widget ) )
+    // eat all events - except if this is a frame (in which case TDEHTMLView handles it all)
+    if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
         return TQObject::event( e );
     return true;
 }
@@ -212,7 +212,7 @@ void RenderWidget::setQWidget(TQWidget *widget)
             connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
             m_widget->installEventFilter(this);
 
-            if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__khtml")) && !::tqqt_cast<TQFrame*>(m_widget))
+            if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget))
                 m_widget->setBackgroundMode( TQWidget::NoBackground );
 
             if (m_widget->focusPolicy() > TQ_StrongFocus)
@@ -236,12 +236,12 @@ void RenderWidget::setQWidget(TQWidget *widget)
 
 void RenderWidget::layout( )
 {
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
     if ( m_widget ) {
         resizeWidget( m_width-borderLeft()-borderRight()-paddingLeft()-paddingRight(),
                       m_height-borderTop()-borderBottom()-paddingTop()-paddingBottom() );
-        if (!isKHTMLWidget() && !isFrame() && !m_needsMask) {
+        if (!isTDEHTMLWidget() && !isFrame() && !m_needsMask) {
             m_needsMask = true;
             RenderLayer* rl = enclosingStackingContext();
             RenderLayer* el = enclosingLayer();
@@ -272,12 +272,12 @@ void RenderWidget::updateFromElement()
         if ( color.isValid() || backgroundColor.isValid() ) {
             TQPalette pal(TQApplication::palette(m_widget));
 
-            int contrast_ = KGlobalSettings::contrast();
+            int contrast_ = TDEGlobalSettings::contrast();
             int highlightVal = 100 + (2*contrast_+4)*16/10;
             int lowlightVal = 100 + (2*contrast_+4)*10;
 
             if (backgroundColor.isValid()) {
-                if (!isKHTMLWidget())
+                if (!isTDEHTMLWidget())
                     widget()->setEraseColor(backgroundColor );
                 for ( int i = 0; i < TQPalette::NColorGroups; ++i ) {
                     pal.setColor( (TQPalette::ColorGroup)i, TQColorGroup::Background, backgroundColor );
@@ -398,11 +398,11 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
     int xPos = _tx+borderLeft()+paddingLeft();
     int yPos = _ty+borderTop()+paddingTop();
 
-    bool khtmlw = isKHTMLWidget();
+    bool tdehtmlw = isTDEHTMLWidget();
     int childw = m_widget->width();
     int childh = m_widget->height();
-    if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "KHTMLView" ) ) {
-        KHTMLView *vw = static_cast<KHTMLView *>(m_widget);
+    if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "TDEHTMLView" ) ) {
+        TDEHTMLView *vw = static_cast<TDEHTMLView *>(m_widget);
         int cy = m_view->contentsY();
         int ch = m_view->visibleHeight();
 
@@ -435,7 +435,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
     m_view->setWidgetVisible(this, true);
     m_view->addChild(m_widget, xPos, yPos );
     m_widget->show();
-    if (khtmlw)
+    if (tdehtmlw)
         paintWidget(paintInfo, m_widget, xPos, yPos);
 }
 
@@ -612,8 +612,8 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty)
 
 bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
 {
-    // no special event processing if this is a frame (in which case KHTMLView handles it all)
-    if ( ::tqqt_cast<KHTMLView *>( m_widget ) )
+    // no special event processing if this is a frame (in which case TDEHTMLView handles it all)
+    if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
         return false;
     if ( !element() ) return true;
 
@@ -655,14 +655,14 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
         //kdDebug(6000) << "RenderWidget::eventFilter captures FocusIn" << endl;
         element()->getDocument()->setFocusNode(element());
 //         if ( isEditable() ) {
-//             KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>( element()->view->part()->browserExtension() );
+//             TDEHTMLPartBrowserExtension *ext = static_cast<TDEHTMLPartBrowserExtension *>( element()->view->part()->browserExtension() );
 //             if ( ext )  ext->editableWidgetFocused( m_widget );
 //         }
         break;
     case TQEvent::KeyPress:
     case TQEvent::KeyRelease:
     // TODO this seems wrong - Qt events are not correctly translated to DOM ones,
-    // like in KHTMLView::dispatchKeyEvent()
+    // like in TDEHTMLView::dispatchKeyEvent()
         if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false))
             filtered = true;
         break;
@@ -837,13 +837,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
         const KeyEventBaseImpl& domKeyEv = static_cast<const KeyEventBaseImpl &>(ev);
         if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break;
 
-        // See KHTMLView::dispatchKeyEvent: autorepeat is just keypress in the DOM
+        // See TDEHTMLView::dispatchKeyEvent: autorepeat is just keypress in the DOM
         // but it's keyrelease+keypress in Qt. So here we do the inverse mapping as
-        // the one done in KHTMLView: generate two events for one DOM auto-repeat keypress.
+        // the one done in TDEHTMLView: generate two events for one DOM auto-repeat keypress.
         // Similarly, DOM keypress events with non-autorepeat Qt event do nothing here,
         // because the matching Qt keypress event was already sent from DOM keydown event.
 
-        // Reverse drawing as the one in KHTMLView:
+        // Reverse drawing as the one in TDEHTMLView:
         //  DOM:   Down      Press   |       Press                             |     Up
         //  Qt:    (nothing) Press   | Release(autorepeat) + Press(autorepeat) |   Release
         //
@@ -882,7 +882,7 @@ void RenderWidget::deref()
     if (_ref) _ref--;
 //     tqDebug( "deref(%p): width get count is %d", this, _ref);
     if (!_ref) {
-        khtml::SharedPtr<RenderArena> guard(m_arena); //Since delete on us gets called -first-,
+        tdehtml::SharedPtr<RenderArena> guard(m_arena); //Since delete on us gets called -first-,
                                                       //before the arena free
         arenaDelete(m_arena.get());
     }
diff --git a/khtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h
index 8432f170e..3d8a68f9c 100644
--- a/khtml/rendering/render_replaced.h
+++ b/tdehtml/rendering/render_replaced.h
@@ -26,7 +26,7 @@
 #include <tqobject.h>
 #include <tqscrollview.h>
 
-class KHTMLView;
+class TDEHTMLView;
 class TQWidget;
 
 namespace DOM
@@ -34,7 +34,7 @@ namespace DOM
     class MouseEventImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderReplaced : public RenderBox
 {
@@ -81,7 +81,7 @@ protected:
 };
 
 
-class RenderWidget : public TQObject, public RenderReplaced, public khtml::Shared<RenderWidget>
+class RenderWidget : public TQObject, public RenderReplaced, public tdehtml::Shared<RenderWidget>
 {
     Q_OBJECT
 public:
@@ -100,7 +100,7 @@ public:
     virtual void updateFromElement();
 
     TQWidget *widget() const { return m_widget; }
-    KHTMLView* view() const { return m_view; }
+    TDEHTMLView* view() const { return m_view; }
 
     void deref();
 
@@ -119,7 +119,7 @@ public:
 
 public slots:
     void slotWidgetDestructed();
-    bool isKHTMLWidget() const { return m_isKHTMLWidget; }
+    bool isTDEHTMLWidget() const { return m_isTDEHTMLWidget; }
 
 protected:
     virtual bool canHaveBorder() const { return false; }
@@ -134,7 +134,7 @@ protected:
     void resizeWidget( int w, int h );
 
     TQWidget *m_widget;
-    KHTMLView* m_view;
+    TDEHTMLView* m_view;
 
     //Because we mess with normal detach due to ref/deref,
     //we need to keep track of the arena ourselves
@@ -143,7 +143,7 @@ protected:
 
     bool m_resizePending;
     bool m_discardResizes;
-    bool m_isKHTMLWidget;
+    bool m_isTDEHTMLWidget;
     bool m_needsMask;
 
 public:
diff --git a/khtml/rendering/render_style.cpp b/tdehtml/rendering/render_style.cpp
index a71dd4116..a2ae70948 100644
--- a/khtml/rendering/render_style.cpp
+++ b/tdehtml/rendering/render_style.cpp
@@ -31,7 +31,7 @@
 
 #include "kdebug.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 /* CSS says Fixed for the default padding value, but we treat variable as 0 padding anyways, and like
diff --git a/khtml/rendering/render_style.h b/tdehtml/rendering/render_style.h
index 80d052980..28b6b999d 100644
--- a/khtml/rendering/render_style.h
+++ b/tdehtml/rendering/render_style.h
@@ -44,7 +44,7 @@
 
 #include "dom/dom_misc.h"
 #include "dom/dom_string.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 #include "misc/shared.h"
 #include "rendering/font.h"
 
@@ -69,7 +69,7 @@ namespace DOM {
     class CounterActImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
     class CachedImage;
     class CachedObject;
@@ -719,11 +719,11 @@ class StyleCSS3InheritedData : public Shared<StyleCSS3InheritedData>
 //
 
 enum EWhiteSpace {
-    NORMAL, PRE, NOWRAP, PRE_WRAP, PRE_LINE, KHTML_NOWRAP
+    NORMAL, PRE, NOWRAP, PRE_WRAP, PRE_LINE, TDEHTML_NOWRAP
 };
 
 enum ETextAlign {
-    TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, KHTML_LEFT, KHTML_RIGHT, KHTML_CENTER
+    TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, TDEHTML_LEFT, TDEHTML_RIGHT, TDEHTML_CENTER
 };
 
 enum ETextTransform {
@@ -764,7 +764,7 @@ public:
 
     CachedImage *style_image;
 
-    khtml::Font font;
+    tdehtml::Font font;
     TQColor color;
 
     short border_hspacing;
@@ -1276,7 +1276,7 @@ public:
 
     void setClear(EClear v) {  noninherited_flags.f._clear = v; }
     void setTableLayout(ETableLayout v) {  noninherited_flags.f._table_layout = v; }
-    bool setFontDef(const khtml::FontDef & v) {
+    bool setFontDef(const tdehtml::FontDef & v) {
         // bah, this doesn't compare pointers. broken! (Dirk)
         if (!(inherited->font.fontDef == v)) {
             inherited.access()->font = Font( v );
diff --git a/khtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp
index d98aa2072..9f2cc3366 100644
--- a/khtml/rendering/render_table.cpp
+++ b/tdehtml/rendering/render_table.cpp
@@ -40,7 +40,7 @@
 #include "rendering/render_line.h"
 #include "xml/dom_docimpl.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqapplication.h>
 #include <tqstyle.h>
@@ -48,7 +48,7 @@
 #include <kdebug.h>
 #include <assert.h>
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 RenderTable::RenderTable(DOM::NodeImpl* node)
@@ -265,9 +265,9 @@ void RenderTable::calcWidth()
 
 void RenderTable::layout()
 {
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
-    KHTMLAssert( !needSectionRecalc );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( !needSectionRecalc );
 
     if (posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
         // All we have to is lay out our positioned objects.
@@ -531,7 +531,7 @@ void RenderTable::paintBoxDecorations(PaintInfo &pI, int _tx, int _ty)
 
 void RenderTable::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     if ( needSectionRecalc )
 	recalcSections();
@@ -567,7 +567,7 @@ void RenderTable::splitColumn( int pos, int firstSpan )
     columns.resize( oldSize + 1 );
     int oldSpan = columns[pos].span;
 //     tqDebug("splitColumn( %d,%d ), oldSize=%d, oldSpan=%d", pos, firstSpan, oldSize, oldSpan );
-    KHTMLAssert( oldSpan > firstSpan );
+    TDEHTMLAssert( oldSpan > firstSpan );
     columns[pos].span = firstSpan;
     memmove( columns.data()+pos+1, columns.data()+pos, (oldSize-pos)*sizeof(ColumnStruct) );
     columns[pos+1].span = oldSpan - firstSpan;
@@ -1040,7 +1040,7 @@ void RenderTableSection::addChild(RenderObject *child, RenderObject *beforeChild
     cCol = 0;
 
     ensureRows( cRow+1 );
-    KHTMLAssert( child->isTableRow() );
+    TDEHTMLAssert( child->isTableRow() );
     grid[cRow].rowRenderer = static_cast<RenderTableRow*>(child);
 
     if (!beforeChild) {
@@ -2084,8 +2084,8 @@ void RenderTableRow::addChild(RenderObject *child, RenderObject *beforeChild)
 
 void RenderTableRow::layout()
 {
-    KHTMLAssert( needsLayout() );
-    KHTMLAssert( minMaxKnown() );
+    TDEHTMLAssert( needsLayout() );
+    TDEHTMLAssert( minMaxKnown() );
 
     RenderObject *child = firstChild();
     const bool pagedMode = canvas()->pagedMode();
@@ -2176,7 +2176,7 @@ void RenderTableRow::paintRow( PaintInfo& pI, int tx, int ty, int w, int h )
 
 void RenderTableRow::paint(PaintInfo& i, int tx, int ty)
 {
-    KHTMLAssert(layer());
+    TDEHTMLAssert(layer());
     if (!layer())
         return;
 
@@ -2260,7 +2260,7 @@ Length RenderTableCell::styleOrColWidth()
 
 void RenderTableCell::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 #ifdef DEBUG_LAYOUT
     kdDebug( 6040 ) << renderName() << "(TableCell)::calcMinMaxWidth() known=" << minMaxKnown() << endl;
 #endif
@@ -2365,7 +2365,7 @@ void RenderTableCell::setStyle( RenderStyle *newStyle )
     RenderBlock::setStyle( newStyle );
     setShouldPaintBackgroundOrBorder(true);
 
-    if (newStyle->whiteSpace() == KHTML_NOWRAP) {
+    if (newStyle->whiteSpace() == TDEHTML_NOWRAP) {
       // Figure out if we are really nowrapping or if we should just
       // use normal instead.  If the width of the cell is fixed, then
       // we don't actually use NOWRAP.
diff --git a/khtml/rendering/render_table.h b/tdehtml/rendering/render_table.h
index a6de6cfaf..09695e3d8 100644
--- a/khtml/rendering/render_table.h
+++ b/tdehtml/rendering/render_table.h
@@ -34,13 +34,13 @@
 #include "rendering/render_block.h"
 #include "rendering/render_style.h"
 
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 
 namespace DOM {
     class DOMString;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderTable;
 class RenderTableSection;
diff --git a/khtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp
index 770e8cd4d..411f3f221 100644
--- a/khtml/rendering/render_text.cpp
+++ b/tdehtml/rendering/render_text.cpp
@@ -43,7 +43,7 @@
 #include <tqimage.h>
 #include <tqpainter.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
@@ -55,7 +55,7 @@
 #include <stdlib.h>
 #endif
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 #ifndef NDEBUG
@@ -225,11 +225,11 @@ void InlineTextBox::paintSelection(const Font *f, RenderText *text, TQPainter *p
         hc = grp.highlightedText();
         hbg = grp.highlight();
 	// ### should be at most retrieved once per render text
-	TQColor bg = khtml::retrieveBackgroundColor(text);
+	TQColor bg = tdehtml::retrieveBackgroundColor(text);
 	// It may happen that the contrast is -- well -- virtually non existent.
 	// In this case, simply swap the colors, thus in compliance with
 	// NN4 (win32 only), IE, and Mozilla.
-	if (!khtml::hasSufficientContrast(hbg, bg))
+	if (!tdehtml::hasSufficientContrast(hbg, bg))
 	    tqSwap(hc, hbg);
     }
 
@@ -691,7 +691,7 @@ RenderText::RenderText(DOM::NodeImpl* node, DOMStringImpl *_str)
     m_maxWidth = -1;
     str = _str;
     if(str) str->ref();
-    KHTMLAssert(!str || !str->l || str->s);
+    TDEHTMLAssert(!str || !str->l || str->s);
 
     m_selectionState = SelectionNone;
     m_hasReturn = true;
@@ -723,7 +723,7 @@ void RenderText::setStyle(RenderStyle *_style)
 
 RenderText::~RenderText()
 {
-    KHTMLAssert(m_lines.count() == 0);
+    TDEHTMLAssert(m_lines.count() == 0);
     if(str) str->deref();
 }
 
@@ -745,7 +745,7 @@ void RenderText::deleteInlineBoxes(RenderArena* arena)
         }
     }
 
-    KHTMLAssert(m_lines.count() == 0);
+    TDEHTMLAssert(m_lines.count() == 0);
 }
 
 bool RenderText::isTextFragment() const
@@ -1009,12 +1009,12 @@ bool RenderText::posOfChar(int chr, int &x, int &y)
 
 void RenderText::paint( PaintInfo& /*pI*/, int /*tx*/, int /*ty*/)
 {
-    KHTMLAssert( false );
+    TDEHTMLAssert( false );
 }
 
 void RenderText::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
+    TDEHTMLAssert( !minMaxKnown() );
 
     // ### calc Min and Max width...
     m_minWidth = m_beginMinWidth = m_endMinWidth = 0;
@@ -1213,8 +1213,8 @@ void RenderText::setText(DOMStringImpl *text, bool force)
 
     // ### what should happen if we change the text of a
     // RenderBR object ?
-    KHTMLAssert(!isBR() || (str->l == 1 && (*str->s) == '\n'));
-    KHTMLAssert(!str->l || str->s);
+    TDEHTMLAssert(!isBR() || (str->l == 1 && (*str->s) == '\n'));
+    TDEHTMLAssert(!str->l || str->s);
 
     setNeedsLayoutAndMinMaxRecalc();
 #ifdef BIDI_DEBUG
@@ -1251,7 +1251,7 @@ short RenderText::baselinePosition( bool firstLine ) const
 
 InlineBox* RenderText::createInlineBox(bool, bool isRootLineBox)
 {
-    KHTMLAssert( !isRootLineBox );
+    TDEHTMLAssert( !isRootLineBox );
     return new (renderArena()) InlineTextBox(this);
 }
 
@@ -1260,7 +1260,7 @@ void RenderText::position(InlineBox* box, int from, int len, bool reverse)
 //kdDebug(6040) << "position: from="<<from<<" len="<<len<<endl;
     // ### should not be needed!!!
     // asserts sometimes with pre (that unibw-hamburg testcase). ### find out why
-    //KHTMLAssert(!(len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') ));
+    //TDEHTMLAssert(!(len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') ));
     // It is now needed. BRs need text boxes too otherwise caret navigation
     // gets stuck (LS)
     // if (len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') ) return;
@@ -1272,7 +1272,7 @@ void RenderText::position(InlineBox* box, int from, int len, bool reverse)
     TQConstString cstr(ch, len);
 #endif
 
-    KHTMLAssert(box->isInlineTextBox());
+    TDEHTMLAssert(box->isInlineTextBox());
     InlineTextBox *s = static_cast<InlineTextBox *>(box);
     s->m_start = from;
     s->m_len = len;
diff --git a/khtml/rendering/render_text.h b/tdehtml/rendering/render_text.h
index 50132fbc7..acce98350 100644
--- a/khtml/rendering/render_text.h
+++ b/tdehtml/rendering/render_text.h
@@ -42,7 +42,7 @@ class TQFontMetrics;
 const int cNoTruncation = -1;
 const int cFullTruncation = -2;
 
-namespace khtml
+namespace tdehtml
 {
     class RenderText;
     class RenderStyle;
diff --git a/khtml/rendering/table_layout.cpp b/tdehtml/rendering/table_layout.cpp
index f745640e7..97a6a4c91 100644
--- a/khtml/rendering/table_layout.cpp
+++ b/tdehtml/rendering/table_layout.cpp
@@ -23,9 +23,9 @@
 #include "table_layout.h"
 #include "render_table.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
-using namespace khtml;
+using namespace tdehtml;
 
 // #define DEBUG_LAYOUT
 
diff --git a/khtml/rendering/table_layout.h b/tdehtml/rendering/table_layout.h
index cbaf6d3a7..04b34a832 100644
--- a/khtml/rendering/table_layout.h
+++ b/tdehtml/rendering/table_layout.h
@@ -24,9 +24,9 @@
 #define TABLE_LAYOUT_H
 
 #include <tqmemarray.h>
-#include <misc/khtmllayout.h>
+#include <misc/tdehtmllayout.h>
 
-namespace khtml {
+namespace tdehtml {
 
 class RenderTable;
 class RenderTableCell;
diff --git a/khtml/rendering/table_layout.txt b/tdehtml/rendering/table_layout.txt
index 14a74bd1e..6dee6c1c2 100644
--- a/khtml/rendering/table_layout.txt
+++ b/tdehtml/rendering/table_layout.txt
@@ -43,7 +43,7 @@ The algorithm below describes to the best of our knowledge the way
 table alyouting is handled in a NS compatible way.
 
 There are two stages, the collection stage (assocaited with
-calcMinMaxWidth() in khtml) and the stage assigning width to cells
+calcMinMaxWidth() in tdehtml) and the stage assigning width to cells
 (associated with layout()).
 
 A set of hinted widths are used to determine the final table layout in
diff --git a/khtml/khtml-devel-gdb b/tdehtml/tdehtml-devel-gdb
index d5fea476f..f8a9542e8 100644
--- a/khtml/khtml-devel-gdb
+++ b/tdehtml/tdehtml-devel-gdb
@@ -1,12 +1,12 @@
-# This file defines handy gdb macros for KHTML
+# This file defines handy gdb macros for TDEHTML
 # To use it, add this line to your ~/.gdbinit :
-# source /path/to/kde/sources/tdelibs/khtml/khtml-devel-gdb
+# source /path/to/kde/sources/tdelibs/tdehtml/tdehtml-devel-gdb
 
 define printdomstring
     printdomstringimpl $arg0.impl
 end
 document printdomstring
-  Prints the contents of a KHTML DOMString.
+  Prints the contents of a TDEHTML DOMString.
 end
 define printdomstringimpl
     set $i=0
@@ -17,6 +17,6 @@ define printdomstringimpl
     printf "\n"
 end
 document printdomstringimpl
-  Prints the contents of a KHTML DOMStringImpl.
+  Prints the contents of a TDEHTML DOMStringImpl.
 end
 
diff --git a/khtml/khtml.desktop b/tdehtml/tdehtml.desktop
index 588f52ab1..9bc4ef9ac 100644
--- a/khtml/khtml.desktop
+++ b/tdehtml/tdehtml.desktop
@@ -85,9 +85,9 @@ Comment[zh_TW]=�嵌入的 HTML 檢視元件
 Comment[zu]= Ilunga lokubuka le-HTML Eshuthekiwe
 MimeType=text/html;text/xml;application/xhtml+xml;
 Icon=konqueror
-Name=KHTML
-Name[hi]=के�चटी�म�ल (KHTML)
+Name=TDEHTML
+Name[hi]=के�चटी�म�ल (TDEHTML)
 Name[te]=కెహెచ� టి ఎమ� ఎల�
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-TDE-Library=libkhtmlpart
+X-TDE-Library=libtdehtmlpart
 InitialPreference=10
diff --git a/khtml/khtml.rc b/tdehtml/tdehtml.rc
index cea311444..af41c8246 100644
--- a/khtml/khtml.rc
+++ b/tdehtml/tdehtml.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="5">
+<kpartgui name="tdehtmlpart" version="5">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
   <Action name="selectAll" />
diff --git a/khtml/khtml_browser.rc b/tdehtml/tdehtml_browser.rc
index a1da305e7..02220dc51 100644
--- a/khtml/khtml_browser.rc
+++ b/tdehtml/tdehtml_browser.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="19">
+<kpartgui name="tdehtmlpart" version="19">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
   <Action name="saveBackground" />
diff --git a/khtml/khtml_caret.cpp b/tdehtml/tdehtml_caret.cpp
index 9b819ee6c..808c52982 100644
--- a/khtml/khtml_caret.cpp
+++ b/tdehtml/tdehtml_caret.cpp
@@ -19,11 +19,11 @@
  */
 
 
-#include "khtml_caret_p.h"
+#include "tdehtml_caret_p.h"
 
 #include "html/html_documentimpl.h"
 
-namespace khtml {
+namespace tdehtml {
 
 /** Flags representing the type of advance that has been made.
  * @param LeftObject a render object was left and an ascent to its parent has
@@ -884,15 +884,15 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
     // ### regard direction
     switch (s->textAlign()) {
       case LEFT:
-      case KHTML_LEFT:
+      case TDEHTML_LEFT:
       case TAAUTO:	// ### find out what this does
       case JUSTIFY:
         break;
       case CENTER:
-      case KHTML_CENTER:
+      case TDEHTML_CENTER:
         _x += cb->contentWidth() / 2;
         break;
-      case KHTML_RIGHT:
+      case TDEHTML_RIGHT:
       case RIGHT:
         _x += cb->contentWidth();
         break;
@@ -1128,7 +1128,7 @@ static inline bool isDescendant(RenderObject *r, RenderObject *cb)
  *	or at the end.
  * @param fromEnd begin search from end (default: begin from beginning)
  */
-static bool containsEditableElement(KHTMLPart *part, RenderBlock *cb,
+static bool containsEditableElement(TDEHTMLPart *part, RenderBlock *cb,
 	RenderTable *&table, bool fromEnd = false)
 {
   RenderObject *r = cb;
@@ -1185,7 +1185,7 @@ static bool containsEditableElement(KHTMLPart *part, RenderBlock *cb,
  * @param fromEnd begin search from end (default: begin from beginning)
  * @param start object after which to begin search.
  */
-static bool containsEditableChildElement(KHTMLPart *part, RenderBlock *cb,
+static bool containsEditableChildElement(TDEHTMLPart *part, RenderBlock *cb,
 	RenderTable *&table, bool fromEnd, RenderObject *start)
 {
   int state = 0;
@@ -1242,7 +1242,7 @@ static bool containsEditableChildElement(KHTMLPart *part, RenderBlock *cb,
 
 // == class LinearDocument implementation
 
-LinearDocument::LinearDocument(KHTMLPart *part, NodeImpl *node, long offset,
+LinearDocument::LinearDocument(TDEHTMLPart *part, NodeImpl *node, long offset,
   		CaretAdvancePolicy advancePolicy, ElementImpl *baseElem)
 	: node(node), offset(offset), m_part(part),
 	advPol(advancePolicy), base(0)
@@ -2052,7 +2052,7 @@ TableRowIterator &TableRowIterator::operator --()
 // == class ErgonomicEditableLineIterator implementation
 
 // some decls
-static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
+static RenderTableCell *findNearestTableCellInRow(TDEHTMLPart *part, int x,
 		RenderTableSection::RowStruct *row, bool fromEnd);
 
 /** finds the cell corresponding to absolute x-coordinate @p x in the given
@@ -2068,7 +2068,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
  *	beginning
  * @return the cell, or 0 if no editable cell was found.
  */
-static inline RenderTableCell *findNearestTableCell(KHTMLPart *part, int x,
+static inline RenderTableCell *findNearestTableCell(TDEHTMLPart *part, int x,
 		TableRowIterator &it, bool fromEnd)
 {
   RenderTableCell *result = 0;
@@ -2090,13 +2090,13 @@ static inline RenderTableCell *findNearestTableCell(KHTMLPart *part, int x,
  * If the cell at @p x is not editable, its left neighbor is tried, then its
  * right neighbor, then the left neighbor's left neighbor etc. If no
  * editable cell can be found, 0 is returned.
- * @param part khtml part
+ * @param part tdehtml part
  * @param x absolute x-coordinate
  * @param row table row to be searched
  * @param fromEnd @p true, begin from end (applies only to nested tables)
  * @return the found cell or 0 if no editable cell was found
  */
-static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
+static RenderTableCell *findNearestTableCellInRow(TDEHTMLPart *part, int x,
 		RenderTableSection::RowStruct *row, bool fromEnd)
 {
   // First pass. Find spatially nearest cell.
diff --git a/khtml/khtml_caret_p.h b/tdehtml/tdehtml_caret_p.h
index 9524f2df7..6d85a76b2 100644
--- a/khtml/khtml_caret_p.h
+++ b/tdehtml/tdehtml_caret_p.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef KHTML_CARET_P_H
-#define KHTML_CARET_P_H
+#ifndef TDEHTML_CARET_P_H
+#define TDEHTML_CARET_P_H
 
 #include "rendering/render_table.h"
 
@@ -34,7 +34,7 @@ namespace DOM {
   class ElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 /** caret advance policy.
  *
@@ -68,7 +68,7 @@ struct CaretViewContext {
     bool displayed;		// true if caret is to be displayed at all.
     bool caretMoved;		// set to true once caret has been moved in page
     				// how to display the caret when view is not focused
-    KHTMLPart::CaretDisplayPolicy displayNonFocused;
+    TDEHTMLPart::CaretDisplayPolicy displayNonFocused;
 
     /** For natural traversal of lines, the original x position is saved, and
      * the actual x is set to the first character whose x position is
@@ -83,7 +83,7 @@ struct CaretViewContext {
     				// corresponding release event
     CaretViewContext() : freqTimerId(-1), x(0), y(0), width(1), height(16),
     	visible(true), displayed(false), caretMoved(false),
-	displayNonFocused(KHTMLPart::CaretInvisible), origX(0),
+	displayNonFocused(TDEHTMLPart::CaretInvisible), origX(0),
 	keyReleasePending(false)
     {}
 };
@@ -650,7 +650,7 @@ public:
    *	cannot serve as a base (to see if this is the case, check whether
    *	LinearDocument::baseFlow()->element() != base)
    */
-  LinearDocument(KHTMLPart *part, DOM::NodeImpl *node, long offset,
+  LinearDocument(TDEHTMLPart *part, DOM::NodeImpl *node, long offset,
   		CaretAdvancePolicy advancePolicy, DOM::ElementImpl *baseElem);
 
   virtual ~LinearDocument();
@@ -730,7 +730,7 @@ protected:
   Iterator _preBegin;
   Iterator _end;
 
-  KHTMLPart *m_part;
+  TDEHTMLPart *m_part;
   CaretAdvancePolicy advPol;
   RenderObject *base;
 
@@ -754,7 +754,7 @@ protected:
  * @since 3.3
  */
 class EditableCaretBoxIterator : public CaretBoxIterator {
-  KHTMLPart *m_part;
+  TDEHTMLPart *m_part;
   bool adjacent;
   CaretAdvancePolicy advpol;	// caret advance policy
 
@@ -1103,7 +1103,7 @@ protected:
 };
 
 
-}/*namespace khtml*/
+}/*namespace tdehtml*/
 
 
 #endif
diff --git a/khtml/khtml_events.cpp b/tdehtml/tdehtml_events.cpp
index 1045a018f..0bb9c6fc3 100644
--- a/khtml/khtml_events.cpp
+++ b/tdehtml/tdehtml_events.cpp
@@ -17,17 +17,17 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "khtml_events.h"
+#include "tdehtml_events.h"
 #include "rendering/render_object.h"
 #include "xml/dom_nodeimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 
-class khtml::MouseEvent::MouseEventPrivate
+class tdehtml::MouseEvent::MouseEventPrivate
 {
 };
 
-khtml::MouseEvent::MouseEvent( const char *name, TQMouseEvent *qmouseEvent, int x, int y,
+tdehtml::MouseEvent::MouseEvent( const char *name, TQMouseEvent *qmouseEvent, int x, int y,
                                const DOM::DOMString &url, const DOM::DOMString& target,
 	                const DOM::Node &innerNode )
 : KParts::Event( name ), m_qmouseEvent( qmouseEvent ), m_x( x ), m_y( y ),
@@ -38,12 +38,12 @@ khtml::MouseEvent::MouseEvent( const char *name, TQMouseEvent *qmouseEvent, int
       innerNode.handle()->renderer()->absolutePosition(m_nodeAbsX, m_nodeAbsY);
 }
 
-khtml::MouseEvent::~MouseEvent()
+tdehtml::MouseEvent::~MouseEvent()
 {
   delete d;
 }
 
-long khtml::MouseEvent::offset() const
+long tdehtml::MouseEvent::offset() const
 {
     int offset = 0;
     DOM::NodeImpl* tempNode = 0;
@@ -51,23 +51,23 @@ long khtml::MouseEvent::offset() const
     absX = absY = 0;
     if (innerNode().handle()->renderer()) {
         innerNode().handle()->renderer()->absolutePosition(absX, absY);
-        khtml::RenderObject::SelPointState state;
+        tdehtml::RenderObject::SelPointState state;
         innerNode().handle()->renderer()->checkSelectionPoint( x(), y(), absX, absY, tempNode, offset, state );
     }
     return offset;
 }
 
-const char *khtml::MousePressEvent::s_strMousePressEvent = "khtml/Events/MousePressEvent";
+const char *tdehtml::MousePressEvent::s_strMousePressEvent = "tdehtml/Events/MousePressEvent";
 
-const char *khtml::MouseDoubleClickEvent::s_strMouseDoubleClickEvent = "khtml/Events/MouseDoubleClickEvent";
+const char *tdehtml::MouseDoubleClickEvent::s_strMouseDoubleClickEvent = "tdehtml/Events/MouseDoubleClickEvent";
 
-const char *khtml::MouseMoveEvent::s_strMouseMoveEvent = "khtml/Events/MouseMoveEvent";
+const char *tdehtml::MouseMoveEvent::s_strMouseMoveEvent = "tdehtml/Events/MouseMoveEvent";
 
-const char *khtml::MouseReleaseEvent::s_strMouseReleaseEvent = "khtml/Events/MouseReleaseEvent";
+const char *tdehtml::MouseReleaseEvent::s_strMouseReleaseEvent = "tdehtml/Events/MouseReleaseEvent";
 
-const char *khtml::DrawContentsEvent::s_strDrawContentsEvent = "khtml/Events/DrawContentsEvent";
+const char *tdehtml::DrawContentsEvent::s_strDrawContentsEvent = "tdehtml/Events/DrawContentsEvent";
 
-class khtml::DrawContentsEvent::DrawContentsEventPrivate
+class tdehtml::DrawContentsEvent::DrawContentsEventPrivate
 {
 public:
   DrawContentsEventPrivate()
@@ -78,14 +78,14 @@ public:
   }
 };
 
-khtml::DrawContentsEvent::DrawContentsEvent( TQPainter *painter, int clipx, int clipy, int clipw, int cliph )
+tdehtml::DrawContentsEvent::DrawContentsEvent( TQPainter *painter, int clipx, int clipy, int clipw, int cliph )
   : KParts::Event( s_strDrawContentsEvent ), m_painter( painter ), m_clipx( clipx ), m_clipy( clipy ),
     m_clipw( clipw ), m_cliph( cliph )
 {
   d = new DrawContentsEventPrivate;
 }
 
-khtml::DrawContentsEvent::~DrawContentsEvent()
+tdehtml::DrawContentsEvent::~DrawContentsEvent()
 {
   delete d;
 }
diff --git a/khtml/khtml_events.h b/tdehtml/tdehtml_events.h
index 223f2b47d..f71298262 100644
--- a/khtml/khtml_events.h
+++ b/tdehtml/tdehtml_events.h
@@ -16,15 +16,15 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __khtml_events_h__
-#define __khtml_events_h__
+#ifndef __tdehtml_events_h__
+#define __tdehtml_events_h__
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include "dom/dom_node.h"
 #include "dom/dom_string.h"
 
-namespace khtml
+namespace tdehtml
 {
 
 class MouseEvent : public KParts::Event
diff --git a/khtml/khtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 3f94dcd17..b7dfb8a42 100644
--- a/khtml/khtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -26,9 +26,9 @@
  */
 
 #include <assert.h>
-#include "khtml_ext.h"
-#include "khtmlview.h"
-#include "khtml_pagecache.h"
+#include "tdehtml_ext.h"
+#include "tdehtmlview.h"
+#include "tdehtml_pagecache.h"
 #include "rendering/render_form.h"
 #include "rendering/render_image.h"
 #include "html/html_imageimpl.h"
@@ -44,33 +44,33 @@
 #include <tqdragobject.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdelocale.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
-#include <ktoolbarbutton.h>
-#include <ktoolbar.h>
+#include <tdetoolbarbutton.h>
+#include <tdetoolbar.h>
 #include <ksavefile.h>
 #include <kurldrag.h>
 #include <kstringhandler.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <krun.h>
 #include <kurifilter.h>
 #include <kiconloader.h>
 #include <kdesktopfile.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kinputdialog.h>
 
-#include "khtml_factory.h"
+#include "tdehtml_factory.h"
 
 #include "dom/dom_element.h"
 #include "misc/htmltags.h"
 
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 
-KHTMLPartBrowserExtension::KHTMLPartBrowserExtension( KHTMLPart *parent, const char *name )
+TDEHTMLPartBrowserExtension::TDEHTMLPartBrowserExtension( TDEHTMLPart *parent, const char *name )
 : KParts::BrowserExtension( parent, name )
 {
     m_part = parent;
@@ -83,29 +83,29 @@ KHTMLPartBrowserExtension::KHTMLPartBrowserExtension( KHTMLPart *parent, const c
     m_connectedToClipboard = false;
 }
 
-int KHTMLPartBrowserExtension::xOffset()
+int TDEHTMLPartBrowserExtension::xOffset()
 {
     return m_part->view()->contentsX();
 }
 
-int KHTMLPartBrowserExtension::yOffset()
+int TDEHTMLPartBrowserExtension::yOffset()
 {
   return m_part->view()->contentsY();
 }
 
-void KHTMLPartBrowserExtension::saveState( TQDataStream &stream )
+void TDEHTMLPartBrowserExtension::saveState( TQDataStream &stream )
 {
   //kdDebug( 6050 ) << "saveState!" << endl;
   m_part->saveState( stream );
 }
 
-void KHTMLPartBrowserExtension::restoreState( TQDataStream &stream )
+void TDEHTMLPartBrowserExtension::restoreState( TQDataStream &stream )
 {
   //kdDebug( 6050 ) << "restoreState!" << endl;
   m_part->restoreState( stream );
 }
 
-void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
+void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
 {
     m_editableFormWidget = widget;
     updateEditActions();
@@ -124,7 +124,7 @@ void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
     editableWidgetFocused();
 }
 
-void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
+void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
 {
     TQWidget *oldWidget = m_editableFormWidget;
 
@@ -150,13 +150,13 @@ void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
     editableWidgetBlurred();
 }
 
-void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *proxy )
+void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *proxy )
 {
     if ( m_extensionProxy )
     {
         disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ),
                     this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
-        if ( m_extensionProxy->inherits( "KHTMLPartBrowserExtension" ) )
+        if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) )
         {
             disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ),
                         this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) );
@@ -171,7 +171,7 @@ void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *pro
     {
         connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ),
                  this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
-        if ( m_extensionProxy->inherits( "KHTMLPartBrowserExtension" ) )
+        if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) )
         {
             connect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ),
                      this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) );
@@ -190,7 +190,7 @@ void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *pro
     }
 }
 
-void KHTMLPartBrowserExtension::cut()
+void TDEHTMLPartBrowserExtension::cut()
 {
     if ( m_extensionProxy )
     {
@@ -207,7 +207,7 @@ void KHTMLPartBrowserExtension::cut()
         static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut();
 }
 
-void KHTMLPartBrowserExtension::copy()
+void TDEHTMLPartBrowserExtension::copy()
 {
     if ( m_extensionProxy )
     {
@@ -215,7 +215,7 @@ void KHTMLPartBrowserExtension::copy()
         return;
     }
 
-    kdDebug( 6050 ) << "************! KHTMLPartBrowserExtension::copy()" << endl;
+    kdDebug( 6050 ) << "************! TDEHTMLPartBrowserExtension::copy()" << endl;
     if ( !m_editableFormWidget )
     {
         // get selected text and paste to the clipboard
@@ -261,7 +261,7 @@ void KHTMLPartBrowserExtension::copy()
     }
 }
 
-void KHTMLPartBrowserExtension::searchProvider()
+void TDEHTMLPartBrowserExtension::searchProvider()
 {
     // action name is of form "previewProvider[<searchproviderprefix>:]"
     const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 );
@@ -285,7 +285,7 @@ void KHTMLPartBrowserExtension::searchProvider()
     emit m_part->browserExtension()->openURLRequest( data.uri(), args );
 }
 
-void KHTMLPartBrowserExtension::openSelection()
+void TDEHTMLPartBrowserExtension::openSelection()
 {
     KParts::URLArgs args;
     args.frameName = "_blank";
@@ -293,7 +293,7 @@ void KHTMLPartBrowserExtension::openSelection()
     emit m_part->browserExtension()->openURLRequest( m_part->selectedText(), args );
 }
 
-void KHTMLPartBrowserExtension::paste()
+void TDEHTMLPartBrowserExtension::paste()
 {
     if ( m_extensionProxy )
     {
@@ -310,7 +310,7 @@ void KHTMLPartBrowserExtension::paste()
         static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste();
 }
 
-void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
+void TDEHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
 {
     if ( !m_extensionProxy )
         return;
@@ -323,7 +323,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
     m_extensionProxy->tqt_invoke( slot, o );
 }
 
-void KHTMLPartBrowserExtension::updateEditActions()
+void TDEHTMLPartBrowserExtension::updateEditActions()
 {
     if ( !m_editableFormWidget )
     {
@@ -354,15 +354,15 @@ void KHTMLPartBrowserExtension::updateEditActions()
     enableAction( "cut", hasSelection );
 }
 
-void KHTMLPartBrowserExtension::extensionProxyEditableWidgetFocused() {
+void TDEHTMLPartBrowserExtension::extensionProxyEditableWidgetFocused() {
 	editableWidgetFocused();
 }
 
-void KHTMLPartBrowserExtension::extensionProxyEditableWidgetBlurred() {
+void TDEHTMLPartBrowserExtension::extensionProxyEditableWidgetBlurred() {
 	editableWidgetBlurred();
 }
 
-void KHTMLPartBrowserExtension::extensionProxyActionEnabled( const char *action, bool enable )
+void TDEHTMLPartBrowserExtension::extensionProxyActionEnabled( const char *action, bool enable )
 {
     // only forward enableAction calls for actions we actually do forward
     if ( strcmp( action, "cut" ) == 0 ||
@@ -372,17 +372,17 @@ void KHTMLPartBrowserExtension::extensionProxyActionEnabled( const char *action,
     }
 }
 
-void KHTMLPartBrowserExtension::reparseConfiguration()
+void TDEHTMLPartBrowserExtension::reparseConfiguration()
 {
   m_part->reparseConfiguration();
 }
 
-void KHTMLPartBrowserExtension::print()
+void TDEHTMLPartBrowserExtension::print()
 {
   m_part->view()->print();
 }
 
-void KHTMLPartBrowserExtension::disableScrolling()
+void TDEHTMLPartBrowserExtension::disableScrolling()
 {
   TQScrollView *scrollView = m_part->view();
   if (scrollView) {
@@ -391,10 +391,10 @@ void KHTMLPartBrowserExtension::disableScrolling()
   }
 }
 
-class KHTMLPopupGUIClient::KHTMLPopupGUIClientPrivate
+class TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClientPrivate
 {
 public:
-  KHTMLPart *m_khtml;
+  TDEHTMLPart *m_tdehtml;
   KURL m_url;
   KURL m_imageURL;
   TQPixmap m_pixmap;
@@ -402,27 +402,27 @@ public:
 };
 
 
-KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, const KURL &url )
-  : TQObject( khtml )
+TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url )
+  : TQObject( tdehtml )
 {
-  d = new KHTMLPopupGUIClientPrivate;
-  d->m_khtml = khtml;
+  d = new TDEHTMLPopupGUIClientPrivate;
+  d->m_tdehtml = tdehtml;
   d->m_url = url;
   bool isImage = false;
-  bool hasSelection = khtml->hasSelection();
-  setInstance( khtml->instance() );
+  bool hasSelection = tdehtml->hasSelection();
+  setInstance( tdehtml->instance() );
 
   DOM::Element e;
-  e = khtml->nodeUnderMouse();
+  e = tdehtml->nodeUnderMouse();
 
   if ( !e.isNull() && (e.elementId() == ID_IMG ||
                        (e.elementId() == ID_INPUT && !static_cast<DOM::HTMLInputElement>(e).src().isEmpty())))
   {
     if (e.elementId() == ID_IMG) {
       DOM::HTMLImageElementImpl *ie = static_cast<DOM::HTMLImageElementImpl*>(e.handle());
-      khtml::RenderImage *ri = dynamic_cast<khtml::RenderImage*>(ie->renderer());
+      tdehtml::RenderImage *ri = dynamic_cast<tdehtml::RenderImage*>(ie->renderer());
       if (ri && ri->contentObject()) {
-        d->m_suggestedFilename = static_cast<khtml::CachedImage*>(ri->contentObject())->suggestedFilename();
+        d->m_suggestedFilename = static_cast<tdehtml::CachedImage*>(ri->contentObject())->suggestedFilename();
       }
     }
     isImage=true;
@@ -430,20 +430,20 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
 
   if (hasSelection)
   {
-      KAction* copyAction = KStdAction::copy( d->m_khtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
+      TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
       copyAction->setText(i18n("&Copy Text"));
-      copyAction->setEnabled(d->m_khtml->browserExtension()->isActionEnabled( "copy" ));
-      actionCollection()->insert( khtml->actionCollection()->action( "selectAll" ) );
+      copyAction->setEnabled(d->m_tdehtml->browserExtension()->isActionEnabled( "copy" ));
+      actionCollection()->insert( tdehtml->actionCollection()->action( "selectAll" ) );
 
 
       // Fill search provider entries
-      KConfig config("kuriikwsfilterrc");
+      TDEConfig config("kuriikwsfilterrc");
       config.setGroup("General");
       const TQString defaultEngine = config.readEntry("DefaultSearchEngine", "google");
       const char keywordDelimiter = config.readNumEntry("KeywordDelimiter", ':');
 
       // search text
-      TQString selectedText = khtml->selectedText();
+      TQString selectedText = tdehtml->selectedText();
       selectedText.replace("&", "&&");
       if ( selectedText.length()>18 ) {
         selectedText.truncate(15);
@@ -477,7 +477,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
       }
 
       // using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x
-      new KAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_khtml->browserExtension(),
+      new TDEAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(),
                      TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" );
 
       // favorite search providers
@@ -486,7 +486,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
       favoriteEngines = config.readListEntry("FavoriteSearchEngines", favoriteEngines);
 
       if ( !favoriteEngines.isEmpty()) {
-        KActionMenu* providerList = new KActionMenu( i18n( "Search for '%1' with" ).arg( selectedText ), actionCollection(), "searchProviderList" );
+        TDEActionMenu* providerList = new TDEActionMenu( i18n( "Search for '%1' with" ).arg( selectedText ), actionCollection(), "searchProviderList" );
 
         TQStringList::ConstIterator it = favoriteEngines.begin();
         for ( ; it != favoriteEngines.end(); ++it ) {
@@ -507,7 +507,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
               icon = TQPixmap( iconPath );
             name = service->name();
 
-            providerList->insert( new KAction( name, icon, 0, d->m_khtml->browserExtension(),
+            providerList->insert( new TDEAction( name, icon, 0, d->m_tdehtml->browserExtension(),
               TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) );
           }
         }
@@ -515,14 +515,14 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
 
 
       if ( selectedText.contains("://") && KURL(selectedText).isValid() )
-         new KAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
-         d->m_khtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
+         new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
+         d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
   }
   else if ( url.isEmpty() && !isImage )
   {
-      actionCollection()->insert( khtml->actionCollection()->action( "security" ) );
-      actionCollection()->insert( khtml->actionCollection()->action( "setEncoding" ) );
-      new KAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+      actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) );
+      actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) );
+      new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
                    actionCollection(), "stopanimations" );
   }
 
@@ -530,14 +530,14 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
   {
     if (url.protocol() == "mailto")
     {
-      new KAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+      new TDEAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
                  actionCollection(), "copylinklocation" );
     }
     else
     {
-      new KAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ),
+      new TDEAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ),
                  actionCollection(), "savelinkas" );
-      new KAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+      new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
                  actionCollection(), "copylinklocation" );
     }
   }
@@ -545,41 +545,41 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
   // frameset? -> add "Reload Frame" etc.
   if (!hasSelection)
   {
-    if ( khtml->parentPart() )
+    if ( tdehtml->parentPart() )
     {
-      new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ),
+      new TDEAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ),
                                           actionCollection(), "frameinwindow" );
-      new KAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
+      new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
                                           actionCollection(), "frameintop" );
-      new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ),
+      new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ),
                                        actionCollection(), "frameintab" );
-      new KAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
+      new TDEAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
                                         actionCollection(), "reloadframe" );
 
-      if ( KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) {
-          if ( khtml->d->m_frame->m_type == khtml::ChildFrame::IFrame )
-              new KAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
+      if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) {
+          if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame )
+              new TDEAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
       }
 
-      new KAction( i18n( "View Frame Source" ), 0, d->m_khtml, TQT_SLOT( slotViewDocumentSource() ),
+      new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ),
                                           actionCollection(), "viewFrameSource" );
-      new KAction( i18n( "View Frame Information" ), 0, d->m_khtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
-      // This one isn't in khtml_popupmenu.rc anymore, because Print isn't either,
+      new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
+      // This one isn't in tdehtml_popupmenu.rc anymore, because Print isn't either,
       // and because print frame is already in the toolbar and the menu.
       // But leave this here, so that it's easy to read it.
-      new KAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_khtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
-      new KAction( i18n( "Save &Frame As..." ), 0, d->m_khtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+      new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
+      new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
 
-      actionCollection()->insert( khtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) );
-      actionCollection()->insert( khtml->parentPart()->actionCollection()->action( "viewPageInfo" ) );
+      actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) );
+      actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) );
     } else {
-      actionCollection()->insert( khtml->actionCollection()->action( "viewDocumentSource" ) );
-      actionCollection()->insert( khtml->actionCollection()->action( "viewPageInfo" ) );
+      actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) );
+      actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) );
     }
   } else if (isImage || !url.isEmpty()) {
-    actionCollection()->insert( khtml->actionCollection()->action( "viewDocumentSource" ) );
-    actionCollection()->insert( khtml->actionCollection()->action( "viewPageInfo" ) );
-    new KAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+    actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) );
+    actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) );
+    new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
                  actionCollection(), "stopanimations" );
   }
 
@@ -598,35 +598,35 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
     }
     else
       d->m_imageURL = KURL( static_cast<DOM::HTMLInputElement>( e ).src().string() );
-    new KAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ),
+    new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ),
                  actionCollection(), "saveimageas" );
-    new KAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ),
+    new TDEAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ),
                  actionCollection(), "sendimage" );
 
 
 #ifndef QT_NO_MIMECLIPBOARD
-    (new KAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
+    (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
                  actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull());
 #endif
 
     if(d->m_pixmap.isNull()) {    //fallback to image location if still loading the image.  this will always be true if ifdef QT_NO_MIMECLIPBOARD
-      new KAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
+      new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
                    actionCollection(), "copyimagelocation" );
     }
 
     TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25);
-    new KAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
+    new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
                  actionCollection(), "viewimage" );
 
-    if (KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
+    if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
     {
-      new KAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
+      new TDEAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
                    actionCollection(), "blockimage" );
 
       if (!d->m_imageURL.host().isEmpty() &&
           !d->m_imageURL.protocol().isEmpty())
       {
-        new KAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ),
+        new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ),
                      actionCollection(), "blockhost" );
       }
     }
@@ -641,19 +641,19 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc,
     menu.insertBefore( domDocument().createElement( "separator" ), menu.firstChild() );
 }
 
-KHTMLPopupGUIClient::~KHTMLPopupGUIClient()
+TDEHTMLPopupGUIClient::~TDEHTMLPopupGUIClient()
 {
   delete d;
 }
 
-void KHTMLPopupGUIClient::slotSaveLinkAs()
+void TDEHTMLPopupGUIClient::slotSaveLinkAs()
 {
-  KIO::MetaData metaData;
-  metaData["referrer"] = d->m_khtml->referrer();
-  saveURL( d->m_khtml->widget(), i18n( "Save Link As" ), d->m_url, metaData );
+  TDEIO::MetaData metaData;
+  metaData["referrer"] = d->m_tdehtml->referrer();
+  saveURL( d->m_tdehtml->widget(), i18n( "Save Link As" ), d->m_url, metaData );
 }
 
-void KHTMLPopupGUIClient::slotSendImage()
+void TDEHTMLPopupGUIClient::slotSendImage()
 {
     TQStringList urls;
     urls.append( d->m_imageURL.url());
@@ -666,21 +666,21 @@ void KHTMLPopupGUIClient::slotSendImage()
 
 }
 
-void KHTMLPopupGUIClient::slotSaveImageAs()
+void TDEHTMLPopupGUIClient::slotSaveImageAs()
 {
-  KIO::MetaData metaData;
-  metaData["referrer"] = d->m_khtml->referrer();
-  saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename );
+  TDEIO::MetaData metaData;
+  metaData["referrer"] = d->m_tdehtml->referrer();
+  saveURL( d->m_tdehtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename );
 }
 
-void KHTMLPopupGUIClient::slotBlockHost()
+void TDEHTMLPopupGUIClient::slotBlockHost()
 {
     TQString name=d->m_imageURL.protocol()+"://"+d->m_imageURL.host()+"/*";
-    KHTMLFactory::defaultHTMLSettings()->addAdFilter( name );
-    d->m_khtml->reparseConfiguration();
+    TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( name );
+    d->m_tdehtml->reparseConfiguration();
 }
 
-void KHTMLPopupGUIClient::slotBlockImage()
+void TDEHTMLPopupGUIClient::slotBlockImage()
 {
     bool ok = false;
 
@@ -689,25 +689,25 @@ void KHTMLPopupGUIClient::slotBlockImage()
                                          d->m_imageURL.url(),
                                          &ok);
     if ( ok ) {
-        KHTMLFactory::defaultHTMLSettings()->addAdFilter( url );
-        d->m_khtml->reparseConfiguration();
+        TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( url );
+        d->m_tdehtml->reparseConfiguration();
     }
 }
 
-void KHTMLPopupGUIClient::slotBlockIFrame()
+void TDEHTMLPopupGUIClient::slotBlockIFrame()
 {
     bool ok = false;
     TQString url = KInputDialog::getText( i18n( "Add URL to Filter"),
                                                i18n("Enter the URL:"),
-                                               d->m_khtml->url().url(),
+                                               d->m_tdehtml->url().url(),
                                                &ok );
     if ( ok ) {
-        KHTMLFactory::defaultHTMLSettings()->addAdFilter( url );
-        d->m_khtml->reparseConfiguration();
+        TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( url );
+        d->m_tdehtml->reparseConfiguration();
     }
 }
 
-void KHTMLPopupGUIClient::slotCopyLinkLocation()
+void TDEHTMLPopupGUIClient::slotCopyLinkLocation()
 {
   KURL safeURL(d->m_url);
   safeURL.setPass(TQString::null);
@@ -722,12 +722,12 @@ void KHTMLPopupGUIClient::slotCopyLinkLocation()
 #endif
 }
 
-void KHTMLPopupGUIClient::slotStopAnimations()
+void TDEHTMLPopupGUIClient::slotStopAnimations()
 {
-  d->m_khtml->stopAnimations();
+  d->m_tdehtml->stopAnimations();
 }
 
-void KHTMLPopupGUIClient::slotCopyImage()
+void TDEHTMLPopupGUIClient::slotCopyImage()
 {
 #ifndef QT_NO_MIMECLIPBOARD
   KURL safeURL(d->m_imageURL);
@@ -735,10 +735,10 @@ void KHTMLPopupGUIClient::slotCopyImage()
 
   KURL::List lst;
   lst.append( safeURL );
-  KMultipleDrag *drag = new KMultipleDrag(d->m_khtml->view(), "Image");
+  KMultipleDrag *drag = new KMultipleDrag(d->m_tdehtml->view(), "Image");
 
   drag->addDragObject( new TQImageDrag(d->m_pixmap.convertToImage()) );
-  drag->addDragObject( new KURLDrag(lst, d->m_khtml->view(), "Image URL") );
+  drag->addDragObject( new KURLDrag(lst, d->m_tdehtml->view(), "Image URL") );
 
   // Set it in both the mouse selection and in the clipboard
   TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
@@ -748,7 +748,7 @@ void KHTMLPopupGUIClient::slotCopyImage()
 #endif
 }
 
-void KHTMLPopupGUIClient::slotCopyImageLocation()
+void TDEHTMLPopupGUIClient::slotCopyImageLocation()
 {
   KURL safeURL(d->m_imageURL);
   safeURL.setPass(TQString::null);
@@ -763,47 +763,47 @@ void KHTMLPopupGUIClient::slotCopyImageLocation()
 #endif
 }
 
-void KHTMLPopupGUIClient::slotViewImage()
+void TDEHTMLPopupGUIClient::slotViewImage()
 {
-  d->m_khtml->browserExtension()->createNewWindow(d->m_imageURL);
+  d->m_tdehtml->browserExtension()->createNewWindow(d->m_imageURL);
 }
 
-void KHTMLPopupGUIClient::slotReloadFrame()
+void TDEHTMLPopupGUIClient::slotReloadFrame()
 {
-  KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
+  KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
   args.reload = true;
-  args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  args.metaData()["referrer"] = d->m_tdehtml->pageReferrer();
   // reload document
-  d->m_khtml->closeURL();
-  d->m_khtml->browserExtension()->setURLArgs( args );
-  d->m_khtml->openURL( d->m_khtml->url() );
+  d->m_tdehtml->closeURL();
+  d->m_tdehtml->browserExtension()->setURLArgs( args );
+  d->m_tdehtml->openURL( d->m_tdehtml->url() );
 }
 
-void KHTMLPopupGUIClient::slotFrameInWindow()
+void TDEHTMLPopupGUIClient::slotFrameInWindow()
 {
-  KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
-  args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
+  args.metaData()["referrer"] = d->m_tdehtml->pageReferrer();
   args.metaData()["forcenewwindow"] = "true";
-  emit d->m_khtml->browserExtension()->createNewWindow( d->m_khtml->url(), args );
+  emit d->m_tdehtml->browserExtension()->createNewWindow( d->m_tdehtml->url(), args );
 }
 
-void KHTMLPopupGUIClient::slotFrameInTop()
+void TDEHTMLPopupGUIClient::slotFrameInTop()
 {
-  KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
-  args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
+  args.metaData()["referrer"] = d->m_tdehtml->pageReferrer();
   args.frameName = "_top";
-  emit d->m_khtml->browserExtension()->openURLRequest( d->m_khtml->url(), args );
+  emit d->m_tdehtml->browserExtension()->openURLRequest( d->m_tdehtml->url(), args );
 }
 
-void KHTMLPopupGUIClient::slotFrameInTab()
+void TDEHTMLPopupGUIClient::slotFrameInTab()
 {
-  KParts::URLArgs args( d->m_khtml->browserExtension()->urlArgs() );
-  args.metaData()["referrer"] = d->m_khtml->pageReferrer();
+  KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
+  args.metaData()["referrer"] = d->m_tdehtml->pageReferrer();
   args.setNewTab(true);
-  emit d->m_khtml->browserExtension()->createNewWindow( d->m_khtml->url(), args );
+  emit d->m_tdehtml->browserExtension()->createNewWindow( d->m_tdehtml->url(), args );
 }
 
-void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
+void TDEHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
                                    const KURL &url,
                                    const TQMap<TQString, TQString> &metadata,
                                    const TQString &filter, long cacheId,
@@ -824,7 +824,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
       {
         TQFileInfo info( destURL.path() );
         if( info.exists() ) {
-          // TODO: use KIO::RenameDlg (shows more information)
+          // TODO: use TDEIO::RenameDlg (shows more information)
           query = KMessageBox::warningContinueCancel( parent, i18n( "A file named \"%1\" already exists. " "Are you sure you want to overwrite it?" ).arg( info.fileName() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ) );
         }
        }
@@ -834,21 +834,21 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
     saveURL(url, destURL, metadata, cacheId);
 }
 
-void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
+void TDEHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
                                    const TQMap<TQString, TQString> &metadata,
                                    long cacheId )
 {
     if ( destURL.isValid() )
     {
         bool saved = false;
-        if (KHTMLPageCache::self()->isComplete(cacheId))
+        if (TDEHTMLPageCache::self()->isComplete(cacheId))
         {
             if (destURL.isLocalFile())
             {
                 KSaveFile destFile(destURL.path());
                 if (destFile.status() == 0)
                 {
-                    KHTMLPageCache::self()->saveData(cacheId, destFile.dataStream());
+                    TDEHTMLPageCache::self()->saveData(cacheId, destFile.dataStream());
                     saved = true;
                 }
             }
@@ -858,11 +858,11 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
                 KTempFile destFile;
                 if (destFile.status() == 0)
                 {
-                    KHTMLPageCache::self()->saveData(cacheId, destFile.dataStream());
+                    TDEHTMLPageCache::self()->saveData(cacheId, destFile.dataStream());
                     destFile.close();
                     KURL url2 = KURL();
                     url2.setPath(destFile.name());
-                    KIO::file_move(url2, destURL, -1, true /*overwrite*/);
+                    TDEIO::file_move(url2, destURL, -1, true /*overwrite*/);
                     saved = true;
                 }
             }
@@ -876,14 +876,14 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
           bool downloadViaKIO = true;
           if ( !url.isLocalFile() )
           {
-            KConfig cfg("konquerorrc", false, false);
+            TDEConfig cfg("konquerorrc", false, false);
             cfg.setGroup("HTML Settings");
             TQString downloadManger = cfg.readPathEntry("DownloadManager");
             if (!downloadManger.isEmpty())
             {
                 // then find the download manager location
                 kdDebug(1000) << "Using: "<<downloadManger <<" as Download Manager" <<endl;
-                TQString cmd = KStandardDirs::findExe(downloadManger);
+                TQString cmd = TDEStandardDirs::findExe(downloadManger);
                 if (cmd.isEmpty())
                 {
                     TQString errMsg=i18n("The Download Manager (%1) could not be found in your $PATH ").arg(downloadManger);
@@ -897,8 +897,8 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
                     downloadViaKIO = false;
                     KURL cleanDest = destURL;
                     cleanDest.setPass( TQString::null ); // don't put password into commandline
-                    cmd += " " + KProcess::quote(url.url()) + " " +
-                           KProcess::quote(cleanDest.url());
+                    cmd += " " + TDEProcess::quote(url.url()) + " " +
+                           TDEProcess::quote(cleanDest.url());
                     kdDebug(1000) << "Calling command  "<<cmd<<endl;
                     KRun::runCommand(cmd);
                 }
@@ -907,7 +907,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
 
           if ( downloadViaKIO )
           {
-              KIO::Job *job = KIO::file_copy( url, destURL, -1, true /*overwrite*/ );
+              TDEIO::Job *job = TDEIO::file_copy( url, destURL, -1, true /*overwrite*/ );
               job->setMetaData(metadata);
               job->addMetaData("MaxCacheSize", "0"); // Don't store in http cache.
               job->addMetaData("cache", "cache"); // Use entry from cache if available.
@@ -917,37 +917,37 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
     }
 }
 
-KHTMLPartBrowserHostExtension::KHTMLPartBrowserHostExtension( KHTMLPart *part )
+TDEHTMLPartBrowserHostExtension::TDEHTMLPartBrowserHostExtension( TDEHTMLPart *part )
 : KParts::BrowserHostExtension( part )
 {
   m_part = part;
 }
 
-KHTMLPartBrowserHostExtension::~KHTMLPartBrowserHostExtension()
+TDEHTMLPartBrowserHostExtension::~TDEHTMLPartBrowserHostExtension()
 {
 }
 
-TQStringList KHTMLPartBrowserHostExtension::frameNames() const
+TQStringList TDEHTMLPartBrowserHostExtension::frameNames() const
 {
   return m_part->frameNames();
 }
 
-const TQPtrList<KParts::ReadOnlyPart> KHTMLPartBrowserHostExtension::frames() const
+const TQPtrList<KParts::ReadOnlyPart> TDEHTMLPartBrowserHostExtension::frames() const
 {
   return m_part->frames();
 }
 
-bool KHTMLPartBrowserHostExtension::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
+bool TDEHTMLPartBrowserHostExtension::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
 {
   return m_part->openURLInFrame( url, urlArgs );
 }
 
-void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
+void TDEHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
 {
   if (id == VIRTUAL_FIND_FRAME_PARENT)
   {
     FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data);
-    KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame);
+    TDEHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame);
     if (parentPart)
        param->parent = parentPart->browserHostExtension();
     return;
@@ -956,24 +956,24 @@ void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
 }
 
 
-// defined in khtml_part.cpp
+// defined in tdehtml_part.cpp
 extern const int KDE_NO_EXPORT fastZoomSizes[];
 extern const int KDE_NO_EXPORT fastZoomSizeCount;
 
 // BCI: remove in KDE 4
-KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
-    : KAction( text, icon, 0, receiver, slot, parent, name )
+TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
+    : TDEAction( text, icon, 0, receiver, slot, parent, name )
 {
     init(part, direction);
 }
 
-KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
-    : KAction( text, icon, cut, receiver, slot, parent, name )
+TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
+    : TDEAction( text, icon, cut, receiver, slot, parent, name )
 {
     init(part, direction);
 }
 
-void KHTMLZoomFactorAction::init(KHTMLPart *part, bool direction)
+void TDEHTMLZoomFactorAction::init(TDEHTMLPart *part, bool direction)
 {
     m_direction = direction;
     m_part = part;
@@ -999,18 +999,18 @@ void KHTMLZoomFactorAction::init(KHTMLPart *part, bool direction)
     connect( m_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
 }
 
-KHTMLZoomFactorAction::~KHTMLZoomFactorAction()
+TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction()
 {
     delete m_popup;
 }
 
-int KHTMLZoomFactorAction::plug( TQWidget *w, int index )
+int TDEHTMLZoomFactorAction::plug( TQWidget *w, int index )
 {
-    int containerId = KAction::plug( w, index );
-    if ( containerId == -1 || !w->inherits( "KToolBar" ) )
+    int containerId = TDEAction::plug( w, index );
+    if ( containerId == -1 || !w->inherits( "TDEToolBar" ) )
         return containerId;
 
-    KToolBarButton *button = static_cast<KToolBar *>( w )->getButton( itemId( containerId ) );
+    TDEToolBarButton *button = static_cast<TDEToolBar *>( w )->getButton( itemId( containerId ) );
     if ( !button )
         return containerId;
 
@@ -1018,7 +1018,7 @@ int KHTMLZoomFactorAction::plug( TQWidget *w, int index )
     return containerId;
 }
 
-void KHTMLZoomFactorAction::slotActivated( int id )
+void TDEHTMLZoomFactorAction::slotActivated( int id )
 {
     int idx = m_popup->indexOf( id );
 
@@ -1028,5 +1028,5 @@ void KHTMLZoomFactorAction::slotActivated( int id )
         m_part->setZoomFactor(fastZoomSizes[fastZoomSizeCount/2 + (m_direction ? 1 : -1)*idx]);
 }
 
-#include "khtml_ext.moc"
+#include "tdehtml_ext.moc"
 
diff --git a/khtml/khtml_ext.h b/tdehtml/tdehtml_ext.h
index 47ab97228..7cea57956 100644
--- a/khtml/khtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -24,27 +24,27 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __khtml_ext_h__
-#define __khtml_ext_h__
+#ifndef __tdehtml_ext_h__
+#define __tdehtml_ext_h__
 
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 
 #include <tqguardedptr.h>
 
-#include <kaction.h>
-#include <kio/global.h>
+#include <tdeaction.h>
+#include <tdeio/global.h>
 
 /**
- * This is the BrowserExtension for a KHTMLPart document. Please see the KParts documentation for
+ * This is the BrowserExtension for a TDEHTMLPart document. Please see the KParts documentation for
  * more information about the BrowserExtension.
  */
-class KHTMLPartBrowserExtension : public KParts::BrowserExtension
+class TDEHTMLPartBrowserExtension : public KParts::BrowserExtension
 {
   Q_OBJECT
-  friend class KHTMLPart;
-  friend class KHTMLView;
+  friend class TDEHTMLPart;
+  friend class TDEHTMLView;
 public:
-  KHTMLPartBrowserExtension( KHTMLPart *parent, const char *name = 0L );
+  TDEHTMLPartBrowserExtension( TDEHTMLPart *parent, const char *name = 0L );
 
   virtual int xOffset();
   virtual int yOffset();
@@ -84,17 +84,17 @@ signals:
 private:
     void callExtensionProxyMethod( const char *method );
 
-    KHTMLPart *m_part;
+    TDEHTMLPart *m_part;
     TQGuardedPtr<TQWidget> m_editableFormWidget;
     TQGuardedPtr<KParts::BrowserExtension> m_extensionProxy;
     bool m_connectedToClipboard;
 };
 
-class KHTMLPartBrowserHostExtension : public KParts::BrowserHostExtension
+class TDEHTMLPartBrowserHostExtension : public KParts::BrowserHostExtension
 {
 public:
-  KHTMLPartBrowserHostExtension( KHTMLPart *part );
-  virtual ~KHTMLPartBrowserHostExtension();
+  TDEHTMLPartBrowserHostExtension( TDEHTMLPart *part );
+  virtual ~TDEHTMLPartBrowserHostExtension();
 
   virtual TQStringList frameNames() const;
 
@@ -105,27 +105,27 @@ public:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KHTMLPart *m_part;
+  TDEHTMLPart *m_part;
 };
 
 /**
  * @internal
  * INTERNAL class. *NOT* part of the public API.
  */
-class KHTMLPopupGUIClient : public TQObject, public KXMLGUIClient
+class TDEHTMLPopupGUIClient : public TQObject, public KXMLGUIClient
 {
   Q_OBJECT
 public:
-  KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, const KURL &url );
-  virtual ~KHTMLPopupGUIClient();
+  TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url );
+  virtual ~TDEHTMLPopupGUIClient();
 
   static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url,
-                       const TQMap<TQString, TQString> &metaData = KIO::MetaData(),
+                       const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
                        const TQString &filter = TQString::null, long cacheId = 0,
                        const TQString &suggestedFilename = TQString::null );
 
   static void saveURL( const KURL &url, const KURL &destination,
-                       const TQMap<TQString, TQString> &metaData = KIO::MetaData(),
+                       const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
                        long cacheId = 0 );
 private slots:
   void slotSaveLinkAs();
@@ -145,33 +145,33 @@ private slots:
   void slotBlockIFrame();
 
 private:
-  class KHTMLPopupGUIClientPrivate;
-  KHTMLPopupGUIClientPrivate *d;
+  class TDEHTMLPopupGUIClientPrivate;
+  TDEHTMLPopupGUIClientPrivate *d;
 };
 
-class KHTMLZoomFactorAction : public KAction
+class TDEHTMLZoomFactorAction : public TDEAction
 {
     Q_OBJECT
 public:
     //BCI: remove in KDE 4
-    KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name );
-    KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const TQString &text,
-            const TQString &icon, const KShortcut& cut, const TQObject *receiver,
+    TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name );
+    TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text,
+            const TQString &icon, const TDEShortcut& cut, const TQObject *receiver,
             const char *slot, TQObject *parent, const char *name );
-    virtual ~KHTMLZoomFactorAction();
+    virtual ~TDEHTMLZoomFactorAction();
 
     virtual int plug( TQWidget *widget, int index );
 
 private slots:
     void slotActivated( int );
 protected slots:
-    void slotActivated() { KAction::slotActivated(); }
+    void slotActivated() { TDEAction::slotActivated(); }
 private:
-    void init(KHTMLPart *part, bool direction);
+    void init(TDEHTMLPart *part, bool direction);
 private:
     TQPopupMenu *m_popup;
     bool m_direction;
-    KHTMLPart *m_part;
+    TDEHTMLPart *m_part;
 };
 
 #endif
diff --git a/khtml/khtml_factory.cpp b/tdehtml/tdehtml_factory.cpp
index 7eedc6311..4094030c6 100644
--- a/khtml/khtml_factory.cpp
+++ b/tdehtml/tdehtml_factory.cpp
@@ -18,9 +18,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "khtml_factory.h"
-#include "khtml_part.h"
-#include "khtml_settings.h"
+#include "tdehtml_factory.h"
+#include "tdehtml_part.h"
+#include "tdehtml_settings.h"
 
 #include "css/cssstyleselector.h"
 #include "html/html_imageimpl.h"
@@ -30,47 +30,47 @@
 #include "misc/arena.h"
 
 #include <kinstance.h>
-#include <kaboutdata.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
 #include <kdebug.h>
 
-template class TQPtrList<KHTMLPart>;
+template class TQPtrList<TDEHTMLPart>;
 
-extern "C" KDE_EXPORT void *init_libkhtml()
+extern "C" KDE_EXPORT void *init_libtdehtml()
 {
     // We can't use a plain self() here, because that would
     // return the global factory, which might already exist
-    // at the time init_libkhtml is called! As soon as someone
-    // does new KHTMLPart() in his application and loads up
+    // at the time init_libtdehtml is called! As soon as someone
+    // does new TDEHTMLPart() in his application and loads up
     // an html document into that part which either embeds
-    // embeds another KHTMLPart instance via <object> or
+    // embeds another TDEHTMLPart instance via <object> or
     // as html frame, then we cannot return self(), as
     // what we return here is what the KLibLoader deletes
     // in the end, and we don't want the libloader to
     // delete our global instance. Anyway, the new
-    // KHTMLFactory we create here is very cheap :)
+    // TDEHTMLFactory we create here is very cheap :)
     // (Simon)
-    return new KHTMLFactory( true );
+    return new TDEHTMLFactory( true );
 }
 
-KHTMLFactory *KHTMLFactory::s_self = 0;
-unsigned long int KHTMLFactory::s_refcnt = 0;
-KInstance *KHTMLFactory::s_instance = 0;
-KAboutData *KHTMLFactory::s_about = 0;
-KHTMLSettings *KHTMLFactory::s_settings = 0;
-TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0;
-TQString *KHTMLSettings::avFamilies = 0;
+TDEHTMLFactory *TDEHTMLFactory::s_self = 0;
+unsigned long int TDEHTMLFactory::s_refcnt = 0;
+TDEInstance *TDEHTMLFactory::s_instance = 0;
+TDEAboutData *TDEHTMLFactory::s_about = 0;
+TDEHTMLSettings *TDEHTMLFactory::s_settings = 0;
+TQPtrList<TDEHTMLPart> *TDEHTMLFactory::s_parts = 0;
+TQString *TDEHTMLSettings::avFamilies = 0;
 
-KHTMLFactory::KHTMLFactory( bool clone )
+TDEHTMLFactory::TDEHTMLFactory( bool clone )
 {
     if ( clone )
         ref();
 }
 
-KHTMLFactory::~KHTMLFactory()
+TDEHTMLFactory::~TDEHTMLFactory()
 {
     if ( s_self == this )
     {
@@ -79,7 +79,7 @@ KHTMLFactory::~KHTMLFactory()
         delete s_instance;
         delete s_about;
         delete s_settings;
-	delete KHTMLSettings::avFamilies;
+	delete TDEHTMLSettings::avFamilies;
         if ( s_parts )
         {
             assert( s_parts->isEmpty() );
@@ -90,49 +90,49 @@ KHTMLFactory::~KHTMLFactory()
         s_about = 0;
         s_settings = 0;
         s_parts = 0;
-	KHTMLSettings::avFamilies = 0;
+	TDEHTMLSettings::avFamilies = 0;
 
         // clean up static data
-        khtml::CSSStyleSelector::clear();
-        khtml::RenderStyle::cleanup();
-        khtml::Cache::clear();
-        khtml::cleanup_thaibreaks();
-        khtml::ArenaFinish();
+        tdehtml::CSSStyleSelector::clear();
+        tdehtml::RenderStyle::cleanup();
+        tdehtml::Cache::clear();
+        tdehtml::cleanup_thaibreaks();
+        tdehtml::ArenaFinish();
     }
     else
         deref();
 }
 
-KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & )
+KParts::Part *TDEHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & )
 {
-  KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI;
+  TDEHTMLPart::GUIProfile prof = TDEHTMLPart::DefaultGUI;
   if ( strcmp( className, "Browser/View" ) == 0 )
-    prof = KHTMLPart::BrowserViewGUI;
+    prof = TDEHTMLPart::BrowserViewGUI;
 
-  return new KHTMLPart( parentWidget, widgetName, parent, name, prof );
+  return new TDEHTMLPart( parentWidget, widgetName, parent, name, prof );
 }
 
-void KHTMLFactory::ref()
+void TDEHTMLFactory::ref()
 {
     if ( !s_refcnt && !s_self )
     {
         // we can't use a staticdeleter here, because that would mean
         // that the factory gets deleted from within a qPostRoutine, called
         // from the TQApplication destructor. That however is too late, because
-        // we want to destruct a KInstance object, which involves destructing
-        // a KConfig object, which might call KGlobal::dirs() (in sync()) which
+        // we want to destruct a TDEInstance object, which involves destructing
+        // a TDEConfig object, which might call TDEGlobal::dirs() (in sync()) which
         // probably is not going to work ;-)
         // well, perhaps I'm wrong here, but as I'm unsure I try to stay on the
         // safe side ;-) -> let's use a simple reference counting scheme
         // (Simon)
-        s_self = new KHTMLFactory;
-        khtml::Cache::init();
+        s_self = new TDEHTMLFactory;
+        tdehtml::Cache::init();
     }
 
     s_refcnt++;
 }
 
-void KHTMLFactory::deref()
+void TDEHTMLFactory::deref()
 {
     if ( !--s_refcnt && s_self )
     {
@@ -141,10 +141,10 @@ void KHTMLFactory::deref()
     }
 }
 
-void KHTMLFactory::registerPart( KHTMLPart *part )
+void TDEHTMLFactory::registerPart( TDEHTMLPart *part )
 {
     if ( !s_parts )
-        s_parts = new TQPtrList<KHTMLPart>;
+        s_parts = new TQPtrList<TDEHTMLPart>;
 
     if ( !s_parts->containsRef( part ) )
     {
@@ -153,7 +153,7 @@ void KHTMLFactory::registerPart( KHTMLPart *part )
     }
 }
 
-void KHTMLFactory::deregisterPart( KHTMLPart *part )
+void TDEHTMLFactory::deregisterPart( TDEHTMLPart *part )
 {
     assert( s_parts );
 
@@ -168,15 +168,15 @@ void KHTMLFactory::deregisterPart( KHTMLPart *part )
     }
 }
 
-KInstance *KHTMLFactory::instance()
+TDEInstance *TDEHTMLFactory::instance()
 {
   assert( s_self );
 
   if ( !s_instance )
   {
-    s_about = new KAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
+    s_about = new TDEAboutData( "tdehtml", I18N_NOOP( "TDEHTML" ), "4.0",
                               I18N_NOOP( "Embeddable HTML component" ),
-                              KAboutData::License_LGPL );
+                              TDEAboutData::License_LGPL );
     s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" );
     s_about->addAuthor( "Antti Koivisto", 0, "koivisto@kde.org" );
     s_about->addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
@@ -187,21 +187,21 @@ KInstance *KHTMLFactory::instance()
     s_about->addAuthor( "Simon Hausmann", 0, "hausmann@kde.org" );
     s_about->addAuthor( "Tobias Anton", 0, "anton@stud.fbi.fh-darmstadt.de" );
 
-    s_instance = new KInstance( s_about );
+    s_instance = new TDEInstance( s_about );
   }
 
   return s_instance;
 }
 
-KHTMLSettings *KHTMLFactory::defaultHTMLSettings()
+TDEHTMLSettings *TDEHTMLFactory::defaultHTMLSettings()
 {
   assert( s_self );
   if ( !s_settings )
-    s_settings = new KHTMLSettings();
+    s_settings = new TDEHTMLSettings();
 
   return s_settings;
 }
 
 using namespace KParts;
-#include "khtml_factory.moc"
+#include "tdehtml_factory.moc"
 
diff --git a/khtml/khtml_factory.h b/tdehtml/tdehtml_factory.h
index e9d5c62a8..3ad2aff8c 100644
--- a/khtml/khtml_factory.h
+++ b/tdehtml/tdehtml_factory.h
@@ -17,44 +17,44 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __khtml_factory_h__
-#define __khtml_factory_h__
+#ifndef __tdehtml_factory_h__
+#define __tdehtml_factory_h__
 
-#include <kparts/factory.h>
-#include <kparts/historyprovider.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/historyprovider.h>
 #include <tqptrlist.h>
 #include <kurl.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 class HistoryProvider;
-class KHTMLSettings;
-class KHTMLPart;
+class TDEHTMLSettings;
+class TDEHTMLPart;
 
 namespace DOM
 {
   class DocumentImpl;
 }
 
-class KDE_EXPORT KHTMLFactory : public KParts::Factory
+class KDE_EXPORT TDEHTMLFactory : public KParts::Factory
 {
   Q_OBJECT
   friend class DOM::DocumentImpl;
-  friend class KHTMLViewPrivate;
+  friend class TDEHTMLViewPrivate;
 public:
-  KHTMLFactory( bool clone = false );
-  virtual ~KHTMLFactory();
+  TDEHTMLFactory( bool clone = false );
+  virtual ~TDEHTMLFactory();
 
   virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args );
 
-  static void registerPart( KHTMLPart *part );
-  static void deregisterPart( KHTMLPart *part );
+  static void registerPart( TDEHTMLPart *part );
+  static void deregisterPart( TDEHTMLPart *part );
 
-  static TQPtrList<KHTMLPart> *partList() { return s_parts; }
+  static TQPtrList<TDEHTMLPart> *partList() { return s_parts; }
 
-  static KInstance *instance();
+  static TDEInstance *instance();
 
-  static KHTMLSettings *defaultHTMLSettings();
+  static TDEHTMLSettings *defaultHTMLSettings();
 
   // list of visited URLs
   static KParts::HistoryProvider *vLinks() {
@@ -66,11 +66,11 @@ protected:
   static void deref();
 private:
   static unsigned long s_refcnt;
-  static KHTMLFactory *s_self;
-  static KInstance *s_instance;
-  static KAboutData *s_about;
-  static KHTMLSettings *s_settings;
-  static TQPtrList<KHTMLPart> *s_parts;
+  static TDEHTMLFactory *s_self;
+  static TDEInstance *s_instance;
+  static TDEAboutData *s_about;
+  static TDEHTMLSettings *s_settings;
+  static TQPtrList<TDEHTMLPart> *s_parts;
 };
 
 #endif
diff --git a/khtml/khtml_iface.cc b/tdehtml/tdehtml_iface.cc
index 2746ba0d2..4bb4afd89 100644
--- a/khtml/khtml_iface.cc
+++ b/tdehtml/tdehtml_iface.cc
@@ -18,135 +18,135 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "khtml_iface.h"
-#include "khtml_part.h"
-#include "khtmlview.h"
-#include "khtml_ext.h"
-#include <kio/global.h>
+#include "tdehtml_iface.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_ext.h"
+#include <tdeio/global.h>
 #include <tqapplication.h>
 #include <tqvariant.h>
 
-KHTMLPartIface::KHTMLPartIface( KHTMLPart *_part )
+TDEHTMLPartIface::TDEHTMLPartIface( TDEHTMLPart *_part )
     : DCOPObject( _part->dcopObjectId() ), part(_part)
 {
 }
 
-KHTMLPartIface::~KHTMLPartIface()
+TDEHTMLPartIface::~TDEHTMLPartIface()
 {
 }
 
-KURL KHTMLPartIface::url() const
+KURL TDEHTMLPartIface::url() const
 {
     return part->url();
 }
 
-void KHTMLPartIface::setJScriptEnabled( bool enable )
+void TDEHTMLPartIface::setJScriptEnabled( bool enable )
 {
     part->setJScriptEnabled(enable);
 }
 
-bool KHTMLPartIface::jScriptEnabled() const
+bool TDEHTMLPartIface::jScriptEnabled() const
 {
     return part->jScriptEnabled();
 }
 
-bool KHTMLPartIface::closeURL()
+bool TDEHTMLPartIface::closeURL()
 {
     return part->closeURL();
 }
 
-bool KHTMLPartIface::metaRefreshEnabled() const
+bool TDEHTMLPartIface::metaRefreshEnabled() const
 {
     return part->metaRefreshEnabled();
 }
 
-void KHTMLPartIface::setDNDEnabled( bool b )
+void TDEHTMLPartIface::setDNDEnabled( bool b )
 {
     part->setDNDEnabled(b);
 }
 
-bool KHTMLPartIface::dndEnabled() const
+bool TDEHTMLPartIface::dndEnabled() const
 {
     return part->dndEnabled();
 }
 
-void KHTMLPartIface::setJavaEnabled( bool enable )
+void TDEHTMLPartIface::setJavaEnabled( bool enable )
 {
     part->setJavaEnabled( enable );
 }
 
-bool KHTMLPartIface::javaEnabled() const
+bool TDEHTMLPartIface::javaEnabled() const
 {
     return part->javaEnabled();
 }
 
-void KHTMLPartIface::setPluginsEnabled( bool enable )
+void TDEHTMLPartIface::setPluginsEnabled( bool enable )
 {
     part->setPluginsEnabled( enable );
 }
 
-bool KHTMLPartIface::pluginsEnabled() const
+bool TDEHTMLPartIface::pluginsEnabled() const
 {
     return part->pluginsEnabled();
 }
 
-void KHTMLPartIface::setAutoloadImages( bool enable )
+void TDEHTMLPartIface::setAutoloadImages( bool enable )
 {
     part->setAutoloadImages( enable );
 }
 
-bool KHTMLPartIface::autoloadImages() const
+bool TDEHTMLPartIface::autoloadImages() const
 {
     return part->autoloadImages();
 }
 
-void KHTMLPartIface::setOnlyLocalReferences(bool enable)
+void TDEHTMLPartIface::setOnlyLocalReferences(bool enable)
 {
     part->setOnlyLocalReferences(enable);
 }
 
-void KHTMLPartIface::setMetaRefreshEnabled( bool enable )
+void TDEHTMLPartIface::setMetaRefreshEnabled( bool enable )
 {
     part->setMetaRefreshEnabled(enable);
 }
 
-bool KHTMLPartIface::onlyLocalReferences() const
+bool TDEHTMLPartIface::onlyLocalReferences() const
 {
     return part->onlyLocalReferences();
 }
 
-bool KHTMLPartIface::setEncoding( const TQString &name )
+bool TDEHTMLPartIface::setEncoding( const TQString &name )
 {
     return part->setEncoding(name);
 }
 
-TQString KHTMLPartIface::encoding() const
+TQString TDEHTMLPartIface::encoding() const
 {
     return part->encoding();
 }
 
-void KHTMLPartIface::setFixedFont( const TQString &name )
+void TDEHTMLPartIface::setFixedFont( const TQString &name )
 {
     part->setFixedFont(name);
 
 }
 
-bool KHTMLPartIface::gotoAnchor( const TQString &name )
+bool TDEHTMLPartIface::gotoAnchor( const TQString &name )
 {
     return part->gotoAnchor(name);
 }
 
-bool KHTMLPartIface::nextAnchor()
+bool TDEHTMLPartIface::nextAnchor()
 {
     return part->nextAnchor();
 }
 
-bool KHTMLPartIface::prevAnchor()
+bool TDEHTMLPartIface::prevAnchor()
 {
     return part->prevAnchor();
 }
 
-void KHTMLPartIface::activateNode()
+void TDEHTMLPartIface::activateNode()
 {
     KParts::ReadOnlyPart* p = part->currentFrame();
     if ( p && p->widget() ) {
@@ -155,79 +155,79 @@ void KHTMLPartIface::activateNode()
     }
 }
 
-void KHTMLPartIface::selectAll()
+void TDEHTMLPartIface::selectAll()
 {
     part->selectAll();
 }
 
-TQString KHTMLPartIface::lastModified() const
+TQString TDEHTMLPartIface::lastModified() const
 {
     return part->lastModified();
 }
 
-void KHTMLPartIface::debugRenderTree()
+void TDEHTMLPartIface::debugRenderTree()
 {
     part->slotDebugRenderTree();
 }
 
-void KHTMLPartIface::debugDOMTree()
+void TDEHTMLPartIface::debugDOMTree()
 {
     part->slotDebugDOMTree();
 }
 
-void KHTMLPartIface::stopAnimations()
+void TDEHTMLPartIface::stopAnimations()
 {
     part->slotStopAnimations();
 }
 
-void KHTMLPartIface::viewDocumentSource()
+void TDEHTMLPartIface::viewDocumentSource()
 {
     part->slotViewDocumentSource();
 }
 
-void KHTMLPartIface::saveBackground(const TQString &destination)
+void TDEHTMLPartIface::saveBackground(const TQString &destination)
 {
     KURL back = part->backgroundURL();
     if (back.isEmpty())
         return;
 
-    KIO::MetaData metaData;
+    TDEIO::MetaData metaData;
     metaData["referrer"] = part->referrer();
-    KHTMLPopupGUIClient::saveURL( back, KURL( destination ), metaData );
+    TDEHTMLPopupGUIClient::saveURL( back, KURL( destination ), metaData );
 }
 
-void KHTMLPartIface::saveDocument(const TQString &destination)
+void TDEHTMLPartIface::saveDocument(const TQString &destination)
 {
     KURL srcURL( part->url() );
 
     if ( srcURL.fileName(false).isEmpty() )
         srcURL.setFileName( "index.html" );
 
-    KIO::MetaData metaData;
+    TDEIO::MetaData metaData;
     // Referrer unknown?
-    KHTMLPopupGUIClient::saveURL( srcURL, KURL( destination ), metaData, part->cacheId() );
+    TDEHTMLPopupGUIClient::saveURL( srcURL, KURL( destination ), metaData, part->cacheId() );
 }
 
-void KHTMLPartIface::setUserStyleSheet(const TQString &styleSheet)
+void TDEHTMLPartIface::setUserStyleSheet(const TQString &styleSheet)
 {
     part->setUserStyleSheet(styleSheet);
 }
 
-TQString KHTMLPartIface::selectedText() const
+TQString TDEHTMLPartIface::selectedText() const
 {
     return part->selectedText();
 }
 
-void KHTMLPartIface::viewFrameSource()
+void TDEHTMLPartIface::viewFrameSource()
 {
     part->slotViewFrameSource();
 }
 
-TQString KHTMLPartIface::evalJS(const TQString &script)
+TQString TDEHTMLPartIface::evalJS(const TQString &script)
 {
     return part->executeScript(DOM::Node(), script).toString();
 }
 
-void KHTMLPartIface::print( bool quick ) {
+void TDEHTMLPartIface::print( bool quick ) {
     part->view()->print( quick );
 }
diff --git a/khtml/khtml_iface.h b/tdehtml/tdehtml_iface.h
index 8caade850..4ca0a3e06 100644
--- a/khtml/khtml_iface.h
+++ b/tdehtml/tdehtml_iface.h
@@ -17,26 +17,26 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef __khtml_Iface_h__
-#define __khtml_Iface_h__
+#ifndef __tdehtml_Iface_h__
+#define __tdehtml_Iface_h__
 
 #include <dcopobject.h>
 #include <dcopref.h>
 #include <kurl.h>
 
-class KHTMLPart;
+class TDEHTMLPart;
 
 /**
- * DCOP interface for KHTML
+ * DCOP interface for TDEHTML
  */
-class KHTMLPartIface : public DCOPObject
+class TDEHTMLPartIface : public DCOPObject
 {
     K_DCOP
 
 public:
 
-    KHTMLPartIface( KHTMLPart * );
-    virtual ~KHTMLPartIface();
+    TDEHTMLPartIface( TDEHTMLPart * );
+    virtual ~TDEHTMLPartIface();
 
 k_dcop:
     /**
@@ -235,7 +235,7 @@ k_dcop:
     void stopAnimations();
 
 private:
-    KHTMLPart *part;
+    TDEHTMLPart *part;
 };
 
 #endif
diff --git a/khtml/khtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp
index 935f31cc0..319dd8162 100644
--- a/khtml/khtml_pagecache.cpp
+++ b/tdehtml/tdehtml_pagecache.cpp
@@ -18,10 +18,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "khtml_pagecache.h"
+#include "tdehtml_pagecache.h"
 
 #include <kstaticdeleter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 #include <tqintdict.h>
@@ -32,18 +32,18 @@
 #include <assert.h>
 
 // We keep 12 pages in memory.
-#ifndef KHTML_PAGE_CACHE_SIZE
-#define KHTML_PAGE_CACHE_SIZE 12
+#ifndef TDEHTML_PAGE_CACHE_SIZE
+#define TDEHTML_PAGE_CACHE_SIZE 12
 #endif
 
-template class TQPtrList<KHTMLPageCacheDelivery>;
-class KHTMLPageCacheEntry
+template class TQPtrList<TDEHTMLPageCacheDelivery>;
+class TDEHTMLPageCacheEntry
 {
-  friend class KHTMLPageCache;
+  friend class TDEHTMLPageCache;
 public:
-  KHTMLPageCacheEntry(long id);
+  TDEHTMLPageCacheEntry(long id);
 
-  ~KHTMLPageCacheEntry();
+  ~TDEHTMLPageCacheEntry();
 
   void addData(const TQByteArray &data);
 
@@ -52,7 +52,7 @@ public:
   bool isComplete()
    { return m_complete; }
 
-  KHTMLPageCacheDelivery *fetchData(TQObject *recvObj, const char *recvSlot);
+  TDEHTMLPageCacheDelivery *fetchData(TQObject *recvObj, const char *recvSlot);
 private:
   long m_id;
   bool m_complete;
@@ -60,38 +60,38 @@ private:
   KTempFile *m_file;
 };
 
-class KHTMLPageCachePrivate
+class TDEHTMLPageCachePrivate
 {
 public:
   long newId;
-  TQIntDict<KHTMLPageCacheEntry> dict;
-  TQPtrList<KHTMLPageCacheDelivery> delivery;
-  TQPtrList<KHTMLPageCacheEntry> expireQueue;
+  TQIntDict<TDEHTMLPageCacheEntry> dict;
+  TQPtrList<TDEHTMLPageCacheDelivery> delivery;
+  TQPtrList<TDEHTMLPageCacheEntry> expireQueue;
   bool deliveryActive;
 };
 
-KHTMLPageCacheEntry::KHTMLPageCacheEntry(long id) : m_id(id), m_complete(false)
+TDEHTMLPageCacheEntry::TDEHTMLPageCacheEntry(long id) : m_id(id), m_complete(false)
 {
-  TQString path = locateLocal("tmp", "khtmlcache");
+  TQString path = locateLocal("tmp", "tdehtmlcache");
   m_file = new KTempFile(path);
   m_file->unlink();
 }
 
-KHTMLPageCacheEntry::~KHTMLPageCacheEntry()
+TDEHTMLPageCacheEntry::~TDEHTMLPageCacheEntry()
 {
   delete m_file;
 }
 
 
 void
-KHTMLPageCacheEntry::addData(const TQByteArray &data)
+TDEHTMLPageCacheEntry::addData(const TQByteArray &data)
 {
   if (m_file->status() == 0)
      m_file->dataStream()->writeRawBytes(data.data(), data.size());
 }
 
 void
-KHTMLPageCacheEntry::endData()
+TDEHTMLPageCacheEntry::endData()
 {
   m_complete = true;
   if ( m_file->status() == 0) {
@@ -101,38 +101,38 @@ KHTMLPageCacheEntry::endData()
 }
 
 
-KHTMLPageCacheDelivery *
-KHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot)
+TDEHTMLPageCacheDelivery *
+TDEHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot)
 {
   // Duplicate fd so that entry can be safely deleted while delivering the data.
   int fd = dup(m_file->handle());
   lseek(fd, 0, SEEK_SET);
-  KHTMLPageCacheDelivery *delivery = new KHTMLPageCacheDelivery(fd);
+  TDEHTMLPageCacheDelivery *delivery = new TDEHTMLPageCacheDelivery(fd);
   recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot);
   delivery->recvObj = recvObj;
   return delivery;
 }
 
-static KStaticDeleter<KHTMLPageCache> pageCacheDeleter;
+static KStaticDeleter<TDEHTMLPageCache> pageCacheDeleter;
 
-KHTMLPageCache *KHTMLPageCache::_self = 0;
+TDEHTMLPageCache *TDEHTMLPageCache::_self = 0;
 
-KHTMLPageCache *
-KHTMLPageCache::self()
+TDEHTMLPageCache *
+TDEHTMLPageCache::self()
 {
   if (!_self)
-     _self = pageCacheDeleter.setObject(_self, new KHTMLPageCache);
+     _self = pageCacheDeleter.setObject(_self, new TDEHTMLPageCache);
   return _self;
 }
 
-KHTMLPageCache::KHTMLPageCache()
+TDEHTMLPageCache::TDEHTMLPageCache()
 {
-  d = new KHTMLPageCachePrivate;
+  d = new TDEHTMLPageCachePrivate;
   d->newId = 1;
   d->deliveryActive = false;
 }
 
-KHTMLPageCache::~KHTMLPageCache()
+TDEHTMLPageCache::~TDEHTMLPageCache()
 {
   d->delivery.setAutoDelete(true);
   d->dict.setAutoDelete(true);
@@ -140,14 +140,14 @@ KHTMLPageCache::~KHTMLPageCache()
 }
 
 long
-KHTMLPageCache::createCacheEntry()
+TDEHTMLPageCache::createCacheEntry()
 {
-  KHTMLPageCacheEntry *entry = new KHTMLPageCacheEntry(d->newId);
+  TDEHTMLPageCacheEntry *entry = new TDEHTMLPageCacheEntry(d->newId);
   d->dict.insert(d->newId, entry);
   d->expireQueue.append(entry);
-  if (d->expireQueue.count() > KHTML_PAGE_CACHE_SIZE)
+  if (d->expireQueue.count() > TDEHTML_PAGE_CACHE_SIZE)
   {
-     KHTMLPageCacheEntry *entry = d->expireQueue.take(0);
+     TDEHTMLPageCacheEntry *entry = d->expireQueue.take(0);
      d->dict.remove(entry->m_id);
      delete entry;
   }
@@ -155,25 +155,25 @@ KHTMLPageCache::createCacheEntry()
 }
 
 void
-KHTMLPageCache::addData(long id, const TQByteArray &data)
+TDEHTMLPageCache::addData(long id, const TQByteArray &data)
 {
-  KHTMLPageCacheEntry *entry = d->dict.find(id);
+  TDEHTMLPageCacheEntry *entry = d->dict.find(id);
   if (entry)
      entry->addData(data);
 }
 
 void
-KHTMLPageCache::endData(long id)
+TDEHTMLPageCache::endData(long id)
 {
-  KHTMLPageCacheEntry *entry = d->dict.find(id);
+  TDEHTMLPageCacheEntry *entry = d->dict.find(id);
   if (entry)
      entry->endData();
 }
 
 void
-KHTMLPageCache::cancelEntry(long id)
+TDEHTMLPageCache::cancelEntry(long id)
 {
-  KHTMLPageCacheEntry *entry = d->dict.take(id);
+  TDEHTMLPageCacheEntry *entry = d->dict.take(id);
   if (entry)
   {
      d->expireQueue.removeRef(entry);
@@ -182,24 +182,24 @@ KHTMLPageCache::cancelEntry(long id)
 }
 
 bool
-KHTMLPageCache::isValid(long id)
+TDEHTMLPageCache::isValid(long id)
 {
   return (d->dict.find(id) != 0);
 }
 
 bool
-KHTMLPageCache::isComplete(long id)
+TDEHTMLPageCache::isComplete(long id)
 {
-  KHTMLPageCacheEntry *entry = d->dict.find(id);
+  TDEHTMLPageCacheEntry *entry = d->dict.find(id);
   if (entry)
      return entry->isComplete();
   return false;
 }
 
 void
-KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot)
+TDEHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot)
 {
-  KHTMLPageCacheEntry *entry = d->dict.find(id);
+  TDEHTMLPageCacheEntry *entry = d->dict.find(id);
   if (!entry || !entry->isComplete()) return;
 
   // Make this entry the most recent entry.
@@ -215,10 +215,10 @@ KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot)
 }
 
 void
-KHTMLPageCache::cancelFetch(TQObject *recvObj)
+TDEHTMLPageCache::cancelFetch(TQObject *recvObj)
 {
-  KHTMLPageCacheDelivery *next;
-  for(KHTMLPageCacheDelivery* delivery = d->delivery.first();
+  TDEHTMLPageCacheDelivery *next;
+  for(TDEHTMLPageCacheDelivery* delivery = d->delivery.first();
       delivery;
       delivery = next)
   {
@@ -232,14 +232,14 @@ KHTMLPageCache::cancelFetch(TQObject *recvObj)
 }
 
 void
-KHTMLPageCache::sendData()
+TDEHTMLPageCache::sendData()
 {
   if (d->delivery.isEmpty())
   {
      d->deliveryActive = false;
      return;
   }
-  KHTMLPageCacheDelivery *delivery = d->delivery.take(0);
+  TDEHTMLPageCacheDelivery *delivery = d->delivery.take(0);
   assert(delivery);
 
   char buf[8192];
@@ -269,9 +269,9 @@ KHTMLPageCache::sendData()
 }
 
 void
-KHTMLPageCache::saveData(long id, TQDataStream *str)
+TDEHTMLPageCache::saveData(long id, TQDataStream *str)
 {
-  KHTMLPageCacheEntry *entry = d->dict.find(id);
+  TDEHTMLPageCacheEntry *entry = d->dict.find(id);
   assert(entry);
 
   int fd = entry->m_file->handle();
@@ -305,9 +305,9 @@ KHTMLPageCache::saveData(long id, TQDataStream *str)
     lseek(fd, pos, SEEK_SET);
 }
 
-KHTMLPageCacheDelivery::~KHTMLPageCacheDelivery()
+TDEHTMLPageCacheDelivery::~TDEHTMLPageCacheDelivery()
 {
   close(fd);
 }
 
-#include "khtml_pagecache.moc"
+#include "tdehtml_pagecache.moc"
diff --git a/khtml/khtml_pagecache.h b/tdehtml/tdehtml_pagecache.h
index ac9ea5b4b..4865f9eac 100644
--- a/khtml/khtml_pagecache.h
+++ b/tdehtml/tdehtml_pagecache.h
@@ -17,15 +17,15 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __khtml_pagecache_h__
-#define __khtml_pagecache_h__
+#ifndef __tdehtml_pagecache_h__
+#define __tdehtml_pagecache_h__
 
 #include <tqobject.h>
 #include <tqcstring.h>
 #include <tqvaluelist.h>
 #include <tqptrlist.h>
 
-class KHTMLPageCachePrivate;
+class TDEHTMLPageCachePrivate;
 
 /**
  * Singleton Object that handles a binary cache on top of
@@ -36,9 +36,9 @@ class KHTMLPageCachePrivate;
  * These operations always want to use the original document and 
  * don't want to fetch the data from the network again.
  *
- * It operates completely independent from the kio_http cache.
+ * It operates completely independent from the tdeio_http cache.
  */
-class KHTMLPageCache : public TQObject
+class TDEHTMLPageCache : public TQObject
 {
   Q_OBJECT
 public:
@@ -47,8 +47,8 @@ public:
    * @return returns a pointer to the cache, if it exists.
    * creates a new cache otherwise.
    */
-  static KHTMLPageCache *self();
-  ~KHTMLPageCache();
+  static TDEHTMLPageCache *self();
+  ~TDEHTMLPageCache();
   
   /**
    * Create a new cache entry. 
@@ -106,21 +106,21 @@ private slots:
   void sendData();
 
 private:  
-  KHTMLPageCache();
+  TDEHTMLPageCache();
 
-  static KHTMLPageCache *_self;
+  static TDEHTMLPageCache *_self;
 
-  KHTMLPageCachePrivate *d;  
+  TDEHTMLPageCachePrivate *d;  
 };
 
-class KHTMLPageCacheDelivery : public TQObject
+class TDEHTMLPageCacheDelivery : public TQObject
 {
-   friend class KHTMLPageCache;
+   friend class TDEHTMLPageCache;
 Q_OBJECT
 public:
-   KHTMLPageCacheDelivery(int _fd)
+   TDEHTMLPageCacheDelivery(int _fd)
     : fd(_fd) { }
-   ~KHTMLPageCacheDelivery();
+   ~TDEHTMLPageCacheDelivery();
 
 signals:
    void emitData(const TQByteArray &data);
diff --git a/khtml/khtml_part.cpp b/tdehtml/tdehtml_part.cpp
index a2843a53a..28b15c7d1 100644
--- a/khtml/khtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -28,9 +28,9 @@
  */
 
 //#define SPEED_DEBUG
-#include "khtml_part.h"
+#include "tdehtml_part.h"
 
-#include "khtml_pagecache.h"
+#include "tdehtml_pagecache.h"
 
 #include "dom/dom_string.h"
 #include "dom/dom_element.h"
@@ -53,11 +53,11 @@
 #include "css/csshelper.h"
 using namespace DOM;
 
-#include "khtmlview.h"
-#include <kparts/partmanager.h>
+#include "tdehtmlview.h"
+#include <tdeparts/partmanager.h>
 #include "ecma/kjs_proxy.h"
 #include "ecma/kjs_window.h"
-#include "khtml_settings.h"
+#include "tdehtml_settings.h"
 #include "kjserrordlg.h"
 
 #include <kjs/function.h>
@@ -75,34 +75,34 @@ using namespace DOM;
 #include <dcopref.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
-#include <kio/job.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
-#include <kprotocolmanager.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
+#include <tdeprotocolmanager.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktrader.h>
 #include <kdatastream.h>
-#include <ktempfile.h>
-#include <kglobalsettings.h>
+#include <tdetempfile.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
-#include <kapplication.h>
-#include <kparts/browserinterface.h>
+#include <tdeapplication.h>
+#include <tdeparts/browserinterface.h>
 #if !defined(QT_NO_DRAGANDDROP)
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #endif
-#include "../kutils/kfinddialog.h"
-#include "../kutils/kfind.h"
+#include "../tdeutils/kfinddialog.h"
+#include "../tdeutils/kfind.h"
 
 #include <ksslcertchain.h>
 #include <ksslinfodlg.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurifilter.h>
 #include <kstatusbar.h>
 #include <kurllabel.h>
@@ -113,19 +113,19 @@ using namespace DOM;
 #include <tqmetaobject.h>
 #include <tqucomextra_p.h>
 
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 #include "kpassivepopup.h"
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 #include "rendering/render_form.h"
 #include <twin.h>
 
 #define HINT_UTF8	106
 
-namespace khtml {
+namespace tdehtml {
     class PartStyleSheetLoader : public CachedObjectClient
     {
     public:
-        PartStyleSheetLoader(KHTMLPart *part, DOM::DOMString url, DocLoader* dl)
+        PartStyleSheetLoader(TDEHTMLPart *part, DOM::DOMString url, DocLoader* dl)
         {
             m_part = part;
             m_cachedSheet = dl->requestStyleSheet(url, TQString(), "text/css",
@@ -147,12 +147,12 @@ namespace khtml {
         virtual void error( int, const TQString& ) {
           delete this;
         }
-        TQGuardedPtr<KHTMLPart> m_part;
-        khtml::CachedCSSStyleSheet *m_cachedSheet;
+        TQGuardedPtr<TDEHTMLPart> m_part;
+        tdehtml::CachedCSSStyleSheet *m_cachedSheet;
     };
 }
 
-void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & event, const KParts::LiveConnectExtension::ArgList & args)
+void tdehtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & event, const KParts::LiveConnectExtension::ArgList & args)
 {
     if (!m_part || !m_frame || !m_liveconnect)
         // hmmm
@@ -176,9 +176,9 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e
             script += (*i).second;
     }
     script += ")";
-    kdDebug(6050) << "khtml::ChildFrame::liveConnectEvent " << script << endl;
+    kdDebug(6050) << "tdehtml::ChildFrame::liveConnectEvent " << script << endl;
 
-    KHTMLPart * part = ::tqqt_cast<KHTMLPart *>(m_part->parent());
+    TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(m_part->parent());
     if (!part)
         return;
     if (!m_jscript)
@@ -191,7 +191,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e
         part->executeScript(m_frame->element(), script);
 }
 
-KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name )
+TDEHTMLFrameList::Iterator TDEHTMLFrameList::find( const TQString &name )
 {
     Iterator it = begin();
     const Iterator e = end();
@@ -203,44 +203,44 @@ KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name )
     return it;
 }
 
-KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof )
+TDEHTMLPart::TDEHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof )
 : KParts::ReadOnlyPart( parent, name )
 {
     d = 0;
-    KHTMLFactory::registerPart( this );
-    setInstance(  KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
+    TDEHTMLFactory::registerPart( this );
+    setInstance(  TDEHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
     // TODO KDE4 - don't load plugins yet
-    //setInstance( KHTMLFactory::instance(), false );
-    init( new KHTMLView( this, parentWidget, widgetname ), prof );
+    //setInstance( TDEHTMLFactory::instance(), false );
+    init( new TDEHTMLView( this, parentWidget, widgetname ), prof );
 }
 
-KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof )
+TDEHTMLPart::TDEHTMLPart( TDEHTMLView *view, TQObject *parent, const char *name, GUIProfile prof )
 : KParts::ReadOnlyPart( parent, name )
 {
     d = 0;
-    KHTMLFactory::registerPart( this );
-    setInstance(  KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
+    TDEHTMLFactory::registerPart( this );
+    setInstance(  TDEHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() );
     // TODO KDE4 - don't load plugins yet
-    //setInstance( KHTMLFactory::instance(), false );
+    //setInstance( TDEHTMLFactory::instance(), false );
     assert( view );
     init( view, prof );
 }
 
-void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
+void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
 {
   if ( prof == DefaultGUI )
-    setXMLFile( "khtml.rc" );
+    setXMLFile( "tdehtml.rc" );
   else if ( prof == BrowserViewGUI )
-    setXMLFile( "khtml_browser.rc" );
+    setXMLFile( "tdehtml_browser.rc" );
 
-  d = new KHTMLPartPrivate(parent());
+  d = new TDEHTMLPartPrivate(parent());
 
   d->m_view = view;
   setWidget( d->m_view );
 
   d->m_guiProfile = prof;
-  d->m_extension = new KHTMLPartBrowserExtension( this, "KHTMLBrowserExtension" );
-  d->m_hostExtension = new KHTMLPartBrowserHostExtension( this );
+  d->m_extension = new TDEHTMLPartBrowserExtension( this, "TDEHTMLBrowserExtension" );
+  d->m_hostExtension = new TDEHTMLPartBrowserHostExtension( this );
   d->m_statusBarExtension = new KParts::StatusBarExtension( this );
   d->m_statusBarIconLabel = 0L;
   d->m_statusBarPopupLabel = 0L;
@@ -252,29 +252,29 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
   d->m_bMousePressed = false;
   d->m_bRightMousePressed = false;
   d->m_bCleared = false;
-  d->m_paViewDocument = new KAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
-  d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
-  d->m_paViewInfo = new KAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
-  d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
+  d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
+  d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
+  d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
+  d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
   d->m_paSaveDocument = KStdAction::saveAs( this, TQT_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
   if ( parentPart() )
-      d->m_paSaveDocument->setShortcut( KShortcut() ); // avoid clashes
-  d->m_paSaveFrame = new KAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
-  d->m_paSecurity = new KAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" );
+      d->m_paSaveDocument->setShortcut( TDEShortcut() ); // avoid clashes
+  d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+  d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" );
   d->m_paSecurity->setWhatsThis( i18n( "Security Settings<p>"
                                        "Shows the certificate of the displayed page. Only "
 				       "pages that have been transmitted using a secure, encrypted connection have a "
 				       "certificate.<p> "
 				       "Hint: If the image shows a closed lock, the page has been transmitted over a "
 				       "secure connection.") );
-  d->m_paDebugRenderTree = new KAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
-  d->m_paDebugDOMTree = new KAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
-  d->m_paStopAnimations = new KAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" );
+  d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
+  d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
+  d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" );
 
-  d->m_paSetEncoding = new KActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" );
+  d->m_paSetEncoding = new TDEActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" );
   d->m_paSetEncoding->setDelayed( false );
 
-  d->m_automaticDetection = new KPopupMenu( 0L );
+  d->m_automaticDetection = new TDEPopupMenu( 0L );
 
   d->m_automaticDetection->insertItem( i18n( "Semi-Automatic" ), 0 );
   d->m_automaticDetection->insertItem( i18n( "Arabic" ), 1 );
@@ -296,74 +296,74 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
 
   d->m_paSetEncoding->popupMenu()->insertItem( i18n( "Automatic Detection" ), d->m_automaticDetection, 0 );
 
-  d->m_paSetEncoding->insert( new KActionSeparator( actionCollection() ) );
+  d->m_paSetEncoding->insert( new TDEActionSeparator( actionCollection() ) );
 
 
-  d->m_manualDetection = new KSelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
-  TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+  d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
+  TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
   d->m_manualDetection->setItems( encodings );
   d->m_manualDetection->setCurrentItem( -1 );
   d->m_paSetEncoding->insert( d->m_manualDetection );
 
 
-  KConfig *config = KGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   if ( config->hasGroup( "HTML Settings" ) ) {
     config->setGroup( "HTML Settings" );
-    khtml::Decoder::AutoDetectLanguage language;
+    tdehtml::Decoder::AutoDetectLanguage language;
     TQCString name = TQTextCodec::codecForLocale()->name();
     name = name.lower();
 
     if ( name == "cp1256" || name == "iso-8859-6" ) {
-      language = khtml::Decoder::Arabic;
+      language = tdehtml::Decoder::Arabic;
     }
     else if ( name == "cp1257" || name == "iso-8859-13" || name == "iso-8859-4" ) {
-      language = khtml::Decoder::Baltic;
+      language = tdehtml::Decoder::Baltic;
     }
     else if ( name == "cp1250" || name == "ibm852" || name == "iso-8859-2" || name == "iso-8859-3" ) {
-      language = khtml::Decoder::CentralEuropean;
+      language = tdehtml::Decoder::CentralEuropean;
     }
     else if ( name == "cp1251" || name == "koi8-r" || name == "iso-8859-5" ) {
-      language = khtml::Decoder::Russian;
+      language = tdehtml::Decoder::Russian;
     }
     else if ( name == "koi8-u" ) {
-      language = khtml::Decoder::Ukrainian;
+      language = tdehtml::Decoder::Ukrainian;
     }
     else if ( name == "cp1253" || name == "iso-8859-7" ) {
-      language = khtml::Decoder::Greek;
+      language = tdehtml::Decoder::Greek;
     }
     else if ( name == "cp1255" || name == "iso-8859-8" || name == "iso-8859-8-i" ) {
-      language = khtml::Decoder::Hebrew;
+      language = tdehtml::Decoder::Hebrew;
     }
     else if ( name == "jis7" || name == "eucjp" || name == "sjis"  ) {
-      language = khtml::Decoder::Japanese;
+      language = tdehtml::Decoder::Japanese;
     }
     else if ( name == "cp1254" || name == "iso-8859-9" ) {
-      language = khtml::Decoder::Turkish;
+      language = tdehtml::Decoder::Turkish;
     }
     else if ( name == "cp1252" || name == "iso-8859-1" || name == "iso-8859-15" ) {
-      language = khtml::Decoder::WesternEuropean;
+      language = tdehtml::Decoder::WesternEuropean;
     }
     else
-      language = khtml::Decoder::SemiautomaticDetection;
+      language = tdehtml::Decoder::SemiautomaticDetection;
 
     int _id = config->readNumEntry( "AutomaticDetectionLanguage", language );
     d->m_automaticDetection->setItemChecked( _id, true );
     d->m_paSetEncoding->popupMenu()->setItemChecked( 0, true );
 
-    d->m_autoDetectLanguage = static_cast< khtml::Decoder::AutoDetectLanguage >( _id );
+    d->m_autoDetectLanguage = static_cast< tdehtml::Decoder::AutoDetectLanguage >( _id );
   }
 
 
-  d->m_paUseStylesheet = new KSelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
+  d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
 
   if ( prof == BrowserViewGUI ) {
-      d->m_paIncZoomFactor = new KHTMLZoomFactorAction( this, true, i18n(
+      d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n(
                   "Enlarge Font" ), "viewmag+", "CTRL++;CTRL+=", this,
               TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" );
       d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font<p>"
                                                 "Make the font in this window bigger. "
                             "Click and hold down the mouse button for a menu with all available font sizes." ) );
-      d->m_paDecZoomFactor = new KHTMLZoomFactorAction( this, false, i18n(
+      d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n(
                   "Shrink Font" ), "viewmag-", CTRL + Key_Minus, this,
               TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" );
       d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font<p>"
@@ -385,37 +385,37 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
 				       "Find the previous occurrence of the text that you "
 				       "have found using the <b>Find Text</b> function" ) );
 
-  d->m_paFindAheadText = new KAction( i18n("Find Text as You Type"), KShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
+  d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
       actionCollection(), "findAheadText");
-  d->m_paFindAheadLinks = new KAction( i18n("Find Links as You Type"), KShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
+  d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
       actionCollection(), "findAheadLink");
   d->m_paFindAheadText->setEnabled( false );
   d->m_paFindAheadLinks->setEnabled( false );
 
   if ( parentPart() )
   {
-      d->m_paFind->setShortcut( KShortcut() ); // avoid clashes
-      d->m_paFindNext->setShortcut( KShortcut() ); // avoid clashes
-      d->m_paFindPrev->setShortcut( KShortcut() ); // avoid clashes
-      d->m_paFindAheadText->setShortcut( KShortcut());
-      d->m_paFindAheadLinks->setShortcut( KShortcut());
+      d->m_paFind->setShortcut( TDEShortcut() ); // avoid clashes
+      d->m_paFindNext->setShortcut( TDEShortcut() ); // avoid clashes
+      d->m_paFindPrev->setShortcut( TDEShortcut() ); // avoid clashes
+      d->m_paFindAheadText->setShortcut( TDEShortcut());
+      d->m_paFindAheadLinks->setShortcut( TDEShortcut());
   }
 
-  d->m_paPrintFrame = new KAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
+  d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
   d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>"
 					 "Some pages have several frames. To print only a single frame, click "
 					 "on it and then use this function." ) );
 
   d->m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectAll" );
   if ( parentPart() )
-      d->m_paSelectAll->setShortcut( KShortcut() ); // avoid clashes
+      d->m_paSelectAll->setShortcut( TDEShortcut() ); // avoid clashes
 
-  d->m_paToggleCaretMode = new KToggleAction(i18n("Toggle Caret Mode"),
+  d->m_paToggleCaretMode = new TDEToggleAction(i18n("Toggle Caret Mode"),
   				Key_F7, this, TQT_SLOT(slotToggleCaretMode()),
                                 actionCollection(), "caretMode");
   d->m_paToggleCaretMode->setChecked(isCaretMode());
   if (parentPart())
-      d->m_paToggleCaretMode->setShortcut(KShortcut()); // avoid clashes
+      d->m_paToggleCaretMode->setShortcut(TDEShortcut()); // avoid clashes
 
   // set the default java(script) flags according to the current host.
   d->m_bOpenMiddleClick = d->m_settings->isOpenMiddleClickEnabled();
@@ -434,17 +434,17 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
            this, TQT_SLOT( updateActions() ) );
   connect( this, TQT_SIGNAL( completed( bool ) ),
            this, TQT_SLOT( updateActions() ) );
-  connect( this, TQT_SIGNAL( started( KIO::Job * ) ),
+  connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ),
            this, TQT_SLOT( updateActions() ) );
 
-  d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "khtml/khtml_popupmenu.rc", KHTMLFactory::instance() ) );
+  d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", TDEHTMLFactory::instance() ) );
 
-  connect( khtml::Cache::loader(), TQT_SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
-           this, TQT_SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
-  connect( khtml::Cache::loader(), TQT_SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-  connect( khtml::Cache::loader(), TQT_SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
+  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
+           this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
+  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
 
   connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) );
 
@@ -453,23 +453,23 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
   connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ),
            this, TQT_SLOT( slotRedirect() ) );
 
-  d->m_dcopobject = new KHTMLPartIface(this);
+  d->m_dcopobject = new TDEHTMLPartIface(this);
 
   // TODO KDE4 - load plugins now (see also the constructors)
   //if ( prof == BrowserViewGUI && !parentPart() )
   //        loadPlugins( partObject(), this, instance() );
 
-  // "khtml" catalog does not exist, our translations are in tdelibs.
-  // removing this catalog from KGlobal::locale() prevents problems
+  // "tdehtml" catalog does not exist, our translations are in tdelibs.
+  // removing this catalog from TDEGlobal::locale() prevents problems
   // with changing the language in applications at runtime -Thomas Reitelbach
-  KGlobal::locale()->removeCatalogue("khtml");
+  TDEGlobal::locale()->removeCatalogue("tdehtml");
 }
 
-KHTMLPart::~KHTMLPart()
+TDEHTMLPart::~TDEHTMLPart()
 {
-  //kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl;
+  //kdDebug(6050) << "TDEHTMLPart::~TDEHTMLPart " << this << endl;
 
-  KConfig *config = KGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup( "HTML Settings" );
   config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage );
 
@@ -477,7 +477,7 @@ KHTMLPart::~KHTMLPart()
   delete d->m_manualDetection;
 
   slotWalletClosed();
-  if (!parentPart()) { // only delete it if the top khtml_part closes
+  if (!parentPart()) { // only delete it if the top tdehtml_part closes
     removeJSErrorExtension();
     delete d->m_statusBarPopupLabel;
   }
@@ -496,12 +496,12 @@ KHTMLPart::~KHTMLPart()
   if (!d->m_bComplete)
     closeURL();
 
-  disconnect( khtml::Cache::loader(), TQT_SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
-           this, TQT_SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
-  disconnect( khtml::Cache::loader(), TQT_SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-  disconnect( khtml::Cache::loader(), TQT_SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
+  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
+           this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
+  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
 
   clear();
 
@@ -512,20 +512,20 @@ KHTMLPart::~KHTMLPart()
     d->m_view->m_part = 0;
   }
 
-  // Have to delete this here since we forward declare it in khtmlpart_p and
+  // Have to delete this here since we forward declare it in tdehtmlpart_p and
   // at least some compilers won't call the destructor in this case.
   delete d->m_jsedlg;
   d->m_jsedlg = 0;
 
-  if (!parentPart()) // only delete d->m_frame if the top khtml_part closes
+  if (!parentPart()) // only delete d->m_frame if the top tdehtml_part closes
       delete d->m_frame;
   delete d; d = 0;
-  KHTMLFactory::deregisterPart( this );
+  TDEHTMLFactory::deregisterPart( this );
 }
 
-bool KHTMLPart::restoreURL( const KURL &url )
+bool TDEHTMLPart::restoreURL( const KURL &url )
 {
-  kdDebug( 6050 ) << "KHTMLPart::restoreURL " << url.url() << endl;
+  kdDebug( 6050 ) << "TDEHTMLPart::restoreURL " << url.url() << endl;
 
   d->m_redirectionTimer.stop();
 
@@ -544,10 +544,10 @@ bool KHTMLPart::restoreURL( const KURL &url )
   d->m_workingURL = url;
 
   // set the java(script) flags according to the current host.
-  d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host());
-  setDebugScript( KHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled() );
-  d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host());
-  d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
+  d->m_bJScriptEnabled = TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host());
+  setDebugScript( TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled() );
+  d->m_bJavaEnabled = TDEHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host());
+  d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
 
   m_url = url;
 
@@ -555,7 +555,7 @@ bool KHTMLPart::restoreURL( const KURL &url )
   disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
   connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
 
-  KHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &)));
+  TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &)));
 
   emit started( 0L );
 
@@ -563,15 +563,15 @@ bool KHTMLPart::restoreURL( const KURL &url )
 }
 
 
-bool KHTMLPart::openURL( const KURL &url )
+bool TDEHTMLPart::openURL( const KURL &url )
 {
-  kdDebug( 6050 ) << "KHTMLPart(" << this << ")::openURL " << url.url() << endl;
+  kdDebug( 6050 ) << "TDEHTMLPart(" << this << ")::openURL " << url.url() << endl;
 
   d->m_redirectionTimer.stop();
 
   // check to see if this is an "error://" URL. This is caused when an error
   // occurs before this part was loaded (e.g. KonqRun), and is passed to
-  // khtmlpart so that it can display the error.
+  // tdehtmlpart so that it can display the error.
   if ( url.protocol() == "error" && url.hasSubURL() ) {
     closeURL();
 
@@ -590,7 +590,7 @@ bool KHTMLPart::openURL( const KURL &url )
       KURL mainURL = urls.first();
       int error = mainURL.queryItem( "error" ).toInt();
       // error=0 isn't a valid error code, so 0 means it's missing from the URL
-      if ( error == 0 ) error = KIO::ERR_UNKNOWN;
+      if ( error == 0 ) error = TDEIO::ERR_UNKNOWN;
       TQString errorText = mainURL.queryItem( "errText", HINT_UTF8 );
       urls.pop_front();
       d->m_workingURL = KURL::join( urls );
@@ -607,7 +607,7 @@ bool KHTMLPart::openURL( const KURL &url )
     if (userAgent != KProtocolManager::userAgentForHost(TQString())) {
       if (!d->m_statusBarUALabel) {
         d->m_statusBarUALabel = new KURLLabel(d->m_statusBarExtension->statusBar());
-        d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
+        d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small));
         d->m_statusBarUALabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
         d->m_statusBarUALabel->setUseCursor(false);
         d->m_statusBarExtension->addStatusBarItem(d->m_statusBarUALabel, 0, false);
@@ -644,7 +644,7 @@ bool KHTMLPart::openURL( const KURL &url )
     bool noReloadForced = !args.reload && !args.redirectedRequest() && !args.doPost();
     if (noReloadForced && urlcmp( url.url(), m_url.url(), true, true ))
     {
-        kdDebug( 6050 ) << "KHTMLPart::openURL, jumping to anchor. m_url = " << url.url() << endl;
+        kdDebug( 6050 ) << "TDEHTMLPart::openURL, jumping to anchor. m_url = " << url.url() << endl;
         m_url = url;
         emit started( 0L );
 
@@ -698,36 +698,36 @@ bool KHTMLPart::openURL( const KURL &url )
   if (d->m_restored)
   {
      args.metaData().insert("referrer", d->m_pageReferrer);
-     d->m_cachePolicy = KIO::CC_Cache;
+     d->m_cachePolicy = TDEIO::CC_Cache;
   }
   else if (args.reload)
-     d->m_cachePolicy = KIO::CC_Reload;
+     d->m_cachePolicy = TDEIO::CC_Reload;
   else
      d->m_cachePolicy = KProtocolManager::cacheControl();
 
   if ( args.doPost() && (m_url.protocol().startsWith("http")) )
   {
-      d->m_job = KIO::http_post( m_url, args.postData, false );
+      d->m_job = TDEIO::http_post( m_url, args.postData, false );
       d->m_job->addMetaData("content-type", args.contentType() );
   }
   else
   {
-      d->m_job = KIO::get( m_url, false, false );
-      d->m_job->addMetaData("cache", KIO::getCacheControlString(d->m_cachePolicy));
+      d->m_job = TDEIO::get( m_url, false, false );
+      d->m_job->addMetaData("cache", TDEIO::getCacheControlString(d->m_cachePolicy));
   }
 
   if (widget())
      d->m_job->setWindow(widget()->topLevelWidget());
   d->m_job->addMetaData(args.metaData());
 
-  connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
-           TQT_SLOT( slotFinished( KIO::Job* ) ) );
-  connect( d->m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
-  connect ( d->m_job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
-           TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) );
-  connect( d->m_job, TQT_SIGNAL(redirection(KIO::Job*, const KURL& ) ),
-           TQT_SLOT( slotRedirection(KIO::Job*, const KURL&) ) );
+  connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+  connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+  connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+           TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
 
   d->m_bComplete = false;
   d->m_bLoadEventEmitted = false;
@@ -737,20 +737,20 @@ bool KHTMLPart::openURL( const KURL &url )
     d->m_statusBarText[BarOverrideText] = d->m_statusBarText[BarDefaultText] = TQString();
 
   // set the javascript flags according to the current url
-  d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host());
-  setDebugScript( KHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled() );
-  d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host());
-  d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
+  d->m_bJScriptEnabled = TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host());
+  setDebugScript( TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled() );
+  d->m_bJavaEnabled = TDEHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host());
+  d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
 
 
-  connect( d->m_job, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
-           this, TQT_SLOT( slotJobSpeed( KIO::Job*, unsigned long ) ) );
+  connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+           this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) );
 
-  connect( d->m_job, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-           this, TQT_SLOT( slotJobPercent( KIO::Job*, unsigned long ) ) );
+  connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+           this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) );
 
-  connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
-           this, TQT_SLOT( slotJobDone( KIO::Job* ) ) );
+  connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) );
 
   d->m_jobspeed = 0;
 
@@ -758,20 +758,20 @@ bool KHTMLPart::openURL( const KURL &url )
   // do a stat to see whether the stylesheet was changed in the meanwhile.
   if ( args.reload && !settings()->userStyleSheet().isEmpty() ) {
     KURL url( settings()->userStyleSheet() );
-    KIO::StatJob *job = KIO::stat( url, false /* don't show progress */ );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( slotUserSheetStatDone( KIO::Job * ) ) );
+    TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) );
   }
   emit started( 0L );
 
   return true;
 }
 
-bool KHTMLPart::closeURL()
+bool TDEHTMLPart::closeURL()
 {
   if ( d->m_job )
   {
-    KHTMLPageCache::self()->cancelEntry(d->m_cacheId);
+    TDEHTMLPageCache::self()->cancelEntry(d->m_cacheId);
     d->m_job->kill();
     d->m_job = 0;
   }
@@ -793,7 +793,7 @@ bool KHTMLPart::closeURL()
 
   disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
 
-  KHTMLPageCache::self()->cancelFetch(this);
+  TDEHTMLPageCache::self()->cancelFetch(this);
   if ( d->m_doc && d->m_doc->parsing() )
   {
     kdDebug( 6050 ) << " was still parsing... calling end " << endl;
@@ -811,7 +811,7 @@ bool KHTMLPart::closeURL()
   d->m_workingURL = KURL();
 
   if ( d->m_doc && d->m_doc->docLoader() )
-    khtml::Cache::loader()->cancelRequests( d->m_doc->docLoader() );
+    tdehtml::Cache::loader()->cancelRequests( d->m_doc->docLoader() );
 
   // tell all subframes to stop as well
   {
@@ -849,7 +849,7 @@ bool KHTMLPart::closeURL()
   return true;
 }
 
-DOM::HTMLDocument KHTMLPart::htmlDocument() const
+DOM::HTMLDocument TDEHTMLPart::htmlDocument() const
 {
   if (d->m_doc && d->m_doc->isHTMLDocument())
     return static_cast<HTMLDocumentImpl*>(d->m_doc);
@@ -857,26 +857,26 @@ DOM::HTMLDocument KHTMLPart::htmlDocument() const
     return static_cast<HTMLDocumentImpl*>(0);
 }
 
-DOM::Document KHTMLPart::document() const
+DOM::Document TDEHTMLPart::document() const
 {
     return d->m_doc;
 }
 
-TQString KHTMLPart::documentSource() const
+TQString TDEHTMLPart::documentSource() const
 {
   TQString sourceStr;
-  if ( !( m_url.isLocalFile() ) && KHTMLPageCache::self()->isComplete( d->m_cacheId ) )
+  if ( !( m_url.isLocalFile() ) && TDEHTMLPageCache::self()->isComplete( d->m_cacheId ) )
   {
      TQByteArray sourceArray;
      TQDataStream dataStream( sourceArray, IO_WriteOnly );
-     KHTMLPageCache::self()->saveData( d->m_cacheId, &dataStream );
+     TDEHTMLPageCache::self()->saveData( d->m_cacheId, &dataStream );
      TQTextStream stream( sourceArray, IO_ReadOnly );
      stream.setCodec( TQTextCodec::codecForName( encoding().latin1() ) );
      sourceStr = stream.read();
   } else
   {
     TQString tmpFile;
-    if( KIO::NetAccess::download( m_url, tmpFile, NULL ) )
+    if( TDEIO::NetAccess::download( m_url, tmpFile, NULL ) )
     {
       TQFile f( tmpFile );
       if ( f.open( IO_ReadOnly ) )
@@ -886,7 +886,7 @@ TQString KHTMLPart::documentSource() const
 	sourceStr = stream.read();
         f.close();
       }
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     }
   }
 
@@ -894,27 +894,27 @@ TQString KHTMLPart::documentSource() const
 }
 
 
-KParts::BrowserExtension *KHTMLPart::browserExtension() const
+KParts::BrowserExtension *TDEHTMLPart::browserExtension() const
 {
   return d->m_extension;
 }
 
-KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const
+KParts::BrowserHostExtension *TDEHTMLPart::browserHostExtension() const
 {
   return d->m_hostExtension;
 }
 
-KHTMLView *KHTMLPart::view() const
+TDEHTMLView *TDEHTMLPart::view() const
 {
   return d->m_view;
 }
 
-void KHTMLPart::setStatusMessagesEnabled( bool enable )
+void TDEHTMLPart::setStatusMessagesEnabled( bool enable )
 {
   d->m_statusMessagesEnabled = enable;
 }
 
-KJS::Interpreter *KHTMLPart::jScriptInterpreter()
+KJS::Interpreter *TDEHTMLPart::jScriptInterpreter()
 {
   KJSProxy *proxy = jScript();
   if (!proxy || proxy->paused())
@@ -923,12 +923,12 @@ KJS::Interpreter *KHTMLPart::jScriptInterpreter()
   return proxy->interpreter();
 }
 
-bool KHTMLPart::statusMessagesEnabled() const
+bool TDEHTMLPart::statusMessagesEnabled() const
 {
   return d->m_statusMessagesEnabled;
 }
 
-void KHTMLPart::setJScriptEnabled( bool enable )
+void TDEHTMLPart::setJScriptEnabled( bool enable )
 {
   if ( !enable && jScriptEnabled() && d->m_frame && d->m_frame->m_jscript ) {
     d->m_frame->m_jscript->clear();
@@ -937,7 +937,7 @@ void KHTMLPart::setJScriptEnabled( bool enable )
   d->m_bJScriptOverride = true;
 }
 
-bool KHTMLPart::jScriptEnabled() const
+bool TDEHTMLPart::jScriptEnabled() const
 {
   if(onlyLocalReferences()) return false;
 
@@ -946,30 +946,30 @@ bool KHTMLPart::jScriptEnabled() const
   return d->m_bJScriptEnabled;
 }
 
-void KHTMLPart::setMetaRefreshEnabled( bool enable )
+void TDEHTMLPart::setMetaRefreshEnabled( bool enable )
 {
   d->m_metaRefreshEnabled = enable;
 }
 
-bool KHTMLPart::metaRefreshEnabled() const
+bool TDEHTMLPart::metaRefreshEnabled() const
 {
   return d->m_metaRefreshEnabled;
 }
 
 // Define this to disable dlopening kjs_html, when directly linking to it.
-// You need to edit khtml/Makefile.am to add ./ecma/libkjs_html.la to LIBADD
-// and to edit khtml/ecma/Makefile.am to s/kjs_html/libkjs_html/, remove libkhtml from LIBADD,
+// You need to edit tdehtml/Makefile.am to add ./ecma/libkjs_html.la to LIBADD
+// and to edit tdehtml/ecma/Makefile.am to s/kjs_html/libkjs_html/, remove libtdehtml from LIBADD,
 //        remove LDFLAGS line, and replace kde_module with either lib (shared) or noinst (static)
-//        Also, change the order of "ecma" and "." in khtml's SUBDIRS line.
+//        Also, change the order of "ecma" and "." in tdehtml's SUBDIRS line.
 // OK - that's the default now, use the opposite of the above instructions to go back
 // to "dlopening it" - but it breaks exception catching in kjs_binding.cpp
 #define DIRECT_LINKAGE_TO_ECMA
 
 #ifdef DIRECT_LINKAGE_TO_ECMA
-extern "C" { KJSProxy *kjs_html_init(khtml::ChildFrame * childframe); }
+extern "C" { KJSProxy *kjs_html_init(tdehtml::ChildFrame * childframe); }
 #endif
 
-static bool createJScript(khtml::ChildFrame *frame)
+static bool createJScript(tdehtml::ChildFrame *frame)
 {
 #ifndef DIRECT_LINKAGE_TO_ECMA
   KLibrary *lib = KLibLoader::self()->library("kjs_html");
@@ -984,7 +984,7 @@ static bool createJScript(khtml::ChildFrame *frame)
     setJScriptEnabled( false );
     return false;
   }
-  typedef KJSProxy* (*initFunction)(khtml::ChildFrame *);
+  typedef KJSProxy* (*initFunction)(tdehtml::ChildFrame *);
   initFunction initSym = (initFunction) sym;
   frame->m_jscript = (*initSym)(d->m_frame);
   frame->m_kjs_lib = lib;
@@ -995,14 +995,14 @@ static bool createJScript(khtml::ChildFrame *frame)
   return true;
 }
 
-KJSProxy *KHTMLPart::jScript()
+KJSProxy *TDEHTMLPart::jScript()
 {
   if (!jScriptEnabled()) return 0;
 
   if ( !d->m_frame ) {
-      KHTMLPart * p = parentPart();
+      TDEHTMLPart * p = parentPart();
       if (!p) {
-          d->m_frame = new khtml::ChildFrame;
+          d->m_frame = new tdehtml::ChildFrame;
           d->m_frame->m_part = this;
       } else {
           ConstFrameIt it = p->d->m_frames.begin();
@@ -1025,9 +1025,9 @@ KJSProxy *KHTMLPart::jScript()
   return d->m_frame->m_jscript;
 }
 
-TQVariant KHTMLPart::crossFrameExecuteScript(const TQString& target,  const TQString& script)
+TQVariant TDEHTMLPart::crossFrameExecuteScript(const TQString& target,  const TQString& script)
 {
-  KHTMLPart* destpart = this;
+  TDEHTMLPart* destpart = this;
 
   TQString trg = target.lower();
 
@@ -1063,7 +1063,7 @@ TQVariant KHTMLPart::crossFrameExecuteScript(const TQString& target,  const TQSt
 //Enable this to see all JS scripts being executed
 //#define KJS_VERBOSE
 
-KJSErrorDlg *KHTMLPart::jsErrorExtension() {
+KJSErrorDlg *TDEHTMLPart::jsErrorExtension() {
   if (!d->m_settings->jsErrorsEnabled()) {
     return 0L;
   }
@@ -1074,7 +1074,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() {
 
   if (!d->m_statusBarJSErrorLabel) {
     d->m_statusBarJSErrorLabel = new KURLLabel(d->m_statusBarExtension->statusBar());
-    d->m_statusBarJSErrorLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
+    d->m_statusBarJSErrorLabel->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small));
     d->m_statusBarJSErrorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     d->m_statusBarJSErrorLabel->setUseCursor(false);
     d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false);
@@ -1086,7 +1086,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() {
   if (!d->m_jsedlg) {
     d->m_jsedlg = new KJSErrorDlg;
     d->m_jsedlg->setURL(m_url.prettyURL());
-    if (KGlobalSettings::showIconsOnPushButtons()) {
+    if (TDEGlobalSettings::showIconsOnPushButtons()) {
       d->m_jsedlg->_clear->setIconSet(SmallIconSet("locationbar_erase"));
       d->m_jsedlg->_close->setIconSet(SmallIconSet("fileclose"));
     }
@@ -1094,7 +1094,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() {
   return d->m_jsedlg;
 }
 
-void KHTMLPart::removeJSErrorExtension() {
+void TDEHTMLPart::removeJSErrorExtension() {
   if (parentPart()) {
     parentPart()->removeJSErrorExtension();
     return;
@@ -1108,24 +1108,24 @@ void KHTMLPart::removeJSErrorExtension() {
   d->m_jsedlg = 0;
 }
 
-void KHTMLPart::disableJSErrorExtension() {
+void TDEHTMLPart::disableJSErrorExtension() {
   removeJSErrorExtension();
   // These two lines are really kind of hacky, and it sucks to do this inside
-  // KHTML but I don't know of anything that's reasonably easy as an alternative
+  // TDEHTML but I don't know of anything that's reasonably easy as an alternative
   // right now.  It makes me wonder if there should be a more clean way to
-  // contact all running "KHTML" instance as opposed to Konqueror instances too.
+  // contact all running "TDEHTML" instance as opposed to Konqueror instances too.
   d->m_settings->setJSErrorsEnabled(false);
   DCOPClient::mainClient()->send("konqueror*", "KonquerorIface", "reparseConfiguration()", TQByteArray());
 }
 
-void KHTMLPart::jsErrorDialogContextMenu() {
-  KPopupMenu *m = new KPopupMenu(0L);
+void TDEHTMLPart::jsErrorDialogContextMenu() {
+  TDEPopupMenu *m = new TDEPopupMenu(0L);
   m->insertItem(i18n("&Hide Errors"), this, TQT_SLOT(removeJSErrorExtension()));
   m->insertItem(i18n("&Disable Error Reporting"), this, TQT_SLOT(disableJSErrorExtension()));
   m->popup(TQCursor::pos());
 }
 
-void KHTMLPart::launchJSErrorDialog() {
+void TDEHTMLPart::launchJSErrorDialog() {
   KJSErrorDlg *dlg = jsErrorExtension();
   if (dlg) {
     dlg->show();
@@ -1133,13 +1133,13 @@ void KHTMLPart::launchJSErrorDialog() {
   }
 }
 
-void KHTMLPart::launchJSConfigDialog() {
+void TDEHTMLPart::launchJSConfigDialog() {
   TQStringList args;
-  args << "khtml_java_js";
-  KApplication::tdeinitExec( "kcmshell", args );
+  args << "tdehtml_java_js";
+  TDEApplication::tdeinitExec( "tdecmshell", args );
 }
 
-TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script)
+TQVariant TDEHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script)
 {
 #ifdef KJS_VERBOSE
   // The script is now printed by KJS's Parser::parse
@@ -1170,7 +1170,7 @@ TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const
   {
     kdDebug(6070) << "executeScript done, handling immediate redirection NOW" << endl;
     // Must abort tokenizer, no further script must execute.
-    khtml::Tokenizer* t = d->m_doc->tokenizer();
+    tdehtml::Tokenizer* t = d->m_doc->tokenizer();
     if(t)
       t->abort();
     d->m_redirectionTimer.start( 0, true );
@@ -1179,15 +1179,15 @@ TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const
   return ret;
 }
 
-TQVariant KHTMLPart::executeScript( const TQString &script )
+TQVariant TDEHTMLPart::executeScript( const TQString &script )
 {
     return executeScript( DOM::Node(), script );
 }
 
-TQVariant KHTMLPart::executeScript( const DOM::Node &n, const TQString &script )
+TQVariant TDEHTMLPart::executeScript( const DOM::Node &n, const TQString &script )
 {
 #ifdef KJS_VERBOSE
-  kdDebug(6070) << "KHTMLPart::executeScript caller='" << name() << "' node=" << n.nodeName().string().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " /* << script */ << endl;
+  kdDebug(6070) << "TDEHTMLPart::executeScript caller='" << name() << "' node=" << n.nodeName().string().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " /* << script */ << endl;
 #endif
   KJSProxy *proxy = jScript();
 
@@ -1213,14 +1213,14 @@ TQVariant KHTMLPart::executeScript( const DOM::Node &n, const TQString &script )
       submitFormAgain();
 
 #ifdef KJS_VERBOSE
-  kdDebug(6070) << "KHTMLPart::executeScript - done" << endl;
+  kdDebug(6070) << "TDEHTMLPart::executeScript - done" << endl;
 #endif
   return ret;
 }
 
-bool KHTMLPart::scheduleScript(const DOM::Node &n, const TQString& script)
+bool TDEHTMLPart::scheduleScript(const DOM::Node &n, const TQString& script)
 {
-    //kdDebug(6050) << "KHTMLPart::scheduleScript "<< script << endl;
+    //kdDebug(6050) << "TDEHTMLPart::scheduleScript "<< script << endl;
 
     d->scheduledScript = script;
     d->scheduledScriptNode = n;
@@ -1228,7 +1228,7 @@ bool KHTMLPart::scheduleScript(const DOM::Node &n, const TQString& script)
     return true;
 }
 
-TQVariant KHTMLPart::executeScheduledScript()
+TQVariant TDEHTMLPart::executeScheduledScript()
 {
   if( d->scheduledScript.isEmpty() )
     return TQVariant();
@@ -1242,13 +1242,13 @@ TQVariant KHTMLPart::executeScheduledScript()
   return ret;
 }
 
-void KHTMLPart::setJavaEnabled( bool enable )
+void TDEHTMLPart::setJavaEnabled( bool enable )
 {
   d->m_bJavaForce = enable;
   d->m_bJavaOverride = true;
 }
 
-bool KHTMLPart::javaEnabled() const
+bool TDEHTMLPart::javaEnabled() const
 {
   if (onlyLocalReferences()) return false;
 
@@ -1261,23 +1261,23 @@ bool KHTMLPart::javaEnabled() const
 #endif
 }
 
-KJavaAppletContext *KHTMLPart::javaContext()
+KJavaAppletContext *TDEHTMLPart::javaContext()
 {
   return 0;
 }
 
-KJavaAppletContext *KHTMLPart::createJavaContext()
+KJavaAppletContext *TDEHTMLPart::createJavaContext()
 {
   return 0;
 }
 
-void KHTMLPart::setPluginsEnabled( bool enable )
+void TDEHTMLPart::setPluginsEnabled( bool enable )
 {
   d->m_bPluginsForce = enable;
   d->m_bPluginsOverride = true;
 }
 
-bool KHTMLPart::pluginsEnabled() const
+bool TDEHTMLPart::pluginsEnabled() const
 {
   if (onlyLocalReferences()) return false;
 
@@ -1288,7 +1288,7 @@ bool KHTMLPart::pluginsEnabled() const
 
 static int s_DOMTreeIndentLevel = 0;
 
-void KHTMLPart::slotDebugDOMTree()
+void TDEHTMLPart::slotDebugDOMTree()
 {
   if ( d->m_doc && d->m_doc->firstChild() )
     tqDebug("%s", d->m_doc->firstChild()->toString().string().latin1());
@@ -1300,21 +1300,21 @@ void KHTMLPart::slotDebugDOMTree()
   ConstFrameIt it = d->m_frames.begin();
   const ConstFrameIt end = d->m_frames.end();
   for (; it != end; ++it )
-    if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "KHTMLPart" ) ) {
+    if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "TDEHTMLPart" ) ) {
       KParts::ReadOnlyPart* const p = ( *it )->m_part;
       kdDebug(6050) << TQString().leftJustify(s_DOMTreeIndentLevel*4,' ') << "FRAME " << p->name() << " " << endl;
-      static_cast<KHTMLPart*>( p )->slotDebugDOMTree();
+      static_cast<TDEHTMLPart*>( p )->slotDebugDOMTree();
     }
   s_DOMTreeIndentLevel = indentLevel;
 }
 
-void KHTMLPart::slotDebugScript()
+void TDEHTMLPart::slotDebugScript()
 {
   if (jScript())
     jScript()->showDebugWindow();
 }
 
-void KHTMLPart::slotDebugRenderTree()
+void TDEHTMLPart::slotDebugRenderTree()
 {
 #ifndef NDEBUG
   if ( d->m_doc ) {
@@ -1328,12 +1328,12 @@ void KHTMLPart::slotDebugRenderTree()
 #endif
 }
 
-void KHTMLPart::slotStopAnimations()
+void TDEHTMLPart::slotStopAnimations()
 {
   stopAnimations();
 }
 
-void KHTMLPart::setAutoloadImages( bool enable )
+void TDEHTMLPart::setAutoloadImages( bool enable )
 {
   if ( d->m_doc && d->m_doc->docLoader()->autoloadImages() == enable )
     return;
@@ -1348,16 +1348,16 @@ void KHTMLPart::setAutoloadImages( bool enable )
     d->m_paLoadImages = 0;
   }
   else if ( !d->m_paLoadImages )
-    d->m_paLoadImages = new KAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
+    d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
 
   if ( d->m_paLoadImages ) {
-    TQPtrList<KAction> lst;
+    TQPtrList<TDEAction> lst;
     lst.append( d->m_paLoadImages );
     plugActionList( "loadImages", lst );
   }
 }
 
-bool KHTMLPart::autoloadImages() const
+bool TDEHTMLPart::autoloadImages() const
 {
   if ( d->m_doc )
     return d->m_doc->docLoader()->autoloadImages();
@@ -1365,7 +1365,7 @@ bool KHTMLPart::autoloadImages() const
   return true;
 }
 
-void KHTMLPart::clear()
+void TDEHTMLPart::clear()
 {
   if ( d->m_bCleared )
     return;
@@ -1434,7 +1434,7 @@ void KHTMLPart::clear()
 
   if (d->m_frames.count())
   {
-    KHTMLFrameList frames = d->m_frames;
+    TDEHTMLFrameList frames = d->m_frames;
     d->m_frames.clear();
     ConstFrameIt it = frames.begin();
     const ConstFrameIt end = frames.end();
@@ -1452,7 +1452,7 @@ void KHTMLPart::clear()
 
   if (d->m_objects.count())
   {
-    KHTMLFrameList objects = d->m_objects;
+    TDEHTMLFrameList objects = d->m_objects;
     d->m_objects.clear();
     ConstFrameIt oi = objects.begin();
     const ConstFrameIt oiEnd = objects.end();
@@ -1492,39 +1492,39 @@ void KHTMLPart::clear()
 #endif
 }
 
-bool KHTMLPart::openFile()
+bool TDEHTMLPart::openFile()
 {
   return true;
 }
 
-DOM::HTMLDocumentImpl *KHTMLPart::docImpl() const
+DOM::HTMLDocumentImpl *TDEHTMLPart::docImpl() const
 {
     if ( d && d->m_doc && d->m_doc->isHTMLDocument() )
         return static_cast<HTMLDocumentImpl*>(d->m_doc);
     return 0;
 }
 
-DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
+DOM::DocumentImpl *TDEHTMLPart::xmlDocImpl() const
 {
     if ( d )
         return d->m_doc;
     return 0;
 }
 
-void KHTMLPart::slotInfoMessage(KIO::Job* kio_job, const TQString& msg)
+void TDEHTMLPart::slotInfoMessage(TDEIO::Job* tdeio_job, const TQString& msg)
 {
-  assert(d->m_job == kio_job);
+  assert(d->m_job == tdeio_job);
 
   if (!parentPart())
     setStatusBarText(msg, BarDefaultText);
 }
 
-void KHTMLPart::setPageSecurity( PageSecurity sec )
+void TDEHTMLPart::setPageSecurity( PageSecurity sec )
 {
   emit d->m_extension->setPageSecurity( sec );
   if ( sec != NotCrypted && !d->m_statusBarIconLabel && !parentPart() ) {
     d->m_statusBarIconLabel = new KURLLabel( d->m_statusBarExtension->statusBar() );
-    d->m_statusBarIconLabel->setFixedHeight( instance()->iconLoader()->currentSize(KIcon::Small) );
+    d->m_statusBarIconLabel->setFixedHeight( instance()->iconLoader()->currentSize(TDEIcon::Small) );
     d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
     d->m_statusBarIconLabel->setUseCursor( false );
     d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false );
@@ -1562,9 +1562,9 @@ void KHTMLPart::setPageSecurity( PageSecurity sec )
     d->m_statusBarIconLabel->setPixmap( SmallIcon( iconName, instance() ) );
 }
 
-void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
+void TDEHTMLPart::slotData( TDEIO::Job* tdeio_job, const TQByteArray &data )
 {
-  assert ( d->m_job == kio_job );
+  assert ( d->m_job == tdeio_job );
 
   //kdDebug( 6050 ) << "slotData: " << data.size() << endl;
   // The first data ?
@@ -1579,14 +1579,14 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
     begin( d->m_workingURL, d->m_extension->urlArgs().xOffset, d->m_extension->urlArgs().yOffset );
     d->m_job->resume();
 
-    if (d->m_cachePolicy == KIO::CC_Refresh)
-      d->m_doc->docLoader()->setCachePolicy(KIO::CC_Verify);
+    if (d->m_cachePolicy == TDEIO::CC_Refresh)
+      d->m_doc->docLoader()->setCachePolicy(TDEIO::CC_Verify);
     else
       d->m_doc->docLoader()->setCachePolicy(d->m_cachePolicy);
 
     d->m_workingURL = KURL();
 
-    d->m_cacheId = KHTMLPageCache::self()->createCacheEntry();
+    d->m_cacheId = TDEHTMLPageCache::self()->createCacheEntry();
 
     // When the first data arrives, the metadata has just been made available
     d->m_httpHeaders = d->m_job->queryMetaData("HTTP-Headers");
@@ -1599,7 +1599,7 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
     d->m_ssl_in_use = (d->m_job->queryMetaData("ssl_in_use") == "TRUE");
 
     {
-    KHTMLPart *p = parentPart();
+    TDEHTMLPart *p = parentPart();
     if (p && p->d->m_ssl_in_use != d->m_ssl_in_use) {
 	while (p->parentPart()) p = p->parentPart();
 
@@ -1663,13 +1663,13 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
         d->m_lastModified = TQString(); // done on-demand by lastModified()
   }
 
-  KHTMLPageCache::self()->addData(d->m_cacheId, data);
+  TDEHTMLPageCache::self()->addData(d->m_cacheId, data);
   write( data.data(), data.size() );
   if (d->m_frame && d->m_frame->m_jscript)
     d->m_frame->m_jscript->dataReceived();
 }
 
-void KHTMLPart::slotRestoreData(const TQByteArray &data )
+void TDEHTMLPart::slotRestoreData(const TQByteArray &data )
 {
   // The first data ?
   if ( !d->m_workingURL.isEmpty() )
@@ -1696,12 +1696,12 @@ void KHTMLPart::slotRestoreData(const TQByteArray &data )
   }
 }
 
-void KHTMLPart::showError( KIO::Job* job )
+void TDEHTMLPart::showError( TDEIO::Job* job )
 {
-  kdDebug(6050) << "KHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete
+  kdDebug(6050) << "TDEHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete
                 << " d->m_bCleared=" << d->m_bCleared << endl;
 
-  if (job->error() == KIO::ERR_NO_CONTENT)
+  if (job->error() == TDEIO::ERR_NO_CONTENT)
 	return;
 
   if ( (d->m_doc && d->m_doc->parsing()) || d->m_workingURL.isEmpty() ) // if we got any data already
@@ -1713,9 +1713,9 @@ void KHTMLPart::showError( KIO::Job* job )
 }
 
 // This is a protected method, placed here because of it's relevance to showError
-void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqUrl )
+void TDEHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqUrl )
 {
-  kdDebug(6050) << "KHTMLPart::htmlError errorCode=" << errorCode << " text=" << text << endl;
+  kdDebug(6050) << "TDEHTMLPart::htmlError errorCode=" << errorCode << " text=" << text << endl;
   // make sure we're not executing any embedded JS
   bool bJSFO = d->m_bJScriptForce;
   bool bJSOO = d->m_bJScriptOverride;
@@ -1728,7 +1728,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
   errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
   errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
   errText += TQString::fromLatin1( "</P>" );
-  errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) );
+  errText += TQStyleSheet::convertFromPlainText( TDEIO::buildErrorString( errorCode, text ) );
   errText += TQString::fromLatin1( "</BODY></HTML>" );
   write(errText);
   end();
@@ -1749,7 +1749,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
   TQString errorName, techName, description;
   TQStringList causes, solutions;
 
-  TQByteArray raw = KIO::rawErrorDetail( errorCode, text, &reqUrl );
+  TQByteArray raw = TDEIO::rawErrorDetail( errorCode, text, &reqUrl );
   TQDataStream stream(raw, IO_ReadOnly);
 
   stream >> errorName >> techName >> description >> causes >> solutions;
@@ -1757,7 +1757,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
   TQString url, protocol, datetime;
   url = reqUrl.prettyURL();
   protocol = reqUrl.protocol();
-  datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
+  datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
                                                 false );
 
   TQString doc = TQString::fromLatin1( "<html><head><title>" );
@@ -1812,21 +1812,21 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
   end();
 }
 
-void KHTMLPart::slotFinished( KIO::Job * job )
+void TDEHTMLPart::slotFinished( TDEIO::Job * job )
 {
   d->m_job = 0L;
   d->m_jobspeed = 0L;
 
   if (job->error())
   {
-    KHTMLPageCache::self()->cancelEntry(d->m_cacheId);
+    TDEHTMLPageCache::self()->cancelEntry(d->m_cacheId);
 
     // The following catches errors that occur as a result of HTTP
     // to FTP redirections where the FTP URL is a directory. Since
     // KIO cannot change a redirection request from GET to LISTDIR,
     // we have to take care of it here once we know for sure it is
     // a directory...
-    if (job->error() == KIO::ERR_IS_DIRECTORY)
+    if (job->error() == TDEIO::ERR_IS_DIRECTORY)
     {
       KParts::URLArgs args;
       emit d->m_extension->openURLRequest( d->m_workingURL, args );
@@ -1841,9 +1841,9 @@ void KHTMLPart::slotFinished( KIO::Job * job )
 
     return;
   }
-  KIO::TransferJob *tjob = ::tqqt_cast<KIO::TransferJob*>(job);
+  TDEIO::TransferJob *tjob = ::tqqt_cast<TDEIO::TransferJob*>(job);
   if (tjob && tjob->isErrorPage()) {
-    khtml::RenderPart *renderPart = d->m_frame ? static_cast<khtml::RenderPart *>(d->m_frame->m_frame) : 0;
+    tdehtml::RenderPart *renderPart = d->m_frame ? static_cast<tdehtml::RenderPart *>(d->m_frame->m_frame) : 0;
     if (renderPart) {
       HTMLObjectElementImpl* elt = static_cast<HTMLObjectElementImpl *>(renderPart->element());
       if (!elt)
@@ -1856,12 +1856,12 @@ void KHTMLPart::slotFinished( KIO::Job * job )
 
   //kdDebug( 6050 ) << "slotFinished" << endl;
 
-  KHTMLPageCache::self()->endData(d->m_cacheId);
+  TDEHTMLPageCache::self()->endData(d->m_cacheId);
   if (d->m_frame && d->m_frame->m_jscript)
     d->m_frame->m_jscript->dataReceived();
 
   if ( d->m_doc && d->m_doc->docLoader()->expireDate() && m_url.protocol().lower().startsWith("http"))
-      KIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
+      TDEIO::http_update_cache(m_url, false, d->m_doc->docLoader()->expireDate());
 
   d->m_workingURL = KURL();
 
@@ -1869,17 +1869,17 @@ void KHTMLPart::slotFinished( KIO::Job * job )
     end(); //will emit completed()
 }
 
-void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
+void TDEHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
 {
   // No need to show this for a new page until an error is triggered
   if (!parentPart()) {
     removeJSErrorExtension();
     setSuppressedPopupIndicator( false );
     d->m_openableSuppressedPopups = 0;
-    for ( TQValueListIterator<TQGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
+    for ( TQValueListIterator<TQGuardedPtr<TDEHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
           i != d->m_suppressedPopupOriginParts.end(); ++i ) {
 
-      if (KHTMLPart* part = *i) {
+      if (TDEHTMLPart* part = *i) {
         KJS::Window *w = KJS::Window::retrieveWindow( part );
         if (w)
           w->forgetSuppressedWindows();
@@ -1895,10 +1895,10 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
 
   if(url.isValid()) {
       TQString urlString = url.url();
-      KHTMLFactory::vLinks()->insert( urlString );
+      TDEHTMLFactory::vLinks()->insert( urlString );
       TQString urlString2 = url.prettyURL();
       if ( urlString != urlString2 ) {
-          KHTMLFactory::vLinks()->insert( urlString2 );
+          TDEHTMLFactory::vLinks()->insert( urlString2 );
       }
   }
 
@@ -1928,7 +1928,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
     // HTML or XHTML? (#86446)
     static_cast<HTMLDocumentImpl *>(d->m_doc)->setHTMLRequested( !servedAsXHTML );
   }
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
 //  d->m_view->initCaret();
 #endif
 
@@ -1937,14 +1937,14 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
   if (!d->m_doc->attached())
     d->m_doc->attach( );
   d->m_doc->setBaseURL( KURL() );
-  d->m_doc->docLoader()->setShowAnimations( KHTMLFactory::defaultHTMLSettings()->showAnimations() );
+  d->m_doc->docLoader()->setShowAnimations( TDEHTMLFactory::defaultHTMLSettings()->showAnimations() );
   emit docCreated();
 
   d->m_paUseStylesheet->setItems(TQStringList());
   d->m_paUseStylesheet->setEnabled( false );
 
-  setAutoloadImages( KHTMLFactory::defaultHTMLSettings()->autoLoadImages() );
-  TQString userStyleSheet = KHTMLFactory::defaultHTMLSettings()->userStyleSheet();
+  setAutoloadImages( TDEHTMLFactory::defaultHTMLSettings()->autoLoadImages() );
+  TQString userStyleSheet = TDEHTMLFactory::defaultHTMLSettings()->userStyleSheet();
   if ( !userStyleSheet.isEmpty() )
     setUserStyleSheet( KURL( userStyleSheet ) );
 
@@ -1957,7 +1957,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
   d->m_doc->setParsing(true);
 }
 
-void KHTMLPart::write( const char *str, int len )
+void TDEHTMLPart::write( const char *str, int len )
 {
   if ( !d->m_decoder )
     d->m_decoder = createDecoder();
@@ -1977,19 +1977,19 @@ void KHTMLPart::write( const char *str, int len )
       d->m_doc->determineParseMode( decoded );
       d->m_bFirstData = false;
 
-  //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
+  //kdDebug(6050) << "TDEHTMLPart::write haveEnc = " << d->m_haveEncoding << endl;
       // ### this is still quite hacky, but should work a lot better than the old solution
       if(d->m_decoder->visuallyOrdered()) d->m_doc->setVisuallyOrdered();
       d->m_doc->setDecoderCodec(d->m_decoder->codec());
       d->m_doc->recalcStyle( NodeImpl::Force );
   }
 
-  khtml::Tokenizer* t = d->m_doc->tokenizer();
+  tdehtml::Tokenizer* t = d->m_doc->tokenizer();
   if(t)
     t->write( decoded, true );
 }
 
-void KHTMLPart::write( const TQString &str )
+void TDEHTMLPart::write( const TQString &str )
 {
     if ( str.isNull() )
         return;
@@ -1999,12 +1999,12 @@ void KHTMLPart::write( const TQString &str )
         d->m_doc->setParseMode( DocumentImpl::Strict );
         d->m_bFirstData = false;
     }
-    khtml::Tokenizer* t = d->m_doc->tokenizer();
+    tdehtml::Tokenizer* t = d->m_doc->tokenizer();
     if(t)
         t->write( str, true );
 }
 
-void KHTMLPart::end()
+void TDEHTMLPart::end()
 {
     if (d->m_doc) {
         if (d->m_decoder) {
@@ -2019,7 +2019,7 @@ void KHTMLPart::end()
     }
 }
 
-bool KHTMLPart::doOpenStream( const TQString& mimeType )
+bool TDEHTMLPart::doOpenStream( const TQString& mimeType )
 {
     KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
     if ( mime->is( "text/html" ) || mime->is( "text/xml" ) )
@@ -2030,40 +2030,40 @@ bool KHTMLPart::doOpenStream( const TQString& mimeType )
     return false;
 }
 
-bool KHTMLPart::doWriteStream( const TQByteArray& data )
+bool TDEHTMLPart::doWriteStream( const TQByteArray& data )
 {
     write( data.data(), data.size() );
     return true;
 }
 
-bool KHTMLPart::doCloseStream()
+bool TDEHTMLPart::doCloseStream()
 {
     end();
     return true;
 }
 
 
-void KHTMLPart::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
+void TDEHTMLPart::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
 {
     if (!d->m_view) return;
     d->m_view->paint(p, rc, yOff, more);
 }
 
-void KHTMLPart::stopAnimations()
+void TDEHTMLPart::stopAnimations()
 {
   if ( d->m_doc )
-    d->m_doc->docLoader()->setShowAnimations( KHTMLSettings::KAnimationDisabled );
+    d->m_doc->docLoader()->setShowAnimations( TDEHTMLSettings::KAnimationDisabled );
 
   ConstFrameIt it = d->m_frames.begin();
   const ConstFrameIt end = d->m_frames.end();
   for (; it != end; ++it )
-    if ( !(*it)->m_part.isNull() && (*it)->m_part->inherits( "KHTMLPart" ) ) {
+    if ( !(*it)->m_part.isNull() && (*it)->m_part->inherits( "TDEHTMLPart" ) ) {
       KParts::ReadOnlyPart* const p = ( *it )->m_part;
-      static_cast<KHTMLPart*>( p )->stopAnimations();
+      static_cast<TDEHTMLPart*>( p )->stopAnimations();
     }
 }
 
-void KHTMLPart::resetFromScript()
+void TDEHTMLPart::resetFromScript()
 {
     closeURL();
     d->m_bComplete = false;
@@ -2075,7 +2075,7 @@ void KHTMLPart::resetFromScript()
     emit started( 0L );
 }
 
-void KHTMLPart::slotFinishedParsing()
+void TDEHTMLPart::slotFinishedParsing()
 {
   d->m_doc->setParsing(false);
   checkEmitLoadEvent();
@@ -2087,12 +2087,12 @@ void KHTMLPart::slotFinishedParsing()
   checkCompleted();
 }
 
-void KHTMLPart::slotLoaderRequestStarted( khtml::DocLoader* dl, khtml::CachedObject *obj )
+void TDEHTMLPart::slotLoaderRequestStarted( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj )
 {
-  if ( obj && obj->type() == khtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
-    KHTMLPart* p = this;
+  if ( obj && obj->type() == tdehtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
+    TDEHTMLPart* p = this;
     while ( p ) {
-      KHTMLPart* const op = p;
+      TDEHTMLPart* const op = p;
       ++(p->d->m_totalObjectCount);
       p = p->parentPart();
       if ( !p && op->d->m_loadedObjects <= op->d->m_totalObjectCount
@@ -2102,12 +2102,12 @@ void KHTMLPart::slotLoaderRequestStarted( khtml::DocLoader* dl, khtml::CachedObj
   }
 }
 
-void KHTMLPart::slotLoaderRequestDone( khtml::DocLoader* dl, khtml::CachedObject *obj )
+void TDEHTMLPart::slotLoaderRequestDone( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj )
 {
-  if ( obj && obj->type() == khtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
-    KHTMLPart* p = this;
+  if ( obj && obj->type() == tdehtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
+    TDEHTMLPart* p = this;
     while ( p ) {
-      KHTMLPart* const op = p;
+      TDEHTMLPart* const op = p;
       ++(p->d->m_loadedObjects);
       p = p->parentPart();
       if ( !p && op->d->m_loadedObjects <= op->d->m_totalObjectCount && op->d->m_jobPercent <= 100
@@ -2119,7 +2119,7 @@ void KHTMLPart::slotLoaderRequestDone( khtml::DocLoader* dl, khtml::CachedObject
   checkCompleted();
 }
 
-void KHTMLPart::slotProgressUpdate()
+void TDEHTMLPart::slotProgressUpdate()
 {
   int percent;
   if ( d->m_loadedObjects < d->m_totalObjectCount )
@@ -2140,14 +2140,14 @@ void KHTMLPart::slotProgressUpdate()
   emit d->m_extension->loadingProgress( percent );
 }
 
-void KHTMLPart::slotJobSpeed( KIO::Job* /*job*/, unsigned long speed )
+void TDEHTMLPart::slotJobSpeed( TDEIO::Job* /*job*/, unsigned long speed )
 {
   d->m_jobspeed = speed;
   if (!parentPart())
     setStatusBarText(jsStatusBarText(), BarOverrideText);
 }
 
-void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent )
+void TDEHTMLPart::slotJobPercent( TDEIO::Job* /*job*/, unsigned long percent )
 {
   d->m_jobPercent = percent;
 
@@ -2155,7 +2155,7 @@ void KHTMLPart::slotJobPercent( KIO::Job* /*job*/, unsigned long percent )
     d->m_progressUpdateTimer.start( 0, true );
 }
 
-void KHTMLPart::slotJobDone( KIO::Job* /*job*/ )
+void TDEHTMLPart::slotJobDone( TDEIO::Job* /*job*/ )
 {
   d->m_jobPercent = 100;
 
@@ -2163,16 +2163,16 @@ void KHTMLPart::slotJobDone( KIO::Job* /*job*/ )
     d->m_progressUpdateTimer.start( 0, true );
 }
 
-void KHTMLPart::slotUserSheetStatDone( KIO::Job *_job )
+void TDEHTMLPart::slotUserSheetStatDone( TDEIO::Job *_job )
 {
-  using namespace KIO;
+  using namespace TDEIO;
 
   if ( _job->error() ) {
     showError( _job );
     return;
   }
 
-  const UDSEntry entry = dynamic_cast<KIO::StatJob *>( _job )->statResult();
+  const UDSEntry entry = dynamic_cast<TDEIO::StatJob *>( _job )->statResult();
   UDSEntry::ConstIterator it = entry.begin();
   const UDSEntry::ConstIterator end = entry.end();
   for ( ; it != end; ++it ) {
@@ -2194,9 +2194,9 @@ void KHTMLPart::slotUserSheetStatDone( KIO::Job *_job )
   setUserStyleSheet( KURL( settings()->userStyleSheet() ) );
 }
 
-void KHTMLPart::checkCompleted()
+void TDEHTMLPart::checkCompleted()
 {
-//   kdDebug( 6050 ) << "KHTMLPart::checkCompleted() " << this << " " << name() << endl;
+//   kdDebug( 6050 ) << "TDEHTMLPart::checkCompleted() " << this << " " << name() << endl;
 //   kdDebug( 6050 ) << "                           parsing: " << (d->m_doc && d->m_doc->parsing()) << endl;
 //   kdDebug( 6050 ) << "                           complete: " << d->m_bComplete << endl;
 
@@ -2240,7 +2240,7 @@ void KHTMLPart::checkCompleted()
   // Still waiting for images/scripts from the loader ?
   int requests = 0;
   if ( d->m_doc && d->m_doc->docLoader() )
-    requests = khtml::Cache::loader()->numRequests( d->m_doc->docLoader() );
+    requests = tdehtml::Cache::loader()->numRequests( d->m_doc->docLoader() );
 
   if ( requests > 0 )
   {
@@ -2255,9 +2255,9 @@ void KHTMLPart::checkCompleted()
   d->m_totalObjectCount = 0;
   d->m_loadedObjects = 0;
 
-  KHTMLPart* p = this;
+  TDEHTMLPart* p = this;
   while ( p ) {
-    KHTMLPart* op = p;
+    TDEHTMLPart* op = p;
     p = p->parentPart();
     if ( !p && !op->d->m_progressUpdateTimer.isActive())
       op->d->m_progressUpdateTimer.start( 0, true );
@@ -2312,7 +2312,7 @@ void KHTMLPart::checkCompleted()
 #endif
 }
 
-void KHTMLPart::checkEmitLoadEvent()
+void TDEHTMLPart::checkEmitLoadEvent()
 {
   if ( d->m_bLoadEventEmitted || !d->m_doc || d->m_doc->parsing() ) return;
 
@@ -2334,7 +2334,7 @@ void KHTMLPart::checkEmitLoadEvent()
   // ## This makes this method very similar to checkCompleted. A brave soul should try merging them.
   int requests = 0;
   if ( d->m_doc && d->m_doc->docLoader() )
-    requests = khtml::Cache::loader()->numRequests( d->m_doc->docLoader() );
+    requests = tdehtml::Cache::loader()->numRequests( d->m_doc->docLoader() );
 
   if ( requests > 0 )
     return;
@@ -2344,20 +2344,20 @@ void KHTMLPart::checkEmitLoadEvent()
     d->m_doc->close();
 }
 
-const KHTMLSettings *KHTMLPart::settings() const
+const TDEHTMLSettings *TDEHTMLPart::settings() const
 {
   return d->m_settings;
 }
 
 #ifndef KDE_NO_COMPAT
-KURL KHTMLPart::baseURL() const
+KURL TDEHTMLPart::baseURL() const
 {
   if ( !d->m_doc ) return KURL();
 
   return d->m_doc->baseURL();
 }
 
-TQString KHTMLPart::baseTarget() const
+TQString TDEHTMLPart::baseTarget() const
 {
   if ( !d->m_doc ) return TQString();
 
@@ -2365,7 +2365,7 @@ TQString KHTMLPart::baseTarget() const
 }
 #endif
 
-KURL KHTMLPart::completeURL( const TQString &url )
+KURL TDEHTMLPart::completeURL( const TQString &url )
 {
   if ( !d->m_doc ) return KURL( url );
 
@@ -2377,9 +2377,9 @@ KURL KHTMLPart::completeURL( const TQString &url )
 
 // Called by ecma/kjs_window in case of redirections from Javascript,
 // and by xml/dom_docimpl.cpp in case of http-equiv meta refresh.
-void KHTMLPart::scheduleRedirection( int delay, const TQString &url, bool doLockHistory )
+void TDEHTMLPart::scheduleRedirection( int delay, const TQString &url, bool doLockHistory )
 {
-  kdDebug(6050) << "KHTMLPart::scheduleRedirection delay=" << delay << " url=" << url << endl;
+  kdDebug(6050) << "TDEHTMLPart::scheduleRedirection delay=" << delay << " url=" << url << endl;
   kdDebug(6050) << "current redirectURL=" << d->m_redirectURL << " with delay " << d->m_delayRedirect <<  endl;
   if( delay < 24*60*60 &&
       ( d->m_redirectURL.isEmpty() || delay <= d->m_delayRedirect) ) {
@@ -2394,7 +2394,7 @@ void KHTMLPart::scheduleRedirection( int delay, const TQString &url, bool doLock
   }
 }
 
-void KHTMLPart::slotRedirect()
+void TDEHTMLPart::slotRedirect()
 {
   kdDebug(6050) << this << " slotRedirect()" << endl;
   TQString u = d->m_redirectURL;
@@ -2405,7 +2405,7 @@ void KHTMLPart::slotRedirect()
   if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
   {
     TQString script = KURL::decode_string( u.right( u.length() - 11 ) );
-    kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl;
+    kdDebug( 6050 ) << "TDEHTMLPart::slotRedirect script=" << script << endl;
     TQVariant res = executeScript( DOM::Node(), script );
     if ( res.type() == TQVariant::String ) {
       begin( url() );
@@ -2425,7 +2425,7 @@ void KHTMLPart::slotRedirect()
 
   if (!kapp || !kapp->authorizeURLAction("redirect", cUrl, url))
   {
-    kdWarning(6050) << "KHTMLPart::scheduleRedirection: Redirection from " << cUrl << " to " << url << " REJECTED!" << endl;
+    kdWarning(6050) << "TDEHTMLPart::scheduleRedirection: Redirection from " << cUrl << " to " << url << " REJECTED!" << endl;
     emit completed();
     return;
   }
@@ -2453,7 +2453,7 @@ void KHTMLPart::slotRedirect()
     emit completed();
 }
 
-void KHTMLPart::slotRedirection(KIO::Job*, const KURL& url)
+void TDEHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url)
 {
   // the slave told us that we got redirected
   //kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl;
@@ -2461,7 +2461,7 @@ void KHTMLPart::slotRedirection(KIO::Job*, const KURL& url)
   d->m_workingURL = url;
 }
 
-bool KHTMLPart::setEncoding( const TQString &name, bool override )
+bool TDEHTMLPart::setEncoding( const TQString &name, bool override )
 {
     d->m_encoding = name;
     d->m_haveEncoding = override;
@@ -2479,7 +2479,7 @@ bool KHTMLPart::setEncoding( const TQString &name, bool override )
     return true;
 }
 
-TQString KHTMLPart::encoding() const
+TQString TDEHTMLPart::encoding() const
 {
     if(d->m_haveEncoding && !d->m_encoding.isEmpty())
         return d->m_encoding;
@@ -2490,7 +2490,7 @@ TQString KHTMLPart::encoding() const
     return defaultEncoding();
 }
 
-TQString KHTMLPart::defaultEncoding() const
+TQString TDEHTMLPart::defaultEncoding() const
 {
   TQString encoding = settings()->encoding();
   if ( !encoding.isEmpty() )
@@ -2500,22 +2500,22 @@ TQString KHTMLPart::defaultEncoding() const
   if ( url().protocol().startsWith( "http" ) )
     return "iso-8859-1";
   else
-    return KGlobal::locale()->encoding();
+    return TDEGlobal::locale()->encoding();
 }
 
-void KHTMLPart::setUserStyleSheet(const KURL &url)
+void TDEHTMLPart::setUserStyleSheet(const KURL &url)
 {
   if ( d->m_doc && d->m_doc->docLoader() )
-    (void) new khtml::PartStyleSheetLoader(this, url.url(), d->m_doc->docLoader());
+    (void) new tdehtml::PartStyleSheetLoader(this, url.url(), d->m_doc->docLoader());
 }
 
-void KHTMLPart::setUserStyleSheet(const TQString &styleSheet)
+void TDEHTMLPart::setUserStyleSheet(const TQString &styleSheet)
 {
   if ( d->m_doc )
     d->m_doc->setUserStyleSheet( styleSheet );
 }
 
-bool KHTMLPart::gotoAnchor( const TQString &name )
+bool TDEHTMLPart::gotoAnchor( const TQString &name )
 {
   if (!d->m_doc)
     return false;
@@ -2539,7 +2539,7 @@ bool KHTMLPart::gotoAnchor( const TQString &name )
       d->m_view->setContentsPos(0, 0);
       return true;
   } else if (!n) {
-      kdDebug(6050) << "KHTMLPart::gotoAnchor node '" << name << "' not found" << endl;
+      kdDebug(6050) << "TDEHTMLPart::gotoAnchor node '" << name << "' not found" << endl;
       return false;
   }
 
@@ -2563,7 +2563,7 @@ bool KHTMLPart::gotoAnchor( const TQString &name )
   return true;
 }
 
-bool KHTMLPart::nextAnchor()
+bool TDEHTMLPart::nextAnchor()
 {
   if (!d->m_doc)
     return false;
@@ -2572,7 +2572,7 @@ bool KHTMLPart::nextAnchor()
   return true;
 }
 
-bool KHTMLPart::prevAnchor()
+bool TDEHTMLPart::prevAnchor()
 {
   if (!d->m_doc)
     return false;
@@ -2581,70 +2581,70 @@ bool KHTMLPart::prevAnchor()
   return true;
 }
 
-void KHTMLPart::setStandardFont( const TQString &name )
+void TDEHTMLPart::setStandardFont( const TQString &name )
 {
     d->m_settings->setStdFontName(name);
 }
 
-void KHTMLPart::setFixedFont( const TQString &name )
+void TDEHTMLPart::setFixedFont( const TQString &name )
 {
     d->m_settings->setFixedFontName(name);
 }
 
-void KHTMLPart::setURLCursor( const TQCursor &c )
+void TDEHTMLPart::setURLCursor( const TQCursor &c )
 {
   d->m_linkCursor = c;
 }
 
-TQCursor KHTMLPart::urlCursor() const
+TQCursor TDEHTMLPart::urlCursor() const
 {
   return d->m_linkCursor;
 }
 
-bool KHTMLPart::onlyLocalReferences() const
+bool TDEHTMLPart::onlyLocalReferences() const
 {
   return d->m_onlyLocalReferences;
 }
 
-void KHTMLPart::setOnlyLocalReferences(bool enable)
+void TDEHTMLPart::setOnlyLocalReferences(bool enable)
 {
   d->m_onlyLocalReferences = enable;
 }
 
-void KHTMLPartPrivate::setFlagRecursively(
-	bool KHTMLPartPrivate::*flag, bool value)
+void TDEHTMLPartPrivate::setFlagRecursively(
+	bool TDEHTMLPartPrivate::*flag, bool value)
 {
   // first set it on the current one
   this->*flag = value;
 
   // descend into child frames recursively
   {
-    TQValueList<khtml::ChildFrame*>::Iterator it = m_frames.begin();
-    const TQValueList<khtml::ChildFrame*>::Iterator itEnd = m_frames.end();
+    TQValueList<tdehtml::ChildFrame*>::Iterator it = m_frames.begin();
+    const TQValueList<tdehtml::ChildFrame*>::Iterator itEnd = m_frames.end();
     for (; it != itEnd; ++it) {
-      KHTMLPart* const part = static_cast<KHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part);
-      if (part->inherits("KHTMLPart"))
+      TDEHTMLPart* const part = static_cast<TDEHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part);
+      if (part->inherits("TDEHTMLPart"))
         part->d->setFlagRecursively(flag, value);
     }/*next it*/
   }
   // do the same again for objects
   {
-    TQValueList<khtml::ChildFrame*>::Iterator it = m_objects.begin();
-    const TQValueList<khtml::ChildFrame*>::Iterator itEnd = m_objects.end();
+    TQValueList<tdehtml::ChildFrame*>::Iterator it = m_objects.begin();
+    const TQValueList<tdehtml::ChildFrame*>::Iterator itEnd = m_objects.end();
     for (; it != itEnd; ++it) {
-      KHTMLPart* const part = static_cast<KHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part);
-      if (part->inherits("KHTMLPart"))
+      TDEHTMLPart* const part = static_cast<TDEHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part);
+      if (part->inherits("TDEHTMLPart"))
         part->d->setFlagRecursively(flag, value);
     }/*next it*/
   }
 }
 
-void KHTMLPart::setCaretMode(bool enable)
+void TDEHTMLPart::setCaretMode(bool enable)
 {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
   kdDebug(6200) << "setCaretMode(" << enable << ")" << endl;
   if (isCaretMode() == enable) return;
-  d->setFlagRecursively(&KHTMLPartPrivate::m_caretMode, enable);
+  d->setFlagRecursively(&TDEHTMLPartPrivate::m_caretMode, enable);
   // FIXME: this won't work on frames as expected
   if (!isEditable()) {
     if (enable) {
@@ -2653,19 +2653,19 @@ void KHTMLPart::setCaretMode(bool enable)
     } else
       view()->caretOff();
   }/*end if*/
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 }
 
-bool KHTMLPart::isCaretMode() const
+bool TDEHTMLPart::isCaretMode() const
 {
   return d->m_caretMode;
 }
 
-void KHTMLPart::setEditable(bool enable)
+void TDEHTMLPart::setEditable(bool enable)
 {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
   if (isEditable() == enable) return;
-  d->setFlagRecursively(&KHTMLPartPrivate::m_designMode, enable);
+  d->setFlagRecursively(&TDEHTMLPartPrivate::m_designMode, enable);
   // FIXME: this won't work on frames as expected
   if (!isCaretMode()) {
     if (enable) {
@@ -2674,17 +2674,17 @@ void KHTMLPart::setEditable(bool enable)
     } else
       view()->caretOff();
   }/*end if*/
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 }
 
-bool KHTMLPart::isEditable() const
+bool TDEHTMLPart::isEditable() const
 {
   return d->m_designMode;
 }
 
-void KHTMLPart::setCaretPosition(DOM::Node node, long offset, bool extendSelection)
+void TDEHTMLPart::setCaretPosition(DOM::Node node, long offset, bool extendSelection)
 {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
 #if 0
   kdDebug(6200) << k_funcinfo << "node: " << node.handle() << " nodeName: "
   	<< node.nodeName().string() << " offset: " << offset
@@ -2693,28 +2693,28 @@ void KHTMLPart::setCaretPosition(DOM::Node node, long offset, bool extendSelecti
   if (view()->moveCaretTo(node.handle(), offset, !extendSelection))
     emitSelectionChanged();
   view()->ensureCaretVisible();
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 }
 
-KHTMLPart::CaretDisplayPolicy KHTMLPart::caretDisplayPolicyNonFocused() const
+TDEHTMLPart::CaretDisplayPolicy TDEHTMLPart::caretDisplayPolicyNonFocused() const
 {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
   return (CaretDisplayPolicy)view()->caretDisplayPolicyNonFocused();
-#else // KHTML_NO_CARET
+#else // TDEHTML_NO_CARET
   return CaretInvisible;
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 }
 
-void KHTMLPart::setCaretDisplayPolicyNonFocused(CaretDisplayPolicy policy)
+void TDEHTMLPart::setCaretDisplayPolicyNonFocused(CaretDisplayPolicy policy)
 {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
   view()->setCaretDisplayPolicyNonFocused(policy);
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 }
 
-void KHTMLPart::setCaretVisible(bool show)
+void TDEHTMLPart::setCaretVisible(bool show)
 {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
   if (show) {
 
     NodeImpl *caretNode = xmlDocImpl()->focusNode();
@@ -2728,10 +2728,10 @@ void KHTMLPart::setCaretVisible(bool show)
     view()->caretOff();
 
   }/*end if*/
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 }
 
-void KHTMLPart::findTextBegin()
+void TDEHTMLPart::findTextBegin()
 {
   d->m_findPos = -1;
   d->m_findNode = 0;
@@ -2744,7 +2744,7 @@ void KHTMLPart::findTextBegin()
   d->m_find = 0L;
 }
 
-bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
+bool TDEHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
 {
     if ( !d->m_doc )
         return false;
@@ -2796,7 +2796,7 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
       if ( reverse )
       {
         // Need to find out the really last object, to start from it
-        khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
+        tdehtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
         if ( obj )
         {
           // find the last object in the render tree
@@ -2817,7 +2817,7 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor )
 }
 
 // Old method (its API limits the available features - remove in KDE-4)
-bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp )
+bool TDEHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp )
 {
     if ( !initFindNode( false, !forward, d->m_findNode ) )
       return false;
@@ -2845,7 +2845,7 @@ bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensit
             if(d->m_findPos != -1)
             {
                 int x = 0, y = 0;
-                if(static_cast<khtml::RenderText *>(d->m_findNode->renderer())
+                if(static_cast<tdehtml::RenderText *>(d->m_findNode->renderer())
                   ->posOfChar(d->m_findPos, x, y))
                     d->m_view->setContentsPos(x-50, y-50);
 
@@ -2898,91 +2898,91 @@ bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensit
 }
 
 
-void KHTMLPart::slotFind()
+void TDEHTMLPart::slotFind()
 {
   KParts::ReadOnlyPart *part = currentFrame();
   if (!part)
     return;
-  if (!part->inherits("KHTMLPart") )
+  if (!part->inherits("TDEHTMLPart") )
   {
       kdError(6000) << "slotFind: part is a " << part->className() << ", can't do a search into it" << endl;
       return;
   }
-  static_cast<KHTMLPart *>( part )->findText();
+  static_cast<TDEHTMLPart *>( part )->findText();
 }
 
-void KHTMLPart::slotFindNext()
+void TDEHTMLPart::slotFindNext()
 {
   KParts::ReadOnlyPart *part = currentFrame();
   if (!part)
     return;
-  if (!part->inherits("KHTMLPart") )
+  if (!part->inherits("TDEHTMLPart") )
   {
       kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl;
       return;
   }
-  static_cast<KHTMLPart *>( part )->findTextNext();
+  static_cast<TDEHTMLPart *>( part )->findTextNext();
 }
 
-void KHTMLPart::slotFindPrev()
+void TDEHTMLPart::slotFindPrev()
 {
   KParts::ReadOnlyPart *part = currentFrame();
   if (!part)
     return;
-  if (!part->inherits("KHTMLPart") )
+  if (!part->inherits("TDEHTMLPart") )
   {
       kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl;
       return;
   }
-  static_cast<KHTMLPart *>( part )->findTextNext( true ); // reverse
+  static_cast<TDEHTMLPart *>( part )->findTextNext( true ); // reverse
 }
 
-void KHTMLPart::slotFindDone()
+void TDEHTMLPart::slotFindDone()
 {
   // ### remove me
 }
 
-void KHTMLPart::slotFindAheadText()
+void TDEHTMLPart::slotFindAheadText()
 {
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
   KParts::ReadOnlyPart *part = currentFrame();
   if (!part)
     return;
-  if (!part->inherits("KHTMLPart") )
+  if (!part->inherits("TDEHTMLPart") )
   {
       kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl;
       return;
   }
-  static_cast<KHTMLPart *>( part )->view()->startFindAhead( false );
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+  static_cast<TDEHTMLPart *>( part )->view()->startFindAhead( false );
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 }
 
-void KHTMLPart::slotFindAheadLink()
+void TDEHTMLPart::slotFindAheadLink()
 {
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
   KParts::ReadOnlyPart *part = currentFrame();
   if (!part)
     return;
-  if (!part->inherits("KHTMLPart") )
+  if (!part->inherits("TDEHTMLPart") )
   {
       kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl;
       return;
   }
-  static_cast<KHTMLPart *>( part )->view()->startFindAhead( true );
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+  static_cast<TDEHTMLPart *>( part )->view()->startFindAhead( true );
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 }
 
-void KHTMLPart::enableFindAheadActions( bool enable )
+void TDEHTMLPart::enableFindAheadActions( bool enable )
 {
   // only the topmost one has shortcuts
-  KHTMLPart* p = this;
+  TDEHTMLPart* p = this;
   while( p->parentPart())
     p = p->parentPart();
   p->d->m_paFindAheadText->setEnabled( enable );
   p->d->m_paFindAheadLinks->setEnabled( enable );
 }
 
-void KHTMLPart::slotFindDialogDestroyed()
+void TDEHTMLPart::slotFindDialogDestroyed()
 {
   d->m_lastFindState.options = d->m_findDialog->options();
   d->m_lastFindState.history = d->m_findDialog->findHistory();
@@ -2990,7 +2990,7 @@ void KHTMLPart::slotFindDialogDestroyed()
   d->m_findDialog = 0L;
 }
 
-void KHTMLPart::findText()
+void TDEHTMLPart::findText()
 {
   // First do some init to make sure we can search in this frame
   if ( !d->m_doc )
@@ -3003,13 +3003,13 @@ void KHTMLPart::findText()
     return;
   }
 
-  // The lineedit of the dialog would make khtml lose its selection, otherwise
+  // The lineedit of the dialog would make tdehtml lose its selection, otherwise
 #ifndef QT_NO_CLIPBOARD
   disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
 #endif
 
   // Now show the dialog in which the user can choose options.
-  d->m_findDialog = new KFindDialog( false /*non-modal*/, widget(), "khtmlfind" );
+  d->m_findDialog = new KFindDialog( false /*non-modal*/, widget(), "tdehtmlfind" );
   d->m_findDialog->setHasSelection( hasSelection() );
   d->m_findDialog->setHasCursor( d->m_findNode != 0 );
   if ( d->m_findNode ) // has a cursor -> default to 'FromCursor'
@@ -3029,7 +3029,7 @@ void KHTMLPart::findText()
   findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog );
 }
 
-void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, KFindDialog *findDialog )
+void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent, KFindDialog *findDialog )
 {
   // First do some init to make sure we can search in this frame
   if ( !d->m_doc )
@@ -3057,13 +3057,13 @@ void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, K
   }
 }
 
-bool KHTMLPart::findTextNext()
+bool TDEHTMLPart::findTextNext()
 {
   return findTextNext( false );
 }
 
 // New method
-bool KHTMLPart::findTextNext( bool reverse )
+bool TDEHTMLPart::findTextNext( bool reverse )
 {
   if (!d->m_find)
   {
@@ -3115,8 +3115,8 @@ bool KHTMLPart::findTextNext( bool reverse )
     tqSwap( d->m_findPosEnd, d->m_findPosStart );
     tqSwap( d->m_findNode, d->m_findNodePrevious );
     // d->m_findNode now point at the end of the last searched line - advance one node
-    khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
-    khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
+    tdehtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
+    tdehtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
     if ( obj == end )
       obj = 0L;
     else if ( obj )
@@ -3133,9 +3133,9 @@ bool KHTMLPart::findTextNext( bool reverse )
   d->m_lastFindState.last_dir = ( options & KFindDialog::FindBackwards ) ? 1 : 0;
 
   KFind::Result res = KFind::NoMatch;
-  khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
-  khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
-  khtml::RenderTextArea *tmpTextArea=0L;
+  tdehtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0;
+  tdehtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0;
+  tdehtml::RenderTextArea *tmpTextArea=0L;
   //kdDebug(6050) << k_funcinfo << "obj=" << obj << " end=" << end << endl;
   while( res == KFind::NoMatch )
   {
@@ -3162,14 +3162,14 @@ bool KHTMLPart::findTextNext( bool reverse )
         bool renderLineText = (TQCString(obj->renderName())== "RenderLineEdit");
         if ( renderAreaText )
         {
-          khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent());
+          tdehtml::RenderTextArea *parent= static_cast<tdehtml::RenderTextArea *>(obj->parent());
           s = parent->text();
           s = s.replace(0xa0, ' ');
           tmpTextArea = parent;
         }
         else if ( renderLineText )
         {
-          khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj);
+          tdehtml::RenderLineEdit *parentLine= static_cast<tdehtml::RenderLineEdit *>(obj);
           if (parentLine->widget()->echoMode() == TQLineEdit::Normal)
             s = parentLine->widget()->text();
           s = s.replace(0xa0, ' ');
@@ -3199,7 +3199,7 @@ bool KHTMLPart::findTextNext( bool reverse )
 
           if ( isLink && obj->parent()!=tmpTextArea )
           {
-            s = static_cast<khtml::RenderText *>(obj)->data().string();
+            s = static_cast<tdehtml::RenderText *>(obj)->data().string();
             s = s.replace(0xa0, ' ');
           }
         }
@@ -3216,16 +3216,16 @@ bool KHTMLPart::findTextNext( bool reverse )
           if( !( options & KFindDialog::FindBackwards ))
           {
             //kdDebug(6050) << "StringPortion: " << index << "-" << index+s.length()-1 << " -> " << lastNode << endl;
-            d->m_stringPortions.append( KHTMLPartPrivate::StringPortion( str.length(), lastNode ) );
+            d->m_stringPortions.append( TDEHTMLPartPrivate::StringPortion( str.length(), lastNode ) );
             str += s;
           }
           else // KFind itself can search backwards, so str must not be built backwards
           {
-            for( TQValueList<KHTMLPartPrivate::StringPortion>::Iterator it = d->m_stringPortions.begin();
+            for( TQValueList<TDEHTMLPartPrivate::StringPortion>::Iterator it = d->m_stringPortions.begin();
                  it != d->m_stringPortions.end();
                  ++it )
                 (*it).index += s.length();
-            d->m_stringPortions.prepend( KHTMLPartPrivate::StringPortion( 0, lastNode ) );
+            d->m_stringPortions.prepend( TDEHTMLPartPrivate::StringPortion( 0, lastNode ) );
             str.prepend( s );
           }
         }
@@ -3290,12 +3290,12 @@ bool KHTMLPart::findTextNext( bool reverse )
   return res == KFind::Match;
 }
 
-void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
+void TDEHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
 {
   //kdDebug(6050) << "slotHighlight index=" << index << " length=" << length << endl;
-  TQValueList<KHTMLPartPrivate::StringPortion>::Iterator it = d->m_stringPortions.begin();
-  const TQValueList<KHTMLPartPrivate::StringPortion>::Iterator itEnd = d->m_stringPortions.end();
-  TQValueList<KHTMLPartPrivate::StringPortion>::Iterator prev = it;
+  TQValueList<TDEHTMLPartPrivate::StringPortion>::Iterator it = d->m_stringPortions.begin();
+  const TQValueList<TDEHTMLPartPrivate::StringPortion>::Iterator itEnd = d->m_stringPortions.end();
+  TQValueList<TDEHTMLPartPrivate::StringPortion>::Iterator prev = it;
   // We stop at the first portion whose index is 'greater than', and then use the previous one
   while ( it != itEnd && (*it).index <= index )
   {
@@ -3309,9 +3309,9 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
   d->m_selectionStart = node;
   d->m_startOffset = index - (*prev).index;
 
-  khtml::RenderObject* obj = node->renderer();
-  khtml::RenderTextArea *parent = 0L;
-  khtml::RenderLineEdit *parentLine = 0L;
+  tdehtml::RenderObject* obj = node->renderer();
+  tdehtml::RenderTextArea *parent = 0L;
+  tdehtml::RenderLineEdit *parentLine = 0L;
   bool renderLineText =false;
 
   TQRect highlightedRect;
@@ -3325,15 +3325,15 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
 
 
     if( renderAreaText )
-      parent= static_cast<khtml::RenderTextArea *>(obj->parent());
+      parent= static_cast<tdehtml::RenderTextArea *>(obj->parent());
     if ( renderLineText )
-      parentLine= static_cast<khtml::RenderLineEdit *>(obj);
+      parentLine= static_cast<tdehtml::RenderLineEdit *>(obj);
     if ( !renderLineText )
-      //if (static_cast<khtml::RenderText *>(node->renderer())
+      //if (static_cast<tdehtml::RenderText *>(node->renderer())
       //    ->posOfChar(d->m_startOffset, x, y))
       {
         int dummy;
-        static_cast<khtml::RenderText *>(node->renderer())
+        static_cast<tdehtml::RenderText *>(node->renderer())
           ->caretPos( d->m_startOffset, false, x, y, dummy, dummy ); // more precise than posOfChar
         //kdDebug(6050) << "topleft: " << x << "," << y << endl;
         if ( x != -1 || y != -1 )
@@ -3409,12 +3409,12 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
     if (d->m_selectionEnd.handle()->renderer() )
     {
       int x, y, height, dummy;
-      static_cast<khtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
+      static_cast<tdehtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
           ->caretPos( d->m_endOffset, false, x, y, dummy, height ); // more precise than posOfChar
       //kdDebug(6050) << "bottomright: " << x << "," << y+height << endl;
       if ( x != -1 || y != -1 )
       {
-        // if ( static_cast<khtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
+        // if ( static_cast<tdehtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
         //  ->posOfChar(d->m_endOffset-1, x, y))
         highlightedRect.setBottomRight( d->m_view->mapToGlobal( TQPoint(x, y+height) ) );
       }
@@ -3431,7 +3431,7 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length )
   }
 }
 
-TQString KHTMLPart::selectedTextAsHTML() const
+TQString TDEHTMLPart::selectedTextAsHTML() const
 {
   if(!hasSelection()) {
     kdDebug() << "selectedTextAsHTML(): selection is not valid.  Returning empty selection" << endl;
@@ -3448,7 +3448,7 @@ TQString KHTMLPart::selectedTextAsHTML() const
   return r.handle()->toHTML(exceptioncode).string();
 }
 
-TQString KHTMLPart::selectedText() const
+TQString TDEHTMLPart::selectedText() const
 {
   bool hasNewLine = true;
   bool seenTDTag = false;
@@ -3590,7 +3590,7 @@ TQString KHTMLPart::selectedText() const
     return text.mid(start, end-start);
 }
 
-bool KHTMLPart::hasSelection() const
+bool TDEHTMLPart::hasSelection() const
 {
   if ( d->m_selectionStart.isNull() || d->m_selectionEnd.isNull() )
       return false;
@@ -3600,7 +3600,7 @@ bool KHTMLPart::hasSelection() const
   return true;
 }
 
-DOM::Range KHTMLPart::selection() const
+DOM::Range TDEHTMLPart::selection() const
 {
     if( d->m_selectionStart.isNull() || d->m_selectionEnd.isNull() )
         return DOM::Range();
@@ -3654,7 +3654,7 @@ DOM::Range KHTMLPart::selection() const
     return r;
 }
 
-void KHTMLPart::selection(DOM::Node &s, long &so, DOM::Node &e, long &eo) const
+void TDEHTMLPart::selection(DOM::Node &s, long &so, DOM::Node &e, long &eo) const
 {
     s = d->m_selectionStart;
     so = d->m_startOffset;
@@ -3662,7 +3662,7 @@ void KHTMLPart::selection(DOM::Node &s, long &so, DOM::Node &e, long &eo) const
     eo = d->m_endOffset;
 }
 
-void KHTMLPart::setSelection( const DOM::Range &r )
+void TDEHTMLPart::setSelection( const DOM::Range &r )
 {
     // Quick-fix: a collapsed range shouldn't select the whole node.
     // The real problem is in RenderCanvas::setSelection though (when index==0 the whole node is selected).
@@ -3675,17 +3675,17 @@ void KHTMLPart::setSelection( const DOM::Range &r )
         d->m_endOffset = r.endOffset();
         d->m_doc->setSelection(d->m_selectionStart.handle(),d->m_startOffset,
                                d->m_selectionEnd.handle(),d->m_endOffset);
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
         bool v = d->m_view->placeCaret();
         emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset());
 #endif
     }
 }
 
-void KHTMLPart::slotClearSelection()
+void TDEHTMLPart::slotClearSelection()
 {
     bool hadSelection = hasSelection();
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     //kdDebug(6000) << "d->m_selectionStart " << d->m_selectionStart.handle()
     //		<< " d->m_selectionEnd " << d->m_selectionEnd.handle() << endl;
     // nothing, leave selection parameters as is
@@ -3698,13 +3698,13 @@ void KHTMLPart::slotClearSelection()
     if ( d->m_doc ) d->m_doc->clearSelection();
     if ( hadSelection )
       emitSelectionChanged();
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     bool v = d->m_view->placeCaret();
     emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset());
 #endif
 }
 
-void KHTMLPart::resetHoverText()
+void TDEHTMLPart::resetHoverText()
 {
    if( !d->m_overURL.isEmpty() ) // Only if we were showing a link
    {
@@ -3716,7 +3716,7 @@ void KHTMLPart::resetHoverText()
   }
 }
 
-void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shiftPressed*/ )
+void TDEHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shiftPressed*/ )
 {
   KURL u = completeURL(url);
 
@@ -3757,7 +3757,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
 
   if ( u.isLocalFile() )
   {
-    // TODO : use KIO::stat() and create a KFileItem out of its result,
+    // TODO : use TDEIO::stat() and create a KFileItem out of its result,
     // to use KFileItem::statusBarText()
     TQCString path = TQFile::encodeName( u.path() );
 
@@ -3800,7 +3800,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
       else
       {
         float d = (float) buff.st_size/1024.0;
-        text = i18n("%2 (%1 K)").arg(KGlobal::locale()->formatNumber(d, 2)).arg(text2); // was %.2f
+        text = i18n("%2 (%1 K)").arg(TDEGlobal::locale()->formatNumber(d, 2)).arg(text2); // was %.2f
       }
       text += "  ";
       text += com;
@@ -3829,7 +3829,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
              (target.lower() != "_self") &&
              (target.lower() != "_parent"))
     {
-      KHTMLPart *p = this;
+      TDEHTMLPart *p = this;
       while (p->parentPart())
           p = p->parentPart();
       if (!p->frameExists(target))
@@ -3887,7 +3887,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
 // This executes in the active part on a click or other url selection action in
 // that active part.
 //
-void KHTMLPart::urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args )
+void TDEHTMLPart::urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args )
 {
   // The member var is so that slotRedirection still calls the virtual urlSelected
   // but is able to know if is opened a url. KDE4: just make urlSelected return a bool
@@ -3896,7 +3896,7 @@ void KHTMLPart::urlSelected( const TQString &url, int button, int state, const T
 }
 
 // Return value: true if an url was opened, false if not (e.g. error, or jumping to anchor)
-bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args )
+bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args )
 {
   bool hasTarget = false;
 
@@ -3932,9 +3932,9 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
 
   if ( button == Qt::LeftButton && ( state & ShiftButton ) )
   {
-    KIO::MetaData metaData;
+    TDEIO::MetaData metaData;
     metaData["referrer"] = d->m_referrer;
-    KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), cURL, metaData );
+    TDEHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), cURL, metaData );
     return false;
   }
 
@@ -3956,7 +3956,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
   if ( hasTarget && target != "_self" && target != "_top" && target != "_blank" && target != "_parent" )
   {
     // unknown frame names should open in a new window.
-    khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false );
+    tdehtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false );
     if ( frame )
     {
       args.metaData()["referrer"] = d->m_referrer;
@@ -4011,16 +4011,16 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
   return true;
 }
 
-void KHTMLPart::slotViewDocumentSource()
+void TDEHTMLPart::slotViewDocumentSource()
 {
   KURL url(m_url);
   bool isTempFile = false;
-  if (!(url.isLocalFile()) && KHTMLPageCache::self()->isComplete(d->m_cacheId))
+  if (!(url.isLocalFile()) && TDEHTMLPageCache::self()->isComplete(d->m_cacheId))
   {
      KTempFile sourceFile(TQString(), defaultExtension());
      if (sourceFile.status() == 0)
      {
-        KHTMLPageCache::self()->saveData(d->m_cacheId, sourceFile.dataStream());
+        TDEHTMLPageCache::self()->saveData(d->m_cacheId, sourceFile.dataStream());
         url = KURL();
         url.setPath(sourceFile.name());
         isTempFile = true;
@@ -4030,9 +4030,9 @@ void KHTMLPart::slotViewDocumentSource()
   (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile );
 }
 
-void KHTMLPart::slotViewPageInfo()
+void TDEHTMLPart::slotViewPageInfo()
 {
-  KHTMLInfoDlg *dlg = new KHTMLInfoDlg(NULL, "KHTML Page Info Dialog", false, (WFlags)WDestructiveClose);
+  TDEHTMLInfoDlg *dlg = new TDEHTMLInfoDlg(NULL, "TDEHTML Page Info Dialog", false, (WFlags)WDestructiveClose);
   dlg->_close->setGuiItem(KStdGuiItem::close());
 
   if (d->m_doc)
@@ -4083,7 +4083,7 @@ void KHTMLPart::slotViewPageInfo()
 }
 
 
-void KHTMLPart::slotViewFrameSource()
+void TDEHTMLPart::slotViewFrameSource()
 {
   KParts::ReadOnlyPart *frame = currentFrame();
   if ( !frame )
@@ -4091,16 +4091,16 @@ void KHTMLPart::slotViewFrameSource()
 
   KURL url = frame->url();
   bool isTempFile = false;
-  if (!(url.isLocalFile()) && frame->inherits("KHTMLPart"))
+  if (!(url.isLocalFile()) && frame->inherits("TDEHTMLPart"))
   {
-       long cacheId = static_cast<KHTMLPart *>(frame)->d->m_cacheId;
+       long cacheId = static_cast<TDEHTMLPart *>(frame)->d->m_cacheId;
 
-       if (KHTMLPageCache::self()->isComplete(cacheId))
+       if (TDEHTMLPageCache::self()->isComplete(cacheId))
        {
            KTempFile sourceFile(TQString(), defaultExtension());
            if (sourceFile.status() == 0)
            {
-               KHTMLPageCache::self()->saveData(cacheId, sourceFile.dataStream());
+               TDEHTMLPageCache::self()->saveData(cacheId, sourceFile.dataStream());
                url = KURL();
                url.setPath(sourceFile.name());
                isTempFile = true;
@@ -4111,7 +4111,7 @@ void KHTMLPart::slotViewFrameSource()
   (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile );
 }
 
-KURL KHTMLPart::backgroundURL() const
+KURL TDEHTMLPart::backgroundURL() const
 {
   // ### what about XML documents? get from CSS?
   if (!d->m_doc || !d->m_doc->isHTMLDocument())
@@ -4122,26 +4122,26 @@ KURL KHTMLPart::backgroundURL() const
   return KURL( m_url, relURL );
 }
 
-void KHTMLPart::slotSaveBackground()
+void TDEHTMLPart::slotSaveBackground()
 {
-  KIO::MetaData metaData;
+  TDEIO::MetaData metaData;
   metaData["referrer"] = d->m_referrer;
-  KHTMLPopupGUIClient::saveURL( d->m_view, i18n("Save Background Image As"), backgroundURL(), metaData );
+  TDEHTMLPopupGUIClient::saveURL( d->m_view, i18n("Save Background Image As"), backgroundURL(), metaData );
 }
 
-void KHTMLPart::slotSaveDocument()
+void TDEHTMLPart::slotSaveDocument()
 {
   KURL srcURL( m_url );
 
   if ( srcURL.fileName(false).isEmpty() )
     srcURL.setFileName( "index" + defaultExtension() );
 
-  KIO::MetaData metaData;
+  TDEIO::MetaData metaData;
   // Referre unknown?
-  KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), srcURL, metaData, "text/html", d->m_cacheId );
+  TDEHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), srcURL, metaData, "text/html", d->m_cacheId );
 }
 
-void KHTMLPart::slotSecurity()
+void TDEHTMLPart::slotSecurity()
 {
 //   kdDebug( 6050 ) << "Meta Data:" << endl
 //                   << d->m_ssl_peer_cert_subject
@@ -4200,7 +4200,7 @@ void KHTMLPart::slotSecurity()
   } else kid->exec();
 }
 
-void KHTMLPart::slotSaveFrame()
+void TDEHTMLPart::slotSaveFrame()
 {
     KParts::ReadOnlyPart *frame = currentFrame();
     if ( !frame )
@@ -4211,22 +4211,22 @@ void KHTMLPart::slotSaveFrame()
     if ( srcURL.fileName(false).isEmpty() )
         srcURL.setFileName( "index" + defaultExtension() );
 
-    KIO::MetaData metaData;
+    TDEIO::MetaData metaData;
     // Referrer unknown?
-    KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save Frame As" ), srcURL, metaData, "text/html" );
+    TDEHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save Frame As" ), srcURL, metaData, "text/html" );
 }
 
-void KHTMLPart::slotSetEncoding()
+void TDEHTMLPart::slotSetEncoding()
 {
   d->m_automaticDetection->setItemChecked( int( d->m_autoDetectLanguage ), false );
   d->m_paSetEncoding->popupMenu()->setItemChecked( 0, false );
   d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), true );
 
-  TQString enc = KGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() );
+  TQString enc = TDEGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() );
   setEncoding( enc, true );
 }
 
-void KHTMLPart::slotUseStylesheet()
+void TDEHTMLPart::slotUseStylesheet()
 {
   if (d->m_doc)
   {
@@ -4236,14 +4236,14 @@ void KHTMLPart::slotUseStylesheet()
   }
 }
 
-void KHTMLPart::updateActions()
+void TDEHTMLPart::updateActions()
 {
   bool frames = false;
 
-  TQValueList<khtml::ChildFrame*>::ConstIterator it = d->m_frames.begin();
-  const TQValueList<khtml::ChildFrame*>::ConstIterator end = d->m_frames.end();
+  TQValueList<tdehtml::ChildFrame*>::ConstIterator it = d->m_frames.begin();
+  const TQValueList<tdehtml::ChildFrame*>::ConstIterator end = d->m_frames.end();
   for (; it != end; ++it )
-      if ( (*it)->m_type == khtml::ChildFrame::Frame )
+      if ( (*it)->m_type == tdehtml::ChildFrame::Frame )
       {
           frames = true;
           break;
@@ -4265,7 +4265,7 @@ void KHTMLPart::updateActions()
   bool enableFindAndSelectAll = true;
 
   if ( frame )
-    enableFindAndSelectAll = frame->inherits( "KHTMLPart" );
+    enableFindAndSelectAll = frame->inherits( "TDEHTMLPart" );
 
   d->m_paFind->setEnabled( enableFindAndSelectAll );
   d->m_paSelectAll->setEnabled( enableFindAndSelectAll );
@@ -4293,7 +4293,7 @@ void KHTMLPart::updateActions()
     d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L );
 }
 
-KParts::LiveConnectExtension *KHTMLPart::liveConnectExtension( const khtml::RenderPart *frame) const {
+KParts::LiveConnectExtension *TDEHTMLPart::liveConnectExtension( const tdehtml::RenderPart *frame) const {
     const ConstFrameIt end = d->m_objects.end();
     for(ConstFrameIt it = d->m_objects.begin(); it != end; ++it )
         if ((*it)->m_frame == frame)
@@ -4301,20 +4301,20 @@ KParts::LiveConnectExtension *KHTMLPart::liveConnectExtension( const khtml::Rend
     return 0L;
 }
 
-bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, const TQString &frameName,
+bool TDEHTMLPart::requestFrame( tdehtml::RenderPart *frame, const TQString &url, const TQString &frameName,
                               const TQStringList &params, bool isIFrame )
 {
   //kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl;
   FrameIt it = d->m_frames.find( frameName );
   if ( it == d->m_frames.end() )
   {
-    khtml::ChildFrame * child = new khtml::ChildFrame;
+    tdehtml::ChildFrame * child = new tdehtml::ChildFrame;
     //kdDebug( 6050 ) << "inserting new frame into frame map " << frameName << endl;
     child->m_name = frameName;
     it = d->m_frames.append( child );
   }
 
-  (*it)->m_type = isIFrame ? khtml::ChildFrame::IFrame : khtml::ChildFrame::Frame;
+  (*it)->m_type = isIFrame ? tdehtml::ChildFrame::IFrame : tdehtml::ChildFrame::Frame;
   (*it)->m_frame = frame;
   (*it)->m_params = params;
 
@@ -4322,7 +4322,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con
   if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
   {
     if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) {
-      KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part));
+      TDEHTMLPart* p = static_cast<TDEHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part));
 
       // See if we want to replace content with javascript: output..
       TQVariant res = p->executeScript( DOM::Node(), KURL::decode_string( url.right( url.length() - 11) ) );
@@ -4339,19 +4339,19 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con
   return requestObject( *it, u );
 }
 
-TQString KHTMLPart::requestFrameName()
+TQString TDEHTMLPart::requestFrameName()
 {
    return TQString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
 }
 
-bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
+bool TDEHTMLPart::requestObject( tdehtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
                                const TQStringList &params )
 {
-  //kdDebug( 6005 ) << "KHTMLPart::requestObject " << this << " frame=" << frame << endl;
-  khtml::ChildFrame *child = new khtml::ChildFrame;
+  //kdDebug( 6005 ) << "TDEHTMLPart::requestObject " << this << " frame=" << frame << endl;
+  tdehtml::ChildFrame *child = new tdehtml::ChildFrame;
   FrameIt it = d->m_objects.append( child );
   (*it)->m_frame = frame;
-  (*it)->m_type = khtml::ChildFrame::Object;
+  (*it)->m_type = tdehtml::ChildFrame::Object;
   (*it)->m_params = params;
 
   KParts::URLArgs args;
@@ -4363,16 +4363,16 @@ bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, co
   return true;
 }
 
-bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &_args )
+bool TDEHTMLPart::requestObject( tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &_args )
 {
   if (!checkLinkSecurity(url))
   {
-    kdDebug(6005) << this << " KHTMLPart::requestObject checkLinkSecurity refused" << endl;
+    kdDebug(6005) << this << " TDEHTMLPart::requestObject checkLinkSecurity refused" << endl;
     return false;
   }
   if ( child->m_bPreloaded )
   {
-    kdDebug(6005) << "KHTMLPart::requestObject preload" << endl;
+    kdDebug(6005) << "TDEHTMLPart::requestObject preload" << endl;
     if ( child->m_frame && child->m_part )
       child->m_frame->setWidget( child->m_part->widget() );
 
@@ -4380,7 +4380,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
     return true;
   }
 
-  //kdDebug(6005) << "KHTMLPart::requestObject child=" << child << " child->m_part=" << child->m_part << endl;
+  //kdDebug(6005) << "TDEHTMLPart::requestObject child=" << child << " child->m_part=" << child->m_part << endl;
 
   KParts::URLArgs args( _args );
 
@@ -4391,7 +4391,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
     args.serviceType = child->m_serviceType;
 
   child->m_args = args;
-  child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
+  child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload);
   child->m_serviceName = TQString();
   if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" ))
     child->m_args.metaData()["referrer"] = d->m_referrer;
@@ -4406,13 +4406,13 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
   child->m_args.metaData().insert("ssl_activate_warnings", "TRUE");
   child->m_args.metaData().insert("cross-domain", toplevelURL().url());
 
-  // We want a KHTMLPart if the HTML says <frame src=""> or <frame src="about:blank">
+  // We want a TDEHTMLPart if the HTML says <frame src=""> or <frame src="about:blank">
   if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty())
     args.serviceType = TQString::fromLatin1( "text/html" );
 
   if ( args.serviceType.isEmpty() ) {
-    kdDebug(6050) << "Running new KHTMLRun for " << this << " and child=" << child << endl;
-    child->m_run = new KHTMLRun( this, child, url, child->m_args, true );
+    kdDebug(6050) << "Running new TDEHTMLRun for " << this << " and child=" << child << endl;
+    child->m_run = new TDEHTMLRun( this, child, url, child->m_args, true );
     d->m_bComplete = false; // ensures we stop it in checkCompleted...
     return false;
   } else {
@@ -4420,16 +4420,16 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
   }
 }
 
-bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url, const TQString &mimetype )
+bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_url, const TQString &mimetype )
 {
-  //kdDebug( 6050 ) << "KHTMLPart::processObjectRequest trying to create part for " << mimetype << endl;
+  //kdDebug( 6050 ) << "TDEHTMLPart::processObjectRequest trying to create part for " << mimetype << endl;
 
   // IMPORTANT: create a copy of the url here, because it is just a reference, which was likely to be given
   // by an emitting frame part (emit openURLRequest( blahurl, ... ) . A few lines below we delete the part
   // though -> the reference becomes invalid -> crash is likely
   KURL url( _url );
 
-  // khtmlrun called us this way to indicate a loading error
+  // tdehtmlrun called us this way to indicate a loading error
   if ( d->m_onlyLocalReferences || ( url.isEmpty() && mimetype.isEmpty() ) )
   {
       child->m_bCompleted = true;
@@ -4449,7 +4449,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     // Before attempting to load a part, check if the user wants that.
     // Many don't like getting ZIP files embedded.
     // However we don't want to ask for flash and other plugin things..
-    if ( child->m_type != khtml::ChildFrame::Object )
+    if ( child->m_type != tdehtml::ChildFrame::Object )
     {
       TQString suggestedFilename;
       if ( child->m_run )
@@ -4459,7 +4459,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
         url, mimetype, suggestedFilename  );
       switch( res ) {
       case KParts::BrowserRun::Save:
-        KHTMLPopupGUIClient::saveURL( widget(), i18n( "Save As" ), url, child->m_args.metaData(), TQString(), 0, suggestedFilename);
+        TDEHTMLPopupGUIClient::saveURL( widget(), i18n( "Save As" ), url, child->m_args.metaData(), TQString(), 0, suggestedFilename);
         // fall-through
       case KParts::BrowserRun::Cancel:
         child->m_bCompleted = true;
@@ -4486,7 +4486,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     //CRITICAL STUFF
     if ( child->m_part )
     {
-      if (!::tqqt_cast<KHTMLPart*>(child->m_part) && child->m_jscript)
+      if (!::tqqt_cast<TDEHTMLPart*>(child->m_part) && child->m_jscript)
           child->m_jscript->clear();
       partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part );
       delete (KParts::ReadOnlyPart *)child->m_part;
@@ -4500,15 +4500,15 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     if ( child->m_frame  && part->widget() )
       child->m_frame->setWidget( part->widget() );
 
-    if ( child->m_type != khtml::ChildFrame::Object )
+    if ( child->m_type != tdehtml::ChildFrame::Object )
       partManager()->addPart( part, false );
 //  else
 //      kdDebug(6005) << "AH! NO FRAME!!!!!" << endl;
 
     child->m_part = part;
 
-    if (::tqqt_cast<KHTMLPart*>(part)) {
-      static_cast<KHTMLPart*>(part)->d->m_frame = child;
+    if (::tqqt_cast<TDEHTMLPart*>(part)) {
+      static_cast<TDEHTMLPart*>(part)->d->m_frame = child;
     } else if (child->m_frame) {
       child->m_liveconnect = KParts::LiveConnectExtension::childObject(part);
       if (child->m_liveconnect)
@@ -4518,15 +4518,15 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     if (sb)
       sb->setStatusBar( d->m_statusBarExtension->statusBar() );
 
-    connect( part, TQT_SIGNAL( started( KIO::Job *) ),
-             this, TQT_SLOT( slotChildStarted( KIO::Job *) ) );
+    connect( part, TQT_SIGNAL( started( TDEIO::Job *) ),
+             this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) );
     connect( part, TQT_SIGNAL( completed() ),
              this, TQT_SLOT( slotChildCompleted() ) );
     connect( part, TQT_SIGNAL( completed(bool) ),
              this, TQT_SLOT( slotChildCompleted(bool) ) );
     connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
                 this, TQT_SIGNAL( setStatusBarText( const TQString & ) ) );
-    if ( part->inherits( "KHTMLPart" ) )
+    if ( part->inherits( "TDEHTMLPart" ) )
     {
       connect( this, TQT_SIGNAL( completed() ),
                part, TQT_SLOT( slotParentCompleted() ) );
@@ -4594,25 +4594,25 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
     return true;
   }
 
-  child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
+  child->m_args.reload = (d->m_cachePolicy == TDEIO::CC_Reload);
 
   // make sure the part has a way to find out about the mimetype.
   // we actually set it in child->m_args in requestObject already,
-  // but it's useless if we had to use a KHTMLRun instance, as the
+  // but it's useless if we had to use a TDEHTMLRun instance, as the
   // point the run object is to find out exactly the mimetype.
   child->m_args.serviceType = mimetype;
 
   // if not a frame set child as completed
-  child->m_bCompleted = child->m_type == khtml::ChildFrame::Object;
+  child->m_bCompleted = child->m_type == tdehtml::ChildFrame::Object;
 
   if ( child->m_extension )
     child->m_extension->setURLArgs( child->m_args );
 
   if(url.protocol() == "javascript" || url.url() == "about:blank") {
-      if (!child->m_part->inherits("KHTMLPart"))
+      if (!child->m_part->inherits("TDEHTMLPart"))
           return false;
 
-      KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>(child->m_part));
+      TDEHTMLPart* p = static_cast<TDEHTMLPart*>(static_cast<KParts::ReadOnlyPart *>(child->m_part));
 
       p->begin();
       if (d->m_doc && p->d->m_doc)
@@ -4643,7 +4643,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
   }
 }
 
-KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName,
+KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName,
                                              TQObject *parent, const char *name, const TQString &mimetype,
                                              TQString &serviceName, TQStringList &serviceTypes,
                                              const TQStringList &params )
@@ -4652,20 +4652,20 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char
   if ( !serviceName.isEmpty() )
     constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) );
 
-  KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() );
+  TDETrader::OfferList offers = TDETrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() );
 
   if ( offers.isEmpty() ) {
     int pos = mimetype.find( "-plugin" );
     if (pos < 0)
         return 0L;
     TQString stripped_mime = mimetype.left( pos );
-    offers = KTrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() );
+    offers = TDETrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() );
     if ( offers.isEmpty() )
         return 0L;
   }
 
-  KTrader::OfferList::ConstIterator it = offers.begin();
-  const KTrader::OfferList::ConstIterator itEnd = offers.end();
+  TDETrader::OfferList::ConstIterator it = offers.begin();
+  const TDETrader::OfferList::ConstIterator itEnd = offers.end();
   for ( ; it != itEnd; ++it )
   {
     KService::Ptr service = (*it);
@@ -4697,11 +4697,11 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char
   return 0;
 }
 
-KParts::PartManager *KHTMLPart::partManager()
+KParts::PartManager *TDEHTMLPart::partManager()
 {
   if ( !d->m_manager && d->m_view )
   {
-    d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "khtml part manager" );
+    d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "tdehtml part manager" );
     d->m_manager->setAllowNestedParts( true );
     connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
              this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
@@ -4712,28 +4712,28 @@ KParts::PartManager *KHTMLPart::partManager()
   return d->m_manager;
 }
 
-void KHTMLPart::submitFormAgain()
+void TDEHTMLPart::submitFormAgain()
 {
   disconnect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain()));
   if( d->m_doc && !d->m_doc->parsing() && d->m_submitForm)
-    KHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary );
+    TDEHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary );
 
   delete d->m_submitForm;
   d->m_submitForm = 0;
 }
 
-void KHTMLPart::submitFormProxy( const char *action, const TQString &url, const TQByteArray &formData, const TQString &_target, const TQString& contentType, const TQString& boundary )
+void TDEHTMLPart::submitFormProxy( const char *action, const TQString &url, const TQByteArray &formData, const TQString &_target, const TQString& contentType, const TQString& boundary )
 {
   submitForm(action, url, formData, _target, contentType, boundary);
 }
 
-void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByteArray &formData, const TQString &_target, const TQString& contentType, const TQString& boundary )
+void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQByteArray &formData, const TQString &_target, const TQString& contentType, const TQString& boundary )
 {
-  kdDebug(6000) << this << ": KHTMLPart::submitForm target=" << _target << " url=" << url << endl;
-  if (d->m_formNotification == KHTMLPart::Only) {
+  kdDebug(6000) << this << ": TDEHTMLPart::submitForm target=" << _target << " url=" << url << endl;
+  if (d->m_formNotification == TDEHTMLPart::Only) {
     emit formSubmitNotification(action, url, formData, _target, contentType, boundary);
     return;
-  } else if (d->m_formNotification == KHTMLPart::Before) {
+  } else if (d->m_formNotification == TDEHTMLPart::Before) {
     emit formSubmitNotification(action, url, formData, _target, contentType, boundary);
   }
 
@@ -4776,9 +4776,9 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
                                                       KGuiItem(i18n("&Send Unencrypted")),
                                                       "WarnOnUnencryptedForm");
           // Move this setting into KSSL instead
-          KConfig *config = kapp->config();
+          TDEConfig *config = kapp->config();
           TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
-          KConfigGroupSaver saver( config, grpNotifMsgs );
+          TDEConfigGroupSaver saver( config, grpNotifMsgs );
 
           if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) {
             config->deleteEntry("WarnOnUnencryptedForm");
@@ -4911,10 +4911,10 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
 
   if ( d->m_doc->parsing() || d->m_runningScripts > 0 ) {
     if( d->m_submitForm ) {
-      kdDebug(6000) << "KHTMLPart::submitForm ABORTING!" << endl;
+      kdDebug(6000) << "TDEHTMLPart::submitForm ABORTING!" << endl;
       return;
     }
-    d->m_submitForm = new KHTMLPartPrivate::SubmitForm;
+    d->m_submitForm = new TDEHTMLPartPrivate::SubmitForm;
     d->m_submitForm->submitAction = action;
     d->m_submitForm->submitUrl = url;
     d->m_submitForm->submitFormData = formData;
@@ -4929,7 +4929,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
   }
 }
 
-void KHTMLPart::popupMenu( const TQString &linkUrl )
+void TDEHTMLPart::popupMenu( const TQString &linkUrl )
 {
   KURL popupURL;
   KURL linkKURL;
@@ -4938,13 +4938,13 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
   KParts::BrowserExtension::PopupFlags itemflags=KParts::BrowserExtension::ShowBookmark | KParts::BrowserExtension::ShowReload;
 
   if ( linkUrl.isEmpty() ) { // click on background
-    KHTMLPart* khtmlPart = this;
-    while ( khtmlPart->parentPart() )
+    TDEHTMLPart* tdehtmlPart = this;
+    while ( tdehtmlPart->parentPart() )
     {
-      khtmlPart=khtmlPart->parentPart();
+      tdehtmlPart=tdehtmlPart->parentPart();
     }
-    popupURL = khtmlPart->url();
-    referrer = khtmlPart->pageReferrer();
+    popupURL = tdehtmlPart->url();
+    referrer = tdehtmlPart->pageReferrer();
     if (hasSelection())
       itemflags = KParts::BrowserExtension::ShowTextSelectionItems;
     else
@@ -4961,7 +4961,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
       if (d->m_strSelectedURLTarget.lower() == "_blank")
         args.setForcesNewWindow(true);
       else {
-	KHTMLPart *p = this;
+	TDEHTMLPart *p = this;
 	while (p->parentPart())
 	  p = p->parentPart();
 	if (!p->frameExists(d->m_strSelectedURLTarget))
@@ -4971,8 +4971,8 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
   }
 
   // Danger, Will Robinson. The Popup might stay around for a much
-  // longer time than KHTMLPart. Deal with it.
-  KHTMLPopupGUIClient* client = new KHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL );
+  // longer time than TDEHTMLPart. Deal with it.
+  TDEHTMLPopupGUIClient* client = new TDEHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL );
   TQGuardedPtr<TQObject> guard( client );
 
   TQString mimetype = TQString::fromLatin1( "text/html" );
@@ -5018,7 +5018,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
   }
 }
 
-void KHTMLPart::slotParentCompleted()
+void TDEHTMLPart::slotParentCompleted()
 {
   //kdDebug(6050) << this << " slotParentCompleted()" << endl;
   if ( !d->m_redirectURL.isEmpty() && !d->m_redirectionTimer.isActive() )
@@ -5028,9 +5028,9 @@ void KHTMLPart::slotParentCompleted()
   }
 }
 
-void KHTMLPart::slotChildStarted( KIO::Job *job )
+void TDEHTMLPart::slotChildStarted( TDEIO::Job *job )
 {
-  khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
+  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
 
   assert( child );
 
@@ -5050,14 +5050,14 @@ void KHTMLPart::slotChildStarted( KIO::Job *job )
   }
 }
 
-void KHTMLPart::slotChildCompleted()
+void TDEHTMLPart::slotChildCompleted()
 {
   slotChildCompleted( false );
 }
 
-void KHTMLPart::slotChildCompleted( bool pendingAction )
+void TDEHTMLPart::slotChildCompleted( bool pendingAction )
 {
-  khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
+  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
 
   if ( child ) {
     kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl;
@@ -5068,19 +5068,19 @@ void KHTMLPart::slotChildCompleted( bool pendingAction )
   checkCompleted();
 }
 
-void KHTMLPart::slotChildDocCreated()
+void TDEHTMLPart::slotChildDocCreated()
 {
-  const KHTMLPart* htmlFrame = static_cast<const KHTMLPart *>(sender());
+  const TDEHTMLPart* htmlFrame = static_cast<const TDEHTMLPart *>(sender());
   // Set domain to the frameset's domain
   // This must only be done when loading the frameset initially (#22039),
   // not when following a link in a frame (#44162).
   if ( d->m_doc && d->m_doc->isHTMLDocument() )
   {
-    if ( sender()->inherits("KHTMLPart") )
+    if ( sender()->inherits("TDEHTMLPart") )
     {
       DOMString domain = static_cast<HTMLDocumentImpl*>(d->m_doc)->domain();
       if (htmlFrame->d->m_doc && htmlFrame->d->m_doc->isHTMLDocument() )
-        //kdDebug(6050) << "KHTMLPart::slotChildDocCreated: url: " << htmlFrame->m_url.url() << endl;
+        //kdDebug(6050) << "TDEHTMLPart::slotChildDocCreated: url: " << htmlFrame->m_url.url() << endl;
         static_cast<HTMLDocumentImpl*>(htmlFrame->d->m_doc)->setDomain( domain );
     }
   }
@@ -5088,10 +5088,10 @@ void KHTMLPart::slotChildDocCreated()
   disconnect( htmlFrame, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( slotChildDocCreated() ) );
 }
 
-void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
+void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
 {
-  khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() );
-  KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent()));
+  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() );
+  TDEHTMLPart *callingHtmlPart = const_cast<TDEHTMLPart *>(dynamic_cast<const TDEHTMLPart *>(sender()->parent()));
 
   // TODO: handle child target correctly! currently the script are always executed fur the parent
   TQString urlStr = url.url();
@@ -5123,7 +5123,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
     }
     else if ( frameName != TQString::fromLatin1( "_self" ) )
     {
-      khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
+      tdehtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
 
       if ( !_frame )
       {
@@ -5135,7 +5135,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
     }
   }
 
-  if ( child && child->m_type != khtml::ChildFrame::Object ) {
+  if ( child && child->m_type != tdehtml::ChildFrame::Object ) {
       // Inform someone that we are about to show something else.
       child->m_bNotify = true;
       requestObject( child, url, args );
@@ -5147,12 +5147,12 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
   }
 }
 
-void KHTMLPart::slotRequestFocus( KParts::ReadOnlyPart * )
+void TDEHTMLPart::slotRequestFocus( KParts::ReadOnlyPart * )
 {
   emit d->m_extension->requestFocus(this);
 }
 
-khtml::ChildFrame *KHTMLPart::frame( const TQObject *obj )
+tdehtml::ChildFrame *TDEHTMLPart::frame( const TQObject *obj )
 {
     assert( obj->inherits( "KParts::ReadOnlyPart" ) );
     const KParts::ReadOnlyPart* const part = static_cast<const KParts::ReadOnlyPart *>( obj );
@@ -5174,14 +5174,14 @@ khtml::ChildFrame *KHTMLPart::frame( const TQObject *obj )
 
 //#define DEBUG_FINDFRAME
 
-bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
+bool TDEHTMLPart::checkFrameAccess(TDEHTMLPart *callingHtmlPart)
 {
   if (callingHtmlPart == this)
     return true; // trivial
 
   if (htmlDocument().isNull()) {
 #ifdef DEBUG_FINDFRAME
-    kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl;
+    kdDebug(6050) << "TDEHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl;
 #endif
     return false; // we are empty?
   }
@@ -5193,7 +5193,7 @@ bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
     DOM::DOMString destDomain = htmlDocument().domain();
 
 #ifdef DEBUG_FINDFRAME
-    kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl;
+    kdDebug(6050) << "TDEHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl;
 #endif
 
     if (actDomain == destDomain)
@@ -5202,20 +5202,20 @@ bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
 #ifdef DEBUG_FINDFRAME
   else
   {
-    kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl;
+    kdDebug(6050) << "TDEHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl;
   }
 #endif
   return false;
 }
 
-KHTMLPart *
-KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame )
+TDEHTMLPart *
+TDEHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, tdehtml::ChildFrame **childFrame )
 {
 #ifdef DEBUG_FINDFRAME
-  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
+  kdDebug(6050) << "TDEHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
 #endif
   // Check access
-  KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
+  TDEHTMLPart* const callingHtmlPart = dynamic_cast<TDEHTMLPart *>(callingPart);
 
   if (!checkFrameAccess(callingHtmlPart))
      return 0;
@@ -5229,7 +5229,7 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f
   if ( it != end )
   {
 #ifdef DEBUG_FINDFRAME
-     kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl;
+     kdDebug(6050) << "TDEHTMLPart::findFrameParent: FOUND!" << endl;
 #endif
      if (childFrame)
         *childFrame = *it;
@@ -5240,9 +5240,9 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f
   for (; it != end; ++it )
   {
     KParts::ReadOnlyPart* const p = (*it)->m_part;
-    if ( p && p->inherits( "KHTMLPart" ))
+    if ( p && p->inherits( "TDEHTMLPart" ))
     {
-      KHTMLPart* const frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame);
+      TDEHTMLPart* const frameParent = static_cast<TDEHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame);
       if (frameParent)
          return frameParent;
     }
@@ -5251,41 +5251,41 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f
 }
 
 
-KHTMLPart *KHTMLPart::findFrame( const TQString &f )
+TDEHTMLPart *TDEHTMLPart::findFrame( const TQString &f )
 {
-  khtml::ChildFrame *childFrame;
-  KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame);
+  tdehtml::ChildFrame *childFrame;
+  TDEHTMLPart *parentFrame = findFrameParent(this, f, &childFrame);
   if (parentFrame)
   {
      KParts::ReadOnlyPart *p = childFrame->m_part;
-     if ( p && p->inherits( "KHTMLPart" ))
-        return static_cast<KHTMLPart *>(p);
+     if ( p && p->inherits( "TDEHTMLPart" ))
+        return static_cast<TDEHTMLPart *>(p);
   }
   return 0;
 }
 
-KParts::ReadOnlyPart *KHTMLPart::findFramePart(const TQString &f)
+KParts::ReadOnlyPart *TDEHTMLPart::findFramePart(const TQString &f)
 {
-  khtml::ChildFrame *childFrame;
+  tdehtml::ChildFrame *childFrame;
   return findFrameParent(this, f, &childFrame) ? static_cast<KParts::ReadOnlyPart *>(childFrame->m_part) : 0L;
 }
 
-KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
+KParts::ReadOnlyPart *TDEHTMLPart::currentFrame() const
 {
   KParts::ReadOnlyPart* part = (KParts::ReadOnlyPart*)(this);
   // Find active part in our frame manager, in case we are a frameset
   // and keep doing that (in case of nested framesets).
   // Just realized we could also do this recursively, calling part->currentFrame()...
-  while ( part && part->inherits("KHTMLPart") &&
-          static_cast<KHTMLPart *>(part)->d->m_frames.count() > 0 ) {
-    KHTMLPart* frameset = static_cast<KHTMLPart *>(part);
+  while ( part && part->inherits("TDEHTMLPart") &&
+          static_cast<TDEHTMLPart *>(part)->d->m_frames.count() > 0 ) {
+    TDEHTMLPart* frameset = static_cast<TDEHTMLPart *>(part);
     part = static_cast<KParts::ReadOnlyPart *>(frameset->partManager()->activePart());
     if ( !part ) return frameset;
   }
   return part;
 }
 
-bool KHTMLPart::frameExists( const TQString &frameName )
+bool TDEHTMLPart::frameExists( const TQString &frameName )
 {
   ConstFrameIt it = d->m_frames.find( frameName );
   if ( it == d->m_frames.end() )
@@ -5297,9 +5297,9 @@ bool KHTMLPart::frameExists( const TQString &frameName )
   return (!(*it)->m_frame.isNull());
 }
 
-KJSProxy *KHTMLPart::framejScript(KParts::ReadOnlyPart *framePart)
+KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart)
 {
-  KHTMLPart* const kp = ::tqqt_cast<KHTMLPart*>(framePart);
+  TDEHTMLPart* const kp = ::tqqt_cast<TDEHTMLPart*>(framePart);
   if (kp)
     return kp->jScript();
 
@@ -5315,19 +5315,19 @@ KJSProxy *KHTMLPart::framejScript(KParts::ReadOnlyPart *framePart)
   return 0L;
 }
 
-KHTMLPart *KHTMLPart::parentPart()
+TDEHTMLPart *TDEHTMLPart::parentPart()
 {
-  return ::tqqt_cast<KHTMLPart *>( parent() );
+  return ::tqqt_cast<TDEHTMLPart *>( parent() );
 }
 
-khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url,
+tdehtml::ChildFrame *TDEHTMLPart::recursiveFrameRequest( TDEHTMLPart *callingHtmlPart, const KURL &url,
                                                      const KParts::URLArgs &args, bool callParent )
 {
 #ifdef DEBUG_FINDFRAME
-  kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl;
+  kdDebug( 6050 ) << "TDEHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl;
 #endif
-  khtml::ChildFrame *childFrame;
-  KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame);
+  tdehtml::ChildFrame *childFrame;
+  TDEHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame);
   if (childPart)
   {
      if (childPart == this)
@@ -5339,7 +5339,7 @@ khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart,
 
   if ( parentPart() && callParent )
   {
-     khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent );
+     tdehtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent );
 
      if ( res )
        parentPart()->requestObject( res, url, args );
@@ -5352,7 +5352,7 @@ khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart,
 static int s_saveStateIndentLevel = 0;
 #endif
 
-void KHTMLPart::saveState( TQDataStream &stream )
+void TDEHTMLPart::saveState( TQDataStream &stream )
 {
 #ifndef NDEBUG
   TQString indent = TQString().leftJustify( s_saveStateIndentLevel * 4, ' ' );
@@ -5438,7 +5438,7 @@ void KHTMLPart::saveState( TQDataStream &stream )
 #endif
 }
 
-void KHTMLPart::restoreState( TQDataStream &stream )
+void TDEHTMLPart::restoreState( TQDataStream &stream )
 {
   KURL u;
   TQ_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight;
@@ -5522,7 +5522,7 @@ void KHTMLPart::restoreState( TQDataStream &stream )
 
     for (; fIt != fEnd; ++fIt, ++fNameIt, ++fServiceTypeIt, ++fServiceNameIt, ++fURLIt, ++fBufferIt )
     {
-      khtml::ChildFrame* const child = *fIt;
+      tdehtml::ChildFrame* const child = *fIt;
 
 //      kdDebug( 6050 ) <<  *fNameIt  << " ---- " <<  *fServiceTypeIt << endl;
 
@@ -5578,7 +5578,7 @@ void KHTMLPart::restoreState( TQDataStream &stream )
 
     for (; fNameIt != fNameEnd; ++fNameIt, ++fServiceTypeIt, ++fServiceNameIt, ++fURLIt, ++fBufferIt )
     {
-      khtml::ChildFrame* const newChild = new khtml::ChildFrame;
+      tdehtml::ChildFrame* const newChild = new tdehtml::ChildFrame;
       newChild->m_bPreloaded = true;
       newChild->m_name = *fNameIt;
       newChild->m_serviceName = *fServiceNameIt;
@@ -5610,7 +5610,7 @@ void KHTMLPart::restoreState( TQDataStream &stream )
     args.docState = docState;
 
     d->m_extension->setURLArgs( args );
-    if (!KHTMLPageCache::self()->isComplete(d->m_cacheId))
+    if (!TDEHTMLPageCache::self()->isComplete(d->m_cacheId))
     {
        d->m_restored = true;
        openURL( u );
@@ -5624,29 +5624,29 @@ void KHTMLPart::restoreState( TQDataStream &stream )
 
 }
 
-void KHTMLPart::show()
+void TDEHTMLPart::show()
 {
   if ( d->m_view )
     d->m_view->show();
 }
 
-void KHTMLPart::hide()
+void TDEHTMLPart::hide()
 {
   if ( d->m_view )
     d->m_view->hide();
 }
 
-DOM::Node KHTMLPart::nodeUnderMouse() const
+DOM::Node TDEHTMLPart::nodeUnderMouse() const
 {
     return d->m_view->nodeUnderMouse();
 }
 
-DOM::Node KHTMLPart::nonSharedNodeUnderMouse() const
+DOM::Node TDEHTMLPart::nonSharedNodeUnderMouse() const
 {
     return d->m_view->nonSharedNodeUnderMouse();
 }
 
-void KHTMLPart::emitSelectionChanged()
+void TDEHTMLPart::emitSelectionChanged()
 {
   emit d->m_extension->enableAction( "copy", hasSelection() );
   if ( d->m_findDialog )
@@ -5656,7 +5656,7 @@ void KHTMLPart::emitSelectionChanged()
   emit selectionChanged();
 }
 
-int KHTMLPart::zoomFactor() const
+int TDEHTMLPart::zoomFactor() const
 {
   return d->m_zoomFactor;
 }
@@ -5671,27 +5671,27 @@ static const int maxZoom = 300;
 extern const int KDE_NO_EXPORT fastZoomSizes[] = { 20, 50, 75, 90, 100, 120, 150, 200, 300 };
 extern const int KDE_NO_EXPORT fastZoomSizeCount = sizeof fastZoomSizes / sizeof fastZoomSizes[0];
 
-void KHTMLPart::slotIncZoom()
+void TDEHTMLPart::slotIncZoom()
 {
   zoomIn(zoomSizes, zoomSizeCount);
 }
 
-void KHTMLPart::slotDecZoom()
+void TDEHTMLPart::slotDecZoom()
 {
   zoomOut(zoomSizes, zoomSizeCount);
 }
 
-void KHTMLPart::slotIncZoomFast()
+void TDEHTMLPart::slotIncZoomFast()
 {
   zoomIn(fastZoomSizes, fastZoomSizeCount);
 }
 
-void KHTMLPart::slotDecZoomFast()
+void TDEHTMLPart::slotDecZoomFast()
 {
   zoomOut(fastZoomSizes, fastZoomSizeCount);
 }
 
-void KHTMLPart::zoomIn(const int stepping[], int count)
+void TDEHTMLPart::zoomIn(const int stepping[], int count)
 {
   int zoomFactor = d->m_zoomFactor;
 
@@ -5706,7 +5706,7 @@ void KHTMLPart::zoomIn(const int stepping[], int count)
   }
 }
 
-void KHTMLPart::zoomOut(const int stepping[], int count)
+void TDEHTMLPart::zoomOut(const int stepping[], int count)
 {
     int zoomFactor = d->m_zoomFactor;
     if (zoomFactor > minZoom) {
@@ -5720,7 +5720,7 @@ void KHTMLPart::zoomOut(const int stepping[], int count)
     }
 }
 
-void KHTMLPart::setZoomFactor (int percent)
+void TDEHTMLPart::setZoomFactor (int percent)
 {
   if (percent < minZoom) percent = minZoom;
   if (percent > maxZoom) percent = maxZoom;
@@ -5738,9 +5738,9 @@ void KHTMLPart::setZoomFactor (int percent)
   ConstFrameIt it = d->m_frames.begin();
   const ConstFrameIt end = d->m_frames.end();
   for (; it != end; ++it )
-    if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "KHTMLPart" ) ) {
+    if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "TDEHTMLPart" ) ) {
       KParts::ReadOnlyPart* const p = ( *it )->m_part;
-      static_cast<KHTMLPart*>( p )->setZoomFactor(d->m_zoomFactor);
+      static_cast<TDEHTMLPart*>( p )->setZoomFactor(d->m_zoomFactor);
     }
 
   if ( d->m_guiProfile == BrowserViewGUI ) {
@@ -5749,7 +5749,7 @@ void KHTMLPart::setZoomFactor (int percent)
   }
 }
 
-void KHTMLPart::slotZoomView( int delta )
+void TDEHTMLPart::slotZoomView( int delta )
 {
   if ( delta < 0 )
     slotIncZoom();
@@ -5757,7 +5757,7 @@ void KHTMLPart::slotZoomView( int delta )
     slotDecZoom();
 }
 
-void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p)
+void TDEHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p)
 {
   if (!d->m_statusMessagesEnabled)
     return;
@@ -5773,7 +5773,7 @@ void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p)
     if (!tobe.isEmpty() && d->m_jobspeed)
       tobe += " ";
     if (d->m_jobspeed)
-      tobe += i18n( "(%1/s)" ).arg( KIO::convertSize( d->m_jobspeed ) );
+      tobe += i18n( "(%1/s)" ).arg( TDEIO::convertSize( d->m_jobspeed ) );
   }
   tobe = "<qt>"+tobe;
 
@@ -5781,32 +5781,32 @@ void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p)
 }
 
 
-void KHTMLPart::setJSStatusBarText( const TQString &text )
+void TDEHTMLPart::setJSStatusBarText( const TQString &text )
 {
   setStatusBarText(text, BarOverrideText);
 }
 
-void KHTMLPart::setJSDefaultStatusBarText( const TQString &text )
+void TDEHTMLPart::setJSDefaultStatusBarText( const TQString &text )
 {
   setStatusBarText(text, BarDefaultText);
 }
 
-TQString KHTMLPart::jsStatusBarText() const
+TQString TDEHTMLPart::jsStatusBarText() const
 {
     return d->m_statusBarText[BarOverrideText];
 }
 
-TQString KHTMLPart::jsDefaultStatusBarText() const
+TQString TDEHTMLPart::jsDefaultStatusBarText() const
 {
    return d->m_statusBarText[BarDefaultText];
 }
 
-TQString KHTMLPart::referrer() const
+TQString TDEHTMLPart::referrer() const
 {
    return d->m_referrer;
 }
 
-TQString KHTMLPart::pageReferrer() const
+TQString TDEHTMLPart::pageReferrer() const
 {
    KURL referrerURL = KURL( d->m_pageReferrer );
    if (referrerURL.isValid())
@@ -5827,7 +5827,7 @@ TQString KHTMLPart::pageReferrer() const
 }
 
 
-TQString KHTMLPart::lastModified() const
+TQString TDEHTMLPart::lastModified() const
 {
   if ( d->m_lastModified.isEmpty() && m_url.isLocalFile() ) {
     // Local file: set last-modified from the file's mtime.
@@ -5836,11 +5836,11 @@ TQString KHTMLPart::lastModified() const
     TQDateTime lastModif = TQFileInfo( m_url.path() ).lastModified();
     d->m_lastModified = lastModif.toString( Qt::LocalDate );
   }
-  //kdDebug(6050) << "KHTMLPart::lastModified: " << d->m_lastModified << endl;
+  //kdDebug(6050) << "TDEHTMLPart::lastModified: " << d->m_lastModified << endl;
   return d->m_lastModified;
 }
 
-void KHTMLPart::slotLoadImages()
+void TDEHTMLPart::slotLoadImages()
 {
   if (d->m_doc )
     d->m_doc->docLoader()->setAutoloadImages( !d->m_doc->docLoader()->autoloadImages() );
@@ -5848,15 +5848,15 @@ void KHTMLPart::slotLoadImages()
   ConstFrameIt it = d->m_frames.begin();
   const ConstFrameIt end = d->m_frames.end();
   for (; it != end; ++it )
-    if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "KHTMLPart" ) ) {
+    if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "TDEHTMLPart" ) ) {
       KParts::ReadOnlyPart* const p = ( *it )->m_part;
-      static_cast<KHTMLPart*>( p )->slotLoadImages();
+      static_cast<TDEHTMLPart*>( p )->slotLoadImages();
     }
 }
 
-void KHTMLPart::reparseConfiguration()
+void TDEHTMLPart::reparseConfiguration()
 {
-  KHTMLSettings *settings = KHTMLFactory::defaultHTMLSettings();
+  TDEHTMLSettings *settings = TDEHTMLFactory::defaultHTMLSettings();
   settings->init();
 
   setAutoloadImages( settings->autoLoadImages() );
@@ -5872,18 +5872,18 @@ void KHTMLPart::reparseConfiguration()
   d->m_metaRefreshEnabled = settings->isAutoDelayedActionsEnabled ();
 
   delete d->m_settings;
-  d->m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
+  d->m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings());
 
   TQApplication::setOverrideCursor( tqwaitCursor );
-  khtml::CSSStyleSelector::reparseConfiguration();
+  tdehtml::CSSStyleSelector::reparseConfiguration();
   if(d->m_doc) d->m_doc->updateStyleSelector();
   TQApplication::restoreOverrideCursor();
 
-  if (KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
+  if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
      runAdFilter();
 }
 
-TQStringList KHTMLPart::frameNames() const
+TQStringList TDEHTMLPart::frameNames() const
 {
   TQStringList res;
 
@@ -5896,7 +5896,7 @@ TQStringList KHTMLPart::frameNames() const
   return res;
 }
 
-TQPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const
+TQPtrList<KParts::ReadOnlyPart> TDEHTMLPart::frames() const
 {
   TQPtrList<KParts::ReadOnlyPart> res;
 
@@ -5909,9 +5909,9 @@ TQPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const
   return res;
 }
 
-bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
+bool TDEHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
 {
-    kdDebug( 6050 ) << this << "KHTMLPart::openURLInFrame " << url << endl;
+    kdDebug( 6050 ) << this << "TDEHTMLPart::openURLInFrame " << url << endl;
   FrameIt it = d->m_frames.find( urlArgs.frameName );
 
   if ( it == d->m_frames.end() )
@@ -5926,45 +5926,45 @@ bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs
   return true;
 }
 
-void KHTMLPart::setDNDEnabled( bool b )
+void TDEHTMLPart::setDNDEnabled( bool b )
 {
   d->m_bDnd = b;
 }
 
-bool KHTMLPart::dndEnabled() const
+bool TDEHTMLPart::dndEnabled() const
 {
   return d->m_bDnd;
 }
 
-void KHTMLPart::customEvent( TQCustomEvent *event )
+void TDEHTMLPart::customEvent( TQCustomEvent *event )
 {
-  if ( khtml::MousePressEvent::test( event ) )
+  if ( tdehtml::MousePressEvent::test( event ) )
   {
-    khtmlMousePressEvent( static_cast<khtml::MousePressEvent *>( event ) );
+    tdehtmlMousePressEvent( static_cast<tdehtml::MousePressEvent *>( event ) );
     return;
   }
 
-  if ( khtml::MouseDoubleClickEvent::test( event ) )
+  if ( tdehtml::MouseDoubleClickEvent::test( event ) )
   {
-    khtmlMouseDoubleClickEvent( static_cast<khtml::MouseDoubleClickEvent *>( event ) );
+    tdehtmlMouseDoubleClickEvent( static_cast<tdehtml::MouseDoubleClickEvent *>( event ) );
     return;
   }
 
-  if ( khtml::MouseMoveEvent::test( event ) )
+  if ( tdehtml::MouseMoveEvent::test( event ) )
   {
-    khtmlMouseMoveEvent( static_cast<khtml::MouseMoveEvent *>( event ) );
+    tdehtmlMouseMoveEvent( static_cast<tdehtml::MouseMoveEvent *>( event ) );
     return;
   }
 
-  if ( khtml::MouseReleaseEvent::test( event ) )
+  if ( tdehtml::MouseReleaseEvent::test( event ) )
   {
-    khtmlMouseReleaseEvent( static_cast<khtml::MouseReleaseEvent *>( event ) );
+    tdehtmlMouseReleaseEvent( static_cast<tdehtml::MouseReleaseEvent *>( event ) );
     return;
   }
 
-  if ( khtml::DrawContentsEvent::test( event ) )
+  if ( tdehtml::DrawContentsEvent::test( event ) )
   {
-    khtmlDrawContentsEvent( static_cast<khtml::DrawContentsEvent *>( event ) );
+    tdehtmlDrawContentsEvent( static_cast<tdehtml::DrawContentsEvent *>( event ) );
     return;
   }
 
@@ -5976,12 +5976,12 @@ void KHTMLPart::customEvent( TQCustomEvent *event )
  *
  * This is a helper function for line-by-line text selection.
  */
-static bool firstRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&startNode, long &startOffset)
+static bool firstRunAt(tdehtml::RenderObject *renderNode, int y, NodeImpl *&startNode, long &startOffset)
 {
-    for (khtml::RenderObject *n = renderNode; n; n = n->nextSibling()) {
+    for (tdehtml::RenderObject *n = renderNode; n; n = n->nextSibling()) {
         if (n->isText()) {
-            khtml::RenderText* const textRenderer = static_cast<khtml::RenderText *>(n);
-            const khtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
+            tdehtml::RenderText* const textRenderer = static_cast<tdehtml::RenderText *>(n);
+            const tdehtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
             const unsigned lim = runs.count();
             for (unsigned i = 0; i != lim; ++i) {
                 if (runs[i]->m_y == y && textRenderer->element()) {
@@ -6005,13 +6005,13 @@ static bool firstRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&startN
  *
  * This is a helper function for line-by-line text selection.
  */
-static bool lastRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&endNode, long &endOffset)
+static bool lastRunAt(tdehtml::RenderObject *renderNode, int y, NodeImpl *&endNode, long &endOffset)
 {
-    khtml::RenderObject *n = renderNode;
+    tdehtml::RenderObject *n = renderNode;
     if (!n) {
         return false;
     }
-    khtml::RenderObject *next;
+    tdehtml::RenderObject *next;
     while ((next = n->nextSibling())) {
         n = next;
     }
@@ -6022,8 +6022,8 @@ static bool lastRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&endNode
         }
 
         if (n->isText()) {
-            khtml::RenderText* const textRenderer =  static_cast<khtml::RenderText *>(n);
-            const khtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
+            tdehtml::RenderText* const textRenderer =  static_cast<tdehtml::RenderText *>(n);
+            const tdehtml::InlineTextBoxArray &runs = textRenderer->inlineTextBoxes();
             for (int i = (int)runs.count()-1; i >= 0; --i) {
                 if (runs[i]->m_y == y && textRenderer->element()) {
                     endNode = textRenderer->element();
@@ -6041,7 +6041,7 @@ static bool lastRunAt(khtml::RenderObject *renderNode, int y, NodeImpl *&endNode
     }
 }
 
-void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
+void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
 {
   DOM::DOMString url = event->url();
   TQMouseEvent *_mouse = event->qmouseEvent();
@@ -6062,7 +6062,7 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
   {
     d->m_bMousePressed = true;
 
-#ifndef KHTML_NO_SELECTION
+#ifndef TDEHTML_NO_SELECTION
     if ( _mouse->button() == Qt::LeftButton )
     {
       if ( (!d->m_strSelectedURL.isNull() && !isEditable())
@@ -6071,32 +6071,32 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
       if ( !innerNode.isNull()  && innerNode.handle()->renderer()) {
           int offset = 0;
           DOM::NodeImpl* node = 0;
-          khtml::RenderObject::SelPointState state;
+          tdehtml::RenderObject::SelPointState state;
           innerNode.handle()->renderer()->checkSelectionPoint( event->x(), event->y(),
                                                                event->absX()-innerNode.handle()->renderer()->xPos(),
                                                                event->absY()-innerNode.handle()->renderer()->yPos(), node, offset, state );
           d->m_extendMode = d->ExtendByChar;
-#ifdef KHTML_NO_CARET
+#ifdef TDEHTML_NO_CARET
           d->m_selectionStart = node;
           d->m_startOffset = offset;
           //if ( node )
-          //  kdDebug(6005) << "KHTMLPart::khtmlMousePressEvent selectionStart=" << d->m_selectionStart.handle()->renderer()
+          //  kdDebug(6005) << "TDEHTMLPart::tdehtmlMousePressEvent selectionStart=" << d->m_selectionStart.handle()->renderer()
           //                << " offset=" << d->m_startOffset << endl;
           //else
-          //  kdDebug(6005) << "KHTML::khtmlMousePressEvent selectionStart=(nil)" << endl;
+          //  kdDebug(6005) << "TDEHTML::tdehtmlMousePressEvent selectionStart=(nil)" << endl;
           d->m_selectionEnd = d->m_selectionStart;
           d->m_endOffset = d->m_startOffset;
           d->m_doc->clearSelection();
-#else // KHTML_NO_CARET
+#else // TDEHTML_NO_CARET
 	  d->m_view->moveCaretTo(node, offset, (_mouse->state() & ShiftButton) == 0);
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 	  d->m_initialNode = d->m_selectionStart;
 	  d->m_initialOffset = d->m_startOffset;
 //           kdDebug(6000) << "press: initOfs " << d->m_initialOffset << endl;
       }
       else
       {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
         // simply leave it. Is this a good idea?
 #else
         d->m_selectionStart = DOM::Node();
@@ -6121,18 +6121,18 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
   }
 }
 
-void KHTMLPart::khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent *event )
+void TDEHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event )
 {
   TQMouseEvent *_mouse = event->qmouseEvent();
   if ( _mouse->button() == Qt::LeftButton )
   {
     d->m_bMousePressed = true;
     DOM::Node innerNode = event->innerNode();
-    // Find selectionStart again, khtmlMouseReleaseEvent lost it
+    // Find selectionStart again, tdehtmlMouseReleaseEvent lost it
     if ( !innerNode.isNull() && innerNode.handle()->renderer()) {
       int offset = 0;
       DOM::NodeImpl* node = 0;
-      khtml::RenderObject::SelPointState state;
+      tdehtml::RenderObject::SelPointState state;
       innerNode.handle()->renderer()->checkSelectionPoint( event->x(), event->y(),
                                                            event->absX()-innerNode.handle()->renderer()->xPos(),
                                                            event->absY()-innerNode.handle()->renderer()->yPos(), node, offset, state);
@@ -6175,7 +6175,7 @@ void KHTMLPart::khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent *event
         d->m_doc
           ->setSelection(d->m_selectionStart.handle(),d->m_startOffset,
                          d->m_selectionEnd.handle(),d->m_endOffset);
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
         bool v = d->m_view->placeCaret();
         emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset());
 #endif
@@ -6185,14 +6185,14 @@ void KHTMLPart::khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent *event
   }
 }
 
-void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& selectionNode, long& selectionOffset, bool right, bool selectLines )
+void TDEHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& selectionNode, long& selectionOffset, bool right, bool selectLines )
 {
-  khtml::RenderObject* obj = node->renderer();
+  tdehtml::RenderObject* obj = node->renderer();
 
   if (obj->isText() && selectLines) {
     int pos;
-    khtml::RenderText *renderer = static_cast<khtml::RenderText *>(obj);
-    khtml::InlineTextBox *run = renderer->findInlineTextBox( offset, pos );
+    tdehtml::RenderText *renderer = static_cast<tdehtml::RenderText *>(obj);
+    tdehtml::InlineTextBox *run = renderer->findInlineTextBox( offset, pos );
     DOMString t = node->nodeValue();
     DOM::NodeImpl* selNode = 0;
     long selOfs = 0;
@@ -6203,7 +6203,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
     int selectionPointY = run->m_y;
 
     // Go up to first non-inline element.
-    khtml::RenderObject *renderNode = renderer;
+    tdehtml::RenderObject *renderNode = renderer;
     while (renderNode && renderNode->isInline())
       renderNode = renderNode->parent();
 
@@ -6229,7 +6229,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
   TQString str;
   int len = 0;
   if ( obj->isText() ) { // can be false e.g. when double-clicking on a disabled submit button
-    str = static_cast<khtml::RenderText *>(obj)->data().string();
+    str = static_cast<tdehtml::RenderText *>(obj)->data().string();
     len = str.length();
   }
   //kdDebug() << "extendSelection right=" << right << " offset=" << offset << " len=" << len << " Starting at obj=" << obj << endl;
@@ -6250,7 +6250,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
         //kdDebug() << "isText=" << obj->isText() << endl;
         str = TQString();
         if ( obj->isText() )
-          str = static_cast<khtml::RenderText *>(obj)->data().string();
+          str = static_cast<tdehtml::RenderText *>(obj)->data().string();
         else if ( obj->isBR() )
           str = '\n';
         else if ( !obj->isInline() ) {
@@ -6289,13 +6289,13 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
   if (right) ++selectionOffset;
 }
 
-#ifndef KHTML_NO_SELECTION
-void KHTMLPart::extendSelectionTo(int x, int y, int absX, int absY, const DOM::Node &innerNode)
+#ifndef TDEHTML_NO_SELECTION
+void TDEHTMLPart::extendSelectionTo(int x, int y, int absX, int absY, const DOM::Node &innerNode)
 {
       int offset;
-      //kdDebug(6000) << "KHTMLPart::khtmlMouseMoveEvent x=" << event->x() << " y=" << event->y() << endl;
+      //kdDebug(6000) << "TDEHTMLPart::tdehtmlMouseMoveEvent x=" << event->x() << " y=" << event->y() << endl;
       DOM::NodeImpl* node=0;
-      khtml::RenderObject::SelPointState state;
+      tdehtml::RenderObject::SelPointState state;
       innerNode.handle()->renderer()->checkSelectionPoint( x, y,
                                                            absX-innerNode.handle()->renderer()->xPos(),
                                                            absY-innerNode.handle()->renderer()->yPos(), node, offset, state);
@@ -6357,21 +6357,21 @@ void KHTMLPart::extendSelectionTo(int x, int y, int absX, int absY, const DOM::N
             ->setSelection(d->m_selectionEnd.handle(),d->m_endOffset,
                            d->m_selectionStart.handle(),d->m_startOffset);
       }
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
       d->m_view->placeCaret();
 #endif
 }
 
-bool KHTMLPart::isExtendingSelection() const
+bool TDEHTMLPart::isExtendingSelection() const
 {
-  // This is it, the whole detection. khtmlMousePressEvent only sets this
+  // This is it, the whole detection. tdehtmlMousePressEvent only sets this
   // on LMB or MMB, but never on RMB. As text selection doesn't work for MMB,
   // it's sufficient to only rely on this flag to detect selection extension.
   return d->m_bMousePressed;
 }
-#endif // KHTML_NO_SELECTION
+#endif // TDEHTML_NO_SELECTION
 
-void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
+void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event )
 {
   TQMouseEvent *_mouse = event->qmouseEvent();
 
@@ -6390,7 +6390,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
   if( d->m_bDnd && d->m_bMousePressed &&
       ( (!d->m_strSelectedURL.isEmpty() && !isEditable())
         || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) ) {
-    if ( ( d->m_dragStartPos - _mouse->pos() ).manhattanLength() <= KGlobalSettings::dndEventDelay() )
+    if ( ( d->m_dragStartPos - _mouse->pos() ).manhattanLength() <= TDEGlobalSettings::dndEventDelay() )
       return;
 
     TQPixmap pix;
@@ -6405,14 +6405,14 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
     if ( url.length() == 0 && innerNode.handle() && innerNode.handle()->id() == ID_IMG )
     {
       img = static_cast<HTMLImageElementImpl *>(innerNode.handle());
-      u = KURL( completeURL( khtml::parseURL(img->getAttribute(ATTR_SRC)).string() ) );
-      pix = KMimeType::mimeType("image/png")->pixmap(KIcon::Desktop);
+      u = KURL( completeURL( tdehtml::parseURL(img->getAttribute(ATTR_SRC)).string() ) );
+      pix = KMimeType::mimeType("image/png")->pixmap(TDEIcon::Desktop);
     }
     else
     {
       // Text or image link...
       u = completeURL( d->m_strSelectedURL );
-      pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
+      pix = KMimeType::pixmapForURL(u, 0, TDEIcon::Desktop, TDEIcon::SizeMedium);
     }
 
     u.setPass(TQString());
@@ -6458,7 +6458,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
         HTMLImageElementImpl *i = static_cast<HTMLImageElementImpl *>(innerNode.handle());
         if ( i && i->isServerMap() )
         {
-          khtml::RenderObject *r = i->renderer();
+          tdehtml::RenderObject *r = i->renderer();
           if(r)
           {
             int absx, absy, vx, vy;
@@ -6490,7 +6490,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
     }
   }
   else {
-#ifndef KHTML_NO_SELECTION
+#ifndef TDEHTML_NO_SELECTION
     // selection stuff
     if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() &&
         ( (_mouse->state() & Qt::LeftButton) != 0 )) {
@@ -6510,7 +6510,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
 
 }
 
-void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
+void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
 {
   DOM::Node innerNode = event->innerNode();
   d->m_mousePressNode = DOM::Node();
@@ -6535,21 +6535,21 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
   }
 #ifndef QT_NO_CLIPBOARD
   if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
-    kdDebug( 6050 ) << "KHTMLPart::khtmlMouseReleaseEvent() MMB shouldOpen="
+    kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen="
                     << d->m_bOpenMiddleClick << endl;
 
     if (d->m_bOpenMiddleClick) {
-    KHTMLPart *p = this;
+    TDEHTMLPart *p = this;
     while (p->parentPart()) p = p->parentPart();
     p->d->m_extension->pasteRequest();
   }
   }
 #endif
 
-#ifndef KHTML_NO_SELECTION
+#ifndef TDEHTML_NO_SELECTION
   // delete selection in case start and end position are at the same point
   if(d->m_selectionStart == d->m_selectionEnd && d->m_startOffset == d->m_endOffset) {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     d->m_extendAtEnd = true;
 #else
     d->m_selectionStart = 0;
@@ -6602,7 +6602,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
       d->m_startBeforeEnd = true;
       d->m_extendAtEnd = !d->m_extendAtEnd;
     }
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     bool v = d->m_view->placeCaret();
     emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset());
 #endif
@@ -6624,11 +6624,11 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
 
 }
 
-void KHTMLPart::khtmlDrawContentsEvent( khtml::DrawContentsEvent * )
+void TDEHTMLPart::tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * )
 {
 }
 
-void KHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event )
+void TDEHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event )
 {
   if ( event->activated() )
   {
@@ -6637,14 +6637,14 @@ void KHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event )
 
     if ( !d->m_settings->autoLoadImages() && d->m_paLoadImages )
     {
-        TQPtrList<KAction> lst;
+        TQPtrList<TDEAction> lst;
         lst.append( d->m_paLoadImages );
         plugActionList( "loadImages", lst );
     }
   }
 }
 
-void KHTMLPart::slotPrintFrame()
+void TDEHTMLPart::slotPrintFrame()
 {
   if ( d->m_frames.count() == 0 )
     return;
@@ -6667,20 +6667,20 @@ void KHTMLPart::slotPrintFrame()
   }
 }
 
-void KHTMLPart::slotSelectAll()
+void TDEHTMLPart::slotSelectAll()
 {
   KParts::ReadOnlyPart *part = currentFrame();
-  if (part && part->inherits("KHTMLPart"))
-    static_cast<KHTMLPart *>(part)->selectAll();
+  if (part && part->inherits("TDEHTMLPart"))
+    static_cast<TDEHTMLPart *>(part)->selectAll();
 }
 
-void KHTMLPart::startAutoScroll()
+void TDEHTMLPart::startAutoScroll()
 {
    connect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ));
    d->m_scrollTimer.start(100, false);
 }
 
-void KHTMLPart::stopAutoScroll()
+void TDEHTMLPart::stopAutoScroll()
 {
    disconnect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ));
    if (d->m_scrollTimer.isActive())
@@ -6688,7 +6688,7 @@ void KHTMLPart::stopAutoScroll()
 }
 
 
-void KHTMLPart::slotAutoScroll()
+void TDEHTMLPart::slotAutoScroll()
 {
     if (d->m_view)
       d->m_view->doAutoScroll();
@@ -6696,7 +6696,7 @@ void KHTMLPart::slotAutoScroll()
       stopAutoScroll(); // Safety
 }
 
-void KHTMLPart::runAdFilter()
+void TDEHTMLPart::runAdFilter()
 {
     if ( parentPart() )
         parentPart()->runAdFilter();
@@ -6704,17 +6704,17 @@ void KHTMLPart::runAdFilter()
     if ( !d->m_doc )
         return;
 
-    TQPtrDictIterator<khtml::CachedObject> it( d->m_doc->docLoader()->m_docObjects );
+    TQPtrDictIterator<tdehtml::CachedObject> it( d->m_doc->docLoader()->m_docObjects );
     for ( ; it.current(); ++it )
-        if ( it.current()->type() == khtml::CachedObject::Image ) {
-            khtml::CachedImage *image = static_cast<khtml::CachedImage *>(it.current());
+        if ( it.current()->type() == tdehtml::CachedObject::Image ) {
+            tdehtml::CachedImage *image = static_cast<tdehtml::CachedImage *>(it.current());
             bool wasBlocked = image->m_wasBlocked;
-            image->m_wasBlocked = KHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( (*it).url().string() ) );
+            image->m_wasBlocked = TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( (*it).url().string() ) );
             if ( image->m_wasBlocked != wasBlocked )
                 image->do_notify(image->pixmap(), image->valid_rect());
         }
 
-    if ( KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() ) {
+    if ( TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() ) {
         for ( NodeImpl *nextNode, *node = d->m_doc; node; node = nextNode ) {
 
             // We might be deleting 'node' shortly.
@@ -6724,7 +6724,7 @@ void KHTMLPart::runAdFilter()
                  node->id() == ID_IFRAME ||
                  (node->id() == ID_INPUT && static_cast<HTMLInputElementImpl *>(node)->inputType() == HTMLInputElementImpl::IMAGE ))
             {
-                if ( KHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( static_cast<ElementImpl *>(node)->getAttribute(ATTR_SRC).string() ) ) )
+                if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( static_cast<ElementImpl *>(node)->getAttribute(ATTR_SRC).string() ) ) )
                 {
                     // We found an IMG, IFRAME or INPUT (of type IMAGE) matching a filter.
                     node->ref();
@@ -6741,7 +6741,7 @@ void KHTMLPart::runAdFilter()
     }
 }
 
-void KHTMLPart::selectAll()
+void TDEHTMLPart::selectAll()
 {
   if (!d->m_doc) return;
 
@@ -6809,7 +6809,7 @@ void KHTMLPart::selectAll()
   emitSelectionChanged();
 }
 
-bool KHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message, const TQString &button)
+bool TDEHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message, const TQString &button)
 {
   bool linkAllowed = true;
 
@@ -6817,7 +6817,7 @@ bool KHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message, c
     linkAllowed = kapp && kapp->authorizeURLAction("redirect", url(), linkURL);
 
   if ( !linkAllowed ) {
-    khtml::Tokenizer *tokenizer = d->m_doc->tokenizer();
+    tdehtml::Tokenizer *tokenizer = d->m_doc->tokenizer();
     if (tokenizer)
       tokenizer->setOnHold(true);
 
@@ -6843,13 +6843,13 @@ bool KHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message, c
   return true;
 }
 
-void KHTMLPart::slotPartRemoved( KParts::Part *part )
+void TDEHTMLPart::slotPartRemoved( KParts::Part *part )
 {
-//    kdDebug(6050) << "KHTMLPart::slotPartRemoved " << part << endl;
+//    kdDebug(6050) << "TDEHTMLPart::slotPartRemoved " << part << endl;
     if ( part == d->m_activeFrame )
     {
         d->m_activeFrame = 0L;
-        if ( !part->inherits( "KHTMLPart" ) )
+        if ( !part->inherits( "TDEHTMLPart" ) )
         {
             if (factory()) {
                 factory()->removeClient( part );
@@ -6861,16 +6861,16 @@ void KHTMLPart::slotPartRemoved( KParts::Part *part )
     }
 }
 
-void KHTMLPart::slotActiveFrameChanged( KParts::Part *part )
+void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part )
 {
-//    kdDebug(6050) << "KHTMLPart::slotActiveFrameChanged this=" << this << "part=" << part << endl;
+//    kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged this=" << this << "part=" << part << endl;
     if ( part == this )
     {
         kdError(6050) << "strange error! we activated ourselves" << endl;
         assert( false );
         return;
     }
-//    kdDebug(6050) << "KHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl;
+//    kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl;
     if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) )
     {
         TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() );
@@ -6881,14 +6881,14 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part )
         }
     }
 
-    if( d->m_activeFrame && !d->m_activeFrame->inherits( "KHTMLPart" ) )
+    if( d->m_activeFrame && !d->m_activeFrame->inherits( "TDEHTMLPart" ) )
     {
         if (factory()) {
             factory()->removeClient( d->m_activeFrame );
         }
         removeChildClient( d->m_activeFrame );
     }
-    if( part && !part->inherits( "KHTMLPart" ) )
+    if( part && !part->inherits( "TDEHTMLPart" ) )
     {
         if (factory()) {
             factory()->addClient( part );
@@ -6916,7 +6916,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part )
     d->m_extension->setExtensionProxy( KParts::BrowserExtension::childObject( d->m_activeFrame ) );
 }
 
-void KHTMLPart::setActiveNode(const DOM::Node &node)
+void TDEHTMLPart::setActiveNode(const DOM::Node &node)
 {
     if (!d->m_doc || !d->m_view)
         return;
@@ -6930,12 +6930,12 @@ void KHTMLPart::setActiveNode(const DOM::Node &node)
     d->m_view->ensureVisible(rect.left(), rect.top());
 }
 
-DOM::Node KHTMLPart::activeNode() const
+DOM::Node TDEHTMLPart::activeNode() const
 {
     return DOM::Node(d->m_doc?d->m_doc->focusNode():0);
 }
 
-DOM::EventListener *KHTMLPart::createHTMLEventListener( TQString code, TQString name, NodeImpl* node )
+DOM::EventListener *TDEHTMLPart::createHTMLEventListener( TQString code, TQString name, NodeImpl* node )
 {
   KJSProxy *proxy = jScript();
 
@@ -6945,64 +6945,64 @@ DOM::EventListener *KHTMLPart::createHTMLEventListener( TQString code, TQString
   return proxy->createHTMLEventHandler( m_url.url(), name, code, node );
 }
 
-KHTMLPart *KHTMLPart::opener()
+TDEHTMLPart *TDEHTMLPart::opener()
 {
     return d->m_opener;
 }
 
-void KHTMLPart::setOpener(KHTMLPart *_opener)
+void TDEHTMLPart::setOpener(TDEHTMLPart *_opener)
 {
     d->m_opener = _opener;
 }
 
-bool KHTMLPart::openedByJS()
+bool TDEHTMLPart::openedByJS()
 {
     return d->m_openedByJS;
 }
 
-void KHTMLPart::setOpenedByJS(bool _openedByJS)
+void TDEHTMLPart::setOpenedByJS(bool _openedByJS)
 {
     d->m_openedByJS = _openedByJS;
 }
 
-void KHTMLPart::preloadStyleSheet(const TQString &url, const TQString &stylesheet)
+void TDEHTMLPart::preloadStyleSheet(const TQString &url, const TQString &stylesheet)
 {
-    khtml::Cache::preloadStyleSheet(url, stylesheet);
+    tdehtml::Cache::preloadStyleSheet(url, stylesheet);
 }
 
-void KHTMLPart::preloadScript(const TQString &url, const TQString &script)
+void TDEHTMLPart::preloadScript(const TQString &url, const TQString &script)
 {
-    khtml::Cache::preloadScript(url, script);
+    tdehtml::Cache::preloadScript(url, script);
 }
 
-TQCString KHTMLPart::dcopObjectId() const
+TQCString TDEHTMLPart::dcopObjectId() const
 {
   TQCString id;
   id.sprintf("html-widget%d", d->m_dcop_counter);
   return id;
 }
 
-long KHTMLPart::cacheId() const
+long TDEHTMLPart::cacheId() const
 {
   return d->m_cacheId;
 }
 
-bool KHTMLPart::restored() const
+bool TDEHTMLPart::restored() const
 {
   return d->m_restored;
 }
 
-bool KHTMLPart::pluginPageQuestionAsked(const TQString& mimetype) const
+bool TDEHTMLPart::pluginPageQuestionAsked(const TQString& mimetype) const
 {
   // parentPart() should be const!
-  KHTMLPart* parent = const_cast<KHTMLPart *>(this)->parentPart();
+  TDEHTMLPart* parent = const_cast<TDEHTMLPart *>(this)->parentPart();
   if ( parent )
     return parent->pluginPageQuestionAsked(mimetype);
 
   return d->m_pluginPageQuestionAsked.contains(mimetype);
 }
 
-void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype)
+void TDEHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype)
 {
   if ( parentPart() )
     parentPart()->setPluginPageQuestionAsked(mimetype);
@@ -7010,58 +7010,58 @@ void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype)
   d->m_pluginPageQuestionAsked.append(mimetype);
 }
 
-void KHTMLPart::slotAutomaticDetectionLanguage( int _id )
+void TDEHTMLPart::slotAutomaticDetectionLanguage( int _id )
 {
   d->m_automaticDetection->setItemChecked( _id, true );
 
   switch ( _id ) {
     case 0 :
-      d->m_autoDetectLanguage = khtml::Decoder::SemiautomaticDetection;
+      d->m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection;
       break;
     case 1 :
-      d->m_autoDetectLanguage = khtml::Decoder::Arabic;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Arabic;
       break;
     case 2 :
-      d->m_autoDetectLanguage = khtml::Decoder::Baltic;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Baltic;
       break;
     case 3 :
-      d->m_autoDetectLanguage = khtml::Decoder::CentralEuropean;
+      d->m_autoDetectLanguage = tdehtml::Decoder::CentralEuropean;
       break;
     case 4 :
-      d->m_autoDetectLanguage = khtml::Decoder::Chinese;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Chinese;
       break;
     case 5 :
-      d->m_autoDetectLanguage = khtml::Decoder::Greek;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Greek;
       break;
     case 6 :
-      d->m_autoDetectLanguage = khtml::Decoder::Hebrew;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Hebrew;
       break;
     case 7 :
-      d->m_autoDetectLanguage = khtml::Decoder::Japanese;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Japanese;
       break;
     case 8 :
-      d->m_autoDetectLanguage = khtml::Decoder::Korean;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Korean;
       break;
     case 9 :
-      d->m_autoDetectLanguage = khtml::Decoder::Russian;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Russian;
       break;
     case 10 :
-      d->m_autoDetectLanguage = khtml::Decoder::Thai;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Thai;
       break;
     case 11 :
-      d->m_autoDetectLanguage = khtml::Decoder::Turkish;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Turkish;
       break;
     case 12 :
-      d->m_autoDetectLanguage = khtml::Decoder::Ukrainian;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Ukrainian;
       break;
     case 13 :
-      d->m_autoDetectLanguage = khtml::Decoder::Unicode;
+      d->m_autoDetectLanguage = tdehtml::Decoder::Unicode;
       break;
     case 14 :
-      d->m_autoDetectLanguage = khtml::Decoder::WesternEuropean;
+      d->m_autoDetectLanguage = tdehtml::Decoder::WesternEuropean;
       break;
     default :
-      d->m_autoDetectLanguage = khtml::Decoder::SemiautomaticDetection;
+      d->m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection;
       break;
   }
 
@@ -7079,17 +7079,17 @@ void KHTMLPart::slotAutomaticDetectionLanguage( int _id )
   d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), false );
 }
 
-khtml::Decoder *KHTMLPart::createDecoder()
+tdehtml::Decoder *TDEHTMLPart::createDecoder()
 {
-    khtml::Decoder *dec = new khtml::Decoder();
+    tdehtml::Decoder *dec = new tdehtml::Decoder();
     if( !d->m_encoding.isNull() )
         dec->setEncoding( d->m_encoding.latin1(),
-            d->m_haveEncoding ? khtml::Decoder::UserChosenEncoding : khtml::Decoder::EncodingFromHTTPHeader);
+            d->m_haveEncoding ? tdehtml::Decoder::UserChosenEncoding : tdehtml::Decoder::EncodingFromHTTPHeader);
     else {
         // Inherit the default encoding from the parent frame if there is one.
         const char *defaultEncoding = (parentPart() && parentPart()->d->m_decoder)
             ? parentPart()->d->m_decoder->encoding() : settings()->encoding().latin1();
-        dec->setEncoding(defaultEncoding, khtml::Decoder::DefaultEncoding);
+        dec->setEncoding(defaultEncoding, tdehtml::Decoder::DefaultEncoding);
     }
 #ifdef APPLE_CHANGES
     if (d->m_doc)
@@ -7099,11 +7099,11 @@ khtml::Decoder *KHTMLPart::createDecoder()
     return dec;
 }
 
-void KHTMLPart::emitCaretPositionChanged(const DOM::Node &node, long offset) {
+void TDEHTMLPart::emitCaretPositionChanged(const DOM::Node &node, long offset) {
   emit caretPositionChanged(node, offset);
 }
 
-void KHTMLPart::restoreScrollPosition()
+void TDEHTMLPart::restoreScrollPosition()
 {
   KParts::URLArgs args = d->m_extension->urlArgs();
 
@@ -7127,10 +7127,10 @@ void KHTMLPart::restoreScrollPosition()
 }
 
 
-void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
+void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
 {
-#ifndef KHTML_NO_WALLET
-  KHTMLPart *p;
+#ifndef TDEHTML_NO_WALLET
+  TDEHTMLPart *p;
 
   for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) {
   }
@@ -7158,21 +7158,21 @@ void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
 
   if (!d->m_wq) {
     KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
-    d->m_wq = new KHTMLWalletQueue(this);
+    d->m_wq = new TDEHTMLWalletQueue(this);
     d->m_wq->wallet = wallet;
     connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
     connect(d->m_wq, TQT_SIGNAL(walletOpened(KWallet::Wallet*)), this, TQT_SLOT(walletOpened(KWallet::Wallet*)));
   }
   assert(form);
-  d->m_wq->callers.append(KHTMLWalletQueue::Caller(form, form->getDocument()));
-#endif // KHTML_NO_WALLET
+  d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument()));
+#endif // TDEHTML_NO_WALLET
 }
 
 
-void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString>& data)
+void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString>& data)
 {
-#ifndef KHTML_NO_WALLET
-  KHTMLPart *p;
+#ifndef TDEHTML_NO_WALLET
+  TDEHTMLPart *p;
 
   for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) {
   }
@@ -7200,19 +7200,19 @@ void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString>
 
   if (!d->m_wq) {
     KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
-    d->m_wq = new KHTMLWalletQueue(this);
+    d->m_wq = new TDEHTMLWalletQueue(this);
     d->m_wq->wallet = wallet;
     connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
     connect(d->m_wq, TQT_SIGNAL(walletOpened(KWallet::Wallet*)), this, TQT_SLOT(walletOpened(KWallet::Wallet*)));
   }
   d->m_wq->savers.append(qMakePair(key, data));
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 
-void KHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) {
-#ifndef KHTML_NO_WALLET
-  KHTMLPart *p;
+void TDEHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) {
+#ifndef TDEHTML_NO_WALLET
+  TDEHTMLPart *p;
 
   for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) {
   }
@@ -7223,14 +7223,14 @@ void KHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) {
   }
 
   if (d->m_wq) {
-    d->m_wq->callers.remove(KHTMLWalletQueue::Caller(form, form->getDocument()));
+    d->m_wq->callers.remove(TDEHTMLWalletQueue::Caller(form, form->getDocument()));
   }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 
-void KHTMLPart::walletOpened(KWallet::Wallet *wallet) {
-#ifndef KHTML_NO_WALLET
+void TDEHTMLPart::walletOpened(KWallet::Wallet *wallet) {
+#ifndef TDEHTML_NO_WALLET
   assert(!d->m_wallet);
   assert(d->m_wq);
 
@@ -7248,7 +7248,7 @@ void KHTMLPart::walletOpened(KWallet::Wallet *wallet) {
 
   if (!d->m_statusBarWalletLabel) {
     d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar());
-    d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
+    d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small));
     d->m_statusBarWalletLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     d->m_statusBarWalletLabel->setUseCursor(false);
     d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false);
@@ -7259,14 +7259,14 @@ void KHTMLPart::walletOpened(KWallet::Wallet *wallet) {
     TQToolTip::remove(d->m_statusBarWalletLabel);
   }
   TQToolTip::add(d->m_statusBarWalletLabel, i18n("The wallet '%1' is open and being used for form data and passwords.").arg(KWallet::Wallet::NetworkWallet()));
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
 
-KWallet::Wallet *KHTMLPart::wallet()
+KWallet::Wallet *TDEHTMLPart::wallet()
 {
-#ifndef KHTML_NO_WALLET
-  KHTMLPart *p;
+#ifndef TDEHTML_NO_WALLET
+  TDEHTMLPart *p;
 
   for (p = parentPart(); p && p->parentPart(); p = p->parentPart())
     ;
@@ -7274,14 +7274,14 @@ KWallet::Wallet *KHTMLPart::wallet()
   if (p)
     return p->wallet();
 
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
   return d->m_wallet;
 }
 
 
-void KHTMLPart::slotWalletClosed()
+void TDEHTMLPart::slotWalletClosed()
 {
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
   if (d->m_wallet) {
     d->m_wallet->deleteLater();
     d->m_wallet = 0L;
@@ -7292,47 +7292,47 @@ void KHTMLPart::slotWalletClosed()
     delete d->m_statusBarWalletLabel;
     d->m_statusBarWalletLabel = 0L;
   }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
-void KHTMLPart::launchWalletManager()
+void TDEHTMLPart::launchWalletManager()
 {
-#ifndef KHTML_NO_WALLET
-  if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
-    KApplication::startServiceByDesktopName("kwalletmanager_show");
+#ifndef TDEHTML_NO_WALLET
+  if (!DCOPClient::mainClient()->isApplicationRegistered("tdewalletmanager")) {
+    TDEApplication::startServiceByDesktopName("tdewalletmanager_show");
   } else {
-    DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
+    DCOPRef r("tdewalletmanager", "tdewalletmanager-mainwindow#1");
     r.send("show");
     r.send("raise");
   }
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
-void KHTMLPart::walletMenu()
+void TDEHTMLPart::walletMenu()
 {
-#ifndef KHTML_NO_WALLET
-  KPopupMenu *m = new KPopupMenu(0L);
+#ifndef TDEHTML_NO_WALLET
+  TDEPopupMenu *m = new TDEPopupMenu(0L);
   m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed()));
   m->popup(TQCursor::pos());
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
 }
 
-void KHTMLPart::slotToggleCaretMode()
+void TDEHTMLPart::slotToggleCaretMode()
 {
   setCaretMode(d->m_paToggleCaretMode->isChecked());
 }
 
-void KHTMLPart::setFormNotification(KHTMLPart::FormNotification fn) {
+void TDEHTMLPart::setFormNotification(TDEHTMLPart::FormNotification fn) {
   d->m_formNotification = fn;
 }
 
-KHTMLPart::FormNotification KHTMLPart::formNotification() const {
+TDEHTMLPart::FormNotification TDEHTMLPart::formNotification() const {
   return d->m_formNotification;
 }
 
-KURL KHTMLPart::toplevelURL()
+KURL TDEHTMLPart::toplevelURL()
 {
-  KHTMLPart* part = this;
+  TDEHTMLPart* part = this;
   while (part->parentPart())
     part = part->parentPart();
 
@@ -7342,7 +7342,7 @@ KURL KHTMLPart::toplevelURL()
   return part->url();
 }
 
-bool KHTMLPart::isModified() const
+bool TDEHTMLPart::isModified() const
 {
   if ( !d->m_doc )
     return false;
@@ -7350,27 +7350,27 @@ bool KHTMLPart::isModified() const
   return d->m_doc->unsubmittedFormChanges();
 }
 
-void KHTMLPart::setDebugScript( bool enable )
+void TDEHTMLPart::setDebugScript( bool enable )
 {
   unplugActionList( "debugScriptList" );
   if ( enable ) {
     if (!d->m_paDebugScript) {
-      d->m_paDebugScript = new KAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
+      d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
     }
     d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L );
-    TQPtrList<KAction> lst;
+    TQPtrList<TDEAction> lst;
     lst.append( d->m_paDebugScript );
     plugActionList( "debugScriptList", lst );
   }
   d->m_bJScriptDebugEnabled = enable;
 }
 
-void KHTMLPart::setSuppressedPopupIndicator( bool enable )
+void TDEHTMLPart::setSuppressedPopupIndicator( bool enable )
 {
     setSuppressedPopupIndicator( enable, 0 );
 }
 
-void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart )
+void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originPart )
 {
     if ( parentPart() ) {
         parentPart()->setSuppressedPopupIndicator( enable, originPart );
@@ -7385,7 +7385,7 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart
 
     if ( enable && !d->m_statusBarPopupLabel ) {
         d->m_statusBarPopupLabel = new KURLLabel( d->m_statusBarExtension->statusBar() );
-        d->m_statusBarPopupLabel->setFixedHeight( instance()->iconLoader()->currentSize( KIcon::Small) );
+        d->m_statusBarPopupLabel->setFixedHeight( instance()->iconLoader()->currentSize( TDEIcon::Small) );
         d->m_statusBarPopupLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
         d->m_statusBarPopupLabel->setUseCursor( false );
         d->m_statusBarExtension->addStatusBarItem( d->m_statusBarPopupLabel, 0, false );
@@ -7406,8 +7406,8 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart
     }
 }
 
-void KHTMLPart::suppressedPopupMenu() {
-  KPopupMenu *m = new KPopupMenu(0L);
+void TDEHTMLPart::suppressedPopupMenu() {
+  TDEPopupMenu *m = new TDEPopupMenu(0L);
   m->setCheckable(true);
   if ( d->m_openableSuppressedPopups )
       m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQT_SLOT(showSuppressedPopups()));
@@ -7417,16 +7417,16 @@ void KHTMLPart::suppressedPopupMenu() {
   m->popup(TQCursor::pos());
 }
 
-void KHTMLPart::togglePopupPassivePopup() {
+void TDEHTMLPart::togglePopupPassivePopup() {
   // Same hack as in disableJSErrorExtension()
   d->m_settings->setJSPopupBlockerPassivePopup( !d->m_settings->jsPopupBlockerPassivePopup() );
   DCOPClient::mainClient()->send("konqueror*", "KonquerorIface", "reparseConfiguration()", TQByteArray());
 }
 
-void KHTMLPart::showSuppressedPopups() {
-    for ( TQValueListIterator<TQGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
+void TDEHTMLPart::showSuppressedPopups() {
+    for ( TQValueListIterator<TQGuardedPtr<TDEHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
           i != d->m_suppressedPopupOriginParts.end(); ++i ) {
-      if (KHTMLPart* part = *i) {
+      if (TDEHTMLPart* part = *i) {
         KJS::Window *w = KJS::Window::retrieveWindow( part );
         if (w) {
             w->showSuppressedWindows();
@@ -7441,7 +7441,7 @@ void KHTMLPart::showSuppressedPopups() {
 
 // Extension to use for "view document source", "save as" etc.
 // Using the right extension can help the viewer get into the right mode (#40496)
-TQString KHTMLPart::defaultExtension() const
+TQString TDEHTMLPart::defaultExtension() const
 {
     if ( !d->m_doc )
         return ".html";
@@ -7450,7 +7450,7 @@ TQString KHTMLPart::defaultExtension() const
     return d->m_doc->htmlMode() == DOM::DocumentImpl::XHtml ? ".xhtml" : ".html";
 }
 
-bool KHTMLPart::inProgress() const
+bool TDEHTMLPart::inProgress() const
 {
     if (d->m_runningScripts || (d->m_doc && d->m_doc->parsing()))
         return true;
@@ -7467,5 +7467,5 @@ bool KHTMLPart::inProgress() const
 }
 
 using namespace KParts;
-#include "khtml_part.moc"
-#include "khtmlpart_p.moc"
+#include "tdehtml_part.moc"
+#include "tdehtmlpart_p.moc"
diff --git a/khtml/khtml_part.h b/tdehtml/tdehtml_part.h
index c3c0ba23f..452083708 100644
--- a/khtml/khtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -23,24 +23,24 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __khtml_part_h__
-#define __khtml_part_h__
+#ifndef __tdehtml_part_h__
+#define __tdehtml_part_h__
 
 #include "dom/html_document.h"
 #include "dom/dom2_range.h"
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 #include <kdemacros.h>
 #include <kfinddialog.h>
 
 #include <tqregexp.h>
 
-class KHTMLPartPrivate;
-class KHTMLPartBrowserExtension;
+class TDEHTMLPartPrivate;
+class TDEHTMLPartBrowserExtension;
 class KJSProxy;
-class KHTMLView;
-class KHTMLSettings;
+class TDEHTMLView;
+class TDEHTMLSettings;
 class KJavaAppletContext;
 class KJSErrorDlg;
 
@@ -68,7 +68,7 @@ namespace KJS
   class Interpreter;
 }
 
-namespace khtml
+namespace tdehtml
 {
   class DocLoader;
   class RenderPart;
@@ -112,7 +112,7 @@ namespace KWallet
 }
 
 /**
- * This class is khtml's main class. It features an almost complete
+ * This class is tdehtml's main class. It features an almost complete
  * web browser, and html renderer.
  *
  * The easiest way to use this class (if you just want to display an HTML
@@ -120,7 +120,7 @@ namespace KWallet
  *
  * \code
  * KURL url = "http://www.kde.org";
- * KHTMLPart *w = new KHTMLPart();
+ * TDEHTMLPart *w = new TDEHTMLPart();
  * w->openURL(url);
  * w->view()->resize(500, 400);
  * w->show();
@@ -139,7 +139,7 @@ namespace KWallet
  * w->setPluginsEnabled(false);
  * \endcode
  *
- * You may also wish to disable external references.  This will prevent KHTML
+ * You may also wish to disable external references.  This will prevent TDEHTML
  * from loading images, frames, etc,  or redirecting to external sites.
  *
  * \code
@@ -151,7 +151,7 @@ namespace KWallet
  *
  * \code
  * TQString myHTMLCode = ...;
- * KHTMLPart *w = new KHTMLPart();
+ * TDEHTMLPart *w = new TDEHTMLPart();
  * w->begin();
  * w->write(myHTMLCode);
  * ...
@@ -171,9 +171,9 @@ namespace KWallet
  * described above as the following example shows:
  *
  * \code
- * KHTMLPart *doc = new KHTMLPart();
+ * TDEHTMLPart *doc = new TDEHTMLPart();
  * doc->openStream( "text/html", KURL() );
- * doc->writeStream( TQCString( "<html><body><p>KHTML Rocks!</p></body></html>" ) );
+ * doc->writeStream( TQCString( "<html><body><p>TDEHTML Rocks!</p></body></html>" ) );
  * doc->closeStream();
  * \endcode
  *
@@ -181,10 +181,10 @@ namespace KWallet
  * @author Lars Knoll (knoll@kde.org)
  *
  */
-class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart
+class TDEHTML_EXPORT TDEHTMLPart : public KParts::ReadOnlyPart
 {
   Q_OBJECT
-  friend class KHTMLView;
+  friend class TDEHTMLView;
   friend class DOM::HTMLTitleElementImpl;
   friend class DOM::HTMLFrameElementImpl;
   friend class DOM::HTMLIFrameElementImpl;
@@ -192,9 +192,9 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart
   friend class DOM::HTMLAnchorElementImpl;
   friend class DOM::HTMLMetaElementImpl;
   friend class DOM::NodeImpl;
-  friend class KHTMLRun;
+  friend class TDEHTMLRun;
   friend class DOM::HTMLFormElementImpl;
-  friend class khtml::RenderPartObject;
+  friend class tdehtml::RenderPartObject;
   friend class KJS::Window;
   friend class KJS::ScheduledAction;
   friend class KJS::JSNodeFilter;
@@ -205,17 +205,17 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart
   friend class KJS::DOMDocument;
   friend class KJS::SourceFile;
   friend class KJSProxy;
-  friend class KHTMLPartBrowserExtension;
+  friend class TDEHTMLPartBrowserExtension;
   friend class DOM::DocumentImpl;
   friend class DOM::HTMLDocumentImpl;
-  friend class KHTMLPartBrowserHostExtension;
-  friend class khtml::HTMLTokenizer;
-  friend class khtml::XMLTokenizer;
-  friend class khtml::RenderWidget;
-  friend class khtml::CSSStyleSelector;
-  friend class KHTMLPartIface;
-  friend class KHTMLPartFunction;
-  friend class KHTMLPopupGUIClient;
+  friend class TDEHTMLPartBrowserHostExtension;
+  friend class tdehtml::HTMLTokenizer;
+  friend class tdehtml::XMLTokenizer;
+  friend class tdehtml::RenderWidget;
+  friend class tdehtml::CSSStyleSelector;
+  friend class TDEHTMLPartIface;
+  friend class TDEHTMLPartFunction;
+  friend class TDEHTMLPopupGUIClient;
 
   TQ_PROPERTY( bool javaScriptEnabled READ jScriptEnabled WRITE setJScriptEnabled )
   TQ_PROPERTY( bool javaEnabled READ javaEnabled WRITE setJavaEnabled )
@@ -235,26 +235,26 @@ public:
   enum GUIProfile { DefaultGUI, BrowserViewGUI /* ... */ };
 
   /**
-   * Constructs a new KHTMLPart.
+   * Constructs a new TDEHTMLPart.
    *
-   * KHTML basically consists of two objects: The KHTMLPart itself,
-   * holding the document data (DOM document), and the KHTMLView,
+   * TDEHTML basically consists of two objects: The TDEHTMLPart itself,
+   * holding the document data (DOM document), and the TDEHTMLView,
    * derived from TQScrollView, in which the document content is
    * rendered in. You can specify two different parent objects for a
-   * KHTMLPart, one parent for the KHTMLPart document and on parent
-   * for the KHTMLView. If the second @p parent argument is 0L, then
+   * TDEHTMLPart, one parent for the TDEHTMLPart document and on parent
+   * for the TDEHTMLView. If the second @p parent argument is 0L, then
    * @p parentWidget is used as parent for both objects, the part and
    * the view.
    */
-  KHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0,
+  TDEHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0,
              TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
 
-  KHTMLPart( KHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
+  TDEHTMLPart( TDEHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
 
   /**
    * Destructor.
    */
-  virtual ~KHTMLPart();
+  virtual ~TDEHTMLPart();
 
   /**
    * Opens the specified URL @p url.
@@ -274,7 +274,7 @@ public:
    * verbose error description a as page, depending on the users configuration.
    * @p job is the job that signaled the error situation
    */
-  virtual void showError( KIO::Job* job );
+  virtual void showError( TDEIO::Job* job );
 
   /**
    * Returns a reference to the DOM HTML document (for non-HTML documents, returns null)
@@ -301,13 +301,13 @@ public:
    * Returns a pointer to the KParts::BrowserExtension.
    */
   KParts::BrowserExtension *browserExtension() const;
-  KParts::LiveConnectExtension *liveConnectExtension( const khtml::RenderPart *) const;
+  KParts::LiveConnectExtension *liveConnectExtension( const tdehtml::RenderPart *) const;
   KParts::BrowserHostExtension *browserHostExtension() const;
 
   /**
    * Returns a pointer to the HTML document's view.
    */
-  KHTMLView *view() const;
+  TDEHTMLView *view() const;
 
   /**
    * Enable/disable Javascript support. Note that this will
@@ -440,7 +440,7 @@ public:
    * Security option.
    *
    * Specify whether only file:/ or data:/ urls are allowed to be loaded without
-   * user confirmation by KHTML.
+   * user confirmation by TDEHTML.
    * ( for example referenced by stylesheets, images, scripts, subdocuments, embedded elements ).
    *
    * This option is mainly intended for enabling the "mail reader mode", where you load untrusted
@@ -450,7 +450,7 @@ public:
    * Java and Plugins support. This might change in the future if the security model
    * is becoming more sophisticated, so don't rely on this behaviour.
    *
-   * ( default false - everything is loaded unless forbidden by KApplication::authorizeURLAction).
+   * ( default false - everything is loaded unless forbidden by TDEApplication::authorizeURLAction).
    */
   void setOnlyLocalReferences( bool enable );
 
@@ -605,7 +605,7 @@ public:
   //    void print(TQPainter *, int pageHeight, int pageWidth);
 
   /**
-   * Paints the HTML page to a TQPainter. See KHTMLView::paint for details
+   * Paints the HTML page to a TQPainter. See TDEHTMLView::paint for details
    */
   void paint( TQPainter *, const TQRect &, int = 0, bool * = 0 );
 
@@ -845,7 +845,7 @@ public:
   KParts::PartManager *partManager();
 
   /**
-   * Saves the KHTMLPart's complete state (including child frame
+   * Saves the TDEHTMLPart's complete state (including child frame
    * objects) to the provided TQDataStream.
    *
    * This is called from the saveState() method of the
@@ -853,7 +853,7 @@ public:
    */
   virtual void saveState( TQDataStream &stream );
   /**
-   * Restores the KHTMLPart's previously saved state (including
+   * Restores the TDEHTMLPart's previously saved state (including
    * child frame objects) from the provided TQDataStream.
    *
    * @see saveState()
@@ -884,15 +884,15 @@ public:
   /**
    * @internal
    */
-  const KHTMLSettings *settings() const;
+  const TDEHTMLSettings *settings() const;
 
   /**
-   * Returns a pointer to the parent KHTMLPart if the part is a frame
+   * Returns a pointer to the parent TDEHTMLPart if the part is a frame
    * in an HTML frameset.
    *
    *  Returns 0L otherwise.
    */
-  KHTMLPart *parentPart();
+  TDEHTMLPart *parentPart();
 
   /**
    * Returns a list of names of all frame (including iframe) objects of
@@ -906,7 +906,7 @@ public:
   /**
    * Finds a frame by name. Returns 0L if frame can't be found.
    */
-  KHTMLPart *findFrame( const TQString &f );
+  TDEHTMLPart *findFrame( const TQString &f );
 
   /**
    * Recursively finds the part containing the frame with name @p f
@@ -916,7 +916,7 @@ public:
    * frame info in @p *childFrame
    * @since 3.3
    */
-  KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame=0 );
+  TDEHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, tdehtml::ChildFrame **childFrame=0 );
 
   /**
    * Return the current frame (the one that has focus)
@@ -1046,7 +1046,7 @@ public:
    * Shows or hides the suppressed popup indicator
    * @since 3.5
    */
-  void setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart );
+  void setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originPart );
 
   /**
    * @internal
@@ -1118,7 +1118,7 @@ protected:
 
   /**
    * presents a detailed error message to the user.
-   * @p errorCode kio error code, eg KIO::ERR_SERVER_TIMEOUT.
+   * @p errorCode kio error code, eg TDEIO::ERR_SERVER_TIMEOUT.
    * @p text kio additional information text.
    * @p url the url that triggered the error.
    */
@@ -1127,25 +1127,25 @@ protected:
   virtual void customEvent( TQCustomEvent *event );
 
   /**
-   * Eventhandler of the khtml::MousePressEvent.
+   * Eventhandler of the tdehtml::MousePressEvent.
    */
-  virtual void khtmlMousePressEvent( khtml::MousePressEvent *event );
+  virtual void tdehtmlMousePressEvent( tdehtml::MousePressEvent *event );
   /**
-   * Eventhandler for the khtml::MouseDoubleClickEvent.
+   * Eventhandler for the tdehtml::MouseDoubleClickEvent.
    */
-  virtual void khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent * );
+  virtual void tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent * );
   /**
-   * Eventhandler for the khtml::MouseMouseMoveEvent.
+   * Eventhandler for the tdehtml::MouseMouseMoveEvent.
    */
-  virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent *event );
+  virtual void tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event );
   /**
-   * Eventhandler for the khtml::MouseMouseReleaseEvent.
+   * Eventhandler for the tdehtml::MouseMouseReleaseEvent.
    */
-  virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event );
+  virtual void tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event );
   /**
-   * Eventhandler for the khtml::DrawContentsEvent.
+   * Eventhandler for the tdehtml::DrawContentsEvent.
    */
-  virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * );
+  virtual void tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * );
 
   /**
    * Internal reimplementation of KParts::Part::guiActivateEvent .
@@ -1288,11 +1288,11 @@ private slots:
   /**
    * @internal
    */
-  void slotData( KIO::Job*, const TQByteArray &data );
+  void slotData( TDEIO::Job*, const TQByteArray &data );
   /**
   * @internal
   */
-  void slotInfoMessage( KIO::Job*, const TQString& msg );
+  void slotInfoMessage( TDEIO::Job*, const TQString& msg );
   /**
    * @internal
    */
@@ -1300,7 +1300,7 @@ private slots:
   /**
    * @internal
    */
-  void slotFinished( KIO::Job* );
+  void slotFinished( TDEIO::Job* );
   /**
    * @internal
    */
@@ -1312,7 +1312,7 @@ private slots:
   /**
    * @internal
    */
-  void slotRedirection( KIO::Job*, const KURL& );
+  void slotRedirection( TDEIO::Job*, const KURL& );
   /**
    * @internal
    */
@@ -1405,7 +1405,7 @@ private slots:
   /**
    * @internal
    */
-  void slotChildStarted( KIO::Job *job );
+  void slotChildStarted( TDEIO::Job *job );
   /**
    * @internal
    */
@@ -1430,8 +1430,8 @@ private slots:
    * @internal
    */
   void slotRequestFocus( KParts::ReadOnlyPart * );
-  void slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* obj);
-  void slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *obj );
+  void slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* obj);
+  void slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *obj );
   void checkCompleted();
 
   /**
@@ -1451,22 +1451,22 @@ private slots:
   /*
    * @internal
    */
-  void slotJobPercent( KIO::Job*, unsigned long );
+  void slotJobPercent( TDEIO::Job*, unsigned long );
 
   /*
    * @internal
    */
-  void slotJobDone( KIO::Job* );
+  void slotJobDone( TDEIO::Job* );
 
   /*
    * @internal
    */
-  void slotUserSheetStatDone( KIO::Job* );
+  void slotUserSheetStatDone( TDEIO::Job* );
 
   /*
    * @internal
    */
-  void slotJobSpeed( KIO::Job*, unsigned long );
+  void slotJobSpeed( TDEIO::Job*, unsigned long );
 
   /**
    * @internal
@@ -1553,7 +1553,7 @@ private:
   void resetFromScript();
   void emitSelectionChanged();
   // Returns whether callingHtmlPart may access this part
-  bool checkFrameAccess(KHTMLPart *callingHtmlPart);
+  bool checkFrameAccess(TDEHTMLPart *callingHtmlPart);
   bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs );
   bool urlSelectedIntern( const TQString &url, int button, int state,
                           const TQString &_target, KParts::URLArgs args = KParts::URLArgs());
@@ -1562,7 +1562,7 @@ private:
   void overURL( const TQString &url, const TQString &target, bool shiftPressed = false );
   void resetHoverText(); // Undo overURL and reset HoverText
 
-  bool processObjectRequest( khtml::ChildFrame *child, const KURL &url, const TQString &mimetype );
+  bool processObjectRequest( tdehtml::ChildFrame *child, const KURL &url, const TQString &mimetype );
 
   KWallet::Wallet* wallet();
 
@@ -1588,7 +1588,7 @@ private:
 
   void popupMenu( const TQString &url );
 
-  void init( KHTMLView *view, GUIProfile prof );
+  void init( TDEHTMLView *view, GUIProfile prof );
 
 
   void clear();
@@ -1598,7 +1598,7 @@ private:
   TQVariant crossFrameExecuteScript(const TQString& target, const TQString& script);
   TQVariant executeScheduledScript();
 
-  bool requestFrame( khtml::RenderPart *frame, const TQString &url, const TQString &frameName,
+  bool requestFrame( tdehtml::RenderPart *frame, const TQString &url, const TQString &frameName,
                      const TQStringList &args = TQStringList(), bool isIFrame = false );
 
   /**
@@ -1610,27 +1610,27 @@ private:
    */
   TQString requestFrameName();
 
-  bool requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
+  bool requestObject( tdehtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
                       const TQStringList &args = TQStringList() );
 
-  bool requestObject( khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
+  bool requestObject( tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
 
   DOM::EventListener *createHTMLEventListener( TQString code, TQString name, DOM::NodeImpl *node );
 
   DOM::HTMLDocumentImpl *docImpl() const;
   DOM::DocumentImpl *xmlDocImpl() const;
-  khtml::ChildFrame *frame( const TQObject *obj );
+  tdehtml::ChildFrame *frame( const TQObject *obj );
 
-  khtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true );
+  tdehtml::ChildFrame *recursiveFrameRequest( TDEHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true );
 
   bool checkLinkSecurity( const KURL &linkURL,const TQString &message = TQString::null, const TQString &button = TQString::null );
   TQVariant executeScript( const TQString& filename, int baseLine, const DOM::Node &n, const TQString& script );
 
   KJSProxy *jScript();
 
-  KHTMLPart *opener();
+  TDEHTMLPart *opener();
   long cacheId() const;
-  void setOpener( KHTMLPart *_opener );
+  void setOpener( TDEHTMLPart *_opener );
   bool openedByJS();
   void setOpenedByJS( bool _openedByJS );
 
@@ -1654,7 +1654,7 @@ private:
    * @return @p true if a selection is extended by the mouse.
    */
   bool isExtendingSelection() const;
-  khtml::Decoder *createDecoder();
+  tdehtml::Decoder *createDecoder();
   TQString defaultEncoding() const;
 
   /** .html, .xhtml or .xml */
@@ -1675,8 +1675,8 @@ private:
 
   void runAdFilter();
 
-  KHTMLPartPrivate *d;
-  friend class KHTMLPartPrivate;
+  TDEHTMLPartPrivate *d;
+  friend class TDEHTMLPartPrivate;
 };
 
 
diff --git a/khtml/khtml_popupmenu.rc b/tdehtml/tdehtml_popupmenu.rc
index 79e3391d3..0570313d2 100644
--- a/khtml/khtml_popupmenu.rc
+++ b/tdehtml/tdehtml_popupmenu.rc
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="khtmlpart_popupmenu" version="14">
+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="tdehtmlpart_popupmenu" version="14">
 <Menu name="popupmenu">
  <Action name="copy" group="editactions"/>
  <Action name="selectAll" group="editactions"/>
diff --git a/khtml/khtml_printsettings.cpp b/tdehtml/tdehtml_printsettings.cpp
index ed998ffb7..19fe7bdbf 100644
--- a/khtml/khtml_printsettings.cpp
+++ b/tdehtml/tdehtml_printsettings.cpp
@@ -17,14 +17,14 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "khtml_printsettings.h"
+#include "tdehtml_printsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name)
+TDEHTMLPrintSettings::TDEHTMLPrintSettings(TQWidget *parent, const char *name)
 : KPrintDialogPage(parent, name)
 {
 	//WhatsThis strings.... (added by pfeifle@kde.org)
@@ -87,22 +87,22 @@ KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name)
 	l0->addStretch(1);
 }
 
-KHTMLPrintSettings::~KHTMLPrintSettings()
+TDEHTMLPrintSettings::~TDEHTMLPrintSettings()
 {
 }
 
-void KHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/)
+void TDEHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/)
 {
-	opts["app-khtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
-	opts["app-khtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
-	opts["app-khtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
+	opts["app-tdehtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
+	opts["app-tdehtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
+	opts["app-tdehtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
 }
 
-void KHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts)
+void TDEHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts)
 {
-	m_printfriendly->setChecked(opts["app-khtml-printfriendly"] != "false");
-	m_printimages->setChecked(opts["app-khtml-printimages"] != "false");
-	m_printheader->setChecked(opts["app-khtml-printheader"] != "false");
+	m_printfriendly->setChecked(opts["app-tdehtml-printfriendly"] != "false");
+	m_printimages->setChecked(opts["app-tdehtml-printimages"] != "false");
+	m_printheader->setChecked(opts["app-tdehtml-printheader"] != "false");
 }
 
-#include "khtml_printsettings.moc"
+#include "tdehtml_printsettings.moc"
diff --git a/khtml/khtml_printsettings.h b/tdehtml/tdehtml_printsettings.h
index 9f69d9b88..2a92d0e3c 100644
--- a/khtml/khtml_printsettings.h
+++ b/tdehtml/tdehtml_printsettings.h
@@ -17,19 +17,19 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KHTML_PRINTSETTINGS_H
-#define KHTML_PRINTSETTINGS_H
+#ifndef TDEHTML_PRINTSETTINGS_H
+#define TDEHTML_PRINTSETTINGS_H
 
 #include <tdeprint/kprintdialogpage.h>
 
 class TQCheckBox;
 
-class KHTMLPrintSettings : public KPrintDialogPage
+class TDEHTMLPrintSettings : public KPrintDialogPage
 {
 	Q_OBJECT
 public:
-	KHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0);
-	~KHTMLPrintSettings();
+	TDEHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0);
+	~TDEHTMLPrintSettings();
 
 	void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false);
 	void setOptions(const TQMap<TQString,TQString>& opts);
diff --git a/khtml/khtml_run.cpp b/tdehtml/tdehtml_run.cpp
index 90770d38f..499616cce 100644
--- a/khtml/khtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -20,15 +20,15 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#include "khtmlpart_p.h"
-#include "khtml_run.h"
-#include <kio/job.h>
+#include "tdehtmlpart_p.h"
+#include "tdehtml_run.h"
+#include <tdeio/job.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include "khtml_ext.h"
+#include <tdelocale.h>
+#include "tdehtml_ext.h"
 #include <tqwidget.h>
 
-KHTMLRun::KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url,
+TDEHTMLRun::TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url,
                     const KParts::URLArgs &args, bool hideErrorDialog )
     : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0,
                           false, false, hideErrorDialog ),
@@ -41,14 +41,14 @@ KHTMLRun::KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url,
     part->started(0L);
 }
 
-//KHTMLPart *KHTMLRun::htmlPart() const
-//{ return static_cast<KHTMLPart *>(m_part); }
+//TDEHTMLPart *TDEHTMLRun::htmlPart() const
+//{ return static_cast<TDEHTMLPart *>(m_part); }
 
-void KHTMLRun::foundMimeType( const TQString &_type )
+void TDEHTMLRun::foundMimeType( const TQString &_type )
 {
     Q_ASSERT(!m_bFinished);
     TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
-    if ( static_cast<KHTMLPart *>(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) )
+    if ( static_cast<TDEHTMLPart *>(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) )
         m_bFinished = true;
     else {
         if ( m_bFinished ) // abort was called (this happens with the activex fallback for instance)
@@ -60,7 +60,7 @@ void KHTMLRun::foundMimeType( const TQString &_type )
         m_bFinished = ( res == KParts::BrowserRun::Handled );
         if ( m_bFinished ) { // saved or canceled -> flag completed
             m_child->m_bCompleted = true;
-            static_cast<KHTMLPart *>(m_part)->checkCompleted();
+            static_cast<TDEHTMLPart *>(m_part)->checkCompleted();
         }
     }
 
@@ -70,23 +70,23 @@ void KHTMLRun::foundMimeType( const TQString &_type )
         return;
     }
 
-    //kdDebug(6050) << "KHTMLRun::foundMimeType " << _type << " couldn't open" << endl;
+    //kdDebug(6050) << "TDEHTMLRun::foundMimeType " << _type << " couldn't open" << endl;
     KRun::foundMimeType( mimeType );
 
     // "open" is finished -> flag completed
     m_child->m_bCompleted = true;
-    static_cast<KHTMLPart *>(m_part)->checkCompleted();
+    static_cast<TDEHTMLPart *>(m_part)->checkCompleted();
 }
 
-void KHTMLRun::save( const KURL & url, const TQString & suggestedFilename )
+void TDEHTMLRun::save( const KURL & url, const TQString & suggestedFilename )
 {
-    KHTMLPopupGUIClient::saveURL( m_part->widget(), i18n( "Save As" ), url, m_args.metaData(), TQString::null, 0, suggestedFilename );
+    TDEHTMLPopupGUIClient::saveURL( m_part->widget(), i18n( "Save As" ), url, m_args.metaData(), TQString::null, 0, suggestedFilename );
 }
 
 // KDE4: remove
-void KHTMLRun::handleError( KIO::Job *job )
+void TDEHTMLRun::handleError( TDEIO::Job *job )
 {
     KParts::BrowserRun::handleError( job );
 }
 
-#include "khtml_run.moc"
+#include "tdehtml_run.moc"
diff --git a/khtml/khtml_run.h b/tdehtml/tdehtml_run.h
index e1be45fd1..401bc7fd6 100644
--- a/khtml/khtml_run.h
+++ b/tdehtml/tdehtml_run.h
@@ -20,40 +20,40 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __khtml_run_h__
-#define __khtml_run_h__
+#ifndef __tdehtml_run_h__
+#define __tdehtml_run_h__
 
-#include <kparts/browserrun.h>
+#include <tdeparts/browserrun.h>
 #include <kurl.h>
 #include <kservice.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
-class KHTMLPart;
+class TDEHTMLPart;
 
-namespace khtml
+namespace tdehtml
 {
   class ChildFrame;
 }
 
-class KHTMLRun : public KParts::BrowserRun
+class TDEHTMLRun : public KParts::BrowserRun
 {
   Q_OBJECT
 public:
-  KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url,
+  TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url,
             const KParts::URLArgs &args, bool hideErrorDialog );
 
   virtual void foundMimeType( const TQString &mimetype );
 
-  //KHTMLPart *htmlPart() const;
+  //TDEHTMLPart *htmlPart() const;
 
 protected:
-  virtual void handleError( KIO::Job * job );
+  virtual void handleError( TDEIO::Job * job );
 
   virtual void save( const KURL & url, const TQString & suggestedFilename );
   bool askSave( const KURL & url, KService::Ptr offer, const TQString & mimeType, const TQString & suggestedFilename );
 
 private:
-  khtml::ChildFrame *m_child;
+  tdehtml::ChildFrame *m_child;
 };
 
 #endif
diff --git a/khtml/khtml_settings.cc b/tdehtml/tdehtml_settings.cc
index 431aec0ca..7f799e311 100644
--- a/khtml/khtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cc
@@ -19,16 +19,16 @@
 
 #include <tqfontdatabase.h>
 
-#include "khtml_settings.h"
-#include "khtmldefaults.h"
-#include <kglobalsettings.h>
-#include <kconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include "tdehtml_settings.h"
+#include "tdehtmldefaults.h"
+#include <tdeglobalsettings.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <tqvaluevector.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 /**
  * @internal
@@ -39,11 +39,11 @@ struct KPerDomainSettings {
     bool m_bEnableJavaScript : 1;
     bool m_bEnablePlugins : 1;
     // don't forget to maintain the bitfields as the enums grow
-    KHTMLSettings::KJSWindowOpenPolicy m_windowOpenPolicy : 2;
-    KHTMLSettings::KJSWindowStatusPolicy m_windowStatusPolicy : 1;
-    KHTMLSettings::KJSWindowFocusPolicy m_windowFocusPolicy : 1;
-    KHTMLSettings::KJSWindowMovePolicy m_windowMovePolicy : 1;
-    KHTMLSettings::KJSWindowResizePolicy m_windowResizePolicy : 1;
+    TDEHTMLSettings::KJSWindowOpenPolicy m_windowOpenPolicy : 2;
+    TDEHTMLSettings::KJSWindowStatusPolicy m_windowStatusPolicy : 1;
+    TDEHTMLSettings::KJSWindowFocusPolicy m_windowFocusPolicy : 1;
+    TDEHTMLSettings::KJSWindowMovePolicy m_windowMovePolicy : 1;
+    TDEHTMLSettings::KJSWindowResizePolicy m_windowResizePolicy : 1;
 
 #ifdef DEBUG_SETTINGS
     void dump(const TQString &infix = TQString::null) const {
@@ -62,7 +62,7 @@ struct KPerDomainSettings {
 
 typedef TQMap<TQString,KPerDomainSettings> PolicyMap;
 
-class KHTMLSettingsPrivate
+class TDEHTMLSettingsPrivate
 {
 public:
     bool m_bChangeCursor : 1;
@@ -92,7 +92,7 @@ public:
     int m_fontSize;
     int m_minFontSize;
     int m_maxFormCompletionItems;
-    KHTMLSettings::KAnimationAdvice m_showAnimations;
+    TDEHTMLSettings::KAnimationAdvice m_showAnimations;
 
     TQString m_encoding;
     TQString m_userSheet;
@@ -115,7 +115,7 @@ public:
   * or a deep copy of the global settings if not existent.
   */
 static KPerDomainSettings &setup_per_domain_policy(
-				KHTMLSettingsPrivate *d,
+				TDEHTMLSettingsPrivate *d,
 				const TQString &domain) {
   if (domain.isEmpty()) {
     kdWarning() << "setup_per_domain_policy: domain is empty" << endl;
@@ -131,7 +131,7 @@ static KPerDomainSettings &setup_per_domain_policy(
 }
 
 
-KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str)
+TDEHTMLSettings::KJavaScriptAdvice TDEHTMLSettings::strToAdvice(const TQString& _str)
 {
   KJavaScriptAdvice ret = KJavaScriptDunno;
 
@@ -146,7 +146,7 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str
   return ret;
 }
 
-const char* KHTMLSettings::adviceToStr(KJavaScriptAdvice _advice)
+const char* TDEHTMLSettings::adviceToStr(KJavaScriptAdvice _advice)
 {
     switch( _advice ) {
     case KJavaScriptAccept: return I18N_NOOP("Accept");
@@ -157,7 +157,7 @@ const char* KHTMLSettings::adviceToStr(KJavaScriptAdvice _advice)
 }
 
 
-void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domain,
+void TDEHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domain,
                                       KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice)
 {
     TQString tmp(configStr);
@@ -186,7 +186,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai
     }
 }
 
-void KHTMLSettings::readDomainSettings(KConfig *config, bool reset,
+void TDEHTMLSettings::readDomainSettings(TDEConfig *config, bool reset,
 	bool global, KPerDomainSettings &pd_settings) {
   TQString jsPrefix = global ? TQString::null
   				: TQString::fromLatin1("javascript.");
@@ -255,51 +255,51 @@ void KHTMLSettings::readDomainSettings(KConfig *config, bool reset,
 }
 
 
-KHTMLSettings::KHTMLSettings()
+TDEHTMLSettings::TDEHTMLSettings()
 {
-  d = new KHTMLSettingsPrivate();
+  d = new TDEHTMLSettingsPrivate();
   init();
 }
 
-KHTMLSettings::KHTMLSettings(const KHTMLSettings &other)
+TDEHTMLSettings::TDEHTMLSettings(const TDEHTMLSettings &other)
 {
-  d = new KHTMLSettingsPrivate();
+  d = new TDEHTMLSettingsPrivate();
   *d = *other.d;
 }
 
-KHTMLSettings::~KHTMLSettings()
+TDEHTMLSettings::~TDEHTMLSettings()
 {
   delete d;
 }
 
-bool KHTMLSettings::changeCursor() const
+bool TDEHTMLSettings::changeCursor() const
 {
   return d->m_bChangeCursor;
 }
 
-bool KHTMLSettings::underlineLink() const
+bool TDEHTMLSettings::underlineLink() const
 {
   return d->m_underlineLink;
 }
 
-bool KHTMLSettings::hoverLink() const
+bool TDEHTMLSettings::hoverLink() const
 {
   return d->m_hoverLink;
 }
 
-void KHTMLSettings::init()
+void TDEHTMLSettings::init()
 {
-  KConfig global( "khtmlrc", true, false );
+  TDEConfig global( "tdehtmlrc", true, false );
   init( &global, true );
 
-  KConfig *local = KGlobal::config();
+  TDEConfig *local = TDEGlobal::config();
   if ( !local )
     return;
 
   init( local, false );
 }
 
-void KHTMLSettings::init( KConfig * config, bool reset )
+void TDEHTMLSettings::init( TDEConfig * config, bool reset )
 {
   TQString group_save = config->group();
   if (reset || config->hasGroup("MainView Settings"))
@@ -369,8 +369,8 @@ void KHTMLSettings::init( KConfig * config, bool reset )
     // Fonts and colors
     if( reset ) {
         d->defaultFonts = TQStringList();
-        d->defaultFonts.append( config->readEntry( "StandardFont", KGlobalSettings::generalFont().family() ) );
-        d->defaultFonts.append( config->readEntry( "FixedFont", KGlobalSettings::fixedFont().family() ) );
+        d->defaultFonts.append( config->readEntry( "StandardFont", TDEGlobalSettings::generalFont().family() ) );
+        d->defaultFonts.append( config->readEntry( "FixedFont", TDEGlobalSettings::fixedFont().family() ) );
         d->defaultFonts.append( config->readEntry( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) );
         d->defaultFonts.append( config->readEntry( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) );
         d->defaultFonts.append( config->readEntry( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) );
@@ -640,7 +640,7 @@ void KHTMLSettings::init( KConfig * config, bool reset )
   * In case of doubt, the global domain is returned.
   */
 static const KPerDomainSettings &lookup_hostname_policy(
-			const KHTMLSettingsPrivate *d,
+			const TDEHTMLSettingsPrivate *d,
 			const TQString& hostname)
 {
 #ifdef DEBUG_SETTINGS
@@ -693,32 +693,32 @@ static const KPerDomainSettings &lookup_hostname_policy(
   return d->global;
 }
 
-bool KHTMLSettings::isOpenMiddleClickEnabled()
+bool TDEHTMLSettings::isOpenMiddleClickEnabled()
 {
   return d->m_bOpenMiddleClick;
 }
 
-bool KHTMLSettings::isBackRightClickEnabled()
+bool TDEHTMLSettings::isBackRightClickEnabled()
 {
   return d->m_bBackRightClick;
 }
 
-bool KHTMLSettings::accessKeysEnabled() const
+bool TDEHTMLSettings::accessKeysEnabled() const
 {
     return d->m_accessKeysEnabled;
 }
 
-bool KHTMLSettings::isAdFilterEnabled() const
+bool TDEHTMLSettings::isAdFilterEnabled() const
 {
     return d->m_adFilterEnabled;
 }
 
-bool KHTMLSettings::isHideAdsEnabled() const
+bool TDEHTMLSettings::isHideAdsEnabled() const
 {
     return d->m_hideAdsEnabled;
 }
 
-bool KHTMLSettings::isAdFiltered( const TQString &url ) const
+bool TDEHTMLSettings::isAdFiltered( const TQString &url ) const
 {
     if (d->m_adFilterEnabled)
     {
@@ -739,9 +739,9 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const
     return false;
 }
 
-void KHTMLSettings::addAdFilter( const TQString &url )
+void TDEHTMLSettings::addAdFilter( const TQString &url )
 {
-    KConfig config( "khtmlrc", false, false );
+    TDEConfig config( "tdehtmlrc", false, false );
     config.setGroup( "Filter Settings" );
 
     TQRegExp rx;
@@ -780,69 +780,69 @@ void KHTMLSettings::addAdFilter( const TQString &url )
     }
 }
 
-bool KHTMLSettings::isJavaEnabled( const TQString& hostname )
+bool TDEHTMLSettings::isJavaEnabled( const TQString& hostname )
 {
   return lookup_hostname_policy(d,hostname.lower()).m_bEnableJava;
 }
 
-bool KHTMLSettings::isJavaScriptEnabled( const TQString& hostname )
+bool TDEHTMLSettings::isJavaScriptEnabled( const TQString& hostname )
 {
   return lookup_hostname_policy(d,hostname.lower()).m_bEnableJavaScript;
 }
 
-bool KHTMLSettings::isJavaScriptDebugEnabled( const TQString& /*hostname*/ )
+bool TDEHTMLSettings::isJavaScriptDebugEnabled( const TQString& /*hostname*/ )
 {
   // debug setting is global for now, but could change in the future
   return d->m_bEnableJavaScriptDebug;
 }
 
-bool KHTMLSettings::isJavaScriptErrorReportingEnabled( const TQString& /*hostname*/ ) const
+bool TDEHTMLSettings::isJavaScriptErrorReportingEnabled( const TQString& /*hostname*/ ) const
 {
   // error reporting setting is global for now, but could change in the future
   return d->m_bEnableJavaScriptErrorReporting;
 }
 
-bool KHTMLSettings::isPluginsEnabled( const TQString& hostname )
+bool TDEHTMLSettings::isPluginsEnabled( const TQString& hostname )
 {
   return lookup_hostname_policy(d,hostname.lower()).m_bEnablePlugins;
 }
 
-KHTMLSettings::KJSWindowOpenPolicy KHTMLSettings::windowOpenPolicy(
+TDEHTMLSettings::KJSWindowOpenPolicy TDEHTMLSettings::windowOpenPolicy(
 				const TQString& hostname) const {
   return lookup_hostname_policy(d,hostname.lower()).m_windowOpenPolicy;
 }
 
-KHTMLSettings::KJSWindowMovePolicy KHTMLSettings::windowMovePolicy(
+TDEHTMLSettings::KJSWindowMovePolicy TDEHTMLSettings::windowMovePolicy(
 				const TQString& hostname) const {
   return lookup_hostname_policy(d,hostname.lower()).m_windowMovePolicy;
 }
 
-KHTMLSettings::KJSWindowResizePolicy KHTMLSettings::windowResizePolicy(
+TDEHTMLSettings::KJSWindowResizePolicy TDEHTMLSettings::windowResizePolicy(
 				const TQString& hostname) const {
   return lookup_hostname_policy(d,hostname.lower()).m_windowResizePolicy;
 }
 
-KHTMLSettings::KJSWindowStatusPolicy KHTMLSettings::windowStatusPolicy(
+TDEHTMLSettings::KJSWindowStatusPolicy TDEHTMLSettings::windowStatusPolicy(
 				const TQString& hostname) const {
   return lookup_hostname_policy(d,hostname.lower()).m_windowStatusPolicy;
 }
 
-KHTMLSettings::KJSWindowFocusPolicy KHTMLSettings::windowFocusPolicy(
+TDEHTMLSettings::KJSWindowFocusPolicy TDEHTMLSettings::windowFocusPolicy(
 				const TQString& hostname) const {
   return lookup_hostname_policy(d,hostname.lower()).m_windowFocusPolicy;
 }
 
-int KHTMLSettings::mediumFontSize() const
+int TDEHTMLSettings::mediumFontSize() const
 {
     return d->m_fontSize;
 }
 
-int KHTMLSettings::minFontSize() const
+int TDEHTMLSettings::minFontSize() const
 {
   return d->m_minFontSize;
 }
 
-TQString KHTMLSettings::settingsToCSS() const
+TQString TDEHTMLSettings::settingsToCSS() const
 {
     // lets start with the link properties
     TQString str = "a:link {\ncolor: ";
@@ -873,7 +873,7 @@ TQString KHTMLSettings::settingsToCSS() const
     return str;
 }
 
-const TQString &KHTMLSettings::availableFamilies()
+const TQString &TDEHTMLSettings::availableFamilies()
 {
     if ( !avFamilies ) {
         avFamilies = new TQString;
@@ -899,7 +899,7 @@ const TQString &KHTMLSettings::availableFamilies()
   return *avFamilies;
 }
 
-TQString KHTMLSettings::lookupFont(int i) const
+TQString TDEHTMLSettings::lookupFont(int i) const
 {
     TQString font;
     if (d->fonts.count() > (uint) i)
@@ -909,156 +909,156 @@ TQString KHTMLSettings::lookupFont(int i) const
     return font;
 }
 
-TQString KHTMLSettings::stdFontName() const
+TQString TDEHTMLSettings::stdFontName() const
 {
     return lookupFont(0);
 }
 
-TQString KHTMLSettings::fixedFontName() const
+TQString TDEHTMLSettings::fixedFontName() const
 {
     return lookupFont(1);
 }
 
-TQString KHTMLSettings::serifFontName() const
+TQString TDEHTMLSettings::serifFontName() const
 {
     return lookupFont(2);
 }
 
-TQString KHTMLSettings::sansSerifFontName() const
+TQString TDEHTMLSettings::sansSerifFontName() const
 {
     return lookupFont(3);
 }
 
-TQString KHTMLSettings::cursiveFontName() const
+TQString TDEHTMLSettings::cursiveFontName() const
 {
     return lookupFont(4);
 }
 
-TQString KHTMLSettings::fantasyFontName() const
+TQString TDEHTMLSettings::fantasyFontName() const
 {
     return lookupFont(5);
 }
 
-void KHTMLSettings::setStdFontName(const TQString &n)
+void TDEHTMLSettings::setStdFontName(const TQString &n)
 {
     while(d->fonts.count() <= 0)
         d->fonts.append(TQString::null);
     d->fonts[0] = n;
 }
 
-void KHTMLSettings::setFixedFontName(const TQString &n)
+void TDEHTMLSettings::setFixedFontName(const TQString &n)
 {
     while(d->fonts.count() <= 1)
         d->fonts.append(TQString::null);
     d->fonts[1] = n;
 }
 
-TQString KHTMLSettings::userStyleSheet() const
+TQString TDEHTMLSettings::userStyleSheet() const
 {
     return d->m_userSheet;
 }
 
-bool KHTMLSettings::isFormCompletionEnabled() const
+bool TDEHTMLSettings::isFormCompletionEnabled() const
 {
   return d->m_formCompletionEnabled;
 }
 
-int KHTMLSettings::maxFormCompletionItems() const
+int TDEHTMLSettings::maxFormCompletionItems() const
 {
   return d->m_maxFormCompletionItems;
 }
 
-const TQString &KHTMLSettings::encoding() const
+const TQString &TDEHTMLSettings::encoding() const
 {
   return d->m_encoding;
 }
 
-bool KHTMLSettings::followSystemColors() const
+bool TDEHTMLSettings::followSystemColors() const
 {
     return d->m_follow_system_colors;
 }
 
-const TQColor& KHTMLSettings::textColor() const
+const TQColor& TDEHTMLSettings::textColor() const
 {
   return d->m_textColor;
 }
 
-const TQColor& KHTMLSettings::baseColor() const
+const TQColor& TDEHTMLSettings::baseColor() const
 {
   return d->m_baseColor;
 }
 
-const TQColor& KHTMLSettings::linkColor() const
+const TQColor& TDEHTMLSettings::linkColor() const
 {
   return d->m_linkColor;
 }
 
-const TQColor& KHTMLSettings::vLinkColor() const
+const TQColor& TDEHTMLSettings::vLinkColor() const
 {
   return d->m_vLinkColor;
 }
 
-bool KHTMLSettings::autoLoadImages() const
+bool TDEHTMLSettings::autoLoadImages() const
 {
   return d->m_bAutoLoadImages;
 }
 
-bool KHTMLSettings::unfinishedImageFrame() const
+bool TDEHTMLSettings::unfinishedImageFrame() const
 {
   return d->m_bUnfinishedImageFrame;
 }
 
-KHTMLSettings::KAnimationAdvice KHTMLSettings::showAnimations() const
+TDEHTMLSettings::KAnimationAdvice TDEHTMLSettings::showAnimations() const
 {
   return d->m_showAnimations;
 }
 
-bool KHTMLSettings::isAutoDelayedActionsEnabled() const
+bool TDEHTMLSettings::isAutoDelayedActionsEnabled() const
 {
   return d->m_autoDelayedActionsEnabled;
 }
 
-bool KHTMLSettings::jsErrorsEnabled() const
+bool TDEHTMLSettings::jsErrorsEnabled() const
 {
   return d->m_jsErrorsEnabled;
 }
 
-void KHTMLSettings::setJSErrorsEnabled(bool enabled)
+void TDEHTMLSettings::setJSErrorsEnabled(bool enabled)
 {
   d->m_jsErrorsEnabled = enabled;
   // save it
-  KConfig *config = KGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("HTML Settings");
   config->writeEntry("ReportJSErrors", enabled);
   config->sync();
 }
 
-bool KHTMLSettings::allowTabulation() const
+bool TDEHTMLSettings::allowTabulation() const
 {
     return d->m_allowTabulation;
 }
 
-bool KHTMLSettings::autoSpellCheck() const
+bool TDEHTMLSettings::autoSpellCheck() const
 {
     return d->m_autoSpellCheck;
 }
 
-TQValueList< TQPair< TQString, TQChar > > KHTMLSettings::fallbackAccessKeysAssignments() const
+TQValueList< TQPair< TQString, TQChar > > TDEHTMLSettings::fallbackAccessKeysAssignments() const
 {
     return d->m_fallbackAccessKeysAssignments;
 }
 
-void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled)
+void TDEHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled)
 {
     d->m_jsPopupBlockerPassivePopup = enabled;
     // save it
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Java/JavaScript Settings");
     config->writeEntry("PopupBlockerPassivePopup", enabled);
     config->sync();
 }
 
-bool KHTMLSettings::jsPopupBlockerPassivePopup() const
+bool TDEHTMLSettings::jsPopupBlockerPassivePopup() const
 {
     return d->m_jsPopupBlockerPassivePopup;
 }
diff --git a/khtml/khtml_settings.h b/tdehtml/tdehtml_settings.h
index bb089e5a8..c2dd2684c 100644
--- a/khtml/khtml_settings.h
+++ b/tdehtml/tdehtml_settings.h
@@ -20,7 +20,7 @@
 #ifndef __konq_htmlsettings_h__
 #define __konq_htmlsettings_h__
 
-class KConfig;
+class TDEConfig;
 #include <tqcolor.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -30,12 +30,12 @@ class KConfig;
 #include <tdelibs_export.h>
 
 struct KPerDomainSettings;
-class KHTMLSettingsPrivate;
+class TDEHTMLSettingsPrivate;
 
 /**
  * Settings for the HTML view.
  */
-class KHTML_EXPORT KHTMLSettings
+class TDEHTML_EXPORT TDEHTMLSettings
 {
 public:
 
@@ -99,8 +99,8 @@ public:
     /**
      * @internal Constructor
      */
-    KHTMLSettings();
-    KHTMLSettings(const KHTMLSettings &other);
+    TDEHTMLSettings();
+    TDEHTMLSettings(const TDEHTMLSettings &other);
 
     /**
      * Called by constructor and reparseConfiguration
@@ -108,16 +108,16 @@ public:
     void init();
 
     /** Read settings from @p config.
-     * @param config is a pointer to KConfig object.
+     * @param config is a pointer to TDEConfig object.
      * @param reset if true, settings are always set; if false,
      *  settings are only set if the config file has a corresponding key.
      */
-    void init( KConfig * config, bool reset = true );
+    void init( TDEConfig * config, bool reset = true );
 
     /**
      * Destructor. Don't delete any instance by yourself.
      */
-    virtual ~KHTMLSettings();
+    virtual ~TDEHTMLSettings();
 
     // Behavior settings
     bool changeCursor() const;
@@ -135,7 +135,7 @@ public:
     TQString cursiveFontName() const;
     TQString fantasyFontName() const;
 
-    // these two can be set. Mainly for historical reasons (the method in KHTMLPart exists...)
+    // these two can be set. Mainly for historical reasons (the method in TDEHTMLPart exists...)
     void setStdFontName(const TQString &n);
     void setFixedFontName(const TQString &n);
 
@@ -193,13 +193,13 @@ public:
 
     /** reads from @p config's current group, forcing initialization
       * if @p reset is true.
-      * @param config is a pointer to KConfig object.
+      * @param config is a pointer to TDEConfig object.
       * @param reset true if initialization is to be forced.
       * @param global true if the global domain is to be read.
       * @param pd_settings will be initialised with the computed (inherited)
       *		settings.
       */
-    void readDomainSettings(KConfig *config, bool reset,
+    void readDomainSettings(TDEConfig *config, bool reset,
 			bool global, KPerDomainSettings &pd_settings);
 
     TQString settingsToCSS() const;
@@ -222,10 +222,10 @@ public:
     bool jsPopupBlockerPassivePopup() const;
 
 private:
-    friend class KHTMLFactory;
+    friend class TDEHTMLFactory;
     TQString lookupFont(int i) const;
 
-    KHTMLSettingsPrivate *d;
+    TDEHTMLSettingsPrivate *d;
     static TQString *avFamilies;
 };
 
diff --git a/khtml/khtmldefaults.h b/tdehtml/tdehtmldefaults.h
index 8b674ffe0..8b674ffe0 100644
--- a/khtml/khtmldefaults.h
+++ b/tdehtml/tdehtmldefaults.h
diff --git a/khtml/khtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index a8ee4d7ef..31311cb3d 100644
--- a/khtml/khtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -17,9 +17,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "khtmlimage.h"
-#include "khtmlview.h"
-#include "khtml_ext.h"
+#include "tdehtmlimage.h"
+#include "tdehtmlview.h"
+#include "tdehtml_ext.h"
 #include "xml/dom_docimpl.h"
 #include "html/html_documentimpl.h"
 #include "html/html_elementimpl.h"
@@ -29,96 +29,96 @@
 #include <tqvbox.h>
 #include <tqtimer.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-K_EXPORT_COMPONENT_FACTORY( khtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory )
+K_EXPORT_COMPONENT_FACTORY( tdehtmlimagefactory /*NOT the part name, see Makefile.am*/, TDEHTMLImageFactory )
 
-KInstance *KHTMLImageFactory::s_instance = 0;
+TDEInstance *TDEHTMLImageFactory::s_instance = 0;
 
-KHTMLImageFactory::KHTMLImageFactory()
+TDEHTMLImageFactory::TDEHTMLImageFactory()
 {
-    s_instance = new KInstance( "khtmlimage" );
+    s_instance = new TDEInstance( "tdehtmlimage" );
 }
 
-KHTMLImageFactory::~KHTMLImageFactory()
+TDEHTMLImageFactory::~TDEHTMLImageFactory()
 {
     delete s_instance;
 }
 
-KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+KParts::Part *TDEHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
                                                    TQObject *parent, const char *name,
                                                    const char *className, const TQStringList & )
 {
-  KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI;
+  TDEHTMLPart::GUIProfile prof = TDEHTMLPart::DefaultGUI;
   if ( strcmp( className, "Browser/View" ) == 0 )
-    prof = KHTMLPart::BrowserViewGUI;
-  return new KHTMLImage( parentWidget, widgetName, parent, name, prof );
+    prof = TDEHTMLPart::BrowserViewGUI;
+  return new TDEHTMLImage( parentWidget, widgetName, parent, name, prof );
 }
 
-KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName,
-                        TQObject *parent, const char *name, KHTMLPart::GUIProfile prof )
+TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
+                        TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof )
     : KParts::ReadOnlyPart( parent, name ), m_image( 0 )
 {
-    KHTMLPart* parentPart = ::tqqt_cast<KHTMLPart *>( parent );
-    setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart );
+    TDEHTMLPart* parentPart = ::tqqt_cast<TDEHTMLPart *>( parent );
+    setInstance( TDEHTMLImageFactory::instance(), prof == TDEHTMLPart::BrowserViewGUI && !parentPart );
 
     TQVBox *box = new TQVBox( parentWidget, widgetName );
 
-    m_khtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof );
-    m_khtml->setAutoloadImages( true );
-    m_khtml->widget()->installEventFilter(this);
-    connect( m_khtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) );
+    m_tdehtml = new TDEHTMLPart( box, widgetName, this, "htmlimagepart", prof );
+    m_tdehtml->setAutoloadImages( true );
+    m_tdehtml->widget()->installEventFilter(this);
+    connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) );
 
     setWidget( box );
 
     // VBox can't take focus, so pass it on to sub-widget
-    box->setFocusProxy( m_khtml->widget() );
+    box->setFocusProxy( m_tdehtml->widget() );
 
-    m_ext = new KHTMLImageBrowserExtension( this, "be" );
+    m_ext = new TDEHTMLImageBrowserExtension( this, "be" );
 
     // Remove unnecessary actions.
-    KAction *encodingAction = actionCollection()->action( "setEncoding" );
+    TDEAction *encodingAction = actionCollection()->action( "setEncoding" );
     if ( encodingAction )
     {
         encodingAction->unplugAll();
         delete encodingAction;
     }
-    KAction *viewSourceAction= actionCollection()->action( "viewDocumentSource" );
+    TDEAction *viewSourceAction= actionCollection()->action( "viewDocumentSource" );
     if ( viewSourceAction )
     {
         viewSourceAction->unplugAll();
         delete viewSourceAction;
     }
 
-    KAction *selectAllAction= actionCollection()->action( "selectAll" );
+    TDEAction *selectAllAction= actionCollection()->action( "selectAll" );
     if ( selectAllAction )
     {
         selectAllAction->unplugAll();
         delete selectAllAction;
     }
 
-    // forward important signals from the khtml part
+    // forward important signals from the tdehtml part
 
     // forward opening requests to parent frame (if existing)
-    KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(parent);
+    TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent);
     KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext;
-    connect(m_khtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
+    connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
     		be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)));
 
-    connect( m_khtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
+    connect( m_tdehtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
              const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
              const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ) );
 
-    connect( m_khtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ),
+    connect( m_tdehtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ),
              m_ext, TQT_SIGNAL( enableAction( const char *, bool ) ) );
 
     m_ext->setURLDropHandlingEnabled( true );
 }
 
-KHTMLImage::~KHTMLImage()
+TDEHTMLImage::~TDEHTMLImage()
 {
     disposeImage();
 
@@ -129,13 +129,13 @@ KHTMLImage::~KHTMLImage()
     // ### additional note: it _can_ be that the part has been deleted before:
     // when we're in a html frameset and the view dies first, then it will also
     // kill the htmlpart
-    if ( m_khtml )
-        delete static_cast<KHTMLPart *>( m_khtml );
+    if ( m_tdehtml )
+        delete static_cast<TDEHTMLPart *>( m_tdehtml );
 }
 
-bool KHTMLImage::openURL( const KURL &url )
+bool TDEHTMLImage::openURL( const KURL &url )
 {
-    static const TQString &html = KGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" );
+    static const TQString &html = TDEGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" );
 
     disposeImage();
 
@@ -152,37 +152,37 @@ bool KHTMLImage::openURL( const KURL &url )
     m_xOffset = args.xOffset;
     m_yOffset = args.yOffset;
 
-    m_khtml->begin( m_url );
-    m_khtml->setAutoloadImages( true );
+    m_tdehtml->begin( m_url );
+    m_tdehtml->setAutoloadImages( true );
 
-    DOM::DocumentImpl *impl = dynamic_cast<DOM::DocumentImpl *>( m_khtml->document().handle() ); // ### hack ;-)
+    DOM::DocumentImpl *impl = dynamic_cast<DOM::DocumentImpl *>( m_tdehtml->document().handle() ); // ### hack ;-)
     if (!impl) return false;
     if ( m_ext->urlArgs().reload )
-        impl->docLoader()->setCachePolicy( KIO::CC_Reload );
+        impl->docLoader()->setCachePolicy( TDEIO::CC_Reload );
 
-    khtml::DocLoader *dl = impl->docLoader();
+    tdehtml::DocLoader *dl = impl->docLoader();
     m_image = dl->requestImage( m_url.url() );
     if ( m_image )
         m_image->ref( this );
 
-    m_khtml->write( html.arg( m_url.url() ) );
-    m_khtml->end();
+    m_tdehtml->write( html.arg( m_url.url() ) );
+    m_tdehtml->end();
 
     /*
-    connect( khtml::Cache::loader(), TQT_SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
+    connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
             this, TQT_SLOT( updateWindowCaption() ) );
             */
     return true;
 }
 
-bool KHTMLImage::closeURL()
+bool TDEHTMLImage::closeURL()
 {
     disposeImage();
-    return m_khtml->closeURL();
+    return m_tdehtml->closeURL();
 }
 
 // This can happen after openURL returns, or directly from m_image->ref()
-void KHTMLImage::notifyFinished( khtml::CachedObject *o )
+void TDEHTMLImage::notifyFinished( tdehtml::CachedObject *o )
 {
     if ( !m_image || o != m_image )
         return;
@@ -214,14 +214,14 @@ void KHTMLImage::notifyFinished( khtml::CachedObject *o )
     emit setStatusBarText(i18n("Done."));
 }
 
-void KHTMLImage::restoreScrollPosition()
+void TDEHTMLImage::restoreScrollPosition()
 {
-    if ( m_khtml->view()->contentsY() == 0 ) {
-        m_khtml->view()->setContentsPos( m_xOffset, m_yOffset );
+    if ( m_tdehtml->view()->contentsY() == 0 ) {
+        m_tdehtml->view()->setContentsPos( m_xOffset, m_yOffset );
     }
 }
 
-void KHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e )
+void TDEHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e )
 {
     // prevent the base implementation from emitting setWindowCaption with
     // our url. It destroys our pretty, previously caption. Konq saves/restores
@@ -232,7 +232,7 @@ void KHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e )
 }
 
 /*
-void KHTMLImage::slotImageJobFinished( KIO::Job *job )
+void TDEHTMLImage::slotImageJobFinished( TDEIO::Job *job )
 {
     if ( job->error() )
     {
@@ -246,12 +246,12 @@ void KHTMLImage::slotImageJobFinished( KIO::Job *job )
     }
 }
 
-void KHTMLImage::updateWindowCaption()
+void TDEHTMLImage::updateWindowCaption()
 {
-    if ( !m_khtml )
+    if ( !m_tdehtml )
         return;
 
-    DOM::HTMLDocumentImpl *impl = dynamic_cast<DOM::HTMLDocumentImpl *>( m_khtml->document().handle() );
+    DOM::HTMLDocumentImpl *impl = dynamic_cast<DOM::HTMLDocumentImpl *>( m_tdehtml->document().handle() );
     if ( !impl )
         return;
 
@@ -263,7 +263,7 @@ void KHTMLImage::updateWindowCaption()
     if ( !image )
         return;
 
-    khtml::RenderImage *renderImage = dynamic_cast<khtml::RenderImage *>( image->renderer() );
+    tdehtml::RenderImage *renderImage = dynamic_cast<tdehtml::RenderImage *>( image->renderer() );
     if ( !renderImage )
         return;
 
@@ -287,7 +287,7 @@ void KHTMLImage::updateWindowCaption()
 }
 */
 
-void KHTMLImage::disposeImage()
+void TDEHTMLImage::disposeImage()
 {
     if ( !m_image )
         return;
@@ -296,7 +296,7 @@ void KHTMLImage::disposeImage()
     m_image = 0;
 }
 
-bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) {
+bool TDEHTMLImage::eventFilter(TQObject *, TQEvent *e) {
     switch (e->type()) {
       case TQEvent::DragEnter:
       case TQEvent::DragMove:
@@ -304,7 +304,7 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) {
       case TQEvent::Drop: {
         // find out if this part is embedded in a frame, and send the
 	// event to its outside widget
-	KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(parent());
+	TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent());
 	if (p)
 	    return TQApplication::sendEvent(p->widget(), e);
         // otherwise simply forward all dnd events to the part widget,
@@ -316,37 +316,37 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) {
     return false;
 }
 
-KHTMLImageBrowserExtension::KHTMLImageBrowserExtension( KHTMLImage *parent, const char *name )
+TDEHTMLImageBrowserExtension::TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name )
     : KParts::BrowserExtension( parent, name )
 {
     m_imgPart = parent;
 }
 
-int KHTMLImageBrowserExtension::xOffset()
+int TDEHTMLImageBrowserExtension::xOffset()
 {
     return m_imgPart->doc()->view()->contentsX();
 }
 
-int KHTMLImageBrowserExtension::yOffset()
+int TDEHTMLImageBrowserExtension::yOffset()
 {
     return m_imgPart->doc()->view()->contentsY();
 }
 
-void KHTMLImageBrowserExtension::print()
+void TDEHTMLImageBrowserExtension::print()
 {
-    static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print();
+    static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print();
 }
 
-void KHTMLImageBrowserExtension::reparseConfiguration()
+void TDEHTMLImageBrowserExtension::reparseConfiguration()
 {
-    static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration();
+    static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration();
     m_imgPart->doc()->setAutoloadImages( true );
 }
 
 
-void KHTMLImageBrowserExtension::disableScrolling()
+void TDEHTMLImageBrowserExtension::disableScrolling()
 {
-    static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->disableScrolling();
+    static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->disableScrolling();
 }
 
 using namespace KParts;
@@ -354,4 +354,4 @@ using namespace KParts;
 /* vim: et sw=4 ts=4
  */
 
-#include "khtmlimage.moc"
+#include "tdehtmlimage.moc"
diff --git a/khtml/khtmlimage.desktop b/tdehtml/tdehtmlimage.desktop
index 83868964f..4703bbabb 100644
--- a/khtml/khtmlimage.desktop
+++ b/tdehtml/tdehtmlimage.desktop
@@ -167,4 +167,4 @@ Name[zh_TW]=�嵌入的影�檢視器
 Name[zu]=Isithombe Sombukisi Oshuthisekayo
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
 InitialPreference=4
-X-TDE-Library=khtmlimagepart
+X-TDE-Library=tdehtmlimagepart
diff --git a/khtml/khtmlimage.h b/tdehtml/tdehtmlimage.h
index dda918177..8b8b5893b 100644
--- a/khtml/khtmlimage.h
+++ b/tdehtml/tdehtmlimage.h
@@ -17,19 +17,19 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __khtmlimage_h__
-#define __khtmlimage_h__
+#ifndef __tdehtmlimage_h__
+#define __tdehtmlimage_h__
 
-#include "khtml_part.h"
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include "tdehtml_part.h"
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 
 #include "misc/loader_client.h"
 
-class KHTMLPart;
-class KInstance;
+class TDEHTMLPart;
+class TDEInstance;
 
-namespace khtml
+namespace tdehtml
 {
     class CachedImage;
 }
@@ -37,33 +37,33 @@ namespace khtml
 /**
  * @internal
  */
-class KHTMLImageFactory : public KParts::Factory
+class TDEHTMLImageFactory : public KParts::Factory
 {
     Q_OBJECT
 public:
-    KHTMLImageFactory();
-    virtual ~KHTMLImageFactory();
+    TDEHTMLImageFactory();
+    virtual ~TDEHTMLImageFactory();
 
     virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *className, const TQStringList &args );
 
-    static KInstance *instance() { return s_instance; }
+    static TDEInstance *instance() { return s_instance; }
 
 private:
-    static KInstance *s_instance;
+    static TDEInstance *s_instance;
 };
 
 /**
  * @internal
  */
-class KHTMLImage : public KParts::ReadOnlyPart, public khtml::CachedObjectClient
+class TDEHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient
 {
     Q_OBJECT
 public:
-    KHTMLImage( TQWidget *parentWidget, const char *widgetName,
-                TQObject *parent, const char *name, KHTMLPart::GUIProfile prof );
-    virtual ~KHTMLImage();
+    TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
+                TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof );
+    virtual ~TDEHTMLImage();
 
     virtual bool openFile() { return true; } // grmbl, should be non-pure in part.h, IMHO
 
@@ -71,9 +71,9 @@ public:
 
     virtual bool closeURL();
 
-    KHTMLPart *doc() const { return m_khtml; }
+    TDEHTMLPart *doc() const { return m_tdehtml; }
 
-    virtual void notifyFinished( khtml::CachedObject *o );
+    virtual void notifyFinished( tdehtml::CachedObject *o );
 
 protected:
     virtual void guiActivateEvent( KParts::GUIActivateEvent *e );
@@ -81,28 +81,28 @@ protected:
 
 private slots:
     void restoreScrollPosition();
-//    void slotImageJobFinished( KIO::Job *job );
+//    void slotImageJobFinished( TDEIO::Job *job );
 
 //    void updateWindowCaption();
 
 private:
     void disposeImage();
 
-    TQGuardedPtr<KHTMLPart> m_khtml;
+    TQGuardedPtr<TDEHTMLPart> m_tdehtml;
     KParts::BrowserExtension *m_ext;
     TQString m_mimeType;
-    khtml::CachedImage *m_image;
+    tdehtml::CachedImage *m_image;
     int m_xOffset, m_yOffset;
 };
 
 /**
  * @internal
  */
-class KHTMLImageBrowserExtension : public KParts::BrowserExtension
+class TDEHTMLImageBrowserExtension : public KParts::BrowserExtension
 {
     Q_OBJECT
 public:
-    KHTMLImageBrowserExtension( KHTMLImage *parent, const char *name = 0 );
+    TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name = 0 );
 
     virtual int xOffset();
     virtual int yOffset();
@@ -113,7 +113,7 @@ protected slots:
     void disableScrolling();
 
 private:
-    KHTMLImage *m_imgPart;
+    TDEHTMLImage *m_imgPart;
 };
 
 #endif
diff --git a/khtml/khtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index cebee9455..de99c9400 100644
--- a/khtml/khtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -1,5 +1,5 @@
-#ifndef khtmlpart_p_h
-#define khtmlpart_p_h
+#ifndef tdehtmlpart_p_h
+#define tdehtmlpart_p_h
 
 /* This file is part of the KDE project
  *
@@ -29,12 +29,12 @@
 #include <kcursor.h>
 #include <klibloader.h>
 #include <kxmlguifactory.h>
-#include <kaction.h>
-#include <kparts/partmanager.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/browserextension.h>
-#ifndef KHTML_NO_WALLET
-#include <kwallet.h>
+#include <tdeaction.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/browserextension.h>
+#ifndef TDEHTML_NO_WALLET
+#include <tdewallet.h>
 #endif
 
 #include <tqguardedptr.h>
@@ -43,24 +43,24 @@
 #include <tqvaluelist.h>
 
 #include "html/html_formimpl.h"
-#include "khtml_run.h"
-#include "khtml_factory.h"
-#include "khtml_events.h"
-#include "khtml_ext.h"
-#include "khtml_iface.h"
-#include "khtml_settings.h"
+#include "tdehtml_run.h"
+#include "tdehtml_factory.h"
+#include "tdehtml_events.h"
+#include "tdehtml_ext.h"
+#include "tdehtml_iface.h"
+#include "tdehtml_settings.h"
 #include "misc/decoder.h"
 #include "ecma/kjs_proxy.h"
 
 class KFind;
 class KFindDialog;
-class KPopupMenu;
-class KSelectAction;
+class TDEPopupMenu;
+class TDESelectAction;
 class KURLLabel;
 class KJavaAppletContext;
 class KJSErrorDlg;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
   class TransferJob;
@@ -70,7 +70,7 @@ namespace KParts
   class StatusBarExtension;
 }
 
-namespace khtml
+namespace tdehtml
 {
   class KDE_EXPORT ChildFrame : public TQObject
   {
@@ -78,7 +78,7 @@ namespace khtml
   public:
       enum Type { Frame, IFrame, Object };
 
-      ChildFrame() : TQObject (0L, "khtml_child_frame") {
+      ChildFrame() : TQObject (0L, "tdehtml_child_frame") {
           m_jscript = 0L;
           m_kjs_lib = 0;
           m_bCompleted = false; m_bPreloaded = false; m_type = Frame; m_bNotify = false;
@@ -92,7 +92,7 @@ namespace khtml
               m_kjs_lib->unload();
       }
 
-    TQGuardedPtr<khtml::RenderPart> m_frame;
+    TQGuardedPtr<tdehtml::RenderPart> m_frame;
     TQGuardedPtr<KParts::ReadOnlyPart> m_part;
     TQGuardedPtr<KParts::BrowserExtension> m_extension;
     TQGuardedPtr<KParts::LiveConnectExtension> m_liveconnect;
@@ -103,7 +103,7 @@ namespace khtml
     bool m_bCompleted;
     TQString m_name;
     KParts::URLArgs m_args;
-    TQGuardedPtr<KHTMLRun> m_run;
+    TQGuardedPtr<TDEHTMLRun> m_run;
     bool m_bPreloaded;
     KURL m_workingURL;
     Type m_type;
@@ -116,36 +116,36 @@ namespace khtml
 
 }
 
-struct KHTMLFrameList : public TQValueList<khtml::ChildFrame*>
+struct TDEHTMLFrameList : public TQValueList<tdehtml::ChildFrame*>
 {
     Iterator find( const TQString &name ) KDE_NO_EXPORT;
 };
 
-typedef KHTMLFrameList::ConstIterator ConstFrameIt;
-typedef KHTMLFrameList::Iterator FrameIt;
+typedef TDEHTMLFrameList::ConstIterator ConstFrameIt;
+typedef TDEHTMLFrameList::Iterator FrameIt;
 
-static int khtml_part_dcop_counter = 0;
+static int tdehtml_part_dcop_counter = 0;
 
 
-class KHTMLWalletQueue : public TQObject
+class TDEHTMLWalletQueue : public TQObject
 {
   Q_OBJECT
   public:
-    KHTMLWalletQueue(TQObject *parent) : TQObject(parent) {
-#ifndef KHTML_NO_WALLET
+    TDEHTMLWalletQueue(TQObject *parent) : TQObject(parent) {
+#ifndef TDEHTML_NO_WALLET
       wallet = 0L;
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
     }
 
-    virtual ~KHTMLWalletQueue() {
-#ifndef KHTML_NO_WALLET
+    virtual ~TDEHTMLWalletQueue() {
+#ifndef TDEHTML_NO_WALLET
       delete wallet;
       wallet = 0L;
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
     }
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
     KWallet::Wallet *wallet;
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
     typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
     typedef TQValueList<Caller> CallerList;
     CallerList callers;
@@ -156,7 +156,7 @@ class KHTMLWalletQueue : public TQObject
 
   public slots:
     void walletOpened(bool success) {
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
       if (!success) {
         delete wallet;
         wallet = 0L;
@@ -179,16 +179,16 @@ class KHTMLWalletQueue : public TQObject
       callers.clear();
       savers.clear();
       wallet = 0L; // gave it away
-#endif // KHTML_NO_WALLET
+#endif // TDEHTML_NO_WALLET
     }
 };
 
-class KHTMLPartPrivate
+class TDEHTMLPartPrivate
 {
-  KHTMLPartPrivate(const KHTMLPartPrivate & other);
-  KHTMLPartPrivate& operator=(const KHTMLPartPrivate&);
+  TDEHTMLPartPrivate(const TDEHTMLPartPrivate & other);
+  TDEHTMLPartPrivate& operator=(const TDEHTMLPartPrivate&);
 public:
-  KHTMLPartPrivate(TQObject* parent)
+  TDEHTMLPartPrivate(TQObject* parent)
   {
     m_doc = 0L;
     m_decoder = 0L;
@@ -198,9 +198,9 @@ public:
     m_job = 0L;
     m_bComplete = true;
     m_bLoadEventEmitted = true;
-    m_cachePolicy = KIO::CC_Verify;
+    m_cachePolicy = TDEIO::CC_Verify;
     m_manager = 0L;
-    m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
+    m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings());
     m_bClearing = false;
     m_bCleared = false;
     m_zoomFactor = 100;
@@ -218,7 +218,7 @@ public:
     m_findDialog = 0;
     m_ssl_in_use = false;
     m_jsedlg = 0;
-    m_formNotification = KHTMLPart::NoNotification;
+    m_formNotification = TDEHTMLPart::NoNotification;
 
 #ifndef Q_WS_QWS
     m_javaContext = 0;
@@ -249,12 +249,12 @@ public:
     m_bFirstData = true;
     m_submitForm = 0;
     m_delayRedirect = 0;
-    m_autoDetectLanguage = khtml::Decoder::SemiautomaticDetection;
+    m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection;
 
     // inherit settings from parent
-    if(parent && parent->inherits("KHTMLPart"))
+    if(parent && parent->inherits("TDEHTMLPart"))
     {
-        KHTMLPart* part = static_cast<KHTMLPart*>(parent);
+        TDEHTMLPart* part = static_cast<TDEHTMLPart*>(parent);
         if(part->d)
         {
             m_bJScriptForce = part->d->m_bJScriptForce;
@@ -282,20 +282,20 @@ public:
     m_newJSInterpreterExists = false;
     m_dcopobject = 0;
     m_jobspeed = 0;
-    m_dcop_counter = ++khtml_part_dcop_counter;
+    m_dcop_counter = ++tdehtml_part_dcop_counter;
     m_statusBarWalletLabel = 0L;
     m_statusBarUALabel = 0L;
     m_statusBarJSErrorLabel = 0L;
     m_userStyleSheetLastModified = 0;
     m_wq = 0;
   }
-  ~KHTMLPartPrivate()
+  ~TDEHTMLPartPrivate()
   {
     delete m_dcopobject;
     delete m_statusBarExtension;
     delete m_extension;
     delete m_settings;
-#ifndef KHTML_NO_WALLET
+#ifndef TDEHTML_NO_WALLET
     delete m_wallet;
 #endif
 #ifndef Q_WS_QWS
@@ -303,23 +303,23 @@ public:
 #endif
   }
 
-  TQGuardedPtr<khtml::ChildFrame> m_frame;
-  KHTMLFrameList m_frames;
-  KHTMLFrameList m_objects;
+  TQGuardedPtr<tdehtml::ChildFrame> m_frame;
+  TDEHTMLFrameList m_frames;
+  TDEHTMLFrameList m_objects;
 
-  TQGuardedPtr<KHTMLView> m_view;
-  KHTMLPartBrowserExtension *m_extension;
+  TQGuardedPtr<TDEHTMLView> m_view;
+  TDEHTMLPartBrowserExtension *m_extension;
   KParts::StatusBarExtension *m_statusBarExtension;
-  KHTMLPartBrowserHostExtension *m_hostExtension;
+  TDEHTMLPartBrowserHostExtension *m_hostExtension;
   KURLLabel* m_statusBarIconLabel;
   KURLLabel* m_statusBarWalletLabel;
   KURLLabel* m_statusBarUALabel;
   KURLLabel* m_statusBarJSErrorLabel;
   KURLLabel* m_statusBarPopupLabel;
-  TQValueList<TQGuardedPtr<KHTMLPart> > m_suppressedPopupOriginParts;
+  TQValueList<TQGuardedPtr<TDEHTMLPart> > m_suppressedPopupOriginParts;
   int m_openableSuppressedPopups;
   DOM::DocumentImpl *m_doc;
-  khtml::Decoder *m_decoder;
+  tdehtml::Decoder *m_decoder;
   TQString m_encoding;
   TQString m_sheetUsed;
   long m_cacheId;
@@ -354,9 +354,9 @@ public:
   KJavaAppletContext *m_javaContext;
 #endif
 
-  KHTMLSettings *m_settings;
+  TDEHTMLSettings *m_settings;
 
-  KIO::TransferJob * m_job;
+  TDEIO::TransferJob * m_job;
 
   TQString m_statusBarText[3];
   unsigned long m_jobspeed;
@@ -387,41 +387,41 @@ public:
 
   KURL m_workingURL;
 
-  KIO::CacheControl m_cachePolicy;
+  TDEIO::CacheControl m_cachePolicy;
   TQTimer m_redirectionTimer;
   TQTime m_parsetime;
   int m_delayRedirect;
   TQString m_redirectURL;
 
-  KAction *m_paViewDocument;
-  KAction *m_paViewFrame;
-  KAction *m_paViewInfo;
-  KAction *m_paSaveBackground;
-  KAction *m_paSaveDocument;
-  KAction *m_paSaveFrame;
-  KAction *m_paSecurity;
-  KActionMenu *m_paSetEncoding;
-  KSelectAction *m_paUseStylesheet;
-  KHTMLZoomFactorAction *m_paIncZoomFactor;
-  KHTMLZoomFactorAction *m_paDecZoomFactor;
-  KAction *m_paLoadImages;
-  KAction *m_paFind;
-  KAction *m_paFindNext;
-  KAction *m_paFindPrev;
-  KAction *m_paFindAheadText;
-  KAction *m_paFindAheadLinks;
-  KAction *m_paPrintFrame;
-  KAction *m_paSelectAll;
-  KAction *m_paDebugScript;
-  KAction *m_paDebugDOMTree;
-  KAction *m_paDebugRenderTree;
-  KAction *m_paStopAnimations;
-  KToggleAction *m_paToggleCaretMode;
+  TDEAction *m_paViewDocument;
+  TDEAction *m_paViewFrame;
+  TDEAction *m_paViewInfo;
+  TDEAction *m_paSaveBackground;
+  TDEAction *m_paSaveDocument;
+  TDEAction *m_paSaveFrame;
+  TDEAction *m_paSecurity;
+  TDEActionMenu *m_paSetEncoding;
+  TDESelectAction *m_paUseStylesheet;
+  TDEHTMLZoomFactorAction *m_paIncZoomFactor;
+  TDEHTMLZoomFactorAction *m_paDecZoomFactor;
+  TDEAction *m_paLoadImages;
+  TDEAction *m_paFind;
+  TDEAction *m_paFindNext;
+  TDEAction *m_paFindPrev;
+  TDEAction *m_paFindAheadText;
+  TDEAction *m_paFindAheadLinks;
+  TDEAction *m_paPrintFrame;
+  TDEAction *m_paSelectAll;
+  TDEAction *m_paDebugScript;
+  TDEAction *m_paDebugDOMTree;
+  TDEAction *m_paDebugRenderTree;
+  TDEAction *m_paStopAnimations;
+  TDEToggleAction *m_paToggleCaretMode;
 
   KParts::PartManager *m_manager;
 
   TQString m_popupMenuXML;
-  KHTMLPart::GUIProfile m_guiProfile;
+  TDEHTMLPart::GUIProfile m_guiProfile;
 
   int m_zoomFactor;
 
@@ -476,7 +476,7 @@ public:
   int m_focusNodeNumber;
 
   TQPoint m_dragStartPos;
-#ifdef KHTML_NO_SELECTION
+#ifdef TDEHTML_NO_SELECTION
   TQPoint m_dragLastPos;
 #endif
 
@@ -490,7 +490,7 @@ public:
   unsigned long m_totalObjectCount;
   unsigned int m_jobPercent;
 
-  KHTMLPart::FormNotification m_formNotification;
+  TDEHTMLPart::FormNotification m_formNotification;
   TQTimer m_progressUpdateTimer;
 
   TQStringList m_pluginPageQuestionAsked;
@@ -543,15 +543,15 @@ public:
 
   //TQGuardedPtr<KParts::Part> m_activeFrame;
   KParts::Part * m_activeFrame;
-  TQGuardedPtr<KHTMLPart> m_opener;
+  TQGuardedPtr<TDEHTMLPart> m_opener;
   bool m_openedByJS;
   bool m_newJSInterpreterExists; // set to 1 by setOpenedByJS, for window.open
 
-  khtml::Decoder::AutoDetectLanguage m_autoDetectLanguage;
-  KPopupMenu *m_automaticDetection;
-  KSelectAction *m_manualDetection;
+  tdehtml::Decoder::AutoDetectLanguage m_autoDetectLanguage;
+  TDEPopupMenu *m_automaticDetection;
+  TDESelectAction *m_manualDetection;
 
-  void setFlagRecursively(bool KHTMLPartPrivate::*flag, bool value);
+  void setFlagRecursively(bool TDEHTMLPartPrivate::*flag, bool value);
   /** returns the caret node */
   DOM::Node &caretNode() {
     return m_extendAtEnd ? m_selectionEnd : m_selectionStart;
@@ -563,7 +563,7 @@ public:
 
   time_t m_userStyleSheetLastModified;
 
-  KHTMLWalletQueue *m_wq;
+  TDEHTMLWalletQueue *m_wq;
 };
 
 #endif
diff --git a/khtml/khtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 2831550c3..16b274cbd 100644
--- a/khtml/khtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -24,12 +24,12 @@
  */
 
 
-#include "khtmlview.moc"
+#include "tdehtmlview.moc"
 
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
-#include "khtml_part.h"
-#include "khtml_events.h"
+#include "tdehtml_part.h"
+#include "tdehtml_events.h"
 
 #include "html/html_documentimpl.h"
 #include "html/html_inlineimpl.h"
@@ -51,28 +51,28 @@
 #include "misc/htmlhashes.h"
 #include "misc/helper.h"
 #include "misc/loader.h"
-#include "khtml_settings.h"
-#include "khtml_printsettings.h"
+#include "tdehtml_settings.h"
+#include "tdehtml_printsettings.h"
 
-#include "khtmlpart_p.h"
+#include "tdehtmlpart_p.h"
 
-#ifndef KHTML_NO_CARET
-#include "khtml_caret_p.h"
+#ifndef TDEHTML_NO_CARET
+#include "tdehtml_caret_p.h"
 #include "xml/dom2_rangeimpl.h"
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kprinter.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
 
@@ -102,22 +102,22 @@
 #define PAINT_BUFFER_HEIGHT 128
 
 #if 0
-namespace khtml {
+namespace tdehtml {
     void dumpLineBoxes(RenderFlow *flow);
 }
 #endif
 
 using namespace DOM;
-using namespace khtml;
-class KHTMLToolTip;
+using namespace tdehtml;
+class TDEHTMLToolTip;
 
 
 #ifndef QT_NO_TOOLTIP
 
-class KHTMLToolTip : public TQToolTip
+class TDEHTMLToolTip : public TQToolTip
 {
 public:
-    KHTMLToolTip(KHTMLView *view,  KHTMLViewPrivate* vp) : TQToolTip(view->viewport())
+    TDEHTMLToolTip(TDEHTMLView *view,  TDEHTMLViewPrivate* vp) : TQToolTip(view->viewport())
     {
         m_view = view;
         m_viewprivate = vp;
@@ -127,14 +127,14 @@ protected:
     virtual void maybeTip(const TQPoint &);
 
 private:
-    KHTMLView *m_view;
-    KHTMLViewPrivate* m_viewprivate;
+    TDEHTMLView *m_view;
+    TDEHTMLViewPrivate* m_viewprivate;
 };
 
 #endif
 
-class KHTMLViewPrivate {
-    friend class KHTMLToolTip;
+class TDEHTMLViewPrivate {
+    friend class TDEHTMLToolTip;
 public:
 
     enum PseudoFocusNodes {
@@ -149,16 +149,16 @@ public:
         CSActionPending
     };
 
-    KHTMLViewPrivate()
+    TDEHTMLViewPrivate()
         : underMouse( 0 ), underMouseNonShared( 0 ), visibleWidgets( 107 )
 #ifndef NO_SMOOTH_SCROLL_HACK
           , dx(0), dy(0), ddx(0), ddy(0), rdx(0), rdy(0), scrolling(false)
 #endif
     {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
 	m_caretViewContext = 0;
 	m_editorContext = 0;
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
         postponed_autorepeat = NULL;
         reset();
         vmode = TQScrollView::Auto;
@@ -175,7 +175,7 @@ public:
         m_mouseScrollTimer = 0;
         m_mouseScrollIndicator = 0;
     }
-    ~KHTMLViewPrivate()
+    ~TDEHTMLViewPrivate()
     {
         delete formCompletions;
         delete tp; tp = 0;
@@ -187,10 +187,10 @@ public:
         if (underMouseNonShared)
 	    underMouseNonShared->deref();
 	delete tooltip;
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
 	delete m_caretViewContext;
 	delete m_editorContext;
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
         delete cursor_icon_widget;
         delete m_mouseScrollTimer;
         delete m_mouseScrollIndicator;
@@ -208,7 +208,7 @@ public:
 	tabMovePending = false;
 	lastTabbingDirection = true;
 	pseudoFocusNode = PFNone;
-#ifndef KHTML_NO_SCROLLBARS
+#ifndef TDEHTML_NO_SCROLLBARS
         //We don't turn off the toolbars here
 	//since if the user turns them
 	//off, then chances are they want them turned
@@ -250,22 +250,22 @@ public:
         painting = false;
         updateRegion = TQRegion();
         m_dialogsAllowed = true;
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
         if (m_caretViewContext) {
           m_caretViewContext->caretMoved = false;
 	  m_caretViewContext->keyReleasePending = false;
         }/*end if*/
-#endif // KHTML_NO_CARET
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_CARET
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
         typeAheadActivated = false;
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 	accessKeysActivated = false;
 	accessKeysPreActivate = false;
 
         // We ref/deref to ensure defaultHTMLSettings is available
-        KHTMLFactory::ref();
-        accessKeysEnabled = KHTMLFactory::defaultHTMLSettings()->accessKeysEnabled();
-        KHTMLFactory::deref();
+        TDEHTMLFactory::ref();
+        accessKeysEnabled = TDEHTMLFactory::defaultHTMLSettings()->accessKeysEnabled();
+        TDEHTMLFactory::deref();
 
         emitCompletedAfterRepaint = CSNone;
     }
@@ -304,7 +304,7 @@ public:
         scrollSuspended = false;
     }
 
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     /** this function returns an instance of the caret view context. If none
      * exists, it will be instantiated.
      */
@@ -319,7 +319,7 @@ public:
       if (!m_editorContext) m_editorContext = new EditorContext();
       return m_editorContext;
     }
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 
 #ifdef DEBUG_PIXEL
     TQTime timer;
@@ -375,18 +375,18 @@ public:
     bool dirtyLayout                           :1;
     bool m_dialogsAllowed			:1;
     TQRegion updateRegion;
-    KHTMLToolTip *tooltip;
+    TDEHTMLToolTip *tooltip;
     TQPtrDict<TQWidget> visibleWidgets;
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     CaretViewContext *m_caretViewContext;
     EditorContext *m_editorContext;
-#endif // KHTML_NO_CARET
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_CARET
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
     TQString findString;
     TQTimer timer;
     bool findLinksOnly;
     bool typeAheadActivated;
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
     bool accessKeysEnabled;
     bool accessKeysActivated;
     bool accessKeysPreActivate;
@@ -453,7 +453,7 @@ static bool findImageMapRect(HTMLImageElementImpl *img, const TQPoint &scrollOfs
     return false;
 }
 
-void KHTMLToolTip::maybeTip(const TQPoint& p)
+void TDEHTMLToolTip::maybeTip(const TQPoint& p)
 {
     DOM::NodeImpl *node = m_viewprivate->underMouseNonShared;
     TQRect region;
@@ -484,22 +484,22 @@ void KHTMLToolTip::maybeTip(const TQPoint& p)
 }
 #endif
 
-KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name)
+TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
     : TQScrollView( parent, name, (WFlags)(WResizeNoErase | WRepaintNoErase) )
 {
     m_medium = "screen";
 
     m_part = part;
-    d = new KHTMLViewPrivate;
+    d = new TDEHTMLViewPrivate;
     TQScrollView::setVScrollBarMode(d->vmode);
     TQScrollView::setHScrollBarMode(d->hmode);
-    connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged()));
+    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged()));
     connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotScrollBarMoved()));
 
     // initialize QScrollView
     enableClipper(true);
     // hack to get unclipped painting on the viewport.
-    static_cast<KHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped);
+    static_cast<TDEHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped);
 
     setResizePolicy(Manual);
     viewport()->setMouseTracking(true);
@@ -508,12 +508,12 @@ KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name)
     KImageIO::registerFormats();
 
 #ifndef QT_NO_TOOLTIP
-    d->tooltip = new KHTMLToolTip( this, d );
+    d->tooltip = new TDEHTMLToolTip( this, d );
 #endif
 
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
     connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout()));
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 
     init();
 
@@ -525,7 +525,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name)
 #endif
 }
 
-KHTMLView::~KHTMLView()
+TDEHTMLView::~TDEHTMLView()
 {
     closeChildDialogs();
     if (m_part)
@@ -539,7 +539,7 @@ KHTMLView::~KHTMLView()
     delete d; d = 0;
 }
 
-void KHTMLView::init()
+void TDEHTMLView::init()
 {
     if(!d->paintBuffer) d->paintBuffer = new TQPixmap(PAINT_BUFFER_HEIGHT, PAINT_BUFFER_HEIGHT);
     if(!d->vertPaintBuffer)
@@ -561,15 +561,15 @@ void KHTMLView::init()
     resizeContents(s.width(), s.height());
 }
 
-void KHTMLView::clear()
+void TDEHTMLView::clear()
 {
     // work around QScrollview's unbelievable bugginess
     setStaticBackground(true);
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     if (!m_part->isCaretMode() && !m_part->isEditable()) caretOff();
 #endif
 
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
     if( d->typeAheadActivated )
         findTimeout();
 #endif
@@ -588,21 +588,21 @@ void KHTMLView::clear()
     horizontalScrollBar()->setEnabled( false );
 }
 
-void KHTMLView::hideEvent(TQHideEvent* e)
+void TDEHTMLView::hideEvent(TQHideEvent* e)
 {
     TQScrollView::hideEvent(e);
     if ( m_part && m_part->xmlDocImpl() )
         m_part->xmlDocImpl()->docLoader()->pauseAnimations();
 }
 
-void KHTMLView::showEvent(TQShowEvent* e)
+void TDEHTMLView::showEvent(TQShowEvent* e)
 {
     TQScrollView::showEvent(e);
     if ( m_part && m_part->xmlDocImpl() )
         m_part->xmlDocImpl()->docLoader()->resumeAnimations();
 }
 
-void KHTMLView::resizeEvent (TQResizeEvent* e)
+void TDEHTMLView::resizeEvent (TQResizeEvent* e)
 {
     int dw = e->oldSize().width() - e->size().width();
     int dh = e->oldSize().height() - e->size().height();
@@ -620,7 +620,7 @@ void KHTMLView::resizeEvent (TQResizeEvent* e)
         m_part->xmlDocImpl()->dispatchWindowEvent( EventImpl::RESIZE_EVENT, false, false );
 }
 
-void KHTMLView::viewportResizeEvent (TQResizeEvent* e)
+void TDEHTMLView::viewportResizeEvent (TQResizeEvent* e)
 {
     TQScrollView::viewportResizeEvent(e);
 
@@ -629,7 +629,7 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e)
 
     if (d->layoutSchedulingEnabled)
         layout();
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     else {
         hideCaret();
         recalcAndStoreCaretPos();
@@ -637,15 +637,15 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e)
     }/*end if*/
 #endif
 
-    KApplication::sendPostedEvents(viewport(), TQEvent::Paint);
+    TDEApplication::sendPostedEvents(viewport(), TQEvent::Paint);
 }
 
 // this is to get rid of a compiler virtual overload mismatch warning. do not remove
-void KHTMLView::drawContents( TQPainter*)
+void TDEHTMLView::drawContents( TQPainter*)
 {
 }
 
-void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
+void TDEHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
 {
 #ifdef DEBUG_PIXEL
 
@@ -683,7 +683,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
     for (TQPtrDictIterator<TQWidget> it(d->visibleWidgets); it.current(); ++it) {
 	TQWidget *w = it.current();
 	RenderWidget* rw = static_cast<RenderWidget*>( it.currentKey() );
-	if (w && rw && !rw->isKHTMLWidget()) {
+	if (w && rw && !rw->isTDEHTMLWidget()) {
             int x, y;
             rw->absolutePosition(x, y);
             contentsToViewport(x, y, x, y);
@@ -760,7 +760,7 @@ static int cnt=0;
         m_part->xmlDocImpl()->renderer()->layer()->paint(p, pr);
 #endif // DEBUG_NO_PAINT_BUFFER
 
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     if (d->m_caretViewContext && d->m_caretViewContext->visible) {
         TQRect pos(d->m_caretViewContext->x, d->m_caretViewContext->y,
 		d->m_caretViewContext->width, d->m_caretViewContext->height);
@@ -774,35 +774,35 @@ static int cnt=0;
 	    }/*end if*/
 	}/*end if*/
     }/*end if*/
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 
 //    p->setPen(TQPen(magenta,0,DashDotDotLine));
 //    p->drawRect(dbg_paint_rect);
 
-    khtml::DrawContentsEvent event( p, ex, ey, ew, eh );
+    tdehtml::DrawContentsEvent event( p, ex, ey, ew, eh );
     TQApplication::sendEvent( m_part, &event );
 
     d->painting = false;
 }
 
-void KHTMLView::setMarginWidth(int w)
+void TDEHTMLView::setMarginWidth(int w)
 {
     // make it update the rendering area when set
     _marginWidth = w;
 }
 
-void KHTMLView::setMarginHeight(int h)
+void TDEHTMLView::setMarginHeight(int h)
 {
     // make it update the rendering area when set
     _marginHeight = h;
 }
 
-void KHTMLView::layout()
+void TDEHTMLView::layout()
 {
     if( m_part && m_part->xmlDocImpl() ) {
         DOM::DocumentImpl *document = m_part->xmlDocImpl();
 
-        khtml::RenderCanvas* canvas = static_cast<khtml::RenderCanvas *>(document->renderer());
+        tdehtml::RenderCanvas* canvas = static_cast<tdehtml::RenderCanvas *>(document->renderer());
         if ( !canvas ) return;
 
         d->layoutSchedulingEnabled=false;
@@ -824,7 +824,7 @@ void KHTMLView::layout()
              }
              else {
                  if (!d->tooltip)
-                     d->tooltip = new KHTMLToolTip( this, d );
+                     d->tooltip = new TDEHTMLToolTip( this, d );
                  // only apply body's overflow to canvas if root as a visible overflow
                  if (root)
                      ref = (!body || root->style()->hidesOverflow()) ? root : body->renderer();
@@ -870,7 +870,7 @@ void KHTMLView::layout()
     if (listitem) kdDebug(6000) << "after layout, before repaint" << endl;
     if (listitem) dumpLineBoxes(static_cast<RenderFlow *>(listitem->renderer()));
 #endif
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
         hideCaret();
         if ((m_part->isCaretMode() || m_part->isEditable())
         	&& !d->complete && d->m_caretViewContext
@@ -895,7 +895,7 @@ void KHTMLView::layout()
     d->layoutSchedulingEnabled=true;
 }
 
-void KHTMLView::closeChildDialogs()
+void TDEHTMLView::closeChildDialogs()
 {
     TQObjectList *dlgs = queryList(TQDIALOG_OBJECT_NAME_STRING);
     for (TQObject *dlg = dlgs->first(); dlg; dlg = dlgs->next())
@@ -919,15 +919,15 @@ void KHTMLView::closeChildDialogs()
     d->m_dialogsAllowed = false;
 }
 
-bool KHTMLView::dialogsAllowed() {
+bool TDEHTMLView::dialogsAllowed() {
     bool allowed = d->m_dialogsAllowed;
-    KHTMLPart* p = m_part->parentPart();
+    TDEHTMLPart* p = m_part->parentPart();
     if (p && p->view())
         allowed &= p->view()->dialogsAllowed();
     return allowed;
 }
 
-void KHTMLView::closeEvent( TQCloseEvent* ev )
+void TDEHTMLView::closeEvent( TQCloseEvent* ev )
 {
     closeChildDialogs();
     TQScrollView::closeEvent( ev );
@@ -938,7 +938,7 @@ void KHTMLView::closeEvent( TQCloseEvent* ev )
 //
 /////////////////
 
-void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
+void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
 {
     if (!m_part->xmlDocImpl()) return;
     if (d->possibleTripleClick && ( _mouse->button() & Qt::MouseButtonMask ) == Qt::LeftButton)
@@ -975,13 +975,13 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
             pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) );
 
             TQPainter p( &pixmap );
-            icon = KGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small );
+            icon = TDEGlobal::iconLoader()->loadIcon( "1uparrow", TDEIcon::Small );
             p.drawPixmap( 16, 0, icon );
-            icon = KGlobal::iconLoader()->loadIcon( "1leftarrow", KIcon::Small );
+            icon = TDEGlobal::iconLoader()->loadIcon( "1leftarrow", TDEIcon::Small );
             p.drawPixmap( 0, 16, icon );
-            icon = KGlobal::iconLoader()->loadIcon( "1downarrow", KIcon::Small );
+            icon = TDEGlobal::iconLoader()->loadIcon( "1downarrow", TDEIcon::Small );
             p.drawPixmap( 16, 32,icon  );
-            icon = KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small );
+            icon = TDEGlobal::iconLoader()->loadIcon( "1rightarrow", TDEIcon::Small );
             p.drawPixmap( 32, 16, icon );
             p.drawEllipse( 23, 23, 2, 2 );
 
@@ -994,8 +994,8 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
         bool hasHorBar = visibleWidth() < contentsWidth();
         bool hasVerBar = visibleHeight() < contentsHeight();
 
-        KConfig *config = KGlobal::config();
-        KConfigGroupSaver saver( config, "HTML Settings" );
+        TDEConfig *config = TDEGlobal::config();
+        TDEConfigGroupSaver saver( config, "HTML Settings" );
         if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) {
             d->m_mouseScrollIndicator->show();
             d->m_mouseScrollIndicator->unsetCursor();
@@ -1045,20 +1045,20 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
     bool swallowEvent = dispatchMouseEvent(EventImpl::MOUSEDOWN_EVENT,mev.innerNode.handle(),mev.innerNonSharedNode.handle(),true,
                                            d->clickCount,_mouse,true,DOM::NodeImpl::MousePress);
 
-    khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+    tdehtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
     if (r && r->isWidget())
 	_mouse->ignore();
 
     if (!swallowEvent) {
 	emit m_part->nodeActivated(mev.innerNode);
 
-	khtml::MousePressEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
+	tdehtml::MousePressEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
         TQApplication::sendEvent( m_part, &event );
         // we might be deleted after this
     }
 }
 
-void KHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse )
+void TDEHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse )
 {
     if(!m_part->xmlDocImpl()) return;
 
@@ -1085,12 +1085,12 @@ void KHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse )
     bool swallowEvent = dispatchMouseEvent(EventImpl::MOUSEDOWN_EVENT,mev.innerNode.handle(),mev.innerNonSharedNode.handle(),true,
                                            d->clickCount,_mouse,true,DOM::NodeImpl::MouseDblClick);
 
-    khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+    tdehtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
     if (r && r->isWidget())
 	_mouse->ignore();
 
     if (!swallowEvent) {
-	khtml::MouseDoubleClickEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode, d->clickCount );
+	tdehtml::MouseDoubleClickEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode, d->clickCount );
 	TQApplication::sendEvent( m_part, &event );
     }
 
@@ -1098,13 +1098,13 @@ void KHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse )
     TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout()));
 }
 
-void KHTMLView::tripleClickTimeout()
+void TDEHTMLView::tripleClickTimeout()
 {
     d->possibleTripleClick = false;
     d->clickCount = 0;
 }
 
-static inline void forwardPeripheralEvent(khtml::RenderWidget* r, TQMouseEvent* me, int x, int y)
+static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent* me, int x, int y)
 {
     int absx = 0;
     int absy = 0;
@@ -1114,13 +1114,13 @@ static inline void forwardPeripheralEvent(khtml::RenderWidget* r, TQMouseEvent*
     TQWidget* w = r->widget();
     TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w);
     if (sc && !::tqqt_cast<TQListBox*>(w))
-        static_cast<khtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw));
+        static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw));
     else if(w)
-        static_cast<khtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw));
+        static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw));
 }
 
 
-static bool targetOpensNewWindow(KHTMLPart *part, TQString target)
+static bool targetOpensNewWindow(TDEHTMLPart *part, TQString target)
 {
     if (!target.isEmpty() && (target.lower() != "_top") &&
        (target.lower() != "_self") && (target.lower() != "_parent")) {
@@ -1136,7 +1136,7 @@ static bool targetOpensNewWindow(KHTMLPart *part, TQString target)
     return false;
 }
 
-void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
+void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
 {
     if ( d->m_mouseScrollTimer ) {
         TQPoint point = mapFromGlobal( _mouse->globalPos() );
@@ -1188,11 +1188,11 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
     DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode();
     if (fn && fn != mev.innerNode.handle() &&
         fn->renderer() && fn->renderer()->isWidget()) {
-        forwardPeripheralEvent(static_cast<khtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
+        forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
     }
 
-    khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
-    khtml::RenderStyle* style = (r && r->style()) ? r->style() : 0;
+    tdehtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+    tdehtml::RenderStyle* style = (r && r->style()) ? r->style() : 0;
     TQCursor c;
     bool mailtoCursor = false;
     bool newWindowCursor = false;
@@ -1259,7 +1259,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
 
     if ( viewport()->cursor().handle() != c.handle() ) {
         if( c.handle() == KCursor::arrowCursor().handle()) {
-            for (KHTMLPart* p = m_part; p; p = p->parentPart())
+            for (TDEHTMLPart* p = m_part; p; p = p->parentPart())
                 p->view()->viewport()->unsetCursor();
         }
         else {
@@ -1269,7 +1269,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
 
     if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) {
 #ifdef Q_WS_X11
-        TQPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", KIcon::Small, 0, KIcon::DefaultState, 0, true );
+        TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true );
 
         if (d->cursor_icon_widget) {
             const TQPixmap *pm = d->cursor_icon_widget->backgroundPixmap();
@@ -1311,12 +1311,12 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
     d->prevMouseY = ym;
 
     if (!swallowEvent) {
-        khtml::MouseMoveEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
+        tdehtml::MouseMoveEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
         TQApplication::sendEvent( m_part, &event );
     }
 }
 
-void KHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse )
+void TDEHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse )
 {
     bool swallowEvent = false;
     int xm, ym;
@@ -1342,22 +1342,22 @@ void KHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse )
         if (fn && fn != mev.innerNode.handle() &&
             fn->renderer() && fn->renderer()->isWidget() &&
             _mouse->button() != Qt::MidButton) {
-            forwardPeripheralEvent(static_cast<khtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
+            forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
         }
 
-        khtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
+        tdehtml::RenderObject* r = mev.innerNode.handle() ? mev.innerNode.handle()->renderer() : 0;
         if (r && r->isWidget())
             _mouse->ignore();
     }
 
     if (!swallowEvent) {
-	khtml::MouseReleaseEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
+	tdehtml::MouseReleaseEvent event( _mouse, xm, ym, mev.url, mev.target, mev.innerNode );
 	TQApplication::sendEvent( m_part, &event );
     }
 }
 
 // returns true if event should be swallowed
-bool KHTMLView::dispatchKeyEvent( TQKeyEvent *_ke )
+bool TDEHTMLView::dispatchKeyEvent( TQKeyEvent *_ke )
 {
     if (!m_part->xmlDocImpl())
         return false;
@@ -1432,7 +1432,7 @@ bool KHTMLView::dispatchKeyEvent( TQKeyEvent *_ke )
 }
 
 // returns true if event should be swallowed
-bool KHTMLView::dispatchKeyEventHelper( TQKeyEvent *_ke, bool keypress )
+bool TDEHTMLView::dispatchKeyEventHelper( TQKeyEvent *_ke, bool keypress )
 {
     DOM::NodeImpl* keyNode = m_part->xmlDocImpl()->focusNode();
     if (keyNode) {
@@ -1442,9 +1442,9 @@ bool KHTMLView::dispatchKeyEventHelper( TQKeyEvent *_ke, bool keypress )
     }
 }
 
-void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
+void TDEHTMLView::keyPressEvent( TQKeyEvent *_ke )
 {
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
 	if(d->typeAheadActivated)
 	{
 		// type-ahead find aka find-as-you-type
@@ -1483,9 +1483,9 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
 			return;
 		}
 	}
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     if (m_part->isEditable() || m_part->isCaretMode()
         || (m_part->xmlDocImpl() && m_part->xmlDocImpl()->focusNode()
 	    && m_part->xmlDocImpl()->focusNode()->contentEditable())) {
@@ -1493,7 +1493,7 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
       caretKeyPressEvent(_ke);
       return;
     }
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 
     // If CTRL was hit, be prepared for access keys
     if (d->accessKeysEnabled && _ke->key() == Key_Control && _ke->state()==0 && !d->accessKeysActivated)
@@ -1539,22 +1539,22 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
 
         case Key_Down:
         case Key_J:
-            d->adjustScroller(this, KHTMLViewPrivate::ScrollDown, KHTMLViewPrivate::ScrollUp);
+            d->adjustScroller(this, TDEHTMLViewPrivate::ScrollDown, TDEHTMLViewPrivate::ScrollUp);
             break;
 
         case Key_Up:
         case Key_K:
-            d->adjustScroller(this, KHTMLViewPrivate::ScrollUp, KHTMLViewPrivate::ScrollDown);
+            d->adjustScroller(this, TDEHTMLViewPrivate::ScrollUp, TDEHTMLViewPrivate::ScrollDown);
             break;
 
         case Key_Left:
         case Key_H:
-            d->adjustScroller(this, KHTMLViewPrivate::ScrollLeft, KHTMLViewPrivate::ScrollRight);
+            d->adjustScroller(this, TDEHTMLViewPrivate::ScrollLeft, TDEHTMLViewPrivate::ScrollRight);
             break;
 
         case Key_Right:
         case Key_L:
-            d->adjustScroller(this, KHTMLViewPrivate::ScrollRight, KHTMLViewPrivate::ScrollLeft);
+            d->adjustScroller(this, TDEHTMLViewPrivate::ScrollRight, TDEHTMLViewPrivate::ScrollLeft);
             break;
         }
     else
@@ -1636,30 +1636,30 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
     _ke->accept();
 }
 
-void KHTMLView::findTimeout()
+void TDEHTMLView::findTimeout()
 {
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
 	d->typeAheadActivated = false;
 	d->findString = "";
-	m_part->setStatusBarText(i18n("Find stopped."), KHTMLPart::BarDefaultText);
+	m_part->setStatusBarText(i18n("Find stopped."), TDEHTMLPart::BarDefaultText);
 	m_part->enableFindAheadActions( true );
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 }
 
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
-void KHTMLView::startFindAhead( bool linksOnly )
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
+void TDEHTMLView::startFindAhead( bool linksOnly )
 {
 	if( linksOnly )
 	{
 		d->findLinksOnly = true;
 		m_part->setStatusBarText(i18n("Starting -- find links as you type"),
-		                         KHTMLPart::BarDefaultText);
+		                         TDEHTMLPart::BarDefaultText);
 	}
 	else
 	{
 		d->findLinksOnly = false;
 		m_part->setStatusBarText(i18n("Starting -- find text as you type"),
-		                         KHTMLPart::BarDefaultText);
+		                         TDEHTMLPart::BarDefaultText);
 	}
 
 	m_part->findTextBegin();
@@ -1669,14 +1669,14 @@ void KHTMLView::startFindAhead( bool linksOnly )
 	d->timer.start(3000, true);
 }
 
-void KHTMLView::findAhead(bool increase)
+void TDEHTMLView::findAhead(bool increase)
 {
 	TQString status;
 
 	if(d->findLinksOnly)
 	{
-		m_part->findText(d->findString, KHTMLPart::FindNoPopups |
-		                 KHTMLPart::FindLinksOnly, this);
+		m_part->findText(d->findString, TDEHTMLPart::FindNoPopups |
+		                 TDEHTMLPart::FindLinksOnly, this);
 		if(m_part->findTextNext())
 		{
 			status = i18n("Link found: \"%1\".");
@@ -1689,7 +1689,7 @@ void KHTMLView::findAhead(bool increase)
 	}
 	else
 	{
-		m_part->findText(d->findString, KHTMLPart::FindNoPopups, this);
+		m_part->findText(d->findString, TDEHTMLPart::FindNoPopups, this);
 		if(m_part->findTextNext())
 		{
 			status = i18n("Text found: \"%1\".");
@@ -1702,20 +1702,20 @@ void KHTMLView::findAhead(bool increase)
 	}
 
 	m_part->setStatusBarText(status.arg(d->findString.lower()),
-	                         KHTMLPart::BarDefaultText);
+	                         TDEHTMLPart::BarDefaultText);
 }
 
-void KHTMLView::updateFindAheadTimeout()
+void TDEHTMLView::updateFindAheadTimeout()
 {
     if( d->typeAheadActivated )
         d->timer.start( 3000, true );
 }
 
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 
-void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
+void TDEHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
 {
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
     if(d->typeAheadActivated) {
         _ke->accept();
         return;
@@ -1730,7 +1730,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
     if( d->scrollSuspendPreActivate && _ke->key() != Key_Shift )
         d->scrollSuspendPreActivate = false;
     if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == TQt::ShiftButton
-        && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
+        && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
     {
         if (d->scrollTimerId)
         {
@@ -1746,10 +1746,10 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
     {
         if (d->accessKeysPreActivate && _ke->key() != Key_Control)
             d->accessKeysPreActivate=false;
-        if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(KApplication::keyboardMouseState() & TQt::ControlButton))
+        if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(TDEApplication::keyboardMouseState() & TQt::ControlButton))
         {
 	    displayAccessKeys();
-	    m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText);
+	    m_part->setStatusBarText(i18n("Access Keys activated"),TDEHTMLPart::BarOverrideText);
 	    d->accessKeysActivated = true;
 	    d->accessKeysPreActivate = false;
             _ke->accept();
@@ -1773,7 +1773,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
     TQScrollView::keyReleaseEvent(_ke);
 }
 
-void KHTMLView::contentsContextMenuEvent ( TQContextMenuEvent * /*ce*/ )
+void TDEHTMLView::contentsContextMenuEvent ( TQContextMenuEvent * /*ce*/ )
 {
 // ### what kind of c*** is that ?
 #if 0
@@ -1800,7 +1800,7 @@ void KHTMLView::contentsContextMenuEvent ( TQContextMenuEvent * /*ce*/ )
 #endif
 }
 
-bool KHTMLView::focusNextPrevChild( bool next )
+bool TDEHTMLView::focusNextPrevChild( bool next )
 {
     // Now try to find the next child
     if (m_part->xmlDocImpl() && focusNextPrevNode(next))
@@ -1812,14 +1812,14 @@ bool KHTMLView::focusNextPrevChild( bool next )
     }
 
     // If we get here, pass tabbing control up to the next/previous child in our parent
-    d->pseudoFocusNode = KHTMLViewPrivate::PFNone;
+    d->pseudoFocusNode = TDEHTMLViewPrivate::PFNone;
     if (m_part->parentPart() && m_part->parentPart()->view())
         return m_part->parentPart()->view()->focusNextPrevChild(next);
 
     return TQWidget::focusNextPrevChild(next);
 }
 
-void KHTMLView::doAutoScroll()
+void TDEHTMLView::doAutoScroll()
 {
     TQPoint pos = TQCursor::pos();
     pos = viewport()->mapFromGlobal( pos );
@@ -1833,7 +1833,7 @@ void KHTMLView::doAutoScroll()
     {
         ensureVisible( xm, ym, 0, 5 );
 
-#ifndef KHTML_NO_SELECTION
+#ifndef TDEHTML_NO_SELECTION
         // extend the selection while scrolling
 	DOM::Node innerNode;
 	if (m_part->isExtendingSelection()) {
@@ -1849,7 +1849,7 @@ void KHTMLView::doAutoScroll()
 
             m_part->extendSelectionTo(xm, ym, absX, absY, innerNode);
         }/*end if*/
-#endif // KHTML_NO_SELECTION
+#endif // TDEHTML_NO_SELECTION
     }
 }
 
@@ -1860,7 +1860,7 @@ class HackWidget : public TQWidget
     inline void setNoErase() { setWFlags(getWFlags()|WRepaintNoErase); }
 };
 
-bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
+bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 {
     if ( e->type() == TQEvent::AccelOverride ) {
 	TQKeyEvent* ke = (TQKeyEvent*) e;
@@ -1904,7 +1904,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 		TQWidget *w = TQT_TQWIDGET(c);
 		// don't install the event filter on toplevels
 		if (w->parentWidget(true) == view) {
-		    if (!strcmp(w->name(), "__khtml")) {
+		    if (!strcmp(w->name(), "__tdehtml")) {
 			w->installEventFilter(this);
 			w->unsetCursor();
 			if (!::tqqt_cast<TQFrame*>(w))
@@ -1934,7 +1934,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    v = v->parentWidget(true);
 	}
 
-	if (v && !strcmp(c->name(), "__khtml")) {
+	if (v && !strcmp(c->name(), "__tdehtml")) {
 	    bool block = false;
 	    TQWidget *w = TQT_TQWIDGET(o);
 	    switch(e->type()) {
@@ -1956,7 +1956,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 
 		    // TQScrollView needs fast repaints
 		    if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() &&
-		         !static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
+		         !static_cast<tdehtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
 		        repaintContents(x + pe->rect().x(), y + pe->rect().y(),
 	                                        pe->rect().width(), pe->rect().height(), true);
                     } else {
@@ -2011,17 +2011,17 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
 }
 
 
-DOM::NodeImpl *KHTMLView::nodeUnderMouse() const
+DOM::NodeImpl *TDEHTMLView::nodeUnderMouse() const
 {
     return d->underMouse;
 }
 
-DOM::NodeImpl *KHTMLView::nonSharedNodeUnderMouse() const
+DOM::NodeImpl *TDEHTMLView::nonSharedNodeUnderMouse() const
 {
     return d->underMouseNonShared;
 }
 
-bool KHTMLView::scrollTo(const TQRect &bounds)
+bool TDEHTMLView::scrollTo(const TQRect &bounds)
 {
     d->scrollingSelf = true; // so scroll events get ignored
 
@@ -2091,7 +2091,7 @@ bool KHTMLView::scrollTo(const TQRect &bounds)
 
 }
 
-bool KHTMLView::focusNextPrevNode(bool next)
+bool TDEHTMLView::focusNextPrevNode(bool next)
 {
     // Sets the focus node of the document to be the node after (or if
     // next is false, before) the current focus node.  Only nodes that
@@ -2143,7 +2143,7 @@ bool KHTMLView::focusNextPrevNode(bool next)
 		    d->scrollBarMoved = false;
 		    d->tabMovePending = false;
 		    d->lastTabbingDirection = next;
-		    d->pseudoFocusNode = KHTMLViewPrivate::PFNone;
+		    d->pseudoFocusNode = TDEHTMLViewPrivate::PFNone;
 		    m_part->xmlDocImpl()->setFocusNode(toFocus);
 		    Node guard(toFocus);
 		    if (!toFocus->hasOneRef() )
@@ -2169,11 +2169,11 @@ bool KHTMLView::focusNextPrevNode(bool next)
     }
 #endif
 
-    if (!oldFocusNode && d->pseudoFocusNode == KHTMLViewPrivate::PFNone)
+    if (!oldFocusNode && d->pseudoFocusNode == TDEHTMLViewPrivate::PFNone)
     {
 	ensureVisible(contentsX(), next?0:contentsHeight());
 	d->scrollBarMoved = false;
-	d->pseudoFocusNode = next?KHTMLViewPrivate::PFTop:KHTMLViewPrivate::PFBottom;
+	d->pseudoFocusNode = next?TDEHTMLViewPrivate::PFTop:TDEHTMLViewPrivate::PFBottom;
 	return true;
     }
 
@@ -2186,12 +2186,12 @@ bool KHTMLView::focusNextPrevNode(bool next)
     }
     else if (next)
     {
-	if (oldFocusNode || d->pseudoFocusNode == KHTMLViewPrivate::PFTop )
+	if (oldFocusNode || d->pseudoFocusNode == TDEHTMLViewPrivate::PFTop )
 	    newFocusNode = doc->nextFocusNode(oldFocusNode);
     }
     else
     {
-	if (oldFocusNode || d->pseudoFocusNode == KHTMLViewPrivate::PFBottom )
+	if (oldFocusNode || d->pseudoFocusNode == TDEHTMLViewPrivate::PFBottom )
 	    newFocusNode = doc->previousFocusNode(oldFocusNode);
     }
 
@@ -2209,7 +2209,7 @@ bool KHTMLView::focusNextPrevNode(bool next)
     }
     else
     {
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
         // if it's an editable element, activate the caret
         if (!m_part->isCaretMode() && !m_part->isEditable()
 		&& newFocusNode->contentEditable()) {
@@ -2218,7 +2218,7 @@ bool KHTMLView::focusNextPrevNode(bool next)
         } else {
 	    caretOff();
 	}
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 
 	targetVisible = scrollTo(newFocusNode->getRect());
     }
@@ -2240,7 +2240,7 @@ bool KHTMLView::focusNextPrevNode(bool next)
 	}
 	else
 	{
-	    d->pseudoFocusNode = next?KHTMLViewPrivate::PFBottom:KHTMLViewPrivate::PFTop;
+	    d->pseudoFocusNode = next?TDEHTMLViewPrivate::PFBottom:TDEHTMLViewPrivate::PFTop;
 	    return false;
 	}
     }
@@ -2253,14 +2253,14 @@ bool KHTMLView::focusNextPrevNode(bool next)
     }
 }
 
-void KHTMLView::displayAccessKeys()
+void TDEHTMLView::displayAccessKeys()
 {
     TQValueVector< TQChar > taken;
     displayAccessKeys( NULL, this, taken, false );
     displayAccessKeys( NULL, this, taken, true );
 }
 
-void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQValueVector< TQChar >& taken, bool use_fallbacks )
+void TDEHTMLView::displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview, TQValueVector< TQChar >& taken, bool use_fallbacks )
 {
     TQMap< ElementImpl*, TQChar > fallbacks;
     if( use_fallbacks )
@@ -2304,9 +2304,9 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal
     for( TQPtrListIterator<KParts::ReadOnlyPart> it( frames );
          it != NULL;
          ++it ) {
-        if( !(*it)->inherits( "KHTMLPart" ))
+        if( !(*it)->inherits( "TDEHTMLPart" ))
             continue;
-        KHTMLPart* part = static_cast< KHTMLPart* >( *it );
+        TDEHTMLPart* part = static_cast< TDEHTMLPart* >( *it );
         if( part->view() && part->view() != caller )
             part->view()->displayAccessKeys( this, origview, taken, use_fallbacks );
     }
@@ -2318,16 +2318,16 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal
 
 
 
-void KHTMLView::accessKeysTimeout()
+void TDEHTMLView::accessKeysTimeout()
 {
 d->accessKeysActivated=false;
 d->accessKeysPreActivate = false;
-m_part->setStatusBarText(TQString::null, KHTMLPart::BarOverrideText);
+m_part->setStatusBarText(TQString::null, TDEHTMLPart::BarOverrideText);
 emit hideAccessKeys();
 }
 
 // Handling of the HTML accesskey attribute.
-bool KHTMLView::handleAccessKey( const TQKeyEvent* ev )
+bool TDEHTMLView::handleAccessKey( const TQKeyEvent* ev )
 {
 // Qt interprets the keyevent also with the modifiers, and ev->text() matches that,
 // but this code must act as if the modifiers weren't pressed
@@ -2347,7 +2347,7 @@ bool KHTMLView::handleAccessKey( const TQKeyEvent* ev )
     return focusNodeWithAccessKey( c );
 }
 
-bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller )
+bool TDEHTMLView::focusNodeWithAccessKey( TQChar c, TDEHTMLView* caller )
 {
     DocumentImpl *doc = m_part->xmlDocImpl();
     if( !doc )
@@ -2358,9 +2358,9 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller )
         for( TQPtrListIterator<KParts::ReadOnlyPart> it( frames );
              it != NULL;
              ++it ) {
-            if( !(*it)->inherits( "KHTMLPart" ))
+            if( !(*it)->inherits( "TDEHTMLPart" ))
                 continue;
-            KHTMLPart* part = static_cast< KHTMLPart* >( *it );
+            TDEHTMLPart* part = static_cast< TDEHTMLPart* >( *it );
             if( part->view() && part->view() != caller
                 && part->view()->focusNodeWithAccessKey( c, this ))
                 return true;
@@ -2385,7 +2385,7 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller )
     }
 
     // Scroll the view as necessary to ensure that the new focus node is visible
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     // if it's an editable element, activate the caret
     if (!m_part->isCaretMode() && !m_part->isEditable()
 	&& node->contentEditable()) {
@@ -2394,7 +2394,7 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller )
     } else {
         caretOff();
     }
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 
     TQRect r = node->getRect();
     ensureVisible( r.right(), r.bottom());
@@ -2512,7 +2512,7 @@ static TQMap< NodeImpl*, TQString > buildLabels( NodeImpl* start )
     return ret;
 }
 
-namespace khtml {
+namespace tdehtml {
 struct AccessKeyData {
     ElementImpl* element;
     TQString text;
@@ -2521,7 +2521,7 @@ struct AccessKeyData {
 };
 }
 
-TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
+TQMap< ElementImpl*, TQChar > TDEHTMLView::buildFallbackAccessKeys() const
 {
     // build a list of all possible candidate elements that could use an accesskey
     TQValueList< AccessKeyData > data;
@@ -2543,7 +2543,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
             bool text_before = false;
             switch( element->id()) {
                 case ID_A:
-                    url = khtml::parseURL(element->getAttribute(ATTR_HREF)).string();
+                    url = tdehtml::parseURL(element->getAttribute(ATTR_HREF)).string();
                     if( url.isEmpty()) // doesn't have href, it's only an anchor
                         continue;
                     text = static_cast< HTMLElementImpl* >( element )->innerText().string().simplifyWhiteSpace();
@@ -2739,22 +2739,22 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
     return ret;
 }
 
-void KHTMLView::setMediaType( const TQString &medium )
+void TDEHTMLView::setMediaType( const TQString &medium )
 {
     m_medium = medium;
 }
 
-TQString KHTMLView::mediaType() const
+TQString TDEHTMLView::mediaType() const
 {
     return m_medium;
 }
 
-bool KHTMLView::pagedMode() const
+bool TDEHTMLView::pagedMode() const
 {
     return d->paged;
 }
 
-void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis)
+void TDEHTMLView::setWidgetVisible(RenderWidget* w, bool vis)
 {
     if (vis) {
         d->visibleWidgets.replace(w, w->widget());
@@ -2763,24 +2763,24 @@ void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis)
         d->visibleWidgets.remove(w);
 }
 
-bool KHTMLView::needsFullRepaint() const
+bool TDEHTMLView::needsFullRepaint() const
 {
     return d->needsFullRepaint;
 }
 
-void KHTMLView::print()
+void TDEHTMLView::print()
 {
     print( false );
 }
 
-void KHTMLView::print(bool quick)
+void TDEHTMLView::print(bool quick)
 {
     if(!m_part->xmlDocImpl()) return;
-    khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
+    tdehtml::RenderCanvas *root = static_cast<tdehtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
     if(!root) return;
 
     KPrinter *printer = new KPrinter(true, TQPrinter::ScreenResolution);
-    printer->addDialogPage(new KHTMLPrintSettings());
+    printer->addDialogPage(new TDEHTMLPrintSettings());
     TQString docname = m_part->xmlDocImpl()->URL().prettyURL();
     if ( !docname.isEmpty() )
         docname = KStringHandler::csqueeze(docname, 80);
@@ -2793,7 +2793,7 @@ void KHTMLView::print(bool quick)
 
         TQPainter *p = new TQPainter;
         p->begin( printer );
-        khtml::setPrintPainter( p );
+        tdehtml::setPrintPainter( p );
 
         m_part->xmlDocImpl()->setPaintDevice( printer );
         TQString oldMediaType = mediaType();
@@ -2801,7 +2801,7 @@ void KHTMLView::print(bool quick)
         // We ignore margin settings for html and body when printing
         // and use the default margins from the print-system
         // (In Qt 3.0.x the default margins are hardcoded in Qt)
-        m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-khtml-printfriendly") == "true" ?
+        m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-tdehtml-printfriendly") == "true" ?
                                                   "* { background-image: none !important;"
                                                   "    background-color: white !important;"
                                                   "    color: black !important; }"
@@ -2825,21 +2825,21 @@ void KHTMLView::print(bool quick)
 
         m_part->xmlDocImpl()->styleSelector()->computeFontSizes(&metrics, 100);
         m_part->xmlDocImpl()->updateStyleSelector();
-        root->setPrintImages( printer->option("app-khtml-printimages") == "true");
+        root->setPrintImages( printer->option("app-tdehtml-printimages") == "true");
         root->makePageBreakAvoidBlocks();
 
         root->setNeedsLayoutAndMinMaxRecalc();
         root->layout();
-        khtml::RenderWidget::flushWidgetResizes(); // make sure widgets have their final size
+        tdehtml::RenderWidget::flushWidgetResizes(); // make sure widgets have their final size
 
         // check sizes ask for action.. (scale or clip)
 
-        bool printHeader = (printer->option("app-khtml-printheader") == "true");
+        bool printHeader = (printer->option("app-tdehtml-printheader") == "true");
 
         int headerHeight = 0;
         TQFont headerFont("Sans Serif", 8);
 
-        TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true);
+        TQString headerLeft = TDEGlobal::locale()->formatDate(TQDate::currentDate(),true);
         TQString headerMid = docname;
         TQString headerRight;
 
@@ -2953,7 +2953,7 @@ void KHTMLView::print(bool quick)
         root->setPagedMode(false);
         root->setStaticMode(false);
         d->paged = false;
-        khtml::setPrintPainter( 0 );
+        tdehtml::setPrintPainter( 0 );
         setMediaType( oldMediaType );
         m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) );
         m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor());
@@ -2963,12 +2963,12 @@ void KHTMLView::print(bool quick)
     delete printer;
 }
 
-void KHTMLView::slotPaletteChanged()
+void TDEHTMLView::slotPaletteChanged()
 {
     if(!m_part->xmlDocImpl()) return;
     DOM::DocumentImpl *document = m_part->xmlDocImpl();
     if (!document->isHTMLDocument()) return;
-    khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(document->renderer());
+    tdehtml::RenderCanvas *root = static_cast<tdehtml::RenderCanvas *>(document->renderer());
     if(!root) return;
     root->style()->resetPalette();
     NodeImpl *body = static_cast<HTMLDocumentImpl*>(document)->body();
@@ -2977,10 +2977,10 @@ void KHTMLView::slotPaletteChanged()
     body->recalcStyle( NodeImpl::Force );
 }
 
-void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
+void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
 {
     if(!m_part->xmlDocImpl()) return;
-    khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
+    tdehtml::RenderCanvas *root = static_cast<tdehtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
     if(!root) return;
 
     m_part->xmlDocImpl()->setPaintDevice(p->device());
@@ -3010,16 +3010,16 @@ void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
 }
 
 
-void KHTMLView::useSlowRepaints()
+void TDEHTMLView::useSlowRepaints()
 {
     d->useSlowRepaints = true;
     setStaticBackground(true);
 }
 
 
-void KHTMLView::setVScrollBarMode ( ScrollBarMode mode )
+void TDEHTMLView::setVScrollBarMode ( ScrollBarMode mode )
 {
-#ifndef KHTML_NO_SCROLLBARS
+#ifndef TDEHTML_NO_SCROLLBARS
     d->vmode = mode;
     TQScrollView::setVScrollBarMode(mode);
 #else
@@ -3027,9 +3027,9 @@ void KHTMLView::setVScrollBarMode ( ScrollBarMode mode )
 #endif
 }
 
-void KHTMLView::setHScrollBarMode ( ScrollBarMode mode )
+void TDEHTMLView::setHScrollBarMode ( ScrollBarMode mode )
 {
-#ifndef KHTML_NO_SCROLLBARS
+#ifndef TDEHTML_NO_SCROLLBARS
     d->hmode = mode;
     TQScrollView::setHScrollBarMode(mode);
 #else
@@ -3037,7 +3037,7 @@ void KHTMLView::setHScrollBarMode ( ScrollBarMode mode )
 #endif
 }
 
-void KHTMLView::restoreScrollBar()
+void TDEHTMLView::restoreScrollBar()
 {
     int ow = visibleWidth();
     TQScrollView::setVScrollBarMode(d->vmode);
@@ -3046,26 +3046,26 @@ void KHTMLView::restoreScrollBar()
     d->prevScrollbarVisible = verticalScrollBar()->isVisible();
 }
 
-TQStringList KHTMLView::formCompletionItems(const TQString &name) const
+TQStringList TDEHTMLView::formCompletionItems(const TQString &name) const
 {
     if (!m_part->settings()->isFormCompletionEnabled())
         return TQStringList();
     if (!d->formCompletions)
-        d->formCompletions = new KSimpleConfig(locateLocal("data", "khtml/formcompletions"));
+        d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
     return d->formCompletions->readListEntry(name);
 }
 
-void KHTMLView::clearCompletionHistory(const TQString& name)
+void TDEHTMLView::clearCompletionHistory(const TQString& name)
 {
     if (!d->formCompletions)
     {
-        d->formCompletions = new KSimpleConfig(locateLocal("data", "khtml/formcompletions"));
+        d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
     }
     d->formCompletions->writeEntry(name, "");
     d->formCompletions->sync();
 }
 
-void KHTMLView::addFormCompletionItem(const TQString &name, const TQString &value)
+void TDEHTMLView::addFormCompletionItem(const TQString &name, const TQString &value)
 {
     if (!m_part->settings()->isFormCompletionEnabled())
         return;
@@ -3092,7 +3092,7 @@ void KHTMLView::addFormCompletionItem(const TQString &name, const TQString &valu
     d->formCompletions->writeEntry(name, items);
 }
 
-void KHTMLView::removeFormCompletionItem(const TQString &name, const TQString &value)
+void TDEHTMLView::removeFormCompletionItem(const TQString &name, const TQString &value)
 {
     if (!m_part->settings()->isFormCompletionEnabled())
         return;
@@ -3102,10 +3102,10 @@ void KHTMLView::removeFormCompletionItem(const TQString &name, const TQString &v
         d->formCompletions->writeEntry(name, items);
 }
 
-void KHTMLView::addNonPasswordStorableSite(const TQString& host)
+void TDEHTMLView::addNonPasswordStorableSite(const TQString& host)
 {
     if (!d->formCompletions) {
-        d->formCompletions = new KSimpleConfig(locateLocal("data", "khtml/formcompletions"));
+        d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
     }
 
     d->formCompletions->setGroup("NonPasswordStorableSites");
@@ -3116,10 +3116,10 @@ void KHTMLView::addNonPasswordStorableSite(const TQString& host)
     d->formCompletions->setGroup(TQString::null);//reset
 }
 
-bool KHTMLView::nonPasswordStorableSite(const TQString& host) const
+bool TDEHTMLView::nonPasswordStorableSite(const TQString& host) const
 {
     if (!d->formCompletions) {
-        d->formCompletions = new KSimpleConfig(locateLocal("data", "khtml/formcompletions"));
+        d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions"));
     }
     d->formCompletions->setGroup("NonPasswordStorableSites");
     TQStringList sites =  d->formCompletions->readListEntry("Sites");
@@ -3129,7 +3129,7 @@ bool KHTMLView::nonPasswordStorableSite(const TQString& host) const
 }
 
 // returns true if event should be swallowed
-bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode,
+bool TDEHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode,
 				   DOM::NodeImpl *targetNodeNonShared, bool cancelable,
 				   int detail,TQMouseEvent *_mouse, bool setUnder,
 				   int mouseEventType)
@@ -3262,14 +3262,14 @@ bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode,
     return swallowEvent;
 }
 
-void KHTMLView::setIgnoreWheelEvents( bool e )
+void TDEHTMLView::setIgnoreWheelEvents( bool e )
 {
     d->ignoreWheelEvents = e;
 }
 
 #ifndef QT_NO_WHEELEVENT
 
-void KHTMLView::viewportWheelEvent(TQWheelEvent* e)
+void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
 {
     if (d->accessKeysEnabled && d->accessKeysPreActivate) d->accessKeysPreActivate=false;
 
@@ -3314,7 +3314,7 @@ void KHTMLView::viewportWheelEvent(TQWheelEvent* e)
 }
 #endif
 
-void KHTMLView::dragEnterEvent( TQDragEnterEvent* ev )
+void TDEHTMLView::dragEnterEvent( TQDragEnterEvent* ev )
 {
     // Handle drops onto frames (#16820)
     // Drops on the main html part is handled by Konqueror (and shouldn't do anything
@@ -3327,7 +3327,7 @@ void KHTMLView::dragEnterEvent( TQDragEnterEvent* ev )
     TQScrollView::dragEnterEvent( ev );
 }
 
-void KHTMLView::dropEvent( TQDropEvent *ev )
+void TDEHTMLView::dropEvent( TQDropEvent *ev )
 {
     // Handle drops onto frames (#16820)
     // Drops on the main html part is handled by Konqueror (and shouldn't do anything
@@ -3340,17 +3340,17 @@ void KHTMLView::dropEvent( TQDropEvent *ev )
     TQScrollView::dropEvent( ev );
 }
 
-void KHTMLView::focusInEvent( TQFocusEvent *e )
+void TDEHTMLView::focusInEvent( TQFocusEvent *e )
 {
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
     m_part->enableFindAheadActions( true );
 #endif
     DOM::NodeImpl* fn = m_part->xmlDocImpl() ? m_part->xmlDocImpl()->focusNode() : 0;
     if (fn && fn->renderer() && fn->renderer()->isWidget() &&
         (e->reason() != TQFocusEvent::Mouse) &&
-        static_cast<khtml::RenderWidget*>(fn->renderer())->widget())
-        static_cast<khtml::RenderWidget*>(fn->renderer())->widget()->setFocus();
-#ifndef KHTML_NO_CARET
+        static_cast<tdehtml::RenderWidget*>(fn->renderer())->widget())
+        static_cast<tdehtml::RenderWidget*>(fn->renderer())->widget()->setFocus();
+#ifndef TDEHTML_NO_CARET
     // Restart blink frequency timer if it has been killed, but only on
     // editable nodes
     if (d->m_caretViewContext &&
@@ -3366,29 +3366,29 @@ void KHTMLView::focusInEvent( TQFocusEvent *e )
         }/*end if*/
     }/*end if*/
     showCaret();
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
     TQScrollView::focusInEvent( e );
 }
 
-void KHTMLView::focusOutEvent( TQFocusEvent *e )
+void TDEHTMLView::focusOutEvent( TQFocusEvent *e )
 {
     if(m_part) m_part->stopAutoScroll();
 
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
     if(d->typeAheadActivated)
     {
         findTimeout();
     }
     m_part->enableFindAheadActions( false );
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     if (d->m_caretViewContext) {
         switch (d->m_caretViewContext->displayNonFocused) {
-	case KHTMLPart::CaretInvisible:
+	case TDEHTMLPart::CaretInvisible:
             hideCaret();
 	    break;
-	case KHTMLPart::CaretVisible: {
+	case TDEHTMLPart::CaretVisible: {
 	    killTimer(d->m_caretViewContext->freqTimerId);
 	    d->m_caretViewContext->freqTimerId = -1;
             NodeImpl *caretNode = m_part->xmlDocImpl()->focusNode();
@@ -3402,12 +3402,12 @@ void KHTMLView::focusOutEvent( TQFocusEvent *e )
 	    }/*end if*/
 	    break;
 	}
-	case KHTMLPart::CaretBlink:
+	case TDEHTMLPart::CaretBlink:
 	    // simply leave as is
 	    break;
 	}/*end switch*/
     }/*end if*/
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 
     if ( d->cursor_icon_widget )
         d->cursor_icon_widget->hide();
@@ -3415,12 +3415,12 @@ void KHTMLView::focusOutEvent( TQFocusEvent *e )
     TQScrollView::focusOutEvent( e );
 }
 
-void KHTMLView::slotScrollBarMoved()
+void TDEHTMLView::slotScrollBarMoved()
 {
     if ( !d->firstRelayout && !d->complete && m_part->xmlDocImpl() &&
           d->layoutSchedulingEnabled) {
         // contents scroll while we are not complete: we need to check our layout *now*
-        khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>( m_part->xmlDocImpl()->renderer() );
+        tdehtml::RenderCanvas* root = static_cast<tdehtml::RenderCanvas *>( m_part->xmlDocImpl()->renderer() );
         if (root && root->needsLayout()) {
             unscheduleRelayout();
             layout();
@@ -3437,32 +3437,32 @@ void KHTMLView::slotScrollBarMoved()
         m_part->xmlDocImpl()->documentElement()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
 }
 
-void KHTMLView::timerEvent ( TQTimerEvent *e )
+void TDEHTMLView::timerEvent ( TQTimerEvent *e )
 {
 //    kdDebug() << "timer event " << e->timerId() << endl;
     if ( e->timerId() == d->scrollTimerId ) {
         if( d->scrollSuspended )
             return;
         switch (d->scrollDirection) {
-            case KHTMLViewPrivate::ScrollDown:
+            case TDEHTMLViewPrivate::ScrollDown:
                 if (contentsY() + visibleHeight () >= contentsHeight())
                     d->newScrollTimer(this, 0);
                 else
                     scrollBy( 0, d->scrollBy );
                 break;
-            case KHTMLViewPrivate::ScrollUp:
+            case TDEHTMLViewPrivate::ScrollUp:
                 if (contentsY() <= 0)
                     d->newScrollTimer(this, 0);
                 else
                     scrollBy( 0, -d->scrollBy );
                 break;
-            case KHTMLViewPrivate::ScrollRight:
+            case TDEHTMLViewPrivate::ScrollRight:
                 if (contentsX() + visibleWidth () >= contentsWidth())
                     d->newScrollTimer(this, 0);
                 else
                     scrollBy( d->scrollBy, 0 );
                 break;
-            case KHTMLViewPrivate::ScrollLeft:
+            case TDEHTMLViewPrivate::ScrollLeft:
                 if (contentsX() <= 0)
                     d->newScrollTimer(this, 0);
                 else
@@ -3480,7 +3480,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
             horizontalScrollBar()->setEnabled( true );
         }
     }
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     else if (d->m_caretViewContext
     	     && e->timerId() == d->m_caretViewContext->freqTimerId) {
         d->m_caretViewContext->visible = !d->m_caretViewContext->visible;
@@ -3498,7 +3498,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
     d->contentsMoving = false;
     if( m_part->xmlDocImpl() ) {
 	DOM::DocumentImpl *document = m_part->xmlDocImpl();
-	khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>(document->renderer());
+	tdehtml::RenderCanvas* root = static_cast<tdehtml::RenderCanvas *>(document->renderer());
 
 	if ( root && root->needsLayout() ) {
 	    killTimer(d->repaintTimerId);
@@ -3562,8 +3562,8 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
 
     emit repaintAccessKeys();
     if (d->emitCompletedAfterRepaint) {
-        bool full = d->emitCompletedAfterRepaint == KHTMLViewPrivate::CSFull;
-        d->emitCompletedAfterRepaint = KHTMLViewPrivate::CSNone;
+        bool full = d->emitCompletedAfterRepaint == TDEHTMLViewPrivate::CSFull;
+        d->emitCompletedAfterRepaint = TDEHTMLViewPrivate::CSNone;
         if ( full )
             emit m_part->completed();
         else
@@ -3571,7 +3571,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
     }
 }
 
-void KHTMLView::scheduleRelayout(khtml::RenderObject * /*clippedObj*/)
+void TDEHTMLView::scheduleRelayout(tdehtml::RenderObject * /*clippedObj*/)
 {
     if (!d->layoutSchedulingEnabled || d->layoutTimerId)
         return;
@@ -3580,7 +3580,7 @@ void KHTMLView::scheduleRelayout(khtml::RenderObject * /*clippedObj*/)
                              ? 1000 : 0 );
 }
 
-void KHTMLView::unscheduleRelayout()
+void TDEHTMLView::unscheduleRelayout()
 {
     if (!d->layoutTimerId)
         return;
@@ -3589,7 +3589,7 @@ void KHTMLView::unscheduleRelayout()
     d->layoutTimerId = 0;
 }
 
-void KHTMLView::unscheduleRepaint()
+void TDEHTMLView::unscheduleRepaint()
 {
     if (!d->repaintTimerId)
         return;
@@ -3598,7 +3598,7 @@ void KHTMLView::unscheduleRepaint()
     d->repaintTimerId = 0;
 }
 
-void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap)
+void TDEHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap)
 {
     bool parsing = !m_part->xmlDocImpl() || m_part->xmlDocImpl()->parsing();
 
@@ -3628,9 +3628,9 @@ void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap)
 //     kdDebug() << "starting timer " << time << endl;
 }
 
-void KHTMLView::complete( bool pendingAction )
+void TDEHTMLView::complete( bool pendingAction )
 {
-//     kdDebug() << "KHTMLView::complete()" << endl;
+//     kdDebug() << "TDEHTMLView::complete()" << endl;
 
     d->complete = true;
 
@@ -3642,7 +3642,7 @@ void KHTMLView::complete( bool pendingAction )
         killTimer(d->layoutTimerId);
         d->layoutTimerId = startTimer( 0 );
         d->emitCompletedAfterRepaint = pendingAction ?
-            KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull;
+            TDEHTMLViewPrivate::CSActionPending : TDEHTMLViewPrivate::CSFull;
     }
 
     // is there a repaint pending?
@@ -3653,7 +3653,7 @@ void KHTMLView::complete( bool pendingAction )
         killTimer(d->repaintTimerId);
         d->repaintTimerId = startTimer( 20 );
         d->emitCompletedAfterRepaint = pendingAction ?
-            KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull;
+            TDEHTMLViewPrivate::CSActionPending : TDEHTMLViewPrivate::CSFull;
     }
 
     if (!d->emitCompletedAfterRepaint)
@@ -3666,19 +3666,19 @@ void KHTMLView::complete( bool pendingAction )
 
 }
 
-void KHTMLView::slotMouseScrollTimer()
+void TDEHTMLView::slotMouseScrollTimer()
 {
     scrollBy( d->m_mouseScroll_byX, d->m_mouseScroll_byY );
 }
 
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
 
 // ### the dependencies on static functions are a nightmare. just be
 // hacky and include the implementation here. Clean me up, please.
 
-#include "khtml_caret.cpp"
+#include "tdehtml_caret.cpp"
 
-void KHTMLView::initCaret(bool keepSelection)
+void TDEHTMLView::initCaret(bool keepSelection)
 {
 #if DEBUG_CARETMODE > 0
   kdDebug(6200) << "begin initCaret" << endl;
@@ -3713,7 +3713,7 @@ void KHTMLView::initCaret(bool keepSelection)
 #endif
 }
 
-bool KHTMLView::caretOverrides() const
+bool TDEHTMLView::caretOverrides() const
 {
     bool cm = m_part->isCaretMode();
     bool dm = m_part->isEditable();
@@ -3722,7 +3722,7 @@ bool KHTMLView::caretOverrides() const
 	  && d->editorContext()->override;
 }
 
-void KHTMLView::ensureNodeHasFocus(NodeImpl *node)
+void TDEHTMLView::ensureNodeHasFocus(NodeImpl *node)
 {
   if (m_part->isCaretMode() || m_part->isEditable()) return;
   if (node->focused()) return;
@@ -3754,7 +3754,7 @@ void KHTMLView::ensureNodeHasFocus(NodeImpl *node)
   emit m_part->nodeActivated(Node(firstAncestor));
 }
 
-void KHTMLView::recalcAndStoreCaretPos(CaretBox *hintBox)
+void TDEHTMLView::recalcAndStoreCaretPos(CaretBox *hintBox)
 {
     if (!m_part || m_part->d->caretNode().isNull()) return;
     d->caretViewContext();
@@ -3795,13 +3795,13 @@ void KHTMLView::recalcAndStoreCaretPos(CaretBox *hintBox)
 #endif
 }
 
-void KHTMLView::caretOn()
+void TDEHTMLView::caretOn()
 {
     if (d->m_caretViewContext) {
         killTimer(d->m_caretViewContext->freqTimerId);
 
 	if (hasFocus() || d->m_caretViewContext->displayNonFocused
-			== KHTMLPart::CaretBlink) {
+			== TDEHTMLPart::CaretBlink) {
             d->m_caretViewContext->freqTimerId = startTimer(500);
 	} else {
 	    d->m_caretViewContext->freqTimerId = -1;
@@ -3810,7 +3810,7 @@ void KHTMLView::caretOn()
         d->m_caretViewContext->visible = true;
         if ((d->m_caretViewContext->displayed = (hasFocus()
 		|| d->m_caretViewContext->displayNonFocused
-			!= KHTMLPart::CaretInvisible))) {
+			!= TDEHTMLPart::CaretInvisible))) {
 	    updateContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
 	    		d->m_caretViewContext->width,
 			d->m_caretViewContext->height);
@@ -3819,7 +3819,7 @@ void KHTMLView::caretOn()
     }/*end if*/
 }
 
-void KHTMLView::caretOff()
+void TDEHTMLView::caretOff()
 {
     if (d->m_caretViewContext) {
         killTimer(d->m_caretViewContext->freqTimerId);
@@ -3835,7 +3835,7 @@ void KHTMLView::caretOff()
     }/*end if*/
 }
 
-void KHTMLView::showCaret(bool forceRepaint)
+void TDEHTMLView::showCaret(bool forceRepaint)
 {
     if (d->m_caretViewContext) {
         d->m_caretViewContext->displayed = true;
@@ -3854,7 +3854,7 @@ void KHTMLView::showCaret(bool forceRepaint)
     }/*end if*/
 }
 
-bool KHTMLView::foldSelectionToCaret(NodeImpl *startNode, long startOffset,
+bool TDEHTMLView::foldSelectionToCaret(NodeImpl *startNode, long startOffset,
     				NodeImpl *endNode, long endOffset)
 {
   m_part->d->m_selectionStart = m_part->d->m_selectionEnd = m_part->d->caretNode();
@@ -3871,7 +3871,7 @@ bool KHTMLView::foldSelectionToCaret(NodeImpl *startNode, long startOffset,
   return folded;
 }
 
-void KHTMLView::hideCaret()
+void TDEHTMLView::hideCaret()
 {
     if (d->m_caretViewContext) {
         if (d->m_caretViewContext->visible) {
@@ -3889,31 +3889,31 @@ void KHTMLView::hideCaret()
     }/*end if*/
 }
 
-int KHTMLView::caretDisplayPolicyNonFocused() const
+int TDEHTMLView::caretDisplayPolicyNonFocused() const
 {
   if (d->m_caretViewContext)
     return d->m_caretViewContext->displayNonFocused;
   else
-    return KHTMLPart::CaretInvisible;
+    return TDEHTMLPart::CaretInvisible;
 }
 
-void KHTMLView::setCaretDisplayPolicyNonFocused(int policy)
+void TDEHTMLView::setCaretDisplayPolicyNonFocused(int policy)
 {
   d->caretViewContext();
 //  int old = d->m_caretViewContext->displayNonFocused;
-  d->m_caretViewContext->displayNonFocused = (KHTMLPart::CaretDisplayPolicy)policy;
+  d->m_caretViewContext->displayNonFocused = (TDEHTMLPart::CaretDisplayPolicy)policy;
 
   // make change immediately take effect if not focused
   if (!hasFocus()) {
     switch (d->m_caretViewContext->displayNonFocused) {
-      case KHTMLPart::CaretInvisible:
+      case TDEHTMLPart::CaretInvisible:
         hideCaret();
 	break;
-      case KHTMLPart::CaretBlink:
+      case TDEHTMLPart::CaretBlink:
 	if (d->m_caretViewContext->freqTimerId != -1) break;
 	d->m_caretViewContext->freqTimerId = startTimer(500);
 	// fall through
-      case KHTMLPart::CaretVisible:
+      case TDEHTMLPart::CaretVisible:
         d->m_caretViewContext->displayed = true;
         showCaret();
 	break;
@@ -3921,7 +3921,7 @@ void KHTMLView::setCaretDisplayPolicyNonFocused(int policy)
   }/*end if*/
 }
 
-bool KHTMLView::placeCaret(CaretBox *hintBox)
+bool TDEHTMLView::placeCaret(CaretBox *hintBox)
 {
   CaretViewContext *cv = d->caretViewContext();
   caretOff();
@@ -3941,7 +3941,7 @@ bool KHTMLView::placeCaret(CaretBox *hintBox)
   return false;
 }
 
-void KHTMLView::ensureCaretVisible()
+void TDEHTMLView::ensureCaretVisible()
 {
   CaretViewContext *cv = d->m_caretViewContext;
   if (!cv) return;
@@ -3949,7 +3949,7 @@ void KHTMLView::ensureCaretVisible()
   d->scrollBarMoved = false;
 }
 
-bool KHTMLView::extendSelection(NodeImpl *oldStartSel, long oldStartOfs,
+bool TDEHTMLView::extendSelection(NodeImpl *oldStartSel, long oldStartOfs,
 				NodeImpl *oldEndSel, long oldEndOfs)
 {
   bool changed = false;
@@ -4001,7 +4001,7 @@ bool KHTMLView::extendSelection(NodeImpl *oldStartSel, long oldStartOfs,
   return changed;
 }
 
-void KHTMLView::updateSelection(NodeImpl *oldStartSel, long oldStartOfs,
+void TDEHTMLView::updateSelection(NodeImpl *oldStartSel, long oldStartOfs,
 				NodeImpl *oldEndSel, long oldEndOfs)
 {
   if (m_part->d->m_selectionStart == m_part->d->m_selectionEnd
@@ -4035,7 +4035,7 @@ void KHTMLView::updateSelection(NodeImpl *oldStartSel, long oldStartOfs,
   }/*end if*/
 }
 
-void KHTMLView::caretKeyPressEvent(TQKeyEvent *_ke)
+void TDEHTMLView::caretKeyPressEvent(TQKeyEvent *_ke)
 {
   NodeImpl *oldStartSel = m_part->d->m_selectionStart.handle();
   long oldStartOfs = m_part->d->m_startOffset;
@@ -4112,7 +4112,7 @@ void KHTMLView::caretKeyPressEvent(TQKeyEvent *_ke)
   _ke->accept();
 }
 
-bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel)
+bool TDEHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel)
 {
   if (!node) return false;
   ElementImpl *baseElem = determineBaseElement(node);
@@ -4128,7 +4128,7 @@ bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel)
   CaretBoxIterator cbit;
   CaretBoxLine *cbl = findCaretBoxLine(node, offset, &cblDeleter, base, r_ofs, cbit);
   if(!cbl) {
-      kdWarning() << "KHTMLView::moveCaretTo - findCaretBoxLine() returns NULL" << endl;
+      kdWarning() << "TDEHTMLView::moveCaretTo - findCaretBoxLine() returns NULL" << endl;
       return false;
   }
 
@@ -4187,7 +4187,7 @@ bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel)
   return selChanged;
 }
 
-void KHTMLView::moveCaretByLine(bool next, int count)
+void TDEHTMLView::moveCaretByLine(bool next, int count)
 {
   Node &caretNodeRef = m_part->d->caretNode();
   if (caretNodeRef.isNull()) return;
@@ -4218,7 +4218,7 @@ void KHTMLView::moveCaretByLine(bool next, int count)
   placeCaretOnLine(caretBox, x, absx, absy);
 }
 
-void KHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy)
+void TDEHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy)
 {
   // paranoia sanity check
   if (!caretBox) return;
@@ -4313,7 +4313,7 @@ void KHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy)
   caretOn();
 }
 
-void KHTMLView::moveCaretToLineBoundary(bool end)
+void TDEHTMLView::moveCaretToLineBoundary(bool end)
 {
   Node &caretNodeRef = m_part->d->caretNode();
   if (caretNodeRef.isNull()) return;
@@ -4343,7 +4343,7 @@ void KHTMLView::moveCaretToLineBoundary(bool end)
   placeCaretOnLine(b, x, absx, absy);
 }
 
-void KHTMLView::moveCaretToDocumentBoundary(bool end)
+void TDEHTMLView::moveCaretToDocumentBoundary(bool end)
 {
   Node &caretNodeRef = m_part->d->caretNode();
   if (caretNodeRef.isNull()) return;
@@ -4373,7 +4373,7 @@ void KHTMLView::moveCaretToDocumentBoundary(bool end)
   placeCaretOnLine(b, x, absx, absy);
 }
 
-void KHTMLView::moveCaretBy(bool next, CaretMovement cmv, int count)
+void TDEHTMLView::moveCaretBy(bool next, CaretMovement cmv, int count)
 {
   if (!m_part) return;
   Node &caretNodeRef = m_part->d->caretNode();
@@ -4421,7 +4421,7 @@ void KHTMLView::moveCaretBy(bool next, CaretMovement cmv, int count)
   placeCaretOnChar(hintBox);
 }
 
-void KHTMLView::placeCaretOnChar(CaretBox *hintBox)
+void TDEHTMLView::placeCaretOnChar(CaretBox *hintBox)
 {
   caretOff();
   recalcAndStoreCaretPos(hintBox);
@@ -4436,7 +4436,7 @@ void KHTMLView::placeCaretOnChar(CaretBox *hintBox)
   caretOn();
 }
 
-void KHTMLView::moveCaretByPage(bool next)
+void TDEHTMLView::moveCaretByPage(bool next)
 {
   Node &caretNodeRef = m_part->d->caretNode();
   if (caretNodeRef.isNull()) return;
@@ -4465,47 +4465,47 @@ void KHTMLView::moveCaretByPage(bool next)
   placeCaretOnLine(caretBox, x, absx, absy);
 }
 
-void KHTMLView::moveCaretPrevWord()
+void TDEHTMLView::moveCaretPrevWord()
 {
   moveCaretBy(false, CaretByWord, 1);
 }
 
-void KHTMLView::moveCaretNextWord()
+void TDEHTMLView::moveCaretNextWord()
 {
   moveCaretBy(true, CaretByWord, 1);
 }
 
-void KHTMLView::moveCaretPrevLine(int n)
+void TDEHTMLView::moveCaretPrevLine(int n)
 {
   moveCaretByLine(false, n);
 }
 
-void KHTMLView::moveCaretNextLine(int n)
+void TDEHTMLView::moveCaretNextLine(int n)
 {
   moveCaretByLine(true, n);
 }
 
-void KHTMLView::moveCaretPrevPage()
+void TDEHTMLView::moveCaretPrevPage()
 {
   moveCaretByPage(false);
 }
 
-void KHTMLView::moveCaretNextPage()
+void TDEHTMLView::moveCaretNextPage()
 {
   moveCaretByPage(true);
 }
 
-void KHTMLView::moveCaretToLineBegin()
+void TDEHTMLView::moveCaretToLineBegin()
 {
   moveCaretToLineBoundary(false);
 }
 
-void KHTMLView::moveCaretToLineEnd()
+void TDEHTMLView::moveCaretToLineEnd()
 {
   moveCaretToLineBoundary(true);
 }
 
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 
 #ifndef NO_SMOOTH_SCROLL_HACK
 #define timer timer2
@@ -4515,9 +4515,9 @@ static const int SCROLL_TIME = 240;
 // Each step is 20 ms == 50 frames/second
 static const int SCROLL_TICK = 20;
 
-void KHTMLView::scrollBy(int dx, int dy)
+void TDEHTMLView::scrollBy(int dx, int dy)
 {
-    KConfigGroup cfg( KGlobal::config(), "KDE" );
+    TDEConfigGroup cfg( TDEGlobal::config(), "KDE" );
     if( !cfg.readBoolEntry( "SmoothScrolling", false )) {
         TQScrollView::scrollBy( dx, dy );
         return;
@@ -4552,7 +4552,7 @@ void KHTMLView::scrollBy(int dx, int dy)
     }
 }
 
-void KHTMLView::scrollTick() {
+void TDEHTMLView::scrollTick() {
     if (d->dx == 0 && d->dy == 0) {
         stopScrolling();
         return;
@@ -4586,13 +4586,13 @@ void KHTMLView::scrollTick() {
     kapp->syncX();
 }
 
-void KHTMLView::startScrolling()
+void TDEHTMLView::startScrolling()
 {
     d->scrolling = true;
     d->timer.start(SCROLL_TICK, false);
 }
 
-void KHTMLView::stopScrolling()
+void TDEHTMLView::stopScrolling()
 {
     d->timer.stop();
     d->dx = d->dy = 0;
@@ -4600,7 +4600,7 @@ void KHTMLView::stopScrolling()
 }
 
 // Overloaded from TQScrollView and TQScrollBar
-void KHTMLView::scrollViewWheelEvent( TQWheelEvent *e )
+void TDEHTMLView::scrollViewWheelEvent( TQWheelEvent *e )
 {
     int pageStep = verticalScrollBar()->pageStep();
     int lineStep = verticalScrollBar()->lineStep();
diff --git a/khtml/khtmlview.h b/tdehtml/tdehtmlview.h
index 45d90b09f..f67f712f0 100644
--- a/khtml/khtmlview.h
+++ b/tdehtml/tdehtmlview.h
@@ -22,8 +22,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KHTMLVIEW_H
-#define KHTMLVIEW_H
+#ifndef TDEHTMLVIEW_H
+#define TDEHTMLVIEW_H
 
 // qt includes and classes
 #include <tqscrollview.h>
@@ -54,7 +54,7 @@ namespace KJS {
     class ExternalFunc;
 }
 
-namespace khtml {
+namespace tdehtml {
     class RenderObject;
     class RenderCanvas;
     class RenderStyle;
@@ -67,15 +67,15 @@ namespace khtml {
     void applyRule(DOM::CSSProperty *prop);
 }
 
-class KHTMLPart;
-class KHTMLViewPrivate;
+class TDEHTMLPart;
+class TDEHTMLViewPrivate;
 
 /**
  * Renders and displays HTML in a TQScrollView.
  *
  * Suitable for use as an application's main view.
  **/
-class KHTML_EXPORT KHTMLView : public TQScrollView
+class TDEHTML_EXPORT TDEHTMLView : public TQScrollView
 {
     Q_OBJECT
 
@@ -86,31 +86,31 @@ class KHTML_EXPORT KHTMLView : public TQScrollView
     friend class DOM::HTMLAnchorElementImpl;
     friend class DOM::HTMLInputElementImpl;
     friend class DOM::DocumentImpl;
-    friend class KHTMLPart;
-    friend class khtml::RenderCanvas;
-    friend class khtml::RenderObject;
-    friend class khtml::RenderLineEdit;
-    friend class khtml::RenderPartObject;
-    friend class khtml::RenderWidget;
-    friend class khtml::CSSStyleSelector;
-    friend class khtml::LineEditWidget;
+    friend class TDEHTMLPart;
+    friend class tdehtml::RenderCanvas;
+    friend class tdehtml::RenderObject;
+    friend class tdehtml::RenderLineEdit;
+    friend class tdehtml::RenderPartObject;
+    friend class tdehtml::RenderWidget;
+    friend class tdehtml::CSSStyleSelector;
+    friend class tdehtml::LineEditWidget;
     friend class KJS::WindowFunc;
     friend class KJS::ExternalFunc;
-    friend void khtml::applyRule(DOM::CSSProperty *prop);
+    friend void tdehtml::applyRule(DOM::CSSProperty *prop);
 
 
 public:
     /**
-     * Constructs a KHTMLView.
+     * Constructs a TDEHTMLView.
      */
-    KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name=0 );
-    virtual ~KHTMLView();
+    TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name=0 );
+    virtual ~TDEHTMLView();
 
     /**
-     * Returns a pointer to the KHTMLPart that is
+     * Returns a pointer to the TDEHTMLPart that is
      * rendering the page.
      **/
-    KHTMLPart *part() const { return m_part; }
+    TDEHTMLPart *part() const { return m_part; }
 
     int frameWidth() const { return _width; }
 
@@ -173,7 +173,7 @@ public:
 signals:
     /**
      * This signal is used for internal layouting. Don't use it to check if rendering finished.
-     * Use @ref KHTMLPart completed() signal instead.
+     * Use @ref TDEHTMLPart completed() signal instead.
      */
     void finishedLayout();
     void cleared();
@@ -248,7 +248,7 @@ private slots:
 
 private:
 
-    void scheduleRelayout(khtml::RenderObject* clippedObj=0);
+    void scheduleRelayout(tdehtml::RenderObject* clippedObj=0);
     void unscheduleRelayout();
 
     void scheduleRepaint(int x, int y, int w, int h, bool asap=false);
@@ -296,9 +296,9 @@ private:
 
     bool focusNextPrevNode(bool next);
     bool handleAccessKey(const TQKeyEvent* ev);
-    bool focusNodeWithAccessKey(TQChar c, KHTMLView* caller = NULL);
+    bool focusNodeWithAccessKey(TQChar c, TDEHTMLView* caller = NULL);
     TQMap< DOM::ElementImpl*, TQChar > buildFallbackAccessKeys() const;
-    void displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQValueVector< TQChar >& taken, bool use_fallbacks );
+    void displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview, TQValueVector< TQChar >& taken, bool use_fallbacks );
 
     void useSlowRepaints();
 
@@ -328,13 +328,13 @@ private:
 
     void complete( bool pendingAction );
 
-#ifndef KHTML_NO_TYPE_AHEAD_FIND
+#ifndef TDEHTML_NO_TYPE_AHEAD_FIND
     void findAhead(bool increase);
     void updateFindAheadTimeout();
     void startFindAhead( bool linksOnly );
-#endif // KHTML_NO_TYPE_AHEAD_FIND
+#endif // TDEHTML_NO_TYPE_AHEAD_FIND
 
-#ifndef KHTML_NO_CARET
+#ifndef TDEHTML_NO_CARET
     // -- caret-related member functions (for caretMode as well as designMode)
 
     /** initializes the caret if it hasn't been initialized yet.
@@ -365,7 +365,7 @@ private:
      * @param hintBox caret box whose coordinates will be used if the
      * caret position could not be determined otherwise.
      */
-    void recalcAndStoreCaretPos(khtml::CaretBox *hintBox = 0);
+    void recalcAndStoreCaretPos(tdehtml::CaretBox *hintBox = 0);
     /** displays the caret and reinitializes the blink frequency timer.
      *
      * The caret will only be displayed on screen if the view has focus, or
@@ -428,7 +428,7 @@ private:
      * caret position could not be determined otherwise.
      * @return @p true if the caret has been displayed.
      */
-    bool placeCaret(khtml::CaretBox *hintBox = 0);
+    bool placeCaret(tdehtml::CaretBox *hintBox = 0);
 
     /** extends the selection up to the current caret position.
      *
@@ -463,14 +463,14 @@ private:
 
     /**
      * Returns the current caret policy when the view is not focused.
-     * @return a KHTMLPart::CaretDisplay value
+     * @return a TDEHTMLPart::CaretDisplay value
      */
     int caretDisplayPolicyNonFocused() const;
 
     /**
      * Sets the caret display policy when the view is not focused.
      * @param policy new display policy as
-     *		defined by KHTMLPart::CaretDisplayPolicy
+     *		defined by TDEHTMLPart::CaretDisplayPolicy
      * @since 3.2
      */
     void setCaretDisplayPolicyNonFocused(int policy);
@@ -540,7 +540,7 @@ private:
      * @param hintBox caret box whose coordinates will be used if the
      * caret position could not be determined otherwise.
      */
-    void placeCaretOnChar(khtml::CaretBox *hintBox);
+    void placeCaretOnChar(tdehtml::CaretBox *hintBox);
 
     /** does the actual caret placement so that it becomes visible at
      * the new position.
@@ -558,7 +558,7 @@ private:
      * @param absy absolute y-coordinate of containing block, needed for
      *		calculation of final caret position
      */
-    void placeCaretOnLine(khtml::CaretBox *caretBox, int x, int absx, int absy);
+    void placeCaretOnLine(tdehtml::CaretBox *caretBox, int x, int absx, int absy);
 
     /** moves the caret by a page length.
      * @param next @p true, move down, @p false, move up.
@@ -601,12 +601,12 @@ private:
      */
     void moveCaretToLineEnd();
 
-#endif // KHTML_NO_CARET
+#endif // TDEHTML_NO_CARET
 
     // ------------------------------------- member variables ------------------------------------
  private:
 
-    void setWidgetVisible(::khtml::RenderWidget*, bool visible);
+    void setWidgetVisible(::tdehtml::RenderWidget*, bool visible);
 
     int _width;
     int _height;
@@ -614,8 +614,8 @@ private:
     int _marginWidth;
     int _marginHeight;
 
-    KHTMLPart *m_part;
-    KHTMLViewPrivate *d;
+    TDEHTMLPart *m_part;
+    TDEHTMLViewPrivate *d;
 
     TQString m_medium;   // media type
 };
diff --git a/khtml/kmultipart/CMakeLists.txt b/tdehtml/tdemultipart/CMakeLists.txt
index 3f07007bd..6ae8c8d0e 100644
--- a/khtml/kmultipart/CMakeLists.txt
+++ b/tdehtml/tdemultipart/CMakeLists.txt
@@ -15,12 +15,12 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 link_directories(
@@ -30,19 +30,19 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kmultipart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdemultipart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libkmultipart #############################
+##### libtdemultipart #############################
 
-set( target libkmultipart )
+set( target libtdemultipart )
 
 set( ${target}_SRCS
-  kmultipart.cpp
+  tdemultipart.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK httpfilter-static kparts-shared
+  LINK httpfilter-static tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am
new file mode 100644
index 000000000..ae33efd01
--- /dev/null
+++ b/tdehtml/tdemultipart/Makefile.am
@@ -0,0 +1,17 @@
+INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcdir)/tdeutils $(all_includes)
+
+# These are not really libraries, but modules dynamically opened.
+# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity
+kde_module_LTLIBRARIES = libtdemultipart.la
+
+libtdemultipart_la_SOURCES = tdemultipart.cpp
+libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ)
+libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS)
+libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+
+# Automatically generate moc files
+METASOURCES = AUTO
+
+# Install the .desktop file into the kde_services directory
+kde_services_DATA = tdemultipart.desktop
+
diff --git a/khtml/kmultipart/README b/tdehtml/tdemultipart/README
index c8a342d68..0fd6eb306 100644
--- a/khtml/kmultipart/README
+++ b/tdehtml/tdemultipart/README
@@ -1,4 +1,4 @@
-KMultiPart implements "server push" for KHTML/Konqueror:
+KMultiPart implements "server push" for TDEHTML/Konqueror:
 it handles the multipart/mixed and multipart/x-mixed-replace
 mimetype, embedding the appropriate component (part).
 
@@ -11,6 +11,6 @@ Testcases:
 
 TODO:
 * Use the new streaming API of KParts to pipe data into the part,
-the current code does that for KHTML only.
-* Change KHTML so that it embeds KMultiPart for images which send multipart/x-mixed-replace
+the current code does that for TDEHTML only.
+* Change TDEHTML so that it embeds KMultiPart for images which send multipart/x-mixed-replace
 data.
diff --git a/khtml/kmultipart/kmultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index 55f37f397..201f1ef60 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -17,25 +17,25 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kmultipart.h"
+#include "tdemultipart.h"
 
 #include <tqvbox.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
-#include <kio/job.h>
+#include <tdelocale.h>
+#include <tdeio/job.h>
 #include <tqfile.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
-#include <kparts/componentfactory.h>
-#include <kparts/genericfactory.h>
-#include <khtml_part.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/genericfactory.h>
+#include <tdehtml_part.h>
 #include <unistd.h>
 #include <kxmlguifactory.h>
 #include <tqtimer.h>
 
 typedef KParts::GenericFactory<KMultiPart> KMultiPartFactory; // factory for the part
-K_EXPORT_COMPONENT_FACTORY( libkmultipart /*library name*/, KMultiPartFactory )
+K_EXPORT_COMPONENT_FACTORY( libtdemultipart /*library name*/, KMultiPartFactory )
 
 //#define DEBUG_PARSING
 
@@ -163,14 +163,14 @@ bool KMultiPart::openURL( const KURL &url )
     // Hmm, args.reload is set to true when reloading, but this doesn't seem to be enough...
     // I get "HOLD: Reusing held slave for <url>", and the old data
 
-    m_job = KIO::get( url, args.reload, false );
+    m_job = TDEIO::get( url, args.reload, false );
 
     emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage
 
-    connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( slotJobFinished( KIO::Job * ) ) );
-    connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-             this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
+    connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) );
+    connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
 
     m_numberOfFrames = 0;
     m_numberOfFramesSkipped = 0;
@@ -184,7 +184,7 @@ bool KMultiPart::openURL( const KURL &url )
 // Yes, libtdenetwork's has such a parser already (MultiPart),
 // but it works on the complete string, expecting the whole data to be available....
 // The version here is asynchronous.
-void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
+void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data )
 {
     if (m_boundary.isNull())
     {
@@ -260,7 +260,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
 #endif
                     startOfData();
                 }
-                // First header (when we know it from kio_http)
+                // First header (when we know it from tdeio_http)
                 else if ( line == m_boundary )
                     ; // nothing to do
                 else if ( !line.isEmpty() ) // this happens with e.g. Set-Cookie:
@@ -334,7 +334,7 @@ void KMultiPart::setPart( const TQString& mimeType )
     {
 
         // Forward signals from the part's browser extension
-        // this is very related (but not exactly like) KHTMLPart::processObjectRequest
+        // this is very related (but not exactly like) TDEHTMLPart::processObjectRequest
 
         connect( childExtension, TQT_SIGNAL( openURLNotify() ),
                  m_extension, TQT_SIGNAL( openURLNotify() ) );
@@ -347,7 +347,7 @@ void KMultiPart::setPart( const TQString& mimeType )
         connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
                  m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
 
-        // Keep in sync with khtml_part.cpp
+        // Keep in sync with tdehtml_part.cpp
         connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
                  m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
         connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
@@ -396,7 +396,7 @@ void KMultiPart::setPart( const TQString& mimeType )
 
     m_partIsLoading = false;
     // Load the part's plugins too.
-    // ###### This is a hack. The bug is that KHTMLPart doesn't load its plugins
+    // ###### This is a hack. The bug is that TDEHTMLPart doesn't load its plugins
     // if className != "Browser/View".
     loadPlugins( this, m_part, m_part->instance() );
     // Get the part's GUI to appear
@@ -437,7 +437,7 @@ void KMultiPart::startOfData()
     }
     if ( m_isHTMLPart )
     {
-        KHTMLPart* htmlPart = static_cast<KHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) );
+        TDEHTMLPart* htmlPart = static_cast<TDEHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) );
         htmlPart->begin( url() );
     }
     else
@@ -463,7 +463,7 @@ void KMultiPart::reallySendData( const TQByteArray& line )
 {
     if ( m_isHTMLPart )
     {
-        KHTMLPart* htmlPart = static_cast<KHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) );
+        TDEHTMLPart* htmlPart = static_cast<TDEHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) );
         htmlPart->write( line.data(), line.size() );
     }
     else if ( m_tempFile )
@@ -477,7 +477,7 @@ void KMultiPart::endOfData()
     Q_ASSERT( m_part );
     if ( m_isHTMLPart )
     {
-        KHTMLPart* htmlPart = static_cast<KHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) );
+        TDEHTMLPart* htmlPart = static_cast<TDEHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) );
         htmlPart->end();
     } else if ( m_tempFile )
     {
@@ -533,20 +533,20 @@ void KMultiPart::guiActivateEvent( KParts::GUIActivateEvent * )
     //    m_part->guiActivateEvent( e );
 }
 
-void KMultiPart::slotJobFinished( KIO::Job *job )
+void KMultiPart::slotJobFinished( TDEIO::Job *job )
 {
     if ( job->error() )
     {
-        // TODO use khtml's error:// scheme
+        // TODO use tdehtml's error:// scheme
         job->showErrorDialog();
         emit canceled( job->errorString() );
     }
     else
     {
-        /*if ( m_khtml->view()->contentsY() == 0 )
+        /*if ( m_tdehtml->view()->contentsY() == 0 )
         {
             KParts::URLArgs args = m_ext->urlArgs();
-            m_khtml->view()->setContentsPos( args.xOffset, args.yOffset );
+            m_tdehtml->view()->setContentsPos( args.xOffset, args.yOffset );
         }*/
 
         emit completed();
@@ -571,12 +571,12 @@ void KMultiPart::slotProgressInfo()
     emit m_extension->infoMessage( str );
 }
 
-KAboutData* KMultiPart::createAboutData()
+TDEAboutData* KMultiPart::createAboutData()
 {
-    KAboutData* aboutData = new KAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
+    TDEAboutData* aboutData = new TDEAboutData( "tdemultipart", I18N_NOOP("KMultiPart"),
                                              "0.1",
                                             I18N_NOOP( "Embeddable component for multipart/mixed" ),
-                                             KAboutData::License_GPL,
+                                             TDEAboutData::License_GPL,
                                              "(c) 2001, David Faure <david@mandrakesoft.com>");
     return aboutData;
 }
@@ -600,14 +600,14 @@ int KMultiPartBrowserExtension::yOffset()
 
 void KMultiPartBrowserExtension::print()
 {
-    static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print();
+    static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print();
 }
 
 void KMultiPartBrowserExtension::reparseConfiguration()
 {
-    static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration();
+    static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration();
     m_imgPart->doc()->setAutoloadImages( true );
 }
 #endif
 
-#include "kmultipart.moc"
+#include "tdemultipart.moc"
diff --git a/khtml/kmultipart/kmultipart.desktop b/tdehtml/tdemultipart/tdemultipart.desktop
index 0dbfd06f7..d5808d928 100644
--- a/khtml/kmultipart/kmultipart.desktop
+++ b/tdehtml/tdemultipart/tdemultipart.desktop
@@ -70,4 +70,4 @@ Name[zh_CN]=�嵌入的 multipart/mixed 组件
 Name[zh_HK]=multipart/mixed 的�嵌入元件
 Name[zh_TW]=multipart/mixed 的�嵌入元件
 ServiceTypes=KParts/ReadOnlyPart
-X-TDE-Library=libkmultipart
+X-TDE-Library=libtdemultipart
diff --git a/khtml/kmultipart/kmultipart.h b/tdehtml/tdemultipart/tdemultipart.h
index f3bf95219..de309eef1 100644
--- a/khtml/kmultipart/kmultipart.h
+++ b/tdehtml/tdemultipart/tdemultipart.h
@@ -17,19 +17,19 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kmultipart_h__
-#define __kmultipart_h__
+#ifndef __tdemultipart_h__
+#define __tdemultipart_h__
 
 #include <httpfilter/httpfilter.h>
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
-#include <kaboutdata.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeaboutdata.h>
 #include <tqdatetime.h>
 
-class KHTMLPart;
-class KInstance;
+class TDEHTMLPart;
+class TDEInstance;
 class KTempFile;
 class KLineParser;
 
@@ -49,7 +49,7 @@ public:
 
     virtual bool closeURL();
 
-    static KAboutData* createAboutData();
+    static TDEAboutData* createAboutData();
 
 protected:
     virtual void guiActivateEvent( KParts::GUIActivateEvent *e );
@@ -62,8 +62,8 @@ protected:
 private slots:
     void reallySendData( const TQByteArray& line );
     //void slotPopupMenu( KXMLGUIClient *cl, const TQPoint &pos, const KURL &u, const TQString &mime, mode_t mode );
-    void slotJobFinished( KIO::Job *job );
-    void slotData( KIO::Job *, const TQByteArray & );
+    void slotJobFinished( TDEIO::Job *job );
+    void slotData( TDEIO::Job *, const TQByteArray & );
     //void updateWindowCaption();
 
     void slotPartCompleted();
@@ -77,7 +77,7 @@ private:
     TQGuardedPtr<KParts::ReadOnlyPart> m_part;
     bool m_isHTMLPart;
     bool m_partIsLoading;
-    KIO::Job* m_job;
+    TDEIO::Job* m_job;
     TQCString m_boundary;
     int m_boundaryLength;
     TQString m_mimeType; // the one handled by m_part - store the kservice instead?
diff --git a/khtml/test/README b/tdehtml/test/README
index 2ffc4a940..9ab2df3c4 100644
--- a/khtml/test/README
+++ b/tdehtml/test/README
@@ -1,6 +1,6 @@
-The contents of this directory will be moved to the toplevel directory khtmltests
+The contents of this directory will be moved to the toplevel directory tdehtmltests
 
 PLEASE DO NOT POST TEST CASES HERE ANY MORE
 
 
-See  khtmltests/README
+See  tdehtmltests/README
diff --git a/khtml/test/align.html b/tdehtml/test/align.html
index ab663bf42..ab663bf42 100644
--- a/khtml/test/align.html
+++ b/tdehtml/test/align.html
diff --git a/khtml/test/align1.html b/tdehtml/test/align1.html
index f288b52ef..f288b52ef 100644
--- a/khtml/test/align1.html
+++ b/tdehtml/test/align1.html
diff --git a/khtml/test/align2.html b/tdehtml/test/align2.html
index 56f3feb70..56f3feb70 100644
--- a/khtml/test/align2.html
+++ b/tdehtml/test/align2.html
diff --git a/khtml/test/anchor1.html b/tdehtml/test/anchor1.html
index 4dfb26134..4dfb26134 100644
--- a/khtml/test/anchor1.html
+++ b/tdehtml/test/anchor1.html
diff --git a/khtml/test/anchor2.html b/tdehtml/test/anchor2.html
index 4f54e83f9..4f54e83f9 100644
--- a/khtml/test/anchor2.html
+++ b/tdehtml/test/anchor2.html
diff --git a/khtml/test/button.html b/tdehtml/test/button.html
index b9c3ae177..b9c3ae177 100644
--- a/khtml/test/button.html
+++ b/tdehtml/test/button.html
diff --git a/khtml/test/color.html b/tdehtml/test/color.html
index ff5617214..ff5617214 100644
--- a/khtml/test/color.html
+++ b/tdehtml/test/color.html
diff --git a/khtml/test/fixed-background.html b/tdehtml/test/fixed-background.html
index 754a6987f..a1cdaec81 100644
--- a/khtml/test/fixed-background.html
+++ b/tdehtml/test/fixed-background.html
@@ -20,7 +20,7 @@ Now follows a short listing, after the listing the text
 
 #include <stdio.h>
 #include <stdarg.h>
-#include "khtml.h"
+#include "tdehtml.h"
 
 #ifdef MARTINSDEBUG
 void debugM( const char *msg, ...)
diff --git a/khtml/test/image.gif b/tdehtml/test/image.gif
index ba019efb8..ba019efb8 100644
--- a/khtml/test/image.gif
+++ b/tdehtml/test/image.gif
diff --git a/khtml/test/image_map.html b/tdehtml/test/image_map.html
index 21e002382..21e002382 100644
--- a/khtml/test/image_map.html
+++ b/tdehtml/test/image_map.html
diff --git a/khtml/test/java.html b/tdehtml/test/java.html
index dfe8d698a..dfe8d698a 100644
--- a/khtml/test/java.html
+++ b/tdehtml/test/java.html
diff --git a/khtml/test/jsplugins.html b/tdehtml/test/jsplugins.html
index 7af7a25f7..7af7a25f7 100644
--- a/khtml/test/jsplugins.html
+++ b/tdehtml/test/jsplugins.html
diff --git a/khtml/test/konqi.gif b/tdehtml/test/konqi.gif
index b80293aa9..b80293aa9 100644
--- a/khtml/test/konqi.gif
+++ b/tdehtml/test/konqi.gif
diff --git a/khtml/test/lake.class b/tdehtml/test/lake.class
index 3196702b1..3196702b1 100644
--- a/khtml/test/lake.class
+++ b/tdehtml/test/lake.class
diff --git a/khtml/test/lists.html b/tdehtml/test/lists.html
index 8f781653c..8f781653c 100644
--- a/khtml/test/lists.html
+++ b/tdehtml/test/lists.html
diff --git a/khtml/test/nav_bar.gif b/tdehtml/test/nav_bar.gif
index 174348da4..174348da4 100644
--- a/khtml/test/nav_bar.gif
+++ b/tdehtml/test/nav_bar.gif
diff --git a/khtml/test/nbsp.html b/tdehtml/test/nbsp.html
index 7a8bde9de..7a8bde9de 100644
--- a/khtml/test/nbsp.html
+++ b/tdehtml/test/nbsp.html
diff --git a/khtml/test/object.html b/tdehtml/test/object.html
index 91da9f575..91da9f575 100644
--- a/khtml/test/object.html
+++ b/tdehtml/test/object.html
diff --git a/khtml/test/pseudo.html b/tdehtml/test/pseudo.html
index caba3bfee..caba3bfee 100644
--- a/khtml/test/pseudo.html
+++ b/tdehtml/test/pseudo.html
diff --git a/khtml/test/testpages.html b/tdehtml/test/testpages.html
index e117a7db9..e117a7db9 100644
--- a/khtml/test/testpages.html
+++ b/tdehtml/test/testpages.html
diff --git a/khtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 069ade04f..62842e086 100644
--- a/khtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -30,7 +30,7 @@
 #include <pwd.h>
 #include <signal.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqimage.h>
 #include <tqfile.h>
@@ -42,7 +42,7 @@
 #include <dom_string.h>
 #include "rendering/render_style.h"
 #include "rendering/render_layer.h"
-#include "khtmldefaults.h"
+#include "tdehtmldefaults.h"
 
 //We don't use the default fonts, though, but traditional testregression ones
 #undef HTML_DEFAULT_VIEW_FONT
@@ -59,13 +59,13 @@
 #define HTML_DEFAULT_VIEW_FANTASY_FONT "helvetica"
 
 
-#include <kaction.h>
-#include <kcmdlineargs.h>
-#include "khtml_factory.h"
-#include <kio/job.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdecmdlineargs.h>
+#include "tdehtml_factory.h"
+#include <tdeio/job.h>
+#include <tdemainwindow.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqcolor.h>
 #include <tqcursor.h>
@@ -87,11 +87,11 @@
 #include "dom/dom_exception.h"
 #include "dom/html_document.h"
 #include "html/htmltokenizer.h"
-#include "khtml_part.h"
-#include "khtmlpart_p.h"
-#include <kparts/browserextension.h>
+#include "tdehtml_part.h"
+#include "tdehtmlpart_p.h"
+#include <tdeparts/browserextension.h>
 
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 #include "rendering/render_replaced.h"
 #include "xml/dom_docimpl.h"
 #include "html/html_baseimpl.h"
@@ -103,7 +103,7 @@
 #include "ecma/kjs_binding.h"
 #include "ecma/kjs_proxy.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 using namespace KJS;
 
@@ -114,7 +114,7 @@ static pid_t xvfb;
 
 PartMonitor *PartMonitor::sm_highestMonitor = NULL;
 
-PartMonitor::PartMonitor(KHTMLPart *_part)
+PartMonitor::PartMonitor(TDEHTMLPart *_part)
 {
     m_part = _part;
     m_completed = false;
@@ -271,19 +271,19 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar
 
 // -------------------------------------------------------------------------
 
-KHTMLPartObject::KHTMLPartObject(ExecState *exec, KHTMLPart *_part)
+TDEHTMLPartObject::TDEHTMLPartObject(ExecState *exec, TDEHTMLPart *_part)
 {
     m_part = _part;
-    putDirect("openPage", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::OpenPage,1), DontEnum);
-    putDirect("openPageAsUrl", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::OpenPageAsUrl,1), DontEnum);
-    putDirect("begin",     new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::Begin,1), DontEnum);
-    putDirect("write",    new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::Write,1), DontEnum);
-    putDirect("end",    new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::End,0), DontEnum);
-    putDirect("executeScript", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::ExecuteScript,0), DontEnum);
-    putDirect("processEvents", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::ProcessEvents,0), DontEnum);
+    putDirect("openPage", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::OpenPage,1), DontEnum);
+    putDirect("openPageAsUrl", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::OpenPageAsUrl,1), DontEnum);
+    putDirect("begin",     new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::Begin,1), DontEnum);
+    putDirect("write",    new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::Write,1), DontEnum);
+    putDirect("end",    new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::End,0), DontEnum);
+    putDirect("executeScript", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::ExecuteScript,0), DontEnum);
+    putDirect("processEvents", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::ProcessEvents,0), DontEnum);
 }
 
-Value KHTMLPartObject::get(ExecState *exec, const Identifier &propertyName) const
+Value TDEHTMLPartObject::get(ExecState *exec, const Identifier &propertyName) const
 {
     if (propertyName == "document")
         return getDOMNode(exec,m_part->document());
@@ -293,19 +293,19 @@ Value KHTMLPartObject::get(ExecState *exec, const Identifier &propertyName) cons
         return ObjectImp::get(exec,propertyName);
 }
 
-KHTMLPartFunction::KHTMLPartFunction(ExecState */*exec*/, KHTMLPart *_part, int _id, int length)
+TDEHTMLPartFunction::TDEHTMLPartFunction(ExecState */*exec*/, TDEHTMLPart *_part, int _id, int length)
 {
     m_part = _part;
     id = _id;
     putDirect("length",length);
 }
 
-bool KHTMLPartFunction::implementsCall() const
+bool TDEHTMLPartFunction::implementsCall() const
 {
     return true;
 }
 
-Value KHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List &args)
+Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List &args)
 {
     Value result = Undefined();
 
@@ -400,7 +400,7 @@ Value KHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List &
 
 // -------------------------------------------------------------------------
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "b", 0, 0 },
     { "base <base_dir>", "Directory containing tests, basedir and output directories.", 0},
@@ -419,7 +419,7 @@ static KCmdLineOptions options[] =
     { "output <directory>", "Put output in <directory> instead of <base_dir>/output", 0 } ,
     { "+[base_dir]", "Directory containing tests,basedir and output directories. Only regarded if -b is not specified.", 0 } ,
     { "+[testcases]", "Relative path to testcase, or directory of testcases to be run (equivalent to -t).", 0 } ,
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 static bool existsDir(TQCString dir)
@@ -449,16 +449,16 @@ int main(int argc, char *argv[])
     // workaround various Qt crashes by always enforcing a TrueColor visual
     TQApplication::setColorSpec( TQApplication::ManyColor );
 
-    KCmdLineArgs::init(argc, argv, "testregression", "TestRegression",
-                       "Regression tester for khtml", "1.0");
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, "testregression", "TestRegression",
+                       "Regression tester for tdehtml", "1.0");
+    TDECmdLineArgs::addCmdLineOptions(options);
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs( );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
 
     TQCString baseDir = args->getOption("base");
 
     if ( args->count() < 1 && baseDir.isEmpty() ) {
-	KCmdLineArgs::usage();
+	TDECmdLineArgs::usage();
 	::exit( 1 );
     }
 
@@ -479,7 +479,7 @@ int main(int argc, char *argv[])
 
     if (args->isSet("xvfb"))
     {
-        TQString xvfbPath = KStandardDirs::findExe("Xvfb");
+        TQString xvfbPath = TDEStandardDirs::findExe("Xvfb");
         if ( xvfbPath.isEmpty() ) {
             fprintf( stderr, "[test_regression] ERROR: We need Xvfb to be installed for reliable results\n" );
             exit( 1 );
@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
         setenv( "DISPLAY", ":47", 1 );
     }
 
-    KApplication a;
+    TDEApplication a;
     a.disableAutoDcopRegistration();
     a.setStyle( "windows" );
     KSimpleConfig sc1( "cryptodefaults" );
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
     a.config()->writeEntry( "kjscupguard_alarmhandler", true );
     a.config()->setGroup("HTML Settings");
     a.config()->writeEntry("ReportJSErrors", false);
-    KConfig cfg( "khtmlrc" );
+    TDEConfig cfg( "tdehtmlrc" );
     cfg.setGroup("HTML Settings");
     cfg.writeEntry( "StandardFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT );
     cfg.writeEntry( "FixedFont", HTML_DEFAULT_VIEW_FIXED_FONT );
@@ -534,7 +534,7 @@ int main(int argc, char *argv[])
     cfg.writeEntry( "Fonts", TQStringList() );
     cfg.writeEntry( "DefaultEncoding", "" );
     cfg.setGroup("Java/JavaScript Settings");
-    cfg.writeEntry( "WindowOpenPolicy", KHTMLSettings::KJSWindowOpenAllow);
+    cfg.writeEntry( "WindowOpenPolicy", TDEHTMLSettings::KJSWindowOpenAllow);
 
     cfg.sync();
 
@@ -557,9 +557,9 @@ int main(int argc, char *argv[])
     }
 
     // create widgets
-    KHTMLFactory *fac = new KHTMLFactory();
-    KMainWindow *toplevel = new KMainWindow();
-    KHTMLPart *part = new KHTMLPart( toplevel, 0, toplevel, 0, KHTMLPart::BrowserViewGUI );
+    TDEHTMLFactory *fac = new TDEHTMLFactory();
+    TDEMainWindow *toplevel = new TDEMainWindow();
+    TDEHTMLPart *part = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI );
 
     toplevel->setCentralWidget( part->widget() );
     part->setJScriptEnabled(true);
@@ -657,9 +657,9 @@ int main(int argc, char *argv[])
     delete toplevel;
     delete fac;
 
-    khtml::Cache::clear();
-    khtml::CSSStyleSelector::clear();
-    khtml::RenderStyle::cleanup();
+    tdehtml::Cache::clear();
+    tdehtml::CSSStyleSelector::clear();
+    tdehtml::RenderStyle::cleanup();
 
     kill( xvfb, SIGINT );
 
@@ -670,7 +670,7 @@ int main(int argc, char *argv[])
 
 RegressionTest *RegressionTest::curr = 0;
 
-RegressionTest::RegressionTest(KHTMLPart *part, const TQString &baseDir, const TQString &outputDir,
+RegressionTest::RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString &outputDir,
 			       bool _genOutput, bool runJS, bool runHTML)
   : TQObject(part)
 {
@@ -788,7 +788,7 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur
 
         alarm( 400 );
 
-        khtml::Cache::init();
+        tdehtml::Cache::init();
 
 	TQString relativeDir = TQFileInfo(relPath).dirPath();
 	TQString filename = info.fileName();
@@ -820,7 +820,7 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur
     return true;
 }
 
-void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* part, uint indent )
+void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, TDEHTMLPart* part, uint indent )
 {
     Node node = part->document();
     while (!node.isNull()) {
@@ -849,7 +849,7 @@ void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* pa
 		if ( node.handle()->id() == ID_FRAME ) {
 			outputStream << endl;
 			TQString frameName = static_cast<DOM::HTMLFrameElementImpl *>( node.handle() )->name.string();
-			KHTMLPart* frame = part->findFrame( frameName );
+			TDEHTMLPart* frame = part->findFrame( frameName );
 			Q_ASSERT( frame );
 			if ( frame )
 			    getPartDOMOutput( outputStream, frame, indent );
@@ -910,7 +910,7 @@ void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* pa
     }
 }
 
-void RegressionTest::dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part )
+void RegressionTest::dumpRenderTree( TQTextStream &outputStream, TDEHTMLPart* part )
 {
     DOM::DocumentImpl* doc = static_cast<DocumentImpl*>( part->document().handle() );
     if ( !doc || !doc->renderer() )
@@ -923,7 +923,7 @@ void RegressionTest::dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part
     names.sort();
     for ( TQStringList::iterator it = names.begin(); it != names.end(); ++it ) {
         outputStream << "FRAME: " << (*it) << "\n";
-	KHTMLPart* frame = part->findFrame( (*it) );
+	TDEHTMLPart* frame = part->findFrame( (*it) );
 	Q_ASSERT( frame );
 	if ( frame )
             dumpRenderTree( outputStream, frame );
@@ -1131,7 +1131,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
     TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir);
 
-    // are blocking reads possible with KProcess?
+    // are blocking reads possible with TDEProcess?
     char pwd[PATH_MAX];
     (void) getcwd( pwd, PATH_MAX );
     chdir( TQFile::encodeName( m_baseDir ) );
@@ -1406,12 +1406,12 @@ void RegressionTest::testJSFile(const TQString & filename )
     // note: this is different from the interpreter used by the part,
     // it contains regression test-specific objects & functions
     Object global(new GlobalImp());
-    khtml::ChildFrame frame;
+    tdehtml::ChildFrame frame;
     frame.m_part = m_part;
     ScriptInterpreter interp(global,&frame);
     ExecState *exec = interp.globalExec();
 
-    global.put(exec, "part", Object(new KHTMLPartObject(exec,m_part)));
+    global.put(exec, "part", Object(new TDEHTMLPartObject(exec,m_part)));
     global.put(exec, "regtest", Object(new RegTestObject(exec,this)));
     global.put(exec, "debug", Object(new RegTestFunction(exec,this,RegTestFunction::Print,1) ) );
     global.put(exec, "print", Object(new RegTestFunction(exec,this,RegTestFunction::Print,1) ) );
diff --git a/khtml/test_regression.h b/tdehtml/test_regression.h
index df76f4439..b6791bd32 100644
--- a/khtml/test_regression.h
+++ b/tdehtml/test_regression.h
@@ -23,7 +23,7 @@
 #ifndef TEST_REGRESSION_H
 #define TEST_REGRESSION_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kurl.h>
 #include <tqobject.h>
 #include <kjs/ustring.h>
@@ -40,12 +40,12 @@ class PartMonitor : public TQObject
 {
   Q_OBJECT
 public:
-    PartMonitor(KHTMLPart *_part);
+    PartMonitor(TDEHTMLPart *_part);
     ~PartMonitor();
     void waitForCompletion();
     static PartMonitor* sm_highestMonitor;
     bool m_completed;
-    KHTMLPart *m_part;
+    TDEHTMLPart *m_part;
     int m_timer_waits;
     TQTimer *m_timeout_timer;
 public slots:
@@ -87,31 +87,31 @@ private:
 /**
  * @internal
  */
-class KHTMLPartObject : public KJS::ObjectImp
+class TDEHTMLPartObject : public KJS::ObjectImp
 {
 public:
-    KHTMLPartObject(KJS::ExecState *exec, KHTMLPart *_part);
+    TDEHTMLPartObject(KJS::ExecState *exec, TDEHTMLPart *_part);
 
     virtual KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const;
 
 private:
-    KHTMLPart *m_part;
+    TDEHTMLPart *m_part;
 };
 
 /**
  * @internal
  */
-class KHTMLPartFunction : public KJS::ObjectImp
+class TDEHTMLPartFunction : public KJS::ObjectImp
 {
 public:
-    KHTMLPartFunction(KJS::ExecState *exec, KHTMLPart *_part, int _id, int length);
+    TDEHTMLPartFunction(KJS::ExecState *exec, TDEHTMLPart *_part, int _id, int length);
 
     bool implementsCall() const;
     KJS::Value call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args);
 
     enum { OpenPage, OpenPageAsUrl, Begin, Write, End, ExecuteScript, ProcessEvents };
 private:
-    KHTMLPart *m_part;
+    TDEHTMLPart *m_part;
     int id;
 };
 
@@ -127,14 +127,14 @@ class RegressionTest : public TQObject
   Q_OBJECT
 public:
 
-    RegressionTest(KHTMLPart *part, const TQString &baseDir, const TQString &outputDir,
+    RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString &outputDir,
 		   bool _genOutput, bool runJS, bool runHTML);
     ~RegressionTest();
 
     enum OutputType { DOMTree, RenderTree };
     TQString getPartOutput( OutputType type );
-    void getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* part, uint indent );
-    void dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part );
+    void getPartDOMOutput( TQTextStream &outputStream, TDEHTMLPart* part, uint indent );
+    void dumpRenderTree( TQTextStream &outputStream, TDEHTMLPart* part );
     void testStaticFile(const TQString& filename);
     void testJSFile(const TQString& filename);
     enum CheckResult { Failure = 0, Success = 1, Ignored = 2 };
@@ -152,7 +152,7 @@ public:
     void doJavascriptReport( const TQString &test );
     void doFailureReport( const TQString& test, int failures );
 
-    KHTMLPart *m_part;
+    TDEHTMLPart *m_part;
     TQString m_baseDir;
     TQString m_outputDir;
     bool m_genOutput;
diff --git a/khtml/test_regression_fontoverload.cpp b/tdehtml/test_regression_fontoverload.cpp
index 2cea9f5a4..d09a3dbd1 100644
--- a/khtml/test_regression_fontoverload.cpp
+++ b/tdehtml/test_regression_fontoverload.cpp
@@ -27,7 +27,7 @@
 #include <tqfontdatabase.h>
 #include <tqfont.h>
 #include <tqpainter.h>
-#include "khtml_settings.h"
+#include "tdehtml_settings.h"
 #include <tqwidget.h>
 #include <assert.h>
 
@@ -265,7 +265,7 @@ KDE_EXPORT bool  TQFontDatabase::isSmoothlyScalable( const TQString &,
     return true;
 }
 
-const TQString &KHTMLSettings::availableFamilies()
+const TQString &TDEHTMLSettings::availableFamilies()
 {
     if ( !avFamilies ) {
         avFamilies = new TQString;
@@ -275,7 +275,7 @@ const TQString &KHTMLSettings::availableFamilies()
   return *avFamilies;
 }
 
-bool KHTMLSettings::unfinishedImageFrame() const
+bool TDEHTMLSettings::unfinishedImageFrame() const
 {
   return false;
 }
@@ -353,13 +353,13 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
     done = true;
 }
 
-#include <kapplication.h>
-void KApplication::dcopFailure( const TQString & )
+#include <tdeapplication.h>
+void TDEApplication::dcopFailure( const TQString & )
 {
-    tqDebug( "KApplication::dcopFailure" );
+    tqDebug( "TDEApplication::dcopFailure" );
 }
 
-#include <kparts/historyprovider.h>
+#include <tdeparts/historyprovider.h>
 
 bool KParts::HistoryProvider::contains( const TQString& t ) const
 {
@@ -378,7 +378,7 @@ bool KSSLSettings::warnOnEnter() const       { return false; }
 bool KSSLSettings::warnOnUnencrypted() const { return false; }
 bool KSSLSettings::warnOnLeave() const       { return false; }
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 KParts::Plugin* KParts::Plugin::loadPlugin( TQObject * parent, const char* libname ) { return 0; }
 
diff --git a/khtml/testkhtml.cpp b/tdehtml/testtdehtml.cpp
index 7765cee8a..bce2c4db0 100644
--- a/khtml/testkhtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -1,18 +1,18 @@
-// program to test the new khtml implementation
+// program to test the new tdehtml implementation
 
 #include <stdlib.h>
 #include "decoder.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "html_document.h"
 #include "htmltokenizer.h"
 // to be able to delete a static protected member pointer in kbrowser...
 // just for memory debugging
 #define protected public
-#include "khtml_part.h"
-#include "khtmlview.h"
+#include "tdehtml_part.h"
+#include "tdehtmlview.h"
 #undef protected
-#include "testkhtml.h"
-#include "testkhtml.moc"
+#include "testtdehtml.h"
+#include "testtdehtml.moc"
 #include "misc/loader.h"
 #include <tqcursor.h>
 #include <dom_string.h>
@@ -21,39 +21,39 @@
 #include "dom/dom_exception.h"
 #include <stdio.h>
 #define protected public
-#include "khtml_factory.h"
+#include "tdehtml_factory.h"
 #undef protected
 #include "css/cssstyleselector.h"
 #include "html/html_imageimpl.h"
 #include "rendering/render_style.h"
-#include <kmainwindow.h>
-#include <kcmdlineargs.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdecmdlineargs.h>
+#include <tdeaction.h>
 #include "domtreeview.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
-static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLastOption };
+static TDECmdLineOptions options[] = { { "+file", "url to open", 0 } , TDECmdLineLastOption };
 
 int main(int argc, char *argv[])
 {
 
-    KCmdLineArgs::init(argc, argv, "testkhtml", "Testkhtml",
-            "a basic web browser using the KHTML library", "1.0");
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, "testtdehtml", "Testtdehtml",
+            "a basic web browser using the TDEHTML library", "1.0");
+    TDECmdLineArgs::addCmdLineOptions(options);
 
-    KApplication a;
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs( );
+    TDEApplication a;
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs( );
     if ( args->count() == 0 ) {
-	KCmdLineArgs::usage();
+	TDECmdLineArgs::usage();
 	::exit( 1 );
     }
 
 #ifndef __KDE_HAVE_GCC_VISIBILITY
-    KHTMLFactory *fac = new KHTMLFactory(true);
+    TDEHTMLFactory *fac = new TDEHTMLFactory(true);
 #endif
 
-    KMainWindow *toplevel = new KMainWindow();
-    KHTMLPart *doc = new KHTMLPart( toplevel, 0, toplevel, 0, KHTMLPart::BrowserViewGUI );
+    TDEMainWindow *toplevel = new TDEMainWindow();
+    TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI );
 
     Dummy *dummy = new Dummy( doc );
     TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
@@ -105,14 +105,14 @@ int main(int argc, char *argv[])
     e.setAttribute( "name", "print" );
     toolBar.insertBefore( e, toolBar.firstChild() );
 
-    (void)new KAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
-    (void)new KAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
-    KAction* kprint = new KAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
+    (void)new TDEAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
+    (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
+    TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
     kprint->setEnabled(true);
-    KToggleAction *ta = new KToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" );
+    TDEToggleAction *ta = new TDEToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" );
     ta->setChecked(doc->isCaretMode());
     TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) ));
-    ta = new KToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );
+    ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );
     ta->setChecked(doc->isEditable());
     TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleEditable(bool) ));
     toplevel->guiFactory()->addClient( doc );
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
 
 void Dummy::doBenchmark()
 {
-    KConfigGroup settings(KGlobal::config(), "bench");
+    TDEConfigGroup settings(TDEGlobal::config(), "bench");
     results.clear();
 
     TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), 
diff --git a/khtml/testkhtml.h b/tdehtml/testtdehtml.h
index 4fd76d044..dcb4c1583 100644
--- a/khtml/testkhtml.h
+++ b/tdehtml/testtdehtml.h
@@ -1,5 +1,5 @@
-#ifndef TESTKHTML_H
-#define TESTKHTML_H
+#ifndef TESTTDEHTML_H
+#define TESTTDEHTML_H
 
 #include <kdebug.h>
 #include <tqvaluelist.h>
@@ -12,7 +12,7 @@ class Dummy : public TQObject
 {
   Q_OBJECT
 public:
-  Dummy( KHTMLPart *part ) : TQObject( part ) { m_part = part; };
+  Dummy( TDEHTMLPart *part ) : TQObject( part ) { m_part = part; };
 
 private slots:
   void slotOpenURL( const KURL &url, const KParts::URLArgs &args )
@@ -43,7 +43,7 @@ private slots:
   void handleDone();
 
 private:
-  KHTMLPart *m_part;
+  TDEHTMLPart *m_part;
   TQValueList<TQString> filesToBenchmark;
   TQMap<TQString, TQValueList<int> > results;
   int                 benchmarkRun;
diff --git a/khtml/xml/CMakeLists.txt b/tdehtml/xml/CMakeLists.txt
index 82fe99d4c..c32e139dc 100644
--- a/khtml/xml/CMakeLists.txt
+++ b/tdehtml/xml/CMakeLists.txt
@@ -17,19 +17,19 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
-  ${CMAKE_SOURCE_DIR}/khtml
+  ${CMAKE_SOURCE_DIR}/tdehtml
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 
-##### khtmlxml-static ############################
+##### tdehtmlxml-static ############################
 
-set( target khtmlxml )
+set( target tdehtmlxml )
 
 set( ${target}_SRCS
   dom_docimpl.cpp dom_nodeimpl.cpp dom_textimpl.cpp
diff --git a/khtml/xml/Makefile.am b/tdehtml/xml/Makefile.am
index 17a9779aa..febb3ef71 100644
--- a/khtml/xml/Makefile.am
+++ b/tdehtml/xml/Makefile.am
@@ -19,15 +19,15 @@
 
 KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
 
-noinst_LTLIBRARIES = libkhtmlxml.la
-libkhtmlxml_la_SOURCES = \
+noinst_LTLIBRARIES = libtdehtmlxml.la
+libtdehtmlxml_la_SOURCES = \
 	dom_docimpl.cpp      dom_nodeimpl.cpp     dom_textimpl.cpp \
 	dom_elementimpl.cpp  dom_stringimpl.cpp   dom2_rangeimpl.cpp \
 	dom2_traversalimpl.cpp xml_tokenizer.cpp  dom_xmlimpl.cpp \
 	dom2_eventsimpl.cpp  dom2_viewsimpl.cpp	  dom_restyler.cpp
 
-#libkhtmlxml_la_LDFLAGS = -no-undefined
-libkhtmlxml_la_METASOURCES = AUTO
+#libtdehtmlxml_la_LDFLAGS = -no-undefined
+libtdehtmlxml_la_METASOURCES = AUTO
 
 noinst_HEADERS = \
 	dom_docimpl.h      dom_nodeimpl.h     dom_textimpl.h \
@@ -35,11 +35,11 @@ noinst_HEADERS = \
 	dom2_traversalimpl.h xml_tokenizer.h  dom_xmlimpl.h \
 	dom2_eventsimpl.h  dom2_viewsimpl.h dom_restyler.h
 
-INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
- -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_srcdir)/kwallet/client \
- -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(all_includes)
+INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop \
+ -I$(top_srcdir)/tdehtml -I$(top_srcdir) -I$(top_srcdir)/tdewallet/client \
+ -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(all_includes)
 
-SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdehtml
 
 ## generate lib documentation
 srcdoc:
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp
index 5121e9caf..e6af64184 100644
--- a/khtml/xml/dom2_eventsimpl.cpp
+++ b/tdehtml/xml/dom2_eventsimpl.cpp
@@ -29,12 +29,12 @@
 #include "xml/dom_nodeimpl.h"
 #include "xml/dom_docimpl.h"
 #include "rendering/render_layer.h"
-#include "khtmlview.h"
+#include "tdehtmlview.h"
 
 #include <kdebug.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 EventImpl::EventImpl()
 {
@@ -179,11 +179,11 @@ EventImpl::EventId EventImpl::typeToId(DOMString type)
     else if ( type == "keypress" )
         return KEYPRESS_EVENT;
     else if ( type == "readystatechange" )
-        return KHTML_READYSTATECHANGE_EVENT;
+        return TDEHTML_READYSTATECHANGE_EVENT;
     else if ( type == "dblclick" )
-        return KHTML_ECMA_DBLCLICK_EVENT;
+        return TDEHTML_ECMA_DBLCLICK_EVENT;
 
-    // ignore: KHTML_CLICK_EVENT
+    // ignore: TDEHTML_CLICK_EVENT
     return UNKNOWN_EVENT;
 }
 
@@ -253,16 +253,16 @@ DOMString EventImpl::idToType(EventImpl::EventId id)
     case KEYPRESS_EVENT:
         return "keypress"; //DOM3 ev. suggests textInput, but it's better for compat this way
 
-    //khtml extensions
-    case KHTML_ECMA_DBLCLICK_EVENT:
+    //tdehtml extensions
+    case TDEHTML_ECMA_DBLCLICK_EVENT:
         return "dblclick";
-    case KHTML_ECMA_CLICK_EVENT:
+    case TDEHTML_ECMA_CLICK_EVENT:
         return "click";
-    case KHTML_DRAGDROP_EVENT:
-        return "khtml_dragdrop";
-    case KHTML_MOVE_EVENT:
-        return "khtml_move";
-    case KHTML_READYSTATECHANGE_EVENT:
+    case TDEHTML_DRAGDROP_EVENT:
+        return "tdehtml_dragdrop";
+    case TDEHTML_MOVE_EVENT:
+        return "tdehtml_move";
+    case TDEHTML_READYSTATECHANGE_EVENT:
         return "readystatechange";
 
     default:
@@ -409,7 +409,7 @@ void MouseEventImpl::computeLayerPos()
 
     DocumentImpl* doc = view() ? view()->document() : 0;
     if (doc) {
-        khtml::RenderObject::NodeInfo renderInfo(true, false);
+        tdehtml::RenderObject::NodeInfo renderInfo(true, false);
         doc->renderer()->layer()->nodeAtPoint(renderInfo, m_pageX, m_pageY);
 
         NodeImpl *node = renderInfo.innerNonSharedNode();
@@ -454,7 +454,7 @@ void MouseEventImpl::initMouseEvent(const DOMString &typeArg,
     m_clientY = clientYArg;
     m_pageX   = clientXArg;
     m_pageY   = clientYArg;
-    KHTMLView* v;
+    TDEHTMLView* v;
     if ( view() && view()->document() && ( v = view()->document()->view() ) ) {
         m_pageX += v->contentsX();
         m_pageY += v->contentsY();
diff --git a/khtml/xml/dom2_eventsimpl.h b/tdehtml/xml/dom2_eventsimpl.h
index fab2225e5..0f48fa605 100644
--- a/khtml/xml/dom2_eventsimpl.h
+++ b/tdehtml/xml/dom2_eventsimpl.h
@@ -28,7 +28,7 @@
 #include "dom/dom2_events.h"
 #include "xml/dom2_viewsimpl.h"
 
-class KHTMLPart;
+class TDEHTMLPart;
 class TQMouseEvent;
 
 namespace DOM {
@@ -39,7 +39,7 @@ class NodeImpl;
 
 // ### support user-defined events
 
-class EventImpl : public khtml::Shared<EventImpl>
+class EventImpl : public tdehtml::Shared<EventImpl>
 {
 public:
     enum EventId {
@@ -80,13 +80,13 @@ public:
 	KEYDOWN_EVENT,
 	KEYUP_EVENT,
 	KEYPRESS_EVENT, //Mostly corresponds to DOM3 textInput event.
-	// khtml events (not part of DOM)
-	KHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick
-	KHTML_ECMA_CLICK_EVENT, // for html onclick
-	KHTML_DRAGDROP_EVENT,
-	KHTML_MOVE_EVENT,
+	// tdehtml events (not part of DOM)
+	TDEHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick
+	TDEHTML_ECMA_CLICK_EVENT, // for html onclick
+	TDEHTML_DRAGDROP_EVENT,
+	TDEHTML_MOVE_EVENT,
         // XMLHttpRequest events
-        KHTML_READYSTATECHANGE_EVENT
+        TDEHTML_READYSTATECHANGE_EVENT
     };
 
     EventImpl();
diff --git a/khtml/xml/dom2_rangeimpl.cpp b/tdehtml/xml/dom2_rangeimpl.cpp
index b160ce23f..c7b19de5c 100644
--- a/khtml/xml/dom2_rangeimpl.cpp
+++ b/tdehtml/xml/dom2_rangeimpl.cpp
@@ -1139,7 +1139,7 @@ DOMString RangeImpl::toHTML( int &exceptioncode )
       text = DOMString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
 		      "<head>\n"
 		      "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
-		      "<meta name=\"Generator\" content=\"KHTML, the KDE Web Page Viewer\" />\n"
+		      "<meta name=\"Generator\" content=\"TDEHTML, the KDE Web Page Viewer\" />\n"
 		      "</head>\n") +
 	    text +
 	    "</html>";
diff --git a/khtml/xml/dom2_rangeimpl.h b/tdehtml/xml/dom2_rangeimpl.h
index 35d532f23..9cf7a3b23 100644
--- a/khtml/xml/dom2_rangeimpl.h
+++ b/tdehtml/xml/dom2_rangeimpl.h
@@ -31,7 +31,7 @@
 
 namespace DOM {
 
-class RangeImpl : public khtml::Shared<RangeImpl>
+class RangeImpl : public tdehtml::Shared<RangeImpl>
 {
     friend class DocumentImpl;
 public:
diff --git a/khtml/xml/dom2_traversalimpl.cpp b/tdehtml/xml/dom2_traversalimpl.cpp
index 2abdadead..2abdadead 100644
--- a/khtml/xml/dom2_traversalimpl.cpp
+++ b/tdehtml/xml/dom2_traversalimpl.cpp
diff --git a/khtml/xml/dom2_traversalimpl.h b/tdehtml/xml/dom2_traversalimpl.h
index 3c5ea1dac..43800c4aa 100644
--- a/khtml/xml/dom2_traversalimpl.h
+++ b/tdehtml/xml/dom2_traversalimpl.h
@@ -35,7 +35,7 @@ namespace DOM {
 class NodeImpl;
 class DocumentImpl;
 
-class NodeIteratorImpl : public khtml::Shared<NodeIteratorImpl>
+class NodeIteratorImpl : public tdehtml::Shared<NodeIteratorImpl>
 {
 public:
     NodeIteratorImpl(NodeImpl *_root, unsigned long _whatToShow, NodeFilter _filter, bool _entityReferenceExpansion);
@@ -74,7 +74,7 @@ protected:
     DocumentImpl *m_doc;
 };
 
-class NodeFilterImpl : public khtml::Shared<NodeFilterImpl>
+class NodeFilterImpl : public tdehtml::Shared<NodeFilterImpl>
 {
 public:
     NodeFilterImpl();
@@ -89,7 +89,7 @@ protected:
 
 };
 
-class TreeWalkerImpl : public khtml::Shared<TreeWalkerImpl>
+class TreeWalkerImpl : public tdehtml::Shared<TreeWalkerImpl>
 {
 public:
     TreeWalkerImpl();
diff --git a/khtml/xml/dom2_viewsimpl.cpp b/tdehtml/xml/dom2_viewsimpl.cpp
index 2195a9db1..217184aa1 100644
--- a/khtml/xml/dom2_viewsimpl.cpp
+++ b/tdehtml/xml/dom2_viewsimpl.cpp
@@ -27,7 +27,7 @@
 #include "css/cssproperties.h"
 #include "css/css_stylesheetimpl.h"
 
-using namespace khtml;
+using namespace tdehtml;
 using namespace DOM;
 
 AbstractViewImpl::AbstractViewImpl(DocumentImpl *_document)
diff --git a/khtml/xml/dom2_viewsimpl.h b/tdehtml/xml/dom2_viewsimpl.h
index caff63e11..e82685244 100644
--- a/khtml/xml/dom2_viewsimpl.h
+++ b/tdehtml/xml/dom2_viewsimpl.h
@@ -35,7 +35,7 @@ class ElementImpl;
 class DOMStringImpl;
 
 // Introduced in DOM Level 2:
-class AbstractViewImpl : public khtml::Shared<AbstractViewImpl>
+class AbstractViewImpl : public tdehtml::Shared<AbstractViewImpl>
 {
 public:
     AbstractViewImpl(DocumentImpl *_document);
diff --git a/khtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 197ceee13..423a2a51e 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -46,7 +46,7 @@
 #include <tqptrstack.h>
 #include <tqpaintdevicemetrics.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 #include "rendering/counter_tree.h"
@@ -57,14 +57,14 @@
 #include "rendering/render_frames.h"
 #include "rendering/render_image.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstringhandler.h>
 #include <krfcdate.h>
-#include "khtml_settings.h"
-#include "khtmlpart_p.h"
+#include "tdehtml_settings.h"
+#include "tdehtmlpart_p.h"
 
 #include "html/html_baseimpl.h"
 #include "html/html_blockimpl.h"
@@ -77,14 +77,14 @@
 #include "html/html_tableimpl.h"
 #include "html/html_objectimpl.h"
 
-#include <kapplication.h>
-#include <kio/job.h>
+#include <tdeapplication.h>
+#include <tdeio/job.h>
 
 #include <stdlib.h>
 #include "dom_docimpl.h"
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 // ------------------------------------------------------------------------
 
@@ -129,14 +129,14 @@ DocumentTypeImpl *DOMImplementationImpl::createDocumentType( const DOMString &qu
     }
 
     // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-    if (!Element::khtmlValidQualifiedName(qualifiedName)) {
+    if (!Element::tdehtmlValidQualifiedName(qualifiedName)) {
         exceptioncode = DOMException::INVALID_CHARACTER_ERR;
         return 0;
     }
 
     // NAMESPACE_ERR: Raised if the qualifiedName is malformed.
     // Added special case for the empty string, which seems to be a common pre-DOM2 misuse
-    if (!qualifiedName.isEmpty() && Element::khtmlMalformedQualifiedName(qualifiedName)) {
+    if (!qualifiedName.isEmpty() && Element::tdehtmlMalformedQualifiedName(qualifiedName)) {
         exceptioncode = DOMException::NAMESPACE_ERR;
         return 0;
     }
@@ -200,12 +200,12 @@ CSSStyleSheetImpl *DOMImplementationImpl::createCSSStyleSheet(DOMStringImpl* /*t
 	return sheet;
 }
 
-DocumentImpl *DOMImplementationImpl::createDocument( KHTMLView *v )
+DocumentImpl *DOMImplementationImpl::createDocument( TDEHTMLView *v )
 {
     return new DocumentImpl(this, v);
 }
 
-HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( KHTMLView *v )
+HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( TDEHTMLView *v )
 {
     return new HTMLDocumentImpl(this, v);
 }
@@ -288,8 +288,8 @@ ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id)
 static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter;
 TQPtrList<DocumentImpl> * DocumentImpl::changedDocuments;
 
-// KHTMLView might be 0
-DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
+// TDEHTMLView might be 0
+DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v)
     : NodeBaseImpl( 0 ), m_domtree_version(0), m_counterDict(257),
       m_imageLoadEventTimer(0)
 {
@@ -304,7 +304,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
     m_view = v;
     m_renderArena.reset();
 
-    KHTMLFactory::ref();
+    TDEHTMLFactory::ref();
 
     if ( v ) {
         m_docLoader = new DocLoader(v->part(), this );
@@ -364,7 +364,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
     m_inSyncLoad = false;
     m_loadingXMLDoc = 0;
     m_cssTarget = 0;
-    m_dynamicDomRestyler = new khtml::DynamicDomRestyler();
+    m_dynamicDomRestyler = new tdehtml::DynamicDomRestyler();
 }
 
 void DocumentImpl::removedLastRef()
@@ -459,7 +459,7 @@ DocumentImpl::~DocumentImpl()
 
     m_renderArena.reset();
 
-    KHTMLFactory::deref();
+    TDEHTMLFactory::deref();
 }
 
 
@@ -773,7 +773,7 @@ void DocumentImpl::setTextContent( const DOMString&, int& )
 
 ElementImpl *DocumentImpl::createHTMLElement( const DOMString &name )
 {
-    uint id = khtml::getTagID( name.string().lower().latin1(), name.string().length() );
+    uint id = tdehtml::getTagID( name.string().lower().latin1(), name.string().length() );
 //     id = makeId(xhtmlNamespace, id);
 
     ElementImpl *n = 0;
@@ -1126,13 +1126,13 @@ void DocumentImpl::recalcStyle( StyleChange change )
         _style->setVisuallyOrdered( visuallyOrdered );
         // ### make the font stuff _really_ work!!!!
 
-	khtml::FontDef fontDef;
-	TQFont f = KGlobalSettings::generalFont();
+	tdehtml::FontDef fontDef;
+	TQFont f = TDEGlobalSettings::generalFont();
 	fontDef.family = f.family();
 	fontDef.italic = f.italic();
 	fontDef.weight = f.weight();
         if (m_view) {
-            const KHTMLSettings *settings = m_view->part()->settings();
+            const TDEHTMLSettings *settings = m_view->part()->settings();
 	    TQString stdfont = settings->stdFontName();
 	    if ( !stdfont.isEmpty() )
 		fontDef.family = stdfont;
@@ -1293,9 +1293,9 @@ void DocumentImpl::clearSelection()
         static_cast<RenderCanvas*>(m_render)->clearSelection();
 }
 
-khtml::Tokenizer *DocumentImpl::createTokenizer()
+tdehtml::Tokenizer *DocumentImpl::createTokenizer()
 {
-    return new khtml::XMLTokenizer(docPtr(),m_view);
+    return new tdehtml::XMLTokenizer(docPtr(),m_view);
 }
 
 void DocumentImpl::setPaintDevice( TQPaintDevice *dev )
@@ -1317,7 +1317,7 @@ void DocumentImpl::open( bool clearEventListeners )
     delete m_tokenizer;
     m_tokenizer = 0;
 
-    KHTMLView* view = m_view;
+    TDEHTMLView* view = m_view;
     bool was_attached = attached();
     if ( was_attached )
         detach();
@@ -1662,7 +1662,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
 {
     assert(!equiv.isNull() && !content.isNull());
 
-    KHTMLView *v = getDocument()->view();
+    TDEHTMLView *v = getDocument()->view();
 
     if(strcasecmp(equiv, "refresh") == 0 && v && v->part()->metaRefreshEnabled())
     {
@@ -1718,7 +1718,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
         KURL url = v->part()->url();
         if ((str == "no-cache") && url.protocol().startsWith("http"))
         {
-           KIO::http_update_cache(url, true, 0);
+           TDEIO::http_update_cache(url, true, 0);
         }
     }
     else if( (strcasecmp(equiv, "set-cookie") == 0))
@@ -1752,7 +1752,7 @@ bool DocumentImpl::prepareMouseEvent( bool readonly, int _x, int _y, MouseEvent
             //tqDebug("urlnode: %s  (%d)", getTagName(renderInfo.URLElement()->id()).string().latin1(), renderInfo.URLElement()->id());
 
             ElementImpl* e =  static_cast<ElementImpl*>(renderInfo.URLElement());
-            DOMString href = khtml::parseURL(e->getAttribute(ATTR_HREF));
+            DOMString href = tdehtml::parseURL(e->getAttribute(ATTR_HREF));
             DOMString target = e->getAttribute(ATTR_TARGET);
 
             if (!target.isNull() && !href.isNull()) {
@@ -1902,7 +1902,7 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
     // unknown
     if (readonly) return 0;
 
-    if ( pExceptioncode && _type != NodeImpl::NamespaceId && !Element::khtmlValidQualifiedName(_name)) {
+    if ( pExceptioncode && _type != NodeImpl::NamespaceId && !Element::tdehtmlValidQualifiedName(_name)) {
         *pExceptioncode = DOMException::INVALID_CHARACTER_ERR;
         return 0;
     }
@@ -2336,12 +2336,12 @@ void DocumentImpl::notifyBeforeNodeRemoval(NodeImpl *n)
 
 bool DocumentImpl::isURLAllowed(const TQString& url) const
 {
-    KHTMLPart *thisPart = part();
+    TDEHTMLPart *thisPart = part();
 
     KURL newURL(completeURL(url));
     newURL.setRef(TQString::null);
 
-    if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() ))
+    if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() ))
         return false;
 
     // Prohibit non-file URLs if we are asked to.
@@ -2355,7 +2355,7 @@ bool DocumentImpl::isURLAllowed(const TQString& url) const
     // We allow one level of self-reference because some sites depend on that.
     // But we don't allow more than one.
     bool foundSelfReference = false;
-    for (KHTMLPart *part = thisPart; part; part = part->parentPart()) {
+    for (TDEHTMLPart *part = thisPart; part; part = part->parentPart()) {
         KURL partURL = part->url();
         partURL.setRef(TQString::null);
         if (partURL == newURL) {
@@ -2491,7 +2491,7 @@ void DocumentImpl::error(int err, const TQString &text)
     int exceptioncode = 0;
     EventImpl *evt = new EventImpl(EventImpl::ERROR_EVENT,false,false);
     if (err != 0)
-      evt->setMessage(KIO::buildErrorString(err,text));
+      evt->setMessage(TDEIO::buildErrorString(err,text));
     else
       evt->setMessage(text);
     evt->ref();
@@ -2520,7 +2520,7 @@ void DocumentImpl::defaultEventHandler(EventImpl *evt)
             continue;
 
         if ((*it).id == evt->id()) {
-            // currentTarget must be 0 in khtml for kjs_events to set "this" correctly.
+            // currentTarget must be 0 in tdehtml for kjs_events to set "this" correctly.
             // (this is how we identify events dispatched to the window, like window.onmousedown)
             // ## currentTarget is unimplemented in IE, and is "window" in Mozilla (how? not a DOM node)
             evt->setCurrentTarget(0);
@@ -2619,7 +2619,7 @@ void DocumentImpl::setDecoderCodec(const TQTextCodec *codec)
 
 ElementImpl *DocumentImpl::ownerElement() const
 {
-    KHTMLPart *childPart = part();
+    TDEHTMLPart *childPart = part();
     if (!childPart)
         return 0;
     ChildFrame *childFrame = childPart->d->m_frame;
@@ -2675,9 +2675,9 @@ DOMString DocumentImpl::toString() const
 }
 
 
-KHTMLPart* DOM::DocumentImpl::part() const
+TDEHTMLPart* DOM::DocumentImpl::part() const
 {
-    // ### TODO: make this independent from a KHTMLView one day.
+    // ### TODO: make this independent from a TDEHTMLView one day.
     return view() ? view()->part() : 0;
 }
 
diff --git a/khtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h
index 5e50c09a4..9cacfd9f5 100644
--- a/khtml/xml/dom_docimpl.h
+++ b/tdehtml/xml/dom_docimpl.h
@@ -47,9 +47,9 @@
 class TQPaintDevice;
 class TQTextCodec;
 class TQPaintDeviceMetrics;
-class KHTMLView;
+class TDEHTMLView;
 
-namespace khtml {
+namespace tdehtml {
     class Tokenizer;
     class CSSStyleSelector;
     class DocLoader;
@@ -93,7 +93,7 @@ namespace DOM {
     class TextImpl;
     class TreeWalkerImpl;
 
-class DOMImplementationImpl : public khtml::Shared<DOMImplementationImpl>
+class DOMImplementationImpl : public tdehtml::Shared<DOMImplementationImpl>
 {
 public:
     DOMImplementationImpl();
@@ -115,8 +115,8 @@ public:
     HTMLDocumentImpl* createHTMLDocument( const DOMString& title);
 
     // Other methods (not part of DOM)
-    DocumentImpl *createDocument( KHTMLView *v = 0 );
-    HTMLDocumentImpl *createHTMLDocument( KHTMLView *v = 0 );
+    DocumentImpl *createDocument( TDEHTMLView *v = 0 );
+    HTMLDocumentImpl *createHTMLDocument( TDEHTMLView *v = 0 );
 
     // Returns the static instance of this class - only one instance of this class should
     // ever be present, and is used as a factory method for creating DocumentImpl objects
@@ -180,11 +180,11 @@ private:
 /**
  * @internal
  */
-class DocumentImpl : public TQObject, private khtml::CachedObjectClient, public NodeBaseImpl
+class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, public NodeBaseImpl
 {
     Q_OBJECT
 public:
-    DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v);
+    DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v);
     ~DocumentImpl();
 
     // DOM methods & attributes for Document
@@ -228,7 +228,7 @@ public:
 
     virtual ElementImpl *createHTMLElement ( const DOMString &tagName );
 
-    khtml::CSSStyleSelector *styleSelector() { return m_styleSelector; }
+    tdehtml::CSSStyleSelector *styleSelector() { return m_styleSelector; }
 
      /**
      * Updates the pending sheet count and then calls updateStyleSelector.
@@ -281,8 +281,8 @@ public:
     // Set the state the document should restore to
     void setRestoreState( const TQStringList &s) { m_state = s; }
 
-    KHTMLView *view() const { return m_view; }
-    KHTMLPart* part() const;
+    TDEHTMLView *view() const { return m_view; }
+    TDEHTMLPart* part() const;
 
     RangeImpl *createRange();
 
@@ -297,12 +297,12 @@ public:
     virtual void updateRendering();
     void updateLayout();
     static void updateDocumentsRendering();
-    khtml::DocLoader *docLoader() { return m_docLoader; }
+    tdehtml::DocLoader *docLoader() { return m_docLoader; }
 
     virtual void attach();
     virtual void detach();
 
-    khtml::RenderArena* renderArena() { return m_renderArena.get(); }
+    tdehtml::RenderArena* renderArena() { return m_renderArena.get(); }
 
     // to get visually ordered hebrew and arabic pages right
     void setVisuallyOrdered();
@@ -337,8 +337,8 @@ public:
     TQString printStyleSheet() const { return m_printSheet; }
 
     CSSStyleSheetImpl* elementSheet();
-    virtual khtml::Tokenizer *createTokenizer();
-    khtml::Tokenizer *tokenizer() { return m_tokenizer; }
+    virtual tdehtml::Tokenizer *createTokenizer();
+    tdehtml::Tokenizer *tokenizer() { return m_tokenizer; }
 
     TQPaintDeviceMetrics *paintDeviceMetrics() { return m_paintDeviceMetrics; }
     TQPaintDevice *paintDevice() const { return m_paintDevice; }
@@ -522,9 +522,9 @@ public:
     void incDOMTreeVersion() { ++m_domtree_version; }
     unsigned int domTreeVersion() const { return m_domtree_version; }
 
-    TQDict<khtml::CounterNode>* counters(const khtml::RenderObject* o) { return m_counterDict[(void*)o]; }
-    void setCounters(const khtml::RenderObject* o, TQDict<khtml::CounterNode> *dict) { m_counterDict.insert((void*)o, dict);}
-    void removeCounters(const khtml::RenderObject* o) { m_counterDict.remove((void*)o); }
+    TQDict<tdehtml::CounterNode>* counters(const tdehtml::RenderObject* o) { return m_counterDict[(void*)o]; }
+    void setCounters(const tdehtml::RenderObject* o, TQDict<tdehtml::CounterNode> *dict) { m_counterDict.insert((void*)o, dict);}
+    void removeCounters(const tdehtml::RenderObject* o) { m_counterDict.remove((void*)o); }
 
 
     ElementMappingCache& underDocNamedCache() {
@@ -542,19 +542,19 @@ public:
     TQString contentLanguage() const { return m_contentLanguage; }
     void setContentLanguage(const TQString& cl) { m_contentLanguage = cl; }
 
-    khtml::DynamicDomRestyler& dynamicDomRestyler() { return *m_dynamicDomRestyler; }
-    const khtml::DynamicDomRestyler& dynamicDomRestyler() const { return *m_dynamicDomRestyler; }
+    tdehtml::DynamicDomRestyler& dynamicDomRestyler() { return *m_dynamicDomRestyler; }
+    const tdehtml::DynamicDomRestyler& dynamicDomRestyler() const { return *m_dynamicDomRestyler; }
 
 signals:
     void finishedParsing();
 
 protected:
-    khtml::CSSStyleSelector *m_styleSelector;
-    KHTMLView *m_view;
+    tdehtml::CSSStyleSelector *m_styleSelector;
+    TDEHTMLView *m_view;
     TQStringList m_state;
 
-    khtml::DocLoader *m_docLoader;
-    khtml::Tokenizer *m_tokenizer;
+    tdehtml::DocLoader *m_docLoader;
+    tdehtml::Tokenizer *m_tokenizer;
     KURL m_url;
     KURL m_baseURL;
     TQString m_baseTarget;
@@ -604,10 +604,10 @@ protected:
         TQDict<void> ids;
 
         void expandIfNeeded() {
-            if (ids.size() <= ids.count() && ids.size() != khtml_MaxSeed)
-                ids.resize( khtml::nextSeed(ids.count()) );
-            if (names.size() <= names.count() && names.size() != khtml_MaxSeed)
-                names.resize( khtml::nextSeed(names.count()) );
+            if (ids.size() <= ids.count() && ids.size() != tdehtml_MaxSeed)
+                ids.resize( tdehtml::nextSeed(ids.count()) );
+            if (names.size() <= names.count() && names.size() != tdehtml_MaxSeed)
+                names.resize( tdehtml::nextSeed(names.count()) );
         }
 
         void addAlias(DOMStringImpl* _prefix, DOMStringImpl* _name, bool cs, NodeImpl::Id id) {
@@ -640,9 +640,9 @@ protected:
     TQPtrList<NodeImpl> m_maintainsState;
 
     // ### evaluate for placement in RenderStyle
-    TQPtrDict<TQDict<khtml::CounterNode> > m_counterDict;
+    TQPtrDict<TQDict<tdehtml::CounterNode> > m_counterDict;
 
-    khtml::DynamicDomRestyler *m_dynamicDomRestyler;
+    tdehtml::DynamicDomRestyler *m_dynamicDomRestyler;
 
     bool visuallyOrdered;
     bool m_bParsing;
@@ -656,7 +656,7 @@ protected:
 
     DOMString m_title;
     DOMString m_preferredStylesheetSet;
-    khtml::CachedCSSStyleSheet *m_loadingXMLDoc;
+    tdehtml::CachedCSSStyleSheet *m_loadingXMLDoc;
 
     int m_decoderMibEnum;
 
@@ -673,7 +673,7 @@ protected:
     //Cache for getElementById
     mutable ElementMappingCache m_getElementByIdCache;
 
-    khtml::SharedPtr<khtml::RenderArena> m_renderArena;
+    tdehtml::SharedPtr<tdehtml::RenderArena> m_renderArena;
 private:
     mutable DOMString m_domain;
     int m_selfOnlyRefCount;
diff --git a/khtml/xml/dom_elementimpl.cpp b/tdehtml/xml/dom_elementimpl.cpp
index 875c5f2e4..3941154d7 100644
--- a/khtml/xml/dom_elementimpl.cpp
+++ b/tdehtml/xml/dom_elementimpl.cpp
@@ -55,7 +55,7 @@
 // ### check for INVALID_CHARACTER_ERR where appropriate
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 AttrImpl::AttrImpl(ElementImpl* element, DocumentImpl* docPtr, NodeImpl::Id attrId,
 		   DOMStringImpl *value, DOMStringImpl *prefix)
@@ -896,8 +896,8 @@ void ElementImpl::setContentEditable(bool enabled) {
         // FIXME: reset caret if it is in this node or a child
     }/*end if*/
     // FIXME: use addCSSProperty when I get permission to move it here
-//    kdDebug(6000) << "CSS_PROP__KHTML_USER_INPUT: "<< value << endl;
-    styleRules()->setProperty(CSS_PROP__KHTML_USER_INPUT, value, false, true);
+//    kdDebug(6000) << "CSS_PROP__TDEHTML_USER_INPUT: "<< value << endl;
+    styleRules()->setProperty(CSS_PROP__TDEHTML_USER_INPUT, value, false, true);
     setChanged();
 
 }
@@ -1160,7 +1160,7 @@ void NamedAttrMapImpl::setValue(NodeImpl::Id id, DOMStringImpl *value, DOMString
 {
     assert( !(qName && nsAware) );
     if (!id) return;
-    // Passing in a null value here causes the attribute to be removed. This is a khtml extension
+    // Passing in a null value here causes the attribute to be removed. This is a tdehtml extension
     // (the spec does not specify what to do in this situation).
     int exceptioncode = 0;
     if (!value) {
diff --git a/khtml/xml/dom_elementimpl.h b/tdehtml/xml/dom_elementimpl.h
index ee1be3e4a..e528d7e24 100644
--- a/khtml/xml/dom_elementimpl.h
+++ b/tdehtml/xml/dom_elementimpl.h
@@ -32,7 +32,7 @@
 #include "xml/dom_stringimpl.h"
 #include "misc/shared.h"
 
-namespace khtml {
+namespace tdehtml {
     class CSSStyleSelector;
 }
 
@@ -141,7 +141,7 @@ class ElementImpl : public NodeBaseImpl
     friend class NamedAttrMapImpl;
     friend class AttrImpl;
     friend class NodeImpl;
-    friend class khtml::CSSStyleSelector;
+    friend class tdehtml::CSSStyleSelector;
 public:
     ElementImpl(DocumentImpl *doc);
     ~ElementImpl();
@@ -197,8 +197,8 @@ public:
     virtual void backwardsStructureChanged();
     virtual void attributeChanged(NodeImpl::Id attrId);
 
-    virtual khtml::RenderStyle *styleForRenderer(khtml::RenderObject *parent);
-    virtual khtml::RenderObject *createRenderer(khtml::RenderArena *, khtml::RenderStyle *);
+    virtual tdehtml::RenderStyle *styleForRenderer(tdehtml::RenderObject *parent);
+    virtual tdehtml::RenderObject *createRenderer(tdehtml::RenderArena *, tdehtml::RenderStyle *);
     virtual void recalcStyle( StyleChange = NoChange );
 
     virtual void mouseEventHandler( MouseEvent* /*ev*/, bool /*inside*/ ) {}
@@ -334,7 +334,7 @@ inline bool checkQualifiedName(const DOMString &qualifiedName, const DOMString &
     }
 
     // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-    if (!qualifiedName.isNull() && !Element::khtmlValidQualifiedName(qualifiedName)
+    if (!qualifiedName.isNull() && !Element::tdehtmlValidQualifiedName(qualifiedName)
         && ( !qualifiedName.isEmpty() || !nameCanBeEmpty ) ) {
         if (pExceptioncode)
             *pExceptioncode = DOMException::INVALID_CHARACTER_ERR;
@@ -357,7 +357,7 @@ inline bool checkQualifiedName(const DOMString &qualifiedName, const DOMString &
         }
     }
 
-    if (!qualifiedName.isNull() && Element::khtmlMalformedQualifiedName(qualifiedName) ||
+    if (!qualifiedName.isNull() && Element::tdehtmlMalformedQualifiedName(qualifiedName) ||
         (colonpos >= 0 && namespaceURI.isNull()) ||
         (qualifiedName.isNull() && !namespaceURI.isNull()) ||
         (colonpos == 3 && qualifiedName[0] == 'x' && qualifiedName[1] == 'm' && qualifiedName[2] == 'l' &&
diff --git a/khtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index 5febe695e..7e2e1bc5f 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -33,7 +33,7 @@
 #include "xml/dom_nodeimpl.h"
 #include "xml/dom_restyler.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "rendering/render_text.h"
@@ -41,18 +41,18 @@
 #include "rendering/render_line.h"
 
 #include "ecma/kjs_proxy.h"
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include "dom_nodeimpl.h"
 
-// from khtml_caret_p.h
-namespace khtml {
+// from tdehtml_caret_p.h
+namespace tdehtml {
 void /*KDE_NO_EXPORT*/ mapDOMPosToRenderPos(DOM::NodeImpl *node, long offset,
-		khtml::RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd);
+		tdehtml::RenderObject *&r, long &r_ofs, bool &outside, bool &outsideEnd);
 }
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 NodeImpl::NodeImpl(DocumentImpl *doc)
     : m_document(doc),
@@ -272,7 +272,7 @@ void NodeImpl::setChanged(bool b)
 
 bool NodeImpl::isInline() const
 {
-    if (m_render) return m_render->style()->display() == khtml::INLINE;
+    if (m_render) return m_render->style()->display() == tdehtml::INLINE;
     return !isElementNode();
 }
 
@@ -337,7 +337,7 @@ void NodeImpl::dispatchEvent(EventImpl *evt, int &exceptioncode, bool tempEvent)
     evt->setTarget(this);
 
     // Since event handling code could cause this object to be deleted, grab a reference to the view now
-    KHTMLView *view = getDocument()->view();
+    TDEHTMLView *view = getDocument()->view();
 
     dispatchGenericEvent( evt, exceptioncode );
 
@@ -390,7 +390,7 @@ void NodeImpl::dispatchGenericEvent( EventImpl *evt, int &/*exceptioncode */)
             it.current()->handleLocalEvents(evt,false);
         }
 
-        // now we call all default event handlers (this is not part of DOM - it is internal to khtml)
+        // now we call all default event handlers (this is not part of DOM - it is internal to tdehtml)
         evt->setCurrentTarget(0);
         evt->setEventPhase(0); // I guess this is correct, the spec does not seem to say
         for (it.toLast(); it.current() && it.current() != propagationSentinel &&
@@ -610,8 +610,8 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture)
                 // * use me->qEvent(), it's not available when using initMouseEvent/dispatchEvent
                 // So we currently store a bool in MouseEventImpl. If anyone needs to trigger
                 // dblclicks from the DOM API, we'll need a timer here (well in the doc).
-                if ( ( !me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_CLICK_EVENT) ||
-                  ( me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_DBLCLICK_EVENT) )
+                if ( ( !me->isDoubleClick() && current.id == EventImpl::TDEHTML_ECMA_CLICK_EVENT) ||
+                  ( me->isDoubleClick() && current.id == EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT) )
                     current.listener->handleEvent(ev);
             }
         }
@@ -670,7 +670,7 @@ void NodeImpl::checkSetPrefix(const DOMString &_prefix, int &exceptioncode)
     // ElementImpl::setPrefix() and AttrImpl::setPrefix()
 
     // INVALID_CHARACTER_ERR: Raised if the specified prefix contains an illegal character.
-    if (!Element::khtmlValidPrefix(_prefix)) {
+    if (!Element::tdehtmlValidPrefix(_prefix)) {
         exceptioncode = DOMException::INVALID_CHARACTER_ERR;
         return;
     }
@@ -688,7 +688,7 @@ void NodeImpl::checkSetPrefix(const DOMString &_prefix, int &exceptioncode)
     // - if this node is an attribute and the specified prefix is "xmlns" and
     //   the namespaceURI of this node is different from "http://www.w3.org/2000/xmlns/",
     // - or if this node is an attribute and the qualifiedName of this node is "xmlns" [Namespaces].
-    if (Element::khtmlMalformedPrefix(_prefix) || (namespacePart(id()) == defaultNamespace && id() > ID_LAST_TAG) ||
+    if (Element::tdehtmlMalformedPrefix(_prefix) || (namespacePart(id()) == defaultNamespace && id() > ID_LAST_TAG) ||
         (_prefix == "xml" && namespaceURI() != "http://www.w3.org/XML/1998/namespace")) {
         exceptioncode = DOMException::NAMESPACE_ERR;
         return;
@@ -766,7 +766,7 @@ bool NodeImpl::childAllowed( NodeImpl *newChild )
     return childTypeAllowed(newChild->nodeType());
 }
 
-NodeImpl::StyleChange NodeImpl::diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 )
+NodeImpl::StyleChange NodeImpl::diff( tdehtml::RenderStyle *s1, tdehtml::RenderStyle *s2 )
 {
     // This method won't work when a style contains noninherited properties with "inherit" value.
     StyleChange ch = NoInherit;
@@ -789,27 +789,27 @@ NodeImpl::StyleChange NodeImpl::diff( khtml::RenderStyle *s1, khtml::RenderStyle
 
     // Because the first-letter implementation is so f..ked up, the easiest way
     // to update first-letter is to remove the entire node and readd it.
-    if (ch < Detach && pseudoDiff(s1, s2, khtml::RenderStyle::FIRST_LETTER))
+    if (ch < Detach && pseudoDiff(s1, s2, tdehtml::RenderStyle::FIRST_LETTER))
         ch = Detach;
     // If the other pseudoStyles have changed, we want to return NoInherit
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::BEFORE))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::BEFORE))
         ch = NoInherit;
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::AFTER))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::AFTER))
         ch = NoInherit;
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::MARKER))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::MARKER))
         ch = NoInherit;
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::SELECTION))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::SELECTION))
         ch = NoInherit;
-    if (ch == NoChange && pseudoDiff(s1, s2, khtml::RenderStyle::FIRST_LINE))
+    if (ch == NoChange && pseudoDiff(s1, s2, tdehtml::RenderStyle::FIRST_LINE))
         ch = NoInherit;
 
     return ch;
 }
 
-bool NodeImpl::pseudoDiff( khtml::RenderStyle *s1, khtml::RenderStyle *s2, unsigned int pid)
+bool NodeImpl::pseudoDiff( tdehtml::RenderStyle *s1, tdehtml::RenderStyle *s2, unsigned int pid)
 {
-    khtml::RenderStyle *ps1 = s1 ? s1->getPseudoStyle((khtml::RenderStyle::PseudoId)pid) : 0;
-    khtml::RenderStyle *ps2 = s2 ? s2->getPseudoStyle((khtml::RenderStyle::PseudoId)pid) : 0;
+    tdehtml::RenderStyle *ps1 = s1 ? s1->getPseudoStyle((tdehtml::RenderStyle::PseudoId)pid) : 0;
+    tdehtml::RenderStyle *ps2 = s2 ? s2->getPseudoStyle((tdehtml::RenderStyle::PseudoId)pid) : 0;
 
     if (ps1 == ps2)
         return false;
@@ -1990,7 +1990,7 @@ void RegisteredListenerList::removeEventListener(int id, EventListener *listener
 
 bool RegisteredListenerList::isHTMLEventListener(EventListener* listener)
 {
-    return (listener->eventListenerType() == "_khtml_HTMLEventListener");
+    return (listener->eventListenerType() == "_tdehtml_HTMLEventListener");
 }
 
 void RegisteredListenerList::setHTMLEventListener(int id, EventListener *listener)
diff --git a/khtml/xml/dom_nodeimpl.h b/tdehtml/xml/dom_nodeimpl.h
index 275452d69..457a05787 100644
--- a/khtml/xml/dom_nodeimpl.h
+++ b/tdehtml/xml/dom_nodeimpl.h
@@ -37,13 +37,13 @@
 class TQPainter;
 template <class type> class TQPtrList;
 template <class type> class TQValueList;
-class KHTMLView;
+class TDEHTMLView;
 class TQRect;
 class TQMouseEvent;
 class TQKeyEvent;
 class TQTextStream;
 
-namespace khtml {
+namespace tdehtml {
     class RenderStyle;
     class RenderObject;
     class RenderArena;
@@ -98,7 +98,7 @@ inline TQ_UINT32 makeId(TQ_UINT16 n, TQ_UINT16 l) { return (n << 16) | l; }
 
 const TQ_UINT32 anyQName = makeId(anyNamespace, anyLocalName);
 
-class NodeImpl : public khtml::TreeShared<NodeImpl>
+class NodeImpl : public tdehtml::TreeShared<NodeImpl>
 {
     friend class DocumentImpl;
 public:
@@ -261,8 +261,8 @@ public:
 
     enum StyleChange { NoChange, NoInherit, Inherit, Detach, Force };
     virtual void recalcStyle( StyleChange = NoChange ) {}
-    static StyleChange diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 );
-    static bool pseudoDiff( khtml::RenderStyle *s1, khtml::RenderStyle *s2, unsigned int pid);
+    static StyleChange diff( tdehtml::RenderStyle *s1, tdehtml::RenderStyle *s2 );
+    static bool pseudoDiff( tdehtml::RenderStyle *s1, tdehtml::RenderStyle *s2, unsigned int pid);
 
     unsigned long nodeIndex() const;
     // Returns the document that this node is associated with. This is guaranteed to always be non-null, as opposed to
@@ -283,7 +283,7 @@ public:
     void dispatchUIEvent(int _id, int detail = 0);
     void dispatchSubtreeModifiedEvent();
     // return true if defaultPrevented (i.e. event should be swallowed)
-    // this matches the logic in KHTMLView.
+    // this matches the logic in TDEHTMLView.
     bool dispatchKeyEvent(TQKeyEvent *key, bool keypress);
 
     void handleLocalEvents(EventImpl *evt, bool useCapture);
@@ -320,10 +320,10 @@ public:
 
     DocumentImpl *docPtr() const { return m_document.get(); }
 
-    khtml::RenderObject *renderer() const { return m_render; }
-    khtml::RenderObject *nextRenderer();
-    khtml::RenderObject *previousRenderer();
-    void setRenderer(khtml::RenderObject* renderer) { m_render = renderer; }
+    tdehtml::RenderObject *renderer() const { return m_render; }
+    tdehtml::RenderObject *nextRenderer();
+    tdehtml::RenderObject *previousRenderer();
+    void setRenderer(tdehtml::RenderObject* renderer) { m_render = renderer; }
 
     void checkSetPrefix(const DOMString &_prefix, int &exceptioncode);
     void checkAddChild(NodeImpl *newChild, int &exceptioncode);
@@ -351,7 +351,7 @@ public:
     /**
      * Attaches this node to the rendering tree. This calculates the style to be applied to the node and creates an
      * appropriate RenderObject which will be inserted into the tree (except when the style has display: none). This
-     * makes the node visible in the KHTMLView.
+     * makes the node visible in the TDEHTMLView.
      */
     virtual void attach();
 
@@ -371,9 +371,9 @@ public:
     virtual void backwardsStructureChanged() {};
 
     void createRendererIfNeeded();
-    virtual khtml::RenderStyle *styleForRenderer(khtml::RenderObject *parent);
-    virtual bool rendererIsNeeded(khtml::RenderStyle *);
-    virtual khtml::RenderObject *createRenderer(khtml::RenderArena *, khtml::RenderStyle *);
+    virtual tdehtml::RenderStyle *styleForRenderer(tdehtml::RenderObject *parent);
+    virtual bool rendererIsNeeded(tdehtml::RenderStyle *);
+    virtual tdehtml::RenderObject *createRenderer(tdehtml::RenderArena *, tdehtml::RenderStyle *);
 
     // -----------------------------------------------------------------------------
     // Methods for maintaining the state of the element between history navigation
@@ -456,11 +456,11 @@ public:
     }
 
 private: // members
-    khtml::DocPtr<DocumentImpl> m_document;
+    tdehtml::DocPtr<DocumentImpl> m_document;
     NodeImpl *m_previous;
     NodeImpl *m_next;
 protected:
-    khtml::RenderObject *m_render;
+    tdehtml::RenderObject *m_render;
     RegisteredListenerList m_regdListeners;
 
     unsigned short m_tabIndex : 15;
@@ -546,7 +546,7 @@ protected:
 class Node;
 class NodeImpl;
 
-class NodeListImpl : public khtml::Shared<NodeListImpl>
+class NodeListImpl : public tdehtml::Shared<NodeListImpl>
 {
 public:
     //Type of the item stored in the cache.
@@ -580,7 +580,7 @@ public:
         }
     };
 
-    struct Cache: public khtml::Shared<Cache>
+    struct Cache: public tdehtml::Shared<Cache>
     {
         static Cache* make() { return new Cache; }
 
@@ -681,7 +681,7 @@ protected:
 // Generic NamedNodeMap interface
 // Other classes implement this for more specific situations e.g. attributes
 // of an element
-class NamedNodeMapImpl : public khtml::Shared<NamedNodeMapImpl>
+class NamedNodeMapImpl : public tdehtml::Shared<NamedNodeMapImpl>
 {
 public:
     NamedNodeMapImpl();
diff --git a/khtml/xml/dom_restyler.cpp b/tdehtml/xml/dom_restyler.cpp
index 0050c4a03..acd89620f 100644
--- a/khtml/xml/dom_restyler.cpp
+++ b/tdehtml/xml/dom_restyler.cpp
@@ -23,7 +23,7 @@
 #include "dom_restyler.h"
 #include "dom_elementimpl.h"
 
-namespace khtml {
+namespace tdehtml {
 
 DynamicDomRestyler::DynamicDomRestyler()
 {
diff --git a/khtml/xml/dom_restyler.h b/tdehtml/xml/dom_restyler.h
index eb8d795d5..54d5ad798 100644
--- a/khtml/xml/dom_restyler.h
+++ b/tdehtml/xml/dom_restyler.h
@@ -32,7 +32,7 @@ namespace DOM {
 
 // Restyle dependency tracker for dynamic DOM
 
-namespace khtml {
+namespace tdehtml {
 
 using DOM::ElementImpl;
 
diff --git a/khtml/xml/dom_stringimpl.cpp b/tdehtml/xml/dom_stringimpl.cpp
index 79bddf5d9..12f1481c0 100644
--- a/khtml/xml/dom_stringimpl.cpp
+++ b/tdehtml/xml/dom_stringimpl.cpp
@@ -31,7 +31,7 @@
 #include <tqstringlist.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 
 DOMStringImpl::DOMStringImpl(const char *str)
@@ -276,7 +276,7 @@ static Length parseLength(const TQChar *s, unsigned int l)
     return Length(0, Relative);
 }
 
-khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
+tdehtml::Length* DOMStringImpl::toCoordsArray(int& len) const
 {
     TQString str(s, l);
     for(unsigned int i=0; i < l; i++) {
@@ -287,7 +287,7 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
     str = str.simplifyWhiteSpace();
 
     len = str.contains(' ') + 1;
-    khtml::Length* r = new khtml::Length[len];
+    tdehtml::Length* r = new tdehtml::Length[len];
 
     int i = 0;
     int pos = 0;
@@ -302,7 +302,7 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
     return r;
 }
 
-khtml::Length* DOMStringImpl::toLengthArray(int& len) const
+tdehtml::Length* DOMStringImpl::toLengthArray(int& len) const
 {
     TQString str(s, l);
     str = str.simplifyWhiteSpace();
@@ -313,7 +313,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
     if( len == 1 )
         return 0L;
 
-    khtml::Length* r = new khtml::Length[len];
+    tdehtml::Length* r = new tdehtml::Length[len];
 
     int i = 0;
     int pos = 0;
diff --git a/khtml/xml/dom_stringimpl.h b/tdehtml/xml/dom_stringimpl.h
index cd7128967..c8f5ce7d8 100644
--- a/khtml/xml/dom_stringimpl.h
+++ b/tdehtml/xml/dom_stringimpl.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 
 #include "dom/dom_misc.h"
-#include "misc/khtmllayout.h"
+#include "misc/tdehtmllayout.h"
 #include "misc/shared.h"
 
 #define QT_ALLOC_QCHAR_VEC( N ) (TQChar*) new char[ sizeof(TQChar)*( N ) ]
@@ -34,7 +34,7 @@
 
 namespace DOM {
 
-class DOMStringImpl : public khtml::Shared<DOMStringImpl>
+class DOMStringImpl : public tdehtml::Shared<DOMStringImpl>
 {
 private:
     DOMStringImpl(const DOMStringImpl&);
@@ -84,8 +84,8 @@ public:
     // ignores trailing garbage, unlike QString
     int toInt(bool* ok = 0) const;
 
-    khtml::Length* toLengthArray(int& len) const;
-    khtml::Length* toCoordsArray(int& len) const;
+    tdehtml::Length* toLengthArray(int& len) const;
+    tdehtml::Length* toCoordsArray(int& len) const;
     bool isLower() const;
     DOMStringImpl *lower() const;
     DOMStringImpl *upper() const;
diff --git a/khtml/xml/dom_textimpl.cpp b/tdehtml/xml/dom_textimpl.cpp
index 86317293d..aa478b922 100644
--- a/khtml/xml/dom_textimpl.cpp
+++ b/tdehtml/xml/dom_textimpl.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 static DOMString escapeHTML( const DOMString& in )
 {
diff --git a/khtml/xml/dom_textimpl.h b/tdehtml/xml/dom_textimpl.h
index 07e4909f6..07d2c0011 100644
--- a/khtml/xml/dom_textimpl.h
+++ b/tdehtml/xml/dom_textimpl.h
@@ -127,8 +127,8 @@ public:
     virtual bool isTextNode() const { return true; }
     virtual Id id() const;
     virtual void attach();
-    virtual bool rendererIsNeeded(khtml::RenderStyle *);
-    virtual khtml::RenderObject *createRenderer(khtml::RenderArena *, khtml::RenderStyle *);
+    virtual bool rendererIsNeeded(tdehtml::RenderStyle *);
+    virtual tdehtml::RenderObject *createRenderer(tdehtml::RenderArena *, tdehtml::RenderStyle *);
     virtual void recalcStyle( StyleChange = NoChange );
     virtual bool childTypeAllowed( unsigned short type );
 
diff --git a/khtml/xml/dom_xmlimpl.cpp b/tdehtml/xml/dom_xmlimpl.cpp
index 121ad436a..121ad436a 100644
--- a/khtml/xml/dom_xmlimpl.cpp
+++ b/tdehtml/xml/dom_xmlimpl.cpp
diff --git a/khtml/xml/dom_xmlimpl.h b/tdehtml/xml/dom_xmlimpl.h
index d88dc041f..29ad1471f 100644
--- a/khtml/xml/dom_xmlimpl.h
+++ b/tdehtml/xml/dom_xmlimpl.h
@@ -28,7 +28,7 @@
 
 #include <tqxml.h>
 
-namespace khtml {
+namespace tdehtml {
 class CachedCSSStyleSheet;
 }
 
@@ -123,7 +123,7 @@ protected:
 };
 
 
-class ProcessingInstructionImpl : public NodeBaseImpl, private khtml::CachedObjectClient
+class ProcessingInstructionImpl : public NodeBaseImpl, private tdehtml::CachedObjectClient
 {
 public:
     ProcessingInstructionImpl(DocumentImpl *doc);
@@ -159,7 +159,7 @@ protected:
     DOMStringImpl *m_target;
     DOMStringImpl *m_data;
     DOMStringImpl *m_localHref;
-    khtml::CachedCSSStyleSheet *m_cachedSheet;
+    tdehtml::CachedCSSStyleSheet *m_cachedSheet;
     CSSStyleSheetImpl *m_sheet;
 };
 
diff --git a/khtml/xml/xml_tokenizer.cpp b/tdehtml/xml/xml_tokenizer.cpp
index 7c043815a..2ee90097b 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/tdehtml/xml/xml_tokenizer.cpp
@@ -32,14 +32,14 @@
 #include "misc/htmlattrs.h"
 #include "misc/loader.h"
 
-#include "khtmlview.h"
-#include "khtml_part.h"
+#include "tdehtmlview.h"
+#include "tdehtml_part.h"
 #include <tqvariant.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace DOM;
-using namespace khtml;
+using namespace tdehtml;
 
 XMLIncrementalSource::XMLIncrementalSource()
     : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ),
@@ -91,7 +91,7 @@ void XMLIncrementalSource::setFinished( bool finished )
     m_finished = finished;
 }
 
-XMLHandler::XMLHandler(DocumentImpl *_doc, KHTMLView *_view)
+XMLHandler::XMLHandler(DocumentImpl *_doc, TDEHTMLView *_view)
     : errorLine(0)
 {
     m_doc = _doc;
@@ -390,7 +390,7 @@ bool XMLHandler::unparsedEntityDecl(const TQString &/*name*/, const TQString &/*
 
 //------------------------------------------------------------------------------
 
-XMLTokenizer::XMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view)
+XMLTokenizer::XMLTokenizer(DOM::DocumentImpl *_doc, TDEHTMLView *_view)
     : m_handler(_doc,_view)
 {
     m_doc = _doc;
diff --git a/khtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h
index 355c41b74..f89e5eb2f 100644
--- a/khtml/xml/xml_tokenizer.h
+++ b/tdehtml/xml/xml_tokenizer.h
@@ -31,9 +31,9 @@
 #include "misc/loader_client.h"
 #include "misc/stringit.h"
 
-class KHTMLView;
+class TDEHTMLView;
 
-namespace khtml {
+namespace tdehtml {
     class CachedObject;
     class CachedScript;
 }
@@ -46,12 +46,12 @@ namespace DOM {
     class HTMLScriptElementImpl;
 }
 
-namespace khtml {
+namespace tdehtml {
 
 class XMLHandler : public TQXmlDefaultHandler
 {
 public:
-    XMLHandler(DOM::DocumentImpl *_doc, KHTMLView *_view);
+    XMLHandler(DOM::DocumentImpl *_doc, TDEHTMLView *_view);
     virtual ~XMLHandler();
 
     // return the error protocol if parsing failed
@@ -101,7 +101,7 @@ private:
 private:
     TQString errorProt;
     DOM::DocumentImpl *m_doc;
-    KHTMLView *m_view;
+    TDEHTMLView *m_view;
     TQPtrStack<DOM::NodeImpl> m_nodes;
     DOM::NodeImpl *m_rootNode;
 
@@ -124,7 +124,7 @@ public:
     // script output must be prepended, while new data
     // received during executing a script must be appended, hence the
     // extra bool to be able to distinguish between both cases. document.write()
-    // always uses false, while khtmlpart uses true
+    // always uses false, while tdehtmlpart uses true
     virtual void write( const TokenizerString &str, bool appendData) = 0;
     virtual void end() = 0;
     virtual void finish() = 0;
@@ -159,10 +159,10 @@ private:
     bool         m_finished;
 };
 
-class XMLTokenizer : public Tokenizer, public khtml::CachedObjectClient
+class XMLTokenizer : public Tokenizer, public tdehtml::CachedObjectClient
 {
 public:
-    XMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0);
+    XMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0);
     virtual ~XMLTokenizer();
     virtual void begin();
     virtual void write( const TokenizerString &str, bool );
@@ -171,21 +171,21 @@ public:
     virtual void setAutoClose(bool b=true) { tqWarning("XMLTokenizer::setAutoClose: stub."); (void)b; }
 
     // from CachedObjectClient
-    void notifyFinished(khtml::CachedObject *finishedObj);
+    void notifyFinished(tdehtml::CachedObject *finishedObj);
 
     virtual bool isWaitingForScripts() const;
     virtual bool isExecutingScript() const { return false; }
 
 protected:
     DOM::DocumentImpl *m_doc;
-    KHTMLView *m_view;
+    TDEHTMLView *m_view;
 
     void executeScripts();
     void addScripts(DOM::NodeImpl *n);
 
     TQPtrList<DOM::HTMLScriptElementImpl> m_scripts;
     TQPtrListIterator<DOM::HTMLScriptElementImpl> *m_scriptsIt;
-    khtml::CachedScript *m_cachedScript;
+    tdehtml::CachedScript *m_cachedScript;
 
     XMLHandler m_handler;
     TQXmlSimpleReader m_reader;
diff --git a/kio/CMakeLists.txt b/tdeio/CMakeLists.txt
index c89f33e99..826fbf743 100644
--- a/kio/CMakeLists.txt
+++ b/tdeio/CMakeLists.txt
@@ -14,11 +14,11 @@ add_definitions(
 )
 
 add_subdirectory( kssl )
-add_subdirectory( kio )
+add_subdirectory( tdeio )
 add_subdirectory( bookmarks )
-add_subdirectory( kfile )
+add_subdirectory( tdefile )
 add_subdirectory( pics )
-add_subdirectory( kioexec )
+add_subdirectory( tdeioexec )
 add_subdirectory( httpfilter )
 add_subdirectory( misc )
 add_subdirectory( kpasswdserver )
@@ -41,10 +41,10 @@ install( FILES magic DESTINATION ${MIME_INSTALL_DIR} )
 install( FILES
     application.desktop kurifilterplugin.desktop
     kcomprfilter.desktop kscan.desktop kdatatool.desktop
-    kfileplugin.desktop kcmodule.desktop
+    tdefileplugin.desktop tdecmodule.desktop
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
-install( FILES kioslave.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+install( FILES tdeioslave.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( PROGRAMS useragent.pl proxytype.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 install( FILES renamedlgplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install( FILES kpasswdserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
@@ -56,16 +56,16 @@ if( HAVE_ELFICON )
 endif( HAVE_ELFICON )
 
 
-##### libkio ####################################
+##### libtdeio ####################################
 
-set( target kio )
+set( target tdeio )
 
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
 
 tde_add_library( ${target} SHARED
   SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
   VERSION 4.2.0
-  EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
-  LINK ltdlc-static tdeui-shared tdesu-shared kwalletclient-shared ${LIBR_LIBRARIES}
+  EMBED kssl-static tdeiocore-static tdesycoca-static kbookmarks-static tdefile-static ${ELFICON_STATIC_LIB}
+  LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kio/DESIGN b/tdeio/DESIGN
index c84bd2182..22307c5c0 100644
--- a/kio/DESIGN
+++ b/tdeio/DESIGN
@@ -1,8 +1,8 @@
 DESIGN:
 =======
 
-libkio uses kioslaves (separate processes) that handle a given protocol.
-Launching those slaves is taken care of by the tdeinit/klauncher tandem,
+libtdeio uses tdeioslaves (separate processes) that handle a given protocol.
+Launching those slaves is taken care of by the tdeinit/tdelauncher tandem,
 which are notified by DCOP.
 
 Connection is the most low-level class, the one that encapsulates the pipe.
@@ -164,7 +164,7 @@ GUI daemon which could be provided in several implementations - examples
 are popup dialogs (most are annoyed by them, like me :) or a kicker applet
 or something completely different. This would also remove the dependency on
 libtdeui (I hope).
-Conclusion: kio_uiserver is this single GUI daemon, but the dependency on
+Conclusion: tdeio_uiserver is this single GUI daemon, but the dependency on
 libtdeui couldn't be removed (for many reasons, including Job::showErrorDialog())
 
 A. progress handling
@@ -190,7 +190,7 @@ B. customized progress dialogs
  This will be similar to what we had before.
 
  - ProgressBase class that all other dialogs will inherit.
-    will contain an initialization method setJob( KIO::Job*) for apps of the
+    will contain an initialization method setJob( TDEIO::Job*) for apps of the
     second class (see A.2 above), that will connect job's signals to dialog's
     slots
 
diff --git a/kio/DESIGN.krun b/tdeio/DESIGN.krun
index 948ef79a3..9ac31f433 100644
--- a/kio/DESIGN.krun
+++ b/tdeio/DESIGN.krun
@@ -14,9 +14,9 @@ existing slave will be re-used and the request resumed.
 
 * When the client is an external process, the on-hold-slave should be 
 removed from the job-scheduler and should connect itself with
-klauncher. This is hard because it must ensure that the external 
+tdelauncher. This is hard because it must ensure that the external 
 program does not request the slave before it has been transfered to
-klauncher. (Status: to be done)
+tdelauncher. (Status: to be done)
 
 * When a slave is on hold but not used for a certain period of time, 
 or, when another slave is put on hold, the slave should be killed.
diff --git a/kio/DESIGN.metadata b/tdeio/DESIGN.metadata
index 9890c961d..bba81addf 100644
--- a/kio/DESIGN.metadata
+++ b/tdeio/DESIGN.metadata
@@ -109,7 +109,7 @@ ssl_proxied	bool		Presently exists only if true.  Set in TCPSlaveBase to indicat
 
 main_frame_request	bool	Actually for SSL, this is set in the caller to tell TCPSlaveBase if this is the request for the main frame of an html page. (dfault: true)
 
-HTTP-Version		string	The HTTP version in use for kio_http (set by http)
+HTTP-Version		string	The HTTP version in use for tdeio_http (set by http)
 
 PropagateHttpHeader	bool	Whether HTTP headers should be send back (read by http)
 
@@ -132,11 +132,11 @@ DefaultRemoteProtocol	string	Protocol to redirect file://<hostname>/ URLs to, de
 Examples:
 
 E.g. the following disables cookies:
-job = KIO::get( KURL("http://www.kde.org"), false, false);
+job = TDEIO::get( KURL("http://www.kde.org"), false, false);
 job->addMetaData("cookies", "none");
 
 If you want to handle cookies yourself, you can do:
-job = KIO::get( KURL("http://www.kde.org"), false, false);
+job = TDEIO::get( KURL("http://www.kde.org"), false, false);
 job->addMetaData("cookies", "manual");
 job->addMetaData("setcookies", "Cookie: foo=bar; gnat=gnork");
 
diff --git a/kio/DESIGN.mimetypes b/tdeio/DESIGN.mimetypes
index 7f1d81b11..7f1d81b11 100644
--- a/kio/DESIGN.mimetypes
+++ b/tdeio/DESIGN.mimetypes
diff --git a/kio/DESKTOP_ENTRY_STANDARD b/tdeio/DESKTOP_ENTRY_STANDARD
index e19cc24c8..e19cc24c8 100644
--- a/kio/DESKTOP_ENTRY_STANDARD
+++ b/tdeio/DESKTOP_ENTRY_STANDARD
diff --git a/kio/Mainpage.dox b/tdeio/Mainpage.dox
index bb7f2796f..7cb127838 100644
--- a/kio/Mainpage.dox
+++ b/tdeio/Mainpage.dox
@@ -6,8 +6,8 @@
  * this to provide its network-enabled file management.
  *
  * The easiest way to use this library from a %Trinity application is via the
- * KIO::NetAccess class (for easy synchronous access) or via the
- * KIO::Job class (for more complex asynchronous jobs).
+ * TDEIO::NetAccess class (for easy synchronous access) or via the
+ * TDEIO::Job class (for more complex asynchronous jobs).
  *
  * This library also implements the System Configuration Cache (KSycoca).
  *
@@ -28,7 +28,7 @@
  * KServiceTypeProfile:
  * Stores the user's preferences for services bound to mimetypes/servicetypes.
  *
- * KTrader:
+ * TDETrader:
  * Use it to query for which services implement a given mimetype/servicetype.
  * Has its own language, in order to allow complex queries.
  *
@@ -39,12 +39,12 @@
  * its building blocks and some other widgets, making use of the file dialog.
  *
  * The file dialog provides different views; there is a vertically scrolling
- * view based on KListView, showing things like filename, file size,
+ * view based on TDEListView, showing things like filename, file size,
  * permissions etc. in separate columns. And there is a horizontally scrolling
- * view based on KIconView. Additionally, there are some compound views,
+ * view based on TDEIconView. Additionally, there are some compound views,
  * like a view using the icon-view for files on the right side and another
  * view for directories on the left. A view, that shows a preview for the
- * currently selected file (using KIO::PreviewJob to generate previews)
+ * currently selected file (using TDEIO::PreviewJob to generate previews)
  * and any other view to show the files is also available.
  *
  * All those views share a common baseclass, named KFileView, which
@@ -55,7 +55,7 @@
  * to them is KDirOperator. It allows the user to switch between different
  * views.
  *
- * KFileTreeView is a KListView based widget that displays files and/or
+ * KFileTreeView is a TDEListView based widget that displays files and/or
  * directories as a tree. It does not implement the KFileView interface,
  * however, so it can't be used with KDirOperator.
  *
@@ -67,8 +67,8 @@
  * The KPropertiesDialog is extensible with plugin-pages via the
  * KPropsDlgPlugin class.
  *
- * The KIconDialog class shows a list of icons installed on the system (as
- * accessible via KIconLoader) and allows the user to select one.
+ * The TDEIconDialog class shows a list of icons installed on the system (as
+ * accessible via TDEIconLoader) and allows the user to select one.
  *
  * KOpenWithDlg implements a dialog to choose an application from, that is
  * to be run, e.g. to let the user choose an application to open a file/url
@@ -97,10 +97,10 @@
  * The base class for all views to be used with KDirOperator.
  *
  * KFileIconView:
- * The KFileView based on KIconView.
+ * The KFileView based on TDEIconView.
  *
  * KFileDetailView:
- * The KFileView based on KListView.
+ * The KFileView based on TDEListView.
  *
  * KFilePreview:
  * The KFileView, combining a widget showing preview for a selected file
diff --git a/kio/Makefile.am b/tdeio/Makefile.am
index 4a28986ef..aa23fcb5a 100644
--- a/kio/Makefile.am
+++ b/tdeio/Makefile.am
@@ -20,30 +20,30 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(srcdir)/.. $(all_includes) $(SSL_INCLUDES)
 
-SUBDIRS = kssl kio bookmarks kfile . pics tests kioexec httpfilter misc kpasswdserver
+SUBDIRS = kssl tdeio bookmarks tdefile . pics tests tdeioexec httpfilter misc kpasswdserver
 
-lib_LTLIBRARIES = libkio.la
+lib_LTLIBRARIES = libtdeio.la
 
-libkio_la_SOURCES = dummy.cpp
+libtdeio_la_SOURCES = dummy.cpp
 
-libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
+libtdeio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
 	$(KDE_MT_LDFLAGS)
-libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
-	kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
+libtdeio_la_LIBADD = kssl/libkssl.la tdeio/libtdeiocore.la \
+	tdeio/libtdesycoca.la bookmarks/libkbookmarks.la tdefile/libtdefile.la \
 	../tdeui/libtdeui.la ../tdesu/libtdesu.la \
-	../kwallet/client/libkwalletclient.la \
+	../tdewallet/client/libtdewalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 kde_mime_DATA = magic
 kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
                         kcomprfilter.desktop kscan.desktop kdatatool.desktop \
-                        kfileplugin.desktop kcmodule.desktop
+                        tdefileplugin.desktop tdecmodule.desktop
 
 EXTRA_DIST = $(kde_mime_DATA)
 
-update_DATA = kioslave.upd
+update_DATA = tdeioslave.upd
 update_SCRIPTS = useragent.pl proxytype.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 servicetype_DATA = renamedlgplugin.desktop
 servicetypedir = $(kde_servicetypesdir)
@@ -58,10 +58,10 @@ dummy.cpp:
 	echo >dummy.cpp
 
 messages:
-	$(EXTRACTRC) `find . ../kioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
-	$(XGETTEXT) `find . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot
+	$(EXTRACTRC) `find . ../tdeioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
+	$(XGETTEXT) `find . ../tdeioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/tdeio.pot
 	rm -f rc.cpp
 
-DOXYGEN_REFERENCES = tdecore tdefx kjs dcop tdeui kio/kio kio/kfile
+DOXYGEN_REFERENCES = tdecore tdefx kjs dcop tdeui tdeio/tdeio tdeio/tdefile
 DOXYGEN_EXCLUDE = kssl/kssl
 include ../admin/Doxyfile.am
diff --git a/kio/application.desktop b/tdeio/application.desktop
index d9e9fc3c2..d9e9fc3c2 100644
--- a/kio/application.desktop
+++ b/tdeio/application.desktop
diff --git a/kio/bookmarks/CMakeLists.txt b/tdeio/bookmarks/CMakeLists.txt
index 7c2fd72c6..93121cbac 100644
--- a/kio/bookmarks/CMakeLists.txt
+++ b/tdeio/bookmarks/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 
diff --git a/kio/bookmarks/Makefile.am b/tdeio/bookmarks/Makefile.am
index 63b535e13..e1ec3a8df 100644
--- a/kio/bookmarks/Makefile.am
+++ b/tdeio/bookmarks/Makefile.am
@@ -17,7 +17,7 @@
 #    Boston, MA 02110-1301, USA.
 
 
-INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx -I$(top_builddir)/kio/kio $(all_includes)
+INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx -I$(top_builddir)/tdeio/tdeio $(all_includes)
 
 noinst_LTLIBRARIES  = libkbookmarks.la
 
diff --git a/kio/bookmarks/dptrtemplate.h b/tdeio/bookmarks/dptrtemplate.h
index dbc059e7e..dbc059e7e 100644
--- a/kio/bookmarks/dptrtemplate.h
+++ b/tdeio/bookmarks/dptrtemplate.h
diff --git a/kio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index 44b8b496c..8bbaa5e43 100644
--- a/kio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -25,10 +25,10 @@
 #include <kmimetype.h>
 #include <kstringhandler.h>
 #include <kinputdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <assert.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kbookmarkmanager.h>
 
@@ -89,9 +89,9 @@ KBookmark KBookmarkGroup::next( const KBookmark & current ) const
 // firstElement() and lastElement()
 TQDomElement KBookmarkGroup::nextKnownTag( TQDomElement start, bool goNext ) const
 {
-    static const TQString & bookmark = KGlobal::staticQString("bookmark");
-    static const TQString & folder = KGlobal::staticQString("folder");
-    static const TQString & separator = KGlobal::staticQString("separator");
+    static const TQString & bookmark = TDEGlobal::staticQString("bookmark");
+    static const TQString & folder = TDEGlobal::staticQString("folder");
+    static const TQString & separator = TDEGlobal::staticQString("separator");
 
     for( TQDomNode n = start; !n.isNull(); )
     {
diff --git a/kio/bookmarks/kbookmark.h b/tdeio/bookmarks/kbookmark.h
index 84f177522..4e5dc9149 100644
--- a/kio/bookmarks/kbookmark.h
+++ b/tdeio/bookmarks/kbookmark.h
@@ -28,7 +28,7 @@
 class KBookmarkManager;
 class KBookmarkGroup;
 
-class KIO_EXPORT KBookmark
+class TDEIO_EXPORT KBookmark
 {
     friend class KBookmarkGroup;
 public:
@@ -196,7 +196,7 @@ private:
 /**
  * A group of bookmarks
  */
-class KIO_EXPORT KBookmarkGroup : public KBookmark
+class TDEIO_EXPORT KBookmarkGroup : public KBookmark
 {
 public:
     /**
@@ -315,7 +315,7 @@ private:
 /**
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkGroupTraverser {
+class TDEIO_EXPORT KBookmarkGroupTraverser {
 protected:
     virtual ~KBookmarkGroupTraverser() { ; }
     void traverse(const KBookmarkGroup &);
diff --git a/kio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cc
index 08c34061b..5c5f64ecc 100644
--- a/kio/bookmarks/kbookmarkbar.cc
+++ b/tdeio/bookmarks/kbookmarkbar.cc
@@ -28,11 +28,11 @@
 #include <kbookmarkmenu.h>
 #include <kdebug.h>
 
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
-#include <kconfig.h>
-#include <kpopupmenu.h>
+#include <tdeconfig.h>
+#include <tdepopupmenu.h>
 
 #include "kbookmarkdrag.h"
 #include "kbookmarkmenu_p.h"
@@ -45,10 +45,10 @@
 class KBookmarkBarPrivate : public dPtrTemplate<KBookmarkBar, KBookmarkBarPrivate>
 {
 public:
-    TQPtrList<KAction> m_actions;
+    TQPtrList<TDEAction> m_actions;
     bool m_readOnly;
     KBookmarkManager* m_filteredMgr;
-    KToolBar* m_sepToolBar;
+    TDEToolBar* m_sepToolBar;
     int m_sepIndex;
     bool m_atFirst;
     TQString m_dropAddress;
@@ -85,8 +85,8 @@ private:
 };
 
 KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr,
-                            KBookmarkOwner *_owner, KToolBar *_toolBar,
-                            KActionCollection *coll,
+                            KBookmarkOwner *_owner, TDEToolBar *_toolBar,
+                            TDEActionCollection *coll,
                             TQObject *parent, const char *name )
     : TQObject( parent, name ), m_pOwner(_owner), m_toolBar(_toolBar),
       m_actionCollection( coll ), m_pManager(mgr)
@@ -150,7 +150,7 @@ KBookmarkBar::~KBookmarkBar()
 
 void KBookmarkBar::clear()
 {
-    TQPtrListIterator<KAction> it( dptr()->m_actions );
+    TQPtrListIterator<TDEAction> it( dptr()->m_actions );
     m_toolBar->clear();
     for (; it.current(); ++it ) {
         (*it)->unplugAll();
@@ -199,9 +199,9 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
                 m_toolBar->insertLineSeparator();
             else
             {
-                KAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
-                connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
-                        this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+                TDEAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
+                connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+                        this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
 
                 action->setProperty( "url", bm.url().url() );
                 action->setProperty( "address", bm.address() );
@@ -215,7 +215,7 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
         }
         else
         {
-            KActionMenu *action = new KBookmarkActionMenu( text, bm.icon(),
+            TDEActionMenu *action = new KBookmarkActionMenu( text, bm.icon(),
                                                            m_actionCollection,
                                                            "bookmarkbar-actionmenu");
             action->setProperty( "address", bm.address() );
@@ -223,8 +223,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
             action->setDelayed( false );
 
             // this flag doesn't have any UI yet
-            KGlobal::config()->setGroup( "Settings" );
-            bool addEntriesBookmarkBar = KGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true);
+            TDEGlobal::config()->setGroup( "Settings" );
+            bool addEntriesBookmarkBar = TDEGlobal::config()->readBoolEntry("AddEntriesBookmarkBar",true);
 
             KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(),
                                                     m_actionCollection, false, addEntriesBookmarkBar,
@@ -252,11 +252,11 @@ bool KBookmarkBar::isReadOnly() const
     return dptr()->m_readOnly;
 }
 
-void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state )
+void KBookmarkBar::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/, TQt::ButtonState state )
 {
     if (!m_pOwner) return; // this view doesn't handle bookmarks...
 
-    const KAction* action = dynamic_cast<const KAction *>(sender());
+    const TDEAction* action = dynamic_cast<const TDEAction *>(sender());
     if(action)
     {
         const TQString & url = sender()->property("url").toString();
@@ -267,7 +267,7 @@ void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, T
 
 void KBookmarkBar::slotBookmarkSelected()
 {
-    slotBookmarkSelected(KAction::ToolBarActivation, Qt::NoButton);
+    slotBookmarkSelected(TDEAction::ToolBarActivation, Qt::NoButton);
 }
 
 static const int const_sepId = -9999; // FIXME this is ugly,
@@ -282,9 +282,9 @@ static void removeTempSep(KBookmarkBarPrivate* p)
     }
 }
 
-static KAction* findPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int id)
+static TDEAction* findPluggedAction(TQPtrList<TDEAction> actions, TDEToolBar *tb, int id)
 {
-    TQPtrListIterator<KAction> it( actions );
+    TQPtrListIterator<TDEAction> it( actions );
     for (; (*it); ++it )
         if ((*it)->isPlugged(tb, id))
             return (*it);
@@ -302,19 +302,19 @@ static KAction* findPluggedAction(TQPtrList<KAction> actions, KToolBar *tb, int
  *        returned action was dropped on
  */
 static TQString handleToolbarDragMoveEvent(
-    KBookmarkBarPrivate *p, KToolBar *tb, TQPoint pos, TQPtrList<KAction> actions,
+    KBookmarkBarPrivate *p, TDEToolBar *tb, TQPoint pos, TQPtrList<TDEAction> actions,
     bool &atFirst, KBookmarkManager *mgr
 ) {
     Q_UNUSED( mgr );
-    Q_ASSERT( actions.isEmpty() || (tb == dynamic_cast<KToolBar*>(actions.first()->container(0))) );
+    Q_ASSERT( actions.isEmpty() || (tb == dynamic_cast<TDEToolBar*>(actions.first()->container(0))) );
     p->m_sepToolBar = tb;
     p->m_sepToolBar->removeItemDelayed(const_sepId);
 
     int index = 0;
-    KToolBarButton* b;
+    TDEToolBarButton* b;
 
-    b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
-    KAction *a = 0;
+    b = dynamic_cast<TDEToolBarButton*>(tb->childAt(pos));
+    TDEAction *a = 0;
     TQString address;
     atFirst = false;
 
@@ -382,23 +382,23 @@ skipact:
 }
 
 // TODO - document!!!!
-static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions,
+static TDEAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<TDEAction> actions,
 	                                     KBookmarkManager * /*mgr*/, TQPoint & pt)
 {
-    KAction *act = actions.first();
+    TDEAction *act = actions.first();
     if (!act) {
         return 0;
     }
 
-    KToolBar *tb = dynamic_cast<KToolBar*>(act->container(0));
+    TDEToolBar *tb = dynamic_cast<TDEToolBar*>(act->container(0));
     Q_ASSERT(tb);
 
-    KToolBarButton *b;
-    b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
+    TDEToolBarButton *b;
+    b = dynamic_cast<TDEToolBarButton*>(tb->childAt(pos));
     if (!b)
         return 0;
 
-    KAction *a = 0;
+    TDEAction *a = 0;
     a = findPluggedAction(actions, tb, b->id());
     Q_ASSERT(a);
     pt = tb->mapToGlobal(pos);
@@ -454,7 +454,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
         TQMouseEvent *mev = (TQMouseEvent*)e;
 
         TQPoint pt;
-        KAction *_a;
+        TDEAction *_a;
 
         // FIXME, see how this holds up on an empty toolbar
         _a = handleToolbarMouseButton( mev->pos(), dptr()->m_actions, m_pManager, pt );
@@ -463,7 +463,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
             dptr()->m_highlightedAddress = _a->property("address").toString();
             KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress );
             RMB::begin_rmb_action(this);
-            KPopupMenu *pm = new KPopupMenu;
+            TDEPopupMenu *pm = new TDEPopupMenu;
             rmbSelf(this)->fillContextMenu( pm, dptr()->m_highlightedAddress, 0 );
             emit aboutToShowContextMenu( rmbSelf(this)->atAddress( dptr()->m_highlightedAddress ), pm );
             rmbSelf(this)->fillContextMenu2( pm, dptr()->m_highlightedAddress, 0 );
@@ -510,7 +510,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
             return false;
         bool _atFirst;
         TQString dropAddress;
-        KToolBar *tb = (KToolBar*)o;
+        TDEToolBar *tb = (TDEToolBar*)o;
         dropAddress = handleToolbarDragMoveEvent(dptr(), tb, dme->pos(), dptr()->m_actions, _atFirst, m_pManager);
         if (!dropAddress.isNull())
         {
diff --git a/kio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h
index 310c1933d..93241cdaf 100644
--- a/kio/bookmarks/kbookmarkbar.h
+++ b/tdeio/bookmarks/kbookmarkbar.h
@@ -25,13 +25,13 @@
 #include <tqguardedptr.h>
 #include <tqptrlist.h>
 #include <kbookmark.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
-class KToolBar;
+class TDEToolBar;
 class KBookmarkMenu;
 class KBookmarkOwner;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
 class TQPopupMenu;
 
 /**
@@ -39,7 +39,7 @@ class TQPopupMenu;
  * identical to using KBookmarkMenu so follow the directions
  * there.
  */
-class KIO_EXPORT KBookmarkBar : public TQObject
+class TDEIO_EXPORT KBookmarkBar : public TQObject
 {
     Q_OBJECT
     
@@ -52,14 +52,14 @@ public:
      * @param owner implementation of the KBookmarkOwner interface (callbacks)
      * @param toolBar toolbar to fill
      * 
-     * The KActionCollection pointer argument is now obsolete.
+     * The TDEActionCollection pointer argument is now obsolete.
      *
      * @param parent the parent widget for the bookmark toolbar
      * @param name the internal name for the bookmark toolbar
      */
     KBookmarkBar( KBookmarkManager* manager,
-                  KBookmarkOwner *owner, KToolBar *toolBar,
-                  KActionCollection *,
+                  KBookmarkOwner *owner, TDEToolBar *toolBar,
+                  TDEActionCollection *,
                   TQObject *parent = 0L, const char *name = 0L);
 
     virtual ~KBookmarkBar();
@@ -98,7 +98,7 @@ public slots:
     /**
      * @since 3.4
      */
-    void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state );
+    void slotBookmarkSelected( TDEAction::ActivationReason reason, TQt::ButtonState state );
     
     /// @since 3.2
     void slotRMBActionRemove( int );
@@ -119,8 +119,8 @@ private:
     KBookmarkGroup getToolbar();
 
     KBookmarkOwner *m_pOwner;
-    TQGuardedPtr<KToolBar> m_toolBar;
-    KActionCollection *m_actionCollection;
+    TQGuardedPtr<TDEToolBar> m_toolBar;
+    TDEActionCollection *m_actionCollection;
     KBookmarkManager *m_pManager;
     TQPtrList<KBookmarkMenu> m_lstSubMenus;
 
diff --git a/kio/bookmarks/kbookmarkdombuilder.cc b/tdeio/bookmarks/kbookmarkdombuilder.cc
index 5c0882d05..5c0882d05 100644
--- a/kio/bookmarks/kbookmarkdombuilder.cc
+++ b/tdeio/bookmarks/kbookmarkdombuilder.cc
diff --git a/kio/bookmarks/kbookmarkdombuilder.h b/tdeio/bookmarks/kbookmarkdombuilder.h
index f1f712531..44fe7b170 100644
--- a/kio/bookmarks/kbookmarkdombuilder.h
+++ b/tdeio/bookmarks/kbookmarkdombuilder.h
@@ -27,7 +27,7 @@
 /**
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkDomBuilder : public TQObject {
+class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject {
    Q_OBJECT
 public:
    KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *);
diff --git a/kio/bookmarks/kbookmarkdrag.cc b/tdeio/bookmarks/kbookmarkdrag.cc
index d13893eed..d13893eed 100644
--- a/kio/bookmarks/kbookmarkdrag.cc
+++ b/tdeio/bookmarks/kbookmarkdrag.cc
diff --git a/kio/bookmarks/kbookmarkdrag.h b/tdeio/bookmarks/kbookmarkdrag.h
index c213f2d93..016bd6849 100644
--- a/kio/bookmarks/kbookmarkdrag.h
+++ b/tdeio/bookmarks/kbookmarkdrag.h
@@ -25,7 +25,7 @@
 #include <kbookmark.h>
 
 // Clipboard/dnd data : URLs + XML for bookmarks
-class KIO_EXPORT KBookmarkDrag : public TQUriDrag
+class TDEIO_EXPORT KBookmarkDrag : public TQUriDrag
 {
 public:
     static KBookmarkDrag * newDrag( const TQValueList<KBookmark> & bookmarks,
diff --git a/kio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cc
index 30c52bdb8..ee33612a2 100644
--- a/kio/bookmarks/kbookmarkexporter.cc
+++ b/tdeio/bookmarks/kbookmarkexporter.cc
@@ -24,7 +24,7 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kbookmarkmanager.h"
 #include "kbookmarkexporter.h"
diff --git a/kio/bookmarks/kbookmarkexporter.h b/tdeio/bookmarks/kbookmarkexporter.h
index 0943d6cbe..68e8f475a 100644
--- a/kio/bookmarks/kbookmarkexporter.h
+++ b/tdeio/bookmarks/kbookmarkexporter.h
@@ -29,7 +29,7 @@
 /**
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkExporterBase
+class TDEIO_EXPORT KBookmarkExporterBase
 {
 public:
     KBookmarkExporterBase(KBookmarkManager* mgr, const TQString & fileName)
diff --git a/kio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cc
index 8a31fa3d2..513f89b40 100644
--- a/kio/bookmarks/kbookmarkimporter.cc
+++ b/tdeio/bookmarks/kbookmarkimporter.cc
@@ -18,9 +18,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/kio/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h
index 8fb684c7e..6a038e03b 100644
--- a/kio/bookmarks/kbookmarkimporter.h
+++ b/tdeio/bookmarks/kbookmarkimporter.h
@@ -31,10 +31,10 @@
 /**
  * A class for importing NS bookmarks
  * KEditBookmarks uses it to insert bookmarks into its DOM tree,
- * and KActionMenu uses it to create actions directly.
+ * and TDEActionMenu uses it to create actions directly.
  * @since 3.2
  */
-class KIO_EXPORT KBookmarkImporterBase : public TQObject
+class TDEIO_EXPORT KBookmarkImporterBase : public TQObject
 {
     Q_OBJECT
 public:
@@ -84,7 +84,7 @@ private:
 /**
  * A class for importing XBEL files
  */
-class KIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser
+class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser
 {
     Q_OBJECT
 public:
diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cc
index 988e1f673..9b0cacf25 100644
--- a/kio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cc
@@ -20,11 +20,11 @@
 
 #include "kbookmarkimporter_crash.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqdir.h>
@@ -40,12 +40,12 @@
 typedef TQMap<TQString, TQString> ViewMap;
 
 // KDE 4.0: remove this BC keeping stub
-void KCrashBookmarkImporter::parseCrashLog( TQString /*filename*/, bool /*del*/ ) 
+void TDECrashBookmarkImporter::parseCrashLog( TQString /*filename*/, bool /*del*/ ) 
 {
     ;
 }
 
-ViewMap KCrashBookmarkImporterImpl::parseCrashLog_noemit( const TQString & filename, bool del ) 
+ViewMap TDECrashBookmarkImporterImpl::parseCrashLog_noemit( const TQString & filename, bool del ) 
 {
     static const int g_lineLimit = 16*1024;
 
@@ -88,12 +88,12 @@ ViewMap KCrashBookmarkImporterImpl::parseCrashLog_noemit( const TQString & filen
     return views;
 }
 
-TQStringList KCrashBookmarkImporter::getCrashLogs() 
+TQStringList TDECrashBookmarkImporter::getCrashLogs() 
 {
-    return KCrashBookmarkImporterImpl::getCrashLogs();
+    return TDECrashBookmarkImporterImpl::getCrashLogs();
 }
 
-TQStringList KCrashBookmarkImporterImpl::getCrashLogs() 
+TQStringList TDECrashBookmarkImporterImpl::getCrashLogs() 
 {
     TQMap<TQString, bool> activeLogs;
 
@@ -127,7 +127,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs()
         activeLogs[ret] = true;
     }
 
-    TQDir d( KCrashBookmarkImporterImpl().findDefaultLocation() );
+    TQDir d( TDECrashBookmarkImporterImpl().findDefaultLocation() );
     d.setSorting( TQDir::Time );
     d.setFilter( TQDir::Files );
     d.setNameFilter( "konqueror-crash-*.log" );
@@ -154,10 +154,10 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs()
     return crashFiles;
 }
 
-void KCrashBookmarkImporterImpl::parse() 
+void TDECrashBookmarkImporterImpl::parse() 
 {
     TQDict<bool> signatureMap;
-    TQStringList crashFiles = KCrashBookmarkImporterImpl::getCrashLogs();
+    TQStringList crashFiles = TDECrashBookmarkImporterImpl::getCrashLogs();
     int count = 1;
     for ( TQStringList::Iterator it = crashFiles.begin(); it != crashFiles.end(); ++it ) 
     {
@@ -185,29 +185,29 @@ void KCrashBookmarkImporterImpl::parse()
     }
 }
 
-TQString KCrashBookmarkImporter::crashBookmarksDir() 
+TQString TDECrashBookmarkImporter::crashBookmarksDir() 
 {
-    static KCrashBookmarkImporterImpl *p = 0;
+    static TDECrashBookmarkImporterImpl *p = 0;
     if (!p)
-        p = new KCrashBookmarkImporterImpl;
+        p = new TDECrashBookmarkImporterImpl;
     return p->findDefaultLocation();
 }
 
-void KCrashBookmarkImporterImpl::setShouldDelete( bool shouldDelete ) 
+void TDECrashBookmarkImporterImpl::setShouldDelete( bool shouldDelete ) 
 {
     m_shouldDelete = shouldDelete;
 }
 
-void KCrashBookmarkImporter::parseCrashBookmarks( bool del ) 
+void TDECrashBookmarkImporter::parseCrashBookmarks( bool del ) 
 {
-    KCrashBookmarkImporterImpl importer;
+    TDECrashBookmarkImporterImpl importer;
     importer.setFilename( m_fileName );
     importer.setShouldDelete( del );
     importer.setupSignalForwards( &importer, this );
     importer.parse();
 }
 
-TQString KCrashBookmarkImporterImpl::findDefaultLocation( bool ) const 
+TQString TDECrashBookmarkImporterImpl::findDefaultLocation( bool ) const 
 {
     return locateLocal( "tmp", "" );
 }
diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h
index a5ae08d96..ab3e43aea 100644
--- a/kio/bookmarks/kbookmarkimporter_crash.h
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.h
@@ -34,12 +34,12 @@
  * A class for importing all crash sessions as bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED TDECrashBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
-    KCrashBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
-    ~KCrashBookmarkImporter() {}
+    TDECrashBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
+    ~TDECrashBookmarkImporter() {}
     void parseCrashBookmarks( bool del = true );
     static TQString crashBookmarksDir( );
     static TQStringList getCrashLogs(); // EMPTY!
@@ -57,10 +57,10 @@ protected:
  * A class for importing all crash sessions as bookmarks
  * @since 3.2
  */
-class KIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT TDECrashBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
-    KCrashBookmarkImporterImpl() : m_shouldDelete(false) { }
+    TDECrashBookmarkImporterImpl() : m_shouldDelete(false) { }
     void setShouldDelete(bool);
     virtual void parse();
     virtual TQString findDefaultLocation(bool forSaving = false) const;
@@ -68,7 +68,7 @@ public:
 private:
     bool m_shouldDelete;
     TQMap<TQString, TQString> parseCrashLog_noemit( const TQString & filename, bool del );
-    class KCrashBookmarkImporterImplPrivate *d;
+    class TDECrashBookmarkImporterImplPrivate *d;
 };
 
 #endif
diff --git a/kio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cc
index 8d1372194..d588517a3 100644
--- a/kio/bookmarks/kbookmarkimporter_ie.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.cc
@@ -18,9 +18,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/tdeio/bookmarks/kbookmarkimporter_ie.h
index eddf20f41..b1b7c651c 100644
--- a/kio/bookmarks/kbookmarkimporter_ie.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.h
@@ -33,7 +33,7 @@
  * A class for importing IE bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
@@ -62,7 +62,7 @@ protected:
  * A class for importing IE bookmarks
  * @since 3.2
  */
-class KIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
     KIEBookmarkImporterImpl() { }
@@ -75,7 +75,7 @@ private:
 /*
  * @since 3.2
  */
-class KIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase
+class TDEIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase
 {
 public:
     KIEBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & path)
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
index 49999e675..95937f890 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
@@ -19,9 +19,9 @@
 */
 
 #include "kbookmarkimporter_kde1.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
@@ -81,8 +81,8 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString &
                 parentElem.appendChild( groupElem );
                 TQDomElement textElem = m_pDoc->createElement( "title" );
                 groupElem.appendChild( textElem );
-                textElem.appendChild( m_pDoc->createTextNode( KIO::decodeFileName( ep->d_name ) ) );
-                if ( KIO::decodeFileName( ep->d_name ) == "Toolbar" )
+                textElem.appendChild( m_pDoc->createTextNode( TDEIO::decodeFileName( ep->d_name ) ) );
+                if ( TDEIO::decodeFileName( ep->d_name ) == "Toolbar" )
                     groupElem.setAttribute("toolbar","yes");
                 scanIntern( groupElem, file.path() );
             }
@@ -136,7 +136,7 @@ void KBookmarkImporter::parseBookmark( TQDomElement & parentElem, TQCString _tex
     if (icon.right( 4 ) == ".xpm" ) // prevent warnings
         icon.truncate( icon.length() - 4 );
 
-    TQString text = KIO::decodeFileName( TQString::fromLocal8Bit(_text) );
+    TQString text = TDEIO::decodeFileName( TQString::fromLocal8Bit(_text) );
     if ( text.length() > 8 && text.right( 8 ) == ".desktop" )
         text.truncate( text.length() - 8 );
     if ( text.length() > 7 && text.right( 7 ) == ".kdelnk" )
diff --git a/kio/bookmarks/kbookmarkimporter_kde1.h b/tdeio/bookmarks/kbookmarkimporter_kde1.h
index 7e6ad2395..5af4f04e9 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.h
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.h
@@ -31,7 +31,7 @@
  * Separated from KBookmarkManager to save memory (we throw this one
  * out once the import is done)
  */
-class KIO_EXPORT KBookmarkImporter
+class TDEIO_EXPORT KBookmarkImporter
 {
 public:
     KBookmarkImporter( TQDomDocument * doc ) : m_pDoc(doc) {}
diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cc
index 5521bee7e..29960ce51 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.cc
@@ -23,9 +23,9 @@
 #include "kbookmarkimporter.h"
 #include "kbookmarkexporter.h"
 #include "kbookmarkmanager.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/tdeio/bookmarks/kbookmarkimporter_ns.h
index fdf79a3b9..10844fc63 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.h
@@ -34,7 +34,7 @@
  * A class for importing NS bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
@@ -64,7 +64,7 @@ protected:
  * utf8 defaults to off
  * @since 3.2
  */
-class KIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
     KNSBookmarkImporterImpl() : m_utf8(false) { }
@@ -81,7 +81,7 @@ private:
  * utf8 defaults to on
  * @since 3.2
  */
-class KIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl
+class TDEIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl
 {
 public:
     KMozillaBookmarkImporterImpl() { setUtf8(true); }
@@ -94,7 +94,7 @@ private:
  * Warning, it overwrites the existing bookmarks.html file !
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KNSBookmarkExporter
+class TDEIO_EXPORT_DEPRECATED KNSBookmarkExporter
 {
 public:
     KNSBookmarkExporter(KBookmarkManager* mgr, const TQString & fileName)
@@ -113,7 +113,7 @@ protected:
 /**
  * @since 3.2
  */
-class KIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase
+class TDEIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase
 {
 public:
     KNSBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & fileName)
diff --git a/kio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cc
index 45ac1a7ca..0609c7a3b 100644
--- a/kio/bookmarks/kbookmarkimporter_opera.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.cc
@@ -18,9 +18,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/tdeio/bookmarks/kbookmarkimporter_opera.h
index 0f9a3ba00..f6f1028b1 100644
--- a/kio/bookmarks/kbookmarkimporter_opera.h
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.h
@@ -32,7 +32,7 @@
  * A class for importing Opera bookmarks
  * @deprecated
  */
-class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject
+class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject
 {
     Q_OBJECT
 public:
@@ -58,7 +58,7 @@ protected:
  * A class for importing Opera bookmarks
  * @since 3.2
  */
-class KIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase
+class TDEIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase
 {
 public:
     KOperaBookmarkImporterImpl() { }
@@ -71,7 +71,7 @@ private:
 /**
  * @since 3.2
  */
-class KIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase
+class TDEIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase
 {
 public:
     KOperaBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & filename)
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index 96ce12896..60d4f2932 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -29,10 +29,10 @@
 #include <ksavefile.h>
 #include <dcopref.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -311,7 +311,7 @@ void KBookmarkManager::convertAttribute( TQDomElement elem, const TQString & old
 void KBookmarkManager::importDesktopFiles()
 {
     KBookmarkImporter importer( const_cast<TQDomDocument *>(&internalDocument()) );
-    TQString path(KGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true));
+    TQString path(TDEGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true));
     importer.import( path );
     //kdDebug(7043) << internalDocument().toCString() << endl;
 
@@ -613,23 +613,23 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser )
 
 void KBookmarkManager::slotEditBookmarks()
 {
-    KProcess proc;
+    TDEProcess proc;
     proc << TQString::fromLatin1("keditbookmarks");
     if (!dptr()->m_editorCaption.isNull())
        proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption;
     if (!dptr()->m_browserEditor)
        proc << TQString::fromLatin1("--nobrowser");
     proc << m_bookmarksFile;
-    proc.start(KProcess::DontCare);
+    proc.start(TDEProcess::DontCare);
 }
 
 void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address )
 {
-    KProcess proc;
+    TDEProcess proc;
     proc << TQString::fromLatin1("keditbookmarks")
          << TQString::fromLatin1("--address") << address
          << m_bookmarksFile;
-    proc.start(KProcess::DontCare);
+    proc.start(TDEProcess::DontCare);
 }
 
 ///////
@@ -702,7 +702,7 @@ KBookmarkSettings* KBookmarkSettings::s_self = 0;
 
 void KBookmarkSettings::readSettings()
 {
-   KConfig config("kbookmarkrc", false, false);
+   TDEConfig config("kbookmarkrc", false, false);
    config.setGroup("Bookmarks");
 
    // add bookmark dialog usage - no reparse
diff --git a/kio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h
index d076eefc7..6931e9842 100644
--- a/kio/bookmarks/kbookmarkmanager.h
+++ b/tdeio/bookmarks/kbookmarkmanager.h
@@ -50,7 +50,7 @@
  * </xbel>
  * \endcode
  */
-class KIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject
+class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject
 {
     Q_OBJECT
     K_DCOP
@@ -167,7 +167,7 @@ public:
 
     /**
      * @return true if the NS bookmarks should be dynamically shown
-     *         in the toplevel kactionmenu
+     *         in the toplevel tdeactionmenu
      * @deprecated
      */
     bool showNSBookmarks() const;
@@ -314,7 +314,7 @@ private:
  * If you wish to use your own editor or allow the user to add
  * bookmarks, you must overload this class.
  */
-class KIO_EXPORT KBookmarkOwner
+class TDEIO_EXPORT KBookmarkOwner
 {
 public:
   /**
@@ -350,7 +350,7 @@ protected:
 /**
  * @since 3.2
  */
-class KIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner
+class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner
 {
     Q_OBJECT
 public:
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index 20ce42a86..e1b00bc40 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -26,16 +26,16 @@
 #include "kbookmarkimporter_ie.h"
 #include "kbookmarkdrag.h"
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstringhandler.h>
 
@@ -77,8 +77,8 @@ static TQString makeTextNodeMod(KBookmark bk, const TQString &m_nodename, const
 /********************************************************************/
 
 KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
-                              KBookmarkOwner * _owner, KPopupMenu * _parentMenu,
-                              KActionCollection *collec, bool _isRoot, bool _add,
+                              KBookmarkOwner * _owner, TDEPopupMenu * _parentMenu,
+                              TDEActionCollection *collec, bool _isRoot, bool _add,
                               const TQString & parentAddress )
   : TQObject(),
     m_bIsRoot(_isRoot), m_bAddBookmark(_add),
@@ -96,9 +96,9 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
   if (m_actionCollection)
   {
     m_actionCollection->setHighlightingEnabled(true);
-    disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( KAction * ) ), 0, 0 );
-    connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( KAction * ) ),
-             this, TQT_SLOT( slotActionHighlighted( KAction * ) ) );
+    disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 );
+    connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ),
+             this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) );
   }
 
   m_bNSBookmark = m_parentAddress.isNull();
@@ -112,8 +112,8 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
     if ( KBookmarkSettings::self()->m_contextmenu )
     {
       (void) _parentMenu->contextMenu();
-      connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*) ),
-               this, TQT_SLOT( slotAboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*) ));
+      connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ),
+               this, TQT_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ));
     }
 
     if ( m_bIsRoot )
@@ -142,7 +142,7 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
 KBookmarkMenu::~KBookmarkMenu()
 {
   //kdDebug(7043) << "KBookmarkMenu::~KBookmarkMenu() " << this << endl;
-  TQPtrListIterator<KAction> it( m_actions );
+  TQPtrListIterator<TDEAction> it( m_actions );
   for (; it.current(); ++it )
     it.current()->unplugAll();
 
@@ -169,7 +169,7 @@ TQString KBookmarkMenu::s_highlightedAddress;
 TQString KBookmarkMenu::s_highlightedImportType;
 TQString KBookmarkMenu::s_highlightedImportLocation;
 
-void KBookmarkMenu::slotActionHighlighted( KAction* action )
+void KBookmarkMenu::slotActionHighlighted( TDEAction* action )
 {
   if (action->isA("KBookmarkActionMenu") || action->isA("KBookmarkAction"))
   {
@@ -231,12 +231,12 @@ KBookmark RMB::atAddress(const TQString & address)
   return bookmark;
 }
 
-void KBookmarkMenu::slotAboutToShowContextMenu( KPopupMenu*, int, TQPopupMenu* contextMenu )
+void KBookmarkMenu::slotAboutToShowContextMenu( TDEPopupMenu*, int, TQPopupMenu* contextMenu )
 {
   //kdDebug(7043) << "KBookmarkMenu::slotAboutToShowContextMenu" << s_highlightedAddress << endl;
   if (s_highlightedAddress.isNull())
   {
-    KPopupMenu::contextMenuFocus()->hideContextMenu();
+    TDEPopupMenu::contextMenuFocus()->hideContextMenu();
     return;
   }
   contextMenu->clear();
@@ -411,7 +411,7 @@ void RMB::slotRMBActionCopyLocation( int val )
 }
 
 void RMB::hidePopup() {
-  KPopupMenu::contextMenuFocus()->hideContextMenu();
+  TDEPopupMenu::contextMenuFocus()->hideContextMenu();
 }
 
 /********************************************************************/
@@ -467,7 +467,7 @@ void KBookmarkMenu::refill()
   //kdDebug(7043) << "KBookmarkMenu::refill()" << endl;
   m_lstSubMenus.clear();
 
-  TQPtrListIterator<KAction> it( m_actions );
+  TQPtrListIterator<TDEAction> it( m_actions );
   for (; it.current(); ++it )
     it.current()->unplug( m_parentMenu );
 
@@ -480,12 +480,12 @@ void KBookmarkMenu::refill()
 
 void KBookmarkMenu::addAddBookmarksList()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "Bookmark Tabs as Folder..." );
 
-  KAction * paAddBookmarksList = new KAction( title,
+  TDEAction * paAddBookmarksList = new TDEAction( title,
                                           "bookmarks_list_add",
                                           0,
                                           this,
@@ -500,14 +500,14 @@ void KBookmarkMenu::addAddBookmarksList()
 
 void KBookmarkMenu::addAddBookmark()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "Add Bookmark" );
 
-  KAction * paAddBookmarks = new KAction( title,
+  TDEAction * paAddBookmarks = new TDEAction( title,
                                           "bookmark_add",
-                                          m_bIsRoot && m_bAddShortcuts ? KStdAccel::addBookmark() : KShortcut(),
+                                          m_bIsRoot && m_bAddShortcuts ? TDEStdAccel::addBookmark() : TDEShortcut(),
                                           this,
                                           TQT_SLOT( slotAddBookmark() ),
                                           m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 );
@@ -520,10 +520,10 @@ void KBookmarkMenu::addAddBookmark()
 
 void KBookmarkMenu::addEditBookmarks()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
-  KAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ),
+  TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ),
                                                              m_actionCollection, "edit_bookmarks" );
   m_paEditBookmarks->plug( m_parentMenu );
   m_paEditBookmarks->setToolTip( i18n( "Edit your bookmark collection in a separate window" ) );
@@ -532,7 +532,7 @@ void KBookmarkMenu::addEditBookmarks()
 
 void KBookmarkMenu::addNewFolder()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
   TQString title = i18n( "&New Bookmark Folder..." );
@@ -540,7 +540,7 @@ void KBookmarkMenu::addNewFolder()
   while ( ( p = title.find( '&' ) ) >= 0 )
     title.remove( p, 1 );
 
-  KAction * paNewFolder = new KAction( title,
+  TDEAction * paNewFolder = new TDEAction( title,
                                        "folder_new", //"folder",
                                        0,
                                        this,
@@ -555,7 +555,7 @@ void KBookmarkMenu::addNewFolder()
 
 void KBookmarkMenu::fillBookmarkMenu()
 {
-  if (!kapp->authorizeKAction("bookmarks"))
+  if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
   if ( m_bIsRoot )
@@ -594,7 +594,7 @@ void KBookmarkMenu::fillBookmarkMenu()
           haveSep = true;
        }
 
-       KActionMenu * actionMenu;
+       TDEActionMenu * actionMenu;
        actionMenu = new KImportedBookmarksActionMenu(
                               info.name, info.type,
                               m_actionCollection, "kbookmarkmenu" );
@@ -638,9 +638,9 @@ void KBookmarkMenu::fillBookmarkMenu()
       else
       {
         //kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl;
-        KAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
-        connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
-                this, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+        TDEAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
+        connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+                this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
 
         action->setProperty( "url", bm.url().url() );
         action->setProperty( "address", bm.address() );
@@ -654,7 +654,7 @@ void KBookmarkMenu::fillBookmarkMenu()
     else
     {
       //kdDebug(7043) << "Creating bookmark submenu named " << bm.text() << endl;
-      KActionMenu * actionMenu = new KBookmarkActionMenu( text, bm.icon(),
+      TDEActionMenu * actionMenu = new KBookmarkActionMenu( text, bm.icon(),
                                                           m_actionCollection,
                                                           "kbookmarkmenu" );
       actionMenu->setProperty( "address", bm.address() );
@@ -681,7 +681,7 @@ void KBookmarkMenu::fillBookmarkMenu()
 
     if ( KBookmarkSettings::self()->m_quickactions )
     {
-      KActionMenu * actionMenu = new KActionMenu( i18n("Quick Actions"), m_actionCollection, 0L );
+      TDEActionMenu * actionMenu = new TDEActionMenu( i18n("Quick Actions"), m_actionCollection, 0L );
       fillContextMenu( actionMenu->popupMenu(), m_parentAddress, 1 );
       actionMenu->plug( m_parentMenu );
       m_actions.append( actionMenu );
@@ -743,11 +743,11 @@ void KBookmarkMenu::slotNewFolder()
   }
 }
 
-void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state )
+void KBookmarkMenu::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/, TQt::ButtonState state )
 {
   kdDebug(7043) << "KBookmarkMenu::slotBookmarkSelected()" << endl;
   if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
-  const KAction* action =  dynamic_cast<const KAction *>(sender());
+  const TDEAction* action =  dynamic_cast<const TDEAction *>(sender());
   if(action)
   {
       const TQString& url = sender()->property("url").toString();
@@ -758,7 +758,7 @@ void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/,
 
 void KBookmarkMenu::slotBookmarkSelected()
 {
-    slotBookmarkSelected(KAction::PopupMenuActivation, Qt::NoButton);
+    slotBookmarkSelected(TDEAction::PopupMenuActivation, Qt::NoButton);
 }
 
 KExtendedBookmarkOwner* KBookmarkMenu::extOwner()
@@ -1057,9 +1057,9 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin
 {
   TQString _text = KStringHandler::csqueeze(text);
   _text.replace( '&', "&&" );
-  KAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
-  connect(action, TQT_SIGNAL( activated ( KAction::ActivationReason, TQt::ButtonState )),
-          m_menu, TQT_SLOT( slotBookmarkSelected( KAction::ActivationReason, TQt::ButtonState ) ));
+  TDEAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
+  connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+          m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
   action->setProperty( "url", url );
   action->setToolTip( url );
   action->plug( mstack.top()->m_parentMenu );
@@ -1070,7 +1070,7 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt
 {
   TQString _text = KStringHandler::csqueeze(text);
   _text.replace( '&', "&&" );
-  KActionMenu * actionMenu = new KActionMenu( _text, "folder", m_actionCollection, 0L );
+  TDEActionMenu * actionMenu = new TDEActionMenu( _text, "folder", m_actionCollection, 0L );
   actionMenu->plug( mstack.top()->m_parentMenu );
   mstack.top()->m_actions.append( actionMenu );
   KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(),
@@ -1099,7 +1099,7 @@ void KBookmarkMenuNSImporter::endFolder()
 
 KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &id )
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
   config.setGroup("Bookmarks");
 
   DynMenuInfo info;
@@ -1131,7 +1131,7 @@ KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &
 
 TQStringList KBookmarkMenu::dynamicBookmarksList()
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
   config.setGroup("Bookmarks");
 
   TQStringList mlist;
@@ -1145,7 +1145,7 @@ TQStringList KBookmarkMenu::dynamicBookmarksList()
 
 void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &newMenu)
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
 
   // add group unconditionally
   config.setGroup("DynamicMenu-" + id);
diff --git a/kio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index fa0368b68..aeed441b0 100644
--- a/kio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -30,8 +30,8 @@
 #include <tqlistview.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kaction.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
 
 #include "kbookmark.h"
 #include "kbookmarkmanager.h"
@@ -43,18 +43,18 @@ class TQListView;
 class KLineEdit;
 class KBookmark;
 class KBookmarkGroup;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
 class KBookmarkOwner;
 class KBookmarkMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 /**
  * This class provides a bookmark menu.  It is typically used in
- * cooperation with KActionMenu but doesn't have to be.
+ * cooperation with TDEActionMenu but doesn't have to be.
  *
  * If you use this class by itself, then it will use KDE defaults for
  * everything -- the bookmark path, bookmark editor, bookmark launcher..
@@ -66,7 +66,7 @@ namespace KIO { class Job; }
  *
  * Using this class is very simple:
  *
- * 1) Create a popup menu (either KActionMenu or KPopupMenu will do)
+ * 1) Create a popup menu (either TDEActionMenu or TDEPopupMenu will do)
  * 2) Instantiate a new KBookmarkMenu object using the above popup
  *    menu as a parameter
  * 3) Insert your (now full) popup menu wherever you wish
@@ -76,7 +76,7 @@ namespace KIO { class Job; }
  * 1a) Reimplement your own KBookmarkOwner
  * 1b) Reimplement and instantiate your own KBookmarkManager
  */
-class KIO_EXPORT KBookmarkMenu : public TQObject
+class TDEIO_EXPORT KBookmarkMenu : public TQObject
 {
   Q_OBJECT
   friend class KBookmarkMenuNSImporter;
@@ -90,7 +90,7 @@ public:
    * @param mgr The bookmark manager to use (i.e. for reading and writing)
    * @param owner implementation of the KBookmarkOwner callback interface.
    * @param parentMenu menu to be filled
-   * @param collec parent collection for the KActions. 
+   * @param collec parent collection for the TDEActions. 
    *  Only used for other menus than the toplevel one.
    * @param root true for the toplevel menu
    * @param add true to show the "Add Bookmark" and "New Folder" entries
@@ -102,8 +102,8 @@ public:
    * An _empty_ parentAddress denotes the toplevel bookmark menu
    */
   KBookmarkMenu( KBookmarkManager* mgr,
-                 KBookmarkOwner * owner, KPopupMenu * parentMenu,
-                 KActionCollection * collec, bool root, bool add = true,
+                 KBookmarkOwner * owner, TDEPopupMenu * parentMenu,
+                 TDEActionCollection * collec, bool root, bool add = true,
                  const TQString & parentAddress = "" );
 
   ~KBookmarkMenu();
@@ -169,8 +169,8 @@ public slots: // public for bookmark bar
 
 protected slots:
   void slotAboutToShow();
-  void slotAboutToShowContextMenu( KPopupMenu *, int, TQPopupMenu * );
-  void slotActionHighlighted( KAction * );
+  void slotAboutToShowContextMenu( TDEPopupMenu *, int, TQPopupMenu * );
+  void slotActionHighlighted( TDEAction * );
 
   void slotRMBActionRemove( int );
   void slotRMBActionInsert( int );
@@ -182,7 +182,7 @@ protected slots:
   /**
    * @ since 3.4
    */
-  void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state );
+  void slotBookmarkSelected( TDEAction::ActivationReason reason, TQt::ButtonState state );
   void slotAddBookmarksList();
   void slotAddBookmark();
   void slotNewFolder();
@@ -214,16 +214,16 @@ protected:
    * The menu in which we plug our actions.
    * Supplied in the constructor.
    */
-  KPopupMenu * m_parentMenu;
+  TDEPopupMenu * m_parentMenu;
   /**
    * List of our sub menus
    */
   TQPtrList<KBookmarkMenu> m_lstSubMenus;
-  KActionCollection * m_actionCollection;
+  TDEActionCollection * m_actionCollection;
   /**
    * List of our actions.
    */
-  TQPtrList<KAction> m_actions;
+  TQPtrList<TDEAction> m_actions;
   /**
    * Parent bookmark for this menu.
    */
@@ -236,13 +236,13 @@ protected:
 };
 
 /**
- * A class connected to KNSBookmarkImporter, to fill KActionMenus.
+ * A class connected to KNSBookmarkImporter, to fill TDEActionMenus.
  */
-class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject
+class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject
 {
   Q_OBJECT
 public:
-  KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, KActionCollection * act ) :
+  KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, TDEActionCollection * act ) :
      m_menu(menu), m_actionCollection(act), m_pManager(mgr) {}
 
   void openNSBookmarks();
@@ -258,7 +258,7 @@ protected slots:
 protected:
   TQPtrStack<KBookmarkMenu> mstack;
   KBookmarkMenu * m_menu;
-  KActionCollection * m_actionCollection;
+  TDEActionCollection * m_actionCollection;
   KBookmarkManager* m_pManager;
 };
 
diff --git a/kio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index cb88607fe..b47af8ebf 100644
--- a/kio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -30,8 +30,8 @@
 #include <tqlistview.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kaction.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
 
 #include "kbookmark.h"
 #include "kbookmarkimporter.h"
@@ -44,15 +44,15 @@ class TQListView;
 class KLineEdit;
 class KBookmark;
 class KBookmarkGroup;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
 class KBookmarkOwner;
 class KBookmarkMenu;
 class KBookmarkBar;
-class KPopupMenu;
+class TDEPopupMenu;
 
-class KImportedBookmarksActionMenu : public KActionMenu {
+class KImportedBookmarksActionMenu : public TDEActionMenu {
   Q_OBJECT
   TQ_PROPERTY( TQString type READ type WRITE setType )
   TQ_PROPERTY( TQString location READ location WRITE setLocation )
@@ -67,13 +67,13 @@ private:
 public:
   KImportedBookmarksActionMenu( 
     const TQString &text, const TQString& sIconName,
-    KActionCollection* parent, const char* name)
-  : KActionMenu(text, sIconName, parent, name) {
+    TDEActionCollection* parent, const char* name)
+  : TDEActionMenu(text, sIconName, parent, name) {
      ;
   }
 };
 
-class KBookmarkActionMenu : public KActionMenu {
+class KBookmarkActionMenu : public TDEActionMenu {
   Q_OBJECT
   TQ_PROPERTY( TQString url READ url WRITE setUrl )
   TQ_PROPERTY( TQString address READ address WRITE setAddress )
@@ -92,13 +92,13 @@ private:
 public:
   KBookmarkActionMenu( 
     const TQString &text, const TQString& sIconName,
-    KActionCollection* parent, const char* name)
-  : KActionMenu(text, sIconName, parent, name) {
+    TDEActionCollection* parent, const char* name)
+  : TDEActionMenu(text, sIconName, parent, name) {
      ;
   }
 };
 
-class KBookmarkAction : public KAction {
+class KBookmarkAction : public TDEAction {
   Q_OBJECT
   TQ_PROPERTY( TQString url READ url WRITE setUrl )
   TQ_PROPERTY( TQString address READ address WRITE setAddress )
@@ -113,15 +113,15 @@ private:
 public:
   // KDE4: remove
   KBookmarkAction(
-    const TQString& text, const TQString& sIconName, const KShortcut& cut,
+    const TQString& text, const TQString& sIconName, const TDEShortcut& cut,
     const TQObject* receiver, const char* slot,
-    KActionCollection* parent, const char* name)
-  : KAction(text, sIconName, cut, receiver, slot, parent, name) {
+    TDEActionCollection* parent, const char* name)
+  : TDEAction(text, sIconName, cut, receiver, slot, parent, name) {
   }
   KBookmarkAction(
-    const TQString& text, const TQString& sIconName, const KShortcut& cut,
-    KActionCollection* parent, const char* name)
-  : KAction(text, sIconName, cut, parent, name) {
+    const TQString& text, const TQString& sIconName, const TDEShortcut& cut,
+    TDEActionCollection* parent, const char* name)
+  : TDEAction(text, sIconName, cut, parent, name) {
   }
 };
 
diff --git a/kio/bookmarks/kbookmarknotifier.h b/tdeio/bookmarks/kbookmarknotifier.h
index 3982f984f..f99e570bc 100644
--- a/kio/bookmarks/kbookmarknotifier.h
+++ b/tdeio/bookmarks/kbookmarknotifier.h
@@ -28,7 +28,7 @@
  * DCOP interface for a bookmark notifier (an object which emits signals
  * upon changes to the bookmarks)
  */
-class KIO_EXPORT KBookmarkNotifier : virtual public DCOPObject
+class TDEIO_EXPORT KBookmarkNotifier : virtual public DCOPObject
 {
   K_DCOP
 
diff --git a/tdeio/data.protocol b/tdeio/data.protocol
new file mode 100644
index 000000000..1982efe80
--- /dev/null
+++ b/tdeio/data.protocol
@@ -0,0 +1,71 @@
+[Protocol]
+protocol=data
+input=stream
+output=none
+reading=true
+Icon=www
+Class=:internet
+Description=A tdeioslave for data URIs (rfc2397)
+Description[af]= ´n tdeioslave vir data URIs (rfc2397)
+Description[be]=Модуль tdeioslave дл� URI з данн�мі (rfc2397)
+Description[br]=Ur tdeioslave evit an URIoù roadoù (rfc2397)
+Description[bs]=Kioslave za data URIs (rfc2397)
+Description[ca]=Un tdeioslave per a URIs de dades (rfc2397)
+Description[cs]=Kioslave pro datová URI (rfc2397)
+Description[csb]=Plugins protokółu pòdôwków URI (rfc2397)
+Description[da]=En tdeioslave for data-URI'er (rfc2397)
+Description[de]=Ein-/Ausgabemodul für Daten-URIs (rfc2397)
+Description[el]=Ένα tdeioslave για URI δεδομένων (rfc2397)
+Description[es]=Un tdeioslave para datos URIs (rfc2397)
+Description[et]=Andme-URI-de I/O-moodul (rfc2397)
+Description[eu]=Datuen URLen (rfc2397) tdeioslave-a
+Description[fa]=یک tdeioslave برای URIهای داده )rfc2397(
+Description[fi]=tdeioslave data URI:lle (rfc2397)
+Description[fr]=Un module d'entrée / sortie pour les URI de données (rfc2397)
+Description[fy]=In tdeioslave foar data-URI-adresse (rfc2397)
+Description[gl]=Un tdeioslave para URIs de dados (rfc2397)
+Description[hi]=डाटा यूआरआई (आर�फसी2397) के लि� �क के-आई-ओ-स�लेव
+Description[hr]=tdeioslave za podatkovne URI-ije (rfc2397)
+Description[hu]=KDE-protokoll adat-URI-k használataához (RFC 2397)
+Description[id]=Kioslave for URI data (rfc2397)
+Description[is]=tdeioslave fyrir gagnaslóðir (rfc2397)
+Description[it]=Un tdeioslave per il protocollo di URI di dati (rfc2397)
+Description[ja]=データ URIs (rfc2397) � tdeioslave
+Description[ka]=URI მ�ნ�ცემთ� (rfc2397) დ�მმუშ�ვებელი
+Description[kk]=URI деректерді өңдеу tdeioslave модулі (rfc2397)
+Description[km]=tdeioslave មួយ​សម្រាប់​ទិន្នន�យ URIs (rfc2397)
+Description[lb]=E tdeioslave fir Donnéen-URIs (rfc2397)
+Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
+Description[mk]=kio-�лужител за податочни URI (rfc2397)
+Description[ms]=Kioslave untuk URI data (rfc2397)
+Description[nb]=tdeioslave for data URI-er (rfc2397)
+Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397)
+Description[ne]=डेटा URIs का लागि किओस�लेभ (rfc2397)
+Description[nl]=Een tdeioslave voor data-URI-adressen (rfc2397)
+Description[nn]=A tdeioslave for data URI-ar (rfc2397)
+Description[pa]= ਡਾਟਾ URI ਲਈ tdeioslave(rfc2397)
+Description[pl]=Wtyczka protokołu URI danych (rfc2397)
+Description[pt]=Um 'tdeioslave' para URIs data (rfc2397)
+Description[pt_BR]=Uma implementação para o protocolo de URIs de dados (rfc2397)
+Description[ro]=Un dispozitiv de I/E pentru URI-urile de date (rfc2397)
+Description[ru]=Обработчик URI данных (rfc2397)
+Description[rw]=Kioslave y'ibyatanzwe URI (rfc2397)
+Description[se]=kiošláva dáhta-URI:aid várás (rfc2397)
+Description[sk]=IO klient pre dátové URI (rfc2397)
+Description[sl]=tdeioslave za podatkovne URI-je (rfc2397)
+Description[sr]=tdeioslave за URI-ије података (rfc2397)
+Description[sr@Latn]=tdeioslave za URI-ije podataka (rfc2397)
+Description[sv]=En I/O-slav för datawebbadresser (RFC 2397)
+Description[ta]=தரவ� வலைமனைகள�க�கான ஒர� tdeioslave (rfc2397)
+Description[te]=దత�తాంశం య�ఆరైల కొరక� కె�ఓబానిస (rfc2397)
+Description[tg]=tdeioslave барои URIs (rfc2397)
+Description[th]=tdeioslave สำหรับข้อมูล URIs (rfc2397)
+Description[tr]= Veri adresleri için bir tdeioslave (rfc2397)
+Description[tt]=Biremle URI öçen tdeioslave (rfc2397)
+Description[uk]=Підлеглий В/В дл� адре� (URI) даних (rfc2397)
+Description[vi]=Một tdeioslave cho các địa điểm URI kiểu dữ liệu (rfc2397).
+Description[zh_CN]=data URI(rfc2397) çš„ tdeioslave
+DocPath=tdeioslave/data.html
+URIMode=rawuri
+defaultMimetype=application/octet-stream
+determineMimetypeFromExtension=false
diff --git a/kio/httpfilter/CMakeLists.txt b/tdeio/httpfilter/CMakeLists.txt
index eec4e78a7..b40f10fdc 100644
--- a/kio/httpfilter/CMakeLists.txt
+++ b/tdeio/httpfilter/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
 )
 
 
diff --git a/kio/httpfilter/Makefile.am b/tdeio/httpfilter/Makefile.am
index 2da25d1b6..2da25d1b6 100644
--- a/kio/httpfilter/Makefile.am
+++ b/tdeio/httpfilter/Makefile.am
diff --git a/kio/httpfilter/httpfilter.cc b/tdeio/httpfilter/httpfilter.cc
index 6a5a1346c..0f6a45790 100644
--- a/kio/httpfilter/httpfilter.cc
+++ b/tdeio/httpfilter/httpfilter.cc
@@ -17,9 +17,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "httpfilter.h"
 
@@ -275,7 +275,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d)
         }
      }
      if (!bHasFinished)
-        emit error( KIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost."));
+        emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Unexpected end of data, some information may be lost."));
      return;
   }
   if (bHasFinished)
@@ -332,7 +332,7 @@ HTTPFilterGZip::slotInput(const TQByteArray &d)
      int result = inflate( &zstr, Z_NO_FLUSH );
      if ((result != Z_OK) && (result != Z_STREAM_END))
      {
-        emit error( KIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data."));
+        emit error( TDEIO::ERR_SLAVE_DEFINED, i18n("Receiving corrupt data."));
         break;
      }
      int bytesOut = 8192 - zstr.avail_out;
diff --git a/kio/httpfilter/httpfilter.h b/tdeio/httpfilter/httpfilter.h
index 520a1c627..520a1c627 100644
--- a/kio/httpfilter/httpfilter.h
+++ b/tdeio/httpfilter/httpfilter.h
diff --git a/kio/kcomprfilter.desktop b/tdeio/kcomprfilter.desktop
index 017bf987d..017bf987d 100644
--- a/kio/kcomprfilter.desktop
+++ b/tdeio/kcomprfilter.desktop
diff --git a/kio/kdatatool.desktop b/tdeio/kdatatool.desktop
index a58357d41..a58357d41 100644
--- a/kio/kdatatool.desktop
+++ b/tdeio/kdatatool.desktop
diff --git a/kio/kpasswdserver.desktop b/tdeio/kpasswdserver.desktop
index db43d621c..db43d621c 100644
--- a/kio/kpasswdserver.desktop
+++ b/tdeio/kpasswdserver.desktop
diff --git a/kio/kpasswdserver/CMakeLists.txt b/tdeio/kpasswdserver/CMakeLists.txt
index a02d3b50a..1d54ddc95 100644
--- a/kio/kpasswdserver/CMakeLists.txt
+++ b/tdeio/kpasswdserver/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kio
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdeio
 )
 
 link_directories(
diff --git a/kio/kpasswdserver/DESIGN b/tdeio/kpasswdserver/DESIGN
index 6a128f9df..6a128f9df 100644
--- a/kio/kpasswdserver/DESIGN
+++ b/tdeio/kpasswdserver/DESIGN
diff --git a/kio/kpasswdserver/Makefile.am b/tdeio/kpasswdserver/Makefile.am
index 694718de4..d1a58059b 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/tdeio/kpasswdserver/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
-# Makefile.am of tdebase/kioslave/http
+# Makefile.am of tdebase/tdeioslave/http
 
-INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
 
 ####### Files
 
@@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
 kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
 kded_kpasswdserver_la_METASOURCES = AUTO
 kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index 0f7b2cc58..cf4e0530c 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -29,12 +29,12 @@
 
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <kio/passdlg.h>
-#include <kwallet.h>
+#include <tdeio/passdlg.h>
+#include <tdewallet.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
@@ -100,7 +100,7 @@ static TQString makeMapKey( const char* key, int entryNumber )
     return str;
 }
 
-static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const KIO::AuthInfo &info )
+static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const TDEIO::AuthInfo &info )
 {
     if ( !wallet->hasFolder( KWallet::Wallet::PasswordFolder() ) )
         if ( !wallet->createFolder( KWallet::Wallet::PasswordFolder() ) )
@@ -175,14 +175,14 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const
     return false;
 }
 
-KIO::AuthInfo
-KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId)
+TDEIO::AuthInfo
+KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId)
 {
     return checkAuthInfo(info, windowId, 0);
 }
 
-KIO::AuthInfo
-KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long usertime)
+TDEIO::AuthInfo
+KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long usertime)
 {
     kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username
               << ", WindowId = " << windowId << endl;
@@ -242,14 +242,14 @@ KPasswdServer::checkAuthInfo(KIO::AuthInfo info, long windowId, unsigned long us
     return copyAuthInfo(result);
 }
 
-KIO::AuthInfo
-KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr)
+TDEIO::AuthInfo
+KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr)
 {
     return queryAuthInfo(info, errorMsg, windowId, seqNr, 0 );
 }
 
-KIO::AuthInfo
-KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr, unsigned long usertime)
+TDEIO::AuthInfo
+KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windowId, long seqNr, unsigned long usertime)
 {
     kdDebug(130) << "KPasswdServer::queryAuthInfo: User= " << info.username
               << ", Message= " << info.prompt << ", WindowId = " << windowId << endl;
@@ -285,7 +285,7 @@ KPasswdServer::queryAuthInfo(KIO::AuthInfo info, TQString errorMsg, long windowI
 }
 
 void
-KPasswdServer::addAuthInfo(KIO::AuthInfo info, long windowId)
+KPasswdServer::addAuthInfo(TDEIO::AuthInfo info, long windowId)
 {
     kdDebug(130) << "KPasswdServer::addAuthInfo: User= " << info.username
               << ", RealmValue= " << info.realmValue << ", WindowId = " << windowId << endl;
@@ -316,7 +316,7 @@ KPasswdServer::processRequest()
     if (!request)
        return;
 
-    KIO::AuthInfo &info = request->info;
+    TDEIO::AuthInfo &info = request->info;
 
     kdDebug(130) << "KPasswdServer::processRequest: User= " << info.username
               << ", Message= " << info.prompt << endl;
@@ -361,12 +361,12 @@ KPasswdServer::processRequest()
             if ( ( username.isEmpty() || password.isEmpty() )
                 && !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) )
             {
-                // no login+pass provided, check if kwallet has one
+                // no login+pass provided, check if tdewallet has one
                 if ( openWallet( request->windowId ) )
                     hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins );
             }
 
-            KIO::PasswordDialog dlg( info.prompt, username, info.keepPassword );
+            TDEIO::PasswordDialog dlg( info.prompt, username, info.keepPassword );
             if (info.caption.isEmpty())
                dlg.setPlainCaption( i18n("Authorization Dialog") );
             else
@@ -428,7 +428,7 @@ KPasswdServer::processRequest()
 
     TQDataStream stream2(replyData, IO_WriteOnly);
     stream2 << info << m_seqNr;
-    replyType = "KIO::AuthInfo";
+    replyType = "TDEIO::AuthInfo";
     request->client->endTransaction( request->transaction,
                                      replyType, replyData);
 
@@ -479,11 +479,11 @@ KPasswdServer::processRequest()
            else
            {
                updateAuthExpire(waitRequest->key, result, waitRequest->windowId, false);
-               KIO::AuthInfo info = copyAuthInfo(result);
+               TDEIO::AuthInfo info = copyAuthInfo(result);
                stream2 << info;
            }
 
-           replyType = "KIO::AuthInfo";
+           replyType = "TDEIO::AuthInfo";
            waitRequest->client->endTransaction( waitRequest->transaction,
                                                 replyType, replyData);
 
@@ -497,7 +497,7 @@ KPasswdServer::processRequest()
 
 }
 
-TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info )
+TQString KPasswdServer::createCacheKey( const TDEIO::AuthInfo &info )
 {
     if( !info.url.isValid() ) {
         // Note that a null key will break findAuthInfoItem later on...
@@ -524,10 +524,10 @@ TQString KPasswdServer::createCacheKey( const KIO::AuthInfo &info )
     return key;
 }
 
-KIO::AuthInfo
+TDEIO::AuthInfo
 KPasswdServer::copyAuthInfo(const AuthInfo *i)
 {
-    KIO::AuthInfo result;
+    TDEIO::AuthInfo result;
     result.url = i->url;
     result.username = i->username;
     result.password = i->password;
@@ -539,7 +539,7 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i)
 }
 
 const KPasswdServer::AuthInfo *
-KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
+KPasswdServer::findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info)
 {
    AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
@@ -577,7 +577,7 @@ KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
 }
 
 void
-KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info)
+KPasswdServer::removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info)
 {
    AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
@@ -604,7 +604,7 @@ KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info
 
 
 void
-KPasswdServer::addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled)
+KPasswdServer::addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled)
 {
    AuthInfoList *authList = m_authDict.find(key);
    if (!authList)
diff --git a/kio/kpasswdserver/kpasswdserver.h b/tdeio/kpasswdserver/kpasswdserver.h
index cf44681bf..ce6d0386e 100644
--- a/kio/kpasswdserver/kpasswdserver.h
+++ b/tdeio/kpasswdserver/kpasswdserver.h
@@ -29,7 +29,7 @@
 #include <tqintdict.h>
 
 #include <dcopclient.h>
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 #include <kded/kdedmodule.h>
 
 namespace KWallet {
@@ -46,11 +46,11 @@ public:
 
 k_dcop:
   // KDE4 merge
-  KIO::AuthInfo checkAuthInfo(KIO::AuthInfo, long, unsigned long);
-  KIO::AuthInfo checkAuthInfo(KIO::AuthInfo, long);
-  KIO::AuthInfo queryAuthInfo(KIO::AuthInfo, TQString, long, long, unsigned long);
-  KIO::AuthInfo queryAuthInfo(KIO::AuthInfo, TQString, long, long);
-  void addAuthInfo(KIO::AuthInfo, long);
+  TDEIO::AuthInfo checkAuthInfo(TDEIO::AuthInfo, long, unsigned long);
+  TDEIO::AuthInfo checkAuthInfo(TDEIO::AuthInfo, long);
+  TDEIO::AuthInfo queryAuthInfo(TDEIO::AuthInfo, TQString, long, long, unsigned long);
+  TDEIO::AuthInfo queryAuthInfo(TDEIO::AuthInfo, TQString, long, long);
+  void addAuthInfo(TDEIO::AuthInfo, long);
 
 public slots:
   void processRequest();
@@ -60,11 +60,11 @@ public slots:
 protected:
   struct AuthInfo;
 
-  TQString createCacheKey( const KIO::AuthInfo &info );
-  const AuthInfo *findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
-  void removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info);
-  void addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled);
-  KIO::AuthInfo copyAuthInfo(const AuthInfo *);
+  TQString createCacheKey( const TDEIO::AuthInfo &info );
+  const AuthInfo *findAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info);
+  void removeAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info);
+  void addAuthInfoItem(const TQString &key, const TDEIO::AuthInfo &info, long windowId, long seqNr, bool canceled);
+  TDEIO::AuthInfo copyAuthInfo(const AuthInfo *);
   void updateAuthExpire(const TQString &key, const AuthInfo *, long windowId, bool keep);
   int findWalletEntry( const TQMap<TQString,TQString>& map, const TQString& username );
   bool openWallet( WId windowId );
@@ -100,7 +100,7 @@ protected:
      DCOPClient *client;
      DCOPClientTransaction *transaction;
      TQString key;
-     KIO::AuthInfo info;
+     TDEIO::AuthInfo info;
      TQString errorMsg;
      long windowId;
      long seqNr;
diff --git a/kio/kscan.desktop b/tdeio/kscan.desktop
index 8d3a026fb..8d3a026fb 100644
--- a/kio/kscan.desktop
+++ b/tdeio/kscan.desktop
diff --git a/kio/kssl/CMakeLists.txt b/tdeio/kssl/CMakeLists.txt
index 377cd9d01..a2c9f00d6 100644
--- a/kio/kssl/CMakeLists.txt
+++ b/tdeio/kssl/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
 )
 
 
diff --git a/kio/kssl/KPMG-CA-16389.0.DC80502.pdf b/tdeio/kssl/KPMG-CA-16389.0.DC80502.pdf
index 63a7633ee..63a7633ee 100644
--- a/kio/kssl/KPMG-CA-16389.0.DC80502.pdf
+++ b/tdeio/kssl/KPMG-CA-16389.0.DC80502.pdf
diff --git a/kio/kssl/Makefile.am b/tdeio/kssl/Makefile.am
index 54f2fc6f5..5d57ab7ab 100644
--- a/kio/kssl/Makefile.am
+++ b/tdeio/kssl/Makefile.am
@@ -3,7 +3,7 @@
 # somewhere else. Another option for the future (needs testing) would be to
 # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
 # instead of #include <openssl/foo.h>
-INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
+INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdewallet/client $(all_includes) $(SSL_INCLUDES)
 
 noinst_LTLIBRARIES = libkssl.la
 KSSLVERSION=	3.0.0
diff --git a/kio/kssl/README b/tdeio/kssl/README
index b5f404fc7..b5f404fc7 100644
--- a/kio/kssl/README
+++ b/tdeio/kssl/README
diff --git a/kio/kssl/SECURITY-HOLES b/tdeio/kssl/SECURITY-HOLES
index 62b8e9ca7..62b8e9ca7 100644
--- a/kio/kssl/SECURITY-HOLES
+++ b/tdeio/kssl/SECURITY-HOLES
diff --git a/kio/kssl/TODO b/tdeio/kssl/TODO
index f24761473..7e2270575 100644
--- a/kio/kssl/TODO
+++ b/tdeio/kssl/TODO
@@ -15,7 +15,7 @@
 
 - <keygen> is not working.
 
-- Namespace it all to KIO::SSL:: in KDE4
+- Namespace it all to TDEIO::SSL:: in KDE4
 
 - Remove SSLv2
 
diff --git a/kio/kssl/configure.in.in b/tdeio/kssl/configure.in.in
index fa256cbdb..7e3848d78 100644
--- a/kio/kssl/configure.in.in
+++ b/tdeio/kssl/configure.in.in
@@ -4,4 +4,4 @@ if test "$have_ssl" = yes; then
 	AC_DEFINE(KSSL_HAVE_SSL, 1, [Define if we shall use KSSL])
 fi
 
-AM_CONFIG_HEADER([kio/kssl/ksslconfig.h])
+AM_CONFIG_HEADER([tdeio/kssl/ksslconfig.h])
diff --git a/kio/kssl/keygenwizard.ui b/tdeio/kssl/keygenwizard.ui
index 4cb5fe1df..4cb5fe1df 100644
--- a/kio/kssl/keygenwizard.ui
+++ b/tdeio/kssl/keygenwizard.ui
diff --git a/kio/kssl/keygenwizard2.ui b/tdeio/kssl/keygenwizard2.ui
index 90fef8fef..90fef8fef 100644
--- a/kio/kssl/keygenwizard2.ui
+++ b/tdeio/kssl/keygenwizard2.ui
diff --git a/kio/kssl/kopenssl.cc b/tdeio/kssl/kopenssl.cc
index e327cd68b..986609570 100644
--- a/kio/kssl/kopenssl.cc
+++ b/tdeio/kssl/kopenssl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <tqregexp.h>
 #include <tqdir.h>
@@ -273,12 +273,12 @@ KOpenSSLProxy::KOpenSSLProxy() {
 KLibLoader *ll = KLibLoader::self();
 _ok = false;
 TQStringList libpaths, libnamesc, libnamess;
-KConfig *cfg;
+TDEConfig *cfg;
 
    _cryptoLib = 0L;
    _sslLib = 0L;
 
-   cfg = new KConfig("cryptodefaults", false, false);
+   cfg = new TDEConfig("cryptodefaults", false, false);
    cfg->setGroup("OpenSSL");
    TQString upath = cfg->readPathEntry("Path");
    if (!upath.isEmpty())
diff --git a/kio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h
index 24130807a..59cf7b560 100644
--- a/kio/kssl/kopenssl.h
+++ b/tdeio/kssl/kopenssl.h
@@ -63,7 +63,7 @@ class KOpenSSLProxyPrivate;
  * @short KDE OpenSSL Wrapper
  * @internal
  */
-class KIO_EXPORT KOpenSSLProxy {
+class TDEIO_EXPORT KOpenSSLProxy {
 friend class KStaticDeleter<KOpenSSLProxy>;
 public:
 
diff --git a/kio/kssl/ksmimecrypto.cc b/tdeio/kssl/ksmimecrypto.cc
index 1a9e37e60..1a9e37e60 100644
--- a/kio/kssl/ksmimecrypto.cc
+++ b/tdeio/kssl/ksmimecrypto.cc
diff --git a/kio/kssl/ksmimecrypto.h b/tdeio/kssl/ksmimecrypto.h
index 95d17a8a8..5f8e1da73 100644
--- a/kio/kssl/ksmimecrypto.h
+++ b/tdeio/kssl/ksmimecrypto.h
@@ -30,7 +30,7 @@
 class KOpenSSLProxy;
 class KSMIMECryptoPrivate;
 
-class KIO_EXPORT KSMIMECrypto {
+class TDEIO_EXPORT KSMIMECrypto {
  public:
     KSMIMECrypto();
     ~KSMIMECrypto();
diff --git a/kio/kssl/kssl.cc b/tdeio/kssl/kssl.cc
index 66cc503d5..874da6aa6 100644
--- a/kio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cc
@@ -48,7 +48,7 @@
 #include <ksslx509v3.h>
 #include <ksslpkcs12.h>
 #include <ksslsession.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksocks.h>
 
 #define sk_dup d->kossl->sk_dup
diff --git a/kio/kssl/kssl.h b/tdeio/kssl/kssl.h
index ffb217980..e10b10eaf 100644
--- a/kio/kssl/kssl.h
+++ b/tdeio/kssl/kssl.h
@@ -39,7 +39,7 @@ class KSSLSession;
  * @see KExtendedSocket, TCPSlaveBase
  * @short KDE SSL Class
  */
-class KIO_EXPORT KSSL {
+class TDEIO_EXPORT KSSL {
 public:
 	/**
 	 *  Construct a KSSL object
diff --git a/kio/kssl/kssl/CMakeLists.txt b/tdeio/kssl/kssl/CMakeLists.txt
index eeed10125..eeed10125 100644
--- a/kio/kssl/kssl/CMakeLists.txt
+++ b/tdeio/kssl/kssl/CMakeLists.txt
diff --git a/kio/kssl/kssl/DigiCertAssuredIDRootCA.pem b/tdeio/kssl/kssl/DigiCertAssuredIDRootCA.pem
index 2731638b6..2731638b6 100644
--- a/kio/kssl/kssl/DigiCertAssuredIDRootCA.pem
+++ b/tdeio/kssl/kssl/DigiCertAssuredIDRootCA.pem
diff --git a/kio/kssl/kssl/DigiCertGlobalRootCA.pem b/tdeio/kssl/kssl/DigiCertGlobalRootCA.pem
index fd4341df2..fd4341df2 100644
--- a/kio/kssl/kssl/DigiCertGlobalRootCA.pem
+++ b/tdeio/kssl/kssl/DigiCertGlobalRootCA.pem
diff --git a/kio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem b/tdeio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem
index 9e6810ab7..9e6810ab7 100644
--- a/kio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem
+++ b/tdeio/kssl/kssl/DigiCertHighAssuranceEVRootCA.pem
diff --git a/kio/kssl/kssl/GeoTrust_Universal_CA.pem b/tdeio/kssl/kssl/GeoTrust_Universal_CA.pem
index 31d9e7aa7..31d9e7aa7 100644
--- a/kio/kssl/kssl/GeoTrust_Universal_CA.pem
+++ b/tdeio/kssl/kssl/GeoTrust_Universal_CA.pem
diff --git a/kio/kssl/kssl/GeoTrust_Universal_CA2.pem b/tdeio/kssl/kssl/GeoTrust_Universal_CA2.pem
index b61946475..b61946475 100644
--- a/kio/kssl/kssl/GeoTrust_Universal_CA2.pem
+++ b/tdeio/kssl/kssl/GeoTrust_Universal_CA2.pem
diff --git a/kio/kssl/kssl/HOWTO b/tdeio/kssl/kssl/HOWTO
index 9a74e418b..762535b14 100644
--- a/kio/kssl/kssl/HOWTO
+++ b/tdeio/kssl/kssl/HOWTO
@@ -24,7 +24,7 @@ maintainer (currently bradh@kde.org) with full details.
 
 
 To add local files:
-1) Create the .pem file and check it into cvs in tdelibs/kio/kssl/kssl.
+1) Create the .pem file and check it into cvs in tdelibs/tdeio/kssl/kssl.
 2) List the pem file name as a single line in 'localcerts'.
 
 
diff --git a/kio/kssl/kssl/Makefile.am b/tdeio/kssl/kssl/Makefile.am
index a7ad33e95..a7ad33e95 100644
--- a/kio/kssl/kssl/Makefile.am
+++ b/tdeio/kssl/kssl/Makefile.am
diff --git a/kio/kssl/kssl/StartCom.pem b/tdeio/kssl/kssl/StartCom.pem
index a7c9b39a0..a7c9b39a0 100644
--- a/kio/kssl/kssl/StartCom.pem
+++ b/tdeio/kssl/kssl/StartCom.pem
diff --git a/kio/kssl/kssl/SwissSign-Gold-G2.pem b/tdeio/kssl/kssl/SwissSign-Gold-G2.pem
index d72118781..d72118781 100644
--- a/kio/kssl/kssl/SwissSign-Gold-G2.pem
+++ b/tdeio/kssl/kssl/SwissSign-Gold-G2.pem
diff --git a/kio/kssl/kssl/SwissSign-Platinum-G2.pem b/tdeio/kssl/kssl/SwissSign-Platinum-G2.pem
index 0aa3e3577..0aa3e3577 100644
--- a/kio/kssl/kssl/SwissSign-Platinum-G2.pem
+++ b/tdeio/kssl/kssl/SwissSign-Platinum-G2.pem
diff --git a/kio/kssl/kssl/SwissSign-Silver-G2.pem b/tdeio/kssl/kssl/SwissSign-Silver-G2.pem
index 67a172cb6..67a172cb6 100644
--- a/kio/kssl/kssl/SwissSign-Silver-G2.pem
+++ b/tdeio/kssl/kssl/SwissSign-Silver-G2.pem
diff --git a/kio/kssl/kssl/WiseKey.pem b/tdeio/kssl/kssl/WiseKey.pem
index a695c21bb..a695c21bb 100644
--- a/kio/kssl/kssl/WiseKey.pem
+++ b/tdeio/kssl/kssl/WiseKey.pem
diff --git a/kio/kssl/kssl/ac_offline_raiz_certicamara.pem b/tdeio/kssl/kssl/ac_offline_raiz_certicamara.pem
index c60cce890..c60cce890 100644
--- a/kio/kssl/kssl/ac_offline_raiz_certicamara.pem
+++ b/tdeio/kssl/kssl/ac_offline_raiz_certicamara.pem
diff --git a/kio/kssl/kssl/argedaten-root-ca-cert.pem b/tdeio/kssl/kssl/argedaten-root-ca-cert.pem
index 621e30e20..621e30e20 100644
--- a/kio/kssl/kssl/argedaten-root-ca-cert.pem
+++ b/tdeio/kssl/kssl/argedaten-root-ca-cert.pem
diff --git a/kio/kssl/kssl/belgacom.pem b/tdeio/kssl/kssl/belgacom.pem
index 0b581a774..0b581a774 100644
--- a/kio/kssl/kssl/belgacom.pem
+++ b/tdeio/kssl/kssl/belgacom.pem
diff --git a/kio/kssl/kssl/caroot/CMakeLists.txt b/tdeio/kssl/kssl/caroot/CMakeLists.txt
index 05e2381a9..05e2381a9 100644
--- a/kio/kssl/kssl/caroot/CMakeLists.txt
+++ b/tdeio/kssl/kssl/caroot/CMakeLists.txt
diff --git a/kio/kssl/kssl/caroot/Makefile.am b/tdeio/kssl/kssl/caroot/Makefile.am
index cd049a036..cd049a036 100644
--- a/kio/kssl/kssl/caroot/Makefile.am
+++ b/tdeio/kssl/kssl/caroot/Makefile.am
diff --git a/kio/kssl/kssl/caroot/ca-bundle.crt b/tdeio/kssl/kssl/caroot/ca-bundle.crt
index 31409b62f..31409b62f 100644
--- a/kio/kssl/kssl/caroot/ca-bundle.crt
+++ b/tdeio/kssl/kssl/caroot/ca-bundle.crt
diff --git a/kio/kssl/kssl/cert_bundle b/tdeio/kssl/kssl/cert_bundle
index 331a64286..331a64286 100755
--- a/kio/kssl/kssl/cert_bundle
+++ b/tdeio/kssl/kssl/cert_bundle
diff --git a/kio/kssl/kssl/cert_extract.c b/tdeio/kssl/kssl/cert_extract.c
index 095f810f4..095f810f4 100644
--- a/kio/kssl/kssl/cert_extract.c
+++ b/tdeio/kssl/kssl/cert_extract.c
diff --git a/kio/kssl/kssl/certbundle_Makefile b/tdeio/kssl/kssl/certbundle_Makefile
index 5a288f3b6..5a288f3b6 100644
--- a/kio/kssl/kssl/certbundle_Makefile
+++ b/tdeio/kssl/kssl/certbundle_Makefile
diff --git a/kio/kssl/kssl/certkde b/tdeio/kssl/kssl/certkde
index 2a46393f9..37c924f83 100755
--- a/kio/kssl/kssl/certkde
+++ b/tdeio/kssl/kssl/certkde
@@ -3,7 +3,7 @@ eval 'exec perl -S $0 ${1+"$@"}'
     if $running_under_some_shell;
 
 ##
-##   Generate the KDE CA list KConfig file
+##   Generate the KDE CA list TDEConfig file
 ##
 
 %CERT = ();
diff --git a/kio/kssl/kssl/certum.pem b/tdeio/kssl/kssl/certum.pem
index b133fcb49..b133fcb49 100644
--- a/kio/kssl/kssl/certum.pem
+++ b/tdeio/kssl/kssl/certum.pem
diff --git a/kio/kssl/kssl/certum1.pem b/tdeio/kssl/kssl/certum1.pem
index aaf9cbc9a..aaf9cbc9a 100644
--- a/kio/kssl/kssl/certum1.pem
+++ b/tdeio/kssl/kssl/certum1.pem
diff --git a/kio/kssl/kssl/certum2.pem b/tdeio/kssl/kssl/certum2.pem
index a90ca2a91..a90ca2a91 100644
--- a/kio/kssl/kssl/certum2.pem
+++ b/tdeio/kssl/kssl/certum2.pem
diff --git a/kio/kssl/kssl/certum3.pem b/tdeio/kssl/kssl/certum3.pem
index d6233c43c..d6233c43c 100644
--- a/kio/kssl/kssl/certum3.pem
+++ b/tdeio/kssl/kssl/certum3.pem
diff --git a/kio/kssl/kssl/certum4.pem b/tdeio/kssl/kssl/certum4.pem
index decbac005..decbac005 100644
--- a/kio/kssl/kssl/certum4.pem
+++ b/tdeio/kssl/kssl/certum4.pem
diff --git a/kio/kssl/kssl/comodo1.pem b/tdeio/kssl/kssl/comodo1.pem
index 536b087db..536b087db 100644
--- a/kio/kssl/kssl/comodo1.pem
+++ b/tdeio/kssl/kssl/comodo1.pem
diff --git a/kio/kssl/kssl/comodo2.pem b/tdeio/kssl/kssl/comodo2.pem
index fef46d9c7..fef46d9c7 100644
--- a/kio/kssl/kssl/comodo2.pem
+++ b/tdeio/kssl/kssl/comodo2.pem
diff --git a/kio/kssl/kssl/comodo3.pem b/tdeio/kssl/kssl/comodo3.pem
index 40c137095..40c137095 100644
--- a/kio/kssl/kssl/comodo3.pem
+++ b/tdeio/kssl/kssl/comodo3.pem
diff --git a/kio/kssl/kssl/comodo4.pem b/tdeio/kssl/kssl/comodo4.pem
index 7490b02be..7490b02be 100644
--- a/kio/kssl/kssl/comodo4.pem
+++ b/tdeio/kssl/kssl/comodo4.pem
diff --git a/kio/kssl/kssl/comodo5.pem b/tdeio/kssl/kssl/comodo5.pem
index 824d542c1..824d542c1 100644
--- a/kio/kssl/kssl/comodo5.pem
+++ b/tdeio/kssl/kssl/comodo5.pem
diff --git a/kio/kssl/kssl/comodo6.pem b/tdeio/kssl/kssl/comodo6.pem
index 4b9f74824..4b9f74824 100644
--- a/kio/kssl/kssl/comodo6.pem
+++ b/tdeio/kssl/kssl/comodo6.pem
diff --git a/kio/kssl/kssl/comodo7.pem b/tdeio/kssl/kssl/comodo7.pem
index 58b02ea94..58b02ea94 100644
--- a/kio/kssl/kssl/comodo7.pem
+++ b/tdeio/kssl/kssl/comodo7.pem
diff --git a/kio/kssl/kssl/dfn-root-ca-cert.pem b/tdeio/kssl/kssl/dfn-root-ca-cert.pem
index eb8a054ac..eb8a054ac 100644
--- a/kio/kssl/kssl/dfn-root-ca-cert.pem
+++ b/tdeio/kssl/kssl/dfn-root-ca-cert.pem
diff --git a/kio/kssl/kssl/gd-class2-root.pem b/tdeio/kssl/kssl/gd-class2-root.pem
index 42e8d1eef..42e8d1eef 100644
--- a/kio/kssl/kssl/gd-class2-root.pem
+++ b/tdeio/kssl/kssl/gd-class2-root.pem
diff --git a/kio/kssl/kssl/geotrust-global-1.pem b/tdeio/kssl/kssl/geotrust-global-1.pem
index b69f0029b..b69f0029b 100644
--- a/kio/kssl/kssl/geotrust-global-1.pem
+++ b/tdeio/kssl/kssl/geotrust-global-1.pem
diff --git a/kio/kssl/kssl/geotrust-global-2.pem b/tdeio/kssl/kssl/geotrust-global-2.pem
index d2ea26636..d2ea26636 100644
--- a/kio/kssl/kssl/geotrust-global-2.pem
+++ b/tdeio/kssl/kssl/geotrust-global-2.pem
diff --git a/kio/kssl/kssl/globalsign-root-r1.pem b/tdeio/kssl/kssl/globalsign-root-r1.pem
index f4ce4ca43..f4ce4ca43 100644
--- a/kio/kssl/kssl/globalsign-root-r1.pem
+++ b/tdeio/kssl/kssl/globalsign-root-r1.pem
diff --git a/kio/kssl/kssl/globalsign-root-r2.pem b/tdeio/kssl/kssl/globalsign-root-r2.pem
index 6f0f8db0d..6f0f8db0d 100644
--- a/kio/kssl/kssl/globalsign-root-r2.pem
+++ b/tdeio/kssl/kssl/globalsign-root-r2.pem
diff --git a/kio/kssl/kssl/icpbrasil.pem b/tdeio/kssl/kssl/icpbrasil.pem
index 53fa58c51..53fa58c51 100644
--- a/kio/kssl/kssl/icpbrasil.pem
+++ b/tdeio/kssl/kssl/icpbrasil.pem
diff --git a/kio/kssl/kssl/ipsservidores.pem b/tdeio/kssl/kssl/ipsservidores.pem
index e5963e72f..e5963e72f 100644
--- a/kio/kssl/kssl/ipsservidores.pem
+++ b/tdeio/kssl/kssl/ipsservidores.pem
diff --git a/kio/kssl/kssl/ksslcalist b/tdeio/kssl/kssl/ksslcalist
index a0761cf4a..a0761cf4a 100644
--- a/kio/kssl/kssl/ksslcalist
+++ b/tdeio/kssl/kssl/ksslcalist
diff --git a/kio/kssl/kssl/localcerts b/tdeio/kssl/kssl/localcerts
index 150763522..150763522 100644
--- a/kio/kssl/kssl/localcerts
+++ b/tdeio/kssl/kssl/localcerts
diff --git a/kio/kssl/kssl/mergelocal b/tdeio/kssl/kssl/mergelocal
index 4fc0f0ff3..4fc0f0ff3 100755
--- a/kio/kssl/kssl/mergelocal
+++ b/tdeio/kssl/kssl/mergelocal
diff --git a/kio/kssl/kssl/netlock1.pem b/tdeio/kssl/kssl/netlock1.pem
index 5f7c1ce43..5f7c1ce43 100644
--- a/kio/kssl/kssl/netlock1.pem
+++ b/tdeio/kssl/kssl/netlock1.pem
diff --git a/kio/kssl/kssl/netlock2.pem b/tdeio/kssl/kssl/netlock2.pem
index c4e610816..c4e610816 100644
--- a/kio/kssl/kssl/netlock2.pem
+++ b/tdeio/kssl/kssl/netlock2.pem
diff --git a/kio/kssl/kssl/netlock3.pem b/tdeio/kssl/kssl/netlock3.pem
index dd373608e..dd373608e 100644
--- a/kio/kssl/kssl/netlock3.pem
+++ b/tdeio/kssl/kssl/netlock3.pem
diff --git a/kio/kssl/kssl/netlock4.pem b/tdeio/kssl/kssl/netlock4.pem
index 3565fef78..3565fef78 100644
--- a/kio/kssl/kssl/netlock4.pem
+++ b/tdeio/kssl/kssl/netlock4.pem
diff --git a/kio/kssl/kssl/oces.pem b/tdeio/kssl/kssl/oces.pem
index 32e08236c..32e08236c 100644
--- a/kio/kssl/kssl/oces.pem
+++ b/tdeio/kssl/kssl/oces.pem
diff --git a/kio/kssl/kssl/quovadis.pem b/tdeio/kssl/kssl/quovadis.pem
index ea68f8876..ea68f8876 100644
--- a/kio/kssl/kssl/quovadis.pem
+++ b/tdeio/kssl/kssl/quovadis.pem
diff --git a/kio/kssl/kssl/qvrca2.pem b/tdeio/kssl/kssl/qvrca2.pem
index 35cc4eb56..35cc4eb56 100644
--- a/kio/kssl/kssl/qvrca2.pem
+++ b/tdeio/kssl/kssl/qvrca2.pem
diff --git a/kio/kssl/kssl/qvrca3.pem b/tdeio/kssl/kssl/qvrca3.pem
index bda7b1aa5..bda7b1aa5 100644
--- a/kio/kssl/kssl/qvrca3.pem
+++ b/tdeio/kssl/kssl/qvrca3.pem
diff --git a/kio/kssl/kssl/sf-class2-root.pem b/tdeio/kssl/kssl/sf-class2-root.pem
index d552e65dd..d552e65dd 100644
--- a/kio/kssl/kssl/sf-class2-root.pem
+++ b/tdeio/kssl/kssl/sf-class2-root.pem
diff --git a/kio/kssl/kssl/sonera1.pem b/tdeio/kssl/kssl/sonera1.pem
index c5dad57ac..c5dad57ac 100644
--- a/kio/kssl/kssl/sonera1.pem
+++ b/tdeio/kssl/kssl/sonera1.pem
diff --git a/kio/kssl/kssl/sonera2.pem b/tdeio/kssl/kssl/sonera2.pem
index 36a998d22..36a998d22 100644
--- a/kio/kssl/kssl/sonera2.pem
+++ b/tdeio/kssl/kssl/sonera2.pem
diff --git a/kio/kssl/kssl/staatdernederlandenrotca.pem b/tdeio/kssl/kssl/staatdernederlandenrotca.pem
index c4eb117fa..c4eb117fa 100644
--- a/kio/kssl/kssl/staatdernederlandenrotca.pem
+++ b/tdeio/kssl/kssl/staatdernederlandenrotca.pem
diff --git a/kio/kssl/kssl/startcom.pem b/tdeio/kssl/kssl/startcom.pem
index 957842c98..957842c98 100644
--- a/kio/kssl/kssl/startcom.pem
+++ b/tdeio/kssl/kssl/startcom.pem
diff --git a/kio/kssl/kssl/startssl.pem b/tdeio/kssl/kssl/startssl.pem
index 960f2657b..960f2657b 100644
--- a/kio/kssl/kssl/startssl.pem
+++ b/tdeio/kssl/kssl/startssl.pem
diff --git a/kio/kssl/kssl/tcclass2-2011.pem b/tdeio/kssl/kssl/tcclass2-2011.pem
index 0c9d89e77..0c9d89e77 100644
--- a/kio/kssl/kssl/tcclass2-2011.pem
+++ b/tdeio/kssl/kssl/tcclass2-2011.pem
diff --git a/kio/kssl/kssl/tcclass3-2011.pem b/tdeio/kssl/kssl/tcclass3-2011.pem
index 14f81c830..14f81c830 100644
--- a/kio/kssl/kssl/tcclass3-2011.pem
+++ b/tdeio/kssl/kssl/tcclass3-2011.pem
diff --git a/kio/kssl/kssl/utn-network.pem b/tdeio/kssl/kssl/utn-network.pem
index 72b576a59..72b576a59 100644
--- a/kio/kssl/kssl/utn-network.pem
+++ b/tdeio/kssl/kssl/utn-network.pem
diff --git a/kio/kssl/kssl/utn-sgc.pem b/tdeio/kssl/kssl/utn-sgc.pem
index 1c747eb57..1c747eb57 100644
--- a/kio/kssl/kssl/utn-sgc.pem
+++ b/tdeio/kssl/kssl/utn-sgc.pem
diff --git a/kio/kssl/kssl/xgca.pem b/tdeio/kssl/kssl/xgca.pem
index f21e6d8b7..f21e6d8b7 100644
--- a/kio/kssl/kssl/xgca.pem
+++ b/tdeio/kssl/kssl/xgca.pem
diff --git a/kio/kssl/ksslall.h b/tdeio/kssl/ksslall.h
index 0e34837bb..0e34837bb 100644
--- a/kio/kssl/ksslall.h
+++ b/tdeio/kssl/ksslall.h
diff --git a/kio/kssl/ksslcallback.c b/tdeio/kssl/ksslcallback.c
index 59f342584..59f342584 100644
--- a/kio/kssl/ksslcallback.c
+++ b/tdeio/kssl/ksslcallback.c
diff --git a/kio/kssl/ksslcertchain.cc b/tdeio/kssl/ksslcertchain.cc
index a401aec3d..a401aec3d 100644
--- a/kio/kssl/ksslcertchain.cc
+++ b/tdeio/kssl/ksslcertchain.cc
diff --git a/kio/kssl/ksslcertchain.h b/tdeio/kssl/ksslcertchain.h
index c7e9f3c8f..eb6c27d44 100644
--- a/kio/kssl/ksslcertchain.h
+++ b/tdeio/kssl/ksslcertchain.h
@@ -42,7 +42,7 @@ class TQStringList;
  * @see KSSL, KSSLCertificate, KSSLPeerInfo
  * @short KDE X.509 Certificate Chain
  */
-class KIO_EXPORT KSSLCertChain {
+class TDEIO_EXPORT KSSLCertChain {
 friend class KSSL;
 friend class KSSLPeerInfo;
 
diff --git a/kio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc
index 511bd4021..26550e715 100644
--- a/kio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cc
@@ -29,10 +29,10 @@
 #include <tqframe.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <kseparator.h>
@@ -60,7 +60,7 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal)
    _certs = new TQListView(this);
    _certs->addColumn(i18n("Certificate"));
    _certs->setResizeMode(TQListView::LastColumn);
-   TQFontMetrics fm( KGlobalSettings::generalFont() );
+   TQFontMetrics fm( TDEGlobalSettings::generalFont() );
    _certs->setMinimumHeight(4*fm.height());
    grid->addWidget(_certs);
 
diff --git a/kio/kssl/ksslcertdlg.h b/tdeio/kssl/ksslcertdlg.h
index 314ae677d..8d6f3d777 100644
--- a/kio/kssl/ksslcertdlg.h
+++ b/tdeio/kssl/ksslcertdlg.h
@@ -40,7 +40,7 @@ class TQPushButton;
  * @see KSSL
  * @short KDE X.509 Certificate Dialog
  */
-class KIO_EXPORT KSSLCertDlg : public KDialog {
+class TDEIO_EXPORT KSSLCertDlg : public KDialog {
 	Q_OBJECT
 public:
 	/**
@@ -119,7 +119,7 @@ private:
 };
 
 
-class KIO_EXPORT KSSLCertDlgRet {
+class TDEIO_EXPORT KSSLCertDlgRet {
 public:
    bool ok;
    TQString choice;
@@ -131,8 +131,8 @@ protected:
    KSSLCertDlgRetPrivate *d;
 };
 
-KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r);
-KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r);
+TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r);
+TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r);
 
 #endif
 
diff --git a/kio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cc
index 285bb1d2d..1f95c3912 100644
--- a/kio/kssl/ksslcertificate.cc
+++ b/tdeio/kssl/ksslcertificate.cc
@@ -37,9 +37,9 @@
 
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <sys/types.h>
 
@@ -93,7 +93,7 @@ public:
 KSSLCertificate::KSSLCertificate() {
 	d = new KSSLCertificatePrivate;
 	d->m_stateCached = false;
-	KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl");
 	#ifdef KSSL_HAVE_SSL
 		d->m_cert = NULL;
 	#endif
@@ -103,7 +103,7 @@ KSSLCertificate::KSSLCertificate() {
 KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) {
 	d = new KSSLCertificatePrivate;
 	d->m_stateCached = false;
-	KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl");
 	#ifdef KSSL_HAVE_SSL
 		d->m_cert = NULL;
 		setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert()));
@@ -637,7 +637,7 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi
 		return errors;
 	}
 
-	TQStringList qsl = KGlobal::dirs()->resourceDirs("kssl");
+	TQStringList qsl = TDEGlobal::dirs()->resourceDirs("kssl");
 
 	if (qsl.isEmpty()) {
 		errors << KSSLCertificate::NoCARoot;
diff --git a/kio/kssl/ksslcertificate.h b/tdeio/kssl/ksslcertificate.h
index a7906581a..0c5f87323 100644
--- a/kio/kssl/ksslcertificate.h
+++ b/tdeio/kssl/ksslcertificate.h
@@ -72,7 +72,7 @@ class X509;
  * @see KSSL
  * @short KDE X.509 Certificate
  */
-class KIO_EXPORT KSSLCertificate {
+class TDEIO_EXPORT KSSLCertificate {
 friend class KSSL;
 friend class KSSLCertificateHome;
 friend class KSSLCertificateFactory;
@@ -350,8 +350,8 @@ public:
 	static TQString getMD5DigestFromKDEKey(const TQString& k);
 
 private:
-	KIO_EXPORT friend int operator!=(KSSLCertificate& x, KSSLCertificate& y);
-	KIO_EXPORT friend int operator==(KSSLCertificate& x, KSSLCertificate& y);
+	TDEIO_EXPORT friend int operator!=(KSSLCertificate& x, KSSLCertificate& y);
+	TDEIO_EXPORT friend int operator==(KSSLCertificate& x, KSSLCertificate& y);
 
 	KSSLCertificatePrivate *d;
 	int purposeToOpenSSL(KSSLPurpose p) const;
@@ -365,11 +365,11 @@ protected:
 	KSSLValidation processError(int ec);
 };
 
-KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificate& r);
-KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificate& r);
+TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificate& r);
+TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificate& r);
 
-KIO_EXPORT int operator==(KSSLCertificate& x, KSSLCertificate& y);
-KIO_EXPORT inline int operator!=(KSSLCertificate& x, KSSLCertificate& y)
+TDEIO_EXPORT int operator==(KSSLCertificate& x, KSSLCertificate& y);
+TDEIO_EXPORT inline int operator!=(KSSLCertificate& x, KSSLCertificate& y)
 { return !(x == y); }
 
 #endif
diff --git a/kio/kssl/ksslcertificatecache.cc b/tdeio/kssl/ksslcertificatecache.cc
index 2eecd66d6..2eecd66d6 100644
--- a/kio/kssl/ksslcertificatecache.cc
+++ b/tdeio/kssl/ksslcertificatecache.cc
diff --git a/kio/kssl/ksslcertificatecache.h b/tdeio/kssl/ksslcertificatecache.h
index 486997265..924cb0f54 100644
--- a/kio/kssl/ksslcertificatecache.h
+++ b/tdeio/kssl/ksslcertificatecache.h
@@ -28,7 +28,7 @@ class KSSLCertificate;
 
 #include <tdelibs_export.h>
 
-class KIO_EXPORT KSSLCertificateCache {
+class TDEIO_EXPORT KSSLCertificateCache {
 public:
 
 enum KSSLCertificatePolicy { Unknown, Reject, Accept, Prompt, Ambiguous };
@@ -101,7 +101,7 @@ private:
 };
 
 
-KIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p);
-KIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p);
+TDEIO_EXPORT TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p);
+TDEIO_EXPORT TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p);
 
 #endif
diff --git a/kio/kssl/ksslcertificatefactory.cc b/tdeio/kssl/ksslcertificatefactory.cc
index 66e272ced..66e272ced 100644
--- a/kio/kssl/ksslcertificatefactory.cc
+++ b/tdeio/kssl/ksslcertificatefactory.cc
diff --git a/kio/kssl/ksslcertificatefactory.h b/tdeio/kssl/ksslcertificatefactory.h
index c259e60e8..503c591a7 100644
--- a/kio/kssl/ksslcertificatefactory.h
+++ b/tdeio/kssl/ksslcertificatefactory.h
@@ -29,7 +29,7 @@ class KSSLCertificate;
 
 typedef enum {KEYTYPE_UNKNOWN, KEYTYPE_RSA, KEYTYPE_DSA} KSSLKeyType;
 
-class KIO_EXPORT KSSLCertificateFactory {
+class TDEIO_EXPORT KSSLCertificateFactory {
  
 public:
 
diff --git a/kio/kssl/ksslcertificatehome.cc b/tdeio/kssl/ksslcertificatehome.cc
index c722e2c6b..39470c5ab 100644
--- a/kio/kssl/ksslcertificatehome.cc
+++ b/tdeio/kssl/ksslcertificatehome.cc
@@ -186,7 +186,7 @@ KSimpleConfig cfg("ksslauthmap", false);
 
 
 TQString KSSLCertificateHome::getDefaultCertificateName(KSSLAuthAction *aa) {
-KConfig cfg("cryptodefaults", false);
+TDEConfig cfg("cryptodefaults", false);
 
    cfg.setGroup("Auth");
    if (aa) {
diff --git a/kio/kssl/ksslcertificatehome.h b/tdeio/kssl/ksslcertificatehome.h
index 549d7c168..f8a18a423 100644
--- a/kio/kssl/ksslcertificatehome.h
+++ b/tdeio/kssl/ksslcertificatehome.h
@@ -28,7 +28,7 @@ class KSSLPKCS12;
 
 #include <tdelibs_export.h>
 
-class KIO_EXPORT KSSLCertificateHome {
+class TDEIO_EXPORT KSSLCertificateHome {
  
 public:
 
diff --git a/kio/kssl/ksslconfig.h.cmake b/tdeio/kssl/ksslconfig.h.cmake
index 1be6bbba4..1be6bbba4 100644
--- a/kio/kssl/ksslconfig.h.cmake
+++ b/tdeio/kssl/ksslconfig.h.cmake
diff --git a/kio/kssl/ksslconfig.h.in b/tdeio/kssl/ksslconfig.h.in
index c078298ec..c078298ec 100644
--- a/kio/kssl/ksslconfig.h.in
+++ b/tdeio/kssl/ksslconfig.h.in
diff --git a/kio/kssl/ksslconfig_win.h b/tdeio/kssl/ksslconfig_win.h
index c078298ec..c078298ec 100644
--- a/kio/kssl/ksslconfig_win.h
+++ b/tdeio/kssl/ksslconfig_win.h
diff --git a/kio/kssl/ksslconnectioninfo.cc b/tdeio/kssl/ksslconnectioninfo.cc
index ccc7fc780..ccc7fc780 100644
--- a/kio/kssl/ksslconnectioninfo.cc
+++ b/tdeio/kssl/ksslconnectioninfo.cc
diff --git a/kio/kssl/ksslconnectioninfo.h b/tdeio/kssl/ksslconnectioninfo.h
index e9bbad831..09fd5cdae 100644
--- a/kio/kssl/ksslconnectioninfo.h
+++ b/tdeio/kssl/ksslconnectioninfo.h
@@ -37,7 +37,7 @@ class KSSL;
  * @see KSSL
  * @short KDE SSL Connection Information
  */
-class KIO_EXPORT KSSLConnectionInfo {
+class TDEIO_EXPORT KSSLConnectionInfo {
 friend class KSSL;
 public:
 	/**
diff --git a/kio/kssl/ksslcsessioncache.cc b/tdeio/kssl/ksslcsessioncache.cc
index d39638717..d39638717 100644
--- a/kio/kssl/ksslcsessioncache.cc
+++ b/tdeio/kssl/ksslcsessioncache.cc
diff --git a/kio/kssl/ksslcsessioncache.h b/tdeio/kssl/ksslcsessioncache.h
index 4cfc77aaf..9badfe279 100644
--- a/kio/kssl/ksslcsessioncache.h
+++ b/tdeio/kssl/ksslcsessioncache.h
@@ -26,7 +26,7 @@
 class KURL;
 class TQString;
 
-class KIO_EXPORT KSSLCSessionCache {
+class TDEIO_EXPORT KSSLCSessionCache {
  public:
 
     /**
diff --git a/kio/kssl/kssldefs.h b/tdeio/kssl/kssldefs.h
index c33664b14..c33664b14 100644
--- a/kio/kssl/kssldefs.h
+++ b/tdeio/kssl/kssldefs.h
diff --git a/kio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cc
index bc67d3e6e..7567b8595 100644
--- a/kio/kssl/ksslinfodlg.cc
+++ b/tdeio/kssl/ksslinfodlg.cc
@@ -30,12 +30,12 @@
 #include <tqscrollview.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksqueezedtextlabel.h>
 #include <kurllabel.h>
 #include <kstdguiitem.h>
@@ -127,9 +127,9 @@ KSSLInfoDlg::~KSSLInfoDlg() {
 }
 
 void KSSLInfoDlg::launchConfig() {
-    KProcess p;
-    p << "kcmshell" << "crypto";
-    p.start(KProcess::DontCare);
+    TDEProcess p;
+    p << "tdecmshell" << "crypto";
+    p.start(TDEProcess::DontCare);
 }
 
 
diff --git a/kio/kssl/ksslinfodlg.h b/tdeio/kssl/ksslinfodlg.h
index 4bd00a9e5..c73afbba1 100644
--- a/kio/kssl/ksslinfodlg.h
+++ b/tdeio/kssl/ksslinfodlg.h
@@ -47,7 +47,7 @@ class KSSLCertChain;
  * @see KSSL
  * @short KDE SSL Information Dialog
  */
-class KIO_EXPORT KSSLInfoDlg : public KDialog {
+class TDEIO_EXPORT KSSLInfoDlg : public KDialog {
 	Q_OBJECT
 public:
 	/**
@@ -146,7 +146,7 @@ private slots:
  * @see KSSLInfoDlg
  * @short KDE SSL Certificate Box
  */
-class KIO_EXPORT KSSLCertBox : public TQScrollView {
+class TDEIO_EXPORT KSSLCertBox : public TQScrollView {
 public:
 	/**
 	 *  Construct a certificate box
diff --git a/kio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cc
index 5e7eb3a77..654444994 100644
--- a/kio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cc
@@ -23,15 +23,15 @@
 #include "keygenwizard.h"
 #include "keygenwizard2.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kopenssl.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
-#include <kwallet.h>
+#include <tdetempfile.h>
+#include <tdewallet.h>
 
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
@@ -166,9 +166,9 @@ int KSSLKeyGen::generateCSR(const TQString& name, const TQString& pass, int bits
 	// back from there.  Yes it's inefficient, but it doesn't happen
 	// often and this way things are uniform.
   
-	KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl");
 
-	TQString path = KGlobal::dirs()->saveLocation("kssl");
+	TQString path = TDEGlobal::dirs()->saveLocation("kssl");
 	KTempFile csrFile(path + "csr_", ".der");
 
 	if (!csrFile.fstream()) {
@@ -191,7 +191,7 @@ int KSSLKeyGen::generateCSR(const TQString& name, const TQString& pass, int bits
 			kossl->EVP_bf_cbc(), pass.local8Bit().data(),
 			pass.length(), 0L, 0L);
 
-	// FIXME Write kconfig entry to store the filenames under the md5 hash
+	// FIXME Write tdeconfig entry to store the filenames under the md5 hash
 
 	kossl->X509_REQ_free(req);
 	kossl->EVP_PKEY_free(pkey);
diff --git a/kio/kssl/ksslkeygen.h b/tdeio/kssl/ksslkeygen.h
index cd1d8e7ab..5bb99a593 100644
--- a/kio/kssl/ksslkeygen.h
+++ b/tdeio/kssl/ksslkeygen.h
@@ -41,7 +41,7 @@ class KGWizardPage2;
  * @see KSSL, KSSLCertificate, KSSLPKCS12
  * @short KDE Key Generation Dialog
  */
-class KIO_EXPORT KSSLKeyGen : public KWizard {
+class TDEIO_EXPORT KSSLKeyGen : public KWizard {
 	Q_OBJECT
 public:
 	/**
diff --git a/kio/kssl/ksslpeerinfo.cc b/tdeio/kssl/ksslpeerinfo.cc
index d1c2d00fc..d1c2d00fc 100644
--- a/kio/kssl/ksslpeerinfo.cc
+++ b/tdeio/kssl/ksslpeerinfo.cc
diff --git a/kio/kssl/ksslpeerinfo.h b/tdeio/kssl/ksslpeerinfo.h
index bdcf91231..a5cd017c9 100644
--- a/kio/kssl/ksslpeerinfo.h
+++ b/tdeio/kssl/ksslpeerinfo.h
@@ -39,7 +39,7 @@ class KInetSocketAddress;
  * @see KSSL
  * @short KDE SSL Peer Data
  */
-class KIO_EXPORT KSSLPeerInfo {
+class TDEIO_EXPORT KSSLPeerInfo {
 friend class KSSL;
 public:
 	/**
diff --git a/kio/kssl/ksslpemcallback.cc b/tdeio/kssl/ksslpemcallback.cc
index 2dfbb9146..207949a0c 100644
--- a/kio/kssl/ksslpemcallback.cc
+++ b/tdeio/kssl/ksslpemcallback.cc
@@ -23,7 +23,7 @@
 #endif
 
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ksslpemcallback.h"
 
 int KSSLPemCallback(char *buf, int size, int rwflag, void *userdata) {
diff --git a/kio/kssl/ksslpemcallback.h b/tdeio/kssl/ksslpemcallback.h
index 0a8978b6e..265edd099 100644
--- a/kio/kssl/ksslpemcallback.h
+++ b/tdeio/kssl/ksslpemcallback.h
@@ -23,7 +23,7 @@
 
 #include <tdelibs_export.h>
 
-int KIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata);
+int TDEIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata);
 
 #endif
 
diff --git a/kio/kssl/ksslpkcs12.cc b/tdeio/kssl/ksslpkcs12.cc
index b8b23cf1c..9521e907b 100644
--- a/kio/kssl/ksslpkcs12.cc
+++ b/tdeio/kssl/ksslpkcs12.cc
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <ksslall.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 
 #include <assert.h>
diff --git a/kio/kssl/ksslpkcs12.h b/tdeio/kssl/ksslpkcs12.h
index bfbd78d3e..c9dff0d82 100644
--- a/kio/kssl/ksslpkcs12.h
+++ b/tdeio/kssl/ksslpkcs12.h
@@ -58,7 +58,7 @@ class KOpenSSLProxy;
  * @see KSSL, KSSLCertificate
  * @short KDE PKCS#12 Certificate
  */
-class KIO_EXPORT KSSLPKCS12 {
+class TDEIO_EXPORT KSSLPKCS12 {
 friend class KSSL;
 
 public:
diff --git a/kio/kssl/ksslpkcs7.cc b/tdeio/kssl/ksslpkcs7.cc
index 8db0000f0..cb66eb468 100644
--- a/kio/kssl/ksslpkcs7.cc
+++ b/tdeio/kssl/ksslpkcs7.cc
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <ksslall.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 
 #include <assert.h>
diff --git a/kio/kssl/ksslpkcs7.h b/tdeio/kssl/ksslpkcs7.h
index 07c221464..c94b7bc7a 100644
--- a/kio/kssl/ksslpkcs7.h
+++ b/tdeio/kssl/ksslpkcs7.h
@@ -57,7 +57,7 @@ class KOpenSSLProxy;
  * @see KSSL
  * @short KDE PKCS#7 Certificate
  */
-class KIO_EXPORT KSSLPKCS7 {
+class TDEIO_EXPORT KSSLPKCS7 {
 friend class KSSL;
 
 public:
diff --git a/kio/kssl/ksslsession.cc b/tdeio/kssl/ksslsession.cc
index 3c80233f1..3c80233f1 100644
--- a/kio/kssl/ksslsession.cc
+++ b/tdeio/kssl/ksslsession.cc
diff --git a/kio/kssl/ksslsession.h b/tdeio/kssl/ksslsession.h
index d8689833f..394a4b91a 100644
--- a/kio/kssl/ksslsession.h
+++ b/tdeio/kssl/ksslsession.h
@@ -39,7 +39,7 @@ class KSSLSessionPrivate;
  * @see KSSL
  * @short KDE SSL Session Information
  */
-class KIO_EXPORT KSSLSession {
+class TDEIO_EXPORT KSSLSession {
 friend class KSSL;
 public:
 	/**
diff --git a/kio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cc
index 5a77b12bf..fbf10b476 100644
--- a/kio/kssl/ksslsettings.cc
+++ b/tdeio/kssl/ksslsettings.cc
@@ -33,7 +33,7 @@
 #include <tqsortedlist.h>
 
 #include "ksslsettings.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
@@ -96,9 +96,9 @@ public:
 
 KSSLSettings::KSSLSettings(bool readConfig) {
   d = new KSSLSettingsPrivate;
-  m_cfg = new KConfig("cryptodefaults", false, false);
+  m_cfg = new TDEConfig("cryptodefaults", false, false);
 
-  if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
+  if (!TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl")) {
     //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl;
   }
 
@@ -316,7 +316,7 @@ void KSSLSettings::save() {
   m_cfg->sync();
  
   // insure proper permissions -- contains sensitive data
-  TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
+  TQString cfgName(TDEGlobal::dirs()->findResource("config", "cryptodefaults"));
   if (!cfgName.isEmpty())
     ::chmod(TQFile::encodeName(cfgName), 0600);
 #endif
diff --git a/kio/kssl/ksslsettings.h b/tdeio/kssl/ksslsettings.h
index 44345937b..18b55331f 100644
--- a/kio/kssl/ksslsettings.h
+++ b/tdeio/kssl/ksslsettings.h
@@ -23,7 +23,7 @@
 
 #include <tqstring.h>
 #include <tqvaluelist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KSSLSettingsPrivate;
 
@@ -36,7 +36,7 @@ class KSSLSettingsPrivate;
  * @see KSSL
  * @short KDE SSL Settings
  */
-class KIO_EXPORT KSSLSettings {
+class TDEIO_EXPORT KSSLSettings {
 public:
 	/**
 	 *  Construct a KSSL Settings object
@@ -208,7 +208,7 @@ public:
 	void save();
 
 private:
-	KConfig *m_cfg;
+	TDEConfig *m_cfg;
 	bool m_bUseSSLv2, m_bUseSSLv3, m_bUseTLSv1;
 	bool m_bWarnOnEnter, m_bWarnOnUnencrypted, m_bWarnOnLeave, m_bWarnOnMixed;
 	bool m_bWarnSelfSigned, m_bWarnRevoked, m_bWarnExpired;
diff --git a/kio/kssl/ksslsigners.cc b/tdeio/kssl/ksslsigners.cc
index 028ddf555..028ddf555 100644
--- a/kio/kssl/ksslsigners.cc
+++ b/tdeio/kssl/ksslsigners.cc
diff --git a/kio/kssl/ksslsigners.h b/tdeio/kssl/ksslsigners.h
index 21744f1de..3149e852a 100644
--- a/kio/kssl/ksslsigners.h
+++ b/tdeio/kssl/ksslsigners.h
@@ -40,7 +40,7 @@ class DCOPClient;
  * @see KSSL, KSSLCertificate
  * @short KDE SSL Signer Database
  */
-class KIO_EXPORT KSSLSigners {
+class TDEIO_EXPORT KSSLSigners {
 public:
 	/**
 	 *  Construct a KSSLSigner object.
diff --git a/kio/kssl/ksslutils.cc b/tdeio/kssl/ksslutils.cc
index cf024347c..444e5dd4a 100644
--- a/kio/kssl/ksslutils.cc
+++ b/tdeio/kssl/ksslutils.cc
@@ -22,8 +22,8 @@
 #include "ksslutils.h"
 
 #include <tqstring.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
 
 #include "kopenssl.h"
@@ -73,7 +73,7 @@ TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm) {
   int gmt;
   TQDateTime qdt = ASN1_UTCTIME_QDateTime(tm, &gmt);
 
-  qstr = KGlobal::locale()->formatDateTime(qdt, false, true);
+  qstr = TDEGlobal::locale()->formatDateTime(qdt, false, true);
   if (gmt) { 
     qstr += " ";
     qstr += i18n("GMT");
diff --git a/kio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h
index 4c087374f..58a817e83 100644
--- a/kio/kssl/ksslutils.h
+++ b/tdeio/kssl/ksslutils.h
@@ -41,7 +41,7 @@ class TQDateTime;
 #ifdef KSSL_HAVE_SSL
 // This functionality is missing in OpenSSL
 /**
- *  Convert an ASN1 UTCTIME value to a string.  Uses KLocale settings.
+ *  Convert an ASN1 UTCTIME value to a string.  Uses TDELocale settings.
  *
  *  @param tm the OpenSSL ASN1_UTCTIME pointer
  *
@@ -51,7 +51,7 @@ class TQDateTime;
 KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm);
 
 /**
- *  Convert an ASN1 UTCTIME value to a TQDateTime.  Uses KLocale settings.
+ *  Convert an ASN1 UTCTIME value to a TQDateTime.  Uses TDELocale settings.
  *
  *  @param tm the OpenSSL ASN1_UTCTIME pointer
  *  @param isGmt set to 1 if the date is set to GMT
diff --git a/kio/kssl/ksslx509map.cc b/tdeio/kssl/ksslx509map.cc
index 7896fdfcf..7896fdfcf 100644
--- a/kio/kssl/ksslx509map.cc
+++ b/tdeio/kssl/ksslx509map.cc
diff --git a/kio/kssl/ksslx509map.h b/tdeio/kssl/ksslx509map.h
index 93c46aeec..f76413100 100644
--- a/kio/kssl/ksslx509map.h
+++ b/tdeio/kssl/ksslx509map.h
@@ -36,7 +36,7 @@
  * @see KSSL, KSSLCertificate
  * @short X.509 Map Parser
  */
-class KIO_EXPORT KSSLX509Map {
+class TDEIO_EXPORT KSSLX509Map {
 public:
 	/**
 	 *  Construct an X.509 Map
diff --git a/kio/kssl/ksslx509v3.cc b/tdeio/kssl/ksslx509v3.cc
index a3310b9db..a3310b9db 100644
--- a/kio/kssl/ksslx509v3.cc
+++ b/tdeio/kssl/ksslx509v3.cc
diff --git a/kio/kssl/ksslx509v3.h b/tdeio/kssl/ksslx509v3.h
index 45c7d706e..c521f3e25 100644
--- a/kio/kssl/ksslx509v3.h
+++ b/tdeio/kssl/ksslx509v3.h
@@ -35,7 +35,7 @@
  * @see KExtendedSocket, TCPSlaveBase
  * @short KDE SSL Class
  */
-class KIO_EXPORT KSSLX509V3 {
+class TDEIO_EXPORT KSSLX509V3 {
 friend class KSSLCertificate;
 friend class KSSLCertificatePrivate;
 public:
diff --git a/kio/kurifilterplugin.desktop b/tdeio/kurifilterplugin.desktop
index 5882b35ca..5882b35ca 100644
--- a/kio/kurifilterplugin.desktop
+++ b/tdeio/kurifilterplugin.desktop
diff --git a/kio/magic b/tdeio/magic
index c12cec4ba..c12cec4ba 100644
--- a/kio/magic
+++ b/tdeio/magic
diff --git a/kio/misc/CMakeLists.txt b/tdeio/misc/CMakeLists.txt
index 52aa2207a..3bfdb0980 100644
--- a/kio/misc/CMakeLists.txt
+++ b/tdeio/misc/CMakeLists.txt
@@ -9,13 +9,13 @@
 #
 #################################################
 
-add_subdirectory( ksendbugmail )
+add_subdirectory( tdesendbugmail )
 add_subdirectory( kpac )
 add_subdirectory( tdesasl )
 add_subdirectory( kssld )
-add_subdirectory( kfile )
-add_subdirectory( kwalletd )
-add_subdirectory( kntlm )
+add_subdirectory( tdefile )
+add_subdirectory( tdewalletd )
+add_subdirectory( tdentlm )
 
 add_definitions(
   -D_LARGEFILE64_SOURCE
@@ -25,17 +25,17 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_BINARY_DIR}/kio
-  ${CMAKE_BINARY_DIR}/kio/kio
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio
+  ${CMAKE_BINARY_DIR}/tdeio/tdeio
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
@@ -45,13 +45,13 @@ link_directories(
 
 ##### headers ###################################
 
-install( FILES uiserver.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install( FILES uiserver.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
 ##### other data ################################
 
 install(FILES
-    kio_uiserver.desktop kmailservice.protocol
+    tdeio_uiserver.desktop tdemailservice.protocol
     telnet.protocol rlogin.protocol rtsp.protocol
     ssh.protocol mms.protocol mmst.protocol mmsu.protocol
     pnm.protocol rtspt.protocol rtspu.protocol
@@ -61,9 +61,9 @@ install( FILES fileshareset DESTINATION ${BIN_INSTALL_DIR}
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE SETUID )
 
 
-#### kio_uiserver ###############################
+#### tdeio_uiserver ###############################
 
-set( target kio_uiserver )
+set( target tdeio_uiserver )
 
 set( ${target}_SRCS
   uiserver.cpp uiserver.skel
@@ -71,14 +71,14 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DEPENDENCIES dcopidl
 )
 
 
-##### kmailservice ##############################
+##### tdemailservice ##############################
 
-set( target kmailservice )
+set( target tdemailservice )
 
 tde_add_executable( ${target}
   SOURCES ${target}.cpp
@@ -87,9 +87,9 @@ tde_add_executable( ${target}
 )
 
 
-##### ktelnetservice ############################
+##### tdetelnetservice ############################
 
-set( target ktelnetservice )
+set( target tdetelnetservice )
 
 tde_add_executable( ${target}
   SOURCES ${target}.cpp
diff --git a/kio/misc/Makefile.am b/tdeio/misc/Makefile.am
index cfa5a4c3e..6a250cf8a 100644
--- a/kio/misc/Makefile.am
+++ b/tdeio/misc/Makefile.am
@@ -20,35 +20,35 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES)
 
-SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm
+SUBDIRS = . tdesendbugmail kpac tdesasl kssld tdefile tdewalletd tdentlm
 
 lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = kio_uiserver.la
-bin_PROGRAMS = kmailservice ktelnetservice
+tdeinit_LTLIBRARIES = tdeio_uiserver.la
+bin_PROGRAMS = tdemailservice tdetelnetservice
 
-observer_DIR = $(top_srcdir)/kio/kio
+observer_DIR = $(top_srcdir)/tdeio/tdeio
 
-kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
-kio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
-kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdeio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
+tdeio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdeio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 METASOURCES = AUTO
 
-kde_services_DATA = kio_uiserver.desktop
+kde_services_DATA = tdeio_uiserver.desktop
 
-kmailservice_SOURCES = kmailservice.cpp
-kmailservice_LDADD = $(LIB_TDECORE)
-kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdemailservice_SOURCES = tdemailservice.cpp
+tdemailservice_LDADD = $(LIB_TDECORE)
+tdemailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-ktelnetservice_SOURCES = ktelnetservice.cpp
-ktelnetservice_LDADD = $(LIB_TDEUI)
-ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdetelnetservice_SOURCES = tdetelnetservice.cpp
+tdetelnetservice_LDADD = $(LIB_TDEUI)
+tdetelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
+protocol_DATA = tdemailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
 		mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
 protocoldir = $(kde_servicesdir)
 
-kiomiscdir = $(includedir)/kio
+kiomiscdir = $(includedir)/tdeio
 kiomisc_HEADERS = uiserver.h
 
 
diff --git a/kio/misc/fileshareset b/tdeio/misc/fileshareset
index 4c921ba38..4c921ba38 100755
--- a/kio/misc/fileshareset
+++ b/tdeio/misc/fileshareset
diff --git a/kio/misc/kpac/CMakeLists.txt b/tdeio/misc/kpac/CMakeLists.txt
index 00ce2d357..14af52de1 100644
--- a/kio/misc/kpac/CMakeLists.txt
+++ b/tdeio/misc/kpac/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/kded
 )
 
diff --git a/kio/misc/kpac/Makefile.am b/tdeio/misc/kpac/Makefile.am
index beb6a4b86..beb6a4b86 100644
--- a/kio/misc/kpac/Makefile.am
+++ b/tdeio/misc/kpac/Makefile.am
diff --git a/kio/misc/kpac/README b/tdeio/misc/kpac/README
index d211ae07b..d211ae07b 100644
--- a/kio/misc/kpac/README
+++ b/tdeio/misc/kpac/README
diff --git a/kio/misc/kpac/README.wpad b/tdeio/misc/kpac/README.wpad
index f63d25764..f63d25764 100644
--- a/kio/misc/kpac/README.wpad
+++ b/tdeio/misc/kpac/README.wpad
diff --git a/kio/misc/kpac/TODO b/tdeio/misc/kpac/TODO
index ce5cd6a11..ce5cd6a11 100644
--- a/kio/misc/kpac/TODO
+++ b/tdeio/misc/kpac/TODO
diff --git a/kio/misc/kpac/configure.in.in b/tdeio/misc/kpac/configure.in.in
index a65b9a1c8..a65b9a1c8 100644
--- a/kio/misc/kpac/configure.in.in
+++ b/tdeio/misc/kpac/configure.in.in
diff --git a/kio/misc/kpac/dhcp.h b/tdeio/misc/kpac/dhcp.h
index 41643ae3a..41643ae3a 100644
--- a/kio/misc/kpac/dhcp.h
+++ b/tdeio/misc/kpac/dhcp.h
diff --git a/kio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index 7a84958f7..533c4fcca 100644
--- a/kio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
@@ -41,7 +41,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <kurl.h>
 
@@ -54,7 +54,7 @@ namespace KPAC
           m_helper( new KProcIO )
     {
         connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) );
-        connect( m_helper, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( failed() ) );
+        connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) );
         *m_helper << "kpac_dhcp_helper";
 
         if ( !m_helper->start() )
diff --git a/kio/misc/kpac/discovery.h b/tdeio/misc/kpac/discovery.h
index a1443ad8c..a1443ad8c 100644
--- a/kio/misc/kpac/discovery.h
+++ b/tdeio/misc/kpac/discovery.h
diff --git a/kio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index 6f419f5f5..483e836cb 100644
--- a/kio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -24,9 +24,9 @@
 #include <tqtextcodec.h>
 
 #include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kio/job.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeio/job.h>
 
 #include "downloader.moc"
 
@@ -43,10 +43,10 @@ namespace KPAC
         m_script = TQString::null;
         m_scriptURL = url;
 
-        KIO::TransferJob* job = KIO::get( url, false, false );
-        connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-                 TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
-        connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( result( KIO::Job* ) ) );
+        TDEIO::TransferJob* job = TDEIO::get( url, false, false );
+        connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+                 TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+        connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) );
     }
 
     void Downloader::failed()
@@ -59,19 +59,19 @@ namespace KPAC
         m_error = error;
     }
 
-    void Downloader::data( KIO::Job*, const TQByteArray& data )
+    void Downloader::data( TDEIO::Job*, const TQByteArray& data )
     {
         unsigned offset = m_data.size();
         m_data.resize( offset + data.size() );
         std::memcpy( m_data.data() + offset, data.data(), data.size() );
     }
 
-    void Downloader::result( KIO::Job* job )
+    void Downloader::result( TDEIO::Job* job )
     {
-        if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() )
+        if ( !job->error() && !static_cast< TDEIO::TransferJob* >( job )->isErrorPage() )
         {
             bool dummy;
-            m_script = KGlobal::charsets()->codecForName(
+            m_script = TDEGlobal::charsets()->codecForName(
                 job->queryMetaData( "charset" ), dummy )->toUnicode( m_data );
             emit result( true );
         }
diff --git a/kio/misc/kpac/downloader.h b/tdeio/misc/kpac/downloader.h
index 82418882f..808e09378 100644
--- a/kio/misc/kpac/downloader.h
+++ b/tdeio/misc/kpac/downloader.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 namespace KPAC
 {
@@ -48,8 +48,8 @@ namespace KPAC
         void setError( const TQString& );
 
     private slots:
-        void data( KIO::Job*, const TQByteArray& );
-        void result( KIO::Job* );
+        void data( TDEIO::Job*, const TQByteArray& );
+        void result( TDEIO::Job* );
 
     private:
         TQByteArray m_data;
diff --git a/kio/misc/kpac/eventsrc b/tdeio/misc/kpac/eventsrc
index c44443a03..c44443a03 100644
--- a/kio/misc/kpac/eventsrc
+++ b/tdeio/misc/kpac/eventsrc
diff --git a/kio/misc/kpac/kpac_dhcp_helper.c b/tdeio/misc/kpac/kpac_dhcp_helper.c
index 906e89dfa..906e89dfa 100644
--- a/kio/misc/kpac/kpac_dhcp_helper.c
+++ b/tdeio/misc/kpac/kpac_dhcp_helper.c
diff --git a/kio/misc/kpac/kpactest.pac b/tdeio/misc/kpac/kpactest.pac
index 69e5aaad7..69e5aaad7 100644
--- a/kio/misc/kpac/kpactest.pac
+++ b/tdeio/misc/kpac/kpactest.pac
diff --git a/kio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index 5d8b008bf..dfb682005 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -22,10 +22,10 @@
 #include <ctime>
 
 #include <dcopclient.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include "proxyscout.moc"
 #include "discovery.h"
@@ -41,7 +41,7 @@ namespace KPAC
 
     ProxyScout::ProxyScout( const TQCString& name )
         : KDEDModule( name ),
-          m_instance( new KInstance( "proxyscout" ) ),
+          m_instance( new TDEInstance( "proxyscout" ) ),
           m_downloader( 0 ),
           m_script( 0 ),
           m_suspendTime( 0 )
diff --git a/kio/misc/kpac/proxyscout.desktop b/tdeio/misc/kpac/proxyscout.desktop
index 02e402b50..02e402b50 100644
--- a/kio/misc/kpac/proxyscout.desktop
+++ b/tdeio/misc/kpac/proxyscout.desktop
diff --git a/kio/misc/kpac/proxyscout.h b/tdeio/misc/kpac/proxyscout.h
index c18e5173d..78c8fc237 100644
--- a/kio/misc/kpac/proxyscout.h
+++ b/tdeio/misc/kpac/proxyscout.h
@@ -29,7 +29,7 @@
 #include <time.h>
 
 class DCOPClientTransaction;
-class KInstance;
+class TDEInstance;
 
 namespace KPAC
 {
@@ -56,7 +56,7 @@ namespace KPAC
         bool startDownload();
         TQString handleRequest( const KURL& url );
 
-        KInstance* m_instance;
+        TDEInstance* m_instance;
         Downloader* m_downloader;
         Script* m_script;
 
diff --git a/kio/misc/kpac/script.cpp b/tdeio/misc/kpac/script.cpp
index 55faef8a1..55faef8a1 100644
--- a/kio/misc/kpac/script.cpp
+++ b/tdeio/misc/kpac/script.cpp
diff --git a/kio/misc/kpac/script.h b/tdeio/misc/kpac/script.h
index 49ba0b6a3..49ba0b6a3 100644
--- a/kio/misc/kpac/script.h
+++ b/tdeio/misc/kpac/script.h
diff --git a/kio/misc/kssld/CMakeLists.txt b/tdeio/misc/kssld/CMakeLists.txt
index 14d2de1ac..813ce44f0 100644
--- a/kio/misc/kssld/CMakeLists.txt
+++ b/tdeio/misc/kssld/CMakeLists.txt
@@ -13,12 +13,12 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
 )
 
 link_directories(
diff --git a/kio/misc/kssld/Makefile.am b/tdeio/misc/kssld/Makefile.am
index 18193018e..09ddfe440 100644
--- a/kio/misc/kssld/Makefile.am
+++ b/tdeio/misc/kssld/Makefile.am
@@ -16,7 +16,7 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl $(all_includes)
+INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl $(all_includes)
 
 kde_module_LTLIBRARIES = kded_kssld.la
 
diff --git a/kio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index 760e654d7..d47845bbb 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include "kssld.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <ksslcertchain.h>
 #include <ksslcertificate.h>
@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <tqfile.h>
 #include <tqsortedlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tqdatetime.h>
@@ -61,7 +61,7 @@ extern "C" {
 }
 
 
-static void updatePoliciesConfig(KConfig *cfg) {
+static void updatePoliciesConfig(TDEConfig *cfg) {
 	TQStringList groups = cfg->groupList();
 
 	for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) {
@@ -117,7 +117,7 @@ KSSLD::KSSLD(const TQCString &name) : KDEDModule(name)
 	if (2 != cfg->readNumEntry("policies version", 0)) {
 		::updatePoliciesConfig(cfg);
 	}
-	KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+	TDEGlobal::dirs()->addResourceType("kssl", TDEStandardDirs::kde_default("data") + "kssl");
 	caVerifyUpdate();
 	cacheLoadDefaultPolicies();
 	certList.setAutoDelete(false);
@@ -166,7 +166,7 @@ KSSLCNode *node;
 		if (node->permanent ||
 			node->expires > TQDateTime::currentDateTime()) {
 			// First convert to a binary format and then write the
-			// kconfig entry write the (CN, policy, cert) to
+			// tdeconfig entry write the (CN, policy, cert) to
 			// KSimpleConfig
 			cfg->setGroup(node->cert->getMD5Digest());
 			cfg->writeEntry("Certificate", node->cert->toString());
@@ -195,7 +195,7 @@ KSSLCNode *node;
 	cfg->sync();
 
 	// insure proper permissions -- contains sensitive data
-	TQString cfgName(KGlobal::dirs()->findResource("config", "ksslpolicies"));
+	TQString cfgName(TDEGlobal::dirs()->findResource("config", "ksslpolicies"));
 
 	if (!cfgName.isEmpty()) {
 		::chmod(TQFile::encodeName(cfgName), 0600);
@@ -618,12 +618,12 @@ return false;
 ///////////////////////////////////////////////////////////////////////////
 
 void KSSLD::caVerifyUpdate() {
-	TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt";
+	TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt";
 	if (!TQFile::exists(path))
 		return;
 	
 	cfg->setGroup(TQString::null);
-	TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true);
+	TQ_UINT32 newStamp = TDEGlobal::dirs()->calcResourceHash("config", "ksslcalist", true);
 	TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp");
 	if (oldStamp != newStamp)
 	{
@@ -634,14 +634,14 @@ void KSSLD::caVerifyUpdate() {
 }
 
 bool KSSLD::caRegenerate() {
-TQString path = KGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt";
+TQString path = TDEGlobal::dirs()->saveLocation("kssl") + "/ca-bundle.crt";
 
 TQFile out(path);
 
 	if (!out.open(IO_WriteOnly))
 		return false;
 
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 TQStringList x = cfg.groupList();
 
@@ -677,7 +677,7 @@ KSSLCertificate *x = KSSLCertificate::fromString(certificate.local8Bit());
 
 	if (!x) return false;
 
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 
 	cfg.setGroup(x->getSubject());
 	cfg.writeEntry("x509", certificate);
@@ -766,7 +766,7 @@ bool KSSLD::caRemoveFromFile(TQString filename) {
 
 TQStringList KSSLD::caList() {
 TQStringList x;
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	x = cfg.groupList();
 	x.remove("<default>");
@@ -776,7 +776,7 @@ return x;
 
 
 bool KSSLD::caUseForSSL(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -788,7 +788,7 @@ return cfg.readBoolEntry("site", false);
 
 
 bool KSSLD::caUseForEmail(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -800,7 +800,7 @@ return cfg.readBoolEntry("email", false);
 
 
 bool KSSLD::caUseForCode(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 
 	if (!cfg.hasGroup(subject))
 		return false;
@@ -811,7 +811,7 @@ return cfg.readBoolEntry("code", false);
 
 
 bool KSSLD::caRemove(TQString subject) {
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 	if (!cfg.hasGroup(subject))
 		return false;
 
@@ -823,7 +823,7 @@ return true;
 
 
 TQString KSSLD::caGetCert(TQString subject) {
-KConfig cfg("ksslcalist", true, false);
+TDEConfig cfg("ksslcalist", true, false);
 	if (!cfg.hasGroup(subject))
 		return TQString::null;
 
@@ -834,7 +834,7 @@ return cfg.readEntry("x509", TQString::null);
 
 
 bool KSSLD::caSetUse(TQString subject, bool ssl, bool email, bool code) {
-KConfig cfg("ksslcalist", false, false);
+TDEConfig cfg("ksslcalist", false, false);
 	if (!cfg.hasGroup(subject))
 		return false;
 
diff --git a/kio/misc/kssld/kssld.desktop b/tdeio/misc/kssld/kssld.desktop
index 7054f8bad..7054f8bad 100644
--- a/kio/misc/kssld/kssld.desktop
+++ b/tdeio/misc/kssld/kssld.desktop
diff --git a/kio/misc/kssld/kssld.h b/tdeio/misc/kssld/kssld.h
index 028a30809..028a30809 100644
--- a/kio/misc/kssld/kssld.h
+++ b/tdeio/misc/kssld/kssld.h
diff --git a/kio/misc/mms.protocol b/tdeio/misc/mms.protocol
index 8fde7c000..8fde7c000 100644
--- a/kio/misc/mms.protocol
+++ b/tdeio/misc/mms.protocol
diff --git a/kio/misc/mmst.protocol b/tdeio/misc/mmst.protocol
index 1f0f7636b..1f0f7636b 100644
--- a/kio/misc/mmst.protocol
+++ b/tdeio/misc/mmst.protocol
diff --git a/kio/misc/mmsu.protocol b/tdeio/misc/mmsu.protocol
index deda935fc..deda935fc 100644
--- a/kio/misc/mmsu.protocol
+++ b/tdeio/misc/mmsu.protocol
diff --git a/kio/misc/pnm.protocol b/tdeio/misc/pnm.protocol
index 3ca3a7d23..3ca3a7d23 100644
--- a/kio/misc/pnm.protocol
+++ b/tdeio/misc/pnm.protocol
diff --git a/kio/misc/rlogin.protocol b/tdeio/misc/rlogin.protocol
index 0757e88ab..3b103a905 100644
--- a/kio/misc/rlogin.protocol
+++ b/tdeio/misc/rlogin.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=ktelnetservice %u
+exec=tdetelnetservice %u
 protocol=rlogin
 input=none
 output=none
@@ -9,5 +9,5 @@ reading=false
 writing=false
 makedir=false
 deleting=false
-DocPath=kioslave/rlogin.html
+DocPath=tdeioslave/rlogin.html
 Icon=konsole
diff --git a/kio/misc/rtsp.protocol b/tdeio/misc/rtsp.protocol
index 301312260..301312260 100644
--- a/kio/misc/rtsp.protocol
+++ b/tdeio/misc/rtsp.protocol
diff --git a/kio/misc/rtspt.protocol b/tdeio/misc/rtspt.protocol
index 9e4fe9626..9e4fe9626 100644
--- a/kio/misc/rtspt.protocol
+++ b/tdeio/misc/rtspt.protocol
diff --git a/kio/misc/rtspu.protocol b/tdeio/misc/rtspu.protocol
index 9cc9299f6..9cc9299f6 100644
--- a/kio/misc/rtspu.protocol
+++ b/tdeio/misc/rtspu.protocol
diff --git a/kio/misc/ssh.protocol b/tdeio/misc/ssh.protocol
index f31a6f4a2..b0c098f8f 100644
--- a/kio/misc/ssh.protocol
+++ b/tdeio/misc/ssh.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=ktelnetservice %u
+exec=tdetelnetservice %u
 protocol=ssh
 input=none
 output=none
diff --git a/kio/misc/kfile/CMakeLists.txt b/tdeio/misc/tdefile/CMakeLists.txt
index 07c2725b2..9e90b956c 100644
--- a/kio/misc/kfile/CMakeLists.txt
+++ b/tdeio/misc/tdefile/CMakeLists.txt
@@ -14,9 +14,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 link_directories(
@@ -24,9 +24,9 @@ link_directories(
 )
 
 
-##### kfile #####################################
+##### tdefile #####################################
 
-set( target kfile )
+set( target tdefile )
 
 set( ${target}_SRCS
   fileprops.cpp
@@ -34,6 +34,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
\ No newline at end of file
diff --git a/tdeio/misc/tdefile/Makefile.am b/tdeio/misc/tdefile/Makefile.am
new file mode 100644
index 000000000..21cdb0627
--- /dev/null
+++ b/tdeio/misc/tdefile/Makefile.am
@@ -0,0 +1,10 @@
+METASOURCES = AUTO
+
+noinst_HEADERS = fileprops.h
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio/tdeio $(all_includes)
+
+bin_PROGRAMS = tdefile
+tdefile_SOURCES = fileprops.cpp
+tdefile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdefile_LDADD = $(LIB_KIO)
+
diff --git a/kio/misc/kfile/README b/tdeio/misc/tdefile/README
index d063b6d58..d063b6d58 100644
--- a/kio/misc/kfile/README
+++ b/tdeio/misc/tdefile/README
diff --git a/kio/misc/kfile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index 396a8dcdf..aa6590ef5 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -21,16 +21,16 @@
 #include <tqfile.h>
 #include <tqptrlist.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kfilemetainfo.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdefilemetainfo.h>
+#include <tdelocale.h>
 #include <kpropertiesdialog.h>
 
 #include "fileprops.h"
 
-#define KFILEVERSION "0.2"
+#define TDEFILEVERSION "0.2"
 #define INDENT "\t"
 
 using namespace std;
@@ -192,9 +192,9 @@ TQStringList FileProps::createKeyValueList( const KFileMetaInfoGroup& g,
 
 
 
-// kfile --mimetype --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
+// tdefile --mimetype --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
 // "key" may be a list of keys, separated by commas
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "m", 0, 0 }, // short option for --mimetype
     { "nomimetype", I18N_NOOP("Do not print the mimetype of the given file(s)"), 0 },
@@ -253,7 +253,7 @@ static KCmdLineOptions options[] =
 
     { "+[files]",
       I18N_NOOP("The file (or a number of files) to operate on."), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 
@@ -280,7 +280,7 @@ static void printSupportedMimeTypes()
 }
 
 // caller needs to delete the returned list!
-static KFileItemList * fileItemList( const KCmdLineArgs *args )
+static KFileItemList * fileItemList( const TDECmdLineArgs *args )
 {
     KFileItemList * items = new KFileItemList();
     items->setAutoDelete( true );
@@ -291,14 +291,14 @@ static KFileItemList * fileItemList( const KCmdLineArgs *args )
     return items;
 }
 
-static void showPropertiesDialog( const KCmdLineArgs *args )
+static void showPropertiesDialog( const TDECmdLineArgs *args )
 {
     KFileItemList *items = fileItemList( args );
     new KPropertiesDialog( *items, 0L, "props dialog", true );
     delete items;
 }
 
-static void printMimeTypes( const KCmdLineArgs *args )
+static void printMimeTypes( const TDECmdLineArgs *args )
 {
     for ( int i = 0; i < args->count(); i++ )
     {
@@ -318,9 +318,9 @@ static void printList( const TQStringList& list )
 }
 
 static void processMetaDataOptions( const TQPtrList<FileProps> propList,
-                                    KCmdLineArgs *args )
+                                    TDECmdLineArgs *args )
 {
-// kfile --mimetype --supportedMimetypes --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
+// tdefile --mimetype --supportedMimetypes --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
 // "key" may be a list of keys, separated by commas
 
     TQString line("-- -------------------------------------------------------");
@@ -406,24 +406,24 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
 
 int main( int argc, char **argv )
 {
-    KAboutData about(
-	  "kfile", I18N_NOOP( "kfile" ), KFILEVERSION,
+    TDEAboutData about(
+	  "tdefile", I18N_NOOP( "tdefile" ), TDEFILEVERSION,
 	  I18N_NOOP("A commandline tool to read and modify metadata of files." ),
-	  KAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
+	  TDEAboutData::License_LGPL, "(c) 2002, Carsten Pfeiffer",
 	  0 /*text*/, "http://devel-home.kde.org/~pfeiffer/",
 	  "pfeiffer@kde.org" );
 
     about.addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org",
 		     "http://devel-home.kde.org/~pfeiffer/" );
 
-    KCmdLineArgs::init( argc, argv, &about );
+    TDECmdLineArgs::init( argc, argv, &about );
 
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     bool useGUI = args->isSet( "dialog" );
 
-    KApplication app( useGUI, useGUI );
+    TDEApplication app( useGUI, useGUI );
 
     TQPtrList<FileProps> m_props;
     m_props.setAutoDelete( true );
@@ -435,7 +435,7 @@ int main( int argc, char **argv )
 
     int files = args->count();
     if ( files == 0 )
-        KCmdLineArgs::usage( i18n("No files specified") ); // exit()s
+        TDECmdLineArgs::usage( i18n("No files specified") ); // exit()s
 
     if ( args->isSet( "dialog" ) )
     {
diff --git a/kio/misc/kfile/fileprops.h b/tdeio/misc/tdefile/fileprops.h
index 41d4f7c86..1be11782a 100644
--- a/kio/misc/kfile/fileprops.h
+++ b/tdeio/misc/tdefile/fileprops.h
@@ -16,12 +16,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEPROPS_H
-#define KFILEPROPS_H
+#ifndef TDEFILEPROPS_H
+#define TDEFILEPROPS_H
 
 #include <tqstring.h>
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class FileProps
 {
@@ -71,4 +71,4 @@ private:
 
 };
 
-#endif // KFILEPROPS_H
+#endif // TDEFILEPROPS_H
diff --git a/kio/misc/kio_uiserver.desktop b/tdeio/misc/tdeio_uiserver.desktop
index fd37cd2bd..969e0308e 100644
--- a/kio/misc/kio_uiserver.desktop
+++ b/tdeio/misc/tdeio_uiserver.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
 Type=Service
-Name=kio_uiserver
+Name=tdeio_uiserver
 Name[de]=Server der graphischen Oberfläche
 Name[fy]=Kio_uiserver
-Name[ja]=kio_uiサー�
+Name[ja]=tdeio_uiサー�
 Name[mn]=График гадаргуугийн �ервер
-Name[nds]=kio_uiserver, Server för de graafsche Böversiet
+Name[nds]=tdeio_uiserver, Server för de graafsche Böversiet
 Name[nl]=Kio_uiserver
-Name[nso]=kio_uiseabi
+Name[nso]=tdeio_uiseabi
 Name[ro]=Kio_uiserver
 Name[sv]=Kio-gränssnittsserver
-Name[ta]=kio_uiசேவையகம�
+Name[ta]=tdeio_uiசேவையகம�
 Name[te]=కే�ఓ_య��సెర�వర�
-Exec=kio_uiserver
+Exec=tdeio_uiserver
 Comment=TDE's Progress Info UI server
 Comment[af]=TDE se vordering inligting UI bediener
 Comment[ar]=خادم معلومات تقدم واجهة كيدي
diff --git a/kio/misc/kmailservice.cpp b/tdeio/misc/tdemailservice.cpp
index 4413911a8..23066d633 100644
--- a/kio/misc/kmailservice.cpp
+++ b/tdeio/misc/tdemailservice.cpp
@@ -16,25 +16,25 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
     { "+url", 0, 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
 {
-    KLocale::setMainCatalogue("tdelibs");
-    KCmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDELocale::setMainCatalogue("tdelibs");
+    TDECmdLineArgs::init( argc, argv, "tdemailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication a( false, false );
+    TDEApplication a( false, false );
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     if ( args->count() != 1 )
         return 1;
diff --git a/kio/misc/kmailservice.protocol b/tdeio/misc/tdemailservice.protocol
index 46a3054a6..240c76aca 100644
--- a/kio/misc/kmailservice.protocol
+++ b/tdeio/misc/tdemailservice.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kmailservice %u
+exec=tdemailservice %u
 protocol=mailto
 input=none
 output=none
@@ -9,7 +9,7 @@ reading=false
 writing=false
 makedir=false
 deleting=false
-DocPath=kioslave/mailto.html
+DocPath=tdeioslave/mailto.html
 Icon=mail_new
 Class=:internet
 URIMode=mailto
diff --git a/kio/misc/kntlm/CMakeLists.txt b/tdeio/misc/tdentlm/CMakeLists.txt
index 0952f4535..dc26da9a1 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/tdeio/misc/tdentlm/CMakeLists.txt
@@ -24,15 +24,15 @@ link_directories(
 
 ##### headers ###################################
 
-install(FILES kntlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install(FILES tdentlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
-##### kntlm ###################################
+##### tdentlm ###################################
 
-set( target kntlm )
+set( target tdentlm )
 
 set( ${target}_SRCS
-  kntlm.cpp des.cpp
+  tdentlm.cpp des.cpp
 )
 
 tde_add_library( ${target} SHARED
diff --git a/tdeio/misc/tdentlm/Makefile.am b/tdeio/misc/tdentlm/Makefile.am
new file mode 100644
index 000000000..16164dbe3
--- /dev/null
+++ b/tdeio/misc/tdentlm/Makefile.am
@@ -0,0 +1,12 @@
+INCLUDES=$(all_includes)
+
+lib_LTLIBRARIES = libtdentlm.la
+METASOURCES     = AUTO
+
+tdentlmincludedir = $(includedir)/tdeio
+tdentlminclude_HEADERS = tdentlm.h
+
+libtdentlm_la_SOURCES = tdentlm.cpp des.cpp
+libtdentlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
+libtdentlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+
diff --git a/kio/misc/kntlm/des.cpp b/tdeio/misc/tdentlm/des.cpp
index bb4fab88b..bb4fab88b 100644
--- a/kio/misc/kntlm/des.cpp
+++ b/tdeio/misc/tdentlm/des.cpp
diff --git a/kio/misc/kntlm/des.h b/tdeio/misc/tdentlm/des.h
index 0f6f59dc9..0f6f59dc9 100644
--- a/kio/misc/kntlm/des.h
+++ b/tdeio/misc/tdentlm/des.h
diff --git a/kio/misc/kntlm/kswap.h b/tdeio/misc/tdentlm/kswap.h
index 9eca243de..9eca243de 100644
--- a/kio/misc/kntlm/kswap.h
+++ b/tdeio/misc/tdentlm/kswap.h
diff --git a/kio/misc/kntlm/kntlm.cpp b/tdeio/misc/tdentlm/tdentlm.cpp
index 9af382483..812c41a64 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/tdeio/misc/tdentlm/tdentlm.cpp
@@ -24,13 +24,13 @@
 #include <string.h>
 
 #include <tqdatetime.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kswap.h>
 #include <kmdcodec.h>
 #include <kdebug.h>
 
 #include "des.h"
-#include "kntlm.h"
+#include "tdentlm.h"
 
 TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
 {
@@ -265,7 +265,7 @@ TQByteArray KNTLM::getLMv2Response( const TQString &target, const TQString &user
   TQByteArray hash = ntlmv2Hash( target, user, password );
   TQByteArray clientChallenge( 8 );
   for ( uint i = 0; i<8; i++ ) {
-    clientChallenge.data()[i] = KApplication::random() % 0xff;
+    clientChallenge.data()[i] = TDEApplication::random() % 0xff;
   }
   return lmv2Response( hash, clientChallenge, challenge );
 }
@@ -304,7 +304,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
   now *= (TQ_UINT64)10000000;
   bl->timestamp = KFromToLittleEndian( now );
   for ( uint i = 0; i<8; i++ ) {
-    bl->challenge[i] = KApplication::random() % 0xff;
+    bl->challenge[i] = TDEApplication::random() % 0xff;
   }
   memcpy( blob.data() + sizeof(Blob), targetinfo.data(), targetinfo.size() );
   return blob;
diff --git a/kio/misc/kntlm/kntlm.h b/tdeio/misc/tdentlm/tdentlm.h
index 462624fcd..06b8febab 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/tdeio/misc/tdentlm/tdentlm.h
@@ -38,7 +38,7 @@
  * This class doesn't maintain any state information, so all methods are static.
  */
 
-class KIO_EXPORT KNTLM {
+class TDEIO_EXPORT KNTLM {
 public:
 
   enum Flags {
diff --git a/kio/misc/tdesasl/CMakeLists.txt b/tdeio/misc/tdesasl/CMakeLists.txt
index 27cacfbb9..d48322d93 100644
--- a/kio/misc/tdesasl/CMakeLists.txt
+++ b/tdeio/misc/tdesasl/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 
 ##### headers ###################################
 
-install(FILES tdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install(FILES tdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
 ##### tdesasl ###################################
diff --git a/kio/misc/tdesasl/Makefile.am b/tdeio/misc/tdesasl/Makefile.am
index 4dd36a6d7..4ebde7e8d 100644
--- a/kio/misc/tdesasl/Makefile.am
+++ b/tdeio/misc/tdesasl/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES=$(all_includes)
 lib_LTLIBRARIES = libtdesasl.la
 METASOURCES     = AUTO
 
-tdesaslincludedir = $(includedir)/kio
+tdesaslincludedir = $(includedir)/tdeio
 tdesaslinclude_HEADERS = tdesasl.h
 
 libtdesasl_la_SOURCES = tdesasl.cpp
diff --git a/kio/misc/tdesasl/tdesasl.cpp b/tdeio/misc/tdesasl/tdesasl.cpp
index ef0768f98..ef0768f98 100644
--- a/kio/misc/tdesasl/tdesasl.cpp
+++ b/tdeio/misc/tdesasl/tdesasl.cpp
diff --git a/kio/misc/tdesasl/tdesasl.h b/tdeio/misc/tdesasl/tdesasl.h
index 1f68ac688..0c57096a8 100644
--- a/kio/misc/tdesasl/tdesasl.h
+++ b/tdeio/misc/tdesasl/tdesasl.h
@@ -69,7 +69,7 @@ class TQStrIList;
  * @version $Id$
  */
 
-class KIO_EXPORT KDESasl
+class TDEIO_EXPORT KDESasl
 {
 
 public:
diff --git a/kio/misc/ksendbugmail/CMakeLists.txt b/tdeio/misc/tdesendbugmail/CMakeLists.txt
index f0e1b99b0..3dffadb22 100644
--- a/kio/misc/ksendbugmail/CMakeLists.txt
+++ b/tdeio/misc/tdesendbugmail/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -22,9 +22,9 @@ link_directories(
 )
 
 
-##### ksendbugmail ##############################
+##### tdesendbugmail ##############################
 
-set( target ksendbugmail )
+set( target tdesendbugmail )
 
 set( ${target}_SRCS
   main.cpp smtp.cpp
@@ -32,6 +32,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kio/misc/ksendbugmail/Makefile.am b/tdeio/misc/tdesendbugmail/Makefile.am
index f3efb2b2c..f9087a4fe 100644
--- a/kio/misc/ksendbugmail/Makefile.am
+++ b/tdeio/misc/tdesendbugmail/Makefile.am
@@ -16,11 +16,11 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-bin_PROGRAMS = ksendbugmail
+bin_PROGRAMS = tdesendbugmail
 INCLUDES= -I$(srcdir)/.. $(all_includes)
 
-ksendbugmail_SOURCES = main.cpp smtp.cpp
-ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-ksendbugmail_LDADD = ../../libkio.la
+tdesendbugmail_SOURCES = main.cpp smtp.cpp
+tdesendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdesendbugmail_LDADD = ../../libtdeio.la
 
 METASOURCES = AUTO
diff --git a/kio/misc/ksendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index fbcaec7b6..32465039d 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -8,20 +8,20 @@
 
 #include <tqtextstream.h>
 
-#include <kapplication.h>
-#include <kemailsettings.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "smtp.h"
 
-static KCmdLineOptions options[] = {
+static TDECmdLineOptions options[] = {
     { "subject <argument>", I18N_NOOP("Subject line"), 0 },
     { "recipient <argument>", I18N_NOOP("Recipient"), "submit@bugs.kde.org" },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 void BugMailer::slotError(int errornum) {
@@ -58,17 +58,17 @@ void BugMailer::slotSend() {
 
 int main(int argc, char **argv) {
 
-    KLocale::setMainCatalogue("tdelibs");
-    KAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
+    TDELocale::setMainCatalogue("tdelibs");
+    TDEAboutData d("tdesendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
                  I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
-                 KAboutData::License_GPL, "(c) 2000 Stephan Kulow");
+                 TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow");
     d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org");
 
-    KCmdLineArgs::init(argc, argv, &d);
-    KCmdLineArgs::addCmdLineOptions(options);
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init(argc, argv, &d);
+    TDECmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-    KApplication a(false, false);
+    TDEApplication a(false, false);
 
     TQCString recipient = args->getOption("recipient");
     if (recipient.isEmpty())
diff --git a/kio/misc/ksendbugmail/main.h b/tdeio/misc/tdesendbugmail/main.h
index 39d424bef..39d424bef 100644
--- a/kio/misc/ksendbugmail/main.h
+++ b/tdeio/misc/tdesendbugmail/main.h
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp
index 36a417b88..d282782fc 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/tdeio/misc/tdesendbugmail/smtp.cpp
@@ -158,7 +158,7 @@ void SMTP::connectTimerTick(void)
     }
 
     kdDebug() << "connecting to " << serverHost << ":" << hostPort << " ..... " << endl;
-    sock = new KSocket(serverHost.ascii(), hostPort);
+    sock = new TDESocket(serverHost.ascii(), hostPort);
 
     if(sock == 0L || sock->socket() < 0) {
         timeOutTimer.stop();
@@ -173,8 +173,8 @@ void SMTP::connectTimerTick(void)
     state = INIT;
     serverState = NONE;
 
-    connect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *)));
-    connect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *)));
+    connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
+    connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
     //    sock->enableRead(true);
     timeOutTimer.stop();
     kdDebug() << "connected" << endl;
@@ -202,7 +202,7 @@ void SMTP::interactTimedOut(void)
     emit error(INTERACTTIMEOUT);
 }
 
-void SMTP::socketRead(KSocket *socket)
+void SMTP::socketRead(TDESocket *socket)
 {
     int n, nl;
 
@@ -228,11 +228,11 @@ void SMTP::socketRead(KSocket *socket)
         interactTimer.start(timeOut, true);
 }
 
-void SMTP::socketClose(KSocket *socket)
+void SMTP::socketClose(TDESocket *socket)
 {
     timeOutTimer.stop();
-    disconnect(sock, TQT_SIGNAL(readEvent(KSocket *)), this, TQT_SLOT(socketRead(KSocket *)));
-    disconnect(sock, TQT_SIGNAL(closeEvent(KSocket *)), this, TQT_SLOT(socketClose(KSocket *)));
+    disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
+    disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
     socket->enableRead(false);
     kdDebug() << "connection terminated" << endl;
     connected = false;
diff --git a/kio/misc/ksendbugmail/smtp.h b/tdeio/misc/tdesendbugmail/smtp.h
index 707d20ae4..acdb4a3c3 100644
--- a/kio/misc/ksendbugmail/smtp.h
+++ b/tdeio/misc/tdesendbugmail/smtp.h
@@ -104,8 +104,8 @@ public slots:
     void connectTimedOut();
     void interactTimedOut();
 
-    void socketRead(KSocket *);
-    void socketClose(KSocket *);
+    void socketRead(TDESocket *);
+    void socketClose(TDESocket *);
 
 signals:
     void connectionClosed();
@@ -131,7 +131,7 @@ private:
 
     TQString domainName;
 
-    KSocket *sock;
+    TDESocket *sock;
     TQTimer connectTimer;
     TQTimer timeOutTimer;
     TQTimer interactTimer;
diff --git a/kio/misc/ktelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp
index 4b21ef799..bf175bdc9 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/tdeio/misc/tdetelnetservice.cpp
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2001 Malte Starostik <malte@kde.org>
-   based on kmailservice.cpp,
+   based on tdemailservice.cpp,
    Copyright (c) 2000 Simon Hausmann <hausmann@kde.org>
 
    This program is free software; you can redistribute it and/or
@@ -21,35 +21,35 @@
 
 // $Id$
 
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <ksimpleconfig.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
 	{"+url", 0, 0},
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
 {
-	KLocale::setMainCatalogue("tdelibs");
-	KCmdLineArgs::init(argc, argv, "ktelnetservice", I18N_NOOP("telnet service"),
+	TDELocale::setMainCatalogue("tdelibs");
+	TDECmdLineArgs::init(argc, argv, "tdetelnetservice", I18N_NOOP("telnet service"),
 			   I18N_NOOP("telnet protocol handler"), "unknown");
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::addCmdLineOptions(options);
 
-	KApplication app;
+	TDEApplication app;
 
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	
 	if (args->count() != 1)
 		return 1;
 
-	KConfig *config = new KConfig("kdeglobals", true);
+	TDEConfig *config = new TDEConfig("kdeglobals", true);
 	config->setGroup("General");
 	TQString terminal = config->readPathEntry("TerminalApplication", "konsole");
 
diff --git a/kio/misc/kwalletd/CMakeLists.txt b/tdeio/misc/tdewalletd/CMakeLists.txt
index db4f56cb1..2d0d2ef28 100644
--- a/kio/misc/kwalletd/CMakeLists.txt
+++ b/tdeio/misc/tdewalletd/CMakeLists.txt
@@ -17,9 +17,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kwallet/client
-  ${CMAKE_SOURCE_DIR}/kwallet/backend
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/backend
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -29,21 +29,21 @@ link_directories(
 
 ##### other data ################################
 
-install(FILES kwalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+install(FILES tdewalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 
-#### kded_kwalletd ##############################
+#### kded_tdewalletd ##############################
 
-set( target kded_kwalletd )
+set( target kded_tdewalletd )
 
 set( ${target}_SRCS
-  kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui
+  tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui
   kbetterthankdialogbase.ui
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeinit_kded-shared kwalletbackend-shared
+  LINK tdeinit_kded-shared tdewalletbackend-shared
   DEPENDENCIES dcopidl
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kio/misc/kwalletd/Makefile.am b/tdeio/misc/tdewalletd/Makefile.am
index 1d5b1313c..5d52fa810 100644
--- a/kio/misc/kwalletd/Makefile.am
+++ b/tdeio/misc/tdewalletd/Makefile.am
@@ -16,20 +16,20 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top_builddir)/kwallet/backend -I$(top_srcdir)/kwallet/client -I$(top_builddir)/kwallet/client $(all_includes)
+INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/tdewallet/backend -I$(top_builddir)/tdewallet/backend -I$(top_srcdir)/tdewallet/client -I$(top_builddir)/tdewallet/client $(all_includes)
 
-kde_module_LTLIBRARIES = kded_kwalletd.la
+kde_module_LTLIBRARIES = kded_tdewalletd.la
 
-kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
-kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui
+kded_tdewalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kded_tdewalletd_la_LIBADD = $(LIB_KIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
+kded_tdewalletd_la_SOURCES = tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui
 
 METASOURCES = AUTO
 
-noinst_HEADERS = kwalletd.h ktimeout.h kwalletwizard.ui.h
+noinst_HEADERS = tdewalletd.h ktimeout.h tdewalletwizard.ui.h
 
-services_DATA = kwalletd.desktop
+services_DATA = tdewalletd.desktop
 servicesdir = $(kde_servicesdir)/kded
 
-kwalletwizard.lo: kwalletwizard.ui kwalletwizard.ui.h
+tdewalletwizard.lo: tdewalletwizard.ui tdewalletwizard.ui.h
 kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
index a02d5def7..a02d5def7 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui
+++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui.h b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui.h
index 2b3e16b0d..2b3e16b0d 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui.h
+++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui.h
diff --git a/kio/misc/kwalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp
index c431ecf69..c431ecf69 100644
--- a/kio/misc/kwalletd/ktimeout.cpp
+++ b/tdeio/misc/tdewalletd/ktimeout.cpp
diff --git a/kio/misc/kwalletd/ktimeout.h b/tdeio/misc/tdewalletd/ktimeout.h
index 441e4ed77..441e4ed77 100644
--- a/kio/misc/kwalletd/ktimeout.h
+++ b/tdeio/misc/tdewalletd/ktimeout.h
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index eca13c463..126f0ce2b 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -21,23 +21,23 @@
 */
 
 #include "kbetterthankdialogbase.h"
-#include "kwalletwizard.h"
-#include "kwalletd.h"
+#include "tdewalletwizard.h"
+#include "tdewalletd.h"
 #include "ktimeout.h"
 
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kactivelabel.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kstandarddirs.h>
-#include <kwalletentry.h>
+#include <tdewalletentry.h>
 #include <twin.h>
 
 #include <tqdir.h>
@@ -51,7 +51,7 @@
 #include <assert.h>
 
 extern "C" {
-   KDE_EXPORT KDEDModule *create_kwalletd(const TQCString &name) {
+   KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
 	   return new KWalletD(name);
    }
 }
@@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name)
 	_idleTime = 0;
 	connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
 	reconfigure();
-	KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
-	connect(KApplication::dcopClient(),
+	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
+	connect(TDEApplication::dcopClient(),
 		TQT_SIGNAL(applicationRemoved(const TQCString&)),
 		this,
 		TQT_SLOT(slotAppUnregistered(const TQCString&)));
 	_dw = new KDirWatch(this, "KWallet Directory Watcher");
-	_dw->addDir(KGlobal::dirs()->saveLocation("kwallet"));
+	_dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
 	_dw->startScan(true);
 	connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty()));
 }
@@ -272,15 +272,15 @@ int KWalletD::open(const TQString& wallet, uint wId) {
 }
 
 
-// Sets up a dialog that will be shown by kwallet.
+// Sets up a dialog that will be shown by tdewallet.
 void KWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ) {
 	if( wId != 0 ) 
 		KWin::setMainWindow( dialog, wId ); // correct, set dialog parent
 	else {
 		if( appid.isEmpty())
-			kdWarning() << "Using kwallet without parent window!" << endl;
+			kdWarning() << "Using tdewallet without parent window!" << endl;
 		else
-			kdWarning() << "Application '" << appid << "' using kwallet without parent window!" << endl;
+			kdWarning() << "Application '" << appid << "' using tdewallet without parent window!" << endl;
 		// allow dialog activation even if it interrupts, better than trying hacks
 		// with keeping the dialog on top or on all desktops
 		kapp->updateUserTimestamp();
@@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 		setupDialog( wiz, wId, appid, modal );
 		int rc = wiz->exec();
 		if (rc == TQDialog::Accepted) {
-			KConfig cfg("kwalletrc");
+			TDEConfig cfg("tdewalletrc");
 			cfg.setGroup("Wallet");
 			cfg.writeEntry("First Use", false);
 			cfg.writeEntry("Enabled", wiz->_useWallet->isChecked());
@@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
 			return -1;
 		}
 	} else if (_firstUse) {
-		KConfig cfg("kwalletrc");
+		TDEConfig cfg("tdewalletrc");
 		_firstUse = false;
 		cfg.setGroup("Wallet");
 		cfg.writeEntry("First Use", false);
@@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
 		}
 		emitDCOPSignal("walletOpened(TQString)", data);
 		if (_wallets.count() == 1 && _launchManager) {
-			KApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
+			TDEApplication::startServiceByDesktopName("tdewalletmanager-tdewalletd");
 		}
 	} else {
 		if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
@@ -564,7 +564,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 
 	if (response == 0 || response == 1) {
 		if (response == 1) {
-			KConfig cfg("kwalletrc");
+			TDEConfig cfg("tdewalletrc");
 			cfg.setGroup("Auto Allow");
 			TQStringList apps = cfg.readListEntry(wallet);
 			if (!apps.contains(thisApp)) {
@@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 			}
 		}
 	} else if (response == 3) {
-		KConfig cfg("kwalletrc");
+		TDEConfig cfg("tdewalletrc");
 		cfg.setGroup("Auto Deny");
 		TQStringList apps = cfg.readListEntry(wallet);
 		if (!apps.contains(thisApp)) {
@@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 
 
 int KWalletD::deleteWallet(const TQString& wallet) {
-	TQString path = KGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl";
+	TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + TQDir::separator() + wallet + ".kwl";
 
 	if (TQFile::exists(path)) {
 		close(wallet, true);
@@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) {
 
 
 TQStringList KWalletD::wallets() const {
-	TQString path = KGlobal::dirs()->saveLocation("kwallet");
+	TQString path = TDEGlobal::dirs()->saveLocation("tdewallet");
 	TQDir dir(path, "*.kwl");
 	TQStringList rc;
 
@@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() {
 
 
 void KWalletD::reconfigure() {
-	KConfig cfg("kwalletrc");
+	TDEConfig cfg("tdewalletrc");
 	cfg.setGroup("Wallet");
 	_firstUse = cfg.readBoolEntry("First Use", true);
 	_enabled = cfg.readBoolEntry("Enabled", true);
@@ -1511,4 +1511,4 @@ TQString KWalletD::localWallet() {
 }
 
 
-#include "kwalletd.moc"
+#include "tdewalletd.moc"
diff --git a/kio/misc/kwalletd/kwalletd.desktop b/tdeio/misc/tdewalletd/tdewalletd.desktop
index 7f07fd079..1f92976e7 100644
--- a/kio/misc/kwalletd/kwalletd.desktop
+++ b/tdeio/misc/tdewalletd/tdewalletd.desktop
@@ -2,8 +2,8 @@
 Type=Service
 ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
-X-TDE-Library=kwalletd
-X-TDE-FactoryName=kwalletd
+X-TDE-Library=tdewalletd
+X-TDE-FactoryName=tdewalletd
 X-TDE-Kded-autoload=false
 X-TDE-Kded-load-on-demand=true
 Name=KWallet Daemon Module
@@ -61,7 +61,7 @@ Name[ru]=Служба бумажника
 Name[rw]=Igice Dayimoni KUruhago
 Name[se]=KWallet-bálvámoduvla
 Name[sk]=Modul démona KWallet
-Name[sl]=Modul demona KListnica
+Name[sl]=Modul demona TDEListnica
 Name[sq]=Demoni për Modulin KWallet
 Name[sr]=KWallet демон модул
 Name[sr@Latn]=KWallet demon modul
@@ -132,7 +132,7 @@ Comment[ru]=Управление бумажником TDE
 Comment[rw]=Igice cya dayimoni KUruhago cya KDED
 Comment[se]=KDED:a KWallet-bálvámoduvla
 Comment[sk]=Modul démona KWallet pre KDED
-Comment[sl]=Modul demona KListnica za KDED
+Comment[sl]=Modul demona TDEListnica za KDED
 Comment[sr]=KWallet демон модул за KDED
 Comment[sr@Latn]=KWallet demon modul za KDED
 Comment[sv]=Kwallet-demonmodul för KDED
diff --git a/kio/misc/kwalletd/kwalletd.h b/tdeio/misc/tdewalletd/tdewalletd.h
index 2aea371ba..b3a315413 100644
--- a/kio/misc/kwalletd/kwalletd.h
+++ b/tdeio/misc/tdewalletd/tdewalletd.h
@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <tqguardedptr.h>
-#include "kwalletbackend.h"
+#include "tdewalletbackend.h"
 
 #include <time.h>
 #include <stdlib.h>
diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index b79853549..c31062c2a 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
@@ -531,8 +531,8 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">tqcheckbox.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
-    <include location="local" impldecl="in implementation">kwalletwizard.ui.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
+    <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="private">passwordPageUpdate()</slot>
diff --git a/kio/misc/kwalletd/kwalletwizard.ui.h b/tdeio/misc/tdewalletd/tdewalletwizard.ui.h
index a42635e9b..a42635e9b 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui.h
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui.h
diff --git a/kio/misc/telnet.protocol b/tdeio/misc/telnet.protocol
index 810011594..062fb1d4f 100644
--- a/kio/misc/telnet.protocol
+++ b/tdeio/misc/telnet.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=ktelnetservice %u
+exec=tdetelnetservice %u
 protocol=telnet
 input=none
 output=none
@@ -9,5 +9,5 @@ reading=false
 writing=false
 makedir=false
 deleting=false
-DocPath=kioslave/telnet.html
+DocPath=tdeioslave/telnet.html
 Icon=konsole
diff --git a/kio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 32130c159..c23628eae 100644
--- a/kio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -26,23 +26,23 @@
 #include <tqevent.h>
 
 #include <ksqueezedtextlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdesu/client.h>
 #include <twin.h>
 #include <kdialog.h>
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
@@ -52,12 +52,12 @@
 
 #include "observer_stub.h"
 #include "observer.h" // for static methods only
-#include "kio/defaultprogress.h"
-#include "kio/jobclasses.h"
+#include "tdeio/defaultprogress.h"
+#include "tdeio/jobclasses.h"
 #include "uiserver.h"
 #include "passdlg.h"
-#include "kio/renamedlg.h"
-#include "kio/skipdlg.h"
+#include "tdeio/renamedlg.h"
+#include "tdeio/skipdlg.h"
 #include "slavebase.h" // for QuestionYesNo etc.
 #include <ksslinfodlg.h>
 #include <ksslcertdlg.h>
@@ -94,7 +94,7 @@ class UIServerSystemTray:public KSystemTray
       UIServerSystemTray(UIServer* uis)
          :KSystemTray(uis)
       {
-         KPopupMenu* pop= contextMenu();
+         TDEPopupMenu* pop= contextMenu();
          pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
          pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
          setPixmap(loadIcon("filesave"));
@@ -118,7 +118,7 @@ class ProgressConfigDialog:public KDialogBase
       TQCheckBox *m_statusBarCb;
       TQCheckBox *m_headerCb;
       TQCheckBox *m_fixedWidthCb;
-      KListView *m_columns;
+      TDEListView *m_columns;
       TQCheckListItem *(m_items[ListProgress::TB_MAX]);
 };
 
@@ -134,7 +134,7 @@ ProgressConfigDialog::ProgressConfigDialog(TQWidget *parent)
    m_statusBarCb=new TQCheckBox(i18n("Show statusbar"), plainPage());
    m_fixedWidthCb=new TQCheckBox(i18n("Column widths are user adjustable"), plainPage());
    TQLabel *label=new TQLabel(i18n("Show information:"), plainPage());
-   m_columns=new KListView(plainPage());
+   m_columns=new TDEListView(plainPage());
 
    m_columns->addColumn("info");
    m_columns->setSorting(-1);
@@ -192,7 +192,7 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString
   m_defaultProgressVisible = showDefault;
 
   // create dialog, but don't show it
-  defaultProgress = new KIO::DefaultProgress( false );
+  defaultProgress = new TDEIO::DefaultProgress( false );
   defaultProgress->setOnlyClean( true );
   connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) );
   connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) );
@@ -217,11 +217,11 @@ ProgressItem::~ProgressItem() {
 }
 
 
-void ProgressItem::setTotalSize( KIO::filesize_t size ) {
+void ProgressItem::setTotalSize( TDEIO::filesize_t size ) {
   m_iTotalSize = size;
 
   // It's already in the % column...
-  //setText( listProgress->lv_total, KIO::convertSize( m_iTotalSize ) );
+  //setText( listProgress->lv_total, TDEIO::convertSize( m_iTotalSize ) );
 
   defaultProgress->slotTotalSize( 0, m_iTotalSize );
 }
@@ -239,10 +239,10 @@ void ProgressItem::setTotalDirs( unsigned long dirs ) {
 }
 
 
-void ProgressItem::setProcessedSize( KIO::filesize_t size ) {
+void ProgressItem::setProcessedSize( TDEIO::filesize_t size ) {
   m_iProcessedSize = size;
 
-  setText( ListProgress::TB_TOTAL, KIO::convertSize( size ) );
+  setText( ListProgress::TB_TOTAL, TDEIO::convertSize( size ) );
 
   defaultProgress->slotProcessedSize( 0, size );
 }
@@ -264,7 +264,7 @@ void ProgressItem::setProcessedDirs( unsigned long dirs ) {
 
 
 void ProgressItem::setPercent( unsigned long percent ) {
-  const TQString tmps = KIO::DefaultProgress::makePercentString( percent, m_iTotalSize, m_iTotalFiles );
+  const TQString tmps = TDEIO::DefaultProgress::makePercentString( percent, m_iTotalSize, m_iTotalFiles );
   setText( ListProgress::TB_PROGRESS, tmps );
 
   defaultProgress->slotPercent( 0, percent );
@@ -281,15 +281,15 @@ void ProgressItem::setInfoMessage( const TQString & msg ) {
 
 void ProgressItem::setSpeed( unsigned long bytes_per_second ) {
   m_iSpeed = bytes_per_second;
-  m_remainingSeconds = KIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, m_iSpeed );
+  m_remainingSeconds = TDEIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, m_iSpeed );
 
   TQString tmps, tmps2;
   if ( m_iSpeed == 0 ) {
     tmps = i18n( "Stalled");
     tmps2 = tmps;
   } else {
-    tmps = i18n( "%1/s").arg( KIO::convertSize( m_iSpeed ));
-    tmps2 = KIO::convertSeconds( m_remainingSeconds );
+    tmps = i18n( "%1/s").arg( TDEIO::convertSize( m_iSpeed ));
+    tmps2 = TDEIO::convertSeconds( m_remainingSeconds );
   }
   setText( ListProgress::TB_SPEED, tmps );
   setText( ListProgress::TB_REMAINING_TIME, tmps2 );
@@ -382,7 +382,7 @@ void ProgressItem::setUnmounting( const TQString & point ) {
   defaultProgress->slotUnmounting( 0, point );
 }
 
-void ProgressItem::setCanResume( KIO::filesize_t offset ) {
+void ProgressItem::setCanResume( TDEIO::filesize_t offset ) {
   /*
   TQString tmps;
   // set canResume
@@ -455,7 +455,7 @@ void ProgressItem::updateVisibility()
 
 //-----------------------------------------------------------------------------
 ListProgress::ListProgress (TQWidget *parent, const char *name)
-: KListView (parent, name)
+: TDEListView (parent, name)
 {
 
   // enable selection of more than one item
@@ -527,7 +527,7 @@ void ListProgress::applySettings()
 }
 
 void ListProgress::readSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
 
   // read listview geometry properties
   config.setGroup( "ProgressList" );
@@ -560,7 +560,7 @@ void ListProgress::columnWidthChanged(int column)
 }
 
 void ListProgress::writeSettings() {
-   KConfig config("uiserverrc");
+   TDEConfig config("uiserverrc");
 
    // write listview geometry properties
    config.setGroup( "ProgressList" );
@@ -584,7 +584,7 @@ void ListProgress::writeSettings() {
 
 
 UIServer::UIServer()
-:KMainWindow(0, "")
+:TDEMainWindow(0, "")
 ,DCOPObject("UIServer")
 ,m_shuttingDown(false)
 ,m_configDialog(0)
@@ -602,7 +602,7 @@ UIServer::UIServer()
                           TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
                           TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
 
-  toolBar()->setBarPos( KToolBar::Left );
+  toolBar()->setBarPos( TDEToolBar::Left );
 
   // setup statusbar
   statusBar()->insertItem( i18n(" Files: %1 ").arg( 0 ), ID_TOTAL_FILES);
@@ -619,8 +619,8 @@ UIServer::UIServer()
            TQT_SLOT( slotSelection() ) );
   connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ),
            TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
-  connect( listProgress, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem *, const TQPoint &)),
-           TQT_SLOT(slotShowContextMenu(KListView*, TQListViewItem *, const TQPoint&)));
+  connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
+           TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
 
 
   // setup animation timer
@@ -671,7 +671,7 @@ void UIServer::applySettings()
      toolBar()->show();
 }
 
-void UIServer::slotShowContextMenu(KListView*, TQListViewItem* item, const TQPoint& pos)
+void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQPoint& pos)
 {
    if (m_contextMenu==0)
    {
@@ -830,9 +830,9 @@ void UIServer::jobFinished( int id )
 void UIServer::totalSize( int id, unsigned long size )
 { totalSize64(id, size); }
 
-void UIServer::totalSize64( int id, KIO::filesize_t size )
+void UIServer::totalSize64( int id, TDEIO::filesize_t size )
 {
-//  kdDebug(7024) << "UIServer::totalSize " << id << " " << KIO::number(size) << endl;
+//  kdDebug(7024) << "UIServer::totalSize " << id << " " << TDEIO::number(size) << endl;
 
   ProgressItem *item = findItem( id );
   if ( item ) {
@@ -863,9 +863,9 @@ void UIServer::totalDirs( int id, unsigned long dirs )
 void UIServer::processedSize( int id, unsigned long size )
 { processedSize64(id, size); }
 
-void UIServer::processedSize64( int id, KIO::filesize_t size )
+void UIServer::processedSize64( int id, TDEIO::filesize_t size )
 {
-  //kdDebug(7024) << "UIServer::processedSize " << id << " " << KIO::number(size) << endl;
+  //kdDebug(7024) << "UIServer::processedSize " << id << " " << TDEIO::number(size) << endl;
 
   ProgressItem *item = findItem( id );
   if ( item ) {
@@ -926,7 +926,7 @@ void UIServer::infoMessage( int id, const TQString & msg )
 void UIServer::canResume( int id, unsigned long offset )
 { canResume64(id, offset); }
 
-void UIServer::canResume64( int id, KIO::filesize_t offset )
+void UIServer::canResume64( int id, TDEIO::filesize_t offset )
 {
   //kdDebug(7024) << "UIServer::canResume " << id << " " << offset << endl;
 
@@ -1018,8 +1018,8 @@ void UIServer::unmounting( int id, TQString point )
 
 void UIServer::killJob( TQCString observerAppId, int progressId )
 {
-    // Contact the object "KIO::Observer" in the application <appId>
-    Observer_stub observer( observerAppId, "KIO::Observer" );
+    // Contact the object "TDEIO::Observer" in the application <appId>
+    Observer_stub observer( observerAppId, "TDEIO::Observer" );
     // Tell it to kill the job
     observer.killJob( progressId );
 }
@@ -1029,7 +1029,7 @@ void UIServer::slotJobCanceled( ProgressItem *item ) {
   // kill the corresponding job
   killJob( item->appId(), item->jobId() );
 
-  // KIO::Job, when killed, should call back jobFinished(), but we can't
+  // TDEIO::Job, when killed, should call back jobFinished(), but we can't
   // really rely on that - the app may have crashed
   delete item;
 }
@@ -1071,7 +1071,7 @@ void UIServer::slotUpdate() {
   }
 
   int iTotalFiles = 0;
-  KIO::filesize_t iTotalSize = 0;
+  TDEIO::filesize_t iTotalSize = 0;
   int iTotalSpeed = 0;
   unsigned int totalRemTime = 0; // in seconds
 
@@ -1095,11 +1095,11 @@ void UIServer::slotUpdate() {
 
   // update statusbar
   statusBar()->changeItem( i18n( " Files: %1 ").arg( iTotalFiles ), ID_TOTAL_FILES);
-  statusBar()->changeItem( i18n( "Remaining Size", " Rem. Size: %1 ").arg( KIO::convertSize( iTotalSize ) ),
+  statusBar()->changeItem( i18n( "Remaining Size", " Rem. Size: %1 ").arg( TDEIO::convertSize( iTotalSize ) ),
                            ID_TOTAL_SIZE);
-  statusBar()->changeItem( i18n( "Remaining Time", " Rem. Time: %1 ").arg( KIO::convertSeconds( totalRemTime ) ),
+  statusBar()->changeItem( i18n( "Remaining Time", " Rem. Time: %1 ").arg( TDEIO::convertSeconds( totalRemTime ) ),
                            ID_TOTAL_TIME);
-  statusBar()->changeItem( i18n( " %1/s ").arg( KIO::convertSize( iTotalSpeed ) ),
+  statusBar()->changeItem( i18n( " %1/s ").arg( TDEIO::convertSize( iTotalSpeed ) ),
                            ID_TOTAL_SPEED);
 
 }
@@ -1144,13 +1144,13 @@ void UIServer::slotSelection() {
 }
 
 // This code is deprecated, slaves go to Observer::openPassDlg now,
-// but this is kept for compat (DCOP calls to kio_uiserver).
-TQByteArray UIServer::openPassDlg( const KIO::AuthInfo &info )
+// but this is kept for compat (DCOP calls to tdeio_uiserver).
+TQByteArray UIServer::openPassDlg( const TDEIO::AuthInfo &info )
 {
     kdDebug(7024) << "UIServer::openPassDlg: User= " << info.username
                   << ", Msg= " << info.prompt << endl;
-    KIO::AuthInfo inf(info);
-    int result = KIO::PasswordDialog::getNameAndPassword( inf.username, inf.password,
+    TDEIO::AuthInfo inf(info);
+    int result = TDEIO::PasswordDialog::getNameAndPassword( inf.username, inf.password,
                                                           &inf.keepPassword, inf.prompt,
                                                           inf.readOnly, inf.caption,
                                                           inf.comment, inf.commentLabel );
@@ -1169,12 +1169,12 @@ int UIServer::messageBox( int progressId, int type, const TQString &text, const
     return Observer::messageBox( progressId, type, text, caption, buttonYes, buttonNo );
 }
 
-void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta)
+void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &meta)
 {
     return showSSLInfoDialog(url,meta,0);
 }
 
-void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta, int mainwindow)
+void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &meta, int mainwindow)
 {
    KSSLInfoDlg *kid = new KSSLInfoDlg(meta["ssl_in_use"].upper()=="TRUE", 0L /*parent?*/, 0L, true);
    KSSLCertificate *x = KSSLCertificate::fromString(meta["ssl_peer_certificate"].local8Bit());
@@ -1269,8 +1269,8 @@ TQByteArray UIServer::open_RenameDlg64( int id,
                                      const TQString & caption,
                                      const TQString& src, const TQString & dest,
                                      int mode,
-                                     KIO::filesize_t sizeSrc,
-                                     KIO::filesize_t sizeDest,
+                                     TDEIO::filesize_t sizeSrc,
+                                     TDEIO::filesize_t sizeDest,
                                      unsigned long ctimeSrc,
                                      unsigned long ctimeDest,
                                      unsigned long mtimeSrc,
@@ -1282,17 +1282,17 @@ TQByteArray UIServer::open_RenameDlg64( int id,
   if ( item )
     setItemVisible( item, false );
   TQString newDest;
-  kdDebug(7024) << "Calling KIO::open_RenameDlg" << endl;
-  KIO::RenameDlg_Result result = KIO::open_RenameDlg( caption, src, dest,
-                                                      (KIO::RenameDlg_Mode) mode, newDest,
+  kdDebug(7024) << "Calling TDEIO::open_RenameDlg" << endl;
+  TDEIO::RenameDlg_Result result = TDEIO::open_RenameDlg( caption, src, dest,
+                                                      (TDEIO::RenameDlg_Mode) mode, newDest,
                                                       sizeSrc, sizeDest,
                                                       (time_t)ctimeSrc, (time_t)ctimeDest,
                                                       (time_t)mtimeSrc, (time_t)mtimeDest );
-  kdDebug(7024) << "KIO::open_RenameDlg done" << endl;
+  kdDebug(7024) << "TDEIO::open_RenameDlg done" << endl;
   TQByteArray data;
   TQDataStream stream( data, IO_WriteOnly );
   stream << TQ_UINT8(result) << newDest;
-  if ( item && result != KIO::R_CANCEL )
+  if ( item && result != TDEIO::R_CANCEL )
     setItemVisible( item, true );
   return data;
 }
@@ -1305,16 +1305,16 @@ int UIServer::open_SkipDlg( int id,
   ProgressItem *item = findItem( id );
   if ( item )
     setItemVisible( item, false );
-  kdDebug(7024) << "Calling KIO::open_SkipDlg" << endl;
-  KIO::SkipDlg_Result result = KIO::open_SkipDlg( (bool)multi, error_text );
-  if ( item && result != KIO::S_CANCEL )
+  kdDebug(7024) << "Calling TDEIO::open_SkipDlg" << endl;
+  TDEIO::SkipDlg_Result result = TDEIO::open_SkipDlg( (bool)multi, error_text );
+  if ( item && result != TDEIO::S_CANCEL )
     setItemVisible( item, true );
-  return (KIO::SkipDlg_Result) result;
+  return (TDEIO::SkipDlg_Result) result;
 }
 
 
 void UIServer::readSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
   config.setGroup( "UIServer" );
   m_showStatusBar=config.readBoolEntry("ShowStatusBar",false);
   m_showToolBar=config.readBoolEntry("ShowToolBar",true);
@@ -1326,7 +1326,7 @@ void UIServer::readSettings() {
 }
 
 void UIServer::writeSettings() {
-  KConfig config("uiserverrc");
+  TDEConfig config("uiserverrc");
   config.setGroup( "UIServer" );
   config.writeEntry("InitialWidth",width());
   config.writeEntry("InitialHeight",height());
@@ -1355,7 +1355,7 @@ void UIServer::slotCancelCurrent() {
 
 void UIServer::resizeEvent(TQResizeEvent* e)
 {
-   KMainWindow::resizeEvent(e);
+   TDEMainWindow::resizeEvent(e);
    writeSettings();
 }
 
@@ -1377,23 +1377,23 @@ UIServer* UIServer::createInstance()
 
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
-    KLocale::setMainCatalogue("tdelibs");
+    TDELocale::setMainCatalogue("tdelibs");
     //  GS 5/2001 - I changed the name to "TDE" to make it look better
     //              in the titles of dialogs which are displayed.
-    KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
+    TDEAboutData aboutdata("tdeio_uiserver", I18N_NOOP("TDE"),
                          "0.8", I18N_NOOP("TDE Progress Information UI Server"),
-                         KAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
+                         TDEAboutData::License_GPL, "(C) 2000, David Faure & Matt Koss");
     // Who's the maintainer ? :)
     aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org");
     aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk");
 
-    KCmdLineArgs::init( argc, argv, &aboutdata );
-    // KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutdata );
+    // TDECmdLineArgs::addCmdLineOptions( options );
     KUniqueApplication::addCmdLineOptions();
 
     if (!KUniqueApplication::start())
     {
-      kdDebug(7024) << "kio_uiserver is already running!" << endl;
+      kdDebug(7024) << "tdeio_uiserver is already running!" << endl;
       return (0);
     }
 
diff --git a/kio/misc/uiserver.h b/tdeio/misc/uiserver.h
index 85e255a43..05b15ba18 100644
--- a/kio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -16,20 +16,20 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_uiserver_h__
-#define __kio_uiserver_h__
+#ifndef __tdeio_uiserver_h__
+#define __tdeio_uiserver_h__
 
 #include <tqintdict.h>
 #include <tqdatetime.h>
 #include <tqtimer.h>
 
 #include <dcopobject.h>
-#include <kio/global.h>
-#include <kio/authinfo.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
 #include <kurl.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdatastream.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksslcertdlg.h>
 
 class ListProgress;
@@ -37,7 +37,7 @@ class KSqueezedTextLabel;
 class ProgressItem;
 class UIServer;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class DefaultProgress;
 }
@@ -55,7 +55,7 @@ struct ListProgressColumnConfig
 * List view in the UIServer.
 * @internal
 */
-class KIO_EXPORT ListProgress : public KListView {
+class TDEIO_EXPORT ListProgress : public TDEListView {
 
   Q_OBJECT
 
@@ -103,7 +103,7 @@ protected:
 * One item in the ListProgress
 * @internal
 */
-class KIO_EXPORT ProgressItem : public TQObject, public TQListViewItem {
+class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem {
 
   Q_OBJECT
 
@@ -122,11 +122,11 @@ public:
   void setDefaultProgressVisible( bool visible );
   bool isVisible() const { return m_visible; }
 
-  void setTotalSize( KIO::filesize_t bytes );
+  void setTotalSize( TDEIO::filesize_t bytes );
   void setTotalFiles( unsigned long files );
   void setTotalDirs( unsigned long dirs );
 
-  void setProcessedSize( KIO::filesize_t size );
+  void setProcessedSize( TDEIO::filesize_t size );
   void setProcessedFiles( unsigned long files );
   void setProcessedDirs( unsigned long dirs );
 
@@ -143,11 +143,11 @@ public:
   void setMounting( const TQString & dev, const TQString & point );
   void setUnmounting( const TQString & point );
 
-  void setCanResume( KIO::filesize_t offset );
+  void setCanResume( TDEIO::filesize_t offset );
 
-  KIO::filesize_t totalSize() { return m_iTotalSize; }
+  TDEIO::filesize_t totalSize() { return m_iTotalSize; }
   unsigned long totalFiles() { return m_iTotalFiles; }
-  KIO::filesize_t processedSize() { return m_iProcessedSize; }
+  TDEIO::filesize_t processedSize() { return m_iProcessedSize; }
   unsigned long processedFiles() { return m_iProcessedFiles; }
   unsigned long speed() { return m_iSpeed; }
   unsigned int remainingSeconds() { return m_remainingSeconds; }
@@ -179,12 +179,12 @@ protected:
   ListProgress *listProgress;
 
   // associated default progress dialog
-  KIO::DefaultProgress *defaultProgress;
+  TDEIO::DefaultProgress *defaultProgress;
 
   // we store these values for calculation of totals ( for statusbar )
-  KIO::filesize_t m_iTotalSize;
+  TDEIO::filesize_t m_iTotalSize;
   unsigned long m_iTotalFiles;
-  KIO::filesize_t m_iProcessedSize;
+  TDEIO::filesize_t m_iProcessedSize;
   unsigned long m_iProcessedFiles;
   unsigned long m_iSpeed;
   int m_remainingSeconds;
@@ -214,7 +214,7 @@ class UIServerSystemTray;
  *
  * @internal
  */
-class KIO_EXPORT UIServer : public KMainWindow, public DCOPObject {
+class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject {
 
   K_DCOP
   Q_OBJECT
@@ -230,9 +230,9 @@ k_dcop:
   /**
    * Signal a new job
    * @param appId the DCOP application id of the job's parent application
-   * @see KIO::Observer::newJob
+   * @see TDEIO::Observer::newJob
    * @param showProgress whether to popup the progress for the job.
-   *   Usually true, but may be false when we use kio_uiserver for
+   *   Usually true, but may be false when we use tdeio_uiserver for
    *   other things, like SSL dialogs.
    * @return the job id
    */
@@ -241,12 +241,12 @@ k_dcop:
   ASYNC jobFinished( int id );
 
   ASYNC totalSize( int id, unsigned long size );
-  ASYNC totalSize64( int id, KIO::filesize_t size );
+  ASYNC totalSize64( int id, TDEIO::filesize_t size );
   ASYNC totalFiles( int id, unsigned long files );
   ASYNC totalDirs( int id, unsigned long dirs );
 
   ASYNC processedSize( int id, unsigned long bytes );
-  ASYNC processedSize64( int id, KIO::filesize_t bytes );
+  ASYNC processedSize64( int id, TDEIO::filesize_t bytes );
   ASYNC processedFiles( int id, unsigned long files );
   ASYNC processedDirs( int id, unsigned long dirs );
 
@@ -265,14 +265,14 @@ k_dcop:
   ASYNC unmounting( int id, TQString point );
 
   ASYNC canResume( int id, unsigned long offset );
-  ASYNC canResume64( int id, KIO::filesize_t offset );
+  ASYNC canResume64( int id, TDEIO::filesize_t offset );
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::PasswordDialog::getNameAndPassword instead.
+   * Use TDEIO::PasswordDialog::getNameAndPassword instead.
    * To be removed in KDE 4.0.
    */
-  TQByteArray openPassDlg( const KIO::AuthInfo &info );
+  TQByteArray openPassDlg( const TDEIO::AuthInfo &info );
 
   /**
    * Popup a message box.
@@ -296,15 +296,15 @@ k_dcop:
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_RenameDlg instead.
+   * Use TDEIO::open_RenameDlg instead.
    * To be removed in KDE 4.0.
    */
   TQByteArray open_RenameDlg64( int id,
                              const TQString & caption,
                              const TQString& src, const TQString & dest,
-                             int /* KIO::RenameDlg_Mode */ mode,
-                             KIO::filesize_t sizeSrc,
-                             KIO::filesize_t sizeDest,
+                             int /* TDEIO::RenameDlg_Mode */ mode,
+                             TDEIO::filesize_t sizeSrc,
+                             TDEIO::filesize_t sizeDest,
                              unsigned long /* time_t */ ctimeSrc,
                              unsigned long /* time_t */ ctimeDest,
                              unsigned long /* time_t */ mtimeSrc,
@@ -312,13 +312,13 @@ k_dcop:
                              );
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_RenameDlg instead.
+   * Use TDEIO::open_RenameDlg instead.
    * To be removed in KDE 4.0.
    */
   TQByteArray open_RenameDlg( int id,
                              const TQString & caption,
                              const TQString& src, const TQString & dest,
-                             int /* KIO::RenameDlg_Mode */ mode,
+                             int /* TDEIO::RenameDlg_Mode */ mode,
                              unsigned long sizeSrc,
                              unsigned long sizeDest,
                              unsigned long /* time_t */ ctimeSrc,
@@ -329,7 +329,7 @@ k_dcop:
 
   /**
    * @deprecated (it blocks other apps).
-   * Use KIO::open_SkipDlg instead.
+   * Use TDEIO::open_SkipDlg instead.
    * To be removed in KDE 4.0.
    */
   int open_SkipDlg( int id,
@@ -350,12 +350,12 @@ k_dcop:
   /**
    * Show a SSL Information Dialog
    */
-  void showSSLInfoDialog(const TQString &url, const KIO::MetaData &data, int mainwindow);
+  void showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &data, int mainwindow);
 
   /**
    * @deprecated
    */
-  void showSSLInfoDialog(const TQString &url, const KIO::MetaData &data);
+  void showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &data);
 
   /*
    * Show an SSL Certificate Selection Dialog
@@ -382,7 +382,7 @@ protected slots:
 
   void slotJobCanceled( ProgressItem * );
   void slotApplyConfig();
-  void slotShowContextMenu(KListView*, TQListViewItem *item, const TQPoint& pos);
+  void slotShowContextMenu(TDEListView*, TQListViewItem *item, const TQPoint& pos);
 
 protected:
 
@@ -396,7 +396,7 @@ protected:
   TQTimer* updateTimer;
   ListProgress* listProgress;
 
-  KToolBar::BarPosition toolbarPos;
+  TDEToolBar::BarPosition toolbarPos;
   TQString properties;
 
   void applySettings();
diff --git a/kio/pics/CMakeLists.txt b/tdeio/pics/CMakeLists.txt
index 1830674b4..b04b9c7d4 100644
--- a/kio/pics/CMakeLists.txt
+++ b/tdeio/pics/CMakeLists.txt
@@ -11,4 +11,4 @@
 
 ##### other data ################################
 
-tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kio_uiserver/icons )
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/tdeio_uiserver/icons )
diff --git a/tdeio/pics/Makefile.am b/tdeio/pics/Makefile.am
new file mode 100644
index 000000000..ce10461b5
--- /dev/null
+++ b/tdeio/pics/Makefile.am
@@ -0,0 +1,3 @@
+kiouiservericonsdir = $(kde_datadir)/tdeio_uiserver/icons
+kiouiservericons_ICON = AUTO
+
diff --git a/kio/pics/cr16-app-kio_uiserver.png b/tdeio/pics/cr16-app-tdeio_uiserver.png
index 41b3f4367..41b3f4367 100644
--- a/kio/pics/cr16-app-kio_uiserver.png
+++ b/tdeio/pics/cr16-app-tdeio_uiserver.png
diff --git a/kio/proxytype.pl b/tdeio/proxytype.pl
index 553db53f7..553db53f7 100755
--- a/kio/proxytype.pl
+++ b/tdeio/proxytype.pl
diff --git a/kio/renamedlgplugin.desktop b/tdeio/renamedlgplugin.desktop
index d6a9f8f1f..d6a9f8f1f 100644
--- a/kio/renamedlgplugin.desktop
+++ b/tdeio/renamedlgplugin.desktop
diff --git a/kio/kcmodule.desktop b/tdeio/tdecmodule.desktop
index c3ab78532..5cbe9b786 100644
--- a/kio/kcmodule.desktop
+++ b/tdeio/tdecmodule.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-TDE-ServiceType=KCModule
+X-TDE-ServiceType=TDECModule
 Name=TDE Control Module
 Name[af]=TDE Beheer Module
 Name[ar]=وحدة تحكم كيدي
diff --git a/kio/kfile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt
index 3444fa0da..ed0350999 100644
--- a/kio/kfile/CMakeLists.txt
+++ b/tdeio/tdefile/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/bookmarks
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/bookmarks
   ${LIBART_INCLUDE_DIRS}
 )
 
@@ -30,14 +30,14 @@ include_directories(
 ##### headers ###################################
 
 install( FILES
-    kfiledialog.h kencodingfiledialog.h
-    kdiroperator.h kfileview.h kfilefiltercombo.h
-    kfiledetailview.h kcombiview.h kdiskfreesp.h
-    kfileiconview.h krecentdocument.h
-    kurlrequester.h kfilepreview.h kfile.h
+    tdefiledialog.h kencodingfiledialog.h
+    tdediroperator.h tdefileview.h tdefilefiltercombo.h
+    tdefiledetailview.h kcombiview.h kdiskfreesp.h
+    tdefileiconview.h tderecentdocument.h
+    kurlrequester.h tdefilepreview.h tdefile.h
     kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h
-    kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h kfilesharedlg.h
-    kfiletreeview.h kfiletreeviewitem.h kfiletreebranch.h
+    kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h
+    tdefiletreeview.h tdefiletreeviewitem.h tdefiletreebranch.h
     kdirselectdialog.h kurlbar.h kpropertiesdialog.h knotifydialog.h
     kcustommenueditor.h ${CMAKE_CURRENT_BINARY_DIR}/knotifywidgetbase.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
@@ -50,22 +50,22 @@ install( FILES
  DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-##### kfile #####################################
+##### tdefile #####################################
 
-set( target kfile )
+set( target tdefile )
 
 set( ${target}_SRCS
-  kfilefiltercombo.cpp kfileview.cpp kfileiconview.cpp
-  krecentdocument.cpp kfiledialog.cpp kdiroperator.cpp
-  kfiledetailview.cpp kcombiview.cpp kurlrequester.cpp
-  kfilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
+  tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp
+  tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp
+  tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp
+  tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
   kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp
-  kdirsize.cpp krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp
-  kfilesharedlg.cpp kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp
-  kfiletreeview.cpp kfiletreeviewitem.cpp kfiletreebranch.cpp
-  kdirselectdialog.cpp kfilebookmarkhandler.cpp kfilemetainfowidget.cpp
+  kdirsize.cpp tderecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp
+  tdefilesharedlg.cpp kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp
+  tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp
+  kdirselectdialog.cpp tdefilebookmarkhandler.cpp tdefilemetainfowidget.cpp
   kcustommenueditor.cpp knotifywidgetbase.ui knotifydialog.cpp
-  kfilespeedbar.cpp kpreviewwidgetbase.cpp kfilemetapreview.cpp
+  tdefilespeedbar.cpp kpreviewwidgetbase.cpp tdefilemetapreview.cpp
   kpropertiesdesktopbase.ui kpropertiesdesktopadvbase.ui
   kpropertiesmimetypebase.ui kencodingfiledialog.cpp
   kacleditwidget.cpp
diff --git a/kio/kfile/ChangeLog b/tdeio/tdefile/ChangeLog
index ac05c86d0..229f9f2f8 100644
--- a/kio/kfile/ChangeLog
+++ b/tdeio/tdefile/ChangeLog
@@ -1,13 +1,13 @@
 Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp:
+	* tdediroperator.cpp:
 	lottsa changes, e.g. action handling more clear now.
 	fixed completed item not clearning the previous selection
 
-	* kfileviewitem.cpp:
+	* tdefileviewitem.cpp:
 	fixed unreadable pixmap not shown, when files were deleted
 
-	* kfiledialog.cpp (selectedURLs): 
+	* tdefiledialog.cpp (selectedURLs): 
 	re-enabled the hack to support multi-selection, until we have something
 	better
 
@@ -17,32 +17,32 @@ Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Feb 20 01:50:44 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.*, kfiledialog.* (saveConfig): 
+	* tdediroperator.*, tdefiledialog.* (saveConfig): 
 	implemented loading, saving and applying configuration
 
-	* kfiledialog.cpp (setURL): 
+	* tdefiledialog.cpp (setURL): 
 	KDirComboBox is now a combo for recent directories as well as the
 	root-dir, home-dir and Desktop-dir.
 	Recent dirs will be saved in kdeglobals.
 
 Fri Feb 18 23:35:04 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfilefilter.cpp (eventFilter): 
+	* tdefilefilter.cpp (eventFilter): 
 	intercept Key_Return and Key_Enter in the filter-combo and emit
 	filterChanged instead of letting the dialog close
 
 Thu Feb 17 19:09:54 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledialog.{cpp,h} (KDirComboBox): 
+	* tdefiledialog.{cpp,h} (KDirComboBox): 
 	Added KDirComboBox and replaced the directory combobox with it. It
 	even does something now :) Items need to be indented tho.
 
-	* kfilereader.cpp, kdiroperator.{cpp,h}: 
+	* tdefilereader.cpp, tdediroperator.{cpp,h}: 
 	fixed showHidden default
 
 Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfile.h (class KFile): 
+	* tdefile.h (class KFile): 
 	added a small class that contains all the enums now.
 	cleaned up the enums (hope not too many apps will be broken)
 	added flags for "Existing files only" and "local files only"
@@ -52,42 +52,42 @@ Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	it more suitable and more consistent with Qt.
 	added selectionChanged() method (necessary for multiselection)
 
-	* kfileview.*:
+	* tdefileview.*:
 	added invertSelection()
 
-	* kfiledialog.cpp:
+	* tdefiledialog.cpp:
 	made it work with multiselection
 	added static methods for multiselection
 	added getOpenURL(), getOpenURLs and getSaveURL()
 	
-	* kdiroperator.cpp (setSorting): 
+	* tdediroperator.cpp (setSorting): 
 	added setSorting() and sorting() to keep sorting when switching views
-	a few cosmetic and KAction changes
+	a few cosmetic and TDEAction changes
 
 Sun Feb 13 00:45:12 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledialog.cpp (completion): 
+	* tdefiledialog.cpp (completion): 
 	small fix: completion and auto-directory following works also
 	without protocol-part in the location.
 
 Sat Feb 12 15:30:40 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileview.h:
+	* tdefileview.h:
 	made setSorting() and sortReversed() virtual so that subclasses
 	can intercept that to show sorting order
 	
-	* kfiledetailview.cpp,h (setSortIndicator): 
+	* tdefiledetailview.cpp,h (setSortIndicator): 
 	enable header-clicking again to set the sorting
 
 Fri Feb 11 12:17:59 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledialog.cpp (KFileDialog): 
+	* tdefiledialog.cpp (KFileDialog): 
 	fixed filefilter not being applied in constructor
 
 Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp (connectView): 
-	- Now that KToggleAction is fixed, I can commit the new stuff:
+	* tdediroperator.cpp (connectView): 
+	- Now that TDEToggleAction is fixed, I can commit the new stuff:
 	  Offer Actions for all the common functionality, i.e. sorting, setting
 	  the view, home(), cdUp(), back, forward, etc.
 	  All actions are exposed through a QActionCollection
@@ -98,7 +98,7 @@ Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	
 	- renamed fileList to fileView (that was an old relic of KDE 1)
 
-	* kfiledialog.*:
+	* tdefiledialog.*:
 	- make use of the new Actions and fill the toolbar again (up, back, 
 	  forward, reload, home).
 
@@ -107,23 +107,23 @@ Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Thu Feb 10 12:59:29 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp (insertNewFiles): 
+	* tdediroperator.cpp (insertNewFiles): 
 	aahhh, finally fixed that infinite loop in KFileView::mergeLists
 	clear the view before calling view->addItemList( currentContents );
 
-	* kfilereader.cpp (setURL): 
+	* tdefilereader.cpp (setURL): 
 	don't disable dirWatch update (setAutoUpdate) when setting a remote URL
 
 Fri Feb  4 12:42:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledetailview.cpp (insertItem): 
+	* tdefiledetailview.cpp (insertItem): 
 	- don't let QListView sort the items
 	  I disabled clicking at the headers for now, will fix that later
 	- don't flicker on mimetype-pixmap update
 
 Thu Feb  3 12:15:16 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileview.h + all views where necessary
+	* tdefileview.h + all views where necessary
 	added selectAll()
 	added isSelected( const KFileViewItem * )
 	added const KFileViewItemList * selectedItems()
@@ -133,15 +133,15 @@ Thu Feb  3 12:15:16 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Jan 30 22:20:14 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileviewitem.cpp (pixmap): 
+	* tdefileviewitem.cpp (pixmap): 
 	fixed some issues for different pixmap sizes
 
-	* kfileiconview.{h,cpp} (setPixmapSize):
+	* tdefileiconview.{h,cpp} (setPixmapSize):
 	added configurability for different pixmap sizes
 
 Sun Jan 30 16:49:12 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileview.h + all views:
+	* tdefileview.h + all views:
 	A view can now have a name (setViewName() and viewName())
 	This is useful to differentiate views and to display the names in a
 	popupmenu for switching between views.
@@ -150,7 +150,7 @@ Sun Jan 30 12:41:04 2000  Werner Trobin  <wtrobin@carinthia.com>
 	The preview mode works again. It's very similar to the Qt-2.1 QFD
 	preview mode - but it's not totally the same. There are some rough
 	edges which have to be ironed out, but it works :)
-	For further information, see kfilepreview.*
+	For further information, see tdefilepreview.*
 	Note: kpreview and so on are obsolete (IMHO)
 	
 Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -158,7 +158,7 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	Time to add some changelogs again, all the recent hard work of the 
 	restructuring is only in CVS-log...
 
-	* kfileview.cpp (compareItems): 
+	* tdefileview.cpp (compareItems): 
 	- added support to disable sorting directories first (QDir::DirsFirst)
 	- added support to sort by date and to sort reversed
 	- removed unused findCompletion method
@@ -170,10 +170,10 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	  sortReversed(). The enum Switching will be removed, soon.
 	- made setSortMode public
 
-	* kfileviewitem.cpp:
+	* tdefileviewitem.cpp:
 	- added time_t mTime() to enable sorting by modification time
 	
-	* kdiroperator.cpp:
+	* tdediroperator.cpp:
 	- offer sorting options in popupmenu
 	- use checkAccess before creating directories. I guess this will again
 	  change when the new kio will be used, tho. 
@@ -181,17 +181,17 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	  the detail-view would be covered).
 	- Added LGPL copyright header
 	
-	* kfilewidget.cpp (connectSignals):
+	* tdefilewidget.cpp (connectSignals):
 	- connect to all signals of KDirOperator
 	- directly connect SIGNAL to SIGNAL -> removed slotFileHighlighted etc.
 	- fixed some sorting/merging bugs
 
-	* {kfiledialog,kdiroperator}.{cpp,h};
+	* {tdefiledialog,kdiroperator}.{cpp,h};
 	- support for disabling chdir (some apps may not want KFileDialog /
 	  KFileReader change the working directory under their feet)
 	- Added LGPL header in cpp-file
 
-	* kfilereader.cpp (stat):
+	* tdefilereader.cpp (stat):
 	- fixed: some special files were recognized as directories
 
 	* kfstest.cpp:
@@ -200,7 +200,7 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	
 Sun Oct 31 00:56:23 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileinfo.cpp (readUserInfo): Don't call getpwnam() and getgrgid()
+	* tdefileinfo.cpp (readUserInfo): Don't call getpwnam() and getgrgid()
 	all the time over and over again! This opens and parses /etc/passwd
 	or /etc/group with every call!
 	Now we load /etc/passwd and /etc/group once and store the interesting 
@@ -211,31 +211,31 @@ Sun Oct 31 00:56:23 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sat Oct 23 01:55:00 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledetaillist.cpp (key): hopefully implemented correct mapping
+	* tdefiledetaillist.cpp (key): hopefully implemented correct mapping
 	from KFileInfo to QListViewItem and back. I had a hard time convincing
 	QListView that KFileInfoContents knows best where to insert an item
 	Now the detaillist is even usable :)
 	Fixed a problem with selection and highlighting
 	Disable clicking on listview headers that can't be used for sorting
 
-	* kfileinfocontents.cpp (setSorting): call insertItem() with a correct
+	* tdefileinfocontents.cpp (setSorting): call insertItem() with a correct
 	(is it?) index, instead of -1
 
 Thu Oct 21 23:18:54 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfiledialog.cpp (init): removed "[development only] from tooltip
+	* tdefiledialog.cpp (init): removed "[development only] from tooltip
 	(sorry to break the translations, but this HAD to go)
 
 	* don't update anything when leaving the configure-dialog with Cancel
 
 Wed Oct 20 15:07:16 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfileinfo.cpp,h: implemented KFileInfo::filePath() and fixed 
+	* tdefileinfo.cpp,h: implemented KFileInfo::filePath() and fixed 
 	KFileInfo::absURL() not being set in some cases
 	
 	* kdir.cpp: fixed a buglet in the path (double slashes)
 
-	* kfiledetaillist.cpp (KFileDetailList): improved selecting files
+	* tdefiledetaillist.cpp (KFileDetailList): improved selecting files
 	(single click, double click, Return-key)
 	but the mapping from QListViewItem to KFileInfo is still quite broken
 	
@@ -244,37 +244,37 @@ Wed Oct 20 15:07:16 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* kdir.cpp: used QString::local8Bit() instead of QString::ascii() 
 	for file names and directory names.
 
-	* kfiledialog.cpp: used QStringList instead of QStrIList. 
+	* tdefiledialog.cpp: used QStringList instead of QStrIList. 
 
 1999-01-14  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: fixed some GUI problems and moved all default
-	configurations into config-kfile.h. 
+	* tdefiledialog.cpp: fixed some GUI problems and moved all default
+	configurations into config-tdefile.h. 
 	Changed some default values, so that users that never looked into
 	the config dialog gets a nice suprise with 1.1 ;-)
 
-	* kfiledialog.cpp: changed selectedFile to return decoded path instead
+	* tdefiledialog.cpp: changed selectedFile to return decoded path instead
 	of encoded one
 
 Thu Jan  7 23:14:39 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfilesimpleview.cpp (keyPressEvent): fixed segfault on keypress,
+	* tdefilesimpleview.cpp (keyPressEvent): fixed segfault on keypress,
 	when there were no files at all in the list
 
 1998-12-19  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: fixing an ugly bug when "." is used as argument
+	* tdefiledialog.cpp: fixing an ugly bug when "." is used as argument
 
 Mon Dec 14 23:00:41 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfilebookmark.cpp: renamed class KBookmark to KFileBookmark to 
+	* tdefilebookmark.cpp: renamed class KBookmark to KFileBookmark to 
 	avoid problems with KFM's KBookmark class. Renamed bookmark.* to
-	kfilebookmark.*, too and changed all occurrences of bookmark.* to
-	kfilebookmark.* (especially all the .po-files)
+	tdefilebookmark.*, too and changed all occurrences of bookmark.* to
+	tdefilebookmark.* (especially all the .po-files)
 
 Wed Dec  2 15:59:13 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kfilesimpleview.cpp: Fixed some more keyboard navigation bugs.
+	* tdefilesimpleview.cpp: Fixed some more keyboard navigation bugs.
 	Added method isColCompletelyVisible( int col ), now you can scroll
 	perfectly to make items completely visible.
 	Moreover, in resizeEvent() the number of columns was not calculated 
@@ -284,77 +284,77 @@ Wed Dec  2 15:59:13 1998  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 1998-10-12  Jochen Küpper  <jochen@uni-duesseldorf.de>
 
-	* kfiledialog.cpp (okPressed): Changed okPressed to store the correct
+	* tdefiledialog.cpp (okPressed): Changed okPressed to store the correct
 	filename before leaving the dialog.
 
 1998-06-07  Stephan Kulow  <coolo@kde.org>
 
-	* kfilesimpleview.cpp: added some checks to prevent division with
+	* tdefilesimpleview.cpp: added some checks to prevent division with
 	zero using the latest qt snapshots
 
-	* kfilesimpleview.cpp: added a repaint call after a resize
+	* tdefilesimpleview.cpp: added a repaint call after a resize
 
-	* kfiledialog.cpp: new experimental button order
+	* tdefiledialog.cpp: new experimental button order
 
-	* kfiledialog.cpp: added lastDirectory to remember the last visited
+	* tdefiledialog.cpp: added lastDirectory to remember the last visited
 	directory for next open
 
 1998-05-24  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: use setSelection also for the initial filename
+	* tdefiledialog.cpp: use setSelection also for the initial filename
 	given
 
-	* kfiledialog.cpp: introduced KFileFilter to make an abstraction
+	* tdefiledialog.cpp: introduced KFileFilter to make an abstraction
 	for the used filter widget. Currently only QComboBox is supported,
 	but this may change in the future
 	
 1998-05-20  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: changed the accelerator for completion 
+	* tdefiledialog.cpp: changed the accelerator for completion 
 	to CTRL-T
 
-	* kfiledialog.cpp: fixed the setSelection() feature
+	* tdefiledialog.cpp: fixed the setSelection() feature
 
 1998-05-19  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.h: added setSelection
+	* tdefiledialog.h: added setSelection
 
 1998-05-18  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: bugfixes
+	* tdefiledialog.cpp: bugfixes
 
 1998-05-15  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfocontents.cpp: some more changes and speed ups 
+	* tdefileinfocontents.cpp: some more changes and speed ups 
 	(caching and some other little things)
 
 1998-05-14  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfocontents.cpp: added addItemList 
+	* tdefileinfocontents.cpp: added addItemList 
 
-	* kfileinfocontents.h: introduced KFileInfoContentsSignaler
+	* tdefileinfocontents.h: introduced KFileInfoContentsSignaler
 
-	* kfileinfocontents.cpp: some more speed improvment
+	* tdefileinfocontents.cpp: some more speed improvment
 
 1998-05-10  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: tried to speed up the refresh
+	* tdefiledialog.cpp: tried to speed up the refresh
 
 1998-04-17  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledetaillist.cpp: implemented the date field
+	* tdefiledetaillist.cpp: implemented the date field
 	
-	* kfiledetaillist.cpp: made the columns wider
+	* tdefiledetaillist.cpp: made the columns wider
 
-	* kfileinfocontents.cpp: use the new icons by Mark
+	* tdefileinfocontents.cpp: use the new icons by Mark
 
 Thu Apr 16 10:51:24 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfiledialog.*: some small fixes concerning preview
+	* tdefiledialog.*: some small fixes concerning preview
         
-        * kfileinfocontents.cpp: fixed sorting bug in preview
+        * tdefileinfocontents.cpp: fixed sorting bug in preview
         
-        * kfilepreview.*: small bug fixes
+        * tdefilepreview.*: small bug fixes
         
         * kpreview.*: small bug fixes
         
@@ -362,31 +362,31 @@ Thu Apr 16 10:51:24 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
 1998-04-15  Stephan Kulow  <coolo@kde.org>
 
-	* kfilepreview.cpp: use a list box instead of simple view
+	* tdefilepreview.cpp: use a list box instead of simple view
 
-	* kfiledialog.cpp: fixed an ugly bug
+	* tdefiledialog.cpp: fixed an ugly bug
 
 1998-04-14  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialogconf.cpp: removed the width/height sliders
+	* tdefiledialogconf.cpp: removed the width/height sliders
 	
-	* kfiledialog.cpp: save the width and height on exit
+	* tdefiledialog.cpp: save the width and height on exit
 
-	* kfiledialogconf.cpp: added more guys to the about box
+	* tdefiledialogconf.cpp: added more guys to the about box
 
-	* kfiledialog.h: removed init*Children. They were useless
+	* tdefiledialog.h: removed init*Children. They were useless
 
-	* kfiledialog.cpp: set the default size to a useful value
+	* tdefiledialog.cpp: set the default size to a useful value
 
 Mon Apr  6 17:30:18 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfilepreview.*: restructured previewing, one can now easily
+	* tdefilepreview.*: restructured previewing, one can now easily
         use custom previewers, dynamically
         
         * kpreview.*: changes for allowing custom previewers, two previewers
         are hardcoded so far
 
-	* kfiledialog.*: changes changes for allowing custom previewers
+	* tdefiledialog.*: changes changes for allowing custom previewers
         
         * kfstest.cpp: changes to preview mode
         
@@ -402,7 +402,7 @@ Thu Apr  2 19:39:37 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 	* kpreview.*: widget which for now shows some info about a 
         file/folder along with the first 20-30 lines of it
         
-        * kfilepreview.*: added a new view which has a preview of any text
+        * tdefilepreview.*: added a new view which has a preview of any text
         file in the right part
         
         * kfstest.cpp: added the new mode "preview" which shows the above 
@@ -410,11 +410,11 @@ Thu Apr  2 19:39:37 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
 1998-03-30  Stephan Kulow  <coolo@kde.org>
 
-	* kfilesimpleview.cpp: fixed highlightning
+	* tdefilesimpleview.cpp: fixed highlightning
 
-	* kfiledialog.cpp: some fixes for the dir selection
+	* tdefiledialog.cpp: some fixes for the dir selection
 
-	* kfiledialog.h: Moved KFileDialog into KFileBaseDialog and made
+	* tdefiledialog.h: Moved KFileDialog into KFileBaseDialog and made
 	KFileDialog and KDirDialog a derived class of KFileBaseDialog to
 	make this virtual functions work
 
@@ -423,91 +423,91 @@ Mon Mar 30 17:53:20 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
         * kcombiview.cpp: bug fixes for completion & corresponding
         highlighting
 
-        * kfiledialog.cpp: small bug fix, too much copying into location
+        * tdefiledialog.cpp: small bug fix, too much copying into location
 
-        * kfileinfocontents.cpp: completion slightly remodeled, should
+        * tdefileinfocontents.cpp: completion slightly remodeled, should
         work in all views now
 
-        * kfileinfocontents.h: changed nameList to case insensitive
+        * tdefileinfocontents.h: changed nameList to case insensitive
         list
                     
 1998-03-28  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: changed the filter separator to \n. 
+	* tdefiledialog.cpp: changed the filter separator to \n. 
 	This looks nicer in the source code of the call
 
 Sat Mar 28 14:49:00 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: changed the meaning of the dirName argument
+	* tdefiledialog.cpp: changed the meaning of the dirName argument
 
-	* kfiledialog.h: added getShowFilter
+	* tdefiledialog.h: added getShowFilter
 
 Thu Mar 26 12:47:42 1998  Stephan Kulow  <coolo@kde.org>
 	
-	* kfilesimpleview.cpp: improved scrolling in simple view
+	* tdefilesimpleview.cpp: improved scrolling in simple view
 
-	* kfileinfocontents.cpp: add a / after a found dir
+	* tdefileinfocontents.cpp: add a / after a found dir
 
-	* kfiledialog.cpp: fixed bug for !showFilter
+	* tdefiledialog.cpp: fixed bug for !showFilter
 
 Wed Mar 25 18:39:09 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfileinfocontents.cpp: completion now working
+	* tdefileinfocontents.cpp: completion now working
         
         * kcombiview.cpp: changed behavior for completion, it
         now highlights completed directory and file                
         
 Tue Mar 24 16:08:46 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfileinfocontents.cpp: sorting now fully working
+	* tdefileinfocontents.cpp: sorting now fully working
         
-        * kfiledialog.cpp: modifications for sorting in the on the
+        * tdefiledialog.cpp: modifications for sorting in the on the
         fly reconfiguration
         
-        * kfileinfocontents.*: modification to the constructor 
+        * tdefileinfocontents.*: modification to the constructor 
         to pass along the sorting
         
-        * kfiledetaillist.*: modification to the constructor 
+        * tdefiledetaillist.*: modification to the constructor 
         to pass along the sorting
         
         * kcombiview.*: modification to the constructor 
         to pass along the sorting
 
-        * kfilesimpleview.*: modification to the constructor 
+        * tdefilesimpleview.*: modification to the constructor 
         to pass along the sorting
 
 Tue Mar 24 10:45:15 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
-	* kfileinfocontents.cpp: sorting fixed, the feature of keeping 
+	* tdefileinfocontents.cpp: sorting fixed, the feature of keeping 
         directories grouped is still missing though
 
 Mon Mar 23 22:59:18 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledetaillist.h: added acceptsFiles() and acceptsDirs() to
+	* tdefiledetaillist.h: added acceptsFiles() and acceptsDirs() to
 	make dirs-only views useful
 	
-	* kfileinfocontents.cpp: OK, completion is back again, but 
+	* tdefileinfocontents.cpp: OK, completion is back again, but 
 	currently not working, because the code is missing ;-)
 
 Mon Mar 23 00:08:02 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: moved all GM related things into initGUI() to
+	* tdefiledialog.cpp: moved all GM related things into initGUI() to
 	make recreation possible
 
 Sun Mar 22 00:22:46 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: use KShellProcess now
+	* tdefiledialog.cpp: use KShellProcess now
 
-	* kfiledialog.h: added virtual function initFileList to made 
+	* tdefiledialog.h: added virtual function initFileList to made 
 	KFileDialog customable
 
-	* kfiledialog.cpp: show a combo box, in case more filters are given
+	* tdefiledialog.cpp: show a combo box, in case more filters are given
 
-	* kfiledialog.cpp: some bug fixes. I can't get the sorting to work
+	* tdefiledialog.cpp: some bug fixes. I can't get the sorting to work
 
 	* Makefile.am: install some toolbar pixmaps
 
-	* kfiledetailview.cpp: added pixmaps to the detail view
+	* tdefiledetailview.cpp: added pixmaps to the detail view
 
 	* Kfiledialog.cpp: made KComboView customable through virtual 
 	functions
@@ -522,66 +522,66 @@ Sun Mar 22 00:22:46 1998  Stephan Kulow  <coolo@kde.org>
 
 	* kdirlistbox.cpp: KDirListBox is now a KFileInfoContents too
 
-	* kfiledialog.cpp: another change in the API. It uses now QSignal.
+	* tdefiledialog.cpp: another change in the API. It uses now QSignal.
 	I didn't liked the old way
 
 1998-03-21  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: implemented mixDirsAndFiles. Need some work and currently 
+	* tdefiledialog.cpp: implemented mixDirsAndFiles. Need some work and currently 
 	only supported by the simple view
 
 Sat Mar 21 01:00:48 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfilesimpleview.cpp: added pixmaps to indicate access on the file
+	* tdefilesimpleview.cpp: added pixmaps to indicate access on the file
 
-	* kfilesimpleview.cpp: improved keyboard navigation
+	* tdefilesimpleview.cpp: improved keyboard navigation
 
-	* kfilesimpleview.cpp: first almost working simple view
+	* tdefilesimpleview.cpp: first almost working simple view
 
-	* kfilesimpleview.cpp: started implementing a simple view. Needs
+	* tdefilesimpleview.cpp: started implementing a simple view. Needs
 	still some work
 	
 
 Fri Mar 20 22:42:31 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfocontents.h: bugfixes
+	* tdefileinfocontents.h: bugfixes
 
-	* kfileinfo.cpp: KFileInfo is no longer a derived class of
+	* tdefileinfo.cpp: KFileInfo is no longer a derived class of
 	QFileInfo. This should reduce memory use too
 
-	* kfileinfocontents.h: moved the actual sorting in
+	* tdefileinfocontents.h: moved the actual sorting in
 	KFileInfoContents. Derived classes are for viewing only
 
-	* kfiledialog.h: fixed some header files locations
+	* tdefiledialog.h: fixed some header files locations
 
 1998-03-20  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfo.cpp: show lockedfolder.xpm for folders, that are not
+	* tdefileinfo.cpp: show lockedfolder.xpm for folders, that are not
 	allowed to enter or read
 
-	* kfiledialog.cpp: bug fixes
+	* tdefiledialog.cpp: bug fixes
 
 Fri Mar 20 13:10:11 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
 	* kfilgdialog.*, remodeled the configuration dialog to reflect the 
         current possible settings
-        * kfiledetailList.cpp: added the PageUp PageDown navigation 
+        * tdefiledetailList.cpp: added the PageUp PageDown navigation 
 
 1998-03-19  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: fixed the forward/back back reported by 
+	* tdefiledialog.cpp: fixed the forward/back back reported by 
 	Stefan Tafener
 
 1998-03-18  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: set the initial focus to the line edit
+	* tdefiledialog.cpp: set the initial focus to the line edit
 
-	* kfiledialog.cpp: use kapp->invokeHTMLHelp now
+	* tdefiledialog.cpp: use kapp->invokeHTMLHelp now
 	
-	* kfiledialog.h: removed treeList, since it's not implemented
+	* tdefiledialog.h: removed treeList, since it's not implemented
 
 Wed Mar 18 02:56:32 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledetaillist.cpp: fixed sorting again
+	* tdefiledetaillist.cpp: fixed sorting again
 
 1998-03-17  Stephan Kulow  <coolo@kde.org>
 
@@ -591,30 +591,30 @@ Wed Mar 18 02:56:32 1998  Stephan Kulow  <coolo@kde.org>
 
 1998-03-16  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: don't accept the first entry of the combo 
+	* tdefiledialog.cpp: don't accept the first entry of the combo 
 	box as a file name
 
-	* kfiledialog.cpp: added an accelerator for completion, since 
+	* tdefiledialog.cpp: added an accelerator for completion, since 
 	KCombo no longer emits such a thing (currently CTRL-A)
 	
 	* kdir.cpp: disable parent button in /
 
-	* kfiledialog.cpp: fixed layout of mkdir dialog
+	* tdefiledialog.cpp: fixed layout of mkdir dialog
 
 	* kdir.cpp: use currentDir instead of homeDir as default
 
-	* kfiledialog.cpp: added member acceptOnlyExisting and set it 
+	* tdefiledialog.cpp: added member acceptOnlyExisting and set it 
 	for now to always false. I guess, we need an extra parameter for this
 	
-	* kfiledialog.cpp: changed dirList and fileList to fix the 
+	* tdefiledialog.cpp: changed dirList and fileList to fix the 
 	focus handling
 	
-	* kfileinfolistwidget.cpp: added focus handling
+	* tdefileinfolistwidget.cpp: added focus handling
 
-	* kfileinfolistwidget.cpp: added keyevent handling to handle 
+	* tdefileinfolistwidget.cpp: added keyevent handling to handle 
 	cursor and enter 
 
-	* kfiledialog.cpp: changed the filter edit to a QLineEdit, since 
+	* tdefiledialog.cpp: changed the filter edit to a QLineEdit, since 
 	we don't need the completion, but the tabing for focus changes
 	
 Mon Mar 16 11:36:07 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
@@ -622,7 +622,7 @@ Mon Mar 16 11:36:07 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
         a mkdir method to kdir in near future
 
 Mon Mar 16 20:04:00 1998  Martin Jones <mjones@kde.org>
-	* Added booktoken.* to remove dependancy on khtmlw and jscript
+	* Added booktoken.* to remove dependancy on tdehtmlw and jscript
 
 Thu Mar 12 09:32:06 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 	* worked on the dir and file completion, should do both now,
@@ -636,8 +636,8 @@ Thu Mar 12 09:32:06 1998  Daniel Grana <grana@ie.iwi.unibe.ch>
 
 Thu Mar 12 00:36:05 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: made a library out of the file selector
-	* kfiledialog.cpp: added an extra parameter acceptURLs to seperate
+	* tdefiledialog.cpp: made a library out of the file selector
+	* tdefiledialog.cpp: added an extra parameter acceptURLs to seperate
 	between getOpenFileName and getOpenFileURL
 
 Sun Feb 15 23:13:47 1998 Richard Moore <rich@kde.org>
@@ -650,28 +650,28 @@ Sun Feb 15 23:13:47 1998 Richard Moore <rich@kde.org>
 
 Thu Feb 12 17:27:51 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfileinfo.cpp: added determination of group and other things to 
-	be display the correct values in the kfileinfolistwidget
+	* tdefileinfo.cpp: added determination of group and other things to 
+	be display the correct values in the tdefileinfolistwidget
 
 Thu Feb 12 16:01:44 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: removed the #ifdef code. Now the combo box for
+	* tdefiledialog.cpp: removed the #ifdef code. Now the combo box for
 	the path is the only option
 
 Tue Feb 10 01:09:16 1998  Richard Moore <rich@kde.org>
 
 	* Added details widget - this is currently selected by a config
 	file entry, but it there should be a toolbar button. Many changes
-	to kfiledialog to allow the switch (need an abstract fileview class).
+	to tdefiledialog to allow the switch (need an abstract fileview class).
 
 Fri Feb  6 18:08:14 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: replaced the location lineedit with an combo
+	* tdefiledialog.cpp: replaced the location lineedit with an combo
 	box. Currently configurable with a compiler define. 
 
 Fri Feb  6 17:07:26 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: fixed the en- and decoding of URLs. Now it's
+	* tdefiledialog.cpp: fixed the en- and decoding of URLs. Now it's
 	possible to move into directories called "sdasd#sdsd" for example
 
 Sat Jan 24 17:18:10 1998  Mario Weilguni  <mweilguni@sime.com>
@@ -682,37 +682,37 @@ Sat Jan 24 17:18:10 1998  Mario Weilguni  <mweilguni@sime.com>
 
 Tue Jan 20 00:51:55 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: some fixes to make kfm support more robust
+	* tdefiledialog.cpp: some fixes to make kfm support more robust
 
 Mon Jan 19 01:10:11 1998  Stephan Kulow  <coolo@kde.org>
 
 	* kdir.cpp: re-added ftp support 
 
-	* kfiledialog.cpp: take care of the case, when the user enters a
+	* tdefiledialog.cpp: take care of the case, when the user enters a
 	complete filename
 
 	* kdir.cpp: added isReadable() to indicate, that the dir is not
 	correct
 	
-	* kfiledialog.cpp: played a little bit with the geometry management
+	* tdefiledialog.cpp: played a little bit with the geometry management
 
 
 Sun Jan 18 15:00:06 1998  Stephan Kulow  <coolo@kde.org>
 
-	* kfiledialog.cpp: - back/forward work now as expected
+	* tdefiledialog.cpp: - back/forward work now as expected
 	  - show the correct filter
 	  - the combo box works now as expected
 
 	* kdir.cpp: check if the directory is correct (for local
 	files). If not, go back to the old value
 
-	* kfiledialog.cpp: - disable parent button, when in root
+	* tdefiledialog.cpp: - disable parent button, when in root
 	  - treat the case, that the URL ends with "/"
 	  - strip white spaces out of the location text
 
-	* kfileinfo.cpp: don't insert broken links
+	* tdefileinfo.cpp: don't insert broken links
 
-	* kfiledialog.cpp: just set the dir, if it's different
+	* tdefiledialog.cpp: just set the dir, if it's different
 	from the already set one
 
 Sun Jan 18 11:53:32 1998  Mario Weilguni  <mweilguni@sime.com>
diff --git a/kio/kfile/Makefile.am b/tdeio/tdefile/Makefile.am
index 1951f30c0..857e843c5 100644
--- a/kio/kfile/Makefile.am
+++ b/tdeio/tdefile/Makefile.am
@@ -18,47 +18,47 @@
 
 
 INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx \
-    -I$(top_builddir)/kio/kio -I$(top_srcdir)/kio/bookmarks $(all_includes) $(LIBART_CFLAGS)
+    -I$(top_builddir)/tdeio/tdeio -I$(top_srcdir)/tdeio/bookmarks $(all_includes) $(LIBART_CFLAGS)
 
-noinst_LTLIBRARIES  = libkfile.la
+noinst_LTLIBRARIES  = libtdefile.la
 
 METASOURCES = AUTO
 
 #SUBDIRS = . acl_prop_page
 
-include_HEADERS = kfiledialog.h kencodingfiledialog.h\
-	kdiroperator.h kfileview.h kfilefiltercombo.h \
-	kfiledetailview.h kcombiview.h kdiskfreesp.h \
-	kfileiconview.h krecentdocument.h \
-	kurlrequester.h kfilepreview.h kfile.h \
+include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
+	tdediroperator.h tdefileview.h tdefilefiltercombo.h \
+	tdefiledetailview.h kcombiview.h kdiskfreesp.h \
+	tdefileiconview.h tderecentdocument.h \
+	kurlrequester.h tdefilepreview.h tdefile.h \
 	kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h \
-	kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h kfilesharedlg.h \
-	kfiletreeview.h kfiletreeviewitem.h kfiletreebranch.h \
+	kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h \
+	tdefiletreeview.h tdefiletreeviewitem.h tdefiletreebranch.h \
 	kdirselectdialog.h kurlbar.h kpropertiesdialog.h knotifydialog.h \
 	kcustommenueditor.h knotifywidgetbase.h
 
-noinst_HEADERS = config-kfile.h krecentdirs.h kmetaprops.h \
-	kfilebookmarkhandler.h kfilemetainfowidget.h kopenwith_p.h \
-	kfilespeedbar.h kpreviewprops.h kacleditwidget.h kacleditwidget_p.h images.h
+noinst_HEADERS = config-tdefile.h tderecentdirs.h kmetaprops.h \
+	tdefilebookmarkhandler.h tdefilemetainfowidget.h kopenwith_p.h \
+	tdefilespeedbar.h kpreviewprops.h kacleditwidget.h kacleditwidget_p.h images.h
 
-libkfile_la_SOURCES = \
-	kfilefiltercombo.cpp \
-	kfileview.cpp kfileiconview.cpp \
-	krecentdocument.cpp kfiledialog.cpp kdiroperator.cpp \
-	kfiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
-	kfilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
+libtdefile_la_SOURCES = \
+	tdefilefiltercombo.cpp \
+	tdefileview.cpp tdefileiconview.cpp \
+	tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp \
+	tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
+	tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
 	kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \
-	krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp kfilesharedlg.cpp \
+	tderecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp \
 	kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp \
-	kfiletreeview.cpp kfiletreeviewitem.cpp kfiletreebranch.cpp \
-	kdirselectdialog.cpp kfilebookmarkhandler.cpp \
-	kfilemetainfowidget.cpp kcustommenueditor.cpp knotifywidgetbase.ui \
-	knotifydialog.cpp kfilespeedbar.cpp kpreviewwidgetbase.cpp \
-	kfilemetapreview.cpp kpropertiesdesktopbase.ui \
+	tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp \
+	kdirselectdialog.cpp tdefilebookmarkhandler.cpp \
+	tdefilemetainfowidget.cpp kcustommenueditor.cpp knotifywidgetbase.ui \
+	knotifydialog.cpp tdefilespeedbar.cpp kpreviewwidgetbase.cpp \
+	tdefilemetapreview.cpp kpropertiesdesktopbase.ui \
 	kpropertiesdesktopadvbase.ui kpropertiesmimetypebase.ui \
 	kencodingfiledialog.cpp kacleditwidget.cpp
 
-libkfile_la_COMPILE_FIRST = $(srcdir)/../kio/kdirnotify_stub.h
+libtdefile_la_COMPILE_FIRST = $(srcdir)/../tdeio/kdirnotify_stub.h
 
 EXTRA_DIST = NOTES
 
@@ -69,10 +69,10 @@ servicetypedir = $(kde_servicetypesdir)
 
 
 #Can't be a module, we need to link to it for readConfig
-#kde_module_LTLIBRARIES = libkfileshare.la
-#libkfileshare_la_SOURCES = kfileshare.cpp
-#libkfileshare_la_LIBADD = libkfile.la
-#libkfileshare_la_LDFLAGS = -module $(KDE_PLUGIN)
-#kde_services_DATA = kfilesharepropsplugin.desktop
+#kde_module_LTLIBRARIES = libtdefileshare.la
+#libtdefileshare_la_SOURCES = tdefileshare.cpp
+#libtdefileshare_la_LIBADD = libtdefile.la
+#libtdefileshare_la_LDFLAGS = -module $(KDE_PLUGIN)
+#kde_services_DATA = tdefilesharepropsplugin.desktop
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kfile/NOTES b/tdeio/tdefile/NOTES
index c3fb6fbcb..e2037e382 100644
--- a/kio/kfile/NOTES
+++ b/tdeio/tdefile/NOTES
@@ -1,9 +1,9 @@
 Rewrite
 =======
 
-Here is the result of a long discussion between the kfile developers
+Here is the result of a long discussion between the tdefile developers
 (Carsten) and the konqueror developers (Simon and David), about the plans
-for more integration between kfile and konqueror. 16/08/2000.
+for more integration between tdefile and konqueror. 16/08/2000.
 
 
 
@@ -31,12 +31,12 @@ for more integration between kfile and konqueror. 16/08/2000.
     given KFileItem. This will help for e.g. deleteItems and refreshItems.
 (5) KFileListView holds a QPtrDict to find the QListViewItem for a
     KFileItem.  It implements different modes if we want the tree view in
-    kfile ?
+    tdefile ?
 
 
     KFileChooserWidget
 
-This (base) class is the container widget that can contain any kfileview and
+This (base) class is the container widget that can contain any tdefileview and
 switch between them. It is embeddable into an application that wants a widget
 for choosing a file or directory. Features listing, selecting, popupmenu for
 switching modes, and a virtual createView( viewmode ) method, which
@@ -69,7 +69,7 @@ KFileIconView, and the line-up-icons algorithm, etc.
   KonqFileListView
 
 Inherits KFileListView to add more stuff if needed. The mc-like text view
-could be implemented here as well, unless we want it in kfile. Same for the
+could be implemented here as well, unless we want it in tdefile. Same for the
 tree view.
 
   KonqFileManagerWidget
@@ -82,7 +82,7 @@ konqueror versions of the views.
 
 This class inherits KParts::ReadOnlyPart, and provides a BrowserExtension.
 It integrates KonqFileManagerWidget as its KParts widget, and provides
-KActions for it.
+TDEActions for it.
 
 Important :
 
diff --git a/kio/kfile/TODO b/tdeio/tdefile/TODO
index b7bf74ea5..b7bf74ea5 100644
--- a/kio/kfile/TODO
+++ b/tdeio/tdefile/TODO
diff --git a/kio/kfile/config-kfile.h b/tdeio/tdefile/config-tdefile.h
index 8715ed273..8ef42eb64 100644
--- a/kio/kfile/config-kfile.h
+++ b/tdeio/tdefile/config-tdefile.h
@@ -1,7 +1,7 @@
-#ifndef CONFIG_KFILE_H
-#define CONFIG_KFILE_H
+#ifndef CONFIG_TDEFILE_H
+#define CONFIG_TDEFILE_H
 
-const int kfile_area = 250;
+const int tdefile_area = 250;
 
 #define DefaultViewStyle TQString::fromLatin1("SimpleView")
 #define DefaultPannerPosition 40
diff --git a/kio/kfile/images.h b/tdeio/tdefile/images.h
index f544e2f0a..f544e2f0a 100644
--- a/kio/kfile/images.h
+++ b/tdeio/tdefile/images.h
diff --git a/kio/kfile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 7f253f8c5..7e8e3dae2 100644
--- a/kio/kfile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -38,8 +38,8 @@
 #include <tqwidgetstack.h>
 #include <tqheader.h>
 
-#include <klocale.h>
-#include <kfileitem.h>
+#include <tdelocale.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
@@ -143,7 +143,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent,
                                     KACLListView::EntryType _type,
                                     unsigned short _value, bool defaults,
                                     const TQString& _qualifier )
- : KListViewItem( parent, parent->lastItem() ), // we want to append
+ : TDEListViewItem( parent, parent->lastItem() ), // we want to append
    type( _type ), value( _value ), isDefault( defaults ),
    qualifier( _qualifier ), isPartial( false )
 {
@@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
         mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) );
         p->setFont( font );
     }
-    KListViewItem::paintCell( p, mycg, column, width, alignment );
+    TDEListViewItem::paintCell( p, mycg, column, width, alignment );
 
     KACLListViewItem *below =0;
     if ( itemBelow() )
@@ -556,7 +556,7 @@ void EditACLEntryDialog::slotSelectionChanged( int id )
 
 
 KACLListView::KACLListView( TQWidget* parent, const char* name )
- : KListView( parent, name ),
+ : TDEListView( parent, name ),
    m_hasMask( false ), m_allowDefaults( false )
 {
     // Add the columns
@@ -753,7 +753,7 @@ void KACLListView::contentsMousePressEvent( TQMouseEvent * e )
     if ( !clickedItem ) return;
     // if the click is on an as yet unselected item, select it first
     if ( !clickedItem->isSelected() )
-        KListView::contentsMousePressEvent( e );
+        TDEListView::contentsMousePressEvent( e );
 
     if ( !currentItem() ) return;
     int column = header()->sectionAt( e->x() );
@@ -770,7 +770,7 @@ void KACLListView::contentsMousePressEvent( TQMouseEvent * e )
             perm = ACL_EXECUTE;
             break;
         default:
-            return KListView::contentsMousePressEvent( e );
+            return TDEListView::contentsMousePressEvent( e );
     }
     KACLListViewItem* referenceItem = static_cast<KACLListViewItem*>( clickedItem );
     unsigned short referenceHadItSet = referenceItem->value & perm;
diff --git a/kio/kfile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h
index d0f30f60a..43f4b2fca 100644
--- a/kio/kfile/kacleditwidget.h
+++ b/tdeio/tdefile/kacleditwidget.h
@@ -30,9 +30,9 @@
 
 #ifdef USE_POSIX_ACL
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kacl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class KACLListViewItem;
 class KACLListView;
diff --git a/kio/kfile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h
index 166725638..41e265053 100644
--- a/kio/kfile/kacleditwidget_p.h
+++ b/tdeio/tdefile/kacleditwidget_p.h
@@ -29,10 +29,10 @@
 #endif // Q_MOC_RUN
 
 #ifdef USE_POSIX_ACL
-#include <klistview.h>
+#include <tdelistview.h>
 #include <sys/acl.h>
 #include <kacl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdialogbase.h>
 #include <tqpixmap.h>
 #include <tqcombobox.h>
@@ -47,7 +47,7 @@ class TQCheckBox;
 /**
 @author Sean Harmer
 */
-class KACLListView : public KListView
+class KACLListView : public TDEListView
 {
     Q_OBJECT
     
@@ -168,7 +168,7 @@ private:
 };
 
 
-class KACLListViewItem : public KListViewItem
+class KACLListViewItem : public TDEListViewItem
 {
 public:
     KACLListViewItem( TQListView* parent, KACLListView::EntryType type,
diff --git a/kio/kfile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index 8ba9d29bb..4c4f0cb06 100644
--- a/kio/kfile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -22,20 +22,20 @@
 
 #include <assert.h>
 
-#include "kfileitem.h"
+#include "tdefileitem.h"
 #include "kcombiview.h"
-#include "kfileiconview.h"
-#include "kfiledetailview.h"
-#include "config-kfile.h"
+#include "tdefileiconview.h"
+#include "tdefiledetailview.h"
+#include "config-tdefile.h"
 
 #include <tqevent.h>
 
 #include <tqdir.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqvaluelist.h>
 
@@ -305,21 +305,21 @@ KFileView *KCombiView::focusView( KFileView *preferred ) const
     return (preferred && w == preferred->widget()) ? preferred : other;
 }
 
-void KCombiView::readConfig( KConfig *config, const TQString& group )
+void KCombiView::readConfig( TDEConfig *config, const TQString& group )
 {
     left->readConfig( config, group );
     if ( right )
         right->readConfig( config, group );
 }
 
-void KCombiView::writeConfig( KConfig *config, const TQString& group )
+void KCombiView::writeConfig( TDEConfig *config, const TQString& group )
 {
     left->writeConfig( config, group );
     if ( right )
         right->writeConfig( config, group );
 }
 
-KActionCollection * KCombiView::actionCollection() const
+TDEActionCollection * KCombiView::actionCollection() const
 {
     return focusView( right )->actionCollection();
 }
diff --git a/kio/kfile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index 6186ab740..af3680571 100644
--- a/kio/kfile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -23,10 +23,10 @@
 #define _KCOMBIVIEW_H
 
 #include <tqsplitter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-#include <kfile.h>
-#include <kfileview.h>
+#include <tdefile.h>
+#include <tdefileview.h>
 
 class KFileIconView;
 class TQEvent;
@@ -51,7 +51,7 @@ class TQIconViewItem;
  * @see KFileDetailView
  * @see KDirOperator
  */
-class KIO_EXPORT KCombiView : public TQSplitter,
+class TDEIO_EXPORT KCombiView : public TQSplitter,
 		   public KFileView
 {
     Q_OBJECT
@@ -93,12 +93,12 @@ public:
 
     virtual void setSorting( TQDir::SortSpec sort );
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
     void ensureItemVisible( const KFileItem * );
 
-    virtual KActionCollection * actionCollection() const;
+    virtual TDEActionCollection * actionCollection() const;
 
     virtual void setAcceptDrops(bool b);
 
diff --git a/kio/kfile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 30513bbf3..b59108071 100644
--- a/kio/kfile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -24,13 +24,13 @@
 #include <tqdir.h>
 
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kopenwith.h>
 
 #include "kcustommenueditor.h"
@@ -60,8 +60,8 @@ public:
       // to accelators, replace them with two ampersands.
       serviceName.replace("&", "&&");
 
-      TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
-                              0, KIcon::DefaultState, 0L, true);
+      TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small,
+                              0, TDEIcon::DefaultState, 0L, true);
 
       // make sure they are not larger than 16x16
       if (normal.width() > 16 || normal.height() > 16) {
@@ -90,7 +90,7 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent)
 {
     d = new KCustomMenuEditorPrivate;
    TQHBox *page = makeHBoxMainWidget();
-   m_listView = new KListView(page);
+   m_listView = new TDEListView(page);
    m_listView->addColumn(i18n("Menu"));
    m_listView->setFullWidth(true);
    m_listView->setSorting(-1);
@@ -119,7 +119,7 @@ void KCustomMenuEditor::refreshButton()
 }
 
 void
-KCustomMenuEditor::load(KConfigBase *cfg)
+KCustomMenuEditor::load(TDEConfigBase *cfg)
 {
    cfg->setGroup(TQString::null);
    int count = cfg->readNumEntry("NrOfItems");
@@ -147,7 +147,7 @@ KCustomMenuEditor::load(KConfigBase *cfg)
 }
 
 void
-KCustomMenuEditor::save(KConfigBase *cfg)
+KCustomMenuEditor::save(TDEConfigBase *cfg)
 {
    // First clear the whole config file.
    TQStringList groups = cfg->groupList();
@@ -164,7 +164,7 @@ KCustomMenuEditor::save(KConfigBase *cfg)
    {
       i++;
       TQString path = item->s->desktopEntryPath();
-      if (TQDir::isRelativePath(path) || TQDir::isRelativePath(KGlobal::dirs()->relativeLocation("xdgdata-apps", path)))
+      if (TQDir::isRelativePath(path) || TQDir::isRelativePath(TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path)))
          path = item->s->desktopEntryName();
       cfg->writePathEntry(TQString("Item%1").arg(i), path);
       item = (Item *) item->nextSibling();
diff --git a/kio/kfile/kcustommenueditor.h b/tdeio/tdefile/kcustommenueditor.h
index cc20c6204..cb43c606f 100644
--- a/kio/kfile/kcustommenueditor.h
+++ b/tdeio/tdefile/kcustommenueditor.h
@@ -21,8 +21,8 @@
 
 #include <kdialogbase.h>
 
-class KListView;
-class KConfigBase;
+class TDEListView;
+class TDEConfigBase;
 
  /*
   * Dialog for editing custom menus.
@@ -30,7 +30,7 @@ class KConfigBase;
   * @author Waldo Bastian (bastian@kde.org)
   * @since 3.1
   */
-class KIO_EXPORT KCustomMenuEditor : public KDialogBase
+class TDEIO_EXPORT KCustomMenuEditor : public KDialogBase
 {
     Q_OBJECT
 public:
@@ -42,12 +42,12 @@ public:
     /**
      * load the custom menu
      */
-    void load(KConfigBase *);
+    void load(TDEConfigBase *);
 
     /**
      * save the custom menu
      */
-    void save(KConfigBase *);
+    void save(TDEConfigBase *);
 
 public slots:
     void slotNewItem();
@@ -58,7 +58,7 @@ public slots:
 
 protected:
     class Item;
-    KListView *m_listView;
+    TDEListView *m_listView;
 
     class KCustomMenuEditorPrivate;
     KCustomMenuEditorPrivate *d;
diff --git a/kio/kfile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 4a3613b98..5027f631c 100644
--- a/kio/kfile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -23,27 +23,27 @@
 #include <tqstringlist.h>
 #include <tqvaluestack.h>
 
-#include <kactionclasses.h>
-#include <kapplication.h>
+#include <tdeactionclasses.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
-#include <kfilespeedbar.h>
-#include <kglobalsettings.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
+#include <tdefilespeedbar.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <kshell.h>
 #include <kurl.h>
 #include <kurlcompletion.h>
 #include <kurlpixmapprovider.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
-#include <kio/renamedlg.h>
-#include <kmessagebox.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/renamedlg.h>
+#include <tdemessagebox.h>
 
-#include "kfiletreeview.h"
+#include "tdefiletreeview.h"
 #include "kdirselectdialog.h"
 
 // ### add mutator for treeview!
@@ -122,10 +122,10 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
              TQT_SLOT( slotComboTextChanged( const TQString& ) ));
 
     m_contextMenu = new TQPopupMenu( this );
-    KAction* newFolder = new KAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
+    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
     newFolder->plug(m_contextMenu);
     m_contextMenu->insertSeparator();
-    m_showHiddenFolders = new KToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
+    m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
                                         TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this));
     m_showHiddenFolders->plug(m_contextMenu);
 
@@ -133,7 +133,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
     if ( localOnly && !d->startURL.isLocalFile() )
     {
         d->startURL = KURL();
-        TQString docPath = KGlobalSettings::documentPath();
+        TQString docPath = TDEGlobalSettings::documentPath();
         if (TQDir(docPath).exists())
             d->startURL.setPath( docPath );
         else
@@ -146,15 +146,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
 
     d->branch = createBranch( root );
 
-    readConfig( KGlobal::config(), "DirSelect Dialog" );
+    readConfig( TDEGlobal::config(), "DirSelect Dialog" );
 
     m_mainLayout->addWidget( m_treeView, 1 );
     m_mainLayout->addWidget( d->urlCombo, 0 );
 
     connect( m_treeView, TQT_SIGNAL( currentChanged( TQListViewItem * )),
              TQT_SLOT( slotCurrentChanged() ));
-    connect( m_treeView, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & )),
-             TQT_SLOT( slotContextMenu( KListView *, TQListViewItem *, const TQPoint & )));
+    connect( m_treeView, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )),
+             TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & )));
 
     connect( d->urlCombo, TQT_SIGNAL( activated( const TQString& )),
              TQT_SLOT( slotURLActivated( const TQString& )));
@@ -267,20 +267,20 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item )
     }
 }
 
-void KDirSelectDialog::readConfig( KConfig *config, const TQString& group )
+void KDirSelectDialog::readConfig( TDEConfig *config, const TQString& group )
 {
     d->urlCombo->clear();
 
-    KConfigGroup conf( config, group );
+    TDEConfigGroup conf( config, group );
     d->urlCombo->setHistoryItems( conf.readPathListEntry( "History Items" ));
 
     TQSize defaultSize( 400, 450 );
     resize( conf.readSizeEntry( "DirSelectDialog Size", &defaultSize ));
 }
 
-void KDirSelectDialog::saveConfig( KConfig *config, const TQString& group )
+void KDirSelectDialog::saveConfig( TDEConfig *config, const TQString& group )
 {
-    KConfigGroup conf( config, group );
+    TDEConfigGroup conf( config, group );
     conf.writePathEntry( "History Items", d->urlCombo->historyItems(), ',',
                      true, true);
     conf.writeEntry( "DirSelectDialog Size", size(), true, true );
@@ -307,14 +307,14 @@ void KDirSelectDialog::accept()
         if ( !item->isDir() )
             dir = dir.upURL();
 
-        KRecentDirs::add(d->recentDirClass, dir.url());
+        TDERecentDirs::add(d->recentDirClass, dir.url());
     }
 
     d->urlCombo->addToHistory( item->url().prettyURL() );
     KFileDialog::setStartDir( url() );
 
     KDialogBase::accept();
-    saveConfig( KGlobal::config(), "DirSelect Dialog" );
+    saveConfig( TDEGlobal::config(), "DirSelect Dialog" );
 }
 
 
@@ -395,7 +395,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text )
     }
 }
 
-void KDirSelectDialog::slotContextMenu( KListView *, TQListViewItem *, const TQPoint& pos )
+void KDirSelectDialog::slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint& pos )
 {
     m_contextMenu->popup( pos );
 }
@@ -406,9 +406,9 @@ void KDirSelectDialog::slotMkdir()
     TQString where = url().pathOrURL();
     TQString name = i18n( "New Folder" );
     if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() )
-        name = KIO::RenameDlg::suggestName( url(), name );
+        name = TDEIO::RenameDlg::suggestName( url(), name );
 
-    TQString directory = KIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ),
+    TQString directory = TDEIO::encodeFileName( KInputDialog::getText( i18n( "New Folder" ),
                                          i18n( "Create new folder in:\n%1" ).arg( where ),
                                          name, &ok, this));
     if (!ok)
@@ -425,8 +425,8 @@ void KDirSelectDialog::slotMkdir()
     for ( ; it != dirs.end(); ++it )
     {
         folderurl.addPath( *it );
-        exists = KIO::NetAccess::exists( folderurl, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() );
+        exists = TDEIO::NetAccess::exists( folderurl, false, 0 );
+        writeOk = !exists && TDEIO::NetAccess::mkdir( folderurl, topLevelWidget() );
     }
 
     if ( exists ) // url was already existant
@@ -470,7 +470,7 @@ KURL KDirSelectDialog::selectDirectory( const TQString& startDir,
         myDialog.setCaption( caption );
 
     if ( myDialog.exec() == TQDialog::Accepted )
-        return KIO::NetAccess::mostLocalURL(myDialog.url(),parent);
+        return TDEIO::NetAccess::mostLocalURL(myDialog.url(),parent);
     else
         return KURL();
 }
diff --git a/kio/kfile/kdirselectdialog.h b/tdeio/tdefile/kdirselectdialog.h
index 79358f4f3..400bd3232 100644
--- a/kio/kfile/kdirselectdialog.h
+++ b/tdeio/tdefile/kdirselectdialog.h
@@ -25,18 +25,18 @@
 
 class TQPopupMenu;
 class TQVBoxLayout;
-class KConfig;
+class TDEConfig;
 class KFileTreeBranch;
 class KFileTreeView;
 class KFileTreeViewItem;
-class KToggleAction;
+class TDEToggleAction;
 
 /**
  * A pretty dialog for a KDirSelect control for selecting directories.
  * @author Michael Jarrett <michaelj@corel.com>
  * @see KFileDialog
  */
-class KIO_EXPORT KDirSelectDialog : public KDialogBase
+class TDEIO_EXPORT KDirSelectDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -106,19 +106,19 @@ private slots:
     void slotURLActivated( const TQString& );
     void slotNextDirToList( KFileTreeViewItem *dirItem );
     void slotComboTextChanged( const TQString& text );
-    void slotContextMenu( KListView *, TQListViewItem *, const TQPoint & );
+    void slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & );
     void slotShowHiddenFoldersToggled();
     void slotMkdir();
 
 private:
-    void readConfig( KConfig *config, const TQString& group );
-    void saveConfig( KConfig *config, const TQString& group );
+    void readConfig( TDEConfig *config, const TQString& group );
+    void saveConfig( TDEConfig *config, const TQString& group );
     void openNextDir( KFileTreeViewItem *parent );
     KFileTreeBranch * createBranch( const KURL& url );
 
     KFileTreeView *m_treeView;
     TQPopupMenu *m_contextMenu;
-    KToggleAction *m_showHiddenFolders;
+    TDEToggleAction *m_showHiddenFolders;
     bool m_localOnly;
 
 protected:
diff --git a/kio/kfile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp
index 86dfc756d..b2d48b4bf 100644
--- a/kio/kfile/kdirsize.cpp
+++ b/tdeio/tdefile/kdirsize.cpp
@@ -19,21 +19,21 @@
 
 #include "kdirsize.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqapplication.h>
 #include <tqtimer.h>
-#include <config-kfile.h>
+#include <config-tdefile.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 KDirSize::KDirSize( const KURL & directory )
-    : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L)
+    : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L)
 {
     startNextJob( directory );
 }
 
 KDirSize::KDirSize( const KFileItemList & lstItems )
-    : KIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems)
+    : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems)
 {
     TQTimer::singleShot( 0, this, TQT_SLOT(processList()) );
 }
@@ -48,7 +48,7 @@ void KDirSize::processList()
 	{
             if ( item->isDir() )
             {
-                kdDebug(kfile_area) << "KDirSize::processList dir -> listing" << endl;
+                kdDebug(tdefile_area) << "KDirSize::processList dir -> listing" << endl;
                 KURL url = item->url();
                 startNextJob( url );
                 return; // we'll come back later, when this one's finished
@@ -57,11 +57,11 @@ void KDirSize::processList()
             {
                 m_totalSize += item->size();
 // no long long with kdDebug()
-//            kdDebug(kfile_area) << "KDirSize::processList file -> " << m_totalSize << endl;
+//            kdDebug(tdefile_area) << "KDirSize::processList file -> " << m_totalSize << endl;
             }
 	}
     }
-    kdDebug(kfile_area) << "KDirSize::processList finished" << endl;
+    kdDebug(tdefile_area) << "KDirSize::processList finished" << endl;
     if ( !m_bAsync )
         tqApp->exit_loop();
     emitResult();
@@ -69,38 +69,38 @@ void KDirSize::processList()
 
 void KDirSize::startNextJob( const KURL & url )
 {
-    KIO::ListJob * listJob = KIO::listRecursive( url, false /* no GUI */ );
-    connect( listJob, TQT_SIGNAL(entries( KIO::Job *,
-                                      const KIO::UDSEntryList& )),
-             TQT_SLOT( slotEntries( KIO::Job*,
-                                const KIO::UDSEntryList& )));
+    TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ );
+    connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *,
+                                      const TDEIO::UDSEntryList& )),
+             TQT_SLOT( slotEntries( TDEIO::Job*,
+                                const TDEIO::UDSEntryList& )));
     addSubjob( listJob );
 }
 
-void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
+void KDirSize::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
 {
-    static const TQString& dot = KGlobal::staticQString( "." );
-    static const TQString& dotdot = KGlobal::staticQString( ".." );
-    KIO::UDSEntryListConstIterator it = list.begin();
-    KIO::UDSEntryListConstIterator end = list.end();
+    static const TQString& dot = TDEGlobal::staticQString( "." );
+    static const TQString& dotdot = TDEGlobal::staticQString( ".." );
+    TDEIO::UDSEntryListConstIterator it = list.begin();
+    TDEIO::UDSEntryListConstIterator end = list.end();
     for (; it != end; ++it) {
-        KIO::UDSEntry::ConstIterator it2 = (*it).begin();
-        KIO::filesize_t size = 0;
+        TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
+        TDEIO::filesize_t size = 0;
         bool isLink = false;
         bool isDir = false;
         TQString name;
         for( ; it2 != (*it).end(); it2++ ) {
           switch( (*it2).m_uds ) {
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
               name = (*it2).m_str;
               break;
-            case KIO::UDS_LINK_DEST:
+            case TDEIO::UDS_LINK_DEST:
               isLink = !(*it2).m_str.isEmpty();
               break;
-            case KIO::UDS_SIZE:
+            case TDEIO::UDS_SIZE:
               size = ((*it2).m_long);
               break;
-            case KIO::UDS_FILE_TYPE:
+            case TDEIO::UDS_FILE_TYPE:
               isDir = S_ISDIR((*it2).m_long);
               break;
             default:
@@ -117,7 +117,7 @@ void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
               m_totalFiles++;
             else
               m_totalSubdirs++;
-            //kdDebug(kfile_area) << name << ":" << size << endl;
+            //kdDebug(tdefile_area) << name << ":" << size << endl;
         }
     }
 }
@@ -135,7 +135,7 @@ KDirSize * KDirSize::dirSizeJob( const KFileItemList & lstItems )
 }
 
 //static
-KIO::filesize_t KDirSize::dirSize( const KURL & directory )
+TDEIO::filesize_t KDirSize::dirSize( const KURL & directory )
 {
     KDirSize * dirSize = dirSizeJob( directory );
     dirSize->setSync();
@@ -144,9 +144,9 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory )
 }
 
 
-void KDirSize::slotResult( KIO::Job * job )
+void KDirSize::slotResult( TDEIO::Job * job )
 {
-    kdDebug(kfile_area) << " KDirSize::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
+    kdDebug(tdefile_area) << " KDirSize::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
     if ( !m_lstItems.isEmpty() )
     {
         subjobs.remove(job); // Remove job, but don't kill this job.
@@ -156,11 +156,11 @@ void KDirSize::slotResult( KIO::Job * job )
     {
         if ( !m_bAsync )
             tqApp->exit_loop();
-        KIO::Job::slotResult( job );
+        TDEIO::Job::slotResult( job );
     }
 }
 
 void KDirSize::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
 
 #include "kdirsize.moc"
diff --git a/kio/kfile/kdirsize.h b/tdeio/tdefile/kdirsize.h
index 64ae80765..210080950 100644
--- a/kio/kfile/kdirsize.h
+++ b/tdeio/tdefile/kdirsize.h
@@ -20,14 +20,14 @@
 #ifndef __KDIRSIZE_H
 #define __KDIRSIZE_H
 
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 
 /**
  * Computes a directory size (similar to "du", but doesn't give the same results
  * since we simply sum up the dir and file sizes, whereas du speaks disk blocks)
  */
-class KIO_EXPORT KDirSize : public KIO::Job
+class TDEIO_EXPORT KDirSize : public TDEIO::Job
 {
   Q_OBJECT
 protected:
@@ -39,14 +39,14 @@ public:
   /**
    * @return the size we found
    */
-  KIO::filesize_t totalSize() const { return m_totalSize; }
+  TDEIO::filesize_t totalSize() const { return m_totalSize; }
 
   /**
    * @return the total number of files (counting symlinks to files, sockets
    * and character devices as files) in this directory and all sub-directories
    * @since 3.3
    */
-  KIO::filesize_t totalFiles() const { return m_totalFiles; }
+  TDEIO::filesize_t totalFiles() const { return m_totalFiles; }
 
   /**
    * @return the total number of sub-directories found (not including the
@@ -54,7 +54,7 @@ public:
    * as directories)
    * @since 3.3
    */
-  KIO::filesize_t totalSubdirs() const { return m_totalSubdirs; }
+  TDEIO::filesize_t totalSubdirs() const { return m_totalSubdirs; }
 
   /**
    * Asynchronous method. Connect to the result signal.
@@ -75,7 +75,7 @@ public:
    * Synchronous method - you get the result as soon as
    * the call returns.
    */
-  static KIO::filesize_t dirSize( const KURL & directory );
+  static TDEIO::filesize_t dirSize( const KURL & directory );
 
 protected:
   /**
@@ -87,15 +87,15 @@ protected:
 
 protected slots:
 
-  virtual void slotResult( KIO::Job *job );
-  void slotEntries( KIO::Job * , const KIO::UDSEntryList &);
+  virtual void slotResult( TDEIO::Job *job );
+  void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList &);
   void processList();
 
 private:
   bool m_bAsync;
-  KIO::filesize_t m_totalSize;
-  KIO::filesize_t m_totalFiles;
-  KIO::filesize_t m_totalSubdirs;
+  TDEIO::filesize_t m_totalSize;
+  TDEIO::filesize_t m_totalFiles;
+  TDEIO::filesize_t m_totalSubdirs;
   KFileItemList m_lstItems;
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/kio/kfile/kdiskfreesp.cpp b/tdeio/tdefile/kdiskfreesp.cpp
index 1e9d3a130..9a6959fdd 100644
--- a/kio/kfile/kdiskfreesp.cpp
+++ b/tdeio/tdefile/kdiskfreesp.cpp
@@ -28,8 +28,8 @@
 
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kio/global.h>
-#include <config-kfile.h>
+#include <tdeio/global.h>
+#include <config-tdefile.h>
 
 #include "kdiskfreesp.moc"
 
@@ -46,11 +46,11 @@
 KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name)
     : TQObject(parent,name)
 {
-    dfProc = new KProcess(); TQ_CHECK_PTR(dfProc);
+    dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc);
     dfProc->setEnvironment("LANGUAGE", "C");
-    connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ),
-             this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) );
-    connect(dfProc,TQT_SIGNAL(processExited(KProcess *) ),
+    connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
+             this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) );
+    connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ),
             this, TQT_SLOT(dfDone() ) );
 
     readingDFStdErrOut=false;
@@ -68,7 +68,7 @@ KDiskFreeSp::~KDiskFreeSp()
 /***************************************************************************
   * is called, when the df-command writes on StdOut
 **/
-void KDiskFreeSp::receivedDFStdErrOut(KProcess *, char *data, int len)
+void KDiskFreeSp::receivedDFStdErrOut(TDEProcess *, char *data, int len)
 {
   TQCString tmp(data,len+1);  // adds a zero-byte
   dfStringErrOut.append(tmp);
@@ -85,7 +85,7 @@ int KDiskFreeSp::readDF( const TQString & mountPoint )
   dfStringErrOut=""; // yet no data received
   dfProc->clearArguments();
   (*dfProc) << TQString::fromLocal8Bit(DF_COMMAND) << TQString::fromLocal8Bit(DF_ARGS);
-  if (!dfProc->start( KProcess::NotifyOnExit, KProcess::AllOutput ))
+  if (!dfProc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ))
      kdError() << "could not execute ["<< DF_COMMAND << "]" << endl;
   return 1;
 }
@@ -107,21 +107,21 @@ void KDiskFreeSp::dfDone()
     s=t.readLine();
     s=s.simplifyWhiteSpace();
     if ( !s.isEmpty() ) {
-      //kdDebug(kfile_area) << "GOT: [" << s << "]" << endl;
+      //kdDebug(tdefile_area) << "GOT: [" << s << "]" << endl;
 
       if (s.find(BLANK)<0)      // devicename was too long, rest in next line
 	if ( !t.eof() ) {       // just appends the next line
             v=t.readLine();
             s=s.append(v);
             s=s.simplifyWhiteSpace();
-            //kdDebug(kfile_area) << "SPECIAL GOT: [" << s << "]" << endl;
+            //kdDebug(tdefile_area) << "SPECIAL GOT: [" << s << "]" << endl;
 	 }//if silly linefeed
 
-      //kdDebug(kfile_area) << "[" << s << "]" << endl;
+      //kdDebug(tdefile_area) << "[" << s << "]" << endl;
 
       //TQString deviceName = s.left(s.find(BLANK));
       s=s.remove(0,s.find(BLANK)+1 );
-      //kdDebug(kfile_area) << "    DeviceName:    [" << deviceName << "]" << endl;
+      //kdDebug(tdefile_area) << "    DeviceName:    [" << deviceName << "]" << endl;
 
       if (!NO_FS_TYPE)
           s=s.remove(0,s.find(BLANK)+1 ); // eat fs type
@@ -129,26 +129,26 @@ void KDiskFreeSp::dfDone()
       u=s.left(s.find(BLANK));
       unsigned long kBSize = u.toULong();
       s=s.remove(0,s.find(BLANK)+1 );
-      //kdDebug(kfile_area) << "    Size:       [" << kBSize << "]" << endl;
+      //kdDebug(tdefile_area) << "    Size:       [" << kBSize << "]" << endl;
 
       u=s.left(s.find(BLANK));
       unsigned long kBUsed = u.toULong();
       s=s.remove(0,s.find(BLANK)+1 );
-      //kdDebug(kfile_area) << "    Used:       [" << kBUsed << "]" << endl;
+      //kdDebug(tdefile_area) << "    Used:       [" << kBUsed << "]" << endl;
 
       u=s.left(s.find(BLANK));
       unsigned long kBAvail = u.toULong();
       s=s.remove(0,s.find(BLANK)+1 );
-      //kdDebug(kfile_area) << "    Avail:       [" << kBAvail << "]" << endl;
+      //kdDebug(tdefile_area) << "    Avail:       [" << kBAvail << "]" << endl;
 
 
       s=s.remove(0,s.find(BLANK)+1 );  // delete the capacity 94%
       TQString mountPoint = s.stripWhiteSpace();
-      //kdDebug(kfile_area) << "    MountPoint:       [" << mountPoint << "]" << endl;
+      //kdDebug(tdefile_area) << "    MountPoint:       [" << mountPoint << "]" << endl;
 
       if ( mountPoint == m_mountPoint )
       {
-        //kdDebug(kfile_area) << "Found mount point. Emitting" << endl;
+        //kdDebug(tdefile_area) << "Found mount point. Emitting" << endl;
         emit foundMountPoint( mountPoint, kBSize, kBUsed, kBAvail );
         emit foundMountPoint( kBSize, kBUsed, kBAvail, mountPoint ); // sic!
       }
@@ -163,7 +163,7 @@ void KDiskFreeSp::dfDone()
 KDiskFreeSp * KDiskFreeSp::findUsageInfo( const TQString & path )
 {
     KDiskFreeSp * job = new KDiskFreeSp;
-    TQString mountPoint = KIO::findPathMountPoint( path );
+    TQString mountPoint = TDEIO::findPathMountPoint( path );
     job->readDF( mountPoint );
     return job;
 }
diff --git a/kio/kfile/kdiskfreesp.h b/tdeio/tdefile/kdiskfreesp.h
index b7286f2df..5ffa47d9a 100644
--- a/kio/kfile/kdiskfreesp.h
+++ b/tdeio/tdefile/kdiskfreesp.h
@@ -31,13 +31,13 @@
 
 #include <tdelibs_export.h>
 
-class KProcess;
+class TDEProcess;
 
 /**
  * This class parses the output of "df" to find the disk usage
  * information for a given partition (mount point).
  */
-class KIO_EXPORT KDiskFreeSp : public TQObject
+class TDEIO_EXPORT KDiskFreeSp : public TQObject
 {  Q_OBJECT
 public:
    KDiskFreeSp( TQObject *parent=0, const char *name=0 );
@@ -72,11 +72,11 @@ signals:
    void done();
 
 private slots:
-   void receivedDFStdErrOut(KProcess *, char *data, int len);
+   void receivedDFStdErrOut(TDEProcess *, char *data, int len);
    void dfDone();
 
 private:
-  KProcess         *dfProc;
+  TDEProcess         *dfProc;
   TQCString          dfStringErrOut;
   TQString           m_mountPoint;
   bool              readingDFStdErrOut;
diff --git a/kio/kfile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index 396006504..d2d588a4e 100644
--- a/kio/kfile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -19,17 +19,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "config-kfile.h"
+#include "config-tdefile.h"
 
 #include "kencodingfiledialog.h"
 #include <kcombobox.h>
-#include <ktoolbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdetoolbar.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
-#include <kdiroperator.h>
-#include <krecentdocument.h>
+#include <tdediroperator.h>
+#include <tderecentdocument.h>
 
 struct KEncodingFileDialogPrivate
 {
@@ -44,7 +44,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin
   
   setOperationMode( type );
     
-  KToolBar *tb = toolBar();
+  TDEToolBar *tb = toolBar();
   tb->insertSeparator();
   int index = tb->insertCombo(TQStringList(), -1 /*id*/, false /*writable*/, 0 /*signal*/, 0 /*receiver*/, 0 /*slot*/ );
   d->encoding = tb->getCombo( tb->idAt( index ) );
@@ -54,14 +54,14 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin
   d->encoding->clear ();
   TQString sEncoding = encoding;
   if (sEncoding.isEmpty())
-     sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+     sEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding());
   
-  TQStringList encodings (KGlobal::charsets()->availableEncodingNames());
+  TQStringList encodings (TDEGlobal::charsets()->availableEncodingNames());
   int insert = 0;
   for (uint i=0; i < encodings.count(); i++)
   {
     bool found = false;
-    TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encodings[i], found);
+    TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(encodings[i], found);
 
     if (found)
     {
@@ -180,7 +180,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveFileNameAndEncoding(cons
 
     TQString filename = dlg.selectedFile();
     if (!filename.isEmpty())
-        KRecentDocument::add(filename);
+        TDERecentDocument::add(filename);
 
     Result res;
     res.fileNames<<filename;
@@ -204,7 +204,7 @@ KEncodingFileDialog::Result  KEncodingFileDialog::getSaveURLAndEncoding(const TQ
 
     KURL url = dlg.selectedURL();
     if (url.isValid())
-        KRecentDocument::add( url );
+        TDERecentDocument::add( url );
 
     Result res;
     res.URLs<<url;
diff --git a/kio/kfile/kencodingfiledialog.h b/tdeio/tdefile/kencodingfiledialog.h
index 15b44f9c3..8659122fb 100644
--- a/kio/kfile/kencodingfiledialog.h
+++ b/tdeio/tdefile/kencodingfiledialog.h
@@ -22,7 +22,7 @@
 #ifndef __KENCODINGFILEDIALOG_H__
 #define __KENCODINGFILEDIALOG_H__
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 struct KEncodingFileDialogPrivate;
 
@@ -36,7 +36,7 @@ struct KEncodingFileDialogPrivate;
  * can easily add children that will be incorporated into the layout.
  */
 
-class KIO_EXPORT KEncodingFileDialog : public KFileDialog
+class TDEIO_EXPORT KEncodingFileDialog : public KFileDialog
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index 3d0b6be8f..154f9e89d 100644
--- a/kio/kfile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -1,6 +1,6 @@
 /* vi: ts=8 sts=4 sw=4
  *
- * This file is part of the KDE project, module kfile.
+ * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
  *           (C) 2000 Kurt Granroth <granroth@kde.org>
  *           (C) 1997 Christoph Neerfeld <chris@kde.org>
@@ -19,14 +19,14 @@
 
 #include <kiconviewsearchline.h>
 
-#include <kapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kprogress.h>
 #include <kiconview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 
 #include <tqlayout.h>
@@ -49,11 +49,11 @@
 #include <svgicons/ksvgiconpainter.h>
 #endif
 
-class KIconCanvas::KIconCanvasPrivate
+class TDEIconCanvas::TDEIconCanvasPrivate
 {
   public:
-    KIconCanvasPrivate() { m_bLoading = false; }
-    ~KIconCanvasPrivate() {}
+    TDEIconCanvasPrivate() { m_bLoading = false; }
+    ~TDEIconCanvasPrivate() {}
     bool m_bLoading;
 };
 
@@ -85,13 +85,13 @@ public:
 };
 
 /*
- * KIconCanvas: Iconview for the iconloader dialog.
+ * TDEIconCanvas: Iconview for the iconloader dialog.
  */
 
-KIconCanvas::KIconCanvas(TQWidget *parent, const char *name)
-    : KIconView(parent, name)
+TDEIconCanvas::TDEIconCanvas(TQWidget *parent, const char *name)
+    : TDEIconView(parent, name)
 {
-    d = new KIconCanvasPrivate;
+    d = new TDEIconCanvasPrivate;
     mpTimer = new TQTimer(this);
     connect(mpTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotLoadFiles()));
     connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)),
@@ -101,13 +101,13 @@ KIconCanvas::KIconCanvas(TQWidget *parent, const char *name)
     setShowToolTips(true);
 }
 
-KIconCanvas::~KIconCanvas()
+TDEIconCanvas::~TDEIconCanvas()
 {
     delete mpTimer;
     delete d;
 }
 
-void KIconCanvas::loadFiles(const TQStringList& files)
+void TDEIconCanvas::loadFiles(const TQStringList& files)
 {
     clear();
     mFiles = files;
@@ -116,7 +116,7 @@ void KIconCanvas::loadFiles(const TQStringList& files)
     d->m_bLoading = false;
 }
 
-void KIconCanvas::slotLoadFiles()
+void TDEIconCanvas::slotLoadFiles()
 {
     setResizeMode(Fixed);
     TQApplication::setOverrideCursor(tqwaitCursor);
@@ -199,67 +199,67 @@ void KIconCanvas::slotLoadFiles()
     setResizeMode(Adjust);
 }
 
-TQString KIconCanvas::getCurrent() const
+TQString TDEIconCanvas::getCurrent() const
 {
     if (!currentItem())
 	return TQString::null;
     return currentItem()->key();
 }
 
-void KIconCanvas::stopLoading()
+void TDEIconCanvas::stopLoading()
 {
     d->m_bLoading = false;
 }
 
-void KIconCanvas::slotCurrentChanged(TQIconViewItem *item)
+void TDEIconCanvas::slotCurrentChanged(TQIconViewItem *item)
 {
     emit nameChanged((item != 0L) ? item->text() : TQString::null);
 }
 
-class KIconDialog::KIconDialogPrivate
+class TDEIconDialog::TDEIconDialogPrivate
 {
   public:
-    KIconDialogPrivate() {
+    TDEIconDialogPrivate() {
         m_bStrictIconSize = true;
 	m_bLockUser = false;
 	m_bLockCustomDir = false;
 	searchLine = 0;
     }
-    ~KIconDialogPrivate() {}
+    ~TDEIconDialogPrivate() {}
     bool m_bStrictIconSize, m_bLockUser, m_bLockCustomDir;
     TQString custom;
     TQString customLocation;
-    KIconViewSearchLine *searchLine;
+    TDEIconViewSearchLine *searchLine;
 };
 
 /*
- * KIconDialog: Dialog for selecting icons. Both system and user
+ * TDEIconDialog: Dialog for selecting icons. Both system and user
  * specified icons can be chosen.
  */
 
-KIconDialog::KIconDialog(TQWidget *parent, const char *name)
+TDEIconDialog::TDEIconDialog(TQWidget *parent, const char *name)
     : KDialogBase(parent, name, true, i18n("Select Icon"), Ok|Cancel, Ok)
 {
-    d = new KIconDialogPrivate;
-    mpLoader = KGlobal::iconLoader();
+    d = new TDEIconDialogPrivate;
+    mpLoader = TDEGlobal::iconLoader();
     init();
 }
 
-KIconDialog::KIconDialog(KIconLoader *loader, TQWidget *parent,
+TDEIconDialog::TDEIconDialog(TDEIconLoader *loader, TQWidget *parent,
 	const char *name)
     : KDialogBase(parent, name, true, i18n("Select Icon"), Ok|Cancel, Ok)
 {
-    d = new KIconDialogPrivate;
+    d = new TDEIconDialogPrivate;
     mpLoader = loader;
     init();
 }
 
-void KIconDialog::init()
+void TDEIconDialog::init()
 {
-    mGroupOrSize = KIcon::Desktop;
-    mContext = KIcon::Any;
+    mGroupOrSize = TDEIcon::Desktop;
+    mContext = TDEIcon::Any;
     mType = 0;
-    mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png"));
+    mFileList = TDEGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png"));
 
     TQWidget *main = new TQWidget( this );
     setMainWidget(main);
@@ -297,7 +297,7 @@ void KIconDialog::init()
     TQLabel *searchLabel = new TQLabel(i18n("&Search:"), main);
     searchLayout->addWidget(searchLabel);
 
-    d->searchLine = new KIconViewSearchLine(main, "searchLine");
+    d->searchLine = new TDEIconViewSearchLine(main, "searchLine");
     searchLayout->addWidget(d->searchLine);
     searchLabel->setBuddy(d->searchLine);
 
@@ -310,7 +310,7 @@ void KIconDialog::init()
     TQWhatsThis::add(d->searchLine, wtstr);
 
 
-    mpCanvas = new KIconCanvas(main);
+    mpCanvas = new TDEIconCanvas(main);
     connect(mpCanvas, TQT_SIGNAL(executed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons()));
     connect(mpCanvas, TQT_SIGNAL(returnPressed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons()));
     mpCanvas->setMinimumSize(400, 125);
@@ -339,19 +339,19 @@ void KIconDialog::init()
         I18N_NOOP( "Mimetypes" ),
         I18N_NOOP( "Places" ),
         I18N_NOOP( "Status" ) };
-    static const KIcon::Context context_id[] = {
-        KIcon::Action,
-        KIcon::Animation,
-        KIcon::Application,
-        KIcon::Category,
-        KIcon::Device,
-        KIcon::Emblem,
-        KIcon::Emote,
-        KIcon::FileSystem,
-        KIcon::International,
-        KIcon::MimeType,
-        KIcon::Place,
-        KIcon::StatusIcon };
+    static const TDEIcon::Context context_id[] = {
+        TDEIcon::Action,
+        TDEIcon::Animation,
+        TDEIcon::Application,
+        TDEIcon::Category,
+        TDEIcon::Device,
+        TDEIcon::Emblem,
+        TDEIcon::Emote,
+        TDEIcon::FileSystem,
+        TDEIcon::International,
+        TDEIcon::MimeType,
+        TDEIcon::Place,
+        TDEIcon::StatusIcon };
     mNumContext = 0;
     int cnt = sizeof( context_text ) / sizeof( context_text[ 0 ] );
     // check all 3 arrays have same sizes
@@ -376,18 +376,18 @@ void KIconDialog::init()
 }
 
 
-KIconDialog::~KIconDialog()
+TDEIconDialog::~TDEIconDialog()
 {
     delete d;
 }
 
-void KIconDialog::slotAcceptIcons()
+void TDEIconDialog::slotAcceptIcons()
 {
   d->custom=TQString::null;
   slotOk();
 }
 
-void KIconDialog::showIcons()
+void TDEIconDialog::showIcons()
 {
     mpCanvas->clear();
     TQStringList filelist;
@@ -417,40 +417,40 @@ void KIconDialog::showIcons()
     mpCanvas->loadFiles(filelist);
 }
 
-void KIconDialog::setStrictIconSize(bool b)
+void TDEIconDialog::setStrictIconSize(bool b)
 {
     d->m_bStrictIconSize=b;
 }
 
-bool KIconDialog::strictIconSize() const
+bool TDEIconDialog::strictIconSize() const
 {
     return d->m_bStrictIconSize;
 }
 
-void KIconDialog::setIconSize( int size )
+void TDEIconDialog::setIconSize( int size )
 {
-    // see KIconLoader, if you think this is weird
+    // see TDEIconLoader, if you think this is weird
     if ( size == 0 )
-        mGroupOrSize = KIcon::Desktop; // default Group
+        mGroupOrSize = TDEIcon::Desktop; // default Group
     else
-        mGroupOrSize = -size; // yes, KIconLoader::queryIconsByContext is weird
+        mGroupOrSize = -size; // yes, TDEIconLoader::queryIconsByContext is weird
 }
 
-int KIconDialog::iconSize() const
+int TDEIconDialog::iconSize() const
 {
     // 0 or any other value ==> mGroupOrSize is a group, so we return 0
     return (mGroupOrSize < 0) ? -mGroupOrSize : 0;
 }
 
 #ifndef KDE_NO_COMPAT
-TQString KIconDialog::selectIcon(KIcon::Group group, KIcon::Context context, bool user)
+TQString TDEIconDialog::selectIcon(TDEIcon::Group group, TDEIcon::Context context, bool user)
 {
     setup( group, context, false, 0, user );
     return openDialog();
 }
 #endif
 
-void KIconDialog::setup(KIcon::Group group, KIcon::Context context,
+void TDEIconDialog::setup(TDEIcon::Group group, TDEIcon::Context context,
                         bool strictIconSize, int iconSize, bool user )
 {
     d->m_bStrictIconSize = strictIconSize;
@@ -463,7 +463,7 @@ void KIconDialog::setup(KIcon::Group group, KIcon::Context context,
     setContext( context );
 }
 
-void KIconDialog::setup(KIcon::Group group, KIcon::Context context,
+void TDEIconDialog::setup(TDEIcon::Group group, TDEIcon::Context context,
                         bool strictIconSize, int iconSize, bool user,
                         bool lockUser, bool lockCustomDir )
 {
@@ -481,7 +481,7 @@ void KIconDialog::setup(KIcon::Group group, KIcon::Context context,
     setContext( context );
 }
 
-void KIconDialog::setContext( KIcon::Context context )
+void TDEIconDialog::setContext( TDEIcon::Context context )
 {
     mContext = context;
     for( int i = 0;
@@ -494,12 +494,12 @@ void KIconDialog::setContext( KIcon::Context context )
         }
 }
 
-void KIconDialog::setCustomLocation( const TQString& location )
+void TDEIconDialog::setCustomLocation( const TQString& location )
 {
     d->customLocation = location;
 }
 
-TQString KIconDialog::openDialog()
+TQString TDEIconDialog::openDialog()
 {
     showIcons();
 
@@ -516,14 +516,14 @@ TQString KIconDialog::openDialog()
     return TQString::null;
 }
 
-void KIconDialog::showDialog()
+void TDEIconDialog::showDialog()
 {
     setModal(false);
     showIcons();
     show();
 }
 
-void KIconDialog::slotOk()
+void TDEIconDialog::slotOk()
 {
     TQString name;
     if (!d->custom.isNull())
@@ -544,11 +544,11 @@ void KIconDialog::slotOk()
     KDialogBase::slotOk();
 }
 
-TQString KIconDialog::getIcon(KIcon::Group group, KIcon::Context context,
+TQString TDEIconDialog::getIcon(TDEIcon::Group group, TDEIcon::Context context,
                              bool strictIconSize, int iconSize, bool user,
                              TQWidget *parent, const TQString &caption)
 {
-    KIconDialog dlg(parent, "icon dialog");
+    TDEIconDialog dlg(parent, "icon dialog");
     dlg.setup( group, context, strictIconSize, iconSize, user );
     if (!caption.isNull())
         dlg.setCaption(caption);
@@ -556,7 +556,7 @@ TQString KIconDialog::getIcon(KIcon::Group group, KIcon::Context context,
     return dlg.openDialog();
 }
 
-void KIconDialog::slotButtonClicked(int id)
+void TDEIconDialog::slotButtonClicked(int id)
 {
     TQString file;
 
@@ -609,13 +609,13 @@ void KIconDialog::slotButtonClicked(int id)
     }
 }
 
-void KIconDialog::slotContext(int id)
+void TDEIconDialog::slotContext(int id)
 {
-    mContext = static_cast<KIcon::Context>( mContextMap[ id ] );
+    mContext = static_cast<TDEIcon::Context>( mContextMap[ id ] );
     showIcons();
 }
 
-void KIconDialog::slotStartLoading(int steps)
+void TDEIconDialog::slotStartLoading(int steps)
 {
     if (steps < 10)
 	mpProgress->hide();
@@ -627,7 +627,7 @@ void KIconDialog::slotStartLoading(int steps)
     }
 }
 
-void KIconDialog::slotProgress(int p)
+void TDEIconDialog::slotProgress(int p)
 {
     mpProgress->setProgress(p);
     // commented out the following since setProgress already paints ther
@@ -635,46 +635,46 @@ void KIconDialog::slotProgress(int p)
     //mpProgress->repaint();
 }
 
-void KIconDialog::slotFinished()
+void TDEIconDialog::slotFinished()
 {
     mpProgress->hide();
 }
 
-class KIconButton::KIconButtonPrivate
+class TDEIconButton::TDEIconButtonPrivate
 {
   public:
-    KIconButtonPrivate() {
+    TDEIconButtonPrivate() {
         m_bStrictIconSize = false;
-        iconSize = 0; // let KIconLoader choose the default
+        iconSize = 0; // let TDEIconLoader choose the default
     }
-    ~KIconButtonPrivate() {}
+    ~TDEIconButtonPrivate() {}
     bool m_bStrictIconSize;
     int iconSize;
 };
 
 
 /*
- * KIconButton: A "choose icon" pushbutton.
+ * TDEIconButton: A "choose icon" pushbutton.
  */
 
-KIconButton::KIconButton(TQWidget *parent, const char *name)
+TDEIconButton::TDEIconButton(TQWidget *parent, const char *name)
     : TQPushButton(parent, name)
 {
-    init( KGlobal::iconLoader() );
+    init( TDEGlobal::iconLoader() );
 }
 
-KIconButton::KIconButton(KIconLoader *loader,
+TDEIconButton::TDEIconButton(TDEIconLoader *loader,
 	TQWidget *parent, const char *name)
     : TQPushButton(parent, name)
 {
     init( loader );
 }
 
-void KIconButton::init( KIconLoader *loader )
+void TDEIconButton::init( TDEIconLoader *loader )
 {
-    d = new KIconButtonPrivate;
-    mGroup = KIcon::Desktop;
-    mContext = KIcon::Application;
+    d = new TDEIconButtonPrivate;
+    mGroup = TDEIcon::Desktop;
+    mContext = TDEIcon::Application;
     mbUser = false;
 
     mpLoader = loader;
@@ -682,47 +682,47 @@ void KIconButton::init( KIconLoader *loader )
     connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeIcon()));
 }
 
-KIconButton::~KIconButton()
+TDEIconButton::~TDEIconButton()
 {
     delete mpDialog;
     delete d;
 }
 
-void KIconButton::setStrictIconSize(bool b)
+void TDEIconButton::setStrictIconSize(bool b)
 {
     d->m_bStrictIconSize=b;
 }
 
-bool KIconButton::strictIconSize() const
+bool TDEIconButton::strictIconSize() const
 {
     return d->m_bStrictIconSize;
 }
 
-void KIconButton::setIconSize( int size )
+void TDEIconButton::setIconSize( int size )
 {
     d->iconSize = size;
 }
 
-int KIconButton::iconSize() const
+int TDEIconButton::iconSize() const
 {
     return d->iconSize;
 }
 
-void KIconButton::setIconType(KIcon::Group group, KIcon::Context context, bool user)
+void TDEIconButton::setIconType(TDEIcon::Group group, TDEIcon::Context context, bool user)
 {
     mGroup = group;
     mContext = context;
     mbUser = user;
 }
 
-void KIconButton::setIcon(const TQString& icon)
+void TDEIconButton::setIcon(const TQString& icon)
 {
     mIcon = icon;
     setIconSet(mpLoader->loadIconSet(mIcon, mGroup, d->iconSize));
 
     if (!mpDialog)
     {
-        mpDialog = new KIconDialog(mpLoader, this);
+        mpDialog = new TDEIconDialog(mpLoader, this);
         connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&)));
     }
 
@@ -730,17 +730,17 @@ void KIconButton::setIcon(const TQString& icon)
       mpDialog->setCustomLocation( TQFileInfo( mpLoader->iconPath(mIcon, mGroup, true) ).dirPath( true ) );
 }
 
-void KIconButton::resetIcon()
+void TDEIconButton::resetIcon()
 {
     mIcon = TQString::null;
     setIconSet(TQIconSet());
 }
 
-void KIconButton::slotChangeIcon()
+void TDEIconButton::slotChangeIcon()
 {
     if (!mpDialog)
     {
-        mpDialog = new KIconDialog(mpLoader, this);
+        mpDialog = new TDEIconDialog(mpLoader, this);
         connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&)));
     }
 
@@ -748,7 +748,7 @@ void KIconButton::slotChangeIcon()
     mpDialog->showDialog();
 }
 
-void KIconButton::newIconName(const TQString& name)
+void TDEIconButton::newIconName(const TQString& name)
 {
     if (name.isEmpty())
         return;
@@ -763,10 +763,10 @@ void KIconButton::newIconName(const TQString& name)
     emit iconChanged(name);
 }
 
-void KIconCanvas::virtual_hook( int id, void* data )
-{ KIconView::virtual_hook( id, data ); }
+void TDEIconCanvas::virtual_hook( int id, void* data )
+{ TDEIconView::virtual_hook( id, data ); }
 
-void KIconDialog::virtual_hook( int id, void* data )
+void TDEIconDialog::virtual_hook( int id, void* data )
 { KDialogBase::virtual_hook( id, data ); }
 
 #include "kicondialog.moc"
diff --git a/kio/kfile/kicondialog.h b/tdeio/tdefile/kicondialog.h
index e533f6800..351de929d 100644
--- a/kio/kfile/kicondialog.h
+++ b/tdeio/tdefile/kicondialog.h
@@ -1,6 +1,6 @@
 /* vi: ts=8 sts=4 sw=4
  *
- * This file is part of the KDE project, module kfile.
+ * This file is part of the KDE project, module tdefile.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
  *           (C) 2000 Kurt Granroth <granroth@kde.org>
  *           (C) 1997 Christoph Neerfeld <chris@kde.org>
@@ -11,8 +11,8 @@
  * exact licensing terms.
  */
 
-#ifndef __KIconDialog_h__
-#define __KIconDialog_h__
+#ifndef __TDEIconDialog_h__
+#define __TDEIconDialog_h__
 
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -27,18 +27,18 @@ class TQTimer;
 class TQKeyEvent;
 class TQRadioButton;
 class KProgress;
-class KIconLoader;
+class TDEIconLoader;
 
 /**
- * Icon canvas for KIconDialog.
+ * Icon canvas for TDEIconDialog.
  */
-class KIO_EXPORT KIconCanvas: public KIconView
+class TDEIO_EXPORT TDEIconCanvas: public TDEIconView
 {
     Q_OBJECT
 
 public:
-    KIconCanvas(TQWidget *parent=0L, const char *name=0L);
-    ~KIconCanvas();
+    TDEIconCanvas(TQWidget *parent=0L, const char *name=0L);
+    ~TDEIconCanvas();
 
     /**
      * Load icons into the canvas.
@@ -71,14 +71,14 @@ private slots:
 private:
     TQStringList mFiles;
     TQTimer *mpTimer;
-    KIconLoader *mpLoader; // unused
+    TDEIconLoader *mpLoader; // unused
 
 protected:
     virtual void virtual_hook( int id, void* data );
 
 private:
-    class KIconCanvasPrivate;
-    KIconCanvasPrivate *d;
+    class TDEIconCanvasPrivate;
+    TDEIconCanvasPrivate *d;
 };
 
 
@@ -88,7 +88,7 @@ private:
  *
  * @short An icon selection dialog.
  */
-class KIO_EXPORT KIconDialog: public KDialogBase
+class TDEIO_EXPORT TDEIconDialog: public KDialogBase
 {
     Q_OBJECT
 
@@ -96,16 +96,16 @@ public:
     /**
      * Constructs an icon selection dialog using the global iconloader.
      */
-    KIconDialog(TQWidget *parent=0L, const char *name=0L);
+    TDEIconDialog(TQWidget *parent=0L, const char *name=0L);
     /**
      * Constructs an icon selection dialog using a specific iconloader.
      */
-    KIconDialog(KIconLoader *loader, TQWidget *parent=0,
+    TDEIconDialog(TDEIconLoader *loader, TQWidget *parent=0,
 	    const char *name=0);
     /**
      * Destructs the dialog.
      */
-    ~KIconDialog();
+    ~TDEIconDialog();
 
     /**
      * Sets a strict icon size policy for allowed icons. When true,
@@ -126,7 +126,7 @@ public:
 
     /**
      * Sets the size of the icons to be shown / selected.
-     * @see KIcon::StdSizes
+     * @see TDEIcon::StdSizes
      * @see iconSize
      */
     void setIconSize(int size);
@@ -141,16 +141,16 @@ public:
     /**
      * @deprecated in KDE 3.0, use the static method getIcon instead.
      */
-    TQString selectIcon(KIcon::Group group=KIcon::Desktop, KIcon::Context
-	    context=KIcon::Application, bool user=false);
+    TQString selectIcon(TDEIcon::Group group=TDEIcon::Desktop, TDEIcon::Context
+	    context=TDEIcon::Application, bool user=false);
 #endif
 
     /**
      * Allows you to set the same parameters as in the class method
      * getIcon().
      */
-    void setup( KIcon::Group group,
-                KIcon::Context context = KIcon::Application,
+    void setup( TDEIcon::Group group,
+                TDEIcon::Context context = TDEIcon::Application,
                 bool strictIconSize = false, int iconSize = 0,
                 bool user = false );
 
@@ -163,14 +163,14 @@ public:
      * @since 3.3
      */
 
-    void setup( KIcon::Group group, KIcon::Context context,
+    void setup( TDEIcon::Group group, TDEIcon::Context context,
                 bool strictIconSize, int iconSize, bool user, bool lockUser,
                 bool lockCustomDir );
 
     /**
      * exec()utes this modal dialog and returns the name of the selected icon,
      * or TQString::null if the dialog was aborted.
-     * @returns the name of the icon, suitable for loading with KIconLoader.
+     * @returns the name of the icon, suitable for loading with TDEIconLoader.
      * @see getIcon
      */
     TQString openDialog();
@@ -197,11 +197,11 @@ public:
      * @param user Begin with the "user icons" instead of "system icons".
      * @param parent The parent widget of the dialog.
      * @param caption The caption to use for the dialog.
-     * @return The name of the icon, suitable for loading with KIconLoader.
+     * @return The name of the icon, suitable for loading with TDEIconLoader.
      * @version New in 3.0
      */
-    static TQString getIcon(KIcon::Group group=KIcon::Desktop,
-                           KIcon::Context context=KIcon::Application,
+    static TQString getIcon(TDEIcon::Group group=TDEIcon::Desktop,
+                           TDEIcon::Context context=TDEIcon::Application,
                            bool strictIconSize=false, int iconSize = 0,
                            bool user=false, TQWidget *parent=0,
                            const TQString &caption=TQString::null);
@@ -222,10 +222,10 @@ private slots:
 private:
     void init();
     void showIcons();
-    void setContext( KIcon::Context context );
+    void setContext( TDEIcon::Context context );
 
     int mGroupOrSize;
-    KIcon::Context mContext;
+    TDEIcon::Context mContext;
     int mType;
 
     TQStringList mFileList;
@@ -233,28 +233,28 @@ private:
     TQPushButton *mpBrowseBut;
     TQRadioButton *mpRb1, *mpRb2;
     KProgress *mpProgress;
-    KIconLoader *mpLoader;
-    KIconCanvas *mpCanvas;
+    TDEIconLoader *mpLoader;
+    TDEIconCanvas *mpCanvas;
     int mNumContext;
-    KIcon::Context mContextMap[ 12 ]; // must match KIcon::Context size, code has assert
+    TDEIcon::Context mContextMap[ 12 ]; // must match TDEIcon::Context size, code has assert
 
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KIconDialogPrivate;
-    KIconDialogPrivate *d;
+    class TDEIconDialogPrivate;
+    TDEIconDialogPrivate *d;
 };
 
 
 /**
  * A pushbutton for choosing an icon. Pressing on the button will open a
- * KIconDialog for the user to select an icon. The current icon will be
+ * TDEIconDialog for the user to select an icon. The current icon will be
  * displayed on the button.
  *
- * @see KIconDialog
+ * @see TDEIconDialog
  * @short A push button that allows selection of an icon.
  */
-class KIO_EXPORT KIconButton: public TQPushButton
+class TDEIO_EXPORT TDEIconButton: public TQPushButton
 {
     Q_OBJECT
     TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon )
@@ -263,18 +263,18 @@ class KIO_EXPORT KIconButton: public TQPushButton
 
 public:
     /**
-     * Constructs a KIconButton using the global iconloader.
+     * Constructs a TDEIconButton using the global iconloader.
      */
-    KIconButton(TQWidget *parent=0L, const char *name=0L);
+    TDEIconButton(TQWidget *parent=0L, const char *name=0L);
 
     /**
-     * Constructs a KIconButton using a specific KIconLoader.
+     * Constructs a TDEIconButton using a specific TDEIconLoader.
      */
-    KIconButton(KIconLoader *loader, TQWidget *parent, const char *name=0L);
+    TDEIconButton(TDEIconLoader *loader, TQWidget *parent, const char *name=0L);
     /**
      * Destructs the button.
      */
-    ~KIconButton();
+    ~TDEIconButton();
 
     /**
      * Sets a strict icon size policy for allowed icons. When true,
@@ -288,10 +288,10 @@ public:
     bool strictIconSize() const;
 
     /**
-     * Sets the icon group and context. Use KIcon::NoGroup if you want to
+     * Sets the icon group and context. Use TDEIcon::NoGroup if you want to
      * allow icons for any group in the given context.
      */
-    void setIconType(KIcon::Group group, KIcon::Context context, bool user=false);
+    void setIconType(TDEIcon::Group group, TDEIcon::Context context, bool user=false);
 
     /**
      * Sets the button's initial icon.
@@ -310,7 +310,7 @@ public:
 
     /**
      * Sets the size of the icon to be shown / selected.
-     * @see KIcon::StdSizes
+     * @see TDEIcon::StdSizes
      * @see iconSize
      */
     void setIconSize( int size );
@@ -333,18 +333,18 @@ private slots:
     void newIconName(const TQString& name);
 
 private:
-    void init( KIconLoader *loader );
+    void init( TDEIconLoader *loader );
 
     bool mbUser;
-    KIcon::Group mGroup;
-    KIcon::Context mContext;
+    TDEIcon::Group mGroup;
+    TDEIcon::Context mContext;
 
     TQString mIcon;
-    KIconDialog *mpDialog;
-    KIconLoader *mpLoader;
-    class KIconButtonPrivate;
-    KIconButtonPrivate *d;
+    TDEIconDialog *mpDialog;
+    TDEIconLoader *mpLoader;
+    class TDEIconButtonPrivate;
+    TDEIconButtonPrivate *d;
 };
 
 
-#endif // __KIconDialog_h__
+#endif // __TDEIconDialog_h__
diff --git a/kio/kfile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index 2d9f7881a..f96be72fc 100644
--- a/kio/kfile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -14,20 +14,20 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
-#include <kio/previewjob.h>
+#include <tdelocale.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
+#include <tdeio/previewjob.h>
 
 #include "kimagefilepreview.h"
-#include "config-kfile.h"
+#include "config-tdefile.h"
 
 /**** KImageFilePreview ****/
 
@@ -35,8 +35,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
     : KPreviewWidgetBase( parent ),
       m_job( 0L )
 {
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver cs( config, ConfigGroup );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs( config, ConfigGroup );
     autoMode = config->readBoolEntry( "Automatic Preview", true );
 
     TQVBoxLayout *vb = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -62,7 +62,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
     timer = new TQTimer( this );
     connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) );
 
-    setSupportedMimeTypes( KIO::PreviewJob::supportedMimeTypes() );
+    setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() );
 }
 
 KImageFilePreview::~KImageFilePreview()
@@ -70,8 +70,8 @@ KImageFilePreview::~KImageFilePreview()
     if ( m_job )
         m_job->kill();
 
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver cs( config, ConfigGroup );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs( config, ConfigGroup );
     config->writeEntry( "Automatic Preview", autoPreview->isChecked() );
 }
 
@@ -109,8 +109,8 @@ void KImageFilePreview::showPreview( const KURL &url, bool force )
             if ( force ) // explicitly requested previews shall always be generated!
                 m_job->setIgnoreMaximumSize( true );
             
-            connect( m_job, TQT_SIGNAL( result( KIO::Job * )),
-                     this, TQT_SLOT( slotResult( KIO::Job * )));
+            connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )),
+                     this, TQT_SLOT( slotResult( TDEIO::Job * )));
             connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*,
                                                 const TQPixmap& )),
                      TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
@@ -142,11 +142,11 @@ TQSize KImageFilePreview::sizeHint() const
     return TQSize( 20, 200 ); // otherwise it ends up huge???
 }
 
-KIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h )
+TDEIO::PreviewJob * KImageFilePreview::createJob( const KURL& url, int w, int h )
 {
     KURL::List urls;
     urls.append( url );
-    return KIO::filePreview( urls, w, h, 0, 0, true, false );
+    return TDEIO::filePreview( urls, w, h, 0, 0, true, false );
 }
 
 void KImageFilePreview::gotPreview( const KFileItem* item, const TQPixmap& pm )
@@ -160,11 +160,11 @@ void KImageFilePreview::slotFailed( const KFileItem* item )
     if ( item->isDir() )
         imageLabel->clear();
     else if ( item->url() == currentURL ) // should always be the case
-        imageLabel->setPixmap( SmallIcon( "file_broken", KIcon::SizeLarge,
-                                          KIcon::DisabledState ));
+        imageLabel->setPixmap( SmallIcon( "file_broken", TDEIcon::SizeLarge,
+                                          TDEIcon::DisabledState ));
 }
 
-void KImageFilePreview::slotResult( KIO::Job *job )
+void KImageFilePreview::slotResult( TDEIO::Job *job )
 {
     if ( job == m_job )
         m_job = 0L;
diff --git a/kio/kfile/kimagefilepreview.h b/tdeio/tdefile/kimagefilepreview.h
index 864fc5d31..0604e08f0 100644
--- a/kio/kfile/kimagefilepreview.h
+++ b/tdeio/tdefile/kimagefilepreview.h
@@ -23,12 +23,12 @@ class TQTimer;
 
 class KFileDialog;
 class KFileItem;
-namespace KIO { class Job; class PreviewJob; }
+namespace TDEIO { class Job; class PreviewJob; }
 
 /**
  * Image preview widget for the file dialog.
  */
-class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
+class TDEIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 {
 	Q_OBJECT
 
@@ -51,11 +51,11 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 
 	protected:
 		virtual void resizeEvent(TQResizeEvent *e);
-		virtual KIO::PreviewJob * createJob( const KURL& url,
+		virtual TDEIO::PreviewJob * createJob( const KURL& url,
                                                      int w, int h );
 
 	private slots:
-		void slotResult( KIO::Job * );
+		void slotResult( TDEIO::Job * );
 		virtual void slotFailed( const KFileItem* );
 
 	private:
@@ -66,7 +66,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 		TQLabel *infoLabel;
 		TQCheckBox *autoPreview;
 		TQPushButton *previewButton;
-		KIO::PreviewJob *m_job;
+		TDEIO::PreviewJob *m_job;
         protected:
                 virtual void virtual_hook( int id, void* data );
         private:
diff --git a/kio/kfile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp
index d82c4523b..21c75e0ce 100644
--- a/kio/kfile/kmetaprops.cpp
+++ b/tdeio/tdefile/kmetaprops.cpp
@@ -21,11 +21,11 @@
 #include "kmetaprops.h"
 
 #include <kdebug.h>
-#include <kfilemetainfowidget.h>
-#include <kfilemetainfo.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdefilemetainfowidget.h>
+#include <tdefilemetainfo.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 
 #include <tqvalidator.h>
@@ -250,7 +250,7 @@ bool KFileMetaPropsPlugin::supports( KFileItemList _items )
   if (KExecPropsPlugin::supports(_items) || KURLPropsPlugin::supports(_items))
      return false; // Having both is redundant.
 
-  bool metaDataEnabled = KGlobalSettings::showFilePreview(_items.first()->url());
+  bool metaDataEnabled = TDEGlobalSettings::showFilePreview(_items.first()->url());
   return _items.count() == 1 && metaDataEnabled;
 }
 
diff --git a/kio/kfile/kmetaprops.h b/tdeio/tdefile/kmetaprops.h
index 8bd83a3b3..c842499dd 100644
--- a/kio/kfile/kmetaprops.h
+++ b/tdeio/tdefile/kmetaprops.h
@@ -28,7 +28,7 @@ class KFileMetaInfoItem;
  * 'MetaProps plugin
  * In this plugin you can modify meta information like id3 tags of mp3 files
  */
-class KIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
diff --git a/kio/kfile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index b3242e905..8397a5e74 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -18,24 +18,24 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kaudioplayer.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
@@ -152,14 +152,14 @@ namespace KNotify
 
 
 int KNotifyDialog::configure( TQWidget *parent, const char *name,
-                              const KAboutData *aboutData )
+                              const TDEAboutData *aboutData )
 {
     KNotifyDialog dialog( parent, name, true, aboutData );
     return dialog.exec();
 }
 
 KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal,
-                              const KAboutData *aboutData )
+                              const TDEAboutData *aboutData )
     : KDialogBase(parent, name, modal, i18n("Notification Settings"),
                   Ok | Apply | Cancel | Default, Ok, true )
 {
@@ -251,7 +251,7 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name,
     d->pixmaps[COL_SOUND]   = psound;
     d->pixmaps[COL_TASKBAR] = ptaskbar;
 
-    int w = KIcon::SizeSmall + 6;
+    int w = TDEIcon::SizeSmall + 6;
 
     TQHeader *header = m_listview->header();
     header->setLabel( COL_EXECUTE, pexec,    TQString::null, w );
@@ -374,7 +374,7 @@ Application * KNotifyWidget::addApplicationEvents( const TQString& path )
     kdDebug() << "**** knotify: adding path: " << path << endl;
     TQString relativePath = path;
 
-    if ( path.at(0) == '/' && KStandardDirs::exists( path ) )
+    if ( path.at(0) == '/' && TDEStandardDirs::exists( path ) )
         relativePath = makeRelative( path );
 
     if ( !relativePath.isEmpty() )
@@ -864,8 +864,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester )
     // find the first "sound"-resource that contains files
     const Application *app = currentEvent()->application();
     TQStringList soundDirs =
-        KGlobal::dirs()->findDirs("data", app->appName() + "/sounds");
-    soundDirs += KGlobal::dirs()->resourceDirs( "sound" );
+        TDEGlobal::dirs()->findDirs("data", app->appName() + "/sounds");
+    soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" );
 
     if ( !soundDirs.isEmpty() ) {
         KURL soundURL;
@@ -915,13 +915,13 @@ void KNotifyWidget::openExecDialog( KURLRequester *requester )
 void KNotifyWidget::playSound()
 {
     TQString soundPath = m_soundPath->url();
-    if (!KIO::NetAccess::exists( m_soundPath->url(), true, 0 )) {        
+    if (!TDEIO::NetAccess::exists( m_soundPath->url(), true, 0 )) {        
         bool foundSound=false;
 
         // find the first "sound"-resource that contains files
         const Application *app = currentEvent()->application();
-        TQStringList soundDirs = KGlobal::dirs()->findDirs("data", app->appName() + "/sounds");
-        soundDirs += KGlobal::dirs()->resourceDirs( "sound" );
+        TQStringList soundDirs = TDEGlobal::dirs()->findDirs("data", app->appName() + "/sounds");
+        soundDirs += TDEGlobal::dirs()->resourceDirs( "sound" );
 
         if ( !soundDirs.isEmpty() ) {
            TQDir dir;
@@ -930,7 +930,7 @@ void KNotifyWidget::playSound()
            while ( it != soundDirs.end() ) {
                dir = *it;
                if ( dir.isReadable() && dir.count() > 2 && 
-	            KIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) {
+	            TDEIO::NetAccess::exists( *it + m_soundPath->url(), true, 0 )) {
                        foundSound=true;
                        soundPath = *it + m_soundPath->url();
                        break;
@@ -1003,8 +1003,8 @@ Application::Application( const TQString &path )
     TQString config_file = path;
     config_file[config_file.find('/')] = '.';
     m_events = 0L;
-    config = new KConfig(config_file, false, false);
-    kc = new KConfig(path, true, false, "data");
+    config = new TDEConfig(config_file, false, false);
+    kc = new TDEConfig(path, true, false, "data");
     kc->setGroup( TQString::fromLatin1("!Global!") );
     m_icon = kc->readEntry(TQString::fromLatin1("IconName"),
                            TQString::fromLatin1("misc"));
diff --git a/kio/kfile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index 165df42f4..c8b5b21ac 100644
--- a/kio/kfile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -19,10 +19,10 @@
 #ifndef KNOTIFYDIALOG_H
 #define KNOTIFYDIALOG_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "knotifywidgetbase.h"
 
@@ -49,7 +49,7 @@ namespace KNotify
  * @since 3.1
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KNotifyDialog : public KDialogBase
+class TDEIO_EXPORT KNotifyDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -63,15 +63,15 @@ public:
      * @param parent The parent widget for the dialog
      * @param name The widget name
      * @param modal If true, this will be a modal dialog, otherwise non-modal.
-     * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
+     * @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
      *                  will be used to find the KNotify events (in the eventsrc file).
      *                  Set this to 0L if you want to add all events yourself with
      * addApplicationEvents().
      */
     KNotifyDialog( TQWidget *parent = 0, const char *name = 0,
                    bool modal = true,
-                   const KAboutData *aboutData =
-                   KGlobal::instance()->aboutData() );
+                   const TDEAboutData *aboutData =
+                   TDEGlobal::instance()->aboutData() );
     /**
      * Destroys the KNotifyDialog
      */
@@ -82,13 +82,13 @@ public:
      *
      * @param parent The parent widget for the dialog
      * @param name The widget name
-     * @param aboutData A pointer to a KAboutData object. KAboutData::appName()
+     * @param aboutData A pointer to a TDEAboutData object. TDEAboutData::appName()
      *                  will be used to find the KNotify events (in the eventsrc file).
      * @see exec for the return values.
      * @return The value of TQDialog::exec()
      */
     static int configure( TQWidget *parent = 0, const char *name = 0,
-                          const KAboutData *aboutData = KGlobal::instance()->aboutData() );
+                          const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData() );
 
     /**
      * With this method, you can add the KNotify events of one eventsrc
@@ -96,7 +96,7 @@ public:
      * KNotifyDialog can handle events for multiple applications (i.e. eventsrc files).
      * Successive calls with a different @p appName will add them.
      * @param appName The application's name, i.e. the name passed to the 
-     *                KApplication constructor or KAboutData.
+     *                TDEApplication constructor or TDEAboutData.
      * @see clearApplicationEvents()
      */
     virtual void addApplicationEvents( const char *appName );
@@ -148,7 +148,7 @@ namespace KNotify
     /**
      * @internal
      */
-    class KIO_EXPORT Application
+    class TDEIO_EXPORT Application
     {
     public:
         Application( const TQString &path );
@@ -168,12 +168,12 @@ namespace KNotify
         TQString m_appname;
         EventList *m_events;
 
-        KConfig *kc; // The file that defines the events.
-        KConfig *config; // The file that contains the settings for the events
+        TDEConfig *kc; // The file that defines the events.
+        TDEConfig *config; // The file that contains the settings for the events
     };
 
 
-    class KIO_EXPORT ApplicationList : public TQPtrList<Application>
+    class TDEIO_EXPORT ApplicationList : public TQPtrList<Application>
     {
         virtual int compareItems ( TQPtrCollection::Item item1,
                                    TQPtrCollection::Item item2 )
@@ -186,7 +186,7 @@ namespace KNotify
     /**
      * @internal
      */
-    class KIO_EXPORT KNotifyWidget : public KNotifyWidgetBase
+    class TDEIO_EXPORT KNotifyWidget : public KNotifyWidgetBase
     {
         Q_OBJECT
 
@@ -195,7 +195,7 @@ namespace KNotify
                        bool handleAllApps = false );
         ~KNotifyWidget();
 
-        KListView * eventsView() {
+        TDEListView * eventsView() {
             return m_listview;
         }
 
diff --git a/kio/kfile/knotifywidgetbase.ui b/tdeio/tdefile/knotifywidgetbase.ui
index d3c3103ff..89591b1b8 100644
--- a/kio/kfile/knotifywidgetbase.ui
+++ b/tdeio/tdefile/knotifywidgetbase.ui
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string></string>
@@ -458,7 +458,7 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
diff --git a/kio/kfile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 8f498aa8d..5db8b79d9 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -34,14 +34,14 @@
 #include <tqstyle.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <kdesktopfile.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimemagic.h>
 #include <krun.h>
@@ -53,8 +53,8 @@
 #include <dcopclient.h>
 #include <kmimetype.h>
 #include <kservicegroup.h>
-#include <klistview.h>
-#include <ksycoca.h>
+#include <tdelistview.h>
+#include <tdesycoca.h>
 #include <kstdguiitem.h>
 
 #include "kopenwith.h"
@@ -69,7 +69,7 @@
 
 // ----------------------------------------------------------------------
 
-KAppTreeListItem::KAppTreeListItem( KListView* parent, const TQString & name,
+KAppTreeListItem::KAppTreeListItem( TDEListView* parent, const TQString & name,
                                     const TQPixmap& pixmap, bool parse, bool dir, const TQString &p, const TQString &c )
     : TQListViewItem( parent, name )
 {
@@ -131,7 +131,7 @@ void KAppTreeListItem::activate()
 void KAppTreeListItem::setOpen( bool o )
 {
     if( o && !parsed ) { // fill the children before opening
-        ((KApplicationTree *) parent())->addDesktopGroup( path, this );
+        ((TDEApplicationTree *) parent())->addDesktopGroup( path, this );
         parsed = true;
     }
     TQListViewItem::setOpen( o );
@@ -144,8 +144,8 @@ bool KAppTreeListItem::isDirectory()
 
 // ----------------------------------------------------------------------
 
-KApplicationTree::KApplicationTree( TQWidget *parent )
-    : KListView( parent ), currentitem(0)
+TDEApplicationTree::TDEApplicationTree( TQWidget *parent )
+    : TDEListView( parent ), currentitem(0)
 {
     addColumn( i18n("Known Applications") );
     setRootIsDecorated( true );
@@ -161,7 +161,7 @@ KApplicationTree::KApplicationTree( TQWidget *parent )
 
 // ----------------------------------------------------------------------
 
-bool KApplicationTree::isDirSel()
+bool TDEApplicationTree::isDirSel()
 {
     if (!currentitem) return false; // if currentitem isn't set
     return currentitem->isDirectory();
@@ -171,7 +171,7 @@ bool KApplicationTree::isDirSel()
 
 static TQPixmap appIcon(const TQString &iconName)
 {
-    TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true);
+    TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::Small, 0, TDEIcon::DefaultState, 0L, true);
     // make sure they are not larger than 20x20
     if (normal.width() > 20 || normal.height() > 20)
     {
@@ -182,7 +182,7 @@ static TQPixmap appIcon(const TQString &iconName)
     return normal;
 }
 
-void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item)
+void TDEApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListItem *item)
 {
    KServiceGroup::Ptr root = KServiceGroup::group(relPath);
    if (!root || !root->isValid()) return;
@@ -244,7 +244,7 @@ void KApplicationTree::addDesktopGroup( const TQString &relPath, KAppTreeListIte
 
 // ----------------------------------------------------------------------
 
-void KApplicationTree::slotItemHighlighted(TQListViewItem* i)
+void TDEApplicationTree::slotItemHighlighted(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
@@ -261,7 +261,7 @@ void KApplicationTree::slotItemHighlighted(TQListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
+void TDEApplicationTree::slotSelectionChanged(TQListViewItem* i)
 {
     // i may be 0 (see documentation)
     if(!i)
@@ -277,15 +277,15 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
 
 // ----------------------------------------------------------------------
 
-void KApplicationTree::resizeEvent( TQResizeEvent * e)
+void TDEApplicationTree::resizeEvent( TQResizeEvent * e)
 {
     setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)
                          -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth));
-    KListView::resizeEvent(e);
+    TDEListView::resizeEvent(e);
 }
 
 // Prune empty directories from the tree
-void KApplicationTree::cleanupTree()
+void TDEApplicationTree::cleanupTree()
 {
 	TQListViewItem *item=firstChild();
 	while(item!=0)
@@ -412,13 +412,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
     // init the history combo and insert it into the URL-Requester
     KHistoryCombo *combo = new KHistoryCombo();
     combo->setDuplicatesEnabled( false );
-    KConfig *kc = KGlobal::config();
-    KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
     int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 );
     combo->setMaxCount( max );
     int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"),
-				KGlobalSettings::completionMode());
-    combo->setCompletionMode((KGlobalSettings::Completion)mode);
+				TDEGlobalSettings::completionMode());
+    combo->setCompletionMode((TDEGlobalSettings::Completion)mode);
     TQStringList list = kc->readListEntry( TQString::fromLatin1("History") );
     combo->setHistoryItems( list, true );
     edit = new KURLRequester( combo, this );
@@ -456,7 +456,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
   connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) );
   connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) );
 
-  m_pTree = new KApplicationTree( this );
+  m_pTree = new TDEApplicationTree( this );
   topLayout->addWidget(m_pTree);
 
   connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString& ) ),
@@ -483,7 +483,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 
   // check to see if we use konsole if not disable the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+  TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
 
   if (bReadOnly || preferredTerminal != "konsole")
@@ -666,7 +666,7 @@ void KOpenWithDlg::slotOK()
 
   if (terminal->isChecked())
   {
-    KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+    TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
     preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
     m_command = preferredTerminal;
     // only add --noclose when we are sure it is konsole we're using
@@ -813,8 +813,8 @@ void KOpenWithDlg::accept()
     if ( combo ) {
         combo->addToHistory( edit->url() );
 
-        KConfig *kc = KGlobal::config();
-        KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+        TDEConfig *kc = TDEGlobal::config();
+        TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
         kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() );
 	kc->writeEntry(TQString::fromLatin1("CompletionMode"),
 		       combo->completionMode());
diff --git a/kio/kfile/kopenwith.h b/tdeio/tdefile/kopenwith.h
index 3dceb10bc..90c43ceb1 100644
--- a/kio/kfile/kopenwith.h
+++ b/tdeio/tdefile/kopenwith.h
@@ -26,7 +26,7 @@
 #include <krun.h>
 #include <kservice.h>
 
-class KApplicationTree;
+class TDEApplicationTree;
 class KURLRequester;
 
 class TQWidget;
@@ -43,7 +43,7 @@ class KOpenWithDlgPrivate;
  *
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4
+class TDEIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4
 {
     Q_OBJECT
 public:
@@ -161,7 +161,7 @@ protected:
     KURLRequester * edit;
     TQString m_command;
 
-    KApplicationTree* m_pTree;
+    TDEApplicationTree* m_pTree;
     TQLabel *label;
 
     TQString qName, qServiceType;
@@ -189,7 +189,7 @@ protected:
  *
  *
  */
-class KIO_EXPORT_DEPRECATED KFileOpenWithHandler : public KOpenWithHandler
+class TDEIO_EXPORT_DEPRECATED KFileOpenWithHandler : public KOpenWithHandler
 {
 public:
   KFileOpenWithHandler() : KOpenWithHandler() {}
diff --git a/kio/kfile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h
index f395d94bd..a0f7eb77c 100644
--- a/kio/kfile/kopenwith_p.h
+++ b/tdeio/tdefile/kopenwith_p.h
@@ -21,7 +21,7 @@
 #define __open_with_p_h__
 
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KURLRequester;
 
@@ -51,7 +51,7 @@ protected:
     void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString &_path, const TQString &exec);
 
 public:
-    KAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap,
+    KAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString &p, const TQString &c );
     KAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap,
                       bool parse, bool dir, const TQString &p, const TQString &c );
@@ -61,7 +61,7 @@ protected:
     virtual void activate();
     virtual void setOpen( bool o );
 
-    friend class KApplicationTree;
+    friend class TDEApplicationTree;
 };
 
 /* ------------------------------------------------------------------------- */
@@ -69,11 +69,11 @@ protected:
 /**
  * @internal
  */
-class KApplicationTree : public KListView
+class TDEApplicationTree : public TDEListView
 {
     Q_OBJECT
 public:
-    KApplicationTree( TQWidget *parent );
+    TDEApplicationTree( TQWidget *parent );
 
     /**
      * Add a group of .desktop/.kdelnk entries
diff --git a/kio/kfile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp
index 9fd91cc7b..c45330893 100644
--- a/kio/kfile/kpreviewprops.cpp
+++ b/tdeio/tdefile/kpreviewprops.cpp
@@ -21,9 +21,9 @@
 
 #include <tqlayout.h>
 
-#include <kfilemetapreview.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdefilemetapreview.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 class KPreviewPropsPlugin::KPreviewPropsPluginPrivate
 {
@@ -66,7 +66,7 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items )
 {
     if ( _items.count() != 1)
         return false;
-    if( !KGlobalSettings::showFilePreview(_items.first()->url()))
+    if( !TDEGlobalSettings::showFilePreview(_items.first()->url()))
         return false;
     KMimeType::Ptr mt = KMimeType::findByURL( _items.first()->url() );
     if ( mt->inherits("inode/directory") || mt->name() == "application/octet-stream" )
diff --git a/kio/kfile/kpreviewprops.h b/tdeio/tdefile/kpreviewprops.h
index c34e70763..d934af22a 100644
--- a/kio/kfile/kpreviewprops.h
+++ b/tdeio/tdefile/kpreviewprops.h
@@ -29,7 +29,7 @@ class KFileMetaPreview;
  * This plugin displays a preview of the given file
  * @since 3.5
  */
-class KIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 
diff --git a/kio/kfile/kpreviewwidgetbase.cpp b/tdeio/tdefile/kpreviewwidgetbase.cpp
index 979da919e..979da919e 100644
--- a/kio/kfile/kpreviewwidgetbase.cpp
+++ b/tdeio/tdefile/kpreviewwidgetbase.cpp
diff --git a/kio/kfile/kpreviewwidgetbase.h b/tdeio/tdefile/kpreviewwidgetbase.h
index e4c77c600..3597070ee 100644
--- a/kio/kfile/kpreviewwidgetbase.h
+++ b/tdeio/tdefile/kpreviewwidgetbase.h
@@ -41,7 +41,7 @@ class KURL;
  * @short Abstract baseclass for all preview widgets.
  * @author Frerich Raabe <raabe@kde.org>
  */
-class KIO_EXPORT KPreviewWidgetBase : public TQWidget
+class TDEIO_EXPORT KPreviewWidgetBase : public TQWidget
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kpropertiesdesktopadvbase.ui b/tdeio/tdefile/kpropertiesdesktopadvbase.ui
index fd8e39781..fd8e39781 100644
--- a/kio/kfile/kpropertiesdesktopadvbase.ui
+++ b/tdeio/tdefile/kpropertiesdesktopadvbase.ui
diff --git a/kio/kfile/kpropertiesdesktopbase.ui b/tdeio/tdefile/kpropertiesdesktopbase.ui
index a0894dc70..28e1375c7 100644
--- a/kio/kfile/kpropertiesdesktopbase.ui
+++ b/tdeio/tdefile/kpropertiesdesktopbase.ui
@@ -52,7 +52,7 @@
 &lt;p&gt;If you want to associate this application with one or more mimetypes that are not in this list, click on the button &lt;b&gt;Add&lt;/b&gt; below. If there are one or more filetypes that this application cannot handle, you may want to remove them from the list clicking on the button &lt;b&gt;Remove&lt;/b&gt; below.&lt;/p&gt;&lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="KListView" row="7" column="0" rowspan="1" colspan="7">
+        <widget class="TDEListView" row="7" column="0" rowspan="1" colspan="7">
             <column>
                 <property name="text">
                     <string>Mimetype</string>
@@ -310,7 +310,7 @@ Following the command, you can have several place holders which will be replaced
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kio/kfile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 6bfe09e8d..87d3926b3 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -30,7 +30,7 @@
  *  Henner Zeller <zeller@think.de>
  * some layout management by
  *  Bertrand Leconte <B.Leconte@mail.dotcom.fr>
- * the rest of the layout management, bug fixes, adaptation to libkio,
+ * the rest of the layout management, bug fixes, adaptation to libtdeio,
  * template feature by
  *  David Faure <faure@kde.org>
  * More layout, cleanups, and fixes by
@@ -85,7 +85,7 @@ extern "C" {
 }
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kdirsize.h>
 #include <kdirwatch.h>
@@ -96,20 +96,20 @@ extern "C" {
 #include <kicondialog.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kio/chmodjob.h>
-#include <kio/renamedlg.h>
-#include <kio/netaccess.h>
-#include <kio/kservicetypefactory.h>
-#include <kfiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/chmodjob.h>
+#include <tdeio/renamedlg.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/kservicetypefactory.h>
+#include <tdefiledialog.h>
 #include <kmimetype.h>
 #include <kmountpoint.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kcompletion.h>
 #include <klineedit.h>
@@ -117,14 +117,14 @@ extern "C" {
 #include <ksqueezedtextlabel.h>
 #include <klibloader.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kmetaprops.h>
 #include <kpreviewprops.h>
 #include <kprocess.h>
 #include <krun.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kacl.h>
-#include "kfilesharedlg.h"
+#include "tdefilesharedlg.h"
 
 #include "kpropertiesdesktopbase.h"
 #include "kpropertiesdesktopadvbase.h"
@@ -146,7 +146,7 @@ static TQString nameFromFileName(TQString nameStr)
    if ( nameStr.endsWith(".kdelnk") )
       nameStr.truncate( nameStr.length() - 7 );
    // Make it human-readable (%2F => '/', ...)
-   nameStr = KIO::decodeFileName( nameStr );
+   nameStr = TDEIO::decodeFileName( nameStr );
    return nameStr;
 }
 
@@ -174,7 +174,7 @@ public:
 KPropertiesDialog::KPropertiesDialog (KFileItem* item,
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
-  : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(KIO::decodeFileName(item->url().fileName())),
+  : KDialogBase (KDialogBase::Tabbed, i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(item->url().fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal)
 {
@@ -206,7 +206,7 @@ KPropertiesDialog::KPropertiesDialog (KFileItemList _items,
                  // TODO: replace <never used> with "Properties for 1 item". It's very confusing how it has to be translated otherwise
                  // (empty translation before the "\n" is not allowed by msgfmt...)
 		 _items.count()>1 ? i18n( "<never used>","Properties for %n Selected Items",_items.count()) :
-		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_items.first()->url().fileName())),
+		 i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_items.first()->url().fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal)
 {
@@ -229,16 +229,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url, mode_t /* _mode is now u
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
   : KDialogBase (KDialogBase::Tabbed,
-		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())),
+		 i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal),
   m_singleUrl( _url )
 {
   d = new KPropertiesDialogPrivate;
 
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
 
-  KIO::NetAccess::stat(_url, entry, parent);
+  TDEIO::NetAccess::stat(_url, entry, parent);
 
   m_items.append( new KFileItem( entry, _url ) );
   init (modal, autoShow);
@@ -249,16 +249,16 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _url,
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
   : KDialogBase (KDialogBase::Tabbed,
-		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_url.fileName())),
+		 i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_url.fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal),
   m_singleUrl( _url )
 {
   d = new KPropertiesDialogPrivate;
 
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
 
-  KIO::NetAccess::stat(_url, entry, parent);
+  TDEIO::NetAccess::stat(_url, entry, parent);
 
   m_items.append( new KFileItem( entry, _url ) );
   init (modal, autoShow);
@@ -269,7 +269,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current
                                       TQWidget* parent, const char* name,
                                       bool modal, bool autoShow)
   : KDialogBase (KDialogBase::Tabbed,
-		 i18n( "Properties for %1" ).arg(KIO::decodeFileName(_tempUrl.fileName())),
+		 i18n( "Properties for %1" ).arg(TDEIO::decodeFileName(_tempUrl.fileName())),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, modal),
 
@@ -360,7 +360,7 @@ void KPropertiesDialog::setFileNameReadOnly( bool ro )
     }
 }
 
-void KPropertiesDialog::slotStatResult( KIO::Job * )
+void KPropertiesDialog::slotStatResult( TDEIO::Job * )
 {
 }
 
@@ -498,7 +498,7 @@ void KPropertiesDialog::insertPages()
     insertPlugin (p);
   }
 
-  if ( kapp->authorizeKAction("sharefile") &&
+  if ( kapp->authorizeTDEAction("sharefile") &&
        KFileSharePropsPlugin::supports( m_items ) )
   {
     KPropsDlgPlugin *p = new KFileSharePropsPlugin( this );
@@ -522,9 +522,9 @@ void KPropertiesDialog::insertPages()
       " ([X-TDE-Protocol] == '%1'  )   )"          ).arg(item->url().protocol());
 
   kdDebug( 250 ) << "trader query: " << query << endl;
-  KTrader::OfferList offers = KTrader::self()->query( mimetype, query );
-  KTrader::OfferList::ConstIterator it = offers.begin();
-  KTrader::OfferList::ConstIterator end = offers.end();
+  TDETrader::OfferList offers = TDETrader::self()->query( mimetype, query );
+  TDETrader::OfferList::ConstIterator it = offers.begin();
+  TDETrader::OfferList::ConstIterator end = offers.end();
   for (; it != end; ++it )
   {
     KPropsDlgPlugin *plugin = KParts::ComponentFactory
@@ -725,7 +725,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   TQString mimeComment = item->mimeComment();
   d->mimeType = item->mimetype();
   bool hasTotalSize;
-  KIO::filesize_t totalSize = item->size(hasTotalSize);
+  TDEIO::filesize_t totalSize = item->size(hasTotalSize);
   TQString magicMimeComment;
   if ( isLocal ) {
       KMimeType::Ptr magicMimeType = KMimeType::findByFileContent( url.path() );
@@ -781,7 +781,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     // Extract the file name only
     filename = properties->defaultName();
     if ( filename.isEmpty() ) { // no template
-      filename = item->name(); // this gives support for UDS_NAME, e.g. for kio_trash or kio_system
+      filename = item->name(); // this gives support for UDS_NAME, e.g. for tdeio_trash or tdeio_system
     } else {
       m_bFromTemplate = true;
       setDirty(); // to enforce that the copy happens
@@ -818,7 +818,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       if ( (*it)->mode() != mode )
         mode = (mode_t)0;
       if ( KMimeType::iconForURL(url, mode) != iconStr )
-        iconStr = "kmultiple";
+        iconStr = "tdemultiple";
       if ( url.directory() != directory )
         directory = TQString::null;
       if ( url.protocol() != protocol )
@@ -858,7 +858,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
 
   if ( !isDevice && !isTrash && (bDesktopFile || S_ISDIR(mode)) && !d->bMultiple /*not implemented for multiple*/ )
   {
-    KIconButton *iconButton = new KIconButton( d->m_frame );
+    TDEIconButton *iconButton = new TDEIconButton( d->m_frame );
     int bsize = 66 + 2 * iconButton->style().pixelMetric(TQStyle::PM_ButtonMargin);
     iconButton->setFixedSize(bsize, bsize);
     iconButton->setIconSize(48);
@@ -872,11 +872,11 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       config.setDesktopGroup();
       iconStr = config.readEntry( "Icon" );
       if ( config.hasDeviceType() )
-	iconButton->setIconType( KIcon::Desktop, KIcon::Device );
+	iconButton->setIconType( TDEIcon::Desktop, TDEIcon::Device );
       else
-	iconButton->setIconType( KIcon::Desktop, KIcon::Application );
+	iconButton->setIconType( TDEIcon::Desktop, TDEIcon::Application );
     } else
-      iconButton->setIconType( KIcon::Desktop, KIcon::Place );
+      iconButton->setIconType( TDEIcon::Desktop, TDEIcon::Place );
     iconButton->setIcon(iconStr);
     iconArea = iconButton;
     connect( iconButton, TQT_SIGNAL( iconChanged(TQString) ),
@@ -885,7 +885,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     TQLabel *iconLabel = new TQLabel( d->m_frame );
     int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin);
     iconLabel->setFixedSize(bsize, bsize);
-    iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) );
+    iconLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( iconStr, TDEIcon::Desktop, 48) );
     iconArea = iconLabel;
   }
   grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft);
@@ -894,7 +894,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   {
     TQLabel *lab = new TQLabel(d->m_frame );
     if ( d->bMultiple )
-      lab->setText( KIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) );
+      lab->setText( TDEIO::itemsSummaryString( iFileCount + iDirCount, iFileCount, iDirCount, 0, false ) );
     else
       lab->setText( filename );
     nameArea = lab;
@@ -953,7 +953,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
 
     connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() ));
 
-    if (!kapp->authorizeKAction("editfiletype"))
+    if (!kapp->authorizeTDEAction("editfiletype"))
        button->hide();
 #endif
 
@@ -992,7 +992,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   if ( !hasDirs ) // Only files [and symlinks]
   {
     if(hasTotalSize) {
-      m_sizeLabel->setText(KIO::convertSizeWithBytes(totalSize));
+      m_sizeLabel->setText(TDEIO::convertSizeWithBytes(totalSize));
     }
 
     m_sizeDetermineButton = 0L;
@@ -1034,36 +1034,36 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   {
     TQDateTime dt;
     bool hasTime;
-    time_t tim = item->time(KIO::UDS_CREATION_TIME, hasTime);
+    time_t tim = item->time(TDEIO::UDS_CREATION_TIME, hasTime);
     if ( hasTime )
     {
       l = new TQLabel(i18n("Created:"), d->m_frame );
       grid->addWidget(l, curRow, 0);
 
       dt.setTime_t( tim );
-      l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame );
+      l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame );
       grid->addWidget(l, curRow++, 2);
     }
 
-    tim = item->time(KIO::UDS_MODIFICATION_TIME, hasTime);
+    tim = item->time(TDEIO::UDS_MODIFICATION_TIME, hasTime);
     if ( hasTime )
     {
       l = new TQLabel(i18n("Modified:"), d->m_frame );
       grid->addWidget(l, curRow, 0);
 
       dt.setTime_t( tim );
-      l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame );
+      l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame );
       grid->addWidget(l, curRow++, 2);
     }
 
-    tim = item->time(KIO::UDS_ACCESS_TIME, hasTime);
+    tim = item->time(TDEIO::UDS_ACCESS_TIME, hasTime);
     if ( hasTime )
     {
       l = new TQLabel(i18n("Accessed:"), d->m_frame );
       grid->addWidget(l, curRow, 0);
 
       dt.setTime_t( tim );
-      l = new TQLabel(KGlobal::locale()->formatDateTime(dt), d->m_frame );
+      l = new TQLabel(TDEGlobal::locale()->formatDateTime(dt), d->m_frame );
       grid->addWidget(l, curRow++, 2);
     }
   }
@@ -1074,7 +1074,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     grid->addMultiCellWidget(sep, curRow, curRow, 0, 2);
     ++curRow;
 
-    TQString mountPoint = KIO::findPathMountPoint( url.path() );
+    TQString mountPoint = TDEIO::findPathMountPoint( url.path() );
 
     if (mountPoint != "/")
     {
@@ -1139,7 +1139,7 @@ void KFilePropsPlugin::slotEditFileType()
   TQString keditfiletype = TQString::fromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype
                     + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId())
-                    + " " + KProcess::quote(mime),
+                    + " " + TDEProcess::quote(mime),
                     keditfiletype, keditfiletype /*unused*/);
 #endif
 }
@@ -1162,16 +1162,16 @@ void KFilePropsPlugin::determineRelativePath( const TQString & path )
     TQStringList dirs;
     if (KBindingPropsPlugin::supports(properties->items()))
     {
-       m_sRelativePath =KGlobal::dirs()->relativeLocation("mime", path);
+       m_sRelativePath =TDEGlobal::dirs()->relativeLocation("mime", path);
        if (m_sRelativePath.startsWith("/"))
           m_sRelativePath = TQString::null;
     }
     else
     {
-       m_sRelativePath =KGlobal::dirs()->relativeLocation("apps", path);
+       m_sRelativePath =TDEGlobal::dirs()->relativeLocation("apps", path);
        if (m_sRelativePath.startsWith("/"))
        {
-          m_sRelativePath =KGlobal::dirs()->relativeLocation("xdgdata-apps", path);
+          m_sRelativePath =TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path);
           if (m_sRelativePath.startsWith("/"))
              m_sRelativePath = TQString::null;
           else
@@ -1193,8 +1193,8 @@ void KFilePropsPlugin::slotFoundMountPoint( const TQString&,
     d->m_freeSpaceLabel->setText(
 	// xgettext:no-c-format  --  Don't warn about translating the %1 out of %2 part.
 	i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
-	.arg(KIO::convertSizeFromKB(kBAvail))
-	.arg(KIO::convertSizeFromKB(kBSize))
+	.arg(TDEIO::convertSizeFromKB(kBAvail))
+	.arg(TDEIO::convertSizeFromKB(kBSize))
 	.arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 }
 
@@ -1208,35 +1208,35 @@ void KFilePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize,
     d->m_freeSpaceLabel->setText(
 	// xgettext:no-c-format  --  Don't warn about translating the %1 out of %2 part.
 	i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
-	.arg(KIO::convertSizeFromKB(kBAvail))
-	.arg(KIO::convertSizeFromKB(kBSize))
+	.arg(TDEIO::convertSizeFromKB(kBAvail))
+	.arg(TDEIO::convertSizeFromKB(kBSize))
 	.arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 }
 
 void KFilePropsPlugin::slotDirSizeUpdate()
 {
-    KIO::filesize_t totalSize = d->dirSizeJob->totalSize();
-    KIO::filesize_t totalFiles = d->dirSizeJob->totalFiles();
-         KIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs();
+    TDEIO::filesize_t totalSize = d->dirSizeJob->totalSize();
+    TDEIO::filesize_t totalFiles = d->dirSizeJob->totalFiles();
+         TDEIO::filesize_t totalSubdirs = d->dirSizeJob->totalSubdirs();
     m_sizeLabel->setText( i18n("Calculating... %1 (%2)\n%3, %4")
-			  .arg(KIO::convertSize(totalSize))
-                         .arg(KGlobal::locale()->formatNumber(totalSize, 0))
+			  .arg(TDEIO::convertSize(totalSize))
+                         .arg(TDEGlobal::locale()->formatNumber(totalSize, 0))
         .arg(i18n("1 file","%n files",totalFiles))
         .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs)));
 }
 
-void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job )
+void KFilePropsPlugin::slotDirSizeFinished( TDEIO::Job * job )
 {
   if (job->error())
     m_sizeLabel->setText( job->errorString() );
   else
   {
-    KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
-	KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
-	KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
+    TDEIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
+	TDEIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
+	TDEIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
     m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4")
-			  .arg(KIO::convertSize(totalSize))
-			  .arg(KGlobal::locale()->formatNumber(totalSize, 0))
+			  .arg(TDEIO::convertSize(totalSize))
+			  .arg(TDEGlobal::locale()->formatNumber(totalSize, 0))
         .arg(i18n("1 file","%n files",totalFiles))
         .arg(i18n("1 sub-folder","%n sub-folders",totalSubdirs)));
   }
@@ -1259,8 +1259,8 @@ void KFilePropsPlugin::slotSizeDetermine()
   connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ),
            TQT_SLOT( slotDirSizeUpdate() ) );
   d->dirSizeUpdateTimer->start(500);
-  connect( d->dirSizeJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotDirSizeFinished( KIO::Job * ) ) );
+  connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) );
   m_sizeStopButton->setEnabled(true);
   m_sizeDetermineButton->setEnabled(false);
 
@@ -1270,7 +1270,7 @@ void KFilePropsPlugin::slotSizeDetermine()
     bool isLocal;
     KFileItem * item = properties->item();
     KURL url = item->mostLocalURL( isLocal );
-    TQString mountPoint = KIO::findPathMountPoint( url.path() );
+    TQString mountPoint = TDEIO::findPathMountPoint( url.path() );
 
     KDiskFreeSp * job = new KDiskFreeSp;
     connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
@@ -1334,10 +1334,10 @@ void KFilePropsPlugin::applyChanges()
     kdDebug(250) << "oldname = " << oldName << endl;
     kdDebug(250) << "newname = " << n << endl;
     if ( oldName != n || m_bFromTemplate ) { // true for any from-template file
-      KIO::Job * job = 0L;
+      TDEIO::Job * job = 0L;
       KURL oldurl = properties->kurl();
 
-      TQString newFileName = KIO::encodeFileName(n);
+      TQString newFileName = TDEIO::encodeFileName(n);
       if (d->bDesktopFile && !newFileName.endsWith(".desktop") && !newFileName.endsWith(".kdelnk"))
          newFileName += ".desktop";
 
@@ -1353,14 +1353,14 @@ void KFilePropsPlugin::applyChanges()
 
       // Don't remove the template !!
       if ( !m_bFromTemplate ) // (normal renaming)
-        job = KIO::move( oldurl, properties->kurl() );
+        job = TDEIO::move( oldurl, properties->kurl() );
       else // Copying a template
-        job = KIO::copy( oldurl, properties->kurl() );
+        job = TDEIO::copy( oldurl, properties->kurl() );
 
-      connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-               TQT_SLOT( slotCopyFinished( KIO::Job * ) ) );
-      connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL &, const KURL & ) ),
-               TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) );
+      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
+      connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ),
+               TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) );
       // wait for job
       TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
       tqt_enter_modal(&dummy);
@@ -1378,7 +1378,7 @@ void KFilePropsPlugin::applyChanges()
   slotCopyFinished( 0L );
 }
 
-void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
+void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job )
 {
   kdDebug(250) << "KFilePropsPlugin::slotCopyFinished" << endl;
   if (job)
@@ -1389,7 +1389,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
     {
         job->showErrorDialog( d->m_frame );
         // Didn't work. Revert the URL to the old one
-        properties->updateUrl( static_cast<KIO::CopyJob*>(job)->srcURLs().first() );
+        properties->updateUrl( static_cast<TDEIO::CopyJob*>(job)->srcURLs().first() );
         properties->abortApplying(); // Don't apply the changes to the wrong file !
         return;
     }
@@ -1427,13 +1427,13 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
 
 void KFilePropsPlugin::applyIconChanges()
 {
-  KIconButton *iconButton = ::tqqt_cast<KIconButton *>( iconArea );
+  TDEIconButton *iconButton = ::tqqt_cast<TDEIconButton *>( iconArea );
   if ( !iconButton || !d->bIconChanged )
     return;
   // handle icon changes - only local files (or pseudo-local) for now
-  // TODO: Use KTempFile and KIO::file_copy with overwrite = true
+  // TODO: Use KTempFile and TDEIO::file_copy with overwrite = true
   KURL url = properties->kurl();
-  url = KIO::NetAccess::mostLocalURL( url, properties );
+  url = TDEIO::NetAccess::mostLocalURL( url, properties );
   if (url.isLocalFile()) {
     TQString path;
 
@@ -1478,7 +1478,7 @@ void KFilePropsPlugin::applyIconChanges()
   }
 }
 
-void KFilePropsPlugin::slotFileRenamed( KIO::Job *, const KURL &, const KURL & newUrl )
+void KFilePropsPlugin::slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & newUrl )
 {
   // This is called in case of an existing local file during the copy/move operation,
   // if the user chooses Rename.
@@ -1633,7 +1633,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   } else {
     //We don't know, for remote files, if they are ours or not.
     //So we let the user change permissions, and
-    //KIO::chmod will tell, if he had no right to do it.
+    //TDEIO::chmod will tell, if he had no right to do it.
     isMyFile = true;
   }
 
@@ -1749,14 +1749,14 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   if (IamRoot && isLocal)
   {
     usrEdit = new KLineEdit( gb );
-    KCompletion *kcom = usrEdit->completionObject();
-    kcom->setOrder(KCompletion::Sorted);
+    TDECompletion *kcom = usrEdit->completionObject();
+    kcom->setOrder(TDECompletion::Sorted);
     setpwent();
     for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++)
       kcom->addItem(TQString::fromLatin1(user->pw_name));
     endpwent();
-    usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto :
-                               KGlobalSettings::CompletionNone);
+    usrEdit->setCompletionMode((i < maxEntries) ? TDEGlobalSettings::CompletionAuto :
+                               TDEGlobalSettings::CompletionNone);
     usrEdit->setText(strOwner);
     gl->addWidget(usrEdit, 1, 1);
     connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
@@ -1829,11 +1829,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   if (IamRoot && isLocal)
   {
     grpEdit = new KLineEdit(gb);
-    KCompletion *kcom = new KCompletion;
+    TDECompletion *kcom = new TDECompletion;
     kcom->setItems(groupList);
     grpEdit->setCompletionObject(kcom, true);
     grpEdit->setAutoDeleteCompletionObject( true );
-    grpEdit->setCompletionMode(KGlobalSettings::CompletionAuto);
+    grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto);
     grpEdit->setText(strGroup);
     gl->addWidget(grpEdit, 2, 1);
     connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
@@ -2506,17 +2506,17 @@ void KFilePermissionsPropsPlugin::applyChanges()
       && !permissionChange && !ACLChange && !defaultACLChange )
     return;
 
-  KIO::Job * job;
+  TDEIO::Job * job;
   if (files.count() > 0) {
-    job = KIO::chmod( files, orFilePermissions, ~andFilePermissions,
+    job = TDEIO::chmod( files, orFilePermissions, ~andFilePermissions,
         owner, group, false );
     if ( ACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" );
     if ( defaultACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
 
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-        TQT_SLOT( slotChmodResult( KIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+        TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
     // Wait for job
     TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
     tqt_enter_modal(&dummy);
@@ -2524,15 +2524,15 @@ void KFilePermissionsPropsPlugin::applyChanges()
     tqt_leave_modal(&dummy);
   }
   if (dirs.count() > 0) {
-    job = KIO::chmod( dirs, orDirPermissions, ~andDirPermissions,
+    job = TDEIO::chmod( dirs, orDirPermissions, ~andDirPermissions,
         owner, group, recursive );
     if ( ACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "ACL_STRING", d->extendedACL.isValid()?d->extendedACL.asString():"ACL_DELETE" );
     if ( defaultACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
 
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-        TQT_SLOT( slotChmodResult( KIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+        TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
     // Wait for job
     TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
     tqt_enter_modal(&dummy);
@@ -2541,7 +2541,7 @@ void KFilePermissionsPropsPlugin::applyChanges()
   }
 }
 
-void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job )
+void KFilePermissionsPropsPlugin::slotChmodResult( TDEIO::Job * job )
 {
   kdDebug(250) << "KFilePermissionsPropsPlugin::slotChmodResult" << endl;
   if (job->error())
@@ -2915,10 +2915,10 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
   KSeparator* sep = new KSeparator( KSeparator::HLine, d->m_frame);
   layout->addMultiCellWidget(sep, 6, 6, 0, 1);
 
-  unmounted = new KIconButton( d->m_frame );
+  unmounted = new TDEIconButton( d->m_frame );
   int bsize = 66 + 2 * unmounted->style().pixelMetric(TQStyle::PM_ButtonMargin);
   unmounted->setFixedSize(bsize, bsize);
-  unmounted->setIconType(KIcon::Desktop, KIcon::Device);
+  unmounted->setIconType(TDEIcon::Desktop, TDEIcon::Device);
   layout->addWidget(unmounted, 7, 0);
 
   label = new TQLabel( i18n("Unmounted Icon"),  d->m_frame );
@@ -3042,8 +3042,8 @@ void KDevicePropsPlugin::slotFoundMountPoint( const unsigned long& kBSize,
   d->m_freeSpaceLabel->setText(
       // xgettext:no-c-format  --  Don't warn about translating the %1 out of %2 part.
       i18n("Available space out of total partition size (percent used)", "%1 out of %2 (%3% used)")
-      .arg(KIO::convertSizeFromKB(kBAvail))
-      .arg(KIO::convertSizeFromKB(kBSize))
+      .arg(TDEIO::convertSizeFromKB(kBAvail))
+      .arg(TDEIO::convertSizeFromKB(kBSize))
       .arg( 100 - (int)(100.0 * kBAvail / kBSize) ));
 
   d->m_freeSpaceBar->setProgress(percUsed, 100);
@@ -3272,7 +3272,7 @@ void KDesktopPropsPlugin::slotAddFiletype()
         }
 
         TQListViewItem *item = new TQListViewItem(majorGroup, min, (*it)->comment());
-        item->setPixmap(0, (*it)->pixmap(KIcon::Small, IconSize(KIcon::Small)));
+        item->setPixmap(0, (*it)->pixmap(TDEIcon::Small, IconSize(TDEIcon::Small)));
      }
      TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( "all" );
      if ( mit != majorMap.end())
@@ -3402,11 +3402,11 @@ void KDesktopPropsPlugin::applyChanges()
   config.sync();
 
   // KSycoca update needed?
-  TQString sycocaPath = KGlobal::dirs()->relativeLocation("apps", path);
+  TQString sycocaPath = TDEGlobal::dirs()->relativeLocation("apps", path);
   bool updateNeeded = !sycocaPath.startsWith("/");
   if (!updateNeeded)
   {
-     sycocaPath = KGlobal::dirs()->relativeLocation("xdgdata-apps", path);
+     sycocaPath = TDEGlobal::dirs()->relativeLocation("xdgdata-apps", path);
      updateNeeded = !sycocaPath.startsWith("/");
   }
   if (updateNeeded)
@@ -3446,7 +3446,7 @@ void KDesktopPropsPlugin::slotAdvanced()
 
   // check to see if we use konsole if not do not add the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+  TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
 						  TQString::fromLatin1("konsole"));
 
@@ -3487,8 +3487,8 @@ void KDesktopPropsPlugin::slotAdvanced()
     w->dcopCombo->setCurrentItem(0);
 
   // Provide username completion up to 1000 users.
-  KCompletion *kcom = new KCompletion;
-  kcom->setOrder(KCompletion::Sorted);
+  TDECompletion *kcom = new TDECompletion;
+  kcom->setOrder(TDECompletion::Sorted);
   struct passwd *pw;
   int i, maxEntries = 1000;
   setpwent();
@@ -3499,7 +3499,7 @@ void KDesktopPropsPlugin::slotAdvanced()
   {
     w->suidEdit->setCompletionObject(kcom, true);
     w->suidEdit->setAutoDeleteCompletionObject( true );
-    w->suidEdit->setCompletionMode(KGlobalSettings::CompletionAuto);
+    w->suidEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto);
   }
   else
   {
@@ -3672,7 +3672,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   // check to see if we use konsole if not do not add the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+  TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
 						  TQString::fromLatin1("konsole"));
 
@@ -3761,8 +3761,8 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   enableSuidEdit();
 
   // Provide username completion up to 1000 users.
-  KCompletion *kcom = new KCompletion;
-  kcom->setOrder(KCompletion::Sorted);
+  TDECompletion *kcom = new TDECompletion;
+  kcom->setOrder(TDECompletion::Sorted);
   struct passwd *pw;
   int i, maxEntries = 1000;
   setpwent();
@@ -3773,7 +3773,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   {
     suidEdit->setCompletionObject(kcom, true);
     suidEdit->setAutoDeleteCompletionObject( true );
-    suidEdit->setCompletionMode(KGlobalSettings::CompletionAuto);
+    suidEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto);
   }
   else
   {
@@ -3887,14 +3887,14 @@ void KExecPropsPlugin::slotBrowseExec()
     execEdit->setText( path );
 }
 
-class KApplicationPropsPlugin::KApplicationPropsPluginPrivate
+class TDEApplicationPropsPlugin::TDEApplicationPropsPluginPrivate
 {
 public:
-  KApplicationPropsPluginPrivate()
+  TDEApplicationPropsPluginPrivate()
   {
       m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh?
   }
-  ~KApplicationPropsPluginPrivate()
+  ~TDEApplicationPropsPluginPrivate()
   {
   }
 
@@ -3902,10 +3902,10 @@ public:
   bool m_kdesktopMode;
 };
 
-KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
+TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props )
   : KPropsDlgPlugin( _props )
 {
-  d = new KApplicationPropsPluginPrivate;
+  d = new TDEApplicationPropsPluginPrivate;
   d->m_frame = properties->addPage(i18n("&Application"));
   TQVBoxLayout *toplayout = new TQVBoxLayout( d->m_frame, 0, KDialog::spacingHint());
 
@@ -4043,23 +4043,23 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props )
            this, TQT_SIGNAL( changed() ) );
 }
 
-KApplicationPropsPlugin::~KApplicationPropsPlugin()
+TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin()
 {
   delete d;
 }
 
-// TQString KApplicationPropsPlugin::tabName () const
+// TQString TDEApplicationPropsPlugin::tabName () const
 // {
 //   return i18n ("&Application");
 // }
 
-void KApplicationPropsPlugin::updateButton()
+void TDEApplicationPropsPlugin::updateButton()
 {
     addExtensionButton->setEnabled(availableExtensionsList->currentItem()>-1);
     delExtensionButton->setEnabled(extensionsList->currentItem()>-1);
 }
 
-void KApplicationPropsPlugin::addMimeType( const TQString & name )
+void TDEApplicationPropsPlugin::addMimeType( const TQString & name )
 {
   // Add a mimetype to the list of available mime types if not in the extensionsList
 
@@ -4076,13 +4076,13 @@ void KApplicationPropsPlugin::addMimeType( const TQString & name )
   }
 }
 
-bool KApplicationPropsPlugin::supports( KFileItemList _items )
+bool TDEApplicationPropsPlugin::supports( KFileItemList _items )
 {
   // same constraints as KExecPropsPlugin : desktop file with Type = Application
   return KExecPropsPlugin::supports( _items );
 }
 
-void KApplicationPropsPlugin::applyChanges()
+void TDEApplicationPropsPlugin::applyChanges()
 {
   TQString path = properties->kurl().path();
 
@@ -4121,7 +4121,7 @@ void KApplicationPropsPlugin::applyChanges()
   config.sync();
 }
 
-void KApplicationPropsPlugin::slotAddExtension()
+void TDEApplicationPropsPlugin::slotAddExtension()
 {
   TQListBoxItem *item = availableExtensionsList->firstItem();
   TQListBoxItem *nextItem;
@@ -4143,7 +4143,7 @@ void KApplicationPropsPlugin::slotAddExtension()
   updateButton();
 }
 
-void KApplicationPropsPlugin::slotDelExtension()
+void TDEApplicationPropsPlugin::slotDelExtension()
 {
   TQListBoxItem *item = extensionsList->firstItem();
   TQListBoxItem *nextItem;
diff --git a/kio/kfile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h
index 91439f8cc..c67659ba7 100644
--- a/kio/kfile/kpropertiesdialog.h
+++ b/tdeio/tdefile/kpropertiesdialog.h
@@ -33,7 +33,7 @@
 
 #include <kdemacros.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdialogbase.h>
 
 class TQLineEdit;
@@ -42,13 +42,13 @@ class TQPushButton;
 class KLineEdit;
 class KURLRequester;
 class TQButton;
-class KIconButton;
+class TDEIconButton;
 class KPropsDlgPlugin;
 class TQComboBox;
 
 #define KPropsPage KPropsDlgPlugin
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 /**
  * The main properties dialog class.
@@ -67,7 +67,7 @@ namespace KIO { class Job; }
  * If you are looking for more flexibility, see KFileMetaInfo and
  * KFileMetaInfoWidget.
  */
-class KIO_EXPORT KPropertiesDialog : public KDialogBase
+class TDEIO_EXPORT KPropertiesDialog : public KDialogBase
 {
   Q_OBJECT
 
@@ -142,7 +142,7 @@ public:
    * @param name is the internal name.
    * @param modal tells the dialog whether it should be modal.
    * IMPORTANT: This constructor, together with modal=true, leads to a grave
-   * display bug (due to KIO::stat() being run before the dialog has all the
+   * display bug (due to TDEIO::stat() being run before the dialog has all the
    * necessary information). Do not use this combination for now.
    * For local files with a known mimetype, simply create a KFileItem and pass
    * it to the other constructor.
@@ -412,7 +412,7 @@ private:
   TQPtrList<KPropsDlgPlugin> m_pageList;
 
 private slots:
-  void slotStatResult( KIO::Job * ); // No longer used
+  void slotStatResult( TDEIO::Job * ); // No longer used
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
@@ -434,7 +434,7 @@ private:
  * You can also include X-TDE-Protocol=file if you want that plugin
  * to be loaded only for local files, for instance.
  */
-class KIO_EXPORT KPropsDlgPlugin : public TQObject
+class TDEIO_EXPORT KPropsDlgPlugin : public TQObject
 {
   Q_OBJECT
 public:
@@ -492,7 +492,7 @@ private:
  *  This plugin displays the name of the file, its size and access times.
  * @internal
  */
-class KIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -523,10 +523,10 @@ public:
 
 protected slots:
   void slotEditFileType();
-  void slotCopyFinished( KIO::Job * );
-  void slotFileRenamed( KIO::Job *, const KURL &, const KURL & );
+  void slotCopyFinished( TDEIO::Job * );
+  void slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & );
   void slotDirSizeUpdate();
-  void slotDirSizeFinished( KIO::Job * );
+  void slotDirSizeFinished( TDEIO::Job * );
   void slotFoundMountPoint( const TQString& mp, unsigned long kBSize,
 			    unsigned long kBUsed, unsigned long kBAvail );
   void slotSizeStop();
@@ -568,7 +568,7 @@ private:
  * the owner of a file.
  * @internal
  */
-class KIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -600,7 +600,7 @@ public:
 
 private slots:
 
-  void slotChmodResult( KIO::Job * );
+  void slotChmodResult( TDEIO::Job * );
   void slotShowAdvancedPermissions();
 
 private:
@@ -654,7 +654,7 @@ private:
  * Such files are used to represent a program in kicker and konqueror.
  * @internal
  */
-class KIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -670,7 +670,7 @@ public:
 
 private:
   KURLRequester *URLEdit;
-  KIconButton *iconBox;
+  TDEIconButton *iconBox;
 
   TQString URLStr;
   TQString iconStr;
@@ -689,7 +689,7 @@ private:
  * Type=MimeType
  * @internal
  */
-class KIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -719,7 +719,7 @@ private:
  * Properties plugin for device .desktop files
  * @internal
  */
-class KIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -746,8 +746,8 @@ private:
   TQLabel* mountpoint;
   TQCheckBox* readonly;
   void* unused;
-  //KIconButton* mounted;
-  KIconButton* unmounted;
+  //TDEIconButton* mounted;
+  TDEIconButton* unmounted;
 
   TQStringList m_devicelist;
   int indexDevice;
@@ -771,7 +771,7 @@ class KPropertiesDesktopBase;
  * Such files are used to represent a program in kicker and konqueror.
  * @internal
  */
-class KIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -822,7 +822,7 @@ private:
  * @deprecated replaced with KDesktopPropsPlugin
  */
  /// Remove in KDE4
-class KIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
@@ -878,15 +878,15 @@ private:
  * @deprecated replaced with KDesktopPropsPlugin
  */
  /// Remove in KDE4
-class KIO_EXPORT_DEPRECATED KApplicationPropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
 {
   Q_OBJECT
 public:
   /**
    * Constructor
    */
-  KApplicationPropsPlugin( KPropertiesDialog *_props );
-  virtual ~KApplicationPropsPlugin();
+  TDEApplicationPropsPlugin( KPropertiesDialog *_props );
+  virtual ~TDEApplicationPropsPlugin();
 
   virtual void applyChanges();
 
@@ -910,8 +910,8 @@ private:
   TQPushButton *addExtensionButton;
   TQPushButton *delExtensionButton;
 
-  class KApplicationPropsPluginPrivate;
-  KApplicationPropsPluginPrivate *d;
+  class TDEApplicationPropsPluginPrivate;
+  TDEApplicationPropsPluginPrivate *d;
 };
 
 #endif
diff --git a/kio/kfile/kpropertiesmimetypebase.ui b/tdeio/tdefile/kpropertiesmimetypebase.ui
index df7c796da..1e1848206 100644
--- a/kio/kfile/kpropertiesmimetypebase.ui
+++ b/tdeio/tdefile/kpropertiesmimetypebase.ui
@@ -30,7 +30,7 @@
                 <cstring>listView</cstring>
             </property>
         </widget>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>Mimetype</string>
@@ -64,7 +64,7 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kio/kfile/kpropsdlg.h b/tdeio/tdefile/kpropsdlg.h
index 502a346e9..502a346e9 100644
--- a/kio/kfile/kpropsdlg.h
+++ b/tdeio/tdefile/kpropsdlg.h
diff --git a/kio/kfile/kpropsdlgplugin.desktop b/tdeio/tdefile/kpropsdlgplugin.desktop
index f74e3895e..f74e3895e 100644
--- a/kio/kfile/kpropsdlgplugin.desktop
+++ b/tdeio/tdefile/kpropsdlgplugin.desktop
diff --git a/kio/kfile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index ee79b4e58..2aa79353f 100644
--- a/kio/kfile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -30,22 +30,22 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeaboutdata.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprotocolinfo.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
 #include <kurlrequester.h>
-#include <kio/global.h>
-#include <kio/netaccess.h>
+#include <tdeio/global.h>
+#include <tdeio/netaccess.h>
 
 #include "kurlbar.h"
 
@@ -89,8 +89,8 @@ public:
 
 KURLBarItem::KURLBarItem( KURLBar *parent,
                           const KURL& url, bool persistent, const TQString& description,
-                          const TQString& icon, KIcon::Group group )
-    : TQListBoxPixmap( KIconLoader::unknown() /*, parent->listBox()*/ ),
+                          const TQString& icon, TDEIcon::Group group )
+    : TQListBoxPixmap( TDEIconLoader::unknown() /*, parent->listBox()*/ ),
       m_url( url ),
       m_pixmap( 0L ),
       m_parent( parent ),
@@ -101,8 +101,8 @@ KURLBarItem::KURLBarItem( KURLBar *parent,
 
 KURLBarItem::KURLBarItem( KURLBar *parent,
                           const KURL& url, const TQString& description,
-                          const TQString& icon, KIcon::Group group )
-    : TQListBoxPixmap( KIconLoader::unknown() /*, parent->listBox()*/ ),
+                          const TQString& icon, TDEIcon::Group group )
+    : TQListBoxPixmap( TDEIconLoader::unknown() /*, parent->listBox()*/ ),
       m_url( url ),
       m_pixmap( 0L ),
       m_parent( parent ),
@@ -111,7 +111,7 @@ KURLBarItem::KURLBarItem( KURLBar *parent,
     init( icon, group, description, true /*persistent*/ );
 }
 
-void KURLBarItem::init( const TQString& icon, KIcon::Group group,
+void KURLBarItem::init( const TQString& icon, TDEIcon::Group group,
                         const TQString& description, bool persistent )
 {
     d = new KURLBarItemPrivate;
@@ -134,7 +134,7 @@ void KURLBarItem::setURL( const KURL& url )
         setText( url.fileName() );
 }
 
-void KURLBarItem::setIcon( const TQString& icon, KIcon::Group group )
+void KURLBarItem::setIcon( const TQString& icon, TDEIcon::Group group )
 {
     m_icon  = icon;
     m_group = group;
@@ -142,8 +142,8 @@ void KURLBarItem::setIcon( const TQString& icon, KIcon::Group group )
     if ( icon.isEmpty() )
         m_pixmap = KMimeType::pixmapForURL( m_url, 0, group, iconSize() );
     else
-        m_pixmap = KGlobal::iconLoader()->loadIcon( icon, group, iconSize(),
-                                                    KIcon::DefaultState );
+        m_pixmap = TDEGlobal::iconLoader()->loadIcon( icon, group, iconSize(),
+                                                    TDEIcon::DefaultState );
 }
 
 void KURLBarItem::setDescription( const TQString& desc )
@@ -203,7 +203,7 @@ void KURLBarItem::paint( TQPainter *p )
         p->setPen( oldPen );
     }
 
-    if ( m_parent->iconSize() < KIcon::SizeMedium ) {
+    if ( m_parent->iconSize() < TDEIcon::SizeMedium ) {
         // small icon -> draw icon next to text
 
         // ### mostly cut & paste of TQListBoxPixmap::paint() until Qt 3.1
@@ -274,7 +274,7 @@ TQSize KURLBarItem::sizeHint() const
     int hmin = 0;
     const KURLBarListBox *lb =static_cast<const KURLBarListBox*>(listBox());
 
-    if ( m_parent->iconSize() < KIcon::SizeMedium ) {
+    if ( m_parent->iconSize() < TDEIcon::SizeMedium ) {
         wmin = TQListBoxPixmap::width( lb ) + KDialog::spacingHint() * 2;
         hmin = TQListBoxPixmap::height( lb ) + KDialog::spacingHint() * 2;
     }
@@ -336,7 +336,7 @@ KURLBar::KURLBar( bool useGlobalItems, TQWidget *parent, const char *name, WFlag
       m_isModified( false ),
       m_isImmutable( false ),
       m_listBox( 0L ),
-      m_iconSize( KIcon::SizeMedium )
+      m_iconSize( TDEIcon::SizeMedium )
 {
     d = new KURLBarPrivate();
 
@@ -359,7 +359,7 @@ KURLBar::~KURLBar()
 
 KURLBarItem * KURLBar::insertItem(const KURL& url, const TQString& description,
                                   bool applicationLocal,
-                                  const TQString& icon, KIcon::Group group )
+                                  const TQString& icon, TDEIcon::Group group )
 {
     KURLBarItem *item = new KURLBarItem(this, url, description, icon, group);
     item->setApplicationLocal( applicationLocal );
@@ -368,7 +368,7 @@ KURLBarItem * KURLBar::insertItem(const KURL& url, const TQString& description,
 }
 
 KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& description,
-                                         const TQString& icon, KIcon::Group group )
+                                         const TQString& icon, TDEIcon::Group group )
 {
     KURLBarItem *item = new KURLBarItem(this, url, false, description, icon, group);
     m_listBox->insertItem( item );
@@ -406,7 +406,7 @@ void KURLBar::setListBox( KURLBarListBox *view )
         m_listBox->resize( width(), height() );
     }
 
-    m_listBox->setSelectionMode( KListBox::Single );
+    m_listBox->setSelectionMode( TDEListBox::Single );
     paletteChange( palette() );
     m_listBox->setFocusPolicy( TQ_TabFocus );
 
@@ -577,16 +577,16 @@ KURL KURLBar::currentURL() const
     return item ? item->url() : KURL();
 }
 
-void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup )
+void KURLBar::readConfig( TDEConfig *appConfig, const TQString& itemGroup )
 {
     m_isImmutable = appConfig->groupIsImmutable( itemGroup );
-    KConfigGroupSaver cs( appConfig, itemGroup );
+    TDEConfigGroupSaver cs( appConfig, itemGroup );
     d->defaultIconSize = m_iconSize;
     m_iconSize = appConfig->readNumEntry( "Speedbar IconSize", m_iconSize );
 
     if ( m_useGlobal ) { // read global items
-        KConfig *globalConfig = KGlobal::config();
-        KConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)"));
+        TDEConfig *globalConfig = TDEGlobal::config();
+        TDEConfigGroupSaver cs( globalConfig, (TQString)(itemGroup +" (Global)"));
         int num = globalConfig->readNumEntry( "Number of Entries" );
         for ( int i = 0; i < num; i++ ) {
             readItem( i, globalConfig, false );
@@ -600,7 +600,7 @@ void KURLBar::readConfig( KConfig *appConfig, const TQString& itemGroup )
     }
 }
 
-void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
+void KURLBar::readItem( int i, TDEConfig *config, bool applicationLocal )
 {
     TQString number = TQString::number( i );
     KURL url = KURL::fromPathOrURL( config->readPathEntry( TQString("URL_") + number ));
@@ -610,9 +610,9 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
     TQString description = config->readEntry( TQString("Description_") + number ); 
 
     if (description.isEmpty() && url.protocol()=="beagle") {
-        KIO::UDSEntry uds;
+        TDEIO::UDSEntry uds;
         const KURL kurl("beagle:?beagled-status");
-        if (!KIO::NetAccess::stat(kurl, uds))
+        if (!TDEIO::NetAccess::stat(kurl, uds))
             return;
 
         description = i18n("Desktop Search");
@@ -622,13 +622,13 @@ void KURLBar::readItem( int i, KConfig *config, bool applicationLocal )
                 description,
                 applicationLocal,
                 config->readEntry( TQString("Icon_") + number ),
-                static_cast<KIcon::Group>(
+                static_cast<TDEIcon::Group>(
                     config->readNumEntry( TQString("IconGroup_") + number )) );
 }
 
-void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup )
+void KURLBar::writeConfig( TDEConfig *config, const TQString& itemGroup )
 {
-    KConfigGroupSaver cs1( config, itemGroup );
+    TDEConfigGroupSaver cs1( config, itemGroup );
     if(!config->hasDefault("Speedbar IconSize") && m_iconSize == d->defaultIconSize )
         config->revertToDefault("Speedbar IconSize");
     else
@@ -685,7 +685,7 @@ void KURLBar::writeConfig( KConfig *config, const TQString& itemGroup )
     m_isModified = false;
 }
 
-void KURLBar::writeItem( KURLBarItem *item, int i, KConfig *config,
+void KURLBar::writeItem( KURLBarItem *item, int i, TDEConfig *config,
                          bool global )
 {
     if ( !item->isPersistent() )
@@ -737,7 +737,7 @@ void KURLBar::slotContextMenuRequested( TQListBoxItem *_item, const TQPoint& pos
 
     KURL lastURL = m_activeItem ? m_activeItem->url() : KURL();
 
-    bool smallIcons = m_iconSize < KIcon::SizeMedium;
+    bool smallIcons = m_iconSize < TDEIcon::SizeMedium;
     TQPopupMenu *popup = new TQPopupMenu();
     popup->insertItem( smallIcons ?
                        i18n("&Large Icons") : i18n("&Small Icons"),
@@ -761,7 +761,7 @@ void KURLBar::slotContextMenuRequested( TQListBoxItem *_item, const TQPoint& pos
     int result = popup->exec( pos );
     switch ( result ) {
         case IconSize:
-            setIconSize( smallIcons ? KIcon::SizeMedium : KIcon::SizeSmallMedium );
+            setIconSize( smallIcons ? TDEIcon::SizeMedium : TDEIcon::SizeSmallMedium );
             m_listBox->triggerUpdate( true );
             break;
         case AddItem:
@@ -829,7 +829,7 @@ bool KURLBar::editItem( KURLBarItem *item )
 
 
 KURLBarListBox::KURLBarListBox( TQWidget *parent, const char *name )
-    : KListBox( parent, name )
+    : TDEListBox( parent, name )
 {
     m_toolTip = new KURLBarToolTip( this );
     setAcceptDrops( true );
@@ -966,7 +966,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url,
     whatsThisText = i18n("<qt>This is the icon that will appear in the Quick Access panel.<p>"
                          "Click on the button to select a different icon.</qt>");
     label = new TQLabel( i18n("Choose an &icon:"), grid );
-    m_iconButton = new KIconButton( grid, "icon button" );
+    m_iconButton = new TDEIconButton( grid, "icon button" );
     m_iconButton->setIconSize( iconSize );
     if ( icon.isEmpty() )
         icon = KMimeType::iconForURL( url );
@@ -977,10 +977,10 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url,
 
     if ( allowGlobal ) {
         TQString appName;
-        if ( KGlobal::instance()->aboutData() )
-            appName = KGlobal::instance()->aboutData()->programName();
+        if ( TDEGlobal::instance()->aboutData() )
+            appName = TDEGlobal::instance()->aboutData()->programName();
         if ( appName.isEmpty() )
-            appName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
+            appName = TQString::fromLatin1( TDEGlobal::instance()->instanceName() );
         m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box );
         m_appLocal->setChecked( appLocal );
         TQWhatsThis::add( m_appLocal,
@@ -1043,7 +1043,7 @@ void KURLBar::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KURLBarListBox::virtual_hook( int id, void* data )
-{ KListBox::virtual_hook( id, data ); }
+{ TDEListBox::virtual_hook( id, data ); }
 
 
 #include "kurlbar.moc"
diff --git a/kio/kfile/kurlbar.h b/tdeio/tdefile/kurlbar.h
index 29a73ff34..4939fa830 100644
--- a/kio/kfile/kurlbar.h
+++ b/tdeio/tdefile/kurlbar.h
@@ -25,10 +25,10 @@
 
 #include <kdialogbase.h>
 #include <kicontheme.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kurl.h>
 
-class KConfig;
+class TDEConfig;
 class KURLBar;
 
 /**
@@ -39,7 +39,7 @@ class KURLBar;
  * @see KURLBar
  * @see KURLBarListBox
  */
-class KIO_EXPORT KURLBarItem : public TQListBoxPixmap
+class TDEIO_EXPORT KURLBarItem : public TQListBoxPixmap
 {
 public:
     /**
@@ -58,7 +58,7 @@ public:
     KURLBarItem( KURLBar *parent, const KURL& url, bool persistent,
                  const TQString& description = TQString::null,
                  const TQString& icon = TQString::null,
-                 KIcon::Group group = KIcon::Panel );
+                 TDEIcon::Group group = TDEIcon::Panel );
 
     /**
      * Creates a persistent KURLBarItem to be used in the @p parent KURLBar. You need
@@ -75,7 +75,7 @@ public:
     KURLBarItem( KURLBar *parent, const KURL& url,
                  const TQString& description = TQString::null,
                  const TQString& icon = TQString::null,
-                 KIcon::Group group = KIcon::Panel );
+                 TDEIcon::Group group = TDEIcon::Panel );
 
     /**
      * Destroys the item
@@ -89,11 +89,11 @@ public:
      */
     void setURL( const KURL& url );
     /**
-     * @p sets the icon for this item. See KIconLoader for a description
+     * @p sets the icon for this item. See TDEIconLoader for a description
      * of the icon groups.
      * @see icon
      */
-    void setIcon( const TQString& icon, KIcon::Group group = KIcon::Panel );
+    void setIcon( const TQString& icon, TDEIcon::Group group = TDEIcon::Panel );
     /**
      * Sets the description of this item that will be shown as item-text.
      * @see description
@@ -144,7 +144,7 @@ public:
      * returns the icon-group of this item (determines icon-effects).
      * @see setIcon
      */
-    KIcon::Group iconGroup() const              { return m_group; }
+    TDEIcon::Group iconGroup() const              { return m_group; }
     /**
      * returns the pixmap  of this item.
      */
@@ -178,7 +178,7 @@ protected:
 
 private:
     int iconSize() const;
-    void init( const TQString& icon, KIcon::Group group,
+    void init( const TQString& icon, TDEIcon::Group group,
                const TQString& description, bool persistent );
 
     KURL m_url;
@@ -186,7 +186,7 @@ private:
     TQString m_icon;
     TQString m_toolTip;
     TQPixmap m_pixmap;
-    KIcon::Group m_group;
+    TDEIcon::Group m_group;
     KURLBar *m_parent;
     bool m_appLocal :1;
 
@@ -215,7 +215,7 @@ class KURLBarListBox;
  * read and write the configuration of all the entries. It can differentiate
  * between global and local entries -- global entries will be saved in the
  * global configuration (kdeglobals), while local entries will be saved in
- * your application's KConfig object.
+ * your application's TDEConfig object.
  *
  * Due to the configurability, you usually only insert some default entries
  * once and then solely use the read and writeConfig methods to preserve the
@@ -227,7 +227,7 @@ class KURLBarListBox;
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  * @short A URL-bar widget, as used in the KFileDialog
  */
-class KIO_EXPORT KURLBar : public TQFrame
+class TDEIO_EXPORT KURLBar : public TQFrame
 {
     Q_OBJECT
 
@@ -257,7 +257,7 @@ public:
                                       const TQString& description,
                                       bool applicationLocal = true,
                                       const TQString& icon = TQString::null,
-                                      KIcon::Group group = KIcon::Panel );
+                                      TDEIcon::Group group = TDEIcon::Panel );
     /**
      * Inserts a new dynamic item into the KURLBar and returns the created
      * KURLBarItem.
@@ -271,7 +271,7 @@ public:
     virtual KURLBarItem * insertDynamicItem( const KURL& url,
                                              const TQString& description,
                                              const TQString& icon = TQString::null,
-                                             KIcon::Group group = KIcon::Panel );
+                                             TDEIcon::Group group = TDEIcon::Panel );
     /**
      * The items can be arranged either vertically in one column or
      * horizontally in one row.
@@ -299,13 +299,13 @@ public:
 
     /**
      * Sets the default iconsize to be used for items inserted with
-     * insertItem. By default KIcon::SizeMedium.
+     * insertItem. By default TDEIcon::SizeMedium.
      * @see iconsize
      */
     virtual void setIconSize( int size );
     /**
      * @returns the default iconsize used for items inserted with
-     * insertItem. By default KIcon::SizeMedium
+     * insertItem. By default TDEIcon::SizeMedium
      * @see setIconSize
      */
     int iconSize() const { return m_iconSize; }
@@ -331,27 +331,27 @@ public:
      * inside the group @p itemGroup. All items in there will be restored.
      * The reading of every item is delegated to the readItem() method.
      */
-    virtual void readConfig(  KConfig *config, const TQString& itemGroup );
+    virtual void readConfig(  TDEConfig *config, const TQString& itemGroup );
     /**
      * Call this method to save the current configuration into @p config,
      * inside the group @p iconGroup. The writeItem() method is used
      * to save each item.
      */
-    virtual void writeConfig( KConfig *config, const TQString& itemGroup );
+    virtual void writeConfig( TDEConfig *config, const TQString& itemGroup );
 
     /**
      * Called from readConfig() to read the i'th from @p config.
      * After reading a KURLBarItem is created and initialized with the read
      * values (as well as the given @p applicationLocal).
      */
-    virtual void readItem( int i, KConfig *config, bool applicationLocal );
+    virtual void readItem( int i, TDEConfig *config, bool applicationLocal );
     /**
      * Called from writeConfig() to save the KURLBarItem @p item as the
      * i'th entry in the config-object.
      * @p global tell whether it should be saved in the global configuration
-     * or not (using KConfig::writeEntry( key, value, true, global ) ).
+     * or not (using TDEConfig::writeEntry( key, value, true, global ) ).
      */
-    virtual void writeItem( KURLBarItem *item, int i, KConfig *, bool global );
+    virtual void writeItem( KURLBarItem *item, int i, TDEConfig *, bool global );
 
     /**
      * @returns the current KURLBarItem, or 0L if none.
@@ -483,14 +483,14 @@ class TQDragObject;
 class KURLBarToolTip;
 
 /**
- * This is the listbox used in KURLBar. It is a subclass of KListBox to support
+ * This is the listbox used in KURLBar. It is a subclass of TDEListBox to support
  * drag & drop and to set up the row / column mode.
  *
  * The widget has just one row or one column, depending on orientation().
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLBarListBox : public KListBox
+class TDEIO_EXPORT KURLBarListBox : public TDEListBox
 {
     Q_OBJECT
 
@@ -553,7 +553,7 @@ private:
 
 
 class TQCheckBox;
-class KIconButton;
+class TDEIconButton;
 class KLineEdit;
 class KURLRequester;
 
@@ -564,7 +564,7 @@ class KURLRequester;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLBarItemDialog : public KDialogBase
+class TDEIO_EXPORT KURLBarItemDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -601,7 +601,7 @@ public:
     KURLBarItemDialog( bool allowGlobal, const KURL& url,
                        const TQString& description, TQString icon,
                        bool appLocal = true,
-                       int iconSize = KIcon::SizeMedium,
+                       int iconSize = TDEIcon::SizeMedium,
                        TQWidget *parent = 0, const char *name = 0 );
     /**
      * Destroys the dialog.
@@ -640,9 +640,9 @@ protected:
      */
     KLineEdit     * m_edit;
     /**
-     * The KIconButton to configure the icon
+     * The TDEIconButton to configure the icon
      */
-    KIconButton   * m_iconButton;
+    TDEIconButton   * m_iconButton;
     /**
      * The TQCheckBox to modify the local/global setting
      */
diff --git a/kio/kfile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp
index 72c7cbd07..66fe8efb8 100644
--- a/kio/kfile/kurlcombobox.cpp
+++ b/tdeio/tdefile/kurlcombobox.cpp
@@ -20,9 +20,9 @@
 #include <tqlistbox.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 
 #include <kurlcombobox.h>
@@ -81,7 +81,7 @@ void KURLComboBox::init( Mode mode )
 TQStringList KURLComboBox::urls() const
 {
     kdDebug(250) << "::urls()" << endl;
-    //static const TQString &fileProt = KGlobal::staticQString("file:");
+    //static const TQString &fileProt = TDEGlobal::staticQString("file:");
     TQStringList list;
     TQString url;
     for ( int i = defaultList.count(); i < count(); i++ ) {
@@ -337,7 +337,7 @@ TQPixmap KURLComboBox::getPixmap( const KURL& url ) const
     if ( myMode == Directories )
         return d->dirpix;
     else
-        return KMimeType::pixmapForURL( url, 0, KIcon::Small );
+        return KMimeType::pixmapForURL( url, 0, TDEIcon::Small );
 }
 
 
diff --git a/kio/kfile/kurlcombobox.h b/tdeio/tdefile/kurlcombobox.h
index 0a9451075..a1fd9182d 100644
--- a/kio/kfile/kurlcombobox.h
+++ b/tdeio/tdefile/kurlcombobox.h
@@ -38,7 +38,7 @@
  * @short A combo box showing a number of recent URLs/directories
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLComboBox : public KComboBox
+class TDEIO_EXPORT KURLComboBox : public KComboBox
 {
     Q_OBJECT
     TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true)
diff --git a/kio/kfile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 5d1495127..7ecfd543d 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -24,16 +24,16 @@
 #include <tqtooltip.h>
 #include <tqapplication.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdirselectdialog.h>
-#include <kfiledialog.h>
-#include <kglobal.h>
+#include <tdefiledialog.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcompletion.h>
 #include <kurldrag.h>
 #include <kprotocolinfo.h>
@@ -124,7 +124,7 @@ public:
 		 receiver, TQT_SIGNAL( returnPressed( const TQString& ) ));
     }
 
-    void setCompletionObject( KCompletion *comp ) {
+    void setCompletionObject( TDECompletion *comp ) {
 	if ( combo )
 	    combo->setCompletionObject( comp );
 	else
@@ -205,7 +205,7 @@ void KURLRequester::init()
     if ( !d->combo && !d->edit )
 	d->edit = new KLineEdit( this, "line edit" );
 
-    myButton = new KURLDragPushButton( this, "kfile button");
+    myButton = new KURLDragPushButton( this, "tdefile button");
     TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
     TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
     myButton->setIconSet( iconSet );
@@ -226,8 +226,8 @@ void KURLRequester::init()
     myCompletion = new KURLCompletion();
     d->setCompletionObject( myCompletion );
 
-    KAccel *accel = new KAccel( this );
-    accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() ));
+    TDEAccel *accel = new TDEAccel( this );
+    accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() ));
     accel->readSettings();
 }
 
@@ -389,7 +389,7 @@ bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev )
     if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) )
     {
         if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut ))
-            // Forward focusin/focusout events to the urlrequester; needed by file form element in khtml
+            // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml
             TQApplication::sendEvent( this, ev );
     }
     return TQWidget::eventFilter( obj, ev );
diff --git a/kio/kfile/kurlrequester.h b/tdeio/tdefile/kurlrequester.h
index f5402788a..5655efa5b 100644
--- a/kio/kfile/kurlrequester.h
+++ b/tdeio/tdefile/kurlrequester.h
@@ -23,7 +23,7 @@
 #include <tqhbox.h>
 
 #include <keditlistbox.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kpushbutton.h>
 #include <kurl.h>
 
@@ -53,7 +53,7 @@ class TQTimer;
  * @short A widget to request a filename/url from the user
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLRequester : public TQHBox
+class TDEIO_EXPORT KURLRequester : public TQHBox
 {
     Q_OBJECT
     TQ_PROPERTY( TQString url READ url WRITE setURL )
@@ -269,7 +269,7 @@ private:
 protected slots:
     /**
      * Called when the button is pressed to open the filedialog.
-     * Also called when KStdAccel::Open (default is Ctrl-O) is pressed.
+     * Also called when TDEStdAccel::Open (default is Ctrl-O) is pressed.
      */
     void slotOpenDialog();
 
@@ -287,7 +287,7 @@ private:
 /**
  * URL requester with a combo box, for use in Designer
  */
-class KIO_EXPORT KURLComboRequester : public KURLRequester
+class TDEIO_EXPORT KURLComboRequester : public KURLRequester
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index 19409afdc..1a040a656 100644
--- a/kio/kfile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -26,13 +26,13 @@
 #include <tqstring.h>
 #include <tqtoolbutton.h>
 
-#include <kaccel.h>
-#include <kfiledialog.h>
-#include <kglobal.h>
+#include <tdeaccel.h>
+#include <tdefiledialog.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <krecentdocument.h>
+#include <tdelocale.h>
+#include <tderecentdocument.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
@@ -115,7 +115,7 @@ KURL KURLRequesterDlg::getURL(const TQString& dir, TQWidget *parent,
 
     const KURL& url = dlg.selectedURL();
     if (url.isValid())
-        KRecentDocument::add(url);
+        TDERecentDocument::add(url);
 
     return url;
 }
diff --git a/kio/kfile/kurlrequesterdlg.h b/tdeio/tdefile/kurlrequesterdlg.h
index 3f13a844d..07b70d745 100644
--- a/kio/kfile/kurlrequesterdlg.h
+++ b/tdeio/tdefile/kurlrequesterdlg.h
@@ -35,7 +35,7 @@ class KFileDialog;
  * @short Simple dialog to enter a filename/url.
  * @author Wilco Greven <greven@kde.org>
  */
-class KIO_EXPORT KURLRequesterDlg : public KDialogBase
+class TDEIO_EXPORT KURLRequesterDlg : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kdiroperator.cpp b/tdeio/tdefile/tdediroperator.cpp
index c5e339b1a..dc44aa8ba 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/tdeio/tdefile/tdediroperator.cpp
@@ -31,37 +31,37 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
 #include <kdirlister.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kstdaction.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
-#include <kio/previewjob.h>
-#include <kio/renamedlg.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/previewjob.h>
+#include <tdeio/renamedlg.h>
 #include <kpropertiesdialog.h>
 #include <kservicetypefactory.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kde_file.h>
 
-#include "config-kfile.h"
+#include "config-tdefile.h"
 #include "kcombiview.h"
-#include "kdiroperator.h"
-#include "kfiledetailview.h"
-#include "kfileiconview.h"
-#include "kfilepreview.h"
-#include "kfileview.h"
-#include "kfileitem.h"
-#include "kfilemetapreview.h"
+#include "tdediroperator.h"
+#include "tdefiledetailview.h"
+#include "tdefileiconview.h"
+#include "tdefilepreview.h"
+#include "tdefileview.h"
+#include "tdefileitem.h"
+#include "tdefilemetapreview.h"
 
 
 template class TQPtrStack<KURL>;
@@ -87,10 +87,10 @@ public:
     TQString lastURL; // used for highlighting a directory on cdUp
     bool onlyDoubleClickSelectsFiles;
     TQTimer *progressDelayTimer;
-    KActionSeparator *viewActionSeparator;
+    TDEActionSeparator *viewActionSeparator;
     int dropOptions;
 
-    KConfig *config;
+    TDEConfig *config;
     TQString configGroup;
 };
 
@@ -192,10 +192,10 @@ void KDirOperator::insertViewDependentActions()
    {
       if (viewActionCollection)
       {
-         disconnect( viewActionCollection, TQT_SIGNAL( inserted( KAction * )),
-               this, TQT_SLOT( slotViewActionAdded( KAction * )));
-         disconnect( viewActionCollection, TQT_SIGNAL( removed( KAction * )),
-               this, TQT_SLOT( slotViewActionRemoved( KAction * )));
+         disconnect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )),
+               this, TQT_SLOT( slotViewActionAdded( TDEAction * )));
+         disconnect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )),
+               this, TQT_SLOT( slotViewActionRemoved( TDEAction * )));
       }
 
       viewActionMenu->popupMenu()->clear();
@@ -223,24 +223,24 @@ void KDirOperator::insertViewDependentActions()
          TQStringList groups = viewActionCollection->groups();
          groups.prepend( TQString::null ); // actions without group
          TQStringList::ConstIterator git = groups.begin();
-         KActionPtrList list;
-         KAction *sep = actionCollection()->action("separator");
+         TDEActionPtrList list;
+         TDEAction *sep = actionCollection()->action("separator");
          for ( ; git != groups.end(); ++git )
          {
             if ( git != groups.begin() )
                viewActionMenu->insert( sep );
 
             list = viewActionCollection->actions( *git );
-            KActionPtrList::ConstIterator it = list.begin();
+            TDEActionPtrList::ConstIterator it = list.begin();
             for ( ; it != list.end(); ++it )
                viewActionMenu->insert( *it );
          }
       }
 
-      connect( viewActionCollection, TQT_SIGNAL( inserted( KAction * )),
-               TQT_SLOT( slotViewActionAdded( KAction * )));
-      connect( viewActionCollection, TQT_SIGNAL( removed( KAction * )),
-               TQT_SLOT( slotViewActionRemoved( KAction * )));
+      connect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )),
+               TQT_SLOT( slotViewActionAdded( TDEAction * )));
+      connect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )),
+               TQT_SLOT( slotViewActionRemoved( TDEAction * )));
    }
 }
 
@@ -271,7 +271,7 @@ void KDirOperator::setPreviewWidget(const TQWidget *w)
     delete myPreview;
     myPreview = w;
 
-    KToggleAction *preview = static_cast<KToggleAction*>(myActionCollection->action("preview"));
+    TDEToggleAction *preview = static_cast<TDEToggleAction*>(myActionCollection->action("preview"));
     preview->setEnabled( w != 0L );
     preview->setChecked( w != 0L );
     setView( static_cast<KFile::FileView>(m_viewKind) );
@@ -326,7 +326,7 @@ void KDirOperator::slotDefaultPreview()
     m_viewKind = m_viewKind | KFile::PreviewContents;
     if ( !myPreview ) {
         myPreview = new KFileMetaPreview( this );
-        (static_cast<KToggleAction*>( myActionCollection->action("preview") ))->setChecked(true);
+        (static_cast<TDEToggleAction*>( myActionCollection->action("preview") ))->setChecked(true);
     }
 
     setView( static_cast<KFile::FileView>(m_viewKind) );
@@ -388,13 +388,13 @@ void KDirOperator::mkdir()
     TQString where = url().pathOrURL();
     TQString name = i18n( "New Folder" );
     if ( url().isLocalFile() && TQFileInfo( url().path(+1) + name ).exists() )
-         name = KIO::RenameDlg::suggestName( url(), name );
+         name = TDEIO::RenameDlg::suggestName( url(), name );
 
     TQString dir = KInputDialog::getText( i18n( "New Folder" ),
                                          i18n( "Create new folder in:\n%1" ).arg( where ),
                                          name, &ok, this);
     if (ok)
-      mkdir( KIO::encodeFileName( dir ), true );
+      mkdir( TDEIO::encodeFileName( dir ), true );
 }
 
 bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
@@ -413,8 +413,8 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
     for ( ; it != dirs.end(); ++it )
     {
         url.addPath( *it );
-        exists = KIO::NetAccess::exists( url, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() );
+        exists = TDEIO::NetAccess::exists( url, false, 0 );
+        writeOk = !exists && TDEIO::NetAccess::mkdir( url, topLevelWidget() );
     }
 
     if ( exists ) // url was already existant
@@ -433,13 +433,13 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
     return writeOk;
 }
 
-KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
+TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
                                     bool ask, bool showProgress )
 {
     return del( items, this, ask, showProgress );
 }
 
-KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
+TDEIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
                                     TQWidget *parent,
                                     bool ask, bool showProgress )
 {
@@ -483,7 +483,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
     }
 
     if ( doIt ) {
-        KIO::DeleteJob *job = KIO::del( urls, false, showProgress );
+        TDEIO::DeleteJob *job = TDEIO::del( urls, false, showProgress );
         job->setWindow (topLevelWidget());
         job->setAutoErrorHandlingEnabled( true, parent );
         return job;
@@ -502,7 +502,7 @@ void KDirOperator::deleteSelected()
         del( *list );
 }
 
-KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
+TDEIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
                                     TQWidget *parent,
                                     bool ask, bool showProgress )
 {
@@ -546,7 +546,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
     }
 
     if ( doIt ) {
-        KIO::CopyJob *job = KIO::trash( urls, showProgress );
+        TDEIO::CopyJob *job = TDEIO::trash( urls, showProgress );
         job->setWindow (topLevelWidget());
         job->setAutoErrorHandlingEnabled( true, parent );
         return job;
@@ -555,12 +555,12 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
     return 0L;
 }
 
-void KDirOperator::trashSelected(KAction::ActivationReason reason, TQt::ButtonState state)
+void KDirOperator::trashSelected(TDEAction::ActivationReason reason, TQt::ButtonState state)
 {
     if ( !m_fileView )
         return;
 
-    if ( reason == KAction::PopupMenuActivation && ( state & ShiftButton ) ) {
+    if ( reason == TDEAction::PopupMenuActivation && ( state & ShiftButton ) ) {
         deleteSelected();
 	return;
     }
@@ -630,7 +630,7 @@ void KDirOperator::checkPath(const TQString &, bool /*takeFiles*/) // SLOT
         accept();
     }
 #endif
-    kdDebug(kfile_area) << "TODO KDirOperator::checkPath()" << endl;
+    kdDebug(tdefile_area) << "TODO KDirOperator::checkPath()" << endl;
 }
 
 void KDirOperator::setURL(const KURL& _newurl, bool clearforward)
@@ -718,7 +718,7 @@ void KDirOperator::pathChanged()
     // it may be, that we weren't ready at this time
     TQApplication::restoreOverrideCursor();
 
-    // when KIO::Job emits finished, the slot will restore the cursor
+    // when TDEIO::Job emits finished, the slot will restore the cursor
     TQApplication::setOverrideCursor( tqwaitCursor );
 
     if ( !isReadable( currUrl )) {
@@ -809,11 +809,11 @@ void KDirOperator::setMimeFilter( const TQStringList& mimetypes )
 
 bool KDirOperator::checkPreviewSupport()
 {
-    KToggleAction *previewAction = static_cast<KToggleAction*>( myActionCollection->action( "preview" ));
+    TDEToggleAction *previewAction = static_cast<TDEToggleAction*>( myActionCollection->action( "preview" ));
 
     bool hasPreviewSupport = false;
-    KConfig *kc = KGlobal::config();
-    KConfigGroupSaver cs( kc, ConfigGroup );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, ConfigGroup );
     if ( kc->readBoolEntry( "Show Default Preview", true ) )
         hasPreviewSupport = checkPreviewInternal();
 
@@ -823,7 +823,7 @@ bool KDirOperator::checkPreviewSupport()
 
 bool KDirOperator::checkPreviewInternal() const
 {
-    TQStringList supported = KIO::PreviewJob::supportedMimeTypes();
+    TQStringList supported = TDEIO::PreviewJob::supportedMimeTypes();
     // no preview support for directories?
     if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 )
         return false;
@@ -1122,7 +1122,7 @@ void KDirOperator::setDirLister( KDirLister *lister )
 
     TQWidget* mainWidget = topLevelWidget();
     dir->setMainWindow (mainWidget);
-    kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl;
+    kdDebug (tdefile_area) << "mainWidget=" << mainWidget << endl;
 
     connect( dir, TQT_SIGNAL( percent( int )),
              TQT_SLOT( slotProgress( int ) ));
@@ -1253,9 +1253,9 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
 
 void KDirOperator::setupActions()
 {
-    myActionCollection = new KActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
+    myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
 
-    actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
+    actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
     upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" );
     upAction->setText( i18n("Parent Folder") );
     backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" );
@@ -1263,33 +1263,33 @@ void KDirOperator::setupActions()
     homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" );
     homeAction->setText(i18n("Home Folder"));
     reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" );
-    actionSeparator = new KActionSeparator( myActionCollection, "separator" );
-    d->viewActionSeparator = new KActionSeparator( myActionCollection,
+    actionSeparator = new TDEActionSeparator( myActionCollection, "separator" );
+    d->viewActionSeparator = new TDEActionSeparator( myActionCollection,
                                                    "viewActionSeparator" );
-    mkdirAction = new KAction( i18n("New Folder..."), 0,
+    mkdirAction = new TDEAction( i18n("New Folder..."), 0,
                                  TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" );
-    KAction* trash = new KAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
-    connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
-	     this, TQT_SLOT( trashSelected( KAction::ActivationReason, TQt::ButtonState ) ) );
-    new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
+    TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
+    connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+	     this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+    new TDEAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
                   TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
     mkdirAction->setIcon( TQString::fromLatin1("folder_new") );
     reloadAction->setText( i18n("Reload") );
-    reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload ));
+    reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload ));
 
 
     // the sort menu actions
-    sortActionMenu = new KActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
-    byNameAction = new KRadioAction( i18n("By Name"), 0,
+    sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
+    byNameAction = new TDERadioAction( i18n("By Name"), 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ),
                                      myActionCollection, "by name" );
-    byDateAction = new KRadioAction( i18n("By Date"), 0,
+    byDateAction = new TDERadioAction( i18n("By Date"), 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ),
                                      myActionCollection, "by date" );
-    bySizeAction = new KRadioAction( i18n("By Size"), 0,
+    bySizeAction = new TDERadioAction( i18n("By Size"), 0,
                                      TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ),
                                      myActionCollection, "by size" );
-    reverseAction = new KToggleAction( i18n("Reverse"), 0,
+    reverseAction = new TDEToggleAction( i18n("Reverse"), 0,
                                        TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ),
                                        myActionCollection, "reversed" );
 
@@ -1299,9 +1299,9 @@ void KDirOperator::setupActions()
     bySizeAction->setExclusiveGroup( sortGroup );
 
 
-    dirsFirstAction = new KToggleAction( i18n("Folders First"), 0,
+    dirsFirstAction = new TDEToggleAction( i18n("Folders First"), 0,
                                          myActionCollection, "dirs first");
-    caseInsensitiveAction = new KToggleAction(i18n("Case Insensitive"), 0,
+    caseInsensitiveAction = new TDEToggleAction(i18n("Case Insensitive"), 0,
                                               myActionCollection, "case insensitive" );
 
     connect( dirsFirstAction, TQT_SIGNAL( toggled( bool ) ),
@@ -1312,24 +1312,24 @@ void KDirOperator::setupActions()
 
 
     // the view menu actions
-    viewActionMenu = new KActionMenu( i18n("&View"), myActionCollection, "view menu" );
+    viewActionMenu = new TDEActionMenu( i18n("&View"), myActionCollection, "view menu" );
     connect( viewActionMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
              TQT_SLOT( insertViewDependentActions() ));
 
-    shortAction = new KRadioAction( i18n("Short View"), "view_multicolumn",
-                                    KShortcut(), myActionCollection, "short view" );
-    detailedAction = new KRadioAction( i18n("Detailed View"), "view_detailed",
-                                       KShortcut(), myActionCollection, "detailed view" );
+    shortAction = new TDERadioAction( i18n("Short View"), "view_multicolumn",
+                                    TDEShortcut(), myActionCollection, "short view" );
+    detailedAction = new TDERadioAction( i18n("Detailed View"), "view_detailed",
+                                       TDEShortcut(), myActionCollection, "detailed view" );
 
-    showHiddenAction = new KToggleAction( i18n("Show Hidden Files"), KShortcut(),
+    showHiddenAction = new TDEToggleAction( i18n("Show Hidden Files"), TDEShortcut(),
                                           myActionCollection, "show hidden" );
 //    showHiddenAction->setCheckedState( i18n("Hide Hidden Files") );
-    separateDirsAction = new KToggleAction( i18n("Separate Folders"), KShortcut(),
+    separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(),
                                             TQT_TQOBJECT(this),
                                             TQT_SLOT(slotSeparateDirs()),
                                             myActionCollection, "separate dirs" );
-    KToggleAction *previewAction = new KToggleAction(i18n("Show Preview"),
-                                                     "thumbnail", KShortcut(),
+    TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"),
+                                                     "thumbnail", TDEShortcut(),
                                                      myActionCollection,
                                                      "preview" );
     previewAction->setCheckedState(i18n("Hide Preview"));
@@ -1348,7 +1348,7 @@ void KDirOperator::setupActions()
     connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( slotToggleHidden( bool ) ));
 
-    new KAction( i18n("Properties"), KShortcut(ALT+Key_Return), TQT_TQOBJECT(this),
+    new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this),
                  TQT_SLOT(slotProperties()), myActionCollection, "properties" );
 }
 
@@ -1383,11 +1383,11 @@ void KDirOperator::setupMenu(int whichActions)
     if (whichActions & FileActions)
     {
         actionMenu->insert( mkdirAction );
-        if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
+        if (currUrl.isLocalFile() && !(TDEApplication::keyboardMouseState() & TQt::ShiftButton))
             actionMenu->insert( myActionCollection->action( "trash" ) );
-        KConfig *globalconfig = KGlobal::config();
-        KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
-        if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) ||
+        TDEConfig *globalconfig = TDEGlobal::config();
+        TDEConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
+        if (!currUrl.isLocalFile() || (TDEApplication::keyboardMouseState() & TQt::ShiftButton) ||
             globalconfig->readBoolEntry("ShowDeleteCommand", false))
             actionMenu->insert( myActionCollection->action( "delete" ) );
         actionMenu->insert( actionSeparator );
@@ -1439,7 +1439,7 @@ void KDirOperator::updateViewActions()
     detailedAction->setChecked( KFile::isDetailView( fv ));
 }
 
-void KDirOperator::readConfig( KConfig *kc, const TQString& group )
+void KDirOperator::readConfig( TDEConfig *kc, const TQString& group )
 {
     if ( !kc )
         return;
@@ -1495,7 +1495,7 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group )
     kc->setGroup( oldGroup );
 }
 
-void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
+void KDirOperator::writeConfig( TDEConfig *kc, const TQString& group )
 {
     if ( !kc )
         return;
@@ -1533,7 +1533,7 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
             kc->writeEntry( TQString::fromLatin1("Separate Directories"),
                             separateDirsAction->isChecked() );
 
-        KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview"));
+        TDEToggleAction *previewAction = static_cast<TDEToggleAction*>(myActionCollection->action("preview"));
         if ( previewAction->isEnabled() ) {
             bool hasPreview = previewAction->isChecked();
             kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview );
@@ -1633,7 +1633,7 @@ void KDirOperator::clearHistory()
     forwardAction->setEnabled( false );
 }
 
-void KDirOperator::slotViewActionAdded( KAction *action )
+void KDirOperator::slotViewActionAdded( TDEAction *action )
 {
     if ( viewActionMenu->popupMenu()->count() == 5 ) // need to add a separator
 	viewActionMenu->insert( d->viewActionSeparator );
@@ -1641,7 +1641,7 @@ void KDirOperator::slotViewActionAdded( KAction *action )
     viewActionMenu->insert( action );
 }
 
-void KDirOperator::slotViewActionRemoved( KAction *action )
+void KDirOperator::slotViewActionRemoved( TDEAction *action )
 {
     viewActionMenu->remove( action );
 
@@ -1718,13 +1718,13 @@ void KDirOperator::slotRefreshItems( const KFileItemList& items )
         m_fileView->updateView( it.current() );
 }
 
-void KDirOperator::setViewConfig( KConfig *config, const TQString& group )
+void KDirOperator::setViewConfig( TDEConfig *config, const TQString& group )
 {
     d->config = config;
     d->configGroup = group;
 }
 
-KConfig * KDirOperator::viewConfig()
+TDEConfig * KDirOperator::viewConfig()
 {
     return d->config;
 }
@@ -1737,4 +1737,4 @@ TQString KDirOperator::viewConfigGroup() const
 void KDirOperator::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kdiroperator.moc"
+#include "tdediroperator.moc"
diff --git a/kio/kfile/kdiroperator.h b/tdeio/tdefile/tdediroperator.h
index 85bcf9187..95bf5c5ba 100644
--- a/kio/kfile/kdiroperator.h
+++ b/tdeio/tdefile/tdediroperator.h
@@ -24,24 +24,24 @@
 #include <tqwidget.h>
 #include <tqptrstack.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcompletion.h>
 #include <kdirlister.h>
-#include <kfileview.h>
-#include <kfileitem.h>
-#include <kfile.h>
+#include <tdefileview.h>
+#include <tdefileitem.h>
+#include <tdefile.h>
 
 class TQPopupMenu;
 class TQTimer;
 
-class KAction;
+class TDEAction;
 class KDirLister;
-class KToggleAction;
-class KActionSeparator;
-class KActionMenu;
+class TDEToggleAction;
+class TDEActionSeparator;
+class TDEActionMenu;
 class TQWidgetStack;
 class KProgress;
-namespace KIO {
+namespace TDEIO {
   class CopyJob;
   class DeleteJob;
 }
@@ -60,7 +60,7 @@ namespace KIO {
  * show either a simple or detailed view and additionally a preview widget
  * (see setPreviewWidget()). KImageFilePreview is one implementation
  * of a preview widget, that displays previews for all supported filetypes
- * utilizing KIO::PreviewJob.
+ * utilizing TDEIO::PreviewJob.
  *
  * Currently, those classes don't support Drag&Drop out of the box -- there
  * you have to use your own view-classes. You can use some DnD-aware views
@@ -82,7 +82,7 @@ namespace KIO {
  *   connect(op, TQT_SIGNAL(finishedLoading()),
  *           TQT_SLOT(slotLoadingFinished()));
  *
- *   op->readConfig( KGlobal::config(), "Your KDiroperator ConfigGroup" );
+ *   op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" );
  *   op->setView(KFile::Default);
  * \endcode
  *
@@ -94,7 +94,7 @@ namespace KIO {
  * @short A widget for displaying files and browsing directories.
  * @author Stephan Kulow <coolo@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KDirOperator : public TQWidget
+class TDEIO_EXPORT KDirOperator : public TQWidget
 {
     Q_OBJECT
 
@@ -319,33 +319,33 @@ class KIO_EXPORT KDirOperator : public TQWidget
     int numFiles() const;
 
     /**
-     * @returns a KCompletion object, containing all filenames and
+     * @returns a TDECompletion object, containing all filenames and
      * directories of the current directory/URL.
      * You can use it to insert it into a KLineEdit or KComboBox
      * Note: it will only contain files, after prepareCompletionObjects()
      * has been called. It will be implicitly called from makeCompletion()
      * or makeDirCompletion()
      */
-    KCompletion * completionObject() const {
-	return const_cast<KCompletion *>( &myCompletion );
+    TDECompletion * completionObject() const {
+	return const_cast<TDECompletion *>( &myCompletion );
     }
 
     /**
-     * @returns a KCompletion object, containing only all directories of the
+     * @returns a TDECompletion object, containing only all directories of the
      * current directory/URL.
      * You can use it to insert it into a KLineEdit or KComboBox
      * Note: it will only contain directories, after
      * prepareCompletionObjects() has been called. It will be implicitly
      * called from makeCompletion() or makeDirCompletion()
      */
-    KCompletion *dirCompletionObject() const {
-	return const_cast<KCompletion *>( &myDirCompletion );
+    TDECompletion *dirCompletionObject() const {
+	return const_cast<TDECompletion *>( &myDirCompletion );
     }
 
     /**
      * an accessor to a collection of all available Actions. The actions
      * are static, they will be there all the time (no need to connect to
-     * the signals KActionCollection::inserted() or removed().
+     * the signals TDEActionCollection::inserted() or removed().
      *
      * There are the following actions:
      *
@@ -387,7 +387,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      *
      * @returns all available Actions
      */
-    KActionCollection * actionCollection() const { return myActionCollection; }
+    TDEActionCollection * actionCollection() const { return myActionCollection; }
 
     /**
      * Sets the config object and the to be used group in KDirOperator. This
@@ -400,23 +400,23 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * instantiation can make use of it already.
      *
      * Note that KDirOperator does NOT take ownership of that object (typically
-     * it's KGlobal::config() anyway.
+     * it's TDEGlobal::config() anyway.
      *
      * @see viewConfig
      * @see viewConfigGroup
      * @since 3.1
      */
 	// ### KDE4: make virtual
-    void setViewConfig( KConfig *config, const TQString& group );
+    void setViewConfig( TDEConfig *config, const TQString& group );
 
     /**
-     * Returns the KConfig object used for saving and restoring view's
+     * Returns the TDEConfig object used for saving and restoring view's
      * configuration.
-     * @returns the KConfig object used for saving and restoring view's
+     * @returns the TDEConfig object used for saving and restoring view's
      * configuration.
      * @since 3.1
      */
-    KConfig *viewConfig();
+    TDEConfig *viewConfig();
 
     /**
      * Returns the group name used for saving and restoring view's
@@ -440,7 +440,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @see setViewConfig
      * @see writeConfig
      */
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
 
     /**
      * Saves the current settings like sorting, simple or detailed view.
@@ -448,7 +448,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @see readConfig
      * @see setViewConfig
      */
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null );
 
 
     /**
@@ -482,18 +482,18 @@ class KIO_EXPORT KDirOperator : public TQWidget
     bool mkdir( const TQString& directory, bool enterDirectory = true );
 
     /**
-     * Starts and returns a KIO::DeleteJob to delete the given @p items.
+     * Starts and returns a TDEIO::DeleteJob to delete the given @p items.
      *
      * @param items the list of items to be deleted
      * @param ask specifies whether a confirmation dialog should be shown
      * @param showProgress passed to the DeleteJob to show a progress dialog
      */
 	// ### KDE4: make virtual
-    KIO::DeleteJob * del( const KFileItemList& items,
+    TDEIO::DeleteJob * del( const KFileItemList& items,
                           bool ask = true, bool showProgress = true );
 
     /**
-     * Starts and returns a KIO::DeleteJob to delete the given @p items.
+     * Starts and returns a TDEIO::DeleteJob to delete the given @p items.
      *
      * @param items the list of items to be deleted
      * @param parent the parent widget used for the confirmation dialog
@@ -502,7 +502,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @since 3.1
      */
 	// ### KDE4: make virtual
-    KIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent,
+    TDEIO::DeleteJob * del( const KFileItemList& items, TQWidget *parent,
                           bool ask = true, bool showProgress = true );
 
     /**
@@ -563,7 +563,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
     void setDropOptions(int options);
 
     /**
-     * Starts and returns a KIO::CopyJob to trash the given @p items.
+     * Starts and returns a TDEIO::CopyJob to trash the given @p items.
      *
      * @param items the list of items to be trashed
      * @param parent the parent widget used for the confirmation dialog
@@ -572,7 +572,7 @@ class KIO_EXPORT KDirOperator : public TQWidget
      * @since 3.4
      */
      // ### KDE4: make virtual
-    KIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent,
+    TDEIO::CopyJob * trash( const KFileItemList& items, TQWidget *parent,
                        bool ask = true, bool showProgress = true );
 
 protected:
@@ -634,7 +634,7 @@ protected:
     void prepareCompletionObjects();
 
     /**
-     * Checks if there support from KIO::PreviewJob for the currently
+     * Checks if there support from TDEIO::PreviewJob for the currently
      * shown files, taking mimeFilter() and nameFilter() into account
      * Enables/disables the preview-action accordingly.
      */
@@ -710,7 +710,7 @@ public slots:
      * @since 3.4
      */
 	// ### KDE4: make virtual
-    void trashSelected(KAction::ActivationReason, TQt::ButtonState);
+    void trashSelected(TDEAction::ActivationReason, TQt::ButtonState);
 
 protected slots:
     /**
@@ -838,8 +838,8 @@ private:
     KDirLister *dir;
     KURL currUrl;
 
-    KCompletion myCompletion;
-    KCompletion myDirCompletion;
+    TDECompletion myCompletion;
+    TDECompletion myDirCompletion;
     bool myCompleteListDirty;
     TQDir::SortSpec mySorting;
 
@@ -873,32 +873,32 @@ private:
 
     // actions for the popupmenus
     // ### clean up all those -- we have them all in the actionMenu!
-    KActionMenu *actionMenu;
-
-    KAction 	*backAction;
-    KAction 	*forwardAction;
-    KAction 	*homeAction;
-    KAction 	*upAction;
-    KAction 	*reloadAction;
-    KActionSeparator *actionSeparator;
-    KAction 	*mkdirAction;
-
-    KActionMenu *sortActionMenu;
-    KRadioAction *byNameAction;
-    KRadioAction *byDateAction;
-    KRadioAction *bySizeAction;
-    KToggleAction *reverseAction;
-    KToggleAction *dirsFirstAction;
-    KToggleAction *caseInsensitiveAction;
-
-    KActionMenu *viewActionMenu;
-    KRadioAction *shortAction;
-    KRadioAction *detailedAction;
-    KToggleAction *showHiddenAction;
-    KToggleAction *separateDirsAction;
-
-    KActionCollection *myActionCollection;
-    KActionCollection *viewActionCollection;
+    TDEActionMenu *actionMenu;
+
+    TDEAction 	*backAction;
+    TDEAction 	*forwardAction;
+    TDEAction 	*homeAction;
+    TDEAction 	*upAction;
+    TDEAction 	*reloadAction;
+    TDEActionSeparator *actionSeparator;
+    TDEAction 	*mkdirAction;
+
+    TDEActionMenu *sortActionMenu;
+    TDERadioAction *byNameAction;
+    TDERadioAction *byDateAction;
+    TDERadioAction *bySizeAction;
+    TDEToggleAction *reverseAction;
+    TDEToggleAction *dirsFirstAction;
+    TDEToggleAction *caseInsensitiveAction;
+
+    TDEActionMenu *viewActionMenu;
+    TDERadioAction *shortAction;
+    TDERadioAction *detailedAction;
+    TDEToggleAction *showHiddenAction;
+    TDEToggleAction *separateDirsAction;
+
+    TDEActionCollection *myActionCollection;
+    TDEActionCollection *viewActionCollection;
 
 private slots:
     /**
@@ -926,8 +926,8 @@ private slots:
     void slotCanceled();
     void slotRedirected( const KURL& );
 
-    void slotViewActionAdded( KAction * );
-    void slotViewActionRemoved( KAction * );
+    void slotViewActionAdded( TDEAction * );
+    void slotViewActionRemoved( TDEAction * );
     void slotViewSortingChanged( TQDir::SortSpec );
 
     void slotClearView();
diff --git a/kio/kfile/kfile.h b/tdeio/tdefile/tdefile.h
index 8e6541cb3..daa630af0 100644
--- a/kio/kfile/kfile.h
+++ b/tdeio/tdefile/tdefile.h
@@ -15,8 +15,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KFILE_H
-#define KFILE_H
+#ifndef TDEFILE_H
+#define TDEFILE_H
 
 #include <tqdir.h>
 
@@ -24,11 +24,11 @@
 
 /**
  * KFile is a class which provides a namespace for some enumerated
- * values associated with the kfile library.  You will never need to
+ * values associated with the tdefile library.  You will never need to
  * construct a KFile object itself.
  */
 
-class KIO_EXPORT KFile
+class TDEIO_EXPORT KFile
 {
 public:
     /**
@@ -126,4 +126,4 @@ public:
 
 };
 
-#endif // KFILE_H
+#endif // TDEFILE_H
diff --git a/kio/kfile/kfilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp
index f78fe2547..1518b48e5 100644
--- a/kio/kfile/kfilebookmarkhandler.cpp
+++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp
@@ -21,28 +21,28 @@
 
 #include <kbookmarkimporter.h>
 #include <kbookmarkdombuilder.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
-#include "kfiledialog.h"
-#include "kfilebookmarkhandler.h"
+#include "tdefiledialog.h"
+#include "tdefilebookmarkhandler.h"
 
 KFileBookmarkHandler::KFileBookmarkHandler( KFileDialog *dialog )
     : TQObject( dialog, "KFileBookmarkHandler" ),
       KBookmarkOwner(),
       m_dialog( dialog )
 {
-    m_menu = new KPopupMenu( dialog, "bookmark menu" );
+    m_menu = new TDEPopupMenu( dialog, "bookmark menu" );
 
-    TQString file = locate( "data", "kfile/bookmarks.xml" );
+    TQString file = locate( "data", "tdefile/bookmarks.xml" );
     if ( file.isEmpty() )
-        file = locateLocal( "data", "kfile/bookmarks.xml" );
+        file = locateLocal( "data", "tdefile/bookmarks.xml" );
 
     KBookmarkManager *manager = KBookmarkManager::managerForFile( file, false);
 
     // import old bookmarks
-    if ( !KStandardDirs::exists( file ) ) {
-        TQString oldFile = locate( "data", "kfile/bookmarks.html" );
+    if ( !TDEStandardDirs::exists( file ) ) {
+        TQString oldFile = locate( "data", "tdefile/bookmarks.html" );
         if ( !oldFile.isEmpty() )
             importOldBookmarks( oldFile, manager );
     }
@@ -78,4 +78,4 @@ void KFileBookmarkHandler::importOldBookmarks( const TQString& path,
 void KFileBookmarkHandler::virtual_hook( int id, void* data )
 { KBookmarkOwner::virtual_hook( id, data ); }
 
-#include "kfilebookmarkhandler.moc"
+#include "tdefilebookmarkhandler.moc"
diff --git a/kio/kfile/kfilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h
index 7db71548b..e13e0673b 100644
--- a/kio/kfile/kfilebookmarkhandler.h
+++ b/tdeio/tdefile/tdefilebookmarkhandler.h
@@ -16,17 +16,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEBOOKMARKHANDLER_H
-#define KFILEBOOKMARKHANDLER_H
+#ifndef TDEFILEBOOKMARKHANDLER_H
+#define TDEFILEBOOKMARKHANDLER_H
 
 #include <kbookmarkmanager.h>
 #include <kbookmarkmenu.h>
 
 class TQTextStream;
-class KPopupMenu;
+class TDEPopupMenu;
 
 
-class KIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner
+class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner
 {
     Q_OBJECT
 
@@ -40,7 +40,7 @@ public:
     virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); }
     virtual TQString currentURL() const;
 
-    KPopupMenu *menu() const { return m_menu; }
+    TDEPopupMenu *menu() const { return m_menu; }
 
 signals:
     void openURL( const TQString& url );
@@ -49,7 +49,7 @@ private:
     void importOldBookmarks( const TQString& path, KBookmarkManager *manager );
 
     KFileDialog *m_dialog;
-    KPopupMenu *m_menu;
+    TDEPopupMenu *m_menu;
     KBookmarkMenu *m_bookmarkMenu;
 
 protected:
@@ -60,4 +60,4 @@ private:
 };
 
 
-#endif // KFILEBOOKMARKHANDLER_H
+#endif // TDEFILEBOOKMARKHANDLER_H
diff --git a/kio/kfile/kfiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index 823714396..e267bdb60 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -25,18 +25,18 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
-#include <kapplication.h>
-#include <kfileitem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeapplication.h>
+#include <tdefileitem.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
-#include "kfiledetailview.h"
-#include "config-kfile.h"
+#include "tdefiledetailview.h"
+#include "config-tdefile.h"
 
 #define COL_NAME 0
 #define COL_SIZE 1
@@ -56,7 +56,7 @@ public:
 };
 
 KFileDetailView::KFileDetailView(TQWidget *parent, const char *name)
-    : KListView(parent, name), KFileView(), d(new KFileDetailViewPrivate())
+    : TDEListView(parent, name), KFileView(), d(new KFileDetailViewPrivate())
 {
     // this is always the static section, not the index depending on column order
     m_sortingCol = COL_NAME; 
@@ -130,12 +130,12 @@ KFileDetailView::~KFileDetailView()
     delete d;
 }
 
-void KFileDetailView::readConfig( KConfig *config, const TQString& group )
+void KFileDetailView::readConfig( TDEConfig *config, const TQString& group )
 {
     restoreLayout( config, group );
 }
 
-void KFileDetailView::writeConfig( KConfig *config, const TQString& group )
+void KFileDetailView::writeConfig( TDEConfig *config, const TQString& group )
 {
     saveLayout( config, group );
 }
@@ -149,7 +149,7 @@ void KFileDetailView::setSelected( const KFileItem *info, bool enable )
     KFileListViewItem *item = (KFileListViewItem*)info->extraData( this );
 
     if ( item )
-	KListView::setSelected( item, enable );
+	TDEListView::setSelected( item, enable );
 }
 
 void KFileDetailView::setCurrentItem( const KFileItem *item )
@@ -158,7 +158,7 @@ void KFileDetailView::setCurrentItem( const KFileItem *item )
         return;
     KFileListViewItem *it = (KFileListViewItem*) item->extraData( this );
     if ( it )
-        KListView::setCurrentItem( it );
+        TDEListView::setCurrentItem( it );
 }
 
 KFileItem * KFileDetailView::currentFileItem() const
@@ -172,7 +172,7 @@ KFileItem * KFileDetailView::currentFileItem() const
 
 void KFileDetailView::clearSelection()
 {
-    KListView::clearSelection();
+    TDEListView::clearSelection();
 }
 
 void KFileDetailView::selectAll()
@@ -181,12 +181,12 @@ void KFileDetailView::selectAll()
         KFileView::selectionMode() == KFile::Single)
 	return;
 
-    KListView::selectAll( true );
+    TDEListView::selectAll( true );
 }
 
 void KFileDetailView::invertSelection()
 {
-    KListView::invertSelection();
+    TDEListView::invertSelection();
 }
 
 void KFileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos )
@@ -202,7 +202,7 @@ void KFileDetailView::slotActivateMenu (TQListViewItem *item,const TQPoint& pos
 void KFileDetailView::clearView()
 {
     m_resolver->m_lstPendingMimeIconItems.clear();
-    KListView::clear();
+    TDEListView::clear();
 }
 
 void KFileDetailView::insertItem( KFileItem *i )
@@ -234,7 +234,7 @@ void KFileDetailView::selected( TQListViewItem *item )
     if ( !item )
         return;
 
-    if ( KGlobalSettings::singleClick() ) {
+    if ( TDEGlobalSettings::singleClick() ) {
         const KFileItem *fi = ( (KFileListViewItem*)item )->fileInfo();
         if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) )
             sig->activate( fi );
@@ -301,7 +301,7 @@ void KFileDetailView::updateView( bool b )
     TQListViewItemIterator it( (TQListView*)this );
     for ( ; it.current(); ++it ) {
         KFileListViewItem *item=static_cast<KFileListViewItem *>(it.current());
-        item->setPixmap( 0, item->fileInfo()->pixmap(KIcon::SizeSmall) );
+        item->setPixmap( 0, item->fileInfo()->pixmap(TDEIcon::SizeSmall) );
     }
 }
 
@@ -327,7 +327,7 @@ void KFileDetailView::setSortingKey( KFileListViewItem *item,
     TQDir::SortSpec spec = KFileView::sorting();
 
     if ( spec & TQDir::Time )
-        item->setKey( sortingKey( i->time( KIO::UDS_MODIFICATION_TIME ),
+        item->setKey( sortingKey( i->time( TDEIO::UDS_MODIFICATION_TIME ),
                                   i->isDir(), spec ));
     else if ( spec & TQDir::Size )
         item->setKey( sortingKey( i->size(), i->isDir(), spec ));
@@ -399,7 +399,7 @@ void KFileDetailView::slotSortingChanged( int col )
 
     if ( sortSpec & TQDir::Time ) {
         for ( ; (item = it.current()); ++it )
-            viewItem(item)->setKey( sortingKey( item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec ));
+            viewItem(item)->setKey( sortingKey( item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), sortSpec ));
     }
 
     else if ( sortSpec & TQDir::Size ) {
@@ -415,8 +415,8 @@ void KFileDetailView::slotSortingChanged( int col )
         }
     }
 
-    KListView::setSorting( m_sortingCol, !reversed );
-    KListView::sort();
+    TDEListView::setSorting( m_sortingCol, !reversed );
+    TDEListView::sort();
 
     if ( !m_blockSortingSignal )
         sig->changeSorting( static_cast<TQDir::SortSpec>( sortSpec ) );
@@ -459,7 +459,7 @@ void KFileDetailView::ensureItemVisible( const KFileItem *i )
     KFileListViewItem *item = (KFileListViewItem*) i->extraData( this );
 
     if ( item )
-        KListView::ensureItemVisible( item );
+        TDEListView::ensureItemVisible( item );
 }
 
 // we're in multiselection mode
@@ -504,7 +504,7 @@ KFileItem * KFileDetailView::prevItem( const KFileItem *fileItem ) const
 
 void KFileDetailView::keyPressEvent( TQKeyEvent *e )
 {
-    KListView::keyPressEvent( e );
+    TDEListView::keyPressEvent( e );
 
     if ( e->key() == Key_Return || e->key() == Key_Enter ) {
         if ( e->state() & ControlButton )
@@ -543,9 +543,9 @@ TQDragObject *KFileDetailView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "kmultiple", KIcon::SizeSmall );
+        pixmap = DesktopIcon( "tdemultiple", TDEIcon::SizeSmall );
     if( pixmap.isNull() )
-        pixmap = currentFileItem()->pixmap( KIcon::SizeSmall );
+        pixmap = currentFileItem()->pixmap( TDEIcon::SizeSmall );
 
     TQPoint hotspot;
     hotspot.setX( pixmap.width() / 2 );
@@ -668,10 +668,10 @@ void KFileDetailView::contentsDropEvent( TQDropEvent *e )
 
 void KFileListViewItem::init()
 {
-    KFileListViewItem::setPixmap( COL_NAME, inf->pixmap(KIcon::SizeSmall));
+    KFileListViewItem::setPixmap( COL_NAME, inf->pixmap(TDEIcon::SizeSmall));
 
     setText( COL_NAME, inf->text() );
-    setText( COL_SIZE, KGlobal::locale()->formatNumber( inf->size(), 0));
+    setText( COL_SIZE, TDEGlobal::locale()->formatNumber( inf->size(), 0));
     setText( COL_DATE,  inf->timeString() );
     setText( COL_PERM,  inf->permissionsString() );
     setText( COL_OWNER, inf->user() );
@@ -680,7 +680,7 @@ void KFileListViewItem::init()
 
 
 void KFileDetailView::virtual_hook( int id, void* data )
-{ KListView::virtual_hook( id, data );
+{ TDEListView::virtual_hook( id, data );
   KFileView::virtual_hook( id, data ); }
 
-#include "kfiledetailview.moc"
+#include "tdefiledetailview.moc"
diff --git a/kio/kfile/kfiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index 937c8f56c..2def9bf27 100644
--- a/kio/kfile/kfiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -18,28 +18,28 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEDETAILVIEW_H
-#define KFILEDETAILVIEW_H
+#ifndef TDEFILEDETAILVIEW_H
+#define TDEFILEDETAILVIEW_H
 
 class KFileItem;
 class TQWidget;
 class TQKeyEvent;
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmimetyperesolver.h>
 
-#include "kfileview.h"
+#include "tdefileview.h"
 
 /**
  * An item for the listiew, that has a reference to its corresponding
  * KFileItem.
  */
-class KIO_EXPORT KFileListViewItem : public KListViewItem
+class TDEIO_EXPORT KFileListViewItem : public TDEListViewItem
 {
 public:
     KFileListViewItem( TQListView *parent, const TQString &text,
 		       const TQPixmap &icon, KFileItem *fi )
-	: KListViewItem( parent, text ), inf( fi ) {
+	: TDEListViewItem( parent, text ), inf( fi ) {
         setPixmap( 0, icon );
         setText( 0, text );
     }
@@ -48,14 +48,14 @@ public:
      * @since 3.1
      */
     KFileListViewItem( TQListView *parent, KFileItem *fi )
-        : KListViewItem( parent ), inf( fi ) {
+        : TDEListViewItem( parent ), inf( fi ) {
         init();
     }
 
     KFileListViewItem( TQListView *parent, const TQString &text,
 		       const TQPixmap &icon, KFileItem *fi,
 		       TQListViewItem *after)
-	: KListViewItem( parent, after ), inf( fi ) {
+	: TDEListViewItem( parent, after ), inf( fi ) {
         setPixmap( 0, icon );
         setText( 0, text );
     }
@@ -106,7 +106,7 @@ private:
  * @see KCombiView
  * @see KFileIconView
  */
-class KIO_EXPORT KFileDetailView : public KListView, public KFileView
+class TDEIO_EXPORT KFileDetailView : public TDEListView, public KFileView
 {
     Q_OBJECT
 
@@ -149,8 +149,8 @@ public:
     void determineIcon( KFileListViewItem *item );
     TQScrollView *scrollWidget() const { return (TQScrollView*) this; }
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
 signals:
     /**
@@ -193,9 +193,9 @@ private slots:
     void slotAutoOpen();
 
 private:
-    virtual void insertItem(TQListViewItem *i) { KListView::insertItem(i); }
-    virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); }
-    virtual void setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); }
+    virtual void insertItem(TQListViewItem *i) { TDEListView::insertItem(i); }
+    virtual void setSorting(int i, bool b) { TDEListView::setSorting(i, b); }
+    virtual void setSelected(TQListViewItem *i, bool b) { TDEListView::setSelected(i, b); }
 
     inline KFileListViewItem * viewItem( const KFileItem *item ) const {
         if ( item )
@@ -216,4 +216,4 @@ private:
     KFileDetailViewPrivate *d;
 };
 
-#endif // KFILEDETAILVIEW_H
+#endif // TDEFILEDETAILVIEW_H
diff --git a/kio/kfile/kfiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 1d364e9b7..03bc17757 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -22,7 +22,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kfiledialog.h"
+#include "tdefiledialog.h"
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -42,52 +42,52 @@
 #include <tqwhatsthis.h>
 #include <tqfiledialog.h>
 
-#include <kaccel.h>
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
-#include <kcmdlineargs.h>
-#include <kcompletionbox.h>
-#include <kconfig.h>
+#include <tdecmdlineargs.h>
+#include <tdecompletionbox.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
-#include <kio/kservicetypefactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/kservicetypefactory.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
 #include <kpushbutton.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <kshell.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <kstaticdeleter.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kuser.h>
 
-#include "config-kfile.h"
+#include "config-tdefile.h"
 #include "kpreviewwidgetbase.h"
 
 #include <kdirselectdialog.h>
-#include <kfileview.h>
-#include <krecentdocument.h>
-#include <kfilefiltercombo.h>
-#include <kdiroperator.h>
+#include <tdefileview.h>
+#include <tderecentdocument.h>
+#include <tdefilefiltercombo.h>
+#include <tdediroperator.h>
 #include <kimagefilepreview.h>
 
-#include <kfilespeedbar.h>
-#include <kfilebookmarkhandler.h>
+#include <tdefilespeedbar.h>
+#include <tdefilebookmarkhandler.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
@@ -97,7 +97,7 @@
 enum Buttons { HOTLIST_BUTTON,
                PATH_COMBO, CONFIGURE_BUTTON };
 
-template class TQPtrList<KIO::StatJob>;
+template class TQPtrList<TDEIO::StatJob>;
 
 namespace {
     static void silenceQToolBar(TQtMsgType, const char *)
@@ -136,7 +136,7 @@ struct KFileDialogPrivate
     bool autoSelectExtChecked; // whether or not the _user_ has checked the above box
     TQString extension; // current extension for this filter
 
-    TQPtrList<KIO::StatJob> statJobs;
+    TQPtrList<TDEIO::StatJob> statJobs;
 
     KURL::List urlList; //the list of selected urls
 
@@ -153,7 +153,7 @@ struct KFileDialogPrivate
     bool hasDefaultFilter :1; // necessary for the operationMode
     KFileDialog::OperationMode operationMode;
 
-    // The file class used for KRecentDirs
+    // The file class used for TDERecentDirs
     TQString fileClass;
 
     KFileBookmarkHandler *bookmarkHandler;
@@ -185,7 +185,7 @@ KFileDialog::~KFileDialog()
 {
     hide();
 
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     if (d->urlBar)
         d->urlBar->save( config );
@@ -332,7 +332,7 @@ KURL KFileDialog::getCompleteURL(const TQString &_url)
 // FIXME: check for "existing" flag here?
 void KFileDialog::slotOk()
 {
-    kdDebug(kfile_area) << "slotOK\n";
+    kdDebug(tdefile_area) << "slotOK\n";
 
     // a list of all selected files/directories (if any)
     // can only be used if the user didn't type any filenames/urls himself
@@ -377,7 +377,7 @@ void KFileDialog::slotOk()
 
     bool dirOnly = ops->dirOnlyMode();
 
-    // we can use our kfileitems, no need to parse anything
+    // we can use our tdefileitems, no need to parse anything
     if ( items && !locationEdit->lineEdit()->edited() &&
          !(items->isEmpty() && !dirOnly) ) {
 
@@ -402,7 +402,7 @@ void KFileDialog::slotOk()
             }
         }
 
-        KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+        KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
         if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
              !url.isLocalFile() ) {
 // ### after message freeze, add message for directories!
@@ -446,7 +446,7 @@ void KFileDialog::slotOk()
        return;
     }
 
-    KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
+    KURL url = TDEIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
     if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
          !url.isLocalFile() ) {
         KMessageBox::sorry( d->mainWidget,
@@ -460,7 +460,7 @@ void KFileDialog::slotOk()
     // d->url is a correct URL now
 
     if ( (mode() & KFile::Directory) == KFile::Directory ) {
-        kdDebug(kfile_area) << "Directory" << endl;
+        kdDebug(tdefile_area) << "Directory" << endl;
         bool done = true;
         if ( d->url.isLocalFile() ) {
             if ( locationEdit->currentText().stripWhiteSpace().isEmpty() ) {
@@ -528,25 +528,25 @@ void KFileDialog::slotOk()
 
     if (!kapp->authorizeURLAction("open", KURL(), d->url))
     {
-        TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, d->url.prettyURL());
+        TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL());
         KMessageBox::error( d->mainWidget, msg);
         return;
     }
 
-    KIO::StatJob *job = 0L;
+    TDEIO::StatJob *job = 0L;
     d->statJobs.clear();
     d->filenames = KShell::tildeExpand(locationEdit->currentText());
 
     if ( (mode() & KFile::Files) == KFile::Files &&
          !locationEdit->currentText().contains( '/' )) {
-        kdDebug(kfile_area) << "Files\n";
+        kdDebug(tdefile_area) << "Files\n";
         KURL::List list = parseSelectedURLs();
         for ( KURL::List::ConstIterator it = list.begin();
               it != list.end(); ++it )
         {
             if (!kapp->authorizeURLAction("open", KURL(), *it))
             {
-                TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, (*it).prettyURL());
+                TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL());
                 KMessageBox::error( d->mainWidget, msg);
                 return;
             }
@@ -554,32 +554,32 @@ void KFileDialog::slotOk()
         for ( KURL::List::ConstIterator it = list.begin();
               it != list.end(); ++it )
         {
-            job = KIO::stat( *it, !(*it).isLocalFile() );
+            job = TDEIO::stat( *it, !(*it).isLocalFile() );
             job->setWindow (topLevelWidget());
-            KIO::Scheduler::scheduleJob( job );
+            TDEIO::Scheduler::scheduleJob( job );
             d->statJobs.append( job );
-            connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-                     TQT_SLOT( slotStatResult( KIO::Job *) ));
+            connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+                     TQT_SLOT( slotStatResult( TDEIO::Job *) ));
         }
         return;
     }
 
-    job = KIO::stat(d->url,!d->url.isLocalFile());
+    job = TDEIO::stat(d->url,!d->url.isLocalFile());
     job->setWindow (topLevelWidget());
     d->statJobs.append( job );
-    connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*)));
+    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*)));
 }
 
 
-static bool isDirectory (const KIO::UDSEntry &t)
+static bool isDirectory (const TDEIO::UDSEntry &t)
 {
     bool isDir = false;
 
-    for (KIO::UDSEntry::ConstIterator it = t.begin();
+    for (TDEIO::UDSEntry::ConstIterator it = t.begin();
          it != t.end();
          it++)
     {
-        if ((*it).m_uds == KIO::UDS_FILE_TYPE)
+        if ((*it).m_uds == TDEIO::UDS_FILE_TYPE)
         {
             isDir = S_ISDIR ((mode_t) ((*it).m_long));
             break;
@@ -592,10 +592,10 @@ static bool isDirectory (const KIO::UDSEntry &t)
 // FIXME : count all errors and show messagebox when d->statJobs.count() == 0
 // in case of an error, we cancel the whole operation (clear d->statJobs and
 // don't call accept)
-void KFileDialog::slotStatResult(KIO::Job* job)
+void KFileDialog::slotStatResult(TDEIO::Job* job)
 {
-    kdDebug(kfile_area) << "slotStatResult" << endl;
-    KIO::StatJob *sJob = static_cast<KIO::StatJob *>( job );
+    kdDebug(tdefile_area) << "slotStatResult" << endl;
+    TDEIO::StatJob *sJob = static_cast<TDEIO::StatJob *>( job );
 
     if ( !d->statJobs.removeRef( sJob ) ) {
         return;
@@ -611,7 +611,7 @@ void KFileDialog::slotStatResult(KIO::Job* job)
         return;
     }
 
-    KIO::UDSEntry t = sJob->statResult();
+    TDEIO::UDSEntry t = sJob->statResult();
     if (isDirectory (t))
     {
         if ( ops->dirOnlyMode() )
@@ -636,7 +636,7 @@ void KFileDialog::slotStatResult(KIO::Job* job)
         return; // ### error message?
     }
 
-    kdDebug(kfile_area) << "filename " << sJob->url().url() << endl;
+    kdDebug(tdefile_area) << "filename " << sJob->url().url() << endl;
 
     if ( count == 0 )
         accept();
@@ -648,7 +648,7 @@ void KFileDialog::accept()
 
     *lastDirectory = ops->url();
     if (!d->fileClass.isEmpty())
-       KRecentDirs::add(d->fileClass, ops->url().url());
+       TDERecentDirs::add(d->fileClass, ops->url().url());
 
     // clear the topmost item, we insert it as full path later on as item 1
     locationEdit->changeItem( TQString::null, 0 );
@@ -672,7 +672,7 @@ void KFileDialog::accept()
         locationEdit->insertItem( file, 1 );
     }
 
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setForceGlobal( true );
     writeConfig( config, ConfigGroup );
     config->setForceGlobal( false );
@@ -751,7 +751,7 @@ void KFileDialog::multiSelectionChanged()
         return;
     }
 
-    static const TQString &begin = KGlobal::staticQString(" \"");
+    static const TQString &begin = TDEGlobal::staticQString(" \"");
     KFileItemListIterator it ( *list );
     TQString text;
     while ( (item = it.current()) ) {
@@ -832,7 +832,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     d->urlBar = 0; // delayed loading
 
     TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
-    toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true);
+    toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
     toolbar->setFlat(true);
     tqInstallMsgHandler( oldHandler );
 
@@ -848,29 +848,29 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     u.setPath( TQDir::rootDirPath() );
     TQString text = i18n("Root Folder: %1").arg( u.path() );
     d->pathCombo->addDefaultURL( u,
-                                 KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+                                 KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
                                  text );
 
     u.setPath( TQDir::homeDirPath() );
     text = i18n("Home Folder: %1").arg( u.path( +1 ) );
-    d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+    d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
                                  text );
 
     KURL docPath;
-    docPath.setPath( KGlobalSettings::documentPath() );
+    docPath.setPath( TDEGlobalSettings::documentPath() );
     if ( (u.path(+1) != docPath.path(+1)) &&
          TQDir(docPath.path(+1)).exists() )
     {
         text = i18n("Documents: %1").arg( docPath.path( +1 ) );
         d->pathCombo->addDefaultURL( docPath,
-                                     KMimeType::pixmapForURL( docPath, 0, KIcon::Small ),
+                                     KMimeType::pixmapForURL( docPath, 0, TDEIcon::Small ),
                                      text );
     }
 
-    u.setPath( KGlobalSettings::desktopPath() );
+    u.setPath( TDEGlobalSettings::desktopPath() );
     text = i18n("Desktop: %1").arg( u.path( +1 ) );
     d->pathCombo->addDefaultURL( u,
-                                 KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+                                 KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
                                  text );
 
     d->url = getStartURL( startDir, d->fileClass );
@@ -905,7 +905,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     ops->setupMenu(KDirOperator::SortActions |
                    KDirOperator::FileActions |
                    KDirOperator::ViewActions);
-    KActionCollection *coll = ops->actionCollection();
+    TDEActionCollection *coll = ops->actionCollection();
 
     // plug nav items into the toolbar
     coll->action( "up" )->plug( toolbar );
@@ -922,19 +922,19 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     coll->action( "mkdir" )->plug( toolbar );
     coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new folder."));
 
-    KToggleAction *showSidebarAction =
-        new KToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
+    TDEToggleAction *showSidebarAction =
+        new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
     showSidebarAction->setCheckedState(i18n("Hide Quick Access Navigation Panel"));
     connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( toggleSpeedbar( bool )) );
 
-    KToggleAction *showBookmarksAction =
-            new KToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks");
+    TDEToggleAction *showBookmarksAction =
+            new TDEToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks");
     showBookmarksAction->setCheckedState(i18n("Hide Bookmarks"));
     connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( toggleBookmarks( bool )) );
 
-    KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" );
+    TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" );
     menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. "
                             "Various options can be accessed from this menu including: <ul>"
                             "<li>how files are sorted in the list</li>"
@@ -965,15 +965,15 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     menu->plug( toolbar );
 
     //Insert a separator.
-    KToolBarSeparator* spacerWidget = new KToolBarSeparator(Qt::Horizontal, false /*no line*/,
+    TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(Qt::Horizontal, false /*no line*/,
                                                             toolbar);
     d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget);
     toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo);
 
 
     toolbar->setItemAutoSized (PATH_COMBO);
-    toolbar->setIconText(KToolBar::IconOnly);
-    toolbar->setBarPos(KToolBar::Top);
+    toolbar->setIconText(TDEToolBar::IconOnly);
+    toolbar->setBarPos(TDEToolBar::Top);
     toolbar->setMovingEnabled(false);
     toolbar->adjustSize();
 
@@ -1038,7 +1038,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
 
     initGUI(); // activate GM
 
-    KConfig* config = KGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     readRecentFiles( config );
 
     adjustSize();
@@ -1220,7 +1220,7 @@ void KFileDialog::toolbarCallback(int) // SLOT
 
 void KFileDialog::setSelection(const TQString& url)
 {
-    kdDebug(kfile_area) << "setSelection " << url << endl;
+    kdDebug(tdefile_area) << "setSelection " << url << endl;
 
     if (url.isEmpty()) {
         d->selection = TQString::null;
@@ -1264,7 +1264,7 @@ void KFileDialog::setSelection(const TQString& url)
             // filename must be decoded, or "name with space" would become
             // "name%20with%20space", so we use KURL::fileName()
             filename = u.fileName();
-            kdDebug(kfile_area) << "filename " << filename << endl;
+            kdDebug(tdefile_area) << "filename " << filename << endl;
             d->selection = filename;
             setLocationText( filename );
 
@@ -1474,7 +1474,7 @@ KURL::List& KFileDialog::parseSelectedURLs() const
 
     d->urlList.clear();
     if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename
-        static const TQString &prot = KGlobal::staticQString(":/");
+        static const TQString &prot = TDEGlobal::staticQString(":/");
         KURL u;
         if ( d->filenames.find( prot ) != -1 )
             u = d->filenames;
@@ -1550,7 +1550,7 @@ TQString KFileDialog::selectedFile() const
 {
     if ( result() == TQDialog::Accepted )
     {
-      KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+      KURL url = TDEIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
        if (url.isLocalFile())
            return url.path();
        else {
@@ -1572,7 +1572,7 @@ TQStringList KFileDialog::selectedFiles() const
             KURL::List urls = parseSelectedURLs();
             TQValueListConstIterator<KURL> it = urls.begin();
             while ( it != urls.end() ) {
-              url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget());
+              url = TDEIO::NetAccess::mostLocalURL(*it,topLevelWidget());
                 if ( url.isLocalFile() )
                     list.append( url.path() );
                 ++it;
@@ -1609,7 +1609,7 @@ TQString KFileDialog::getSaveFileName(const TQString& dir, const TQString& filte
 
     TQString filename = dlg.selectedFile();
     if (!filename.isEmpty())
-        KRecentDocument::add(filename);
+        TDERecentDocument::add(filename);
 
     return filename;
 }
@@ -1638,7 +1638,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
 
     TQString filename = dlg.selectedFile();
     if (!filename.isEmpty())
-        KRecentDocument::add(filename);
+        TDERecentDocument::add(filename);
 
     return filename;
 }
@@ -1658,7 +1658,7 @@ KURL KFileDialog::getSaveURL(const TQString& dir, const TQString& filter,
 
     KURL url = dlg.selectedURL();
     if (url.isValid())
-        KRecentDocument::add( url );
+        TDERecentDocument::add( url );
 
     return url;
 }
@@ -1698,7 +1698,7 @@ KFile::Mode KFileDialog::mode() const
 }
 
 
-void KFileDialog::readConfig( KConfig *kc, const TQString& group )
+void KFileDialog::readConfig( TDEConfig *kc, const TQString& group )
 {
     if ( !kc )
         return;
@@ -1717,16 +1717,16 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group )
     autoDirectoryFollowing = kc->readBoolEntry( AutoDirectoryFollowing,
                                                 DefaultDirectoryFollowing );
 
-    KGlobalSettings::Completion cm = (KGlobalSettings::Completion)
+    TDEGlobalSettings::Completion cm = (TDEGlobalSettings::Completion)
                                       kc->readNumEntry( PathComboCompletionMode,
-                                      KGlobalSettings::completionMode() );
-    if ( cm != KGlobalSettings::completionMode() )
+                                      TDEGlobalSettings::completionMode() );
+    if ( cm != TDEGlobalSettings::completionMode() )
         combo->setCompletionMode( cm );
 
-    cm = (KGlobalSettings::Completion)
+    cm = (TDEGlobalSettings::Completion)
          kc->readNumEntry( LocationComboCompletionMode,
-                           KGlobalSettings::completionMode() );
-    if ( cm != KGlobalSettings::completionMode() )
+                           TDEGlobalSettings::completionMode() );
+    if ( cm != TDEGlobalSettings::completionMode() )
         locationEdit->setCompletionMode( cm );
 
     // show or don't show the speedbar
@@ -1749,7 +1749,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group )
     kc->setGroup( oldGroup );
 }
 
-void KFileDialog::writeConfig( KConfig *kc, const TQString& group )
+void KFileDialog::writeConfig( TDEConfig *kc, const TQString& group )
 {
     if ( !kc )
         return;
@@ -1771,7 +1771,7 @@ void KFileDialog::writeConfig( KConfig *kc, const TQString& group )
 }
 
 
-void KFileDialog::readRecentFiles( KConfig *kc )
+void KFileDialog::readRecentFiles( TDEConfig *kc )
 {
     TQString oldGroup = kc->group();
     kc->setGroup( ConfigGroup );
@@ -1786,7 +1786,7 @@ void KFileDialog::readRecentFiles( KConfig *kc )
     kc->setGroup( oldGroup );
 }
 
-void KFileDialog::saveRecentFiles( KConfig *kc )
+void KFileDialog::saveRecentFiles( TDEConfig *kc )
 {
     TQString oldGroup = kc->group();
     kc->setGroup( ConfigGroup );
@@ -1816,7 +1816,7 @@ void KFileDialog::slotCancel()
     ops->close();
     KDialogBase::slotCancel();
 
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setForceGlobal( true );
     writeConfig( config, ConfigGroup );
     config->setForceGlobal( false );
@@ -1856,7 +1856,7 @@ KFileDialog::OperationMode KFileDialog::operationMode() const
 
 void KFileDialog::slotAutoSelectExtClicked()
 {
-    kdDebug (kfile_area) << "slotAutoSelectExtClicked(): "
+    kdDebug (tdefile_area) << "slotAutoSelectExtClicked(): "
                          << d->autoSelectExtCheckBox->isChecked () << endl;
 
     // whether the _user_ wants it on/off
@@ -1869,14 +1869,14 @@ void KFileDialog::slotAutoSelectExtClicked()
 static TQString getExtensionFromPatternList (const TQStringList &patternList)
 {
     TQString ret;
-    kdDebug (kfile_area) << "\tgetExtension " << patternList << endl;
+    kdDebug (tdefile_area) << "\tgetExtension " << patternList << endl;
 
     TQStringList::ConstIterator patternListEnd = patternList.end ();
     for (TQStringList::ConstIterator it = patternList.begin ();
          it != patternListEnd;
          it++)
     {
-        kdDebug (kfile_area) << "\t\ttry: \'" << (*it) << "\'" << endl;
+        kdDebug (tdefile_area) << "\t\ttry: \'" << (*it) << "\'" << endl;
 
         // is this pattern like "*.BMP" rather than useless things like:
         //
@@ -1924,7 +1924,7 @@ void KFileDialog::updateAutoSelectExtension (void)
     // COPYING.txt ...)
     //
 
-    kdDebug (kfile_area) << "Figure out an extension: " << endl;
+    kdDebug (tdefile_area) << "Figure out an extension: " << endl;
     TQString lastExtension = d->extension;
     d->extension = TQString::null;
 
@@ -1942,7 +1942,7 @@ void KFileDialog::updateAutoSelectExtension (void)
             if (filter.find ('/') < 0)
             {
                 d->extension = getExtensionFromPatternList (TQStringList::split (" ", filter)).lower ();
-                kdDebug (kfile_area) << "\tsetFilter-style: pattern ext=\'"
+                kdDebug (tdefile_area) << "\tsetFilter-style: pattern ext=\'"
                                     << d->extension << "\'" << endl;
             }
             // e.g. "text/html"
@@ -1955,7 +1955,7 @@ void KFileDialog::updateAutoSelectExtension (void)
                 if (nativeExtension.at (0) == '.')
                 {
                     d->extension = nativeExtension.lower ();
-                    kdDebug (kfile_area) << "\tsetMimeFilter-style: native ext=\'"
+                    kdDebug (tdefile_area) << "\tsetMimeFilter-style: native ext=\'"
                                          << d->extension << "\'" << endl;
                 }
 
@@ -1963,7 +1963,7 @@ void KFileDialog::updateAutoSelectExtension (void)
                 if (d->extension.isEmpty ())
                 {
                     d->extension = getExtensionFromPatternList (mime->patterns ()).lower ();
-                    kdDebug (kfile_area) << "\tsetMimeFilter-style: pattern ext=\'"
+                    kdDebug (tdefile_area) << "\tsetMimeFilter-style: pattern ext=\'"
                                          << d->extension << "\'" << endl;
                 }
             }
@@ -2056,7 +2056,7 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
         return;
 
     KURL url = getCompleteURL (urlStr);
-    kdDebug (kfile_area) << "updateLocationEditExtension (" << url << ")" << endl;
+    kdDebug (tdefile_area) << "updateLocationEditExtension (" << url << ")" << endl;
 
     const int fileNameOffset = urlStr.findRev ('/') + 1;
     TQString fileName = urlStr.mid (fileNameOffset);
@@ -2069,14 +2069,14 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
     )
     {
         // exists?
-        KIO::UDSEntry t;
-        if (KIO::NetAccess::stat (url, t, topLevelWidget()))
+        TDEIO::UDSEntry t;
+        if (TDEIO::NetAccess::stat (url, t, topLevelWidget()))
         {
-            kdDebug (kfile_area) << "\tfile exists" << endl;
+            kdDebug (tdefile_area) << "\tfile exists" << endl;
 
             if (isDirectory (t))
             {
-                kdDebug (kfile_area) << "\tisDir - won't alter extension" << endl;
+                kdDebug (tdefile_area) << "\tisDir - won't alter extension" << endl;
                 return;
             }
 
@@ -2134,7 +2134,7 @@ void KFileDialog::appendExtension (KURL &url)
     if (fileName.isEmpty ())
         return;
 
-    kdDebug (kfile_area) << "appendExtension(" << url << ")" << endl;
+    kdDebug (tdefile_area) << "appendExtension(" << url << ")" << endl;
 
     const int len = fileName.length ();
     const int dot = fileName.findRev ('.');
@@ -2142,15 +2142,15 @@ void KFileDialog::appendExtension (KURL &url)
     const bool suppressExtension = (dot == len - 1);
     const bool unspecifiedExtension = (dot <= 0);
 
-    // don't KIO::NetAccess::Stat if unnecessary
+    // don't TDEIO::NetAccess::Stat if unnecessary
     if (!(suppressExtension || unspecifiedExtension))
         return;
 
     // exists?
-    KIO::UDSEntry t;
-    if (KIO::NetAccess::stat (url, t, topLevelWidget()))
+    TDEIO::UDSEntry t;
+    if (TDEIO::NetAccess::stat (url, t, topLevelWidget()))
     {
-        kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl;
+        kdDebug (tdefile_area) << "\tfile exists - won't append extension" << endl;
         return;
     }
 
@@ -2167,15 +2167,15 @@ void KFileDialog::appendExtension (KURL &url)
         // and the trailing dot will be removed (or just stop being lazy and
         // turn off this feature so that you can type "README.")
         //
-        kdDebug (kfile_area) << "\tstrip trailing dot" << endl;
+        kdDebug (tdefile_area) << "\tstrip trailing dot" << endl;
         url.setFileName (fileName.left (len - 1));
     }
     // evilmatically append extension :) if the user hasn't specified one
     else if (unspecifiedExtension)
     {
-        kdDebug (kfile_area) << "\tappending extension \'" << d->extension << "\'..." << endl;
+        kdDebug (tdefile_area) << "\tappending extension \'" << d->extension << "\'..." << endl;
         url.setFileName (fileName + d->extension);
-        kdDebug (kfile_area) << "\tsaving as \'" << url << "\'" << endl;
+        kdDebug (tdefile_area) << "\tsaving as \'" << url << "\'" << endl;
     }
 }
 
@@ -2189,7 +2189,7 @@ void KFileDialog::addToRecentDocuments()
         TQStringList files = selectedFiles();
         TQStringList::ConstIterator it = files.begin();
         for ( ; it != files.end(); ++it )
-            KRecentDocument::add( *it );
+            TDERecentDocument::add( *it );
     }
 
     else { // urls
@@ -2197,12 +2197,12 @@ void KFileDialog::addToRecentDocuments()
         KURL::List::ConstIterator it = urls.begin();
         for ( ; it != urls.end(); ++it ) {
             if ( (*it).isValid() )
-                KRecentDocument::add( *it );
+                TDERecentDocument::add( *it );
         }
     }
 }
 
-KActionCollection * KFileDialog::actionCollection() const
+TDEActionCollection * KFileDialog::actionCollection() const
 {
     return ops->actionCollection();
 }
@@ -2251,7 +2251,7 @@ void KFileDialog::toggleSpeedbar( bool show )
             ops->actionCollection()->action( "home" )->plug( toolbar, 3 );
     }
 
-    static_cast<KToggleAction *>(actionCollection()->action("toggleSpeedbar"))->setChecked( show );
+    static_cast<TDEToggleAction *>(actionCollection()->action("toggleSpeedbar"))->setChecked( show );
 }
 
 void KFileDialog::toggleBookmarks(bool show)
@@ -2286,7 +2286,7 @@ void KFileDialog::toggleBookmarks(bool show)
         toolbar->removeItem(HOTLIST_BUTTON);
     }
 
-    static_cast<KToggleAction *>(actionCollection()->action("toggleBookmarks"))->setChecked( show );
+    static_cast<TDEToggleAction *>(actionCollection()->action("toggleBookmarks"))->setChecked( show );
 }
 
 int KFileDialog::pathComboIndex()
@@ -2318,11 +2318,11 @@ KURL KFileDialog::getStartURL( const TQString& startDir,
         if (startDir[0] == ':')
         {
             recentDirClass = startDir;
-            ret = KURL::fromPathOrURL( KRecentDirs::dir(recentDirClass) );
+            ret = KURL::fromPathOrURL( TDERecentDirs::dir(recentDirClass) );
         }
         else
         {
-            ret = KCmdLineArgs::makeURL( TQFile::encodeName(startDir) );
+            ret = TDECmdLineArgs::makeURL( TQFile::encodeName(startDir) );
             // If we won't be able to list it (e.g. http), then use default
             if ( !KProtocolInfo::supportsListing( ret ) )
                 useDefaultStartDir = true;
@@ -2332,7 +2332,7 @@ KURL KFileDialog::getStartURL( const TQString& startDir,
     if ( useDefaultStartDir )
     {
         if (lastDirectory->isEmpty()) {
-            lastDirectory->setPath(KGlobalSettings::documentPath());
+            lastDirectory->setPath(TDEGlobalSettings::documentPath());
             KURL home;
             home.setPath( TQDir::homeDirPath() );
             // if there is no docpath set (== home dir), we prefer the current
@@ -2377,4 +2377,4 @@ void KFileDialog::virtual_hook( int id, void* data )
 { KDialogBase::virtual_hook( id, data ); }
 
 
-#include "kfiledialog.moc"
+#include "tdefiledialog.moc"
diff --git a/kio/kfile/kfiledialog.h b/tdeio/tdefile/tdefiledialog.h
index 33e0c9b12..b7310b599 100644
--- a/kio/kfile/kfiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -22,16 +22,16 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KFILEDIALOG_H__
-#define __KFILEDIALOG_H__
+#ifndef __TDEFILEDIALOG_H__
+#define __TDEFILEDIALOG_H__
 
 #include <tqstring.h>
 
 #include <kdialogbase.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurl.h>
 #include <kmimetype.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class TQCheckBox;
 class TQHBoxLayout;
@@ -40,7 +40,7 @@ class TQLabel;
 class TQPopupMenu;
 class TQVBoxLayout;
 
-class KActionCollection;
+class TDEActionCollection;
 class KDirOperator;
 class KURLBar;
 class KURLComboBox;
@@ -48,7 +48,7 @@ class KFileFilterCombo;
 class KFileView;
 class KFileItem;
 class KPushButton;
-class KToolBar;
+class TDEToolBar;
 class KPreviewWidgetBase;
 
 struct KFileDialogPrivate;
@@ -68,13 +68,13 @@ struct KFileDialogPrivate;
  * by subclassing. It uses geometry management to ensure that subclasses
  * can easily add children that will be incorporated into the layout.
  *
- * \image html kfiledialog.png "KDE File Dialog"
+ * \image html tdefiledialog.png "KDE File Dialog"
  *
  * @short A file selection dialog.
  *
  * @author Richard J. Moore <rich@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KFileDialog : public KDialogBase
+class TDEIO_EXPORT KFileDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -265,11 +265,11 @@ public:
      * shown. Examples:
      *
      * \code
-     * kfile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
-     * kfile->setFilter("*.cpp");
-     * kfile->setFilter("*.cpp|Sources (*.cpp)");
-     * kfile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
-     * kfile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files");
+     * tdefile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
+     * tdefile->setFilter("*.cpp");
+     * tdefile->setFilter("*.cpp|Sources (*.cpp)");
+     * tdefile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
+     * tdefile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files");
      * \endcode
      *
      * Note: The text to display is not parsed in any way. So, if you
@@ -282,8 +282,8 @@ public:
      * space):
      *
      * \code
-     * kfile->setFilter( "image/png text/html text/plain" );
-     * kfile->setFilter( "*.cue|CUE\\/BIN Files (*.cue)" );
+     * tdefile->setFilter( "image/png text/html text/plain" );
+     * tdefile->setFilter( "*.cue|CUE\\/BIN Files (*.cue)" );
      * \endcode
      *
      * @see filterChanged
@@ -672,7 +672,7 @@ public:
     /**
      * Sets the mode of the dialog.
      *
-     * The mode is defined as (in kfile.h):
+     * The mode is defined as (in tdefile.h):
      * \code
      *    enum Mode {
      *         File         = 1,
@@ -713,13 +713,13 @@ public:
      * You can use this to insert custom
      * items into it, e.g.:
      * \code
-     *      yourAction = new KAction( i18n("Your Action"), 0,
+     *      yourAction = new TDEAction( i18n("Your Action"), 0,
      *                                this, TQT_SLOT( yourSlot() ),
      *                                this, "action name" );
-     *      yourAction->plug( kfileDialog->toolBar() );
+     *      yourAction->plug( tdefileDialog->toolBar() );
      * \endcode
      */
-    KToolBar *toolBar() const { return toolbar; }
+    TDEToolBar *toolBar() const { return toolbar; }
 
     /**
      * @returns a pointer to the OK-Button in the filedialog. You may use it
@@ -752,9 +752,9 @@ public:
 
     /**
      * @returns a pointer to the action collection, holding all the used
-     * KActions.
+     * TDEActions.
      */
-    KActionCollection *actionCollection() const;
+    TDEActionCollection *actionCollection() const;
 
     /**
      * @returns the index of the path combobox so when inserting widgets into
@@ -769,7 +769,7 @@ public:
      * @param startDir A url/directory, to be used. May use the ':' and '::' syntax
      *        as documented in the KFileDialog() constructor.
      * @param recentDirClass If the ':' or '::' syntax is used, recentDirClass
-     *        will contain the string to be used later for KRecentDir::dir()
+     *        will contain the string to be used later for TDERecentDir::dir()
      * @return The URL that should be listed by default (e.g. by KFileDialog or
      *         KDirSelectDialog).
      * @since 3.1
@@ -820,7 +820,7 @@ signals:
     void filterChanged( const TQString& filter );
 
 protected:
-    KToolBar *toolbar;
+    TDEToolBar *toolbar;
 
     static KURL *lastDirectory;
 
@@ -854,22 +854,22 @@ protected:
     /**
      * Reads configuration and applies it (size, recent directories, ...)
      */
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
 
     /**
      * Saves the current configuration
      */
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null );
 
     /**
      * Reads the recent used files and inserts them into the location combobox
      */
-    virtual void readRecentFiles( KConfig * );
+    virtual void readRecentFiles( TDEConfig * );
 
     /**
      * Saves the entries from the location combobox.
      */
-    virtual void saveRecentFiles( KConfig * );
+    virtual void saveRecentFiles( TDEConfig * );
 
     /**
      * Parses the string "line" for files. If line doesn't contain any ", the
@@ -929,7 +929,7 @@ protected slots:
     void slotFilterChanged();
     void fileHighlighted(const KFileItem *i);
     void fileSelected(const KFileItem *i);
-    void slotStatResult(KIO::Job* job);
+    void slotStatResult(TDEIO::Job* job);
     void slotLoadingFinished();
 
     void fileCompletion( const TQString& );
diff --git a/kio/kfile/kfilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp
index 12a51db8e..ed41f8f82 100644
--- a/kio/kfile/kfilefiltercombo.cpp
+++ b/tdeio/tdefile/tdefilefiltercombo.cpp
@@ -17,12 +17,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
-#include <config-kfile.h>
+#include <config-tdefile.h>
 
-#include "kfilefiltercombo.h"
+#include "tdefilefiltercombo.h"
 
 class KFileFilterCombo::KFileFilterComboPrivate
 {
@@ -143,7 +143,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types,
             allTypes += ' ';
         }
 
-	kdDebug(kfile_area) << *it << endl;
+	kdDebug(tdefile_area) << *it << endl;
         KMimeType::Ptr type = KMimeType::mimeType( *it );
         filters.append( type->name() );
         if ( m_allTypes )
@@ -200,4 +200,4 @@ TQString KFileFilterCombo::defaultFilter() const
 void KFileFilterCombo::virtual_hook( int id, void* data )
 { KComboBox::virtual_hook( id, data ); }
 
-#include "kfilefiltercombo.moc"
+#include "tdefilefiltercombo.moc"
diff --git a/kio/kfile/kfilefiltercombo.h b/tdeio/tdefile/tdefilefiltercombo.h
index d1f9cbf62..f448003bb 100644
--- a/kio/kfile/kfilefiltercombo.h
+++ b/tdeio/tdefile/tdefilefiltercombo.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEFILTERCOMBO_H
-#define KFILEFILTERCOMBO_H
+#ifndef TDEFILEFILTERCOMBO_H
+#define TDEFILEFILTERCOMBO_H
 
 #include <tqstringlist.h>
 #include <tqptrdict.h>
@@ -28,7 +28,7 @@
 
 class KFileFilterComboPrivate;
 
-class KIO_EXPORT KFileFilterCombo : public KComboBox
+class TDEIO_EXPORT KFileFilterCombo : public KComboBox
 {
     Q_OBJECT
 
diff --git a/kio/kfile/kfileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 86bd5eeb2..92bbeba41 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -29,17 +29,17 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
-#include <kapplication.h>
-#include <klocale.h>
-#include <kfileitem.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdefileitem.h>
 #include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
-#include "kfileiconview.h"
-#include "config-kfile.h"
+#include "tdefileiconview.h"
+#include "config-tdefile.h"
 
 #define DEFAULT_PREVIEW_SIZE 60
 #define DEFAULT_SHOW_PREVIEWS false
@@ -60,12 +60,12 @@ public:
 
         noArrangement = false;
 	ignoreMaximumSize = false;
-	smallColumns = new KRadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent),
+	smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent),
 					 TQT_SLOT( slotSmallColumns() ),
 					 parent->actionCollection(),
 					 "small columns" );
 
-	largeRows = new KRadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent),
+	largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent),
 				      TQT_SLOT( slotLargeRows() ),
 				      parent->actionCollection(),
 				      "large rows" );
@@ -73,7 +73,7 @@ public:
 	smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
 	largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
 
-        previews = new KToggleAction( i18n("Thumbnail Previews"), 0,
+        previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0,
                                       parent->actionCollection(),
                                       "show previews" );
         zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ),
@@ -99,10 +99,10 @@ public:
             job->kill();
     }
 
-    KRadioAction *smallColumns, *largeRows;
-    KAction *zoomIn, *zoomOut;
-    KToggleAction *previews;
-    KIO::PreviewJob *job;
+    TDERadioAction *smallColumns, *largeRows;
+    TDEAction *zoomIn, *zoomOut;
+    TDEToggleAction *previews;
+    TDEIO::PreviewJob *job;
     KFileIconViewItem *dropItem;
     TQTimer previewTimer;
     TQTimer autoOpenTimer;
@@ -113,7 +113,7 @@ public:
 };
 
 KFileIconView::KFileIconView(TQWidget *parent, const char *name)
-    : KIconView(parent, name), KFileView()
+    : TDEIconView(parent, name), KFileView()
 {
     d = new KFileIconViewPrivate( this );
 
@@ -126,8 +126,8 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name)
     setArrangement( TopToBottom );
     setAutoArrange( true );
     setItemsMovable( false );
-    setMode( KIconView::Select );
-    KIconView::setSorting( true );
+    setMode( TDEIconView::Select );
+    TDEIconView::setSorting( true );
     // as long as TQIconView only shows tooltips when the cursor is over the
     // icon (and not the text), we have to create our own tooltips
     setShowToolTips( false );
@@ -187,10 +187,10 @@ KFileIconView::~KFileIconView()
     delete d;
 }
 
-void KFileIconView::readConfig( KConfig *kc, const TQString& group )
+void KFileIconView::readConfig( TDEConfig *kc, const TQString& group )
 {
     TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
-    KConfigGroupSaver cs( kc, gr );
+    TDEConfigGroupSaver cs( kc, gr );
     TQString small = TQString::fromLatin1("SmallColumns");
     d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE );
     d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) );
@@ -208,10 +208,10 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group )
         showPreviews();
 }
 
-void KFileIconView::writeConfig( KConfig *kc, const TQString& group )
+void KFileIconView::writeConfig( TDEConfig *kc, const TQString& group )
 {
     TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
-    KConfigGroupSaver cs( kc, gr );
+    TDEConfigGroupSaver cs( kc, gr );
 
     TQString viewMode =  d->smallColumns->isChecked() ?
         TQString::fromLatin1("SmallColumns") :
@@ -286,12 +286,12 @@ void KFileIconView::slotActivateMenu( TQIconViewItem* item, const TQPoint& pos )
 void KFileIconView::hideEvent( TQHideEvent *e )
 {
     removeToolTip();
-    KIconView::hideEvent( e );
+    TDEIconView::hideEvent( e );
 }
 
 void KFileIconView::keyPressEvent( TQKeyEvent *e )
 {
-    KIconView::keyPressEvent( e );
+    TDEIconView::keyPressEvent( e );
 
     // ignore Ctrl-Return so that the dialog can catch it.
     if ( (e->state() & ControlButton) &&
@@ -303,7 +303,7 @@ void KFileIconView::setSelected( const KFileItem *info, bool enable )
 {
     KFileIconViewItem *item = viewItem( info );
     if ( item )
-        KIconView::setSelected( item, enable, true );
+        TDEIconView::setSelected( item, enable, true );
 }
 
 void KFileIconView::selectAll()
@@ -312,24 +312,24 @@ void KFileIconView::selectAll()
         KFileView::selectionMode() == KFile::Single)
 	return;
 
-    KIconView::selectAll( true );
+    TDEIconView::selectAll( true );
 }
 
 void KFileIconView::clearSelection()
 {
-    KIconView::clearSelection();
+    TDEIconView::clearSelection();
 }
 
 void KFileIconView::invertSelection()
 {
-    KIconView::invertSelection();
+    TDEIconView::invertSelection();
 }
 
 void KFileIconView::clearView()
 {
     m_resolver->m_lstPendingMimeIconItems.clear();
 
-    KIconView::clear();
+    TDEIconView::clear();
     stopPreview();
 }
 
@@ -362,10 +362,10 @@ void KFileIconView::slotActivate( TQIconViewItem *item )
 
 void KFileIconView::selected( TQIconViewItem *item )
 {
-    if ( !item || (KApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 )
+    if ( !item || (TDEApplication::keyboardMouseState() & (ShiftButton | ControlButton)) != 0 )
 	return;
 
-    if ( KGlobalSettings::singleClick() ) {
+    if ( TDEGlobalSettings::singleClick() ) {
 	const KFileItem *fi = ( (KFileIconViewItem*)item )->fileInfo();
 	if ( fi && (fi->isDir() || !onlyDoubleClickSelectsFiles()) )
 	    sig->activate( fi );
@@ -376,7 +376,7 @@ void KFileIconView::setCurrentItem( const KFileItem *item )
 {
     KFileIconViewItem *it = viewItem( item );
     if ( it )
-        KIconView::setCurrentItem( it );
+        TDEIconView::setCurrentItem( it );
 }
 
 KFileItem * KFileIconView::currentFileItem() const
@@ -510,7 +510,7 @@ void KFileIconView::ensureItemVisible( const KFileItem *i )
 {
     KFileIconViewItem *item = viewItem( i );
     if ( item )
-	KIconView::ensureItemVisible( item );
+	TDEIconView::ensureItemVisible( item );
 }
 
 void KFileIconView::slotSelectionChanged()
@@ -538,7 +538,7 @@ void KFileIconView::slotSmallColumns()
     setSpacing( 0 );
 
     d->noArrangement = false; // now we can arrange
-    setIconSize( KIcon::SizeSmall );
+    setIconSize( TDEIcon::SizeSmall );
 }
 
 void KFileIconView::slotLargeRows()
@@ -547,14 +547,14 @@ void KFileIconView::slotLargeRows()
     // setIconSize() all call arrangeItemsInGrid() :( Prevent this.
     d->noArrangement = true; // stop arrangeItemsInGrid()!
 
-    setGridX( KGlobal::iconLoader()->currentSize( KIcon::Desktop ) + 50 );
+    setGridX( TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ) + 50 );
     setItemTextPos( Bottom );
     setArrangement( LeftToRight );
     setWordWrapIconText( true );
     setSpacing( 5 ); // default in QIconView
 
     d->noArrangement = false; // now we can arrange
-    setIconSize( KIcon::SizeMedium );
+    setIconSize( TDEIcon::SizeMedium );
 }
 
 void KFileIconView::stopPreview()
@@ -578,7 +578,7 @@ void KFileIconView::slotPreviewsToggled( bool on )
 void KFileIconView::showPreviews()
 {
     if ( d->previewMimeTypes.isEmpty() )
-        d->previewMimeTypes = KIO::PreviewJob::supportedMimeTypes();
+        d->previewMimeTypes = TDEIO::PreviewJob::supportedMimeTypes();
 
     stopPreview();
     d->previews->setChecked( true );
@@ -591,18 +591,18 @@ void KFileIconView::showPreviews()
         updateIcons();
     }
 
-    d->job = KIO::filePreview(*items(), d->previewIconSize,d->previewIconSize);
+    d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize);
     d->job->setIgnoreMaximumSize(d->ignoreMaximumSize);
 
-    connect( d->job, TQT_SIGNAL( result( KIO::Job * )),
-             this, TQT_SLOT( slotPreviewResult( KIO::Job * )));
+    connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )),
+             this, TQT_SLOT( slotPreviewResult( TDEIO::Job * )));
     connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )),
              TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
 //     connect( d->job, TQT_SIGNAL( failed( const KFileItem* )),
 //              this, TQT_SLOT( slotFailed( const KFileItem* ) ));
 }
 
-void KFileIconView::slotPreviewResult( KIO::Job *job )
+void KFileIconView::slotPreviewResult( TDEIO::Job *job )
 {
     if ( job == d->job )
         d->job = 0L;
@@ -612,11 +612,11 @@ void KFileIconView::gotPreview( const KFileItem *item, const TQPixmap& pix )
 {
     KFileIconViewItem *it = viewItem( item );
     if ( it )
-        if( item->overlays() & KIcon::HiddenOverlay )
+        if( item->overlays() & TDEIcon::HiddenOverlay )
         {
             TQPixmap p( pix );
 
-            KIconEffect::semiTransparent( p );
+            TDEIconEffect::semiTransparent( p );
             it->setPixmap( p );
         }
         else
@@ -683,7 +683,7 @@ void KFileIconView::setSorting( TQDir::SortSpec spec )
     if ( spec & TQDir::Time ) {
         for ( ; (item = it.current()); ++it )
             // warning, time_t is often signed -> cast it
-            viewItem(item)->setKey( sortingKey( (unsigned long)item->time( KIO::UDS_MODIFICATION_TIME ), item->isDir(), spec ));
+            viewItem(item)->setKey( sortingKey( (unsigned long)item->time( TDEIO::UDS_MODIFICATION_TIME ), item->isDir(), spec ));
     }
 
     else if ( spec & TQDir::Size ) {
@@ -697,7 +697,7 @@ void KFileIconView::setSorting( TQDir::SortSpec spec )
                                                 spec ));
     }
 
-    KIconView::setSorting( true, !isReversed() );
+    TDEIconView::setSorting( true, !isReversed() );
     sort( !isReversed() );
 }
 
@@ -725,8 +725,8 @@ void KFileIconView::listingCompleted()
         bool block = signalsBlocked();
         blockSignals( true );
         TQIconViewItem *item = viewItem( firstFileItem() );
-        KIconView::setCurrentItem( item );
-        KIconView::setSelected( item, false );
+        TDEIconView::setCurrentItem( item );
+        TDEIconView::setSelected( item, false );
         blockSignals( block );
     }
 
@@ -743,7 +743,7 @@ bool KFileIconView::eventFilter( TQObject *o, TQEvent *e )
             removeToolTip();
     }
 
-    return KIconView::eventFilter( o, e );
+    return TDEIconView::eventFilter( o, e );
 }
 
 /////////////////////////////////////////////////////////////////
@@ -751,7 +751,7 @@ bool KFileIconView::eventFilter( TQObject *o, TQEvent *e )
 // ### workaround for Qt3 Bug
 void KFileIconView::showEvent( TQShowEvent *e )
 {
-    KIconView::showEvent( e );
+    TDEIconView::showEvent( e );
 }
 
 
@@ -775,7 +775,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i,
 
     if ( spec & TQDir::Time )
         // warning, time_t is often signed -> cast it
-        item->setKey( sortingKey( (unsigned long) i->time( KIO::UDS_MODIFICATION_TIME ),
+        item->setKey( sortingKey( (unsigned long) i->time( TDEIO::UDS_MODIFICATION_TIME ),
                                   i->isDir(), spec ));
     else if ( spec & TQDir::Size )
         item->setKey( sortingKey( i->size(), i->isDir(), spec ));
@@ -794,7 +794,7 @@ void KFileIconView::arrangeItemsInGrid( bool update )
     if ( d->noArrangement )
         return;
 
-    KIconView::arrangeItemsInGrid( update );
+    TDEIconView::arrangeItemsInGrid( update );
 }
 
 void KFileIconView::zoomIn()
@@ -817,7 +817,7 @@ TQDragObject *KFileIconView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "kmultiple", iconSize() );
+        pixmap = DesktopIcon( "tdemultiple", iconSize() );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( iconSize() );
 
@@ -937,7 +937,7 @@ void KFileIconView::contentsDropEvent( TQDropEvent *e )
 }
 
 void KFileIconView::virtual_hook( int id, void* data )
-{ KIconView::virtual_hook( id, data );
+{ TDEIconView::virtual_hook( id, data );
   KFileView::virtual_hook( id, data ); }
 
-#include "kfileiconview.moc"
+#include "tdefileiconview.moc"
diff --git a/kio/kfile/kfileiconview.h b/tdeio/tdefile/tdefileiconview.h
index a4fd34ea1..0c46e4ffd 100644
--- a/kio/kfile/kfileiconview.h
+++ b/tdeio/tdefile/tdefileiconview.h
@@ -18,16 +18,16 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEICONVIEW_H
-#define KFILEICONVIEW_H
+#ifndef TDEFILEICONVIEW_H
+#define TDEFILEICONVIEW_H
 
 #include <tqt.h>
 
 #include <kiconview.h>
 #include <kiconloader.h>
-#include <kfileview.h>
+#include <tdefileview.h>
 #include <kmimetyperesolver.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 class KFileItem;
 class TQWidget;
@@ -37,18 +37,18 @@ class TQLabel;
  * An item for the iconview, that has a reference to its corresponding
  * KFileItem.
  */
-class KIO_EXPORT KFileIconViewItem : public KIconViewItem
+class TDEIO_EXPORT KFileIconViewItem : public TDEIconViewItem
 {
 public:
     KFileIconViewItem( TQIconView *parent, const TQString &text,
 		       const TQPixmap &pixmap,
 		       KFileItem *fi )
-	: KIconViewItem( parent, text, pixmap ), inf( fi ) {}
+	: TDEIconViewItem( parent, text, pixmap ), inf( fi ) {}
     /**
      * @since 3.1
      */
     KFileIconViewItem( TQIconView *parent, KFileItem *fi )
-	: KIconViewItem( parent ), inf( fi ) {}
+	: TDEIconViewItem( parent ), inf( fi ) {}
 
     virtual ~KFileIconViewItem();
 
@@ -68,7 +68,7 @@ private:
 
 };
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
@@ -80,7 +80,7 @@ namespace KIO {
  * @see KCombiView
  * @see KFileDetailView
  */
-class KIO_EXPORT KFileIconView : public KIconView, public KFileView
+class TDEIO_EXPORT KFileIconView : public TDEIconView, public KFileView
 {
     Q_OBJECT
 
@@ -114,12 +114,12 @@ public:
     virtual KFileItem * prevItem( const KFileItem * ) const;
 
     /**
-     * Sets the size of the icons to show. Defaults to KIcon::SizeSmall.
+     * Sets the size of the icons to show. Defaults to TDEIcon::SizeSmall.
      */
     void setIconSize( int size );
 
     /**
-     * Sets the size of the previews. Defaults to KIcon::SizeLarge.
+     * Sets the size of the previews. Defaults to TDEIcon::SizeLarge.
      */
     void setPreviewSize( int size );
 
@@ -141,8 +141,8 @@ public:
 
     virtual void setSorting(TQDir::SortSpec sort);
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
     // for KMimeTypeResolver
     void mimeTypeDeterminationFinished();
@@ -150,7 +150,7 @@ public:
     TQScrollView *scrollWidget() const { return (TQScrollView*) this; }
     void setAcceptDrops(bool b) 
     {  
-      KIconView::setAcceptDrops(b); 
+      TDEIconView::setAcceptDrops(b); 
       viewport()->setAcceptDrops(b);
     }
 
@@ -212,7 +212,7 @@ private slots:
     void slotLargeRows();
     void slotPreviewsToggled( bool );
 
-    void slotPreviewResult( KIO::Job * );
+    void slotPreviewResult( TDEIO::Job * );
     void gotPreview( const KFileItem *item, const TQPixmap& pix );
     void slotAutoOpen();
 
@@ -239,9 +239,9 @@ private:
     int th;
     int myIconSize;
 
-    virtual void insertItem(TQIconViewItem *a, TQIconViewItem *b) { KIconView::insertItem(a, b); }
-    virtual void setSelectionMode(TQIconView::SelectionMode m) { KIconView::setSelectionMode(m); }
-    virtual void setSelected(TQIconViewItem *i, bool a, bool b) { KIconView::setSelected(i, a, b); }
+    virtual void insertItem(TQIconViewItem *a, TQIconViewItem *b) { TDEIconView::insertItem(a, b); }
+    virtual void setSelectionMode(TQIconView::SelectionMode m) { TDEIconView::setSelectionMode(m); }
+    virtual void setSelected(TQIconViewItem *i, bool a, bool b) { TDEIconView::setSelected(i, a, b); }
 
     bool canPreview( const KFileItem * ) const;
     void stopPreview();
@@ -264,4 +264,4 @@ private:
     KFileIconViewPrivate *d;
 };
 
-#endif // KFILESIMPLEVIEW_H
+#endif // TDEFILESIMPLEVIEW_H
diff --git a/kio/kfile/kfilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index c4df4a15d..50fef856b 100644
--- a/kio/kfile/kfilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -18,10 +18,10 @@
     $Id$
  */
 
-#include "kfilemetainfowidget.h"
+#include "tdefilemetainfowidget.h"
 
 #include <keditcl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <klineedit.h>
@@ -372,4 +372,4 @@ void KFileMetaInfoWidget::slotDateTimeChanged(const TQDateTime& value)
     m_dirty = true;
 }
 
-#include "kfilemetainfowidget.moc"
+#include "tdefilemetainfowidget.moc"
diff --git a/kio/kfile/kfilemetainfowidget.h b/tdeio/tdefile/tdefilemetainfowidget.h
index 96614950b..5ba4d6eef 100644
--- a/kio/kfile/kfilemetainfowidget.h
+++ b/tdeio/tdefile/tdefilemetainfowidget.h
@@ -17,17 +17,17 @@
 
  */
 
-#ifndef __KFILEMETAINFOWIDGET_H__
-#define __KFILEMETAINFOWIDGET_H__
+#ifndef __TDEFILEMETAINFOWIDGET_H__
+#define __TDEFILEMETAINFOWIDGET_H__
 
 #include <tqwidget.h>
 #include <tqvariant.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 /*!
  * A widget to display file meta infos (like id3 for mp3)
  */
-class KIO_EXPORT KFileMetaInfoWidget: public TQWidget
+class TDEIO_EXPORT KFileMetaInfoWidget: public TQWidget
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kfilemetapreview.cpp b/tdeio/tdefile/tdefilemetapreview.cpp
index 155e1194c..d587511e4 100644
--- a/kio/kfile/kfilemetapreview.cpp
+++ b/tdeio/tdefile/tdefilemetapreview.cpp
@@ -6,11 +6,11 @@
  * License. See the file "COPYING" for the exact licensing terms.
  */
 
-#include "kfilemetapreview.h"
+#include "tdefilemetapreview.h"
 
 #include <tqlayout.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 #include <klibloader.h>
 #include <kimagefilepreview.h>
 #include <kmimetype.h>
@@ -181,16 +181,16 @@ void KFileMetaPreview::clearPreviewProviders()
 // static
 KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent )
 {
-    KLibFactory *factory = KLibLoader::self()->factory( "kfileaudiopreview" );
+    KLibFactory *factory = KLibLoader::self()->factory( "tdefileaudiopreview" );
     if ( !factory )
     {
         s_tryAudioPreview = false;
         return 0L;
     }
 
-    return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "kfileaudiopreview" ));
+    return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "tdefileaudiopreview" ));
 }
 
 void KFileMetaPreview::virtual_hook( int, void* ) {}
 
-#include "kfilemetapreview.moc"
+#include "tdefilemetapreview.moc"
diff --git a/kio/kfile/kfilemetapreview.h b/tdeio/tdefile/tdefilemetapreview.h
index 19b7901a1..443324da3 100644
--- a/kio/kfile/kfilemetapreview.h
+++ b/tdeio/tdefile/tdefilemetapreview.h
@@ -6,8 +6,8 @@
  * License. See the file "COPYING" for the exact licensing terms.
  */
 
-#ifndef KFILEMETAPREVIEW_H
-#define KFILEMETAPREVIEW_H
+#ifndef TDEFILEMETAPREVIEW_H
+#define TDEFILEMETAPREVIEW_H
 
 #include <tqdict.h>
 #include <tqwidgetstack.h>
@@ -15,7 +15,7 @@
 #include <kpreviewwidgetbase.h>
 #include <kurl.h>
 
-class KIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase
+class TDEIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase
 {
     Q_OBJECT
 
@@ -53,4 +53,4 @@ private:
     KFileMetaPreviewPrivate *d;
 };
 
-#endif // KFILEMETAPREVIEW_H
+#endif // TDEFILEMETAPREVIEW_H
diff --git a/kio/kfile/kfilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index b221a1ebb..acec61475 100644
--- a/kio/kfile/kfilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -19,14 +19,14 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaction.h>
-#include <kfilepreview.h>
-#include <kfilepreview.moc>
-#include <klocale.h>
+#include <tdeaction.h>
+#include <tdefilepreview.h>
+#include <tdefilepreview.moc>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 
-#include "config-kfile.h"
+#include "config-tdefile.h"
 
 KFilePreview::KFilePreview(KFileView *view, TQWidget *parent, const char *name)
     : TQSplitter(parent, name), KFileView()
@@ -254,7 +254,7 @@ KFileItem * KFilePreview::prevItem( const KFileItem *item ) const
     return left->prevItem( item );
 }
 
-KActionCollection * KFilePreview::actionCollection() const
+TDEActionCollection * KFilePreview::actionCollection() const
 {
     if ( left )
         return left->actionCollection();
@@ -264,12 +264,12 @@ KActionCollection * KFilePreview::actionCollection() const
     }
 }
 
-void KFilePreview::readConfig( KConfig *config, const TQString& group )
+void KFilePreview::readConfig( TDEConfig *config, const TQString& group )
 {
     left->readConfig( config, group );
 }
 
-void KFilePreview::writeConfig( KConfig *config, const TQString& group )
+void KFilePreview::writeConfig( TDEConfig *config, const TQString& group )
 {
     left->writeConfig( config, group );
 }
diff --git a/kio/kfile/kfilepreview.h b/tdeio/tdefile/tdefilepreview.h
index 123d221f1..16cfa281b 100644
--- a/kio/kfile/kfilepreview.h
+++ b/tdeio/tdefile/tdefilepreview.h
@@ -20,23 +20,23 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KFILEPREVIEW_H
-#define _KFILEPREVIEW_H
+#ifndef _TDEFILEPREVIEW_H
+#define _TDEFILEPREVIEW_H
 
 #include <tqsplitter.h>
 #include <tqwidget.h>
 #include <tqstring.h>
 
 #include <kurl.h>
-#include <kfileitem.h>
-#include <kfileiconview.h>
-#include <kfiledetailview.h>
-#include <kfile.h>
+#include <tdefileitem.h>
+#include <tdefileiconview.h>
+#include <tdefiledetailview.h>
+#include <tdefile.h>
 
 /*!
  * This KFileView is an empbedded preview for some file types.
  */
-class KIO_EXPORT KFilePreview : public TQSplitter, public KFileView
+class TDEIO_EXPORT KFilePreview : public TQSplitter, public KFileView
 {
     Q_OBJECT
 
@@ -83,16 +83,16 @@ public:
 
     virtual void setSorting( TQDir::SortSpec sort );
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
     /**
      * This overrides KFileView::actionCollection() by returning
      * the actionCollection() of the KFileView (member left) it contains.
-     * This means that KFilePreview will never create a KActionCollection
+     * This means that KFilePreview will never create a TDEActionCollection
      * object of its own.
      */
-    virtual KActionCollection * actionCollection() const;
+    virtual TDEActionCollection * actionCollection() const;
 
     void ensureItemVisible(const KFileItem *);
 
diff --git a/kio/kfile/kfilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index 0a2798ae6..a2fb01c2c 100644
--- a/kio/kfile/kfilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kfilesharedlg.h"
+#include "tdefilesharedlg.h"
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqdir.h>
@@ -27,25 +27,25 @@
 #include <tqlineedit.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <kio/kfileshare.h>
+#include <tdeio/tdefileshare.h>
 #include <kseparator.h>
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 class KFileSharePropsPlugin::Private
 {
 public:
     TQVBox *m_vBox;
-    KProcess *m_configProc;
+    TDEProcess *m_configProc;
     bool m_bAllShared;
     bool m_bAllUnshared;
     bool m_bAllReadOnly;
@@ -86,7 +86,7 @@ bool KFileSharePropsPlugin::supports( const KFileItemList& items )
         if ( !(*it)->isDir() || !isLocal )
             return false;
         // And sharing the trash doesn't make sense
-        if ( isLocal && (*it)->url().path( 1 ) == KGlobalSettings::trashPath() )
+        if ( isLocal && (*it)->url().path( 1 ) == TDEGlobalSettings::trashPath() )
             return false;
     }
     return true;
@@ -236,15 +236,15 @@ void KFileSharePropsPlugin::slotConfigureFileSharing()
 {
     if (d->m_configProc) return;
 
-    d->m_configProc = new KProcess(this);
-    (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare";
-    if (!d->m_configProc->start( KProcess::NotifyOnExit ))
+    d->m_configProc = new TDEProcess(this);
+    (*d->m_configProc) << TDEStandardDirs::findExe("tdesu") << locate("exe", "tdecmshell") << "fileshare";
+    if (!d->m_configProc->start( TDEProcess::NotifyOnExit ))
     {
        delete d->m_configProc;
        d->m_configProc = 0;
        return;
     }
-    connect(d->m_configProc, TQT_SIGNAL(processExited(KProcess *)),
+    connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)),
             this, TQT_SLOT(slotConfigureFileSharingDone()));
     m_pbConfig->setEnabled(false);
 }
@@ -317,7 +317,7 @@ TQWidget* KFileSharePropsPlugin::page() const
     return d->m_vBox;
 }
 
-#include "kfilesharedlg.moc"
+#include "tdefilesharedlg.moc"
 
 //TODO: do we need to monitor /etc/security/fileshare.conf ?
 // if the user is added to the 'fileshare' group, we wouldn't be notified
diff --git a/kio/kfile/kfilesharedlg.h b/tdeio/tdefile/tdefilesharedlg.h
index 54876f12a..aa818db64 100644
--- a/kio/kfile/kfilesharedlg.h
+++ b/tdeio/tdefile/tdefilesharedlg.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfilesharedlg_h
-#define kfilesharedlg_h
+#ifndef tdefilesharedlg_h
+#define tdefilesharedlg_h
 
 #include <kpropertiesdialog.h>
 class TQVBoxLayout;
@@ -30,7 +30,7 @@ class TQPushButton;
  * @author David Faure <david@mandrakesoft.com>
  * @since 3.1
  */
-class KIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin
+class TDEIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kfilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp
index 154009625..6f3365a5f 100644
--- a/kio/kfile/kfilespeedbar.cpp
+++ b/tdeio/tdefile/tdefilespeedbar.cpp
@@ -16,18 +16,18 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kfilespeedbar.h"
-#include "config-kfile.h"
+#include "tdefilespeedbar.h"
+#include "config-tdefile.h"
 
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 
-#include <kconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
@@ -35,24 +35,24 @@
 KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name )
     : KURLBar( true, parent, name )
 {
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver cs( config, ConfigGroup );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs( config, ConfigGroup );
     m_initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults",
                                                    true );
-    setIconSize(KIcon::SizeSmallMedium);
-    readConfig( KGlobal::config(), "KFileDialog Speedbar" );
+    setIconSize(TDEIcon::SizeSmallMedium);
+    readConfig( TDEGlobal::config(), "KFileDialog Speedbar" );
 
     if ( m_initializeSpeedbar )
     {
         KURL u;
-        u.setPath( KGlobalSettings::desktopPath() );
+        u.setPath( TDEGlobalSettings::desktopPath() );
         insertItem( u, i18n("Desktop"), false );
 
 //TODO: win32
-        if ((KGlobalSettings::documentPath() != (TQDir::homeDirPath()+"/")) &&
-            TQDir(KGlobalSettings::documentPath()).exists())
+        if ((TDEGlobalSettings::documentPath() != (TQDir::homeDirPath()+"/")) &&
+            TQDir(TDEGlobalSettings::documentPath()).exists())
         {
-            u.setPath( KGlobalSettings::documentPath() );
+            u.setPath( TDEGlobalSettings::documentPath() );
             insertItem( u, i18n("Documents"), false, "folder_txt" );
         }
 
@@ -121,11 +121,11 @@ KFileSpeedBar::~KFileSpeedBar()
 {
 }
 
-void KFileSpeedBar::save( KConfig *config )
+void KFileSpeedBar::save( TDEConfig *config )
 {
     if ( m_initializeSpeedbar && isModified() )
     {
-        KConfigGroup conf( config, ConfigGroup );
+        TDEConfigGroup conf( config, ConfigGroup );
         // write to kdeglobals
         conf.writeEntry( "Set speedbar defaults", false, true, true );
     }
@@ -144,4 +144,4 @@ TQSize KFileSpeedBar::sizeHint() const
     return sizeHint;
 }
 
-#include "kfilespeedbar.moc"
+#include "tdefilespeedbar.moc"
diff --git a/kio/kfile/kfilespeedbar.h b/tdeio/tdefile/tdefilespeedbar.h
index 28c621651..62415dadc 100644
--- a/kio/kfile/kfilespeedbar.h
+++ b/tdeio/tdefile/tdefilespeedbar.h
@@ -16,21 +16,21 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILESPEEDBAR_H
-#define KFILESPEEDBAR_H
+#ifndef TDEFILESPEEDBAR_H
+#define TDEFILESPEEDBAR_H
 
 #include <kurlbar.h>
 
-class KConfig;
+class TDEConfig;
 
-class KIO_EXPORT KFileSpeedBar : public KURLBar
+class TDEIO_EXPORT KFileSpeedBar : public KURLBar
 {
     Q_OBJECT
 public:
     KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 );
     ~KFileSpeedBar();
 
-    virtual void save( KConfig *config );
+    virtual void save( TDEConfig *config );
     virtual TQSize sizeHint() const;
 
 private:
@@ -38,4 +38,4 @@ private:
 
 };
 
-#endif // KFILESPEEDBAR_H
+#endif // TDEFILESPEEDBAR_H
diff --git a/kio/kfile/kfiletreebranch.cpp b/tdeio/tdefile/tdefiletreebranch.cpp
index 352bd875e..b55c3ffb2 100644
--- a/kio/kfile/kfiletreebranch.cpp
+++ b/tdeio/tdefile/tdefiletreebranch.cpp
@@ -20,7 +20,7 @@
 
 #include <tqfile.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 #include <kde_file.h>
 
@@ -28,8 +28,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "kfiletreeviewitem.h"
-#include "kfiletreebranch.h"
+#include "tdefiletreeviewitem.h"
+#include "tdefiletreebranch.h"
 
 
 /* --- KFileTreeViewToplevelItem --- */
@@ -143,7 +143,7 @@ void KFileTreeBranch::slotRefreshItems( const KFileItemList& list )
     {
         item = findTVIByURL(currItem->url());
         if (item) {
-            item->setPixmap(0, item->fileItem()->pixmap( KIcon::SizeSmall ));
+            item->setPixmap(0, item->fileItem()->pixmap( TDEIcon::SizeSmall ));
             item->setText( 0, item->fileItem()->text());
         }
         ++it;
@@ -309,7 +309,7 @@ void KFileTreeBranch::slotDeleteItem( KFileItem *it )
     }
     else
     {
-        kdDebug(250) << "Error: kfiletreeviewitem: "<< kfti << endl;
+        kdDebug(250) << "Error: tdefiletreeviewitem: "<< kfti << endl;
     }
 }
 
@@ -524,5 +524,5 @@ bool KFileTreeBranch::populate( const KURL& url,  KFileTreeViewItem *currItem )
 void KFileTreeBranch::virtual_hook( int id, void* data )
 { KDirLister::virtual_hook( id, data ); }
 
-#include "kfiletreebranch.moc"
+#include "tdefiletreebranch.moc"
 
diff --git a/kio/kfile/kfiletreebranch.h b/tdeio/tdefile/tdefiletreebranch.h
index 30f5cf47c..a8548b10c 100644
--- a/kio/kfile/kfiletreebranch.h
+++ b/tdeio/tdefile/tdefiletreebranch.h
@@ -19,17 +19,17 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfile_tree_branch_h
-#define kfile_tree_branch_h
+#ifndef tdefile_tree_branch_h
+#define tdefile_tree_branch_h
 
 #include <tqdict.h>
 #include <tqlistview.h>
 
-#include <kfileitem.h>
-#include <kio/global.h>
+#include <tdefileitem.h>
+#include <tdeio/global.h>
 #include <kdirlister.h>
-#include <kio/job.h>
-#include <kfiletreeviewitem.h>
+#include <tdeio/job.h>
+#include <tdefiletreeviewitem.h>
 
 class KURL;
 class KFileTreeView;
@@ -45,7 +45,7 @@ class KFileTreeView;
  *
  */
 
-class KIO_EXPORT KFileTreeBranch : public KDirLister
+class TDEIO_EXPORT KFileTreeBranch : public KDirLister
 {
    Q_OBJECT
 public:
diff --git a/kio/kfile/kfiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index e8451077d..cb7432423 100644
--- a/kio/kfile/kfiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -22,30 +22,30 @@
 #include <tqtimer.h>
 #include <kdebug.h>
 #include <kdirnotify_stub.h>
-#include <kglobalsettings.h>
-#include <kfileitem.h>
-#include <kfileview.h>
+#include <tdeglobalsettings.h>
+#include <tdefileitem.h>
+#include <tdefileview.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
 
 
-#include "kfiletreeview.h"
-#include "kfiletreebranch.h"
-#include "kfiletreeviewitem.h"
+#include "tdefiletreeview.h"
+#include "tdefiletreebranch.h"
+#include "tdefiletreeviewitem.h"
 
 KFileTreeView::KFileTreeView( TQWidget *parent, const char *name )
-    : KListView( parent, name ),
+    : TDEListView( parent, name ),
       m_wantOpenFolderPixmaps( true ),
       m_toolTip( this )
 {
     setDragEnabled(true);
-    setSelectionModeExt( KListView::Single );
+    setSelectionModeExt( TDEListView::Single );
 
     m_animationTimer = new TQTimer( this );
     connect( m_animationTimer, TQT_SIGNAL( timeout() ),
@@ -79,7 +79,7 @@ KFileTreeView::KFileTreeView( TQWidget *parent, const char *name )
     m_bDrag = false;
     m_branches.setAutoDelete( true );
 
-    m_openFolderPixmap = DesktopIcon( "folder_open",KIcon::SizeSmall,KIcon::ActiveState );
+    m_openFolderPixmap = DesktopIcon( "folder_open",TDEIcon::SizeSmall,TDEIcon::ActiveState );
 }
 
 KFileTreeView::~KFileTreeView()
@@ -235,8 +235,8 @@ bool KFileTreeView::acceptDrag(TQDropEvent* e ) const
    // kdDebug(250) << "canDecode: " << KURLDrag::canDecode(e) << endl;
    // kdDebug(250) << "action: " << e->action() << endl;
 
-   /*  KListView::acceptDrag(e);  */
-   /* this is what KListView does:
+   /*  TDEListView::acceptDrag(e);  */
+   /* this is what TDEListView does:
     * acceptDrops() && itemsMovable() && (e->source()==viewport());
     * ask acceptDrops and itemsMovable, but not the third
     */
@@ -262,7 +262,7 @@ TQDragObject * KFileTreeView::dragObject()
    TQPoint hotspot;
    TQPixmap pixmap;
    if( urls.count() > 1 ){
-      pixmap = DesktopIcon( "kmultiple", 16 );
+      pixmap = DesktopIcon( "tdemultiple", 16 );
    }
    if( pixmap.isNull() )
       pixmap = currentKFileTreeViewItem()->fileItem()->pixmap( 16 );
@@ -357,7 +357,7 @@ void KFileTreeView::slotSelectionChanged()
 KFileTreeBranch* KFileTreeView::addBranch( const KURL &path, const TQString& name,
                               bool showHidden )
 {
-    const TQPixmap& folderPix = KMimeType::mimeType("inode/directory")->pixmap( KIcon::Desktop,KIcon::SizeSmall );
+    const TQPixmap& folderPix = KMimeType::mimeType("inode/directory")->pixmap( TDEIcon::Desktop,TDEIcon::SizeSmall );
 
     return addBranch( path, name, folderPix, showHidden);
 }
@@ -491,7 +491,7 @@ TQPixmap KFileTreeView::itemIcon( KFileTreeViewItem *item, int gap ) const
       else
       {
          // TODO: different modes, user Pixmaps ?
-         pix = item->fileItem()->pixmap( KIcon::SizeSmall ); // , KIcon::DefaultState);
+         pix = item->fileItem()->pixmap( TDEIcon::SizeSmall ); // , TDEIcon::DefaultState);
 
          /* Only if it is a dir and the user wants open dir pixmap and it is open,
           * change the fileitem's pixmap to the open folder pixmap. */
@@ -524,7 +524,7 @@ void KFileTreeView::slotAnimation()
       uint & iconNumber = it.data().iconNumber;
       TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
       // kdDebug(250) << "Loading icon " << icon << endl;
-      item->setPixmap( 0, DesktopIcon( icon,KIcon::SizeSmall,KIcon::ActiveState )); // KFileTreeViewFactory::instance() ) );
+      item->setPixmap( 0, DesktopIcon( icon,TDEIcon::SizeSmall,TDEIcon::ActiveState )); // KFileTreeViewFactory::instance() ) );
 
       iconNumber++;
       if ( iconNumber > it.data().iconCount )
@@ -672,6 +672,6 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & )
 }
 
 void KFileTreeView::virtual_hook( int id, void* data )
-{ KListView::virtual_hook( id, data ); }
+{ TDEListView::virtual_hook( id, data ); }
 
-#include "kfiletreeview.moc"
+#include "tdefiletreeview.moc"
diff --git a/kio/kfile/kfiletreeview.h b/tdeio/tdefile/tdefiletreeview.h
index fb242b2c6..da72709cd 100644
--- a/kio/kfile/kfiletreeview.h
+++ b/tdeio/tdefile/tdefiletreeview.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfile_tree_view_h
-#define kfile_tree_view_h
+#ifndef tdefile_tree_view_h
+#define tdefile_tree_view_h
 
 #include <tqmap.h>
 #include <tqpoint.h>
@@ -27,17 +27,17 @@
 #include <tqstrlist.h>
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdirnotify.h>
-#include <kio/job.h>
-#include <kfiletreeviewitem.h>
-#include <kfiletreebranch.h>
+#include <tdeio/job.h>
+#include <tdefiletreeviewitem.h>
+#include <tdefiletreebranch.h>
 
 class TQTimer;
 
 
 
-class KIO_EXPORT KFileTreeViewToolTip : public TQToolTip
+class TDEIO_EXPORT KFileTreeViewToolTip : public TQToolTip
 {
 public:
     KFileTreeViewToolTip( TQListView *view ) : TQToolTip( view ), m_view( view ) {}
@@ -63,7 +63,7 @@ private:
  * 3. retrieve the root item with KFileTreeBranch::root() and set it open
  *    if desired. That starts the listing.
  */
-class KIO_EXPORT KFileTreeView : public KListView
+class TDEIO_EXPORT KFileTreeView : public TDEListView
 {
     Q_OBJECT
 public:
diff --git a/kio/kfile/kfiletreeviewitem.cpp b/tdeio/tdefile/tdefiletreeviewitem.cpp
index 17e2d9abe..8879c5675 100644
--- a/kio/kfile/kfiletreeviewitem.cpp
+++ b/tdeio/tdefile/tdefiletreeviewitem.cpp
@@ -18,10 +18,10 @@
 */
 
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kicontheme.h>
 
-#include "kfiletreeviewitem.h"
+#include "tdefiletreeviewitem.h"
 
 /* --- KFileTreeViewItem --- */
 /*
@@ -29,12 +29,12 @@
 KFileTreeViewItem::KFileTreeViewItem( KFileTreeViewItem *parent,
 				      KFileItem* item,
 				      KFileTreeBranch *brnch )
-   : KListViewItem( parent ),
-     m_kfileitem( item ),
+   : TDEListViewItem( parent ),
+     m_tdefileitem( item ),
      m_branch( brnch ),
      m_wasListed(false)
 {
-   setPixmap(0, item->pixmap( KIcon::SizeSmall ));
+   setPixmap(0, item->pixmap( TDEIcon::SizeSmall ));
    setText( 0, item->text());
 
 }
@@ -42,19 +42,19 @@ KFileTreeViewItem::KFileTreeViewItem( KFileTreeViewItem *parent,
 KFileTreeViewItem::KFileTreeViewItem( KFileTreeView* parent,
 				      KFileItem* item,
 				      KFileTreeBranch *brnch )
-   :KListViewItem( (TQListView*)parent ),
-    m_kfileitem(item ),
+   :TDEListViewItem( (TQListView*)parent ),
+    m_tdefileitem(item ),
     m_branch( brnch ),
     m_wasListed(false)
 {
-   setPixmap(0, item->pixmap( KIcon::SizeSmall ));
+   setPixmap(0, item->pixmap( TDEIcon::SizeSmall ));
    setText( 0, item->text());
 }
 
 KFileTreeViewItem::~KFileTreeViewItem()
 {
-    if ( m_kfileitem )
-        m_kfileitem->removeExtraData( m_branch );
+    if ( m_tdefileitem )
+        m_tdefileitem->removeExtraData( m_branch );
 }
 
 bool KFileTreeViewItem::alreadyListed() const
@@ -69,15 +69,15 @@ void KFileTreeViewItem::setListed( bool wasListed )
 
 KURL KFileTreeViewItem::url() const
 {
-    return m_kfileitem ? m_kfileitem->url() : KURL();
+    return m_tdefileitem ? m_tdefileitem->url() : KURL();
 }
 
 TQString KFileTreeViewItem::path()  const
 {
-    return m_kfileitem ? m_kfileitem->url().path() : TQString::null;
+    return m_tdefileitem ? m_tdefileitem->url().path() : TQString::null;
 }
 
 bool KFileTreeViewItem::isDir() const
 {
-    return m_kfileitem ? m_kfileitem->isDir() : false;
+    return m_tdefileitem ? m_tdefileitem->isDir() : false;
 }
diff --git a/kio/kfile/kfiletreeviewitem.h b/tdeio/tdefile/tdefiletreeviewitem.h
index fe338df3b..5ee6e035a 100644
--- a/kio/kfile/kfiletreeviewitem.h
+++ b/tdeio/tdefile/tdefiletreeviewitem.h
@@ -17,16 +17,16 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfile_tree_view_item_h
-#define kfile_tree_view_item_h
+#ifndef tdefile_tree_view_item_h
+#define tdefile_tree_view_item_h
 
 #include <tqptrlist.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
-#include <kfileitem.h>
-#include <kio/global.h>
+#include <tdefileitem.h>
+#include <tdeio/global.h>
 #include <kdirlister.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class KURL;
 class KFileTreeView;
@@ -37,7 +37,7 @@ class KFileTreeItem;
 /**
  * An item for a KFileTreeView that knows about its own KFileItem.
  */
-class KIO_EXPORT KFileTreeViewItem : public KListViewItem
+class TDEIO_EXPORT KFileTreeViewItem : public TDEListViewItem
 {
 public:
    KFileTreeViewItem( KFileTreeViewItem*, KFileItem*, KFileTreeBranch * );
@@ -52,7 +52,7 @@ public:
    /**
     * @return the KFileItem the viewitem is representing.
     */
-   KFileItem *fileItem() const         { return m_kfileitem; }
+   KFileItem *fileItem() const         { return m_tdefileitem; }
 
    /**
     * @return the path of the item.
@@ -83,7 +83,7 @@ protected:
 
 private:
 
-   KFileItem *m_kfileitem;
+   KFileItem *m_tdefileitem;
    KFileTreeBranch *m_branch;
    bool  m_wasListed;
    class KFileTreeViewItemPrivate;
diff --git a/kio/kfile/kfileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 165801652..f171975d8 100644
--- a/kio/kfile/kfileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -22,15 +22,15 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
-#include "config-kfile.h"
-#include "kfileview.h"
+#include "config-tdefile.h"
+#include "tdefileview.h"
 
 #ifdef Unsorted // the "I hate X.h" modus
 #undef Unsorted
@@ -55,7 +55,7 @@ public:
         }
     }
 
-    TQGuardedPtr<KActionCollection> actions;
+    TQGuardedPtr<TDEActionCollection> actions;
     int dropOptions;
 };
 
@@ -171,7 +171,7 @@ void KFileView::sortReversed()
 #if 0
 int KFileView::compareItems(const KFileItem *fi1, const KFileItem *fi2) const
 {
-    static const TQString &dirup = KGlobal::staticQString("..");
+    static const TQString &dirup = TDEGlobal::staticQString("..");
     bool bigger = true;
     bool keepFirst = false;
     bool dirsFirst = ((m_sorting & TQDir::DirsFirst) == TQDir::DirsFirst);
@@ -212,8 +212,8 @@ sort_by_name:
                     break;
                 case TQDir::Time:
                 {
-                    time_t t1 = fi1->time( KIO::UDS_MODIFICATION_TIME );
-                    time_t t2 = fi2->time( KIO::UDS_MODIFICATION_TIME );
+                    time_t t1 = fi1->time( TDEIO::UDS_MODIFICATION_TIME );
+                    time_t t2 = fi2->time( TDEIO::UDS_MODIFICATION_TIME );
                     if ( t1 != t2 ) {
                         bigger = (t1 > t2);
                         break;
@@ -228,8 +228,8 @@ sort_by_name:
                 }
                 case TQDir::Size:
                 {
-                    KIO::filesize_t s1 = fi1->size();
-                    KIO::filesize_t s2 = fi2->size();
+                    TDEIO::filesize_t s1 = fi1->size();
+                    TDEIO::filesize_t s2 = fi2->size();
                     if ( s1 != s2 ) {
                         bigger = (s1 > s2);
                         break;
@@ -277,7 +277,7 @@ void KFileView::setCurrentItem(const TQString &filename )
         }
     }
 
-    kdDebug(kfile_area) << "setCurrentItem: no match found: " << filename << endl;
+    kdDebug(tdefile_area) << "setCurrentItem: no match found: " << filename << endl;
 }
 
 const KFileItemList * KFileView::items() const
@@ -362,18 +362,18 @@ void KFileView::listingCompleted()
     // empty default impl.
 }
 
-KActionCollection * KFileView::actionCollection() const
+TDEActionCollection * KFileView::actionCollection() const
 {
     if ( !d->actions )
-        d->actions = new KActionCollection( widget(), "KFileView::d->actions" );
+        d->actions = new TDEActionCollection( widget(), "KFileView::d->actions" );
     return d->actions;
 }
 
-void KFileView::readConfig( KConfig *, const TQString&  )
+void KFileView::readConfig( TDEConfig *, const TQString&  )
 {
 }
 
-void KFileView::writeConfig( KConfig *, const TQString& )
+void KFileView::writeConfig( TDEConfig *, const TQString& )
 {
 }
 
@@ -386,12 +386,12 @@ TQString KFileView::sortingKey( const TQString& value, bool isDir, int sortSpec
     return result.prepend( start );
 }
 
-TQString KFileView::sortingKey( KIO::filesize_t value, bool isDir, int sortSpec)
+TQString KFileView::sortingKey( TDEIO::filesize_t value, bool isDir, int sortSpec)
 {
     bool reverse = sortSpec & TQDir::Reversed;
     bool dirsFirst = sortSpec & TQDir::DirsFirst;
     char start = (isDir && dirsFirst) ? (reverse ? '2' : '0') : '1';
-    return KIO::number( value ).rightJustify( 24, '0' ).prepend( start );
+    return TDEIO::number( value ).rightJustify( 24, '0' ).prepend( start );
 }
 
 void KFileView::setDropOptions(int options)
@@ -426,4 +426,4 @@ void KFileView::virtual_hook( int id, void* data)
     }
 }
 
-#include "kfileview.moc"
+#include "tdefileview.moc"
diff --git a/kio/kfile/kfileview.h b/tdeio/tdefile/tdefileview.h
index bce408327..b80c16f0f 100644
--- a/kio/kfile/kfileview.h
+++ b/tdeio/tdefile/tdefileview.h
@@ -19,22 +19,22 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEVIEW_H
-#define KFILEVIEW_H
+#ifndef TDEFILEVIEW_H
+#define TDEFILEVIEW_H
 
 class TQPoint;
-class KActionCollection;
+class TDEActionCollection;
 
 #include <tqwidget.h>
 
-#include "kfileitem.h"
-#include "kfile.h"
+#include "tdefileitem.h"
+#include "tdefile.h"
 
 /**
  * internal class to make easier to use signals possible
  * @internal
  **/
-class KIO_EXPORT KFileViewSignaler : public TQObject
+class TDEIO_EXPORT KFileViewSignaler : public TQObject
 {
     Q_OBJECT
 
@@ -95,7 +95,7 @@ signals:
   * @short A base class for views of the KDE file selector
   * @author Stephan Kulow <coolo@kde.org>
   **/
-class KIO_EXPORT KFileView {
+class TDEIO_EXPORT KFileView {
 
 public:
     KFileView();
@@ -342,12 +342,12 @@ public:
      * add its actions here (if it has any) to make them available to
      * e.g. the KDirOperator's popup-menu.
      */
-    virtual KActionCollection * actionCollection() const;
+    virtual TDEActionCollection * actionCollection() const;
 
     KFileViewSignaler * signaler() const { return sig; }
 
-    virtual void readConfig( KConfig *, const TQString& group = TQString::null );
-    virtual void writeConfig( KConfig *, const TQString& group = TQString::null);
+    virtual void readConfig( TDEConfig *, const TQString& group = TQString::null );
+    virtual void writeConfig( TDEConfig *, const TQString& group = TQString::null);
 
     /**
      * Various options for drag and drop support. 
@@ -392,10 +392,10 @@ public:
     /**
      * An overloaded method that takes not a TQString, but a number as sort
      * criterion. You can use this for file-sizes or dates/times for example.
-     * If you use a time_t, you need to cast that to KIO::filesize_t because
+     * If you use a time_t, you need to cast that to TDEIO::filesize_t because
      * of ambiguity problems.
      */
-    static TQString sortingKey( KIO::filesize_t value, bool isDir,int sortSpec);
+    static TQString sortingKey( TDEIO::filesize_t value, bool isDir,int sortSpec);
 
     /**
      * @internal
@@ -441,4 +441,4 @@ private:
     KFileViewPrivate *d;
 };
 
-#endif // KFILEINFOLISTWIDGET_H
+#endif // TDEFILEINFOLISTWIDGET_H
diff --git a/kio/kfile/krecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
index 22b4cd477..0548261dd 100644
--- a/kio/kfile/krecentdirs.cpp
+++ b/tdeio/tdefile/tderecentdirs.cpp
@@ -25,16 +25,16 @@
  * SUCH DAMAGE.
  *
  */
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #define MAX_DIR_HISTORY 3
 
-static void recentdirs_done(KConfig *config)
+static void recentdirs_done(TDEConfig *config)
 {
-   if (config == KGlobal::config())
+   if (config == TDEGlobal::config())
    {
       config->sync();
    }
@@ -44,32 +44,32 @@ static void recentdirs_done(KConfig *config)
    }
 }
 
-static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly)
+static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool readOnly)
 {
-   KConfig *config;
+   TDEConfig *config;
    if ((key.length() < 2) || (key[0] != ':'))
      key = ":default";
    if (key[1] == ':') 
    {
       key = key.mid(2);
-      config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly);
+      config = new KSimpleConfig(TQString::fromLatin1("tderecentdirsrc"), readOnly);
    }
    else
    {
       key = key.mid(1);
-      config = KGlobal::config();
+      config = TDEGlobal::config();
       config->setGroup(TQString::fromLatin1("Recent Dirs"));
    }
 
    result=config->readPathListEntry(key);
    if (result.isEmpty())
    {
-      result.append(KGlobalSettings::documentPath());
+      result.append(TDEGlobalSettings::documentPath());
    }
    return config;
 }
 
-TQStringList KRecentDirs::list(const TQString &fileClass)
+TQStringList TDERecentDirs::list(const TQString &fileClass)
 {
    TQString key = fileClass;
    TQStringList result;
@@ -77,17 +77,17 @@ TQStringList KRecentDirs::list(const TQString &fileClass)
    return result;
 }
     
-TQString KRecentDirs::dir(const TQString &fileClass)
+TQString TDERecentDirs::dir(const TQString &fileClass)
 {
    TQStringList result = list(fileClass);
    return result[0];
 }
 
-void KRecentDirs::add(const TQString &fileClass, const TQString &directory)
+void TDERecentDirs::add(const TQString &fileClass, const TQString &directory)
 {
    TQString key = fileClass;
    TQStringList result;
-   KConfig *config = recentdirs_readList(key, result, false);
+   TDEConfig *config = recentdirs_readList(key, result, false);
    // make sure the dir is first in history
    result.remove(directory);
    result.prepend(directory);
diff --git a/kio/kfile/krecentdirs.h b/tdeio/tdefile/tderecentdirs.h
index e8c6c9419..cc9be16b4 100644
--- a/kio/kfile/krecentdirs.h
+++ b/tdeio/tdefile/tderecentdirs.h
@@ -47,7 +47,7 @@
  * a single ':' the file-class is specific to the current application.
  * If the file-class starts with '::' it is global to all applications.
  */
-class KIO_EXPORT KRecentDirs
+class TDEIO_EXPORT TDERecentDirs
 {
 public:
     /**
diff --git a/kio/kfile/krecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp
index 7ad690be4..968db93a4 100644
--- a/kio/kfile/krecentdocument.cpp
+++ b/tdeio/tdefile/tderecentdocument.cpp
@@ -25,10 +25,10 @@
  * SUCH DAMAGE.
  *
  */
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kmimetype.h>
@@ -42,13 +42,13 @@
 #include <sys/types.h>
 #include <utime.h>
 
-TQString KRecentDocument::recentDocumentDirectory()
+TQString TDERecentDocument::recentDocumentDirectory()
 {
     // need to change this path, not sure where
     return locateLocal("data", TQString::fromLatin1("RecentDocuments/"));
 }
 
-TQStringList KRecentDocument::recentDocuments()
+TQStringList TDERecentDocument::recentDocuments()
 {
     TQDir d(recentDocumentDirectory(), "*.desktop", TQDir::Time,
            TQDir::Files | TQDir::Readable | TQDir::Hidden);
@@ -72,21 +72,21 @@ TQStringList KRecentDocument::recentDocuments()
     return fullList;
 }
 
-void KRecentDocument::add(const KURL& url)
+void TDERecentDocument::add(const KURL& url)
 {
-    KRecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename!
+    TDERecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename!
 }
 
-void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
+void TDERecentDocument::add(const KURL& url, const TQString& desktopEntryName)
 {
-	if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
+	if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
 		return;
 
     TQString openStr = url.url();
     openStr.replace( TQRegExp("\\$"), "$$" ); // Desktop files with type "Link" are $-variable expanded
 
-    kdDebug(250) << "KRecentDocument::add for " << openStr << endl;
-    KConfig *config = KGlobal::config();
+    kdDebug(250) << "TDERecentDocument::add for " << openStr << endl;
+    TDEConfig *config = TDEGlobal::config();
     TQString oldGrp = config->group();
     config->setGroup(TQString::fromLatin1("RecentDocuments"));
     bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true);
@@ -148,7 +148,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
     conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) );
 }
 
-void KRecentDocument::add(const TQString &openStr, bool isUrl)
+void TDERecentDocument::add(const TQString &openStr, bool isUrl)
 {
     if( isUrl ) {
         add( KURL( openStr ) );
@@ -159,7 +159,7 @@ void KRecentDocument::add(const TQString &openStr, bool isUrl)
     }
 }
 
-void KRecentDocument::clear()
+void TDERecentDocument::clear()
 {
   TQStringList list = recentDocuments();
   TQDir dir;
@@ -167,10 +167,10 @@ void KRecentDocument::clear()
     dir.remove(*it);
 }
 
-int KRecentDocument::maximumItems()
+int TDERecentDocument::maximumItems()
 {
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
     return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
 }
 
diff --git a/kio/kfile/krecentdocument.h b/tdeio/tdefile/tderecentdocument.h
index 6bbd3f654..b788c0dc2 100644
--- a/kio/kfile/krecentdocument.h
+++ b/tdeio/tdefile/tderecentdocument.h
@@ -47,7 +47,7 @@
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class KIO_EXPORT KRecentDocument
+class TDEIO_EXPORT TDERecentDocument
 {
 public:
 
diff --git a/kio/kfile/tests/Makefile.am b/tdeio/tdefile/tests/Makefile.am
index 9689f7a27..d869f11f5 100644
--- a/kio/kfile/tests/Makefile.am
+++ b/tdeio/tdefile/tests/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES = $(all_includes)
 
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 
-check_PROGRAMS = kfstest kurlrequestertest kfiletreeviewtest \
+check_PROGRAMS = kfstest kurlrequestertest tdefiletreeviewtest \
                  kopenwithtest kdirselectdialogtest kicondialogtest \
                  knotifytest kcustommenueditortest
 
@@ -33,7 +33,7 @@ LDADD = $(LIB_KIO)
 kcustommenueditortest_SOURCES = kcustommenueditortest.cpp
 kurlrequestertest_SOURCES = kurlrequestertest.cpp
 kfstest_SOURCES = kfstest.cpp kfdtest.cpp
-kfiletreeviewtest_SOURCES = kfiletreeviewtest.cpp
+tdefiletreeviewtest_SOURCES = tdefiletreeviewtest.cpp
 kopenwithtest_SOURCES = kopenwithtest.cpp
 kdirselectdialogtest_SOURCES = kdirselectdialogtest.cpp
 kicondialogtest_SOURCES = kicondialogtest.cpp
diff --git a/tdeio/tdefile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp
new file mode 100644
index 000000000..9e2189406
--- /dev/null
+++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp
@@ -0,0 +1,19 @@
+#include "kcustommenueditor.h"
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
+
+int main(int argc, char** argv)
+{
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEApplication app(argc, argv, "KCustomMenuEditorTest");
+  KCustomMenuEditor editor(0);
+  TDEConfig *cfg = new TDEConfig("kdesktop_custom_menu2");
+  editor.load(cfg);
+  if (editor.exec())
+  {
+     editor.save(cfg);
+     cfg->sync();
+  }
+}
+
diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
index 47fcd02ca..c1178c3bc 100644
--- a/kio/kfile/tests/kdirselectdialogtest.cpp
+++ b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
@@ -1,11 +1,11 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirselectdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 int main( int argc, char **argv )
 {
-    KApplication app(argc, argv, "kdirselectdialogtest");
+    TDEApplication app(argc, argv, "kdirselectdialogtest");
 
     KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null );
     if ( u.isValid() )
diff --git a/kio/kfile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index 867b9b4a8..ce7127d9e 100644
--- a/kio/kfile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -1,9 +1,9 @@
 #include "kfdtest.h"
 
 #include <tqstringlist.h>
-#include <kfiledialog.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
+#include <tdefiledialog.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 
 KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name )
diff --git a/kio/kfile/tests/kfdtest.h b/tdeio/tdefile/tests/kfdtest.h
index 6c59550b8..6c59550b8 100644
--- a/kio/kfile/tests/kfdtest.h
+++ b/tdeio/tdefile/tests/kfdtest.h
diff --git a/kio/kfile/tests/kfstest.cpp b/tdeio/tdefile/tests/kfstest.cpp
index db3f46e28..ada8d825e 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/tdeio/tdefile/tests/kfstest.cpp
@@ -28,15 +28,15 @@
 #include <tqstringlist.h>
 #include <tqwidget.h>
 
-#include <kfiledialog.h>
-#include <kfileiconview.h>
-#include <kmessagebox.h>
-#include <kconfig.h>
-#include <kapplication.h>
+#include <tdefiledialog.h>
+#include <tdefileiconview.h>
+#include <tdemessagebox.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kurlbar.h>
-#include <kdiroperator.h>
-#include <kfile.h>
+#include <tdediroperator.h>
+#include <tdefile.h>
 #include <kdebug.h>
 #include <kicondialog.h>
 
@@ -44,7 +44,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication a(argc, argv, "kfstest");
+    TDEApplication a(argc, argv, "kfstest");
     TQString name1;
     TQStringList names;
 
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
 
     if (argv1 == TQString::fromLatin1("diroperator")) {
 	KDirOperator *op = new KDirOperator(startDir, 0, "operator");
-	op->setViewConfig( KGlobal::config(), "TestGroup" );
+	op->setViewConfig( TDEGlobal::config(), "TestGroup" );
 	op->setView(KFile::Simple);
 	op->show();
 	a.setMainWidget(op);
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
     }
 
     else if (argv1 == TQString::fromLatin1("icon")) {
-    	KIconDialog dlg;
+    	TDEIconDialog dlg;
 	TQString icon = dlg.selectIcon();
 	kdDebug() << icon << endl;
     }
diff --git a/kio/kfile/tests/kicondialogtest.cpp b/tdeio/tdefile/tests/kicondialogtest.cpp
index 23301b752..3000e89a0 100644
--- a/kio/kfile/tests/kicondialogtest.cpp
+++ b/tdeio/tdefile/tests/kicondialogtest.cpp
@@ -1,13 +1,13 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kicondialog.h>
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kicondialogtest" );
+    TDEApplication app( argc, argv, "kicondialogtest" );
 
-//    KIconDialog::getIcon(); 
+//    TDEIconDialog::getIcon(); 
 
-    KIconButton button;
+    TDEIconButton button;
     app.setMainWidget( &button );
     button.show();
  
diff --git a/kio/kfile/tests/knotifytest.cpp b/tdeio/tdefile/tests/knotifytest.cpp
index f6e93fa99..1716a86a3 100644
--- a/kio/kfile/tests/knotifytest.cpp
+++ b/tdeio/tdefile/tests/knotifytest.cpp
@@ -1,9 +1,9 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifydialog.h>
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "knotifytest" );
+    TDEApplication app( argc, argv, "knotifytest" );
     KNotifyDialog *dlg = new KNotifyDialog();
     dlg->addApplicationEvents( "twin" );
     return dlg->exec();
diff --git a/kio/kfile/tests/kopenwithtest.cpp b/tdeio/tdefile/tests/kopenwithtest.cpp
index ea348a94c..925aa7625 100644
--- a/kio/kfile/tests/kopenwithtest.cpp
+++ b/tdeio/tdefile/tests/kopenwithtest.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
@@ -28,7 +28,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kopenwithtest");
+    TDEApplication app(argc, argv, "kopenwithtest");
     KURL::List list;
 
     list += KURL("file:///tmp/testfile.txt");
diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/tdeio/tdefile/tests/kurlrequestertest.cpp
index 99af39814..829055304 100644
--- a/kio/kfile/tests/kurlrequestertest.cpp
+++ b/tdeio/tdefile/tests/kurlrequestertest.cpp
@@ -1,11 +1,11 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditlistbox.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdlg.h>
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kurlrequestertest" );
+    TDEApplication app( argc, argv, "kurlrequestertest" );
     KURL url = KURLRequesterDlg::getURL( "ftp://ftp.kde.org" );
     tqDebug( "Selected url: %s", url.url().latin1());
 
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 5c520dd5d..9ff0199dc 100644
--- a/kio/kfile/tests/kfiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -19,21 +19,21 @@
 
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kmainwindow.h>
-#include <kapplication.h>
+#include <tdemainwindow.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
 
-#include <kfiletreeview.h>
-#include "kfiletreeviewtest.h"
+#include <tdefiletreeview.h>
+#include "tdefiletreeviewtest.h"
 
 
-#include "kfiletreeviewtest.moc"
+#include "tdefiletreeviewtest.moc"
 
-testFrame::testFrame():KMainWindow(0,"Test FileTreeView"),
+testFrame::testFrame():TDEMainWindow(0,"Test FileTreeView"),
 		       dirOnlyMode(false)
 
 {
@@ -66,9 +66,9 @@ void testFrame::showPath( const KURL &url )
 {
    TQString fname = "TestBranch"; // url.fileName ();
    /* try a user icon */
-   KIconLoader *loader = KGlobal::iconLoader();
-   TQPixmap pix = loader->loadIcon( "contents2", KIcon::Small );
-   TQPixmap pixOpen = loader->loadIcon( "contents", KIcon::Small );
+   TDEIconLoader *loader = TDEGlobal::iconLoader();
+   TQPixmap pix = loader->loadIcon( "contents2", TDEIcon::Small );
+   TQPixmap pixOpen = loader->loadIcon( "contents", TDEIcon::Small );
 
    KFileTreeBranch *nb = treeView->addBranch( url, fname, pix );
 
@@ -134,7 +134,7 @@ void testFrame::slotSetChildCount( KFileTreeViewItem *item, int c )
 
 int main(int argc, char **argv)
 {
-    KApplication a(argc, argv, "kfiletreeviewtest");
+    TDEApplication a(argc, argv, "tdefiletreeviewtest");
     TQString name1;
     TQStringList names;
 
diff --git a/kio/kfile/tests/kfiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h
index 4ae791ce5..0375f8d11 100644
--- a/kio/kfile/tests/kfiletreeviewtest.h
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h
@@ -17,10 +17,10 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILETREEVIEWTEST
-#define KFILETREEVIEWTEST
+#ifndef TDEFILETREEVIEWTEST
+#define TDEFILETREEVIEWTEST
 
-class testFrame: public KMainWindow
+class testFrame: public TDEMainWindow
 {
    Q_OBJECT
 public:
diff --git a/kio/kfileplugin.desktop b/tdeio/tdefileplugin.desktop
index 6609551a6..6609551a6 100644
--- a/kio/kfileplugin.desktop
+++ b/tdeio/tdefileplugin.desktop
diff --git a/kio/kio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt
index 25d4fad83..e2b96ebb1 100644
--- a/kio/kio/CMakeLists.txt
+++ b/tdeio/tdeio/CMakeLists.txt
@@ -12,7 +12,7 @@
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/kio/kssl
+  ${CMAKE_BINARY_DIR}/tdeio/kssl
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
@@ -21,8 +21,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kssl
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/kssl
   ${CMAKE_SOURCE_DIR}/interfaces
   ${LIBR_INCLUDEDIR}
   ${GAMIN_INCLUDEDIR}
@@ -38,12 +38,12 @@ install( FILES
     kservicetype.h kmimetype.h kmimemagic.h kservice.h
     krun.h kdirwatch.h kautomount.h kuserprofile.h
     kshred.h kar.h ktar.h kzip.h ktrader.h kurifilter.h
-    kurlcompletion.h kshellcompletion.h kfileitem.h
-    kfileshare.h ksambashare.h knfsshare.h kdirlister.h
+    kurlcompletion.h kshellcompletion.h tdefileitem.h
+    tdefileshare.h ksambashare.h knfsshare.h kdirlister.h
     kservicegroup.h kimageio.h kdirnotify.h kdirnotify_stub.h
-    kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h
-    kfilterbase.h kfilterdev.h kemailsettings.h kscan.h
-    kdatatool.h karchive.h kfilefilter.h kfilemetainfo.h
+    kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h
+    kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h
+    kdatatool.h karchive.h tdefilefilter.h tdefilemetainfo.h
     renamedlgplugin.h kmimetyperesolver.h kdcopservicestarter.h
     kremoteencoding.h kmimetypechooser.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
@@ -63,15 +63,15 @@ install( FILES
     http_slave_defaults.h previewjob.h thumbcreator.h
     metainfojob.h davjob.h renamedlg.h skipdlg.h
     ${CMAKE_CURRENT_BINARY_DIR}/uiserver_stub.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
-##### kiocore ###################################
+##### tdeiocore ###################################
 
-set( target kiocore )
+set( target tdeiocore )
 
 set( ${target}_SRCS
-  authinfo.cpp kshred.cpp kprotocolmanager.cpp slave.cpp
+  authinfo.cpp kshred.cpp tdeprotocolmanager.cpp slave.cpp
   slaveinterface.cpp observer.stub sessiondata.cpp
   scheduler.cpp connection.cpp job.cpp global.cpp
   slaveconfig.cpp kurlpixmapprovider.cpp netaccess.cpp
@@ -79,7 +79,7 @@ set( ${target}_SRCS
   slavebase.cpp passdlg.cpp forwardingslavebase.cpp
   progressbase.cpp defaultprogress.cpp statusbarprogress.cpp
   kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp
-  observer.cpp ../misc/uiserver.stub observer.skel kemailsettings.cpp
+  observer.cpp ../misc/uiserver.stub observer.skel tdeemailsettings.cpp
   kprotocolinfo.cpp renamedlg.cpp skipdlg.cpp kremoteencoding.cpp
   kmimetypechooser.cpp
 )
@@ -90,23 +90,23 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
 )
 
 
-##### ksycoca ###################################
+##### tdesycoca ###################################
 
-set( target ksycoca )
+set( target tdesycoca )
 
 set( ${target}_SRCS
-  kdirwatch.cpp kfileshare.cpp ksambashare.cpp
+  kdirwatch.cpp tdefileshare.cpp ksambashare.cpp
   knfsshare.cpp ktrader.cpp ktraderparse.cpp
   ktraderparsetree.cpp kservicetypefactory.cpp
   kservicetype.cpp kmimetype.cpp kservicegroup.cpp
   kservice.cpp kservicefactory.cpp kuserprofile.cpp
   kservicegroupfactory.cpp kurifilter.cpp kfilterbase.cpp
   kfilterdev.cpp kshellcompletion.cpp kurlcompletion.cpp
-  kautomount.cpp krun.cpp kfileitem.cpp kdirlister.cpp
+  kautomount.cpp krun.cpp tdefileitem.cpp kdirlister.cpp
   kimageio.cpp yacc.c lex.c chmodjob.cpp kscan.cpp
   kar.cpp ktar.cpp kzip.cpp previewjob.cpp metainfojob.cpp
-  davjob.cpp kdatatool.cpp karchive.cpp kfilefilter.cpp
-  kfilemetainfo.cpp kdcopservicestarter.cpp dataslave.cpp
+  davjob.cpp kdatatool.cpp karchive.cpp tdefilefilter.cpp
+  tdefilemetainfo.cpp kdcopservicestarter.cpp dataslave.cpp
   dataprotocol.cpp
 )
 
diff --git a/kio/kio/KFILEMETAINFO_ISSUES b/tdeio/tdeio/KFILEMETAINFO_ISSUES
index a4486f85f..a4486f85f 100644
--- a/kio/kio/KFILEMETAINFO_ISSUES
+++ b/tdeio/tdeio/KFILEMETAINFO_ISSUES
diff --git a/kio/kio/Makefile.am b/tdeio/tdeio/Makefile.am
index 2034a33b6..587cfe511 100644
--- a/kio/kio/Makefile.am
+++ b/tdeio/tdeio/Makefile.am
@@ -20,13 +20,13 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
 
 INCLUDES=  -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces  $(all_includes) $(SSL_INCLUDES)
 
-noinst_LTLIBRARIES = libkiocore.la libksycoca.la
+noinst_LTLIBRARIES = libtdeiocore.la libtdesycoca.la
 
 # convenience lib - no LDFLAGS or LIBADD !
 
-libksycoca_la_SOURCES = \
+libtdesycoca_la_SOURCES = \
 	kdirwatch.cpp \
-	kfileshare.cpp ksambashare.cpp knfsshare.cpp \
+	tdefileshare.cpp ksambashare.cpp knfsshare.cpp \
 	ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \
         kservicetypefactory.cpp kservicetype.cpp \
 	kmimetype.cpp kservicegroup.cpp \
@@ -36,38 +36,38 @@ libksycoca_la_SOURCES = \
 	kfilterbase.cpp kfilterdev.cpp \
 	kshellcompletion.cpp kurlcompletion.cpp \
 	kautomount.cpp krun.cpp \
-	kfileitem.cpp kdirlister.cpp kimageio.cpp \
+	tdefileitem.cpp kdirlister.cpp kimageio.cpp \
 	yacc.c lex.c  \
 	chmodjob.cpp kscan.cpp kar.cpp ktar.cpp kzip.cpp previewjob.cpp metainfojob.cpp davjob.cpp \
-	kdatatool.cpp karchive.cpp kfilefilter.cpp \
-	kfilemetainfo.cpp kdcopservicestarter.cpp \
+	kdatatool.cpp karchive.cpp tdefilefilter.cpp \
+	tdefilemetainfo.cpp kdcopservicestarter.cpp \
 	dataslave.cpp dataprotocol.cpp 
 #if USE_POSIX_ACL
-  libksycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
+  libtdesycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
 #endif
 
 include_HEADERS = \
 	kservicetype.h kmimetype.h kmimemagic.h kservice.h \
 	krun.h kdirwatch.h kautomount.h kuserprofile.h \
 	kshred.h kar.h ktar.h kzip.h ktrader.h kurifilter.h kurlcompletion.h \
-	kshellcompletion.h kfileitem.h kfileshare.h ksambashare.h knfsshare.h \
+	kshellcompletion.h tdefileitem.h tdefileshare.h ksambashare.h knfsshare.h \
     kdirlister.h kservicegroup.h \
 	kimageio.h kdirnotify.h kdirnotify_stub.h \
-	kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h \
-	kfilterbase.h kfilterdev.h kemailsettings.h kscan.h kdatatool.h \
-	karchive.h kfilefilter.h kfilemetainfo.h renamedlgplugin.h \
+	kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h \
+	kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h kdatatool.h \
+	karchive.h tdefilefilter.h tdefilemetainfo.h renamedlgplugin.h \
 	kmimetyperesolver.h kdcopservicestarter.h kremoteencoding.h \
 	kmimetypechooser.h 
 #if USE_POSIX_ACL
 include_HEADERS += kacl.h
 #endif
 
-#libkiocore_la_LDFLAGS = $(all_libraries)
-#libkiocore_la_LIBADD = ../../tdeui/libtdeui.la ../../tdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT)
+#libtdeiocore_la_LDFLAGS = $(all_libraries)
+#libtdeiocore_la_LIBADD = ../../tdeui/libtdeui.la ../../tdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT)
 
-libkiocore_la_SOURCES = authinfo.cpp \
+libtdeiocore_la_SOURCES = authinfo.cpp \
 	kshred.cpp \
-	kprotocolmanager.cpp \
+	tdeprotocolmanager.cpp \
 	slave.cpp slaveinterface.cpp observer.stub \
 	sessiondata.cpp	scheduler.cpp \
 	connection.cpp \
@@ -81,17 +81,17 @@ libkiocore_la_SOURCES = authinfo.cpp \
 	statusbarprogress.cpp \
 	kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp \
 	observer.cpp uiserver.stub observer.skel \
-	kemailsettings.cpp  \
+	tdeemailsettings.cpp  \
 	kprotocolinfo.cpp \
 	renamedlg.cpp skipdlg.cpp kremoteencoding.cpp \
 	kmimetypechooser.cpp
 
-uiserver_DIR = $(top_srcdir)/kio/misc
+uiserver_DIR = $(top_srcdir)/tdeio/misc
 
 METASOURCES = AUTO
 
-kioincludedir = $(includedir)/kio
-kioinclude_HEADERS = connection.h \
+tdeioincludedir = $(includedir)/tdeio
+tdeioinclude_HEADERS = connection.h \
         slaveinterface.h slave.h slaveconfig.h \
         sessiondata.h global.h passdlg.h \
 	netaccess.h job.h scheduler.h \
diff --git a/kio/kio/authinfo.cpp b/tdeio/tdeio/authinfo.cpp
index 6f0592ac4..b95a40585 100644
--- a/kio/kio/authinfo.cpp
+++ b/tdeio/tdeio/authinfo.cpp
@@ -35,11 +35,11 @@
 #include <kstaticdeleter.h>
 #include <kde_file.h>
 
-#include "kio/authinfo.h"
+#include "tdeio/authinfo.h"
 
 #define NETRC_READ_BUF_SIZE 4096
 
-using namespace KIO;
+using namespace TDEIO;
 
 AuthInfo::AuthInfo()
 {
@@ -72,7 +72,7 @@ AuthInfo& AuthInfo::operator= ( const AuthInfo& info )
     return *this;
 }
 
-TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a)
+TQDataStream& TDEIO::operator<< (TQDataStream& s, const AuthInfo& a)
 {
     s << a.url << a.username << a.password << a.prompt << a.caption
       << a.comment << a.commentLabel << a.realmValue << a.digestInfo
@@ -81,7 +81,7 @@ TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a)
     return s;
 }
 
-TQDataStream& KIO::operator>> (TQDataStream& s, AuthInfo& a)
+TQDataStream& TDEIO::operator>> (TQDataStream& s, AuthInfo& a)
 {
     TQ_UINT8 verify = 0;
     TQ_UINT8 ro = 0;
diff --git a/kio/kio/authinfo.h b/tdeio/tdeio/authinfo.h
index 3f92e58d1..019311ef8 100644
--- a/kio/kio/authinfo.h
+++ b/tdeio/tdeio/authinfo.h
@@ -26,7 +26,7 @@
 #include <kurl.h>
 
 
-namespace KIO {
+namespace TDEIO {
 
 /**
  * This class is intended to make it easier to prompt for, cache
@@ -48,10 +48,10 @@ namespace KIO {
  * @short A two way messaging class for passing authentication information.
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KIO_EXPORT AuthInfo
+class TDEIO_EXPORT AuthInfo
 {
-    KIO_EXPORT friend TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a);
-    KIO_EXPORT friend TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
+    TDEIO_EXPORT friend TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a);
+    TDEIO_EXPORT friend TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
 
 public:
    /**
@@ -225,8 +225,8 @@ private:
     class AuthInfoPrivate* d;
 };
 
-KIO_EXPORT TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a);
-KIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
+TDEIO_EXPORT TQDataStream& operator<< (TQDataStream& s, const AuthInfo& a);
+TDEIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
 
 /**
  * A Singleton class that provides access to passwords
@@ -237,7 +237,7 @@ KIO_EXPORT TQDataStream& operator>> (TQDataStream& s, AuthInfo& a);
  * @short An interface to the ftp .netrc files
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KIO_EXPORT NetRC
+class TDEIO_EXPORT NetRC
 {
 public:
 
diff --git a/kio/kio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp
index e1d343c10..24a5c247d 100644
--- a/kio/kio/chmodjob.cpp
+++ b/tdeio/tdeio/chmodjob.cpp
@@ -29,21 +29,21 @@
 
 #include <tqtimer.h>
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
-#include "kio/job.h"
-#include "kio/chmodjob.h"
+#include "tdeio/job.h"
+#include "tdeio/chmodjob.h"
 
 #include <kdirnotify_stub.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask,
                     int newOwner, int newGroup,
                     bool recursive, bool showProgressInfo )
-    : KIO::Job( showProgressInfo ), state( STATE_LISTING ),
+    : TDEIO::Job( showProgressInfo ), state( STATE_LISTING ),
       m_permissions( permissions ), m_mask( mask ),
       m_newOwner( newOwner ), m_newGroup( newGroup ),
       m_recursive( recursive ), m_lstItems( lstItems )
@@ -76,11 +76,11 @@ void ChmodJob::processList()
             if ( item->isDir() && m_recursive )
             {
                 //kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl;
-                KIO::ListJob * listJob = KIO::listRecursive( item->url(), false /* no GUI */ );
-                connect( listJob, TQT_SIGNAL(entries( KIO::Job *,
-                                                  const KIO::UDSEntryList& )),
-                         TQT_SLOT( slotEntries( KIO::Job*,
-                                            const KIO::UDSEntryList& )));
+                TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ );
+                connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *,
+                                                  const TDEIO::UDSEntryList& )),
+                         TQT_SLOT( slotEntries( TDEIO::Job*,
+                                            const TDEIO::UDSEntryList& )));
                 addSubjob( listJob );
                 return; // we'll come back later, when this one's finished
             }
@@ -93,28 +93,28 @@ void ChmodJob::processList()
     chmodNextFile();
 }
 
-void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
+void ChmodJob::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list )
 {
-    KIO::UDSEntryListConstIterator it = list.begin();
-    KIO::UDSEntryListConstIterator end = list.end();
+    TDEIO::UDSEntryListConstIterator it = list.begin();
+    TDEIO::UDSEntryListConstIterator end = list.end();
     for (; it != end; ++it) {
-        KIO::UDSEntry::ConstIterator it2 = (*it).begin();
+        TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
         mode_t permissions = 0;
         bool isDir = false;
         bool isLink = false;
         TQString relativePath;
         for( ; it2 != (*it).end(); it2++ ) {
           switch( (*it2).m_uds ) {
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
               relativePath = (*it2).m_str;
               break;
-            case KIO::UDS_FILE_TYPE:
+            case TDEIO::UDS_FILE_TYPE:
               isDir = S_ISDIR((*it2).m_long);
               break;
-            case KIO::UDS_LINK_DEST:
+            case TDEIO::UDS_LINK_DEST:
               isLink = !(*it2).m_str.isEmpty();
               break;
-            case KIO::UDS_ACCESS:
+            case TDEIO::UDS_ACCESS:
               permissions = (mode_t)((*it2).m_long);
               break;
             default:
@@ -182,7 +182,7 @@ void ChmodJob::chmodNextFile()
 
         kdDebug(7007) << "ChmodJob::chmodNextFile chmod'ing " << info.url.prettyURL()
                       << " to " << TQString::number(info.permissions,8) << endl;
-        KIO::SimpleJob * job = KIO::chmod( info.url, info.permissions );
+        TDEIO::SimpleJob * job = TDEIO::chmod( info.url, info.permissions );
         // copy the metadata for acl and default acl
         const TQString aclString = queryMetaData( "ACL_STRING" );
         const TQString defaultAclString = queryMetaData( "DEFAULT_ACL_STRING" );
@@ -197,7 +197,7 @@ void ChmodJob::chmodNextFile()
         emitResult();
 }
 
-void ChmodJob::slotResult( KIO::Job * job )
+void ChmodJob::slotResult( TDEIO::Job * job )
 {
     if ( job->error() )
     {
@@ -206,7 +206,7 @@ void ChmodJob::slotResult( KIO::Job * job )
         emitResult();
         return;
     }
-    //kdDebug(7007) << " ChmodJob::slotResult( KIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
+    //kdDebug(7007) << " ChmodJob::slotResult( TDEIO::Job * job ) m_lstItems:" << m_lstItems.count() << endl;
     switch ( state )
     {
         case STATE_LISTING:
@@ -227,7 +227,7 @@ void ChmodJob::slotResult( KIO::Job * job )
 }
 
 // antlarr: KDE 4: Make owner and group be const TQString &
-KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
+TDEIO_EXPORT ChmodJob *TDEIO::chmod( const KFileItemList& lstItems, int permissions, int mask,
                       TQString owner, TQString group,
                       bool recursive, bool showProgressInfo )
 {
@@ -253,6 +253,6 @@ KIO_EXPORT ChmodJob *KIO::chmod( const KFileItemList& lstItems, int permissions,
 }
 
 void ChmodJob::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
 
 #include "chmodjob.moc"
diff --git a/kio/kio/chmodjob.h b/tdeio/tdeio/chmodjob.h
index fdb873b17..59fb253bc 100644
--- a/kio/kio/chmodjob.h
+++ b/tdeio/tdeio/chmodjob.h
@@ -18,29 +18,29 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_chmodjob_h__
-#define __kio_chmodjob_h__
+#ifndef __tdeio_chmodjob_h__
+#define __tdeio_chmodjob_h__
 
 #include <kurl.h>
 #include <tqstring.h>
 
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 
-namespace KIO {
+namespace TDEIO {
 
     /**
      * This job changes permissions on a list of files or directories,
      * optionally in a recursive manner.
-     * @see KIO::chmod()
+     * @see TDEIO::chmod()
      */
-    class KIO_EXPORT ChmodJob : public KIO::Job
+    class TDEIO_EXPORT ChmodJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
 	/**
-	 * Create new ChmodJobs using the KIO::chmod() function.
+	 * Create new ChmodJobs using the TDEIO::chmod() function.
 	 */
         ChmodJob( const KFileItemList & lstItems,  int permissions, int mask,
                   int newOwner, int newGroup,
@@ -51,8 +51,8 @@ namespace KIO {
 
     protected slots:
 
-        virtual void slotResult( KIO::Job *job );
-        void slotEntries( KIO::Job * , const KIO::UDSEntryList & );
+        virtual void slotResult( TDEIO::Job *job );
+        void slotEntries( TDEIO::Job * , const TDEIO::UDSEntryList & );
         void processList();
 
     private:
@@ -100,7 +100,7 @@ namespace KIO {
      * @param showProgressInfo true to show progess information
      * @return The job handling the operation.
      */
-    KIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask,
+    TDEIO_EXPORT ChmodJob * chmod( const KFileItemList& lstItems, int permissions, int mask,
                       TQString newOwner, TQString newGroup,
                       bool recursive, bool showProgressInfo = true );
 
diff --git a/kio/kio/configure.in.in b/tdeio/tdeio/configure.in.in
index 8683dfec1..8683dfec1 100644
--- a/kio/kio/configure.in.in
+++ b/tdeio/tdeio/configure.in.in
diff --git a/kio/kio/connection.cpp b/tdeio/tdeio/connection.cpp
index b2a84a798..cbe737693 100644
--- a/kio/kio/connection.cpp
+++ b/tdeio/tdeio/connection.cpp
@@ -38,12 +38,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "kio/connection.h"
+#include "tdeio/connection.h"
 
 #include <kdebug.h>
 #include <tqsocketnotifier.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 Connection::Connection()
 {
@@ -83,7 +83,7 @@ void Connection::close()
     delete socket;
     socket = 0;
 
-    // KSocket has already closed the file descriptor, but we need to
+    // TDESocket has already closed the file descriptor, but we need to
     // close the file-stream as well otherwise we leak memory. 
     // As a result we close the file descriptor twice, but that should
     // be harmless
@@ -121,7 +121,7 @@ void Connection::dequeue()
     }
 }
 
-void Connection::init(KSocket *sock)
+void Connection::init(TDESocket *sock)
 {
     delete notifier;
     notifier = 0;
diff --git a/kio/kio/connection.h b/tdeio/tdeio/connection.h
index a30131af8..fb0b50e15 100644
--- a/kio/kio/connection.h
+++ b/tdeio/tdeio/connection.h
@@ -30,12 +30,12 @@
 #include <tqptrlist.h>
 #include <tqobject.h>
 
-class KSocket;
+class TDESocket;
 class TQSocketNotifier;
 
-namespace KIO {
+namespace TDEIO {
 
-    struct KIO_EXPORT Task {
+    struct TDEIO_EXPORT Task {
 	int cmd;
 	TQByteArray data;
     };
@@ -46,7 +46,7 @@ namespace KIO {
      * It handles a queue of commands to be sent which makes it possible to
      * queue data before an actual connection has been established.
      */
-    class KIO_EXPORT Connection : public TQObject
+    class TDEIO_EXPORT Connection : public TQObject
     {
 	Q_OBJECT
     public:
@@ -62,7 +62,7 @@ namespace KIO {
 	 * @param sock the socket to use
 	 * @see inited()
 	 */
-	void init(KSocket *sock);
+	void init(TDESocket *sock);
         /**
 	 * Initialize the connection to use the given file
 	 * descriptors.
@@ -143,7 +143,7 @@ namespace KIO {
     private:
 	int fd_in;
 	FILE *f_out;
-	KSocket *socket;
+	TDESocket *socket;
 	TQSocketNotifier *notifier;
 	TQObject *receiver;
 	const char *member;
diff --git a/kio/kio/dataprotocol.cpp b/tdeio/tdeio/dataprotocol.cpp
index 161c82296..8478ea0cb 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/tdeio/tdeio/dataprotocol.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqcstring.h>
 #include <tqstring.h>
@@ -42,24 +42,24 @@
 #  define DISPATCH(f) f
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 #ifdef DATAKIOSLAVE
 extern "C" {
 
   int kdemain( int argc, char **argv ) {
-    KInstance instance( "kio_data" );
+    TDEInstance instance( "tdeio_data" );
 
-    kdDebug(7101) << "*** Starting kio_data " << endl;
+    kdDebug(7101) << "*** Starting tdeio_data " << endl;
 
     if (argc != 4) {
-      kdDebug(7101) << "Usage: kio_data  protocol domain-socket1 domain-socket2" << endl;
+      kdDebug(7101) << "Usage: tdeio_data  protocol domain-socket1 domain-socket2" << endl;
       exit(-1);
     }
 
     DataProtocol slave(argv[2], argv[3]);
     slave.dispatchLoop();
 
-    kdDebug(7101) << "*** kio_data Done" << endl;
+    kdDebug(7101) << "*** tdeio_data Done" << endl;
     return 0;
   }
 }
@@ -242,7 +242,7 @@ static void parseDataHeader(const KURL &url, DataHeader &header_info) {
 
 #ifdef DATAKIOSLAVE
 DataProtocol::DataProtocol(const TQCString &pool_socket, const TQCString &app_socket)
-	: SlaveBase("kio_data", pool_socket, app_socket) {
+	: SlaveBase("tdeio_data", pool_socket, app_socket) {
 #else
 DataProtocol::DataProtocol() {
 #endif
@@ -260,7 +260,7 @@ DataProtocol::~DataProtocol() {
 void DataProtocol::get(const KURL& url) {
   ref();
   //kdDebug() << "===============================================================================================================================================================================" << endl;
-  kdDebug() << "kio_data@"<<this<<"::get(const KURL& url)" << endl ;
+  kdDebug() << "tdeio_data@"<<this<<"::get(const KURL& url)" << endl ;
 
   DataHeader hdr;
   parseDataHeader(url,hdr);
diff --git a/kio/kio/dataprotocol.h b/tdeio/tdeio/dataprotocol.h
index 44dccfcce..ed9bfc325 100644
--- a/kio/kio/dataprotocol.h
+++ b/tdeio/tdeio/dataprotocol.h
@@ -21,10 +21,10 @@
 
 // dataprotocol.* interprets the following defines
 // DATAKIOSLAVE: define if you want to compile this into a stand-alone
-//		kioslave
+//		tdeioslave
 // TESTKIO: define for test-driving
 // Both defines are mutually exclusive. Defining none of them compiles
-// DataProtocol for internal usage within libkiocore.
+// DataProtocol for internal usage within libtdeiocore.
 
 class TQString;
 class TQCString;
@@ -32,19 +32,19 @@ class TQCString;
 class KURL;
 
 #if defined(DATAKIOSLAVE)
-#  include <kio/slavebase.h>
+#  include <tdeio/slavebase.h>
 #elif !defined(TESTKIO)
-#  include "kio/dataslave.h"
+#  include "tdeio/dataslave.h"
 #endif
 
-namespace KIO {
+namespace TDEIO {
 
-/** This kioslave provides support of data urls as specified by rfc 2397
+/** This tdeioslave provides support of data urls as specified by rfc 2397
  * @see http://www.ietf.org/rfc/rfc2397.txt
  * @author Leo Savernik
  */
 #if defined(DATAKIOSLAVE)
-class DataProtocol : public KIO::SlaveBase {
+class DataProtocol : public TDEIO::SlaveBase {
 #elif defined(TESTKIO)
 class DataProtocol : public TestSlave {
 #else
diff --git a/kio/kio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp
index d16ecc0d4..a5b6bdf69 100644
--- a/kio/kio/dataslave.cpp
+++ b/tdeio/tdeio/dataslave.cpp
@@ -23,12 +23,12 @@
 #include "dataslave.h"
 #include "dataprotocol.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 #define KIO_DATA_POLL_INTERVAL 0
 
@@ -198,12 +198,12 @@ void DataSlave::virtual_hook( int id, void* data ) {
       return;
     }
     default:
-      KIO::Slave::virtual_hook( id, data );
+      TDEIO::Slave::virtual_hook( id, data );
   }
 }
 
 DISPATCH_IMPL1(mimeType, const TQString &, s)
-DISPATCH_IMPL1(totalSize, KIO::filesize_t, size)
+DISPATCH_IMPL1(totalSize, TDEIO::filesize_t, size)
 DISPATCH_IMPL(sendMetaData)
 DISPATCH_IMPL1(data, const TQByteArray &, ba)
 
diff --git a/kio/kio/dataslave.h b/tdeio/tdeio/dataslave.h
index 71eae6cd3..40cfef126 100644
--- a/kio/kio/dataslave.h
+++ b/tdeio/tdeio/dataslave.h
@@ -22,8 +22,8 @@
 #ifndef __KIO_DATASLAVE_H__
 #define __KIO_DATASLAVE_H__
 
-#include <kio/global.h>
-#include <kio/slave.h>
+#include <tdeio/global.h>
+#include <tdeio/slave.h>
 
 class TQTimer;
 
@@ -35,7 +35,7 @@ class TQTimer;
 #define DISPATCH_DECL1(type, paramtype, param) \
 	void dispatch_##type(paramtype param);
 
-namespace KIO {
+namespace TDEIO {
 
     /**
      * This class provides a high performance implementation for the data
@@ -46,7 +46,7 @@ namespace KIO {
      * detail of KIO and subject to change without notice.
      * @author Leo Savernik
      */
-    class DataSlave : public KIO::Slave {
+    class DataSlave : public TDEIO::Slave {
 	Q_OBJECT
     public:
 	DataSlave();
@@ -90,7 +90,7 @@ namespace KIO {
 	struct QueueStruct {
 	  QueueType type;
 	  TQString s;
-	  KIO::filesize_t size;
+	  TDEIO::filesize_t size;
 	  TQByteArray ba;
 
 	  QueueStruct() {}
@@ -100,7 +100,7 @@ namespace KIO {
 	DispatchQueue dispatchQueue;
 
 	DISPATCH_DECL1(mimeType, const TQString &, s)
-	DISPATCH_DECL1(totalSize, KIO::filesize_t, size)
+	DISPATCH_DECL1(totalSize, TDEIO::filesize_t, size)
 	DISPATCH_DECL(sendMetaData)
 	DISPATCH_DECL1(data, const TQByteArray &, ba)
 	DISPATCH_DECL(finished)
diff --git a/kio/kio/davjob.cpp b/tdeio/tdeio/davjob.cpp
index 1f3b208a6..986e76342 100644
--- a/kio/kio/davjob.cpp
+++ b/tdeio/tdeio/davjob.cpp
@@ -31,16 +31,16 @@
 #include <sys/stat.h>
 
 #include <kdebug.h>
-#include <kio/jobclasses.h>
-#include <kio/global.h>
-#include <kio/http.h>
-#include <kio/davjob.h>
-#include <kio/job.h>
-#include <kio/slaveinterface.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/http.h>
+#include <tdeio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/slaveinterface.h>
 
 #define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
-using namespace KIO;
+using namespace TDEIO;
 
 class DavJob::DavJobPrivate
 {
@@ -50,7 +50,7 @@ public:
 };
 
 DavJob::DavJob( const KURL& url, int method, const TQString& request, bool showProgressInfo )
-  : TransferJob( url, KIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo )
+  : TransferJob( url, TDEIO::CMD_SPECIAL, TQByteArray(), TQByteArray(), showProgressInfo )
 {
   d = new DavJobPrivate;
   // We couldn't set the args when calling the parent constructor,
@@ -86,10 +86,10 @@ void DavJob::slotFinished()
 		istream >> s_url;
 		istream >> s_method;
 		// PROPFIND
-		if ( (s_cmd == 7) && (s_method == (int)KIO::DAV_PROPFIND) ) {
+		if ( (s_cmd == 7) && (s_method == (int)TDEIO::DAV_PROPFIND) ) {
 			m_packedArgs.truncate(0);
 			TQDataStream stream( m_packedArgs, IO_WriteOnly );
-			stream << (int)7 << m_redirectionURL << (int)KIO::DAV_PROPFIND;
+			stream << (int)7 << m_redirectionURL << (int)TDEIO::DAV_PROPFIND;
 		}
   } else if ( ! m_response.setContent( d->str_response, true ) ) {
 		// An error occurred parsing the XML response
@@ -114,20 +114,20 @@ void DavJob::slotFinished()
 /* Convenience methods */
 
 // KDE 4: Make it const TQString &
-DavJob* KIO::davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo )
+DavJob* TDEIO::davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo )
 {
-  DavJob *job = new DavJob( url, (int) KIO::DAV_PROPFIND, properties.toString(), showProgressInfo );
+  DavJob *job = new DavJob( url, (int) TDEIO::DAV_PROPFIND, properties.toString(), showProgressInfo );
   job->addMetaData( "davDepth", depth );
   return job;
 }
 
 
-DavJob* KIO::davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo )
+DavJob* TDEIO::davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo )
 {
-  return new DavJob( url, (int) KIO::DAV_PROPPATCH, properties.toString(), showProgressInfo );
+  return new DavJob( url, (int) TDEIO::DAV_PROPPATCH, properties.toString(), showProgressInfo );
 }
 
-DavJob* KIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo )
+DavJob* TDEIO::davSearch( const KURL& url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo )
 {
   TQDomDocument doc;
   TQDomElement searchrequest = doc.createElementNS( "DAV:", "searchrequest" );
@@ -136,7 +136,7 @@ DavJob* KIO::davSearch( const KURL& url, const TQString& nsURI, const TQString&
   searchelement.appendChild( text );
   searchrequest.appendChild( searchelement );
   doc.appendChild( searchrequest );
-  return new DavJob( url, KIO::DAV_SEARCH, doc.toString(), showProgressInfo );
+  return new DavJob( url, TDEIO::DAV_SEARCH, doc.toString(), showProgressInfo );
 }
 
 #include "davjob.moc"
diff --git a/kio/kio/davjob.h b/tdeio/tdeio/davjob.h
index 98d0fe702..83e3bb3d8 100644
--- a/kio/kio/davjob.h
+++ b/tdeio/tdeio/davjob.h
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_davjob_h__
-#define __kio_davjob_h__
+#ifndef __tdeio_davjob_h__
+#define __tdeio_davjob_h__
 
 #include <kurl.h>
 
@@ -33,13 +33,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 
 class Observer;
 class TQTimer;
 
-namespace KIO {
+namespace TDEIO {
 
     class Slave;
     class SlaveInterface;
@@ -49,18 +49,18 @@ namespace KIO {
      * Data is sent to the slave on request of the slave ( dataReq).
      * If data coming from the slave can not be handled, the
      * reading of data from the slave should be suspended.
-     * @see KIO::davPropFind()
-     * @see KIO::davPropPatch()
-     * @see KIO::davSearch()
+     * @see TDEIO::davPropFind()
+     * @see TDEIO::davPropPatch()
+     * @see TDEIO::davSearch()
      * @since 3.1
      */
-    class KIO_EXPORT DavJob : public TransferJob {
+    class TDEIO_EXPORT DavJob : public TransferJob {
     Q_OBJECT
 
     public:
         /**
-	 * Use KIO::davPropFind(), KIO::davPropPatch() and
-	 * KIO::davSearch() to create a new DavJob.
+	 * Use TDEIO::davPropFind(), TDEIO::davPropPatch() and
+	 * TDEIO::davSearch() to create a new DavJob.
 	 */
         DavJob(const KURL& url, int method,
                     const TQString& request, bool showProgressInfo);
@@ -95,7 +95,7 @@ namespace KIO {
     * @param showProgressInfo true to show progress information
     * @return the new DavJob
     */
-   KIO_EXPORT DavJob* davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo=true );
+   TDEIO_EXPORT DavJob* davPropFind( const KURL& url, const TQDomDocument& properties, TQString depth, bool showProgressInfo=true );
 
    /**
     * Creates a new DavJob that issues a PROPPATCH command. PROPPATCH sets
@@ -107,7 +107,7 @@ namespace KIO {
     * @param showProgressInfo true to show progress information
     * @return the new DavJob
     */
-   KIO_EXPORT DavJob* davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo=true );
+   TDEIO_EXPORT DavJob* davPropPatch( const KURL& url, const TQDomDocument& properties, bool showProgressInfo=true );
 
    /**
     * Creates a new DavJob that issues a SEARCH command.
@@ -119,7 +119,7 @@ namespace KIO {
     * @param showProgressInfo true to show progress information
     * @return the new DavJob
     */
-   KIO_EXPORT DavJob* davSearch( const KURL &url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo=true ); 
+   TDEIO_EXPORT DavJob* davSearch( const KURL &url, const TQString& nsURI, const TQString& qName, const TQString& query, bool showProgressInfo=true ); 
 
 }
 
diff --git a/kio/kio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 12eacab5d..5db9c5a0c 100644
--- a/kio/kio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -22,12 +22,12 @@
 #include <tqdatetime.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kstringhandler.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kprocess.h>
 #include <kpushbutton.h>
@@ -42,7 +42,7 @@
 #include "jobclasses.h"
 #include "defaultprogress.h"
 
-namespace KIO {
+namespace TDEIO {
 
 class DefaultProgress::DefaultProgressPrivate
 {
@@ -89,8 +89,8 @@ void DefaultProgress::init()
 #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
   // Set a useful icon for this window!
   KWin::setIcons( winId(),
-          KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ),
-          KGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) );
+          TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 32 ),
+          TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 16 ) );
 #endif
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
@@ -176,7 +176,7 @@ void DefaultProgress::init()
 
   d->keepOpenChecked = false;
   d->noCaptionYet = true;
-  setCaption(i18n("Progress Dialog")); // show something better than kio_uiserver
+  setCaption(i18n("Progress Dialog")); // show something better than tdeio_uiserver
 }
 
 DefaultProgress::~DefaultProgress()
@@ -184,7 +184,7 @@ DefaultProgress::~DefaultProgress()
   delete d;
 }
 
-void DefaultProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void DefaultProgress::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
 {
   // size is measured in bytes
   if ( m_iTotalSize == size )
@@ -195,7 +195,7 @@ void DefaultProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size )
 }
 
 
-void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files )
+void DefaultProgress::slotTotalFiles( TDEIO::Job*, unsigned long files )
 {
   if ( m_iTotalFiles == files )
       return;
@@ -204,7 +204,7 @@ void DefaultProgress::slotTotalFiles( KIO::Job*, unsigned long files )
 }
 
 
-void DefaultProgress::slotTotalDirs( KIO::Job*, unsigned long dirs )
+void DefaultProgress::slotTotalDirs( TDEIO::Job*, unsigned long dirs )
 {
   if ( m_iTotalDirs == dirs )
       return;
@@ -232,18 +232,18 @@ void DefaultProgress::showTotals()
 
 //static
 TQString DefaultProgress::makePercentString( unsigned long percent,
-                                            KIO::filesize_t totalSize,
+                                            TDEIO::filesize_t totalSize,
                                             unsigned long totalFiles )
 {
   if ( totalSize )
-      return i18n( "%1 % of %2 " ).arg( TQString::number(percent) , KIO::convertSize( totalSize ) );
+      return i18n( "%1 % of %2 " ).arg( TQString::number(percent) , TDEIO::convertSize( totalSize ) );
   else if ( totalFiles )
       return i18n( "%1 % of 1 file", "%1 % of %n files", totalFiles ).arg( percent );
   else
       return i18n( "%1 %" ).arg( percent );
 }
 
-void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent )
+void DefaultProgress::slotPercent( TDEIO::Job*, unsigned long percent )
 {
   TQString caption = makePercentString( percent, m_iTotalSize, m_iTotalFiles );
   m_pProgressBar->setValue( percent );
@@ -270,26 +270,26 @@ void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent )
 }
 
 
-void DefaultProgress::slotInfoMessage( KIO::Job*, const TQString & msg )
+void DefaultProgress::slotInfoMessage( TDEIO::Job*, const TQString & msg )
 {
   speedLabel->setText( msg );
   speedLabel->setAlignment( speedLabel->alignment() & ~TQt::WordBreak );
 }
 
 
-void DefaultProgress::slotProcessedSize( KIO::Job*, KIO::filesize_t bytes ) {
+void DefaultProgress::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t bytes ) {
   if ( m_iProcessedSize == bytes )
     return;
   m_iProcessedSize = bytes;
 
   TQString tmp = i18n( "%1 of %2 complete")
-                .arg( KIO::convertSize(bytes) )
-                .arg( KIO::convertSize(m_iTotalSize));
+                .arg( TDEIO::convertSize(bytes) )
+                .arg( TDEIO::convertSize(m_iTotalSize));
   sizeLabel->setText( tmp );
 }
 
 
-void DefaultProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs )
+void DefaultProgress::slotProcessedDirs( TDEIO::Job*, unsigned long dirs )
 {
   if ( m_iProcessedDirs == dirs )
     return;
@@ -303,7 +303,7 @@ void DefaultProgress::slotProcessedDirs( KIO::Job*, unsigned long dirs )
 }
 
 
-void DefaultProgress::slotProcessedFiles( KIO::Job*, unsigned long files )
+void DefaultProgress::slotProcessedFiles( TDEIO::Job*, unsigned long files )
 {
   if ( m_iProcessedFiles == files )
     return;
@@ -319,18 +319,18 @@ void DefaultProgress::slotProcessedFiles( KIO::Job*, unsigned long files )
 }
 
 
-void DefaultProgress::slotSpeed( KIO::Job*, unsigned long speed )
+void DefaultProgress::slotSpeed( TDEIO::Job*, unsigned long speed )
 {
   if ( speed == 0 ) {
     speedLabel->setText( i18n( "Stalled") );
   } else {
-    speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( KIO::convertSize( speed ))
-        .arg( KIO::convertSeconds( KIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, speed ))) );
+    speedLabel->setText( i18n( "%1/s ( %2 remaining )").arg( TDEIO::convertSize( speed ))
+        .arg( TDEIO::convertSeconds( TDEIO::calculateRemainingSeconds( m_iTotalSize, m_iProcessedSize, speed ))) );
   }
 }
 
 
-void DefaultProgress::slotCopying( KIO::Job*, const KURL& from, const KURL& to )
+void DefaultProgress::slotCopying( TDEIO::Job*, const KURL& from, const KURL& to )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Copy File(s) Progress"));
@@ -344,7 +344,7 @@ void DefaultProgress::slotCopying( KIO::Job*, const KURL& from, const KURL& to )
 }
 
 
-void DefaultProgress::slotMoving( KIO::Job*, const KURL& from, const KURL& to )
+void DefaultProgress::slotMoving( TDEIO::Job*, const KURL& from, const KURL& to )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Move File(s) Progress"));
@@ -358,7 +358,7 @@ void DefaultProgress::slotMoving( KIO::Job*, const KURL& from, const KURL& to )
 }
 
 
-void DefaultProgress::slotCreatingDir( KIO::Job*, const KURL& dir )
+void DefaultProgress::slotCreatingDir( TDEIO::Job*, const KURL& dir )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Creating Folder"));
@@ -370,7 +370,7 @@ void DefaultProgress::slotCreatingDir( KIO::Job*, const KURL& dir )
 }
 
 
-void DefaultProgress::slotDeleting( KIO::Job*, const KURL& url )
+void DefaultProgress::slotDeleting( TDEIO::Job*, const KURL& url )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Delete File(s) Progress"));
@@ -381,7 +381,7 @@ void DefaultProgress::slotDeleting( KIO::Job*, const KURL& url )
   setDestVisible( false );
 }
 
-void DefaultProgress::slotTransferring( KIO::Job*, const KURL& url )
+void DefaultProgress::slotTransferring( TDEIO::Job*, const KURL& url )
 {
   if ( d->noCaptionYet ) {
     setCaption(i18n("Loading Progress"));
@@ -391,31 +391,31 @@ void DefaultProgress::slotTransferring( KIO::Job*, const KURL& url )
   setDestVisible( false );
 }
 
-void DefaultProgress::slotStating( KIO::Job*, const KURL& url )
+void DefaultProgress::slotStating( TDEIO::Job*, const KURL& url )
 {
   setCaption(i18n("Examining File Progress"));
   sourceEdit->setText(url.prettyURL());
   setDestVisible( false );
 }
 
-void DefaultProgress::slotMounting( KIO::Job*, const TQString & dev, const TQString & point )
+void DefaultProgress::slotMounting( TDEIO::Job*, const TQString & dev, const TQString & point )
 {
   setCaption(i18n("Mounting %1").arg(dev));
   sourceEdit->setText(point);
   setDestVisible( false );
 }
 
-void DefaultProgress::slotUnmounting( KIO::Job*, const TQString & point )
+void DefaultProgress::slotUnmounting( TDEIO::Job*, const TQString & point )
 {
   setCaption(i18n("Unmounting"));
   sourceEdit->setText(point);
   setDestVisible( false );
 }
 
-void DefaultProgress::slotCanResume( KIO::Job*, KIO::filesize_t resume )
+void DefaultProgress::slotCanResume( TDEIO::Job*, TDEIO::filesize_t resume )
 {
   if ( resume ) {
-    resumeLabel->setText( i18n("Resuming from %1").arg(KIO::number(resume)) );
+    resumeLabel->setText( i18n("Resuming from %1").arg(TDEIO::number(resume)) );
   } else {
     resumeLabel->setText( i18n("Not resumable") );
   }
@@ -453,7 +453,7 @@ void DefaultProgress::slotClean() {
       int s = d->startTime.elapsed();
       if (!s)
         s = 1;
-      speedLabel->setText(i18n("%1/s (done)").arg(KIO::convertSize(1000 * m_iTotalSize / s)));
+      speedLabel->setText(i18n("%1/s (done)").arg(TDEIO::convertSize(1000 * m_iTotalSize / s)));
     }
     setOnlyClean(false);
   }
@@ -470,7 +470,7 @@ void DefaultProgress::checkDestination(const KURL& dest) {
   bool ok = true;
   if ( dest.isLocalFile() ) {
       TQString path = dest.path( -1 );
-      TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" );
+      TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs( "tmp" );
       for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it )
           if ( path.contains( *it ) )
               ok = false; // it's in the tmp resource
@@ -486,17 +486,17 @@ void DefaultProgress::checkDestination(const KURL& dest) {
 
 void DefaultProgress::slotOpenFile()
 {
-  KProcess proc;
+  TDEProcess proc;
   proc << "konqueror" << d->location.prettyURL();
-  proc.start(KProcess::DontCare);
+  proc.start(TDEProcess::DontCare);
 }
 
 void DefaultProgress::slotOpenLocation()
 {
-  KProcess proc;
+  TDEProcess proc;
   d->location.setFileName("");
   proc << "konqueror" << d->location.prettyURL();
-  proc.start(KProcess::DontCare);
+  proc.start(TDEProcess::DontCare);
 }
 
 void DefaultProgress::virtual_hook( int id, void* data )
diff --git a/kio/kio/defaultprogress.h b/tdeio/tdeio/defaultprogress.h
index 8dca499bd..de0dfd093 100644
--- a/kio/kio/defaultprogress.h
+++ b/tdeio/tdeio/defaultprogress.h
@@ -20,7 +20,7 @@
 
 #include <tqlabel.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <kprogress.h>
 
@@ -28,13 +28,13 @@
 
 class KLineEdit;
 
-namespace KIO {
+namespace TDEIO {
 
 /*
  * A default implementation of the progress dialog ProgressBase.
  * ProgressBase
  */
-class KIO_EXPORT DefaultProgress : public ProgressBase {
+class TDEIO_EXPORT DefaultProgress : public ProgressBase {
 
   Q_OBJECT
 
@@ -58,59 +58,59 @@ public:
 
   /// Shared with uiserver.cpp
   static TQString makePercentString( unsigned long percent,
-                                    KIO::filesize_t totalSize,
+                                    TDEIO::filesize_t totalSize,
                                     unsigned long totalFiles );
 
 public slots:
-  virtual void slotTotalSize( KIO::Job *job, KIO::filesize_t size );
-  virtual void slotTotalFiles( KIO::Job *job, unsigned long files );
-  virtual void slotTotalDirs( KIO::Job *job, unsigned long dirs );
+  virtual void slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size );
+  virtual void slotTotalFiles( TDEIO::Job *job, unsigned long files );
+  virtual void slotTotalDirs( TDEIO::Job *job, unsigned long dirs );
 
-  virtual void slotProcessedSize( KIO::Job *job, KIO::filesize_t bytes );
-  virtual void slotProcessedFiles( KIO::Job *job, unsigned long files );
-  virtual void slotProcessedDirs( KIO::Job *job, unsigned long dirs );
+  virtual void slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t bytes );
+  virtual void slotProcessedFiles( TDEIO::Job *job, unsigned long files );
+  virtual void slotProcessedDirs( TDEIO::Job *job, unsigned long dirs );
 
-  virtual void slotSpeed( KIO::Job *job, unsigned long speed );
-  virtual void slotPercent( KIO::Job *job, unsigned long percent );
+  virtual void slotSpeed( TDEIO::Job *job, unsigned long speed );
+  virtual void slotPercent( TDEIO::Job *job, unsigned long percent );
   /**
    * Called to set an information message.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param msg the message to set
    */
-  virtual void slotInfoMessage( KIO::Job *job, const TQString & msg );
+  virtual void slotInfoMessage( TDEIO::Job *job, const TQString & msg );
 
-  virtual void slotCopying( KIO::Job* job, const KURL& src, const KURL& dest );
-  virtual void slotMoving( KIO::Job* job, const KURL& src, const KURL& dest );
-  virtual void slotDeleting( KIO::Job* job, const KURL& url );
+  virtual void slotCopying( TDEIO::Job* job, const KURL& src, const KURL& dest );
+  virtual void slotMoving( TDEIO::Job* job, const KURL& src, const KURL& dest );
+  virtual void slotDeleting( TDEIO::Job* job, const KURL& url );
   /**
    * Called when the job is transferring.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param url the url to transfer
    * @since 3.1
    */
-  void slotTransferring( KIO::Job* job, const KURL& url );
-  virtual void slotCreatingDir( KIO::Job* job, const KURL& dir );
+  void slotTransferring( TDEIO::Job* job, const KURL& url );
+  virtual void slotCreatingDir( TDEIO::Job* job, const KURL& dir );
   /**
    * Called when the job is requesting a stat.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dir the dir to stat
    * @since 3.1
    */
-  virtual void slotStating( KIO::Job* job, const KURL& dir );
+  virtual void slotStating( TDEIO::Job* job, const KURL& dir );
   /**
    * Called when the job is mounting.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dev the device to mount
    * @param point the mount point
    */
-  virtual void slotMounting( KIO::Job* job, const TQString & dev, const TQString & point );
+  virtual void slotMounting( TDEIO::Job* job, const TQString & dev, const TQString & point );
   /**
    * Called when the job is unmounting.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param point the mount point
    */
-  virtual void slotUnmounting( KIO::Job* job, const TQString & point );
-  virtual void slotCanResume( KIO::Job* job, KIO::filesize_t from);
+  virtual void slotUnmounting( TDEIO::Job* job, const TQString & point );
+  virtual void slotCanResume( TDEIO::Job* job, TDEIO::filesize_t from);
 
   /**
    * Called when the job is cleaned.
@@ -136,11 +136,11 @@ protected:
 
   KProgress* m_pProgressBar;
 
-  KIO::filesize_t m_iTotalSize;
+  TDEIO::filesize_t m_iTotalSize;
   unsigned long m_iTotalFiles;
   unsigned long m_iTotalDirs;
 
-  KIO::filesize_t m_iProcessedSize;
+  TDEIO::filesize_t m_iProcessedSize;
   unsigned long m_iProcessedDirs;
   unsigned long m_iProcessedFiles;
 
diff --git a/kio/kio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp
index 17f12900a..a55f68249 100644
--- a/kio/kio/forwardingslavebase.cpp
+++ b/tdeio/tdeio/forwardingslavebase.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmimetype.h>
 #include <kprotocolinfo.h>
 
@@ -27,7 +27,7 @@
 
 #include "forwardingslavebase.h"
 
-namespace KIO
+namespace TDEIO
 {
 
 class ForwardingSlaveBasePrivate
@@ -63,7 +63,7 @@ bool ForwardingSlaveBase::internalRewriteURL(const KURL &url, KURL &newURL)
     return result;
 }
 
-void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
+void ForwardingSlaveBase::prepareUDSEntry(TDEIO::UDSEntry &entry,
                                           bool listing) const
 {
     kdDebug() << "ForwardingSlaveBase::prepareUDSEntry: listing=="
@@ -73,8 +73,8 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
     TQString name;
     KURL url;
 
-    KIO::UDSEntry::iterator it = entry.begin();
-    KIO::UDSEntry::iterator end = entry.end();
+    TDEIO::UDSEntry::iterator it = entry.begin();
+    TDEIO::UDSEntry::iterator end = entry.end();
 
     for(; it!=end; ++it)
     {
@@ -82,11 +82,11 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
 
         switch( (*it).m_uds )
         {
-        case KIO::UDS_NAME:
+        case TDEIO::UDS_NAME:
             name = (*it).m_str;
             kdDebug() << "Name = " << name << endl;
 	    break;
-        case KIO::UDS_URL:
+        case TDEIO::UDS_URL:
             url_found = true;
             url = (*it).m_str;
 	    if (listing)
@@ -108,8 +108,8 @@ void ForwardingSlaveBase::prepareUDSEntry(KIO::UDSEntry &entry,
             new_url.addPath( name );
         }
 
-        KIO::UDSAtom atom;
-        atom.m_uds = KIO::UDS_LOCAL_PATH;
+        TDEIO::UDSAtom atom;
+        atom.m_uds = TDEIO::UDS_LOCAL_PATH;
         atom.m_long = 0;
         atom.m_str = new_url.path();
         entry.append(atom);
@@ -123,7 +123,7 @@ void ForwardingSlaveBase::get(const KURL &url)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::TransferJob *job = KIO::get(new_url, false, false);
+        TDEIO::TransferJob *job = TDEIO::get(new_url, false, false);
         connectTransferJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -138,7 +138,7 @@ void ForwardingSlaveBase::put(const KURL &url, int permissions,
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::TransferJob *job = KIO::put(new_url, permissions, overwrite,
+        TDEIO::TransferJob *job = TDEIO::put(new_url, permissions, overwrite,
                                          resume, false);
         connectTransferJob(job);
 
@@ -153,7 +153,7 @@ void ForwardingSlaveBase::stat(const KURL &url)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::SimpleJob *job = KIO::stat(new_url, false);
+        TDEIO::SimpleJob *job = TDEIO::stat(new_url, false);
         connectSimpleJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -167,7 +167,7 @@ void ForwardingSlaveBase::mimetype(const KURL &url)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::TransferJob *job = KIO::mimetype(new_url, false);
+        TDEIO::TransferJob *job = TDEIO::mimetype(new_url, false);
         connectTransferJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -181,7 +181,7 @@ void ForwardingSlaveBase::listDir(const KURL &url)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::ListJob *job = KIO::listDir(new_url, false);
+        TDEIO::ListJob *job = TDEIO::listDir(new_url, false);
         connectListJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -195,7 +195,7 @@ void ForwardingSlaveBase::mkdir(const KURL &url, int permissions)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::SimpleJob *job = KIO::mkdir(new_url, permissions);
+        TDEIO::SimpleJob *job = TDEIO::mkdir(new_url, permissions);
         connectSimpleJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -210,7 +210,7 @@ void ForwardingSlaveBase::rename(const KURL &src, const KURL &dest,
     KURL new_src, new_dest;
     if ( internalRewriteURL(src, new_src) && internalRewriteURL(dest, new_dest) )
     {
-        KIO::Job *job = KIO::rename(new_src, new_dest, overwrite);
+        TDEIO::Job *job = TDEIO::rename(new_src, new_dest, overwrite);
         connectJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -225,7 +225,7 @@ void ForwardingSlaveBase::symlink(const TQString &target, const KURL &dest,
     KURL new_dest;
     if ( internalRewriteURL(dest, new_dest) )
     {
-        KIO::SimpleJob *job = KIO::symlink(target, new_dest, overwrite, false);
+        TDEIO::SimpleJob *job = TDEIO::symlink(target, new_dest, overwrite, false);
         connectSimpleJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -239,7 +239,7 @@ void ForwardingSlaveBase::chmod(const KURL &url, int permissions)
     KURL new_url;
     if ( internalRewriteURL(url, new_url) )
     {
-        KIO::SimpleJob *job = KIO::chmod(new_url, permissions);
+        TDEIO::SimpleJob *job = TDEIO::chmod(new_url, permissions);
         connectSimpleJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -254,7 +254,7 @@ void ForwardingSlaveBase::copy(const KURL &src, const KURL &dest,
     KURL new_src, new_dest;
     if ( internalRewriteURL(src, new_src) && internalRewriteURL(dest, new_dest) )
     {
-        KIO::Job *job = KIO::file_copy(new_src, new_dest, permissions,
+        TDEIO::Job *job = TDEIO::file_copy(new_src, new_dest, permissions,
                                        overwrite, false);
         connectJob(job);
 
@@ -271,12 +271,12 @@ void ForwardingSlaveBase::del(const KURL &url, bool isfile)
     {
         if (isfile)
         {
-            KIO::DeleteJob *job = KIO::del(new_url, false, false);
+            TDEIO::DeleteJob *job = TDEIO::del(new_url, false, false);
             connectJob(job);
         }
         else
         {
-            KIO::SimpleJob *job = KIO::rmdir(new_url);
+            TDEIO::SimpleJob *job = TDEIO::rmdir(new_url);
             connectSimpleJob(job);
         }
 
@@ -291,7 +291,7 @@ void ForwardingSlaveBase::localURL(const KURL& remoteURL)
     KURL new_url;
     if ( internalRewriteURL(remoteURL, new_url) )
     {
-        KIO::LocalURLJob *job = KIO::localURL(new_url);
+        TDEIO::LocalURLJob *job = TDEIO::localURL(new_url);
         connectLocalURLJob(job);
 
         tqApp->eventLoop()->enterLoop();
@@ -305,7 +305,7 @@ void ForwardingSlaveBase::localURL(const KURL& remoteURL)
 
 //////////////////////////////////////////////////////////////////////////////
 
-void ForwardingSlaveBase::connectJob(KIO::Job *job)
+void ForwardingSlaveBase::connectJob(TDEIO::Job *job)
 {
     // We will forward the warning message, no need to let the job
     // display it itself
@@ -320,57 +320,57 @@ void ForwardingSlaveBase::connectJob(KIO::Job *job)
         kdDebug() << it.key() << " = " << it.data() << endl;
 #endif
 
-    connect( job, TQT_SIGNAL( result(KIO::Job *) ),
-             this, TQT_SLOT( slotResult(KIO::Job *) ) );
-    connect( job, TQT_SIGNAL( warning(KIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotWarning(KIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( infoMessage(KIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotInfoMessage(KIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( totalSize(KIO::Job *, KIO::filesize_t) ),
-             this, TQT_SLOT( slotTotalSize(KIO::Job *, KIO::filesize_t) ) );
-    connect( job, TQT_SIGNAL( processedSize(KIO::Job *, KIO::filesize_t) ),
-             this, TQT_SLOT( slotProcessedSize(KIO::Job *, KIO::filesize_t) ) );
-    connect( job, TQT_SIGNAL( speed(KIO::Job *, unsigned long) ),
-             this, TQT_SLOT( slotSpeed(KIO::Job *, unsigned long) ) );
+    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
+             this, TQT_SLOT( slotResult(TDEIO::Job *) ) );
+    connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ),
+             this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ),
+             this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) );
+    connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) );
+    connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ),
+             this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) );
 }
 
-void ForwardingSlaveBase::connectSimpleJob(KIO::SimpleJob *job)
+void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job)
 {
     connectJob(job);
-    connect( job, TQT_SIGNAL( redirection(KIO::Job *, const KURL &) ),
-             this, TQT_SLOT( slotRedirection(KIO::Job *, const KURL &) ) );
+    connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ),
+             this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) );
 }
 
-void ForwardingSlaveBase::connectListJob(KIO::ListJob *job)
+void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job)
 {
     connectSimpleJob(job);
-    connect( job, TQT_SIGNAL( entries(KIO::Job *, const KIO::UDSEntryList &) ),
-             this, TQT_SLOT( slotEntries(KIO::Job *, const KIO::UDSEntryList &) ) );
+    connect( job, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ),
+             this, TQT_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) );
 }
 
-void ForwardingSlaveBase::connectTransferJob(KIO::TransferJob *job)
+void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job)
 {
     connectSimpleJob(job);
-    connect( job, TQT_SIGNAL( data(KIO::Job *, const TQByteArray &) ),
-             this, TQT_SLOT( slotData(KIO::Job *, const TQByteArray &) ) );
-    connect( job, TQT_SIGNAL( dataReq(KIO::Job *, TQByteArray &) ),
-             this, TQT_SLOT( slotDataReq(KIO::Job *, TQByteArray &) ) );
-    connect( job, TQT_SIGNAL( mimetype(KIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( canResume(KIO::Job *, KIO::filesize_t) ),
-             this, TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t) ) );
+    connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
+             this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
+    connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
+             this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) );
+    connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ),
+             this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) );
 }
 
-void ForwardingSlaveBase::connectLocalURLJob(KIO::LocalURLJob *job)
+void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job)
 {
     connectJob(job);
-    connect( job, TQT_SIGNAL( localURL(KIO::Job *, const KURL&, bool) ),
-             this, TQT_SLOT( slotLocalURL(KIO::Job *, const KURL&, bool) ) );
+    connect( job, TQT_SIGNAL( localURL(TDEIO::Job *, const KURL&, bool) ),
+             this, TQT_SLOT( slotLocalURL(TDEIO::Job *, const KURL&, bool) ) );
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-void ForwardingSlaveBase::slotResult(KIO::Job *job)
+void ForwardingSlaveBase::slotResult(TDEIO::Job *job)
 {
     if ( job->error() != 0)
     {
@@ -378,10 +378,10 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job)
     }
     else
     {
-        KIO::StatJob *stat_job = dynamic_cast<KIO::StatJob *>(job);
+        TDEIO::StatJob *stat_job = dynamic_cast<TDEIO::StatJob *>(job);
         if ( stat_job!=0L )
         {
-            KIO::UDSEntry entry = stat_job->statResult();
+            TDEIO::UDSEntry entry = stat_job->statResult();
 	    prepareUDSEntry(entry);
             statEntry( entry );
         }
@@ -391,32 +391,32 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job)
     tqApp->eventLoop()->exitLoop();
 }
 
-void ForwardingSlaveBase::slotWarning(KIO::Job* /*job*/, const TQString &msg)
+void ForwardingSlaveBase::slotWarning(TDEIO::Job* /*job*/, const TQString &msg)
 {
     warning(msg);
 }
 
-void ForwardingSlaveBase::slotInfoMessage(KIO::Job* /*job*/, const TQString &msg)
+void ForwardingSlaveBase::slotInfoMessage(TDEIO::Job* /*job*/, const TQString &msg)
 {
     infoMessage(msg);
 }
 
-void ForwardingSlaveBase::slotTotalSize(KIO::Job* /*job*/, KIO::filesize_t size)
+void ForwardingSlaveBase::slotTotalSize(TDEIO::Job* /*job*/, TDEIO::filesize_t size)
 {
     totalSize(size);
 }
 
-void ForwardingSlaveBase::slotProcessedSize(KIO::Job* /*job*/, KIO::filesize_t size)
+void ForwardingSlaveBase::slotProcessedSize(TDEIO::Job* /*job*/, TDEIO::filesize_t size)
 {
     processedSize(size);
 }
 
-void ForwardingSlaveBase::slotSpeed(KIO::Job* /*job*/, unsigned long bytesPerSecond)
+void ForwardingSlaveBase::slotSpeed(TDEIO::Job* /*job*/, unsigned long bytesPerSecond)
 {
     speed(bytesPerSecond);
 }
 
-void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url)
+void ForwardingSlaveBase::slotRedirection(TDEIO::Job *job, const KURL &url)
 {
     redirection(url);
 
@@ -427,13 +427,13 @@ void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url)
     tqApp->eventLoop()->exitLoop();
 }
 
-void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/,
-                                      const KIO::UDSEntryList &entries)
+void ForwardingSlaveBase::slotEntries(TDEIO::Job* /*job*/,
+                                      const TDEIO::UDSEntryList &entries)
 {
-    KIO::UDSEntryList final_entries = entries;
+    TDEIO::UDSEntryList final_entries = entries;
 
-    KIO::UDSEntryList::iterator it = final_entries.begin();
-    KIO::UDSEntryList::iterator end = final_entries.end();
+    TDEIO::UDSEntryList::iterator it = final_entries.begin();
+    TDEIO::UDSEntryList::iterator end = final_entries.end();
 
     for(; it!=end; ++it)
     {
@@ -443,28 +443,28 @@ void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/,
     listEntries( final_entries );
 }
 
-void ForwardingSlaveBase::slotData(KIO::Job* /*job*/, const TQByteArray &d)
+void ForwardingSlaveBase::slotData(TDEIO::Job* /*job*/, const TQByteArray &d)
 {
     data(d);
 }
 
-void ForwardingSlaveBase::slotDataReq(KIO::Job* /*job*/, TQByteArray &data)
+void ForwardingSlaveBase::slotDataReq(TDEIO::Job* /*job*/, TQByteArray &data)
 {
     dataReq();
     readData(data);
 }
 
-void ForwardingSlaveBase::slotMimetype (KIO::Job* /*job*/, const TQString &type)
+void ForwardingSlaveBase::slotMimetype (TDEIO::Job* /*job*/, const TQString &type)
 {
     mimeType(type);
 }
 
-void ForwardingSlaveBase::slotCanResume (KIO::Job* /*job*/, KIO::filesize_t offset)
+void ForwardingSlaveBase::slotCanResume (TDEIO::Job* /*job*/, TDEIO::filesize_t offset)
 {
     canResume(offset);
 }
 
-void ForwardingSlaveBase::slotLocalURL(KIO::Job *, const KURL& url, bool)
+void ForwardingSlaveBase::slotLocalURL(TDEIO::Job *, const KURL& url, bool)
 {
     SlaveBase::localURL(url);
 }
diff --git a/kio/kio/forwardingslavebase.h b/tdeio/tdeio/forwardingslavebase.h
index 1e6d303ee..4d84089bf 100644
--- a/kio/kio/forwardingslavebase.h
+++ b/tdeio/tdeio/forwardingslavebase.h
@@ -20,12 +20,12 @@
 #ifndef _FORWARDING_SLAVE_BASE_H_
 #define _FORWARDING_SLAVE_BASE_H_
 
-#include <kio/slavebase.h>
-#include <kio/jobclasses.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
 
 class ForwardingSlaveBasePrivate;
@@ -56,7 +56,7 @@ class ForwardingSlaveBasePrivate;
  *         if ( is_special )
  *         {
  *             // Handle the URL ourselves
- *             KIO::UDSEntry entry;
+ *             TDEIO::UDSEntry entry;
  *             // Fill entry with UDSAtom instances
  *             statEntry(entry);
  *             finished();
@@ -85,7 +85,7 @@ class ForwardingSlaveBasePrivate;
  * @since 3.4
  * @author Kevin Ottens <ervin@ipsquad.net>
  */
-class KIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase
+class TDEIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase
 {
 Q_OBJECT
 public:
@@ -146,7 +146,7 @@ protected:
      * @param listing indicate if this entry it created during a listDir
      *                operation
      */
-    virtual void prepareUDSEntry(KIO::UDSEntry &entry,
+    virtual void prepareUDSEntry(TDEIO::UDSEntry &entry,
                                  bool listing=false) const;
     
     /**
@@ -175,28 +175,28 @@ private:
     void connectLocalURLJob(LocalURLJob *job);
 
 private slots:
-    // KIO::Job
-    void slotResult(KIO::Job *job);
-    void slotWarning(KIO::Job *job, const TQString &msg);
-    void slotInfoMessage(KIO::Job *job, const TQString &msg);
-    void slotTotalSize(KIO::Job *job, KIO::filesize_t size);
-    void slotProcessedSize(KIO::Job *job, KIO::filesize_t size);
-    void slotSpeed(KIO::Job *job, unsigned long bytesPerSecond);
-
-    // KIO::SimpleJob subclasses
-    void slotRedirection(KIO::Job *job, const KURL &url);
-
-    // KIO::ListJob
-    void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries);
-
-    // KIO::TransferJob
-    void slotData(KIO::Job *job, const TQByteArray &data);
-    void slotDataReq(KIO::Job *job, TQByteArray &data);
-    void slotMimetype (KIO::Job *job, const TQString &type);
-    void slotCanResume (KIO::Job *job, KIO::filesize_t offset);
-
-    // KIO::LocalURLJob
-    void slotLocalURL(KIO::Job *, const KURL&, bool);
+    // TDEIO::Job
+    void slotResult(TDEIO::Job *job);
+    void slotWarning(TDEIO::Job *job, const TQString &msg);
+    void slotInfoMessage(TDEIO::Job *job, const TQString &msg);
+    void slotTotalSize(TDEIO::Job *job, TDEIO::filesize_t size);
+    void slotProcessedSize(TDEIO::Job *job, TDEIO::filesize_t size);
+    void slotSpeed(TDEIO::Job *job, unsigned long bytesPerSecond);
+
+    // TDEIO::SimpleJob subclasses
+    void slotRedirection(TDEIO::Job *job, const KURL &url);
+
+    // TDEIO::ListJob
+    void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries);
+
+    // TDEIO::TransferJob
+    void slotData(TDEIO::Job *job, const TQByteArray &data);
+    void slotDataReq(TDEIO::Job *job, TQByteArray &data);
+    void slotMimetype (TDEIO::Job *job, const TQString &type);
+    void slotCanResume (TDEIO::Job *job, TDEIO::filesize_t offset);
+
+    // TDEIO::LocalURLJob
+    void slotLocalURL(TDEIO::Job *, const KURL&, bool);
 };
 
 }
diff --git a/kio/kio/global.cpp b/tdeio/tdeio/global.cpp
index 1ad304a41..8dce8a5f4 100644
--- a/kio/kio/global.cpp
+++ b/tdeio/tdeio/global.cpp
@@ -29,28 +29,28 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include "kio/global.h"
-#include "kio/job.h"
+#include "tdeio/global.h"
+#include "tdeio/job.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeprotocolmanager.h>
 #include <kde_file.h>
 
 #ifdef HAVE_VOLMGT
 #include <volmgt.h>
 #endif
 
-KIO_EXPORT TQString KIO::convertSizeWithBytes( KIO::filesize_t size )
+TDEIO_EXPORT TQString TDEIO::convertSizeWithBytes( TDEIO::filesize_t size )
 {
     if ( size >= 1024 )
-        return convertSize( size ) + " (" + i18n( "%1 B" ).arg( KGlobal::locale()->formatNumber(size, 0) ) + ")";
+        return convertSize( size ) + " (" + i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(size, 0) ) + ")";
     else
 	return convertSize( size );
 }
 
-KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size )
+TDEIO_EXPORT TQString TDEIO::convertSize( TDEIO::filesize_t size )
 {
     double fsize = size;
     TQString s;
@@ -59,26 +59,26 @@ KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size )
     {
         fsize /= 1073741824.0;
         if ( fsize > 1024 ) // Tera-byte
-            s = i18n( "%1 TB" ).arg( KGlobal::locale()->formatNumber(fsize / 1024.0, 1));
+            s = i18n( "%1 TB" ).arg( TDEGlobal::locale()->formatNumber(fsize / 1024.0, 1));
         else
-            s = i18n( "%1 GB" ).arg( KGlobal::locale()->formatNumber(fsize, 1));
+            s = i18n( "%1 GB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1));
     }
     // Mega-byte
     else if ( size >= 1048576 )
     {
         fsize /= 1048576.0;
-        s = i18n( "%1 MB" ).arg( KGlobal::locale()->formatNumber(fsize, 1));
+        s = i18n( "%1 MB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1));
     }
     // Kilo-byte
     else if ( size >= 1024 )
     {
         fsize /= 1024.0;
-        s = i18n( "%1 KB" ).arg( KGlobal::locale()->formatNumber(fsize, 1));
+        s = i18n( "%1 KB" ).arg( TDEGlobal::locale()->formatNumber(fsize, 1));
     }
     // Just byte
     else if ( size > 0 )
     {
-        s = i18n( "%1 B" ).arg( KGlobal::locale()->formatNumber(fsize, 0));
+        s = i18n( "%1 B" ).arg( TDEGlobal::locale()->formatNumber(fsize, 0));
     }
     // Nothing
     else
@@ -88,20 +88,20 @@ KIO_EXPORT TQString KIO::convertSize( KIO::filesize_t size )
     return s;
 }
 
-KIO_EXPORT TQString KIO::convertSizeFromKB( KIO::filesize_t kbSize )
+TDEIO_EXPORT TQString TDEIO::convertSizeFromKB( TDEIO::filesize_t kbSize )
 {
     return convertSize(kbSize * 1024);
 }
 
-KIO_EXPORT TQString KIO::number( KIO::filesize_t size )
+TDEIO_EXPORT TQString TDEIO::number( TDEIO::filesize_t size )
 {
     char charbuf[256];
     sprintf(charbuf, "%lld", size);
     return TQString::fromLatin1(charbuf);
 }
 
-KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize,
-                                                        KIO::filesize_t processedSize, KIO::filesize_t speed )
+TDEIO_EXPORT unsigned int TDEIO::calculateRemainingSeconds( TDEIO::filesize_t totalSize,
+                                                        TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
 {
   if ( (speed != 0) && (totalSize != 0) )
     return ( totalSize - processedSize ) / speed;
@@ -109,7 +109,7 @@ KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSiz
     return 0;
 }
 
-KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds )
+TDEIO_EXPORT TQString TDEIO::convertSeconds( unsigned int seconds )
 {
   unsigned int days  = seconds / 86400;
   unsigned int hours = (seconds - (days * 86400)) / 3600;
@@ -117,19 +117,19 @@ KIO_EXPORT TQString KIO::convertSeconds( unsigned int seconds )
   seconds            = (seconds - (days * 86400) - (hours * 3600) - (mins * 60));
 
   const TQTime time(hours, mins, seconds);
-  const TQString timeStr( KGlobal::locale()->formatTime(time, true /*with seconds*/, true /*duration*/) );
+  const TQString timeStr( TDEGlobal::locale()->formatTime(time, true /*with seconds*/, true /*duration*/) );
   if ( days > 0 )
     return i18n("1 day %1", "%n days %1", days).arg(timeStr);
   else
     return timeStr;
 }
 
-KIO_EXPORT TQTime KIO::calculateRemaining( KIO::filesize_t totalSize, KIO::filesize_t processedSize, KIO::filesize_t speed )
+TDEIO_EXPORT TQTime TDEIO::calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed )
 {
   TQTime remainingTime;
 
   if ( speed != 0 ) {
-    KIO::filesize_t secs;
+    TDEIO::filesize_t secs;
     if ( totalSize == 0 ) {
       secs = 0;
     } else {
@@ -147,7 +147,7 @@ KIO_EXPORT TQTime KIO::calculateRemaining( KIO::filesize_t totalSize, KIO::files
   return remainingTime;
 }
 
-KIO_EXPORT TQString KIO::itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize)
+TDEIO_EXPORT TQString TDEIO::itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize)
 {
     TQString text = items == 0 ? i18n( "No Items" ) : i18n( "One Item", "%n Items", items );
     text += " - ";
@@ -155,14 +155,14 @@ KIO_EXPORT TQString KIO::itemsSummaryString(uint items, uint files, uint dirs, K
     if ( showSize && files > 0 )
     {
         text += " ";
-        text += i18n("(%1 Total)").arg(KIO::convertSize( size ) );
+        text += i18n("(%1 Total)").arg(TDEIO::convertSize( size ) );
     }
     text += " - ";
     text += dirs == 0 ? i18n( "No Folders" ) : i18n("One Folder", "%n Folders", dirs);
     return text;
 }
 
-KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str )
+TDEIO_EXPORT TQString TDEIO::encodeFileName( const TQString & _str )
 {
   TQString str( _str );
 
@@ -177,7 +177,7 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str )
   return str;
 }
 
-KIO_EXPORT TQString KIO::decodeFileName( const TQString & _str )
+TDEIO_EXPORT TQString TDEIO::decodeFileName( const TQString & _str )
 {
   TQString str;
 
@@ -205,210 +205,210 @@ KIO_EXPORT TQString KIO::decodeFileName( const TQString & _str )
   return str;
 }
 
-KIO_EXPORT TQString KIO::Job::errorString() const
+TDEIO_EXPORT TQString TDEIO::Job::errorString() const
 {
-  return KIO::buildErrorString(m_error, m_errorText);
+  return TDEIO::buildErrorString(m_error, m_errorText);
 }
 
-KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorText)
+TDEIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &errorText)
 {
   TQString result;
 
   switch( errorCode )
     {
-    case  KIO::ERR_CANNOT_OPEN_FOR_READING:
+    case  TDEIO::ERR_CANNOT_OPEN_FOR_READING:
       result = i18n( "Could not read %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_OPEN_FOR_WRITING:
+    case  TDEIO::ERR_CANNOT_OPEN_FOR_WRITING:
       result = i18n( "Could not write to %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_LAUNCH_PROCESS:
+    case  TDEIO::ERR_CANNOT_LAUNCH_PROCESS:
       result = i18n( "Could not start process %1." ).arg( errorText );
       break;
-    case  KIO::ERR_INTERNAL:
+    case  TDEIO::ERR_INTERNAL:
       result = i18n( "Internal Error\nPlease send a full bug report at http://bugs.kde.org\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_MALFORMED_URL:
+    case  TDEIO::ERR_MALFORMED_URL:
       result = i18n( "Malformed URL %1." ).arg( errorText );
       break;
-    case  KIO::ERR_UNSUPPORTED_PROTOCOL:
+    case  TDEIO::ERR_UNSUPPORTED_PROTOCOL:
       result = i18n( "The protocol %1 is not supported." ).arg( errorText );
       break;
-    case  KIO::ERR_NO_SOURCE_PROTOCOL:
+    case  TDEIO::ERR_NO_SOURCE_PROTOCOL:
       result = i18n( "The protocol %1 is only a filter protocol.").arg( errorText );
       break;
-    case  KIO::ERR_UNSUPPORTED_ACTION:
+    case  TDEIO::ERR_UNSUPPORTED_ACTION:
       result = errorText;
 //       result = i18n( "Unsupported action %1" ).arg( errorText );
       break;
-    case  KIO::ERR_IS_DIRECTORY:
+    case  TDEIO::ERR_IS_DIRECTORY:
       result = i18n( "%1 is a folder, but a file was expected." ).arg( errorText );
       break;
-    case  KIO::ERR_IS_FILE:
+    case  TDEIO::ERR_IS_FILE:
       result = i18n( "%1 is a file, but a folder was expected." ).arg( errorText );
       break;
-    case  KIO::ERR_DOES_NOT_EXIST:
+    case  TDEIO::ERR_DOES_NOT_EXIST:
       result = i18n( "The file or folder %1 does not exist." ).arg( errorText );
       break;
-    case  KIO::ERR_FILE_ALREADY_EXIST:
+    case  TDEIO::ERR_FILE_ALREADY_EXIST:
       result = i18n( "A file named %1 already exists." ).arg( errorText );
       break;
-    case  KIO::ERR_DIR_ALREADY_EXIST:
+    case  TDEIO::ERR_DIR_ALREADY_EXIST:
       result = i18n( "A folder named %1 already exists." ).arg( errorText );
       break;
-    case  KIO::ERR_UNKNOWN_HOST:
+    case  TDEIO::ERR_UNKNOWN_HOST:
       result = errorText.isEmpty() ? i18n( "No hostname specified." ) : i18n( "Unknown host %1" ).arg( errorText );
       break;
-    case  KIO::ERR_ACCESS_DENIED:
+    case  TDEIO::ERR_ACCESS_DENIED:
       result = i18n( "Access denied to %1." ).arg( errorText );
       break;
-    case  KIO::ERR_WRITE_ACCESS_DENIED:
+    case  TDEIO::ERR_WRITE_ACCESS_DENIED:
       result = i18n( "Access denied.\nCould not write to %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_ENTER_DIRECTORY:
+    case  TDEIO::ERR_CANNOT_ENTER_DIRECTORY:
       result = i18n( "Could not enter folder %1." ).arg( errorText );
       break;
-    case  KIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
+    case  TDEIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
       result = i18n( "The protocol %1 does not implement a folder service." ).arg( errorText );
       break;
-    case  KIO::ERR_CYCLIC_LINK:
+    case  TDEIO::ERR_CYCLIC_LINK:
       result = i18n( "Found a cyclic link in %1." ).arg( errorText );
       break;
-    case  KIO::ERR_USER_CANCELED:
+    case  TDEIO::ERR_USER_CANCELED:
       // Do nothing in this case. The user doesn't need to be told what he just did.
       break;
-    case  KIO::ERR_CYCLIC_COPY:
+    case  TDEIO::ERR_CYCLIC_COPY:
       result = i18n( "Found a cyclic link while copying %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_CREATE_SOCKET:
+    case  TDEIO::ERR_COULD_NOT_CREATE_SOCKET:
       result = i18n( "Could not create socket for accessing %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_CONNECT:
+    case  TDEIO::ERR_COULD_NOT_CONNECT:
       result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("localhost") : errorText );
       break;
-    case  KIO::ERR_CONNECTION_BROKEN:
+    case  TDEIO::ERR_CONNECTION_BROKEN:
       result = i18n( "Connection to host %1 is broken." ).arg( errorText );
       break;
-    case  KIO::ERR_NOT_FILTER_PROTOCOL:
+    case  TDEIO::ERR_NOT_FILTER_PROTOCOL:
       result = i18n( "The protocol %1 is not a filter protocol." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_MOUNT:
+    case  TDEIO::ERR_COULD_NOT_MOUNT:
       result = i18n( "Could not mount device.\nThe reported error was:\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_UNMOUNT:
+    case  TDEIO::ERR_COULD_NOT_UNMOUNT:
       result = i18n( "Could not unmount device.\nThe reported error was:\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_READ:
+    case  TDEIO::ERR_COULD_NOT_READ:
       result = i18n( "Could not read file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_WRITE:
+    case  TDEIO::ERR_COULD_NOT_WRITE:
       result = i18n( "Could not write to file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_BIND:
+    case  TDEIO::ERR_COULD_NOT_BIND:
       result = i18n( "Could not bind %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_LISTEN:
+    case  TDEIO::ERR_COULD_NOT_LISTEN:
       result = i18n( "Could not listen %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_ACCEPT:
+    case  TDEIO::ERR_COULD_NOT_ACCEPT:
       result = i18n( "Could not accept %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_LOGIN:
+    case  TDEIO::ERR_COULD_NOT_LOGIN:
       result = errorText;
       break;
-    case  KIO::ERR_COULD_NOT_STAT:
+    case  TDEIO::ERR_COULD_NOT_STAT:
       result = i18n( "Could not access %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_CLOSEDIR:
+    case  TDEIO::ERR_COULD_NOT_CLOSEDIR:
       result = i18n( "Could not terminate listing %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_MKDIR:
+    case  TDEIO::ERR_COULD_NOT_MKDIR:
       result = i18n( "Could not make folder %1." ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_RMDIR:
+    case  TDEIO::ERR_COULD_NOT_RMDIR:
       result = i18n( "Could not remove folder %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_RESUME:
+    case  TDEIO::ERR_CANNOT_RESUME:
       result = i18n( "Could not resume file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_RENAME:
+    case  TDEIO::ERR_CANNOT_RENAME:
       result = i18n( "Could not rename file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_CHMOD:
+    case  TDEIO::ERR_CANNOT_CHMOD:
       result = i18n( "Could not change permissions for %1." ).arg( errorText );
       break;
-    case  KIO::ERR_CANNOT_DELETE:
+    case  TDEIO::ERR_CANNOT_DELETE:
       result = i18n( "Could not delete file %1." ).arg( errorText );
       break;
-    case  KIO::ERR_SLAVE_DIED:
+    case  TDEIO::ERR_SLAVE_DIED:
       result = i18n( "The process for the %1 protocol died unexpectedly." ).arg( errorText );
       break;
-    case  KIO::ERR_OUT_OF_MEMORY:
+    case  TDEIO::ERR_OUT_OF_MEMORY:
       result = i18n( "Error. Out of memory.\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_UNKNOWN_PROXY_HOST:
+    case  TDEIO::ERR_UNKNOWN_PROXY_HOST:
       result = i18n( "Unknown proxy host\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_COULD_NOT_AUTHENTICATE:
+    case  TDEIO::ERR_COULD_NOT_AUTHENTICATE:
       result = i18n( "Authorization failed, %1 authentication not supported" ).arg( errorText );
       break;
-    case  KIO::ERR_ABORTED:
+    case  TDEIO::ERR_ABORTED:
       result = i18n( "User canceled action\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_INTERNAL_SERVER:
+    case  TDEIO::ERR_INTERNAL_SERVER:
       result = i18n( "Internal error in server\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_SERVER_TIMEOUT:
+    case  TDEIO::ERR_SERVER_TIMEOUT:
       result = i18n( "Timeout on server\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_UNKNOWN:
+    case  TDEIO::ERR_UNKNOWN:
       result = i18n( "Unknown error\n%1" ).arg( errorText );
       break;
-    case  KIO::ERR_UNKNOWN_INTERRUPT:
+    case  TDEIO::ERR_UNKNOWN_INTERRUPT:
       result = i18n( "Unknown interrupt\n%1" ).arg( errorText );
       break;
 /*
-    case  KIO::ERR_CHECKSUM_MISMATCH:
+    case  TDEIO::ERR_CHECKSUM_MISMATCH:
       if (errorText)
         result = i18n( "Warning: MD5 Checksum for %1 does not match checksum returned from server" ).arg(errorText);
       else
         result = i18n( "Warning: MD5 Checksum for %1 does not match checksum returned from server" ).arg("document");
       break;
 */
-    case KIO::ERR_CANNOT_DELETE_ORIGINAL:
+    case TDEIO::ERR_CANNOT_DELETE_ORIGINAL:
       result = i18n( "Could not delete original file %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_CANNOT_DELETE_PARTIAL:
+    case TDEIO::ERR_CANNOT_DELETE_PARTIAL:
       result = i18n( "Could not delete partial file %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_CANNOT_RENAME_ORIGINAL:
+    case TDEIO::ERR_CANNOT_RENAME_ORIGINAL:
       result = i18n( "Could not rename original file %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_CANNOT_RENAME_PARTIAL:
+    case TDEIO::ERR_CANNOT_RENAME_PARTIAL:
       result = i18n( "Could not rename partial file %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_CANNOT_SYMLINK:
+    case TDEIO::ERR_CANNOT_SYMLINK:
       result = i18n( "Could not create symlink %1.\nPlease check permissions." ).arg( errorText );
       break;
-    case KIO::ERR_NO_CONTENT:
+    case TDEIO::ERR_NO_CONTENT:
       result = errorText;
       break;
-    case KIO::ERR_DISK_FULL:
+    case TDEIO::ERR_DISK_FULL:
       result = i18n( "Could not write file %1.\nDisk full." ).arg( errorText );
       break;
-    case KIO::ERR_IDENTICAL_FILES:
+    case TDEIO::ERR_IDENTICAL_FILES:
       result = i18n( "The source and destination are the same file.\n%1" ).arg( errorText );
       break;
-    case KIO::ERR_SLAVE_DEFINED:
+    case TDEIO::ERR_SLAVE_DEFINED:
       result = errorText;
       break;
-    case KIO::ERR_UPGRADE_REQUIRED:
+    case TDEIO::ERR_UPGRADE_REQUIRED:
       result = i18n( "%1 is required by the server, but is not available." ).arg(errorText);
       break;
-    case KIO::ERR_POST_DENIED:
+    case TDEIO::ERR_POST_DENIED:
       result = i18n( "Access to restricted port in POST denied.");
       break;
-    case KIO::ERR_OFFLINE_MODE:
+    case TDEIO::ERR_OFFLINE_MODE:
       result = i18n( "Could not access %1.\nOffline mode active.").arg( errorText ); 
       break;
     default:
@@ -419,7 +419,7 @@ KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorTe
   return result;
 }
 
-KIO_EXPORT TQString KIO::unsupportedActionErrorString(const TQString &protocol, int cmd) {
+TDEIO_EXPORT TQString TDEIO::unsupportedActionErrorString(const TQString &protocol, int cmd) {
   switch (cmd) {
     case CMD_CONNECT:
       return i18n("Opening connections is not supported with the protocol %1." ).arg(protocol);
@@ -458,7 +458,7 @@ KIO_EXPORT TQString KIO::unsupportedActionErrorString(const TQString &protocol,
   }/*end switch*/
 }
 
-KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/,
+TDEIO_EXPORT TQStringList TDEIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0L*/,
                                             int method /*= -1*/ ) const
 {
   TQString errorName, techName, description, ret2;
@@ -477,7 +477,7 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0
     url = i18n( "(unknown)" );
   }
 
-  datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
+  datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
                                                 false );
 
   ret << errorName;
@@ -508,7 +508,7 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0
   return ret;
 }
 
-KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorText,
+TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &errorText,
                                const KURL *reqUrl /*= 0L*/, int /*method = -1*/ )
 {
   TQString url, host, protocol, datetime, domain, path, dir, filename;
@@ -559,7 +559,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
     protocol = i18n( "(unknown)" );
   }
 
-  datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
+  datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
                                                 false );
 
   TQString errorName, techName, description;
@@ -612,7 +612,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
   TQString sNetwork = i18n( "Check your network connection status." );
 
   switch( errorCode ) {
-    case  KIO::ERR_CANNOT_OPEN_FOR_READING:
+    case  TDEIO::ERR_CANNOT_OPEN_FOR_READING:
       errorName = i18n( "Cannot Open Resource For Reading" );
       description = i18n( "This means that the contents of the requested file "
         "or folder <strong>%1</strong> could not be retrieved, as read "
@@ -622,7 +622,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sQuerylock << sSysadmin;
       break;
 
-    case  KIO::ERR_CANNOT_OPEN_FOR_WRITING:
+    case  TDEIO::ERR_CANNOT_OPEN_FOR_WRITING:
       errorName = i18n( "Cannot Open Resource For Writing" );
       description = i18n( "This means that the file, <strong>%1</strong>, could "
         "not be written to as requested, because access with permission to "
@@ -631,7 +631,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sQuerylock << sSysadmin;
       break;
 
-    case  KIO::ERR_CANNOT_LAUNCH_PROCESS:
+    case  TDEIO::ERR_CANNOT_LAUNCH_PROCESS:
       errorName = i18n( "Cannot Initiate the %1 Protocol" ).arg( protocol );
       techName = i18n( "Unable to Launch Process" );
       description = i18n( "The program on your computer which provides access "
@@ -644,7 +644,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_INTERNAL:
+    case  TDEIO::ERR_INTERNAL:
       errorName = i18n( "Internal Error" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol has reported an internal error." )
@@ -653,7 +653,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_MALFORMED_URL:
+    case  TDEIO::ERR_MALFORMED_URL:
       errorName = i18n( "Improperly Formatted URL" );
       description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
         "<strong>L</strong>ocator (URL) that you entered was not properly "
@@ -663,7 +663,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTypo;
       break;
 
-    case  KIO::ERR_UNSUPPORTED_PROTOCOL:
+    case  TDEIO::ERR_UNSUPPORTED_PROTOCOL:
       errorName = i18n( "Unsupported Protocol %1" ).arg( protocol );
       description = i18n( "The protocol <strong>%1</strong> is not supported "
         "by the TDE programs currently installed on this computer." )
@@ -672,14 +672,14 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << i18n( "The versions of the %1 protocol supported by this computer and "
         "the server may be incompatible." ).arg( protocol );
       solutions << i18n( "You may perform a search on the Internet for a TDE "
-        "program (called a kioslave or ioslave) which supports this protocol. "
+        "program (called a tdeioslave or ioslave) which supports this protocol. "
         "Places to search include <a href=\"http://kde-apps.org/\">"
         "http://kde-apps.org/</a> and <a href=\"http://freshmeat.net/\">"
         "http://freshmeat.net/</a>." )
         << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_NO_SOURCE_PROTOCOL:
+    case  TDEIO::ERR_NO_SOURCE_PROTOCOL:
       errorName = i18n( "URL Does Not Refer to a Resource." );
       techName = i18n( "Protocol is a Filter Protocol" );
       description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
@@ -692,7 +692,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTypo;
       break;
 
-    case  KIO::ERR_UNSUPPORTED_ACTION:
+    case  TDEIO::ERR_UNSUPPORTED_ACTION:
       errorName = i18n( "Unsupported Action: %1" ).arg( errorText );
       description = i18n( "The requested action is not supported by the TDE "
         "program which is implementing the <strong>%1</strong> protocol." )
@@ -704,7 +704,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "outcome." );
       break;
 
-    case  KIO::ERR_IS_DIRECTORY:
+    case  TDEIO::ERR_IS_DIRECTORY:
       errorName = i18n( "File Expected" );
       description = i18n( "The request expected a file, however the "
         "folder <strong>%1</strong> was found instead." ).arg( dir );
@@ -712,7 +712,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_IS_FILE:
+    case  TDEIO::ERR_IS_FILE:
       errorName = i18n( "Folder Expected" );
       description = i18n( "The request expected a folder, however "
         "the file <strong>%1</strong> was found instead." ).arg( filename );
@@ -720,7 +720,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_DOES_NOT_EXIST:
+    case  TDEIO::ERR_DOES_NOT_EXIST:
       errorName = i18n( "File or Folder Does Not Exist" );
       description = i18n( "The specified file or folder <strong>%1</strong> "
         "does not exist." ).arg( dir );
@@ -728,7 +728,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sSysadmin;
       break;
 
-    case  KIO::ERR_FILE_ALREADY_EXIST:
+    case  TDEIO::ERR_FILE_ALREADY_EXIST:
       errorName = i18n( "File Already Exists" );
       description = i18n( "The requested file could not be created because a "
         "file with the same name already exists." );
@@ -738,7 +738,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << i18n( "Choose an alternate filename for the new file." );
       break;
 
-    case  KIO::ERR_DIR_ALREADY_EXIST:
+    case  TDEIO::ERR_DIR_ALREADY_EXIST:
       errorName = i18n( "Folder Already Exists" );
       description = i18n( "The requested folder could not be created because "
         "a folder with the same name already exists." );
@@ -748,7 +748,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << i18n( "Choose an alternate name for the new folder." );
       break;
 
-    case  KIO::ERR_UNKNOWN_HOST:
+    case  TDEIO::ERR_UNKNOWN_HOST:
       errorName = i18n( "Unknown Host" );
       description = i18n( "An unknown host error indicates that the server with "
         "the requested name, <strong>%1</strong>, could not be "
@@ -759,7 +759,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_ACCESS_DENIED:
+    case  TDEIO::ERR_ACCESS_DENIED:
       errorName = i18n( "Access Denied" );
       description = i18n( "Access was denied to the specified resource, "
         "<strong>%1</strong>." ).arg( url );
@@ -772,7 +772,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       if ( !isSlaveNetwork ) solutions << sServeradmin;
       break;
 
-    case  KIO::ERR_WRITE_ACCESS_DENIED:
+    case  TDEIO::ERR_WRITE_ACCESS_DENIED:
       errorName = i18n( "Write Access Denied" );
       description = i18n( "This means that an attempt to write to the file "
         "<strong>%1</strong> was rejected." ).arg( filename );
@@ -780,7 +780,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sQuerylock << sSysadmin;
       break;
 
-    case  KIO::ERR_CANNOT_ENTER_DIRECTORY:
+    case  TDEIO::ERR_CANNOT_ENTER_DIRECTORY:
       errorName = i18n( "Unable to Enter Folder" );
       description = i18n( "This means that an attempt to enter (in other words, "
         "to open) the requested folder <strong>%1</strong> was rejected." )
@@ -789,7 +789,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sQuerylock << sSysadmin;
       break;
 
-    case  KIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
+    case  TDEIO::ERR_PROTOCOL_IS_NOT_A_FILESYSTEM:
       errorName = i18n( "Folder Listing Unavailable" );
       techName = i18n( "Protocol %1 is not a Filesystem" ).arg( protocol );
       description = i18n( "This means that a request was made which requires "
@@ -799,7 +799,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_CYCLIC_LINK:
+    case  TDEIO::ERR_CYCLIC_LINK:
       errorName = i18n( "Cyclic Link Detected" );
       description = i18n( "UNIX environments are commonly able to link a file or "
         "folder to a separate name and/or location. TDE detected a link or "
@@ -809,7 +809,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "cause an infinite loop, and try again." ) << sSysadmin;
       break;
 
-    case  KIO::ERR_USER_CANCELED:
+    case  TDEIO::ERR_USER_CANCELED:
       // Do nothing in this case. The user doesn't need to be told what he just did.
       // rodda: However, if we have been called, an application is about to display
       // this information anyway. If we don't return sensible information, the
@@ -820,7 +820,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << i18n( "Retry the request." );
       break;
 
-    case  KIO::ERR_CYCLIC_COPY:
+    case  TDEIO::ERR_CYCLIC_COPY:
       errorName = i18n( "Cyclic Link Detected During Copy" );
       description = i18n( "UNIX environments are commonly able to link a file or "
         "folder to a separate name and/or location. During the requested copy "
@@ -831,7 +831,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "cause an infinite loop, and try again." ) << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_CREATE_SOCKET:
+    case  TDEIO::ERR_COULD_NOT_CREATE_SOCKET:
       errorName = i18n( "Could Not Create Network Connection" );
       techName = i18n( "Could Not Create Socket" );
       description = i18n( "This is a fairly technical error in which a required "
@@ -841,7 +841,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_CONNECT:
+    case  TDEIO::ERR_COULD_NOT_CONNECT:
       errorName = i18n( "Connection to Server Refused" );
       description = i18n( "The server <strong>%1</strong> refused to allow this "
         "computer to make a connection." ).arg( host );
@@ -855,7 +855,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTryagain << sServeradmin << sSysadmin;
       break;
 
-    case  KIO::ERR_CONNECTION_BROKEN:
+    case  TDEIO::ERR_CONNECTION_BROKEN:
       errorName = i18n( "Connection to Server Closed Unexpectedly" );
       description = i18n( "Although a connection was established to "
         "<strong>%1</strong>, the connection was closed at an unexpected point "
@@ -865,7 +865,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTryagain << sServeradmin << sSysadmin;
       break;
 
-    case  KIO::ERR_NOT_FILTER_PROTOCOL:
+    case  TDEIO::ERR_NOT_FILTER_PROTOCOL:
       errorName = i18n( "URL Resource Invalid" );
       techName = i18n( "Protocol %1 is not a Filter Protocol" ).arg( protocol );
       description = i18n( "The <strong>U</strong>niform <strong>R</strong>esource "
@@ -880,7 +880,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTypo << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_MOUNT:
+    case  TDEIO::ERR_COULD_NOT_MOUNT:
       errorName = i18n( "Unable to Initialize Input/Output Device" );
       techName = i18n( "Could Not Mount Device" );
       description = i18n( "The requested device could not be initialized "
@@ -899,7 +899,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "on.; and try again." ) << sAccess << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_UNMOUNT:
+    case  TDEIO::ERR_COULD_NOT_UNMOUNT:
       errorName = i18n( "Unable to Uninitialize Input/Output Device" );
       techName = i18n( "Could Not Unmount Device" );
       description = i18n( "The requested device could not be uninitialized "
@@ -917,7 +917,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "and try again." ) << sAccess << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_READ:
+    case  TDEIO::ERR_COULD_NOT_READ:
       errorName = i18n( "Cannot Read From Resource" );
       description = i18n( "This means that although the resource, "
         "<strong>%1</strong>, was able to be opened, an error occurred while "
@@ -930,7 +930,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_WRITE:
+    case  TDEIO::ERR_COULD_NOT_WRITE:
       errorName = i18n( "Cannot Write to Resource" );
       description = i18n( "This means that although the resource, <strong>%1</strong>"
         ", was able to be opened, an error occurred while writing to the resource." )
@@ -943,7 +943,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_BIND:
+    case  TDEIO::ERR_COULD_NOT_BIND:
       errorName = i18n( "Could Not Listen for Network Connections" );
       techName = i18n( "Could Not Bind" );
       description = i18n( "This is a fairly technical error in which a required "
@@ -954,7 +954,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_LISTEN:
+    case  TDEIO::ERR_COULD_NOT_LISTEN:
       errorName = i18n( "Could Not Listen for Network Connections" );
       techName = i18n( "Could Not Listen" );
       description = i18n( "This is a fairly technical error in which a required "
@@ -965,7 +965,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_ACCEPT:
+    case  TDEIO::ERR_COULD_NOT_ACCEPT:
       errorName = i18n( "Could Not Accept Network Connection" );
       description = i18n( "This is a fairly technical error in which an error "
         "occurred while attempting to accept an incoming network connection." );
@@ -975,7 +975,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sNetwork << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_LOGIN:
+    case  TDEIO::ERR_COULD_NOT_LOGIN:
       errorName = i18n( "Could Not Login: %1" ).arg( errorText );
       description = i18n( "An attempt to login to perform the requested "
         "operation was unsuccessful." );
@@ -987,7 +987,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "are entered correctly." ) << sServeradmin << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_STAT:
+    case  TDEIO::ERR_COULD_NOT_STAT:
       errorName = i18n( "Could Not Determine Resource Status" );
       techName = i18n( "Could Not Stat Resource" );
       description = i18n( "An attempt to determine information about the status "
@@ -999,13 +999,13 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "are entered correctly." ) << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_CLOSEDIR:
+    case  TDEIO::ERR_COULD_NOT_CLOSEDIR:
       //result = i18n( "Could not terminate listing %1" ).arg( errorText );
       errorName = i18n( "Could Not Cancel Listing" );
       techName = i18n( "FIXME: Document this" );
       break;
 
-    case  KIO::ERR_COULD_NOT_MKDIR:
+    case  TDEIO::ERR_COULD_NOT_MKDIR:
       errorName = i18n( "Could Not Create Folder" );
       description = i18n( "An attempt to create the requested folder failed." );
       causes << cAccess << i18n( "The location where the folder was to be created "
@@ -1014,7 +1014,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << i18n( "Retry the request." ) << sAccess;
       break;
 
-    case  KIO::ERR_COULD_NOT_RMDIR:
+    case  TDEIO::ERR_COULD_NOT_RMDIR:
       errorName = i18n( "Could Not Remove Folder" );
       description = i18n( "An attempt to remove the specified folder, "
         "<strong>%1</strong>, failed." ).arg( dir );
@@ -1026,7 +1026,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "again." ) << sAccess;
       break;
 
-    case  KIO::ERR_CANNOT_RESUME:
+    case  TDEIO::ERR_CANNOT_RESUME:
       errorName = i18n( "Could Not Resume File Transfer" );
       description = i18n( "The specified request asked that the transfer of "
         "file <strong>%1</strong> be resumed at a certain point of the "
@@ -1037,7 +1037,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "transfer." );
       break;
 
-    case  KIO::ERR_CANNOT_RENAME:
+    case  TDEIO::ERR_CANNOT_RENAME:
       errorName = i18n( "Could Not Rename Resource" );
       description = i18n( "An attempt to rename the specified resource "
         "<strong>%1</strong> failed." ).arg( url );
@@ -1046,7 +1046,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sExists;
       break;
 
-    case  KIO::ERR_CANNOT_CHMOD:
+    case  TDEIO::ERR_CANNOT_CHMOD:
       errorName = i18n( "Could Not Alter Permissions of Resource" );
       description = i18n( "An attempt to alter the permissions on the specified "
         "resource <strong>%1</strong> failed." ).arg( url );
@@ -1054,7 +1054,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sExists;
       break;
 
-    case  KIO::ERR_CANNOT_DELETE:
+    case  TDEIO::ERR_CANNOT_DELETE:
       errorName = i18n( "Could Not Delete Resource" );
       description = i18n( "An attempt to delete the specified resource "
         "<strong>%1</strong> failed." ).arg( url );
@@ -1062,7 +1062,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess << sExists;
       break;
 
-    case  KIO::ERR_SLAVE_DIED:
+    case  TDEIO::ERR_SLAVE_DIED:
       errorName = i18n( "Unexpected Program Termination" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol has unexpectedly terminated." )
@@ -1071,7 +1071,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_OUT_OF_MEMORY:
+    case  TDEIO::ERR_OUT_OF_MEMORY:
       errorName = i18n( "Out of Memory" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol could not obtain the memory "
@@ -1080,7 +1080,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_UNKNOWN_PROXY_HOST:
+    case  TDEIO::ERR_UNKNOWN_PROXY_HOST:
       errorName = i18n( "Unknown Proxy Host" );
       description = i18n( "While retrieving information about the specified "
         "proxy host, <strong>%1</strong>, an Unknown Host error was encountered. "
@@ -1094,7 +1094,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << sSysadmin;
       break;
 
-    case  KIO::ERR_COULD_NOT_AUTHENTICATE:
+    case  TDEIO::ERR_COULD_NOT_AUTHENTICATE:
       errorName = i18n( "Authentication Failed: Method %1 Not Supported" )
          .arg( errorText );
       description = i18n( "Although you may have supplied the correct "
@@ -1106,14 +1106,14 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "authentication method." ) << sSysadmin;
       break;
 
-    case  KIO::ERR_ABORTED:
+    case  TDEIO::ERR_ABORTED:
       errorName = i18n( "Request Aborted" );
       description = i18n( "The request was not completed because it was "
         "aborted." );
       solutions << i18n( "Retry the request." );
       break;
 
-    case  KIO::ERR_INTERNAL_SERVER:
+    case  TDEIO::ERR_INTERNAL_SERVER:
       errorName = i18n( "Internal Error in Server" );
       description = i18n( "The program on the server which provides access "
         "to the <strong>%1</strong> protocol has reported an internal error: "
@@ -1127,7 +1127,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         "submit the bug report directly to them." );
       break;
 
-    case  KIO::ERR_SERVER_TIMEOUT:
+    case  TDEIO::ERR_SERVER_TIMEOUT:
       errorName = i18n( "Timeout Error" );
       description = i18n( "Although contact was made with the server, a "
         "response was not received within the amount of time allocated for "
@@ -1145,7 +1145,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sTryagain << sServeradmin;
       break;
 
-    case  KIO::ERR_UNKNOWN:
+    case  TDEIO::ERR_UNKNOWN:
       errorName = i18n( "Unknown Error" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol has reported an unknown error: "
@@ -1154,7 +1154,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case  KIO::ERR_UNKNOWN_INTERRUPT:
+    case  TDEIO::ERR_UNKNOWN_INTERRUPT:
       errorName = i18n( "Unknown Interruption" );
       description = i18n( "The program on your computer which provides access "
         "to the <strong>%1</strong> protocol has reported an interruption of "
@@ -1163,7 +1163,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sUpdate << sBugreport;
       break;
 
-    case KIO::ERR_CANNOT_DELETE_ORIGINAL:
+    case TDEIO::ERR_CANNOT_DELETE_ORIGINAL:
       errorName = i18n( "Could Not Delete Original File" );
       description = i18n( "The requested operation required the deleting of "
         "the original file, most likely at the end of a file move operation. "
@@ -1173,7 +1173,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_CANNOT_DELETE_PARTIAL:
+    case TDEIO::ERR_CANNOT_DELETE_PARTIAL:
       errorName = i18n( "Could Not Delete Temporary File" );
       description = i18n( "The requested operation required the creation of "
         "a temporary file in which to save the new file while being "
@@ -1183,7 +1183,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_CANNOT_RENAME_ORIGINAL:
+    case TDEIO::ERR_CANNOT_RENAME_ORIGINAL:
       errorName = i18n( "Could Not Rename Original File" );
       description = i18n( "The requested operation required the renaming of "
         "the original file <strong>%1</strong>, however it could not be "
@@ -1192,7 +1192,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_CANNOT_RENAME_PARTIAL:
+    case TDEIO::ERR_CANNOT_RENAME_PARTIAL:
       errorName = i18n( "Could Not Rename Temporary File" );
       description = i18n( "The requested operation required the creation of "
         "a temporary file <strong>%1</strong>, however it could not be "
@@ -1201,7 +1201,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_CANNOT_SYMLINK:
+    case TDEIO::ERR_CANNOT_SYMLINK:
       errorName = i18n( "Could Not Create Link" );
       techName = i18n( "Could Not Create Symbolic Link" );
       description = i18n( "The requested symbolic link %1 could not be created." )
@@ -1210,12 +1210,12 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       solutions << sAccess;
       break;
 
-    case KIO::ERR_NO_CONTENT:
+    case TDEIO::ERR_NO_CONTENT:
       errorName = i18n( "No Content" );
       description = errorText;
       break;
 
-    case KIO::ERR_DISK_FULL:
+    case TDEIO::ERR_DISK_FULL:
       errorName = i18n( "Disk Full" );
       description = i18n( "The requested file <strong>%1</strong> could not be "
         "written to as there is inadequate disk space." ).arg( errorText );
@@ -1225,7 +1225,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
         << sSysadmin;
       break;
 
-    case KIO::ERR_IDENTICAL_FILES:
+    case TDEIO::ERR_IDENTICAL_FILES:
       errorName = i18n( "Source and Destination Files Identical" );
       description = i18n( "The operation could not be completed because the "
         "source and destination files are the same file." );
@@ -1233,7 +1233,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
       break;
 
     // We assume that the slave has all the details
-    case KIO::ERR_SLAVE_DEFINED:
+    case TDEIO::ERR_SLAVE_DEFINED:
       errorName = TQString::null;
       description = errorText;
       break;
@@ -1368,7 +1368,7 @@ extern "C" void endvfsent( );
 
 #endif /* HAVE_GETMNTINFO */
 
-TQString KIO::findDeviceMountPoint( const TQString& filename )
+TQString TDEIO::findDeviceMountPoint( const TQString& filename )
 {
     TQString result;
 
@@ -1666,7 +1666,7 @@ static TQString get_mount_info(const TQString& filename,
        gotDevice = true;
        if (stat_buf.st_dev == rootDevice)
        {
-          static const TQString &root = KGlobal::staticQString("/");
+          static const TQString &root = TDEGlobal::staticQString("/");
           isautofs = Wrong;
           isslow = Wrong;
           ismanual = Wrong;
@@ -1909,13 +1909,13 @@ static TQString get_mount_info(const TQString& filename,
 
 #else //!Q_OS_UNIX
 //dummy
-TQString KIO::findDeviceMountPoint( const TQString& filename )
+TQString TDEIO::findDeviceMountPoint( const TQString& filename )
 {
 	return TQString::null;
 }
 #endif
 
-TQString KIO::findPathMountPoint(const TQString& filename)
+TQString TDEIO::findPathMountPoint(const TQString& filename)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1926,7 +1926,7 @@ TQString KIO::findPathMountPoint(const TQString& filename)
 #endif 
 }
 
-bool KIO::manually_mounted(const TQString& filename)
+bool TDEIO::manually_mounted(const TQString& filename)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Unseen;
@@ -1938,7 +1938,7 @@ bool KIO::manually_mounted(const TQString& filename)
 #endif 
 }
 
-bool KIO::probably_slow_mounted(const TQString& filename)
+bool TDEIO::probably_slow_mounted(const TQString& filename)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1950,7 +1950,7 @@ bool KIO::probably_slow_mounted(const TQString& filename)
 #endif 
 }
 
-bool KIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
+bool TDEIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
 {
 #ifdef Q_OS_UNIX
   MountState isautofs = Unseen, isslow = Unseen, ismanual = Wrong;
@@ -1973,36 +1973,36 @@ bool KIO::testFileSystemFlag(const TQString& filename, FileSystemFlag flag)
   return false;
 }
 
-KIO::CacheControl KIO::parseCacheControl(const TQString &cacheControl)
+TDEIO::CacheControl TDEIO::parseCacheControl(const TQString &cacheControl)
 {
   TQString tmp = cacheControl.lower();
 
   if (tmp == "cacheonly")
-     return KIO::CC_CacheOnly;
+     return TDEIO::CC_CacheOnly;
   if (tmp == "cache")
-     return KIO::CC_Cache;
+     return TDEIO::CC_Cache;
   if (tmp == "verify")
-     return KIO::CC_Verify;
+     return TDEIO::CC_Verify;
   if (tmp == "refresh")
-     return KIO::CC_Refresh;
+     return TDEIO::CC_Refresh;
   if (tmp == "reload")
-     return KIO::CC_Reload;
+     return TDEIO::CC_Reload;
 
   kdDebug() << "unrecognized Cache control option:"<<cacheControl<<endl;
-  return KIO::CC_Verify;
+  return TDEIO::CC_Verify;
 }
 
-TQString KIO::getCacheControlString(KIO::CacheControl cacheControl)
+TQString TDEIO::getCacheControlString(TDEIO::CacheControl cacheControl)
 {
-    if (cacheControl == KIO::CC_CacheOnly)
+    if (cacheControl == TDEIO::CC_CacheOnly)
 	return "CacheOnly";
-    if (cacheControl == KIO::CC_Cache)
+    if (cacheControl == TDEIO::CC_Cache)
 	return "Cache";
-    if (cacheControl == KIO::CC_Verify)
+    if (cacheControl == TDEIO::CC_Verify)
 	return "Verify";
-    if (cacheControl == KIO::CC_Refresh)
+    if (cacheControl == TDEIO::CC_Refresh)
 	return "Refresh";
-    if (cacheControl == KIO::CC_Reload)
+    if (cacheControl == TDEIO::CC_Reload)
 	return "Reload";
     kdDebug() << "unrecognized Cache control enum value:"<<cacheControl<<endl;
     return TQString::null;
diff --git a/kio/kio/global.h b/tdeio/tdeio/global.h
index 6b0408c04..1cec378e3 100644
--- a/kio/kio/global.h
+++ b/tdeio/tdeio/global.h
@@ -15,8 +15,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_global_h__
-#define __kio_global_h__
+#ifndef __tdeio_global_h__
+#define __tdeio_global_h__
 
 #include <tqstring.h>
 #include <tqvaluelist.h>
@@ -31,7 +31,7 @@
  * @short A namespace for KIO globals
  *
  */
-namespace KIO
+namespace TDEIO
 {
   /// 64-bit file offset
   typedef TQ_LLONG fileoffset_t;
@@ -44,7 +44,7 @@ namespace KIO
    * @param  size  size in bytes
    * @return converted size as a string - e.g. 123.4 kB , 12.0 MB
    */
-  KIO_EXPORT TQString convertSize( KIO::filesize_t size );
+  TDEIO_EXPORT TQString convertSize( TDEIO::filesize_t size );
 
   /**
    * Converts @p size from bytes to a string representation with includes
@@ -53,7 +53,7 @@ namespace KIO
    * @param  size  size in bytes
    * @return converted size as a string - e.g. 1.4 KB (1495 B), 45 B
    */
-  KIO_EXPORT TQString convertSizeWithBytes( KIO::filesize_t size );
+  TDEIO_EXPORT TQString convertSizeWithBytes( TDEIO::filesize_t size );
   /**
    * Converts a size to a string representation
    * Not unlike TQString::number(...)
@@ -61,7 +61,7 @@ namespace KIO
    * @param size size in bytes
    * @return  converted size as a string - e.g. 123456789
    */
-  KIO_EXPORT TQString number( KIO::filesize_t size );
+  TDEIO_EXPORT TQString number( TDEIO::filesize_t size );
 
   /**
    * Converts size from kilo-bytes to the string representation.
@@ -69,7 +69,7 @@ namespace KIO
    * @param  kbSize  size in kilo-bytes
    * @return converted size as a string - e.g. 123.4 kB , 12.0 MB
    */
-   KIO_EXPORT TQString convertSizeFromKB( KIO::filesize_t kbSize );
+   TDEIO_EXPORT TQString convertSizeFromKB( TDEIO::filesize_t kbSize );
 
   /**
    * Calculates remaining time in seconds from total size, processed size and speed.
@@ -81,8 +81,8 @@ namespace KIO
    *
    * @since 3.4
    */
-  KIO_EXPORT unsigned int calculateRemainingSeconds( KIO::filesize_t totalSize,
-                                                     KIO::filesize_t processedSize, KIO::filesize_t speed );
+  TDEIO_EXPORT unsigned int calculateRemainingSeconds( TDEIO::filesize_t totalSize,
+                                                     TDEIO::filesize_t processedSize, TDEIO::filesize_t speed );
 
   /**
    * Convert @p seconds to a string representing number of days, hours, minutes and seconds
@@ -92,7 +92,7 @@ namespace KIO
    *
    * @since 3.4
    */
-  KIO_EXPORT TQString convertSeconds( unsigned int seconds );
+  TDEIO_EXPORT TQString convertSeconds( unsigned int seconds );
 
   /**
    * Calculates remaining time from total size, processed size and speed.
@@ -103,7 +103,7 @@ namespace KIO
    * @param  speed          speed in bytes per second
    * @return calculated remaining time
    */
-  KIO_EXPORT TQTime calculateRemaining( KIO::filesize_t totalSize, KIO::filesize_t processedSize, KIO::filesize_t speed ) KDE_DEPRECATED;
+  TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED;
 
   /**
    * Helper for showing information about a set of files and directories
@@ -114,23 +114,23 @@ namespace KIO
    * @param showSize whether to show the size in the result
    * @return the summary string
    */
-  KIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize);
+  TDEIO_EXPORT TQString itemsSummaryString(uint items, uint files, uint dirs, TDEIO::filesize_t size, bool showSize);
 
   /**
    * Encodes (from the text displayed to the real filename)
    * This translates % into %% and / into %2f
-   * Used by KIO::link, for instance.
+   * Used by TDEIO::link, for instance.
    * @param str the file name to encode
    * @return the encoded file name
    */
-  KIO_EXPORT TQString encodeFileName( const TQString & str );
+  TDEIO_EXPORT TQString encodeFileName( const TQString & str );
   /**
    * Decodes (from the filename to the text displayed)
    * This translates %2[fF] into / and %% into %
    * @param str the file name to decode
    * @return the decoded file name
    */
-  KIO_EXPORT TQString decodeFileName( const TQString & str );
+  TDEIO_EXPORT TQString decodeFileName( const TQString & str );
 
   /**
    * Commands that can be invoked by a job.
@@ -258,7 +258,7 @@ namespace KIO
    * @param errorText the additional error text
    * @return the created error string
    */
-  KIO_EXPORT TQString buildErrorString(int errorCode, const TQString &errorText);
+  TDEIO_EXPORT TQString buildErrorString(int errorCode, const TQString &errorText);
 
   /**
    * Returns a translated html error message for @p errorCode using the
@@ -270,7 +270,7 @@ namespace KIO
    * @param method the ioslave method
    * @return the created error string
    */
-  KIO_EXPORT TQString buildHTMLErrorString(int errorCode, const TQString &errorText,
+  TDEIO_EXPORT TQString buildHTMLErrorString(int errorCode, const TQString &errorText,
                                 const KURL *reqUrl = 0L, int method = -1 );
 
   /**
@@ -289,7 +289,7 @@ namespace KIO
    * @li TQStringList causes - a list of possible causes of the error
    * @li TQStringList solutions - a liso of solutions for the error
    */
-  KIO_EXPORT TQByteArray rawErrorDetail(int errorCode, const TQString &errorText,
+  TDEIO_EXPORT TQByteArray rawErrorDetail(int errorCode, const TQString &errorText,
                                 const KURL *reqUrl = 0L, int method = -1 );
 
   /**
@@ -300,7 +300,7 @@ namespace KIO
    * @see enum Command
    * @since 3.2
    */
-  KIO_EXPORT TQString unsupportedActionErrorString(const TQString &protocol, int cmd);
+  TDEIO_EXPORT TQString unsupportedActionErrorString(const TQString &protocol, int cmd);
 
   /**
    * Constants used to specify the type of a KUDSAtom.
@@ -401,7 +401,7 @@ namespace KIO
    * @return the cache control value
    * @see getCacheControlString()
    */
-  KIO_EXPORT KIO::CacheControl parseCacheControl(const TQString &cacheControl);
+  TDEIO_EXPORT TDEIO::CacheControl parseCacheControl(const TQString &cacheControl);
 
   /**
    * Returns a string representation of the given cache control method.
@@ -410,14 +410,14 @@ namespace KIO
    * @return the string representation
    * @see parseCacheControl()
    */
-  KIO_EXPORT TQString getCacheControlString(KIO::CacheControl cacheControl);
+  TDEIO_EXPORT TQString getCacheControlString(TDEIO::CacheControl cacheControl);
 
   /**
    * Returns the mount point where @p device is mounted
    * right now. This means, it has to be mounted, not just
    * defined in fstab.
    */
-  KIO_EXPORT TQString findDeviceMountPoint( const TQString& device );
+  TDEIO_EXPORT TQString findDeviceMountPoint( const TQString& device );
 
   /**
    * Returns the mount point on which resides @p filename.
@@ -426,7 +426,7 @@ namespace KIO
    * @param filename the file name to check
    * @return the mount point of the given @p filename
    */
-  KIO_EXPORT TQString findPathMountPoint( const TQString & filename );
+  TDEIO_EXPORT TQString findPathMountPoint( const TQString & filename );
 
   /**
    * Checks if the path belongs to a filesystem that is probably
@@ -435,7 +435,7 @@ namespace KIO
    * @param filename the file name to check
    * @return true if the filesystem is probably slow
    */
-  KIO_EXPORT bool probably_slow_mounted(const TQString& filename);
+  TDEIO_EXPORT bool probably_slow_mounted(const TQString& filename);
 
   /**
    * Checks if the path belongs to a filesystem that is manually
@@ -443,7 +443,7 @@ namespace KIO
    * @param filename the file name to check
    * @return true if the filesystem is manually mounted
    */
-  KIO_EXPORT bool manually_mounted(const TQString& filename);
+  TDEIO_EXPORT bool manually_mounted(const TQString& filename);
 
   enum FileSystemFlag { SupportsChmod, SupportsChown, SupportsUTime,
                         SupportsSymlinks, CaseInsensitive };
@@ -467,7 +467,7 @@ namespace KIO
    * "foo" and "FOO" as being the same file (true for msdos systems)
    *
    */
-  KIO_EXPORT bool testFileSystemFlag(const TQString& filename, FileSystemFlag flag);
+  TDEIO_EXPORT bool testFileSystemFlag(const TQString& filename, FileSystemFlag flag);
 
 
 /************
@@ -483,7 +483,7 @@ namespace KIO
  *
  * Each atom contains a specific bit of information for the file
  */
-class KIO_EXPORT UDSAtom
+class TDEIO_EXPORT UDSAtom
 {
 public:
   /**
@@ -512,7 +512,7 @@ typedef TQValueListConstIterator<UDSEntry> UDSEntryListConstIterator;
 /**
  * MetaData is a simple map of key/value strings.
  */
-class KIO_EXPORT MetaData : public TQMap<TQString, TQString>
+class TDEIO_EXPORT MetaData : public TQMap<TQString, TQString>
 {
 public:
   /**
diff --git a/kio/kio/http_slave_defaults.h b/tdeio/tdeio/http_slave_defaults.h
index 715efcfdb..e3247e39b 100644
--- a/kio/kio/http_slave_defaults.h
+++ b/tdeio/tdeio/http_slave_defaults.h
@@ -27,7 +27,7 @@
 #define DEFAULT_MAX_CACHE_AGE           60*60*24*14     // 14 DAYS
 #define DEFAULT_CACHE_EXPIRE            3*60            // 3 MINS
 #define DEFAULT_CLEAN_CACHE_INTERVAL    30*60           // 30 MINS
-#define DEFAULT_CACHE_CONTROL           KIO::CC_Refresh // Verify with remote
+#define DEFAULT_CACHE_CONTROL           TDEIO::CC_Refresh // Verify with remote
 #define CACHE_REVISION                  "7\n"           // Cache version
 
 // DEFAULT USER AGENT KEY - ENABLES OS NAME
diff --git a/kio/kio/ioslave_defaults.h b/tdeio/tdeio/ioslave_defaults.h
index ddf5b6af5..ddf5b6af5 100644
--- a/kio/kio/ioslave_defaults.h
+++ b/tdeio/tdeio/ioslave_defaults.h
diff --git a/kio/kio/job.cpp b/tdeio/tdeio/job.cpp
index 69b363392..7f8b9bda3 100644
--- a/kio/kio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kio/job.h"
+#include "tdeio/job.h"
 
 #include <config.h>
 
@@ -41,15 +41,15 @@ extern "C" {
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdatastream.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kde_file.h>
 
 #include <errno.h>
@@ -60,14 +60,14 @@ extern "C" {
 #include "kdirwatch.h"
 #include "kmimemagic.h"
 #include "kprotocolinfo.h"
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
-#include "kio/observer.h"
+#include "tdeio/observer.h"
 
 #include "kssl/ksslcsessioncache.h"
 
 #include <kdirnotify_stub.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <dcopclient.h>
 
 #ifdef Q_OS_UNIX
@@ -78,8 +78,8 @@ extern "C" {
 #include <fixx11h.h>
 #endif
 
-using namespace KIO;
-template class TQPtrList<KIO::Job>;
+using namespace TDEIO;
+template class TQPtrList<TDEIO::Job>;
 
 //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX
 #define REPORT_TIMEOUT 200
@@ -102,7 +102,7 @@ public:
     // (requires a new ctor, and moving the ctor code to some init()).
     Job* m_parentJob;
     int m_extraFlags;
-    KIO::filesize_t m_processedSize;
+    TDEIO::filesize_t m_processedSize;
     unsigned long m_userTimestamp;
 };
 
@@ -118,16 +118,16 @@ Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0)
         addMetaData("progress-id", TQString::number(m_progressId));
         //kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl;
         // Connect global progress info signals
-        connect( this, TQT_SIGNAL( percent( KIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotPercent( KIO::Job*, unsigned long ) ) );
-        connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString & ) ),
-                 Observer::self(), TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString & ) ) );
-        connect( this, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
-                 Observer::self(), TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
-        connect( this, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-                 Observer::self(), TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-        connect( this, TQT_SIGNAL( speed( KIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotSpeed( KIO::Job*, unsigned long ) ) );
+        connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+        connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ),
+                 Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) );
+        connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
     }
     // Don't exit while this job is running
     if (kapp)
@@ -149,12 +149,12 @@ int& Job::extraFlags()
     return d->m_extraFlags;
 }
 
-void Job::setProcessedSize(KIO::filesize_t size)
+void Job::setProcessedSize(TDEIO::filesize_t size)
 {
     d->m_processedSize = size;
 }
 
-KIO::filesize_t Job::getProcessedSize()
+TDEIO::filesize_t Job::getProcessedSize()
 {
     return d->m_processedSize;
 }
@@ -164,15 +164,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData)
     //kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl;
     subjobs.append(job);
 
-    connect( job, TQT_SIGNAL(result(KIO::Job*)),
-             TQT_SLOT(slotResult(KIO::Job*)) );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
+             TQT_SLOT(slotResult(TDEIO::Job*)) );
 
     // Forward information from that subjob.
-    connect( job, TQT_SIGNAL(speed( KIO::Job*, unsigned long )),
-             TQT_SLOT(slotSpeed(KIO::Job*, unsigned long)) );
+    connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )),
+             TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) );
 
-    connect( job, TQT_SIGNAL(infoMessage( KIO::Job*, const TQString & )),
-             TQT_SLOT(slotInfoMessage(KIO::Job*, const TQString &)) );
+    connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )),
+             TQT_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) );
 
     if (inheritMetaData)
        job->mergeMetaData(m_outgoingMetaData);
@@ -197,7 +197,7 @@ void Job::removeSubjob( Job *job, bool mergeMetaData, bool emitResultIfLast )
         emitResult();
 }
 
-void Job::emitPercent( KIO::filesize_t processedSize, KIO::filesize_t totalSize )
+void Job::emitPercent( TDEIO::filesize_t processedSize, TDEIO::filesize_t totalSize )
 {
   // calculate percents
   unsigned long ipercent = m_percent;
@@ -269,13 +269,13 @@ void Job::slotResult( Job *job )
     removeSubjob(job);
 }
 
-void Job::slotSpeed( KIO::Job*, unsigned long speed )
+void Job::slotSpeed( TDEIO::Job*, unsigned long speed )
 {
   //kdDebug(7007) << "Job::slotSpeed " << speed << endl;
   emitSpeed( speed );
 }
 
-void Job::slotInfoMessage( KIO::Job*, const TQString & msg )
+void Job::slotInfoMessage( TDEIO::Job*, const TQString & msg )
 {
   emit infoMessage( this, msg );
 }
@@ -298,7 +298,7 @@ void Job::showErrorDialog( TQWidget * parent )
   // Show a message box, except for "user canceled" or "no content"
   if ( (m_error != ERR_USER_CANCELED) && (m_error != ERR_NO_CONTENT) ) {
     //old plain error message
-    //kdDebug(7007) << "Default language: " << KGlobal::locale()->defaultLanguage() << endl;
+    //kdDebug(7007) << "Default language: " << TDEGlobal::locale()->defaultLanguage() << endl;
     if ( 1 )
       KMessageBox::queuedMessageBox( parent, KMessageBox::Error, errorString() );
 #if 0
@@ -352,7 +352,7 @@ bool Job::isInteractive() const
 void Job::setWindow(TQWidget *window)
 {
   m_window = window;
-  KIO::Scheduler::registerWindow(window);
+  TDEIO::Scheduler::registerWindow(window);
 }
 
 TQWidget *Job::window() const
@@ -397,7 +397,7 @@ TQString Job::queryMetaData(const TQString &key)
     return m_incomingMetaData[key];
 }
 
-void Job::setMetaData( const KIO::MetaData &_metaData)
+void Job::setMetaData( const TDEIO::MetaData &_metaData)
 {
     m_outgoingMetaData = _metaData;
 }
@@ -512,11 +512,11 @@ void SimpleJob::start(Slave *slave)
 
     if ((extraFlags() & EF_TransferJobDataSent) == 0)
     {
-        connect( m_slave, TQT_SIGNAL( totalSize( KIO::filesize_t ) ),
-                 TQT_SLOT( slotTotalSize( KIO::filesize_t ) ) );
+        connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+                 TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
 
-        connect( m_slave, TQT_SIGNAL( processedSize( KIO::filesize_t ) ),
-                 TQT_SLOT( slotProcessedSize( KIO::filesize_t ) ) );
+        connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+                 TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) );
 
         connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ),
                  TQT_SLOT( slotSpeed( unsigned long ) ) );
@@ -525,8 +525,8 @@ void SimpleJob::start(Slave *slave)
     connect( slave, TQT_SIGNAL( needProgressId() ),
              TQT_SLOT( slotNeedProgressId() ) );
 
-    connect( slave, TQT_SIGNAL(metaData( const KIO::MetaData& ) ),
-             TQT_SLOT( slotMetaData( const KIO::MetaData& ) ) );
+    connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ),
+             TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) );
 
     if (m_window)
     {
@@ -648,7 +648,7 @@ void SimpleJob::slotNeedProgressId()
     m_slave->setProgressId( m_progressId );
 }
 
-void SimpleJob::slotTotalSize( KIO::filesize_t size )
+void SimpleJob::slotTotalSize( TDEIO::filesize_t size )
 {
     if (size > m_totalSize)
     {
@@ -657,9 +657,9 @@ void SimpleJob::slotTotalSize( KIO::filesize_t size )
     }
 }
 
-void SimpleJob::slotProcessedSize( KIO::filesize_t size )
+void SimpleJob::slotProcessedSize( TDEIO::filesize_t size )
 {
-    //kdDebug(7007) << "SimpleJob::slotProcessedSize " << KIO::number(size) << endl;
+    //kdDebug(7007) << "SimpleJob::slotProcessedSize " << TDEIO::number(size) << endl;
     setProcessedSize(size);
     emit processedSize( this, size );
     if ( size > m_totalSize ) {
@@ -674,7 +674,7 @@ void SimpleJob::slotSpeed( unsigned long speed )
     emitSpeed( speed );
 }
 
-void SimpleJob::slotMetaData( const KIO::MetaData &_metaData)
+void SimpleJob::slotMetaData( const TDEIO::MetaData &_metaData)
 {
     m_incomingMetaData += _metaData;
 }
@@ -748,48 +748,48 @@ void MkdirJob::slotFinished()
     }
 }
 
-SimpleJob *KIO::mkdir( const KURL& url, int permissions )
+SimpleJob *TDEIO::mkdir( const KURL& url, int permissions )
 {
     //kdDebug(7007) << "mkdir " << url << endl;
     KIO_ARGS << url << permissions;
     return new MkdirJob(url, CMD_MKDIR, packedArgs, false);
 }
 
-SimpleJob *KIO::rmdir( const KURL& url )
+SimpleJob *TDEIO::rmdir( const KURL& url )
 {
     //kdDebug(7007) << "rmdir " << url << endl;
     KIO_ARGS << url << TQ_INT8(false); // isFile is false
     return new SimpleJob(url, CMD_DEL, packedArgs, false);
 }
 
-SimpleJob *KIO::chmod( const KURL& url, int permissions )
+SimpleJob *TDEIO::chmod( const KURL& url, int permissions )
 {
     //kdDebug(7007) << "chmod " << url << endl;
     KIO_ARGS << url << permissions;
     return new SimpleJob(url, CMD_CHMOD, packedArgs, false);
 }
 
-SimpleJob *KIO::rename( const KURL& src, const KURL & dest, bool overwrite )
+SimpleJob *TDEIO::rename( const KURL& src, const KURL & dest, bool overwrite )
 {
     //kdDebug(7007) << "rename " << src << " " << dest << endl;
     KIO_ARGS << src << dest << (TQ_INT8) overwrite;
     return new SimpleJob(src, CMD_RENAME, packedArgs, false);
 }
 
-SimpleJob *KIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo )
+SimpleJob *TDEIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo )
 {
     //kdDebug(7007) << "symlink target=" << target << " " << dest << endl;
     KIO_ARGS << target << dest << (TQ_INT8) overwrite;
     return new SimpleJob(dest, CMD_SYMLINK, packedArgs, showProgressInfo);
 }
 
-SimpleJob *KIO::special(const KURL& url, const TQByteArray & data, bool showProgressInfo)
+SimpleJob *TDEIO::special(const KURL& url, const TQByteArray & data, bool showProgressInfo)
 {
     //kdDebug(7007) << "special " << url << endl;
     return new SimpleJob(url, CMD_SPECIAL, data, showProgressInfo);
 }
 
-SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
+SimpleJob *TDEIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
 {
     KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 )
              << TQString::fromLatin1(fstype) << dev << point;
@@ -799,7 +799,7 @@ SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const T
     return job;
 }
 
-SimpleJob *KIO::unmount( const TQString& point, bool showProgressInfo )
+SimpleJob *TDEIO::unmount( const TQString& point, bool showProgressInfo )
 {
     KIO_ARGS << int(2) << point;
     SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo );
@@ -837,7 +837,7 @@ void LocalURLJob::slotFinished()
     SimpleJob::slotFinished();
 }
 
-LocalURLJob *KIO::localURL( const KURL& remoteUrl )
+LocalURLJob *TDEIO::localURL( const KURL& remoteUrl )
 {
     KIO_ARGS << remoteUrl;
     return new LocalURLJob(remoteUrl, CMD_LOCALURL, packedArgs, false);
@@ -858,15 +858,15 @@ void StatJob::start(Slave *slave)
     m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" );
     m_outgoingMetaData.replace( "details", TQString::number(m_details) );
 
-    connect( slave, TQT_SIGNAL( statEntry( const KIO::UDSEntry& ) ),
-             TQT_SLOT( slotStatEntry( const KIO::UDSEntry & ) ) );
+    connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ),
+             TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) );
     connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
              TQT_SLOT( slotRedirection(const KURL &) ) );
 
     SimpleJob::start(slave);
 }
 
-void StatJob::slotStatEntry( const KIO::UDSEntry & entry )
+void StatJob::slotStatEntry( const TDEIO::UDSEntry & entry )
 {
     //kdDebug(7007) << "StatJob::slotStatEntry" << endl;
     m_statResult = entry;
@@ -912,18 +912,18 @@ void StatJob::slotFinished()
     }
 }
 
-void StatJob::slotMetaData( const KIO::MetaData &_metaData) {
+void StatJob::slotMetaData( const TDEIO::MetaData &_metaData) {
     SimpleJob::slotMetaData(_metaData);
     storeSSLSessionFromJob(m_redirectionURL);
 }
 
-StatJob *KIO::stat(const KURL& url, bool showProgressInfo)
+StatJob *TDEIO::stat(const KURL& url, bool showProgressInfo)
 {
     // Assume sideIsSource. Gets are more common than puts.
     return stat( url, true, 2, showProgressInfo );
 }
 
-StatJob *KIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo)
+StatJob *TDEIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo)
 {
     kdDebug(7007) << "stat " << url << endl;
     KIO_ARGS << url;
@@ -935,7 +935,7 @@ StatJob *KIO::stat(const KURL& url, bool sideIsSource, short int details, bool s
     return job;
 }
 
-SimpleJob *KIO::http_update_cache( const KURL& url, bool no_cache, time_t expireDate)
+SimpleJob *TDEIO::http_update_cache( const KURL& url, bool no_cache, time_t expireDate)
 {
     assert( (url.protocol() == "http") || (url.protocol() == "https") );
     // Send http update_cache command (2)
@@ -1074,7 +1074,7 @@ void TransferJob::sendAsyncData(const TQByteArray &dataForSlave)
        m_slave->send( MSG_DATA, dataForSlave );
        if (extraFlags() & EF_TransferJobDataSent)
        {
-           KIO::filesize_t size = getProcessedSize()+dataForSlave.size();
+           TDEIO::filesize_t size = getProcessedSize()+dataForSlave.size();
            setProcessedSize(size);
            emit processedSize( this, size );
            if ( size > m_totalSize ) {
@@ -1181,8 +1181,8 @@ void TransferJob::start(Slave *slave)
     connect( slave, TQT_SIGNAL( needSubURLData() ),
              TQT_SLOT( slotNeedSubURLData() ) );
 
-    connect( slave, TQT_SIGNAL(canResume( KIO::filesize_t ) ),
-             TQT_SLOT( slotCanResume( KIO::filesize_t ) ) );
+    connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ),
+             TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
 
     if (slave->suspended())
     {
@@ -1199,14 +1199,14 @@ void TransferJob::start(Slave *slave)
 void TransferJob::slotNeedSubURLData()
 {
     // Job needs data from subURL.
-    m_subJob = KIO::get( m_subUrl, false, false);
+    m_subJob = TDEIO::get( m_subUrl, false, false);
     suspend(); // Put job on hold until we have some data.
-    connect(m_subJob, TQT_SIGNAL( data(KIO::Job*,const TQByteArray &)),
-            TQT_SLOT( slotSubURLData(KIO::Job*,const TQByteArray &)));
+    connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)),
+            TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &)));
     addSubjob(m_subJob);
 }
 
-void TransferJob::slotSubURLData(KIO::Job*, const TQByteArray &data)
+void TransferJob::slotSubURLData(TDEIO::Job*, const TQByteArray &data)
 {
     // The Alternating Bitburg protocol in action again.
     staticData = data;
@@ -1214,7 +1214,7 @@ void TransferJob::slotSubURLData(KIO::Job*, const TQByteArray &data)
     resume(); // Activate ourselves again.
 }
 
-void TransferJob::slotMetaData( const KIO::MetaData &_metaData) {
+void TransferJob::slotMetaData( const TDEIO::MetaData &_metaData) {
     SimpleJob::slotMetaData(_metaData);
     storeSSLSessionFromJob(m_redirectionURL);
 }
@@ -1224,12 +1224,12 @@ void TransferJob::slotErrorPage()
     m_errorPage = true;
 }
 
-void TransferJob::slotCanResume( KIO::filesize_t offset )
+void TransferJob::slotCanResume( TDEIO::filesize_t offset )
 {
     emit canResume(this, offset);
 }
 
-void TransferJob::slotResult( KIO::Job *job)
+void TransferJob::slotResult( TDEIO::Job *job)
 {
    // This can only be our suburl.
    assert(job == m_subJob);
@@ -1251,7 +1251,7 @@ void TransferJob::slotResult( KIO::Job *job)
    removeSubjob( job, false, false ); // Remove job, but don't kill this job.
 }
 
-TransferJob *KIO::get( const KURL& url, bool reload, bool showProgressInfo )
+TransferJob *TDEIO::get( const KURL& url, bool reload, bool showProgressInfo )
 {
     // Send decoded path and encoded query
     KIO_ARGS << url;
@@ -1274,7 +1274,7 @@ public:
 
 };
 
-TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo )
+TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, bool showProgressInfo )
 {
     int _error = 0;
 
@@ -1344,7 +1344,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
     for (int cnt=0; bad_ports[cnt]; ++cnt)
         if (url.port() == bad_ports[cnt])
         {
-            _error = KIO::ERR_POST_DENIED;
+            _error = TDEIO::ERR_POST_DENIED;
             break;
         }
 
@@ -1354,7 +1354,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
 	static TQValueList< int >* overriden_ports = NULL;
 	if( !override_loaded )
 	{
-	    KConfig cfg( "kio_httprc", true );
+	    TDEConfig cfg( "tdeio_httprc", true );
 	    overriden_ports = new TQValueList< int >;
 	    *overriden_ports = cfg.readIntListEntry( "OverriddenPorts" );
 	    override_loaded = true;
@@ -1368,7 +1368,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
 
     // filter out non https? protocols
     if ((url.protocol() != "http") && (url.protocol() != "https" ))
-        _error = KIO::ERR_POST_DENIED;
+        _error = TDEIO::ERR_POST_DENIED;
 
     bool redirection = false;
     KURL _url(url);
@@ -1379,7 +1379,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool
     }
 
     if (!_error && !kapp->authorizeURLAction("open", KURL(), _url))
-        _error = KIO::ERR_ACCESS_DENIED;
+        _error = TDEIO::ERR_ACCESS_DENIED;
 
     // if request is not valid, return an invalid transfer job
     if (_error)
@@ -1411,7 +1411,7 @@ void TransferJob::slotPostRedirection()
 }
 
 
-TransferJob *KIO::put( const KURL& url, int permissions,
+TransferJob *TDEIO::put( const KURL& url, int permissions,
                   bool overwrite, bool resume, bool showProgressInfo )
 {
     KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
@@ -1428,10 +1428,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
     : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
       m_uploadOffset( 0 )
 {
-    connect( this, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotStoredData( KIO::Job *, const TQByteArray & ) ) );
-    connect( this, TQT_SIGNAL( dataReq( KIO::Job *, TQByteArray & ) ),
-             TQT_SLOT( slotStoredDataReq( KIO::Job *, TQByteArray & ) ) );
+    connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
+             TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) );
 }
 
 void StoredTransferJob::setData( const TQByteArray& arr )
@@ -1441,7 +1441,7 @@ void StoredTransferJob::setData( const TQByteArray& arr )
     m_data = arr;
 }
 
-void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data )
+void StoredTransferJob::slotStoredData( TDEIO::Job *, const TQByteArray &data )
 {
   // check for end-of-data marker:
   if ( data.size() == 0 )
@@ -1451,7 +1451,7 @@ void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data )
   memcpy( m_data.data() + oldSize, data.data(), data.size() );
 }
 
-void StoredTransferJob::slotStoredDataReq( KIO::Job *, TQByteArray &data )
+void StoredTransferJob::slotStoredDataReq( TDEIO::Job *, TQByteArray &data )
 {
   // Inspired from kmail's KMKernel::byteArrayToRemoteFile
   // send the data in 64 KB chunks
@@ -1472,7 +1472,7 @@ void StoredTransferJob::slotStoredDataReq( KIO::Job *, TQByteArray &data )
   }
 }
 
-StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgressInfo )
+StoredTransferJob *TDEIO::storedGet( const KURL& url, bool reload, bool showProgressInfo )
 {
     // Send decoded path and encoded query
     KIO_ARGS << url;
@@ -1482,7 +1482,7 @@ StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgre
     return job;
 }
 
-StoredTransferJob *KIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions,
+StoredTransferJob *TDEIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions,
                                    bool overwrite, bool resume, bool showProgressInfo )
 {
     KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
@@ -1508,7 +1508,7 @@ void MimetypeJob::start(Slave *slave)
 void MimetypeJob::slotFinished( )
 {
     //kdDebug(7007) << "MimetypeJob::slotFinished()" << endl;
-    if ( m_error == KIO::ERR_IS_DIRECTORY )
+    if ( m_error == TDEIO::ERR_IS_DIRECTORY )
     {
         // It is in fact a directory. This happens when HTTP redirects to FTP.
         // Due to the "protocol doesn't support listing" code in KRun, we
@@ -1540,7 +1540,7 @@ void MimetypeJob::slotFinished( )
     }
 }
 
-MimetypeJob *KIO::mimetype(const KURL& url, bool showProgressInfo )
+MimetypeJob *TDEIO::mimetype(const KURL& url, bool showProgressInfo )
 {
     KIO_ARGS << url;
     MimetypeJob * job = new MimetypeJob(url, CMD_MIMETYPE, packedArgs, showProgressInfo);
@@ -1559,12 +1559,12 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command,
 
 void DirectCopyJob::start( Slave* slave )
 {
-    connect( slave, TQT_SIGNAL(canResume( KIO::filesize_t ) ),
-             TQT_SLOT( slotCanResume( KIO::filesize_t ) ) );
+    connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ),
+             TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
     SimpleJob::start(slave);
 }
 
-void DirectCopyJob::slotCanResume( KIO::filesize_t offset )
+void DirectCopyJob::slotCanResume( TDEIO::filesize_t offset )
 {
     emit canResume(this, offset);
 }
@@ -1575,7 +1575,7 @@ void DirectCopyJob::slotCanResume( KIO::filesize_t offset )
 class FileCopyJob::FileCopyJobPrivate
 {
 public:
-    KIO::filesize_t m_sourceSize;
+    TDEIO::filesize_t m_sourceSize;
     time_t m_modificationTime;
     SimpleJob *m_delJob;
 };
@@ -1605,7 +1605,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions,
     m_putJob = 0;
     d = new FileCopyJobPrivate;
     d->m_delJob = 0;
-    d->m_sourceSize = (KIO::filesize_t) -1;
+    d->m_sourceSize = (TDEIO::filesize_t) -1;
     d->m_modificationTime = static_cast<time_t>( -1 );
     TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
 }
@@ -1677,10 +1677,10 @@ void FileCopyJob::setSourceSize( off_t size )
        m_totalSize = size;
 }
 
-void FileCopyJob::setSourceSize64( KIO::filesize_t size )
+void FileCopyJob::setSourceSize64( TDEIO::filesize_t size )
 {
     d->m_sourceSize = size;
-    if (size != (KIO::filesize_t) -1)
+    if (size != (TDEIO::filesize_t) -1)
        m_totalSize = size;
 }
 
@@ -1701,8 +1701,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url)
     m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false);
     addSubjob( m_copyJob );
     connectSubjob( m_copyJob );
-    connect( m_copyJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
-             TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
+    connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+             TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
 }
 
 void FileCopyJob::startRenameJob(const KURL &slave_url)
@@ -1715,18 +1715,18 @@ void FileCopyJob::startRenameJob(const KURL &slave_url)
 
 void FileCopyJob::connectSubjob( SimpleJob * job )
 {
-    connect( job, TQT_SIGNAL(totalSize( KIO::Job*, KIO::filesize_t )),
-             this, TQT_SLOT( slotTotalSize(KIO::Job*, KIO::filesize_t)) );
+    connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )),
+             this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) );
 
-    connect( job, TQT_SIGNAL(processedSize( KIO::Job*, KIO::filesize_t )),
-             this, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t)) );
+    connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )),
+             this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) );
 
-    connect( job, TQT_SIGNAL(percent( KIO::Job*, unsigned long )),
-             this, TQT_SLOT( slotPercent(KIO::Job*, unsigned long)) );
+    connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )),
+             this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) );
 
 }
 
-void FileCopyJob::slotProcessedSize( KIO::Job *, KIO::filesize_t size )
+void FileCopyJob::slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t size )
 {
     setProcessedSize(size);
     emit processedSize( this, size );
@@ -1736,7 +1736,7 @@ void FileCopyJob::slotProcessedSize( KIO::Job *, KIO::filesize_t size )
     emitPercent( size, m_totalSize );
 }
 
-void FileCopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void FileCopyJob::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
 {
     if (size > m_totalSize)
     {
@@ -1745,7 +1745,7 @@ void FileCopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
     }
 }
 
-void FileCopyJob::slotPercent( KIO::Job*, unsigned long pct )
+void FileCopyJob::slotPercent( TDEIO::Job*, unsigned long pct )
 {
     if ( pct > m_percent )
     {
@@ -1770,18 +1770,18 @@ void FileCopyJob::startDataPump()
 
     // The first thing the put job will tell us is whether we can
     // resume or not (this is always emitted)
-    connect( m_putJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
-             TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
-    connect( m_putJob, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray&)),
-             TQT_SLOT( slotDataReq(KIO::Job *, TQByteArray&)));
+    connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+             TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
+    connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)),
+             TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&)));
     addSubjob( m_putJob );
 }
 
-void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
+void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset )
 {
     if ( job == m_putJob || job == m_copyJob )
     {
-        //kdDebug(7007) << "FileCopyJob::slotCanResume from PUT job. offset=" << KIO::number(offset) << endl;
+        //kdDebug(7007) << "FileCopyJob::slotCanResume from PUT job. offset=" << TDEIO::number(offset) << endl;
         if (offset)
         {
             RenameDlg_Result res = R_RESUME;
@@ -1789,7 +1789,7 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
             if (!KProtocolManager::autoResume() && !m_overwrite)
             {
                 TQString newPath;
-                KIO::Job* job = ( !m_progressId && parentJob() ) ? parentJob() : this;
+                TDEIO::Job* job = ( !m_progressId && parentJob() ) ? parentJob() : this;
                 // Ask confirmation about resuming previous transfer
                 res = Observer::self()->open_RenameDlg(
                       job, i18n("File Already Exists"),
@@ -1822,18 +1822,18 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
             m_getJob->addMetaData( "errorPage", "false" );
             m_getJob->addMetaData( "AllowCompressedPage", "false" );
             // Set size in subjob. This helps if the slave doesn't emit totalSize.
-            if ( d->m_sourceSize != (KIO::filesize_t)-1 )
+            if ( d->m_sourceSize != (TDEIO::filesize_t)-1 )
                 m_getJob->slotTotalSize( d->m_sourceSize );
             if (offset)
             {
                 //kdDebug(7007) << "Setting metadata for resume to " << (unsigned long) offset << endl;
 		// TODO KDE4: rename to seek or offset and document it
 		// This isn't used only for resuming, but potentially also for extracting (#72302).
-                m_getJob->addMetaData( "resume", KIO::number(offset) );
+                m_getJob->addMetaData( "resume", TDEIO::number(offset) );
 
                 // Might or might not get emitted
-                connect( m_getJob, TQT_SIGNAL(canResume(KIO::Job *, KIO::filesize_t)),
-                         TQT_SLOT( slotCanResume(KIO::Job *, KIO::filesize_t)));
+                connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+                         TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
             }
             m_putJob->slave()->setOffset( offset );
 
@@ -1842,10 +1842,10 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
             connectSubjob( m_getJob ); // Progress info depends on get
             m_getJob->resume(); // Order a beer
 
-            connect( m_getJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)),
-                     TQT_SLOT( slotData(KIO::Job*,const TQByteArray&)) );
-            connect( m_getJob, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&) ),
-                     TQT_SLOT(slotMimetype(KIO::Job*,const TQString&)) );
+            connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+                     TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) );
+            connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ),
+                     TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
         }
         else // copyjob
         {
@@ -1865,7 +1865,7 @@ void FileCopyJob::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
                         << " m_getJob=" << m_getJob << " m_putJob=" << m_putJob << endl;
 }
 
-void FileCopyJob::slotData( KIO::Job * , const TQByteArray &data)
+void FileCopyJob::slotData( TDEIO::Job * , const TQByteArray &data)
 {
    //kdDebug(7007) << "FileCopyJob::slotData" << endl;
    //kdDebug(7007) << " data size : " << data.size() << endl;
@@ -1885,7 +1885,7 @@ void FileCopyJob::slotData( KIO::Job * , const TQByteArray &data)
    }
 }
 
-void FileCopyJob::slotDataReq( KIO::Job * , TQByteArray &data)
+void FileCopyJob::slotDataReq( TDEIO::Job * , TQByteArray &data)
 {
    //kdDebug(7007) << "FileCopyJob::slotDataReq" << endl;
    if (!m_resumeAnswerSent && !m_getJob)
@@ -1906,12 +1906,12 @@ void FileCopyJob::slotDataReq( KIO::Job * , TQByteArray &data)
    m_buffer = TQByteArray();
 }
 
-void FileCopyJob::slotMimetype( KIO::Job*, const TQString& type )
+void FileCopyJob::slotMimetype( TDEIO::Job*, const TQString& type )
 {
     emit mimetype( this, type );
 }
 
-void FileCopyJob::slotResult( KIO::Job *job)
+void FileCopyJob::slotResult( TDEIO::Job *job)
 {
    //kdDebug(7007) << "FileCopyJob this=" << this << " ::slotResult(" << job << ")" << endl;
    // Did job have an error ?
@@ -1994,19 +1994,19 @@ void FileCopyJob::slotResult( KIO::Job *job)
    removeSubjob(job);
 }
 
-FileCopyJob *KIO::file_copy( const KURL& src, const KURL& dest, int permissions,
+FileCopyJob *TDEIO::file_copy( const KURL& src, const KURL& dest, int permissions,
                              bool overwrite, bool resume, bool showProgressInfo)
 {
    return new FileCopyJob( src, dest, permissions, false, overwrite, resume, showProgressInfo );
 }
 
-FileCopyJob *KIO::file_move( const KURL& src, const KURL& dest, int permissions,
+FileCopyJob *TDEIO::file_move( const KURL& src, const KURL& dest, int permissions,
                              bool overwrite, bool resume, bool showProgressInfo)
 {
    return new FileCopyJob( src, dest, permissions, true, overwrite, resume, showProgressInfo );
 }
 
-SimpleJob *KIO::file_delete( const KURL& src, bool showProgressInfo)
+SimpleJob *TDEIO::file_delete( const KURL& src, bool showProgressInfo)
 {
     KIO_ARGS << src << TQ_INT8(true); // isFile
     return new SimpleJob(src, CMD_DEL, packedArgs, showProgressInfo );
@@ -2025,7 +2025,7 @@ ListJob::ListJob(const KURL& u, bool showProgressInfo, bool _recursive, TQString
     stream << u;
 }
 
-void ListJob::slotListEntries( const KIO::UDSEntryList& list )
+void ListJob::slotListEntries( const TDEIO::UDSEntryList& list )
 {
     // Emit progress info (takes care of emit processedSize and percent)
     m_processedEntries += list.count();
@@ -2074,10 +2074,10 @@ void ListJob::slotListEntries( const KIO::UDSEntryList& list )
                                                prefix + filename + "/",
                                                includeHidden);
                     Scheduler::scheduleJob(job);
-                    connect(job, TQT_SIGNAL(entries( KIO::Job *,
-                                                 const KIO::UDSEntryList& )),
-                            TQT_SLOT( gotEntries( KIO::Job*,
-                                              const KIO::UDSEntryList& )));
+                    connect(job, TQT_SIGNAL(entries( TDEIO::Job *,
+                                                 const TDEIO::UDSEntryList& )),
+                            TQT_SLOT( gotEntries( TDEIO::Job*,
+                                              const TDEIO::UDSEntryList& )));
                     addSubjob(job);
                 }
             }
@@ -2117,13 +2117,13 @@ void ListJob::slotListEntries( const KIO::UDSEntryList& list )
     }
 }
 
-void ListJob::gotEntries(KIO::Job *, const KIO::UDSEntryList& list )
+void ListJob::gotEntries(TDEIO::Job *, const TDEIO::UDSEntryList& list )
 {
     // Forward entries received by subjob - faking we received them ourselves
     emit entries(this, list);
 }
 
-void ListJob::slotResult( KIO::Job * job )
+void ListJob::slotResult( TDEIO::Job * job )
 {
     // If we can't list a subdir, the result is still ok
     // This is why we override Job::slotResult() - to skip error checking
@@ -2146,7 +2146,7 @@ void ListJob::slotRedirection( const KURL & url )
 void ListJob::slotFinished()
 {
     // Support for listing archives as directories
-    if ( m_error == KIO::ERR_IS_FILE && m_url.isLocalFile() ) {
+    if ( m_error == TDEIO::ERR_IS_FILE && m_url.isLocalFile() ) {
         KMimeType::Ptr ptr = KMimeType::findByURL( m_url, 0, true, true );
         if ( ptr ) {
             TQString proto = ptr->property("X-TDE-LocalProtocol").toString();
@@ -2178,18 +2178,18 @@ void ListJob::slotFinished()
     }
 }
 
-void ListJob::slotMetaData( const KIO::MetaData &_metaData) {
+void ListJob::slotMetaData( const TDEIO::MetaData &_metaData) {
     SimpleJob::slotMetaData(_metaData);
     storeSSLSessionFromJob(m_redirectionURL);
 }
 
-ListJob *KIO::listDir( const KURL& url, bool showProgressInfo, bool includeHidden )
+ListJob *TDEIO::listDir( const KURL& url, bool showProgressInfo, bool includeHidden )
 {
     ListJob * job = new ListJob(url, showProgressInfo,false,TQString::null,includeHidden);
     return job;
 }
 
-ListJob *KIO::listRecursive( const KURL& url, bool showProgressInfo, bool includeHidden )
+ListJob *TDEIO::listRecursive( const KURL& url, bool showProgressInfo, bool includeHidden )
 {
     ListJob * job = new ListJob(url, showProgressInfo, true,TQString::null,includeHidden);
     return job;
@@ -2212,10 +2212,10 @@ void ListJob::start(Slave *slave)
         TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) );
         return;
     }
-    connect( slave, TQT_SIGNAL( listEntries( const KIO::UDSEntryList& )),
-             TQT_SLOT( slotListEntries( const KIO::UDSEntryList& )));
-    connect( slave, TQT_SIGNAL( totalSize( KIO::filesize_t ) ),
-             TQT_SLOT( slotTotalSize( KIO::filesize_t ) ) );
+    connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )),
+             TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& )));
+    connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+             TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
     connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
              TQT_SLOT( slotRedirection(const KURL &) ) );
 
@@ -2260,11 +2260,11 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a
     d->m_globalDestinationState = destinationState;
 
     if ( showProgressInfo ) {
-        connect( this, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
+        connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
 
-        connect( this, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+        connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
     }
     TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
     /**
@@ -2301,13 +2301,13 @@ void CopyJob::slotStart()
     m_reportTimer->start(REPORT_TIMEOUT,false);
 
     // Stat the dest
-    KIO::Job * job = KIO::stat( m_dest, false, 2, false );
+    TDEIO::Job * job = TDEIO::stat( m_dest, false, 2, false );
     //kdDebug(7007) << "CopyJob:stating the dest " << m_dest << endl;
     addSubjob(job);
 }
 
 // For unit test purposes
-KIO_EXPORT bool kio_resolve_local_urls = true;
+TDEIO_EXPORT bool tdeio_resolve_local_urls = true;
 
 void CopyJob::slotResultStating( Job *job )
 {
@@ -2328,7 +2328,7 @@ void CopyJob::slotResultStating( Job *job )
             info.permissions = (mode_t) -1;
             info.mtime = (time_t) -1;
             info.ctime = (time_t) -1;
-            info.size = (KIO::filesize_t)-1;
+            info.size = (TDEIO::filesize_t)-1;
             info.uSource = srcurl;
             info.uDest = m_dest;
             // Append filename or dirname to destination URL, if allowed
@@ -2376,7 +2376,7 @@ void CopyJob::slotResultStating( Job *job )
         if ( isGlobalDest )
             d->m_globalDestinationState = destinationState;
 
-        if ( !sLocalPath.isEmpty() && kio_resolve_local_urls ) {
+        if ( !sLocalPath.isEmpty() && tdeio_resolve_local_urls ) {
             m_dest = KURL();
             m_dest.setPath(sLocalPath);
             if ( isGlobalDest )
@@ -2525,7 +2525,7 @@ void CopyJob::slotReport()
     }
 }
 
-void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
+void CopyJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
 {
     UDSEntryListConstIterator it = list.begin();
     UDSEntryListConstIterator end = list.end();
@@ -2535,7 +2535,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
         info.permissions = -1;
         info.mtime = (time_t) -1;
         info.ctime = (time_t) -1;
-        info.size = (KIO::filesize_t)-1;
+        info.size = (TDEIO::filesize_t)-1;
         TQString displayName;
         KURL url;
         TQString localPath;
@@ -2562,7 +2562,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
                     info.permissions = ((*it2).m_long);
                     break;
                 case UDS_SIZE:
-                    info.size = (KIO::filesize_t)((*it2).m_long);
+                    info.size = (TDEIO::filesize_t)((*it2).m_long);
                     m_totalSize += info.size;
                     break;
                 case UDS_MODIFICATION_TIME:
@@ -2586,7 +2586,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
                 }
             }
             //kdDebug(7007) << "displayName=" << displayName << " url=" << url << endl;
-            if (!localPath.isEmpty() && kio_resolve_local_urls) {
+            if (!localPath.isEmpty() && tdeio_resolve_local_urls) {
                 url = KURL();
                 url.setPath(localPath);
             }
@@ -2611,7 +2611,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
                     for ( int n = 0; n < numberOfSlashes + 1; ++n ) {
                         pos = path.findRev( '/', pos - 1 );
                         if ( pos == -1 ) { // error
-                            kdWarning(7007) << "kioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl;
+                            kdWarning(7007) << "tdeioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl;
                             break;
                         }
                     }
@@ -2627,7 +2627,7 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
                 // Otherwise, we end up with e.g. dest=..../Desktop/ itself.
                 // (This can happen when dropping a link to a webpage with no path)
                 if ( destFileName.isEmpty() )
-                    destFileName = KIO::encodeFileName( info.uSource.prettyURL() );
+                    destFileName = TDEIO::encodeFileName( info.uSource.prettyURL() );
 
                 //kdDebug(7007) << " adding destFileName=" << destFileName << endl;
                 info.uDest.addPath( destFileName );
@@ -2682,7 +2682,7 @@ void CopyJob::statCurrentSrc()
             info.permissions = -1;
             info.mtime = (time_t) -1;
             info.ctime = (time_t) -1;
-            info.size = (KIO::filesize_t)-1;
+            info.size = (TDEIO::filesize_t)-1;
             info.uSource = m_currentSrcURL;
             info.uDest = m_currentDest;
             // Append filename or dirname to destination URL, if allowed
@@ -2703,7 +2703,7 @@ void CopyJob::statCurrentSrc()
                     // Different protocols, we'll create a .desktop file
                     // We have to change the extension anyway, so while we're at it,
                     // name the file like the URL
-                    info.uDest.addPath( KIO::encodeFileName( m_currentSrcURL.prettyURL() )+".desktop" );
+                    info.uDest.addPath( TDEIO::encodeFileName( m_currentSrcURL.prettyURL() )+".desktop" );
                 }
             }
             files.append( info ); // Files and any symlinks
@@ -2750,8 +2750,8 @@ void CopyJob::statCurrentSrc()
         }
 
         // Stat the next src url
-        Job * job = KIO::stat( m_currentSrcURL, true, 2, false );
-        //kdDebug(7007) << "KIO::stat on " << m_currentSrcURL << endl;
+        Job * job = TDEIO::stat( m_currentSrcURL, true, 2, false );
+        //kdDebug(7007) << "TDEIO::stat on " << m_currentSrcURL << endl;
         state = STATE_STATING;
         addSubjob(job);
         m_currentDestURL=m_dest;
@@ -2790,7 +2790,7 @@ void CopyJob::startRenameJob( const KURL& slave_url )
     info.permissions = -1;
     info.mtime = (time_t) -1;
     info.ctime = (time_t) -1;
-    info.size = (KIO::filesize_t)-1;
+    info.size = (TDEIO::filesize_t)-1;
     info.uSource = m_currentSrcURL;
     info.uDest = dest;
     TQValueList<CopyInfo> files;
@@ -2811,10 +2811,10 @@ void CopyJob::startListing( const KURL & src )
     d->m_bURLDirty = true;
     ListJob * newjob = listRecursive( src, false );
     newjob->setUnrestricted(true);
-    connect(newjob, TQT_SIGNAL(entries( KIO::Job *,
-                                    const KIO::UDSEntryList& )),
-            TQT_SLOT( slotEntries( KIO::Job*,
-                               const KIO::UDSEntryList& )));
+    connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *,
+                                    const TDEIO::UDSEntryList& )),
+            TQT_SLOT( slotEntries( TDEIO::Job*,
+                               const TDEIO::UDSEntryList& )));
     addSubjob( newjob );
 }
 
@@ -2888,9 +2888,9 @@ void CopyJob::slotResultCreatingDirs( Job * job )
 
                     // We need to stat the existing dir, to get its last-modification time
                     KURL existingDest( (*it).uDest );
-                    SimpleJob * newJob = KIO::stat( existingDest, false, 2, false );
+                    SimpleJob * newJob = TDEIO::stat( existingDest, false, 2, false );
                     Scheduler::scheduleJob(newJob);
-                    kdDebug(7007) << "KIO::stat for resolving conflict on " << existingDest << endl;
+                    kdDebug(7007) << "TDEIO::stat for resolving conflict on " << existingDest << endl;
                     state = STATE_CONFLICT_CREATING_DIRS;
                     addSubjob(newJob);
                     return; // Don't move to next dir yet !
@@ -2919,7 +2919,7 @@ void CopyJob::slotResultCreatingDirs( Job * job )
     createNextDir();
 }
 
-void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job )
+void CopyJob::slotResultConflictCreatingDirs( TDEIO::Job * job )
 {
     // We come here after a conflict has been detected and we've stated the existing dir
 
@@ -2928,11 +2928,11 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job )
     // Its modification time:
     time_t destmtime = (time_t)-1;
     time_t destctime = (time_t)-1;
-    KIO::filesize_t destsize = 0;
+    TDEIO::filesize_t destsize = 0;
     TQString linkDest;
 
-    UDSEntry entry = ((KIO::StatJob*)job)->statResult();
-    KIO::UDSEntry::ConstIterator it2 = entry.begin();
+    UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+    TDEIO::UDSEntry::ConstIterator it2 = entry.begin();
     for( ; it2 != entry.end(); it2++ ) {
         switch ((*it2).m_uds) {
             case UDS_MODIFICATION_TIME:
@@ -3082,7 +3082,7 @@ void CopyJob::createNextDir()
     {
         // Create the directory - with default permissions so that we can put files into it
         // TODO : change permissions once all is finished; but for stuff coming from CDROM it sucks...
-        KIO::SimpleJob *newjob = KIO::mkdir( udir, -1 );
+        TDEIO::SimpleJob *newjob = TDEIO::mkdir( udir, -1 );
         Scheduler::scheduleJob(newjob);
 
         m_currentDestURL = udir;
@@ -3132,16 +3132,16 @@ void CopyJob::slotResultCopyingFiles( Job * job )
                 assert ( subjobs.isEmpty() );
                 // We need to stat the existing file, to get its last-modification time
                 KURL existingFile( (*it).uDest );
-                SimpleJob * newJob = KIO::stat( existingFile, false, 2, false );
+                SimpleJob * newJob = TDEIO::stat( existingFile, false, 2, false );
                 Scheduler::scheduleJob(newJob);
-                kdDebug(7007) << "KIO::stat for resolving conflict on " << existingFile << endl;
+                kdDebug(7007) << "TDEIO::stat for resolving conflict on " << existingFile << endl;
                 state = STATE_CONFLICT_COPYING_FILES;
                 addSubjob(newJob);
                 return; // Don't move to next file yet !
             }
             else
             {
-                if ( m_bCurrentOperationIsLink && ::tqqt_cast<KIO::DeleteJob*>( job ) )
+                if ( m_bCurrentOperationIsLink && ::tqqt_cast<TDEIO::DeleteJob*>( job ) )
                 {
                     // Very special case, see a few lines below
                     // We are deleting the source of a symlink we successfully moved... ignore error
@@ -3158,14 +3158,14 @@ void CopyJob::slotResultCopyingFiles( Job * job )
     {
         // Special case for moving links. That operation needs two jobs, unlike others.
         if ( m_bCurrentOperationIsLink && m_mode == Move
-             && !::tqqt_cast<KIO::DeleteJob *>( job ) // Deleting source not already done
+             && !::tqqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done
              )
         {
             subjobs.remove( job );
             assert ( subjobs.isEmpty() );
             // The only problem with this trick is that the error handling for this del operation
             // is not going to be right... see 'Very special case' above.
-            KIO::Job * newjob = KIO::del( (*it).uSource, false /*don't shred*/, false /*no GUI*/ );
+            TDEIO::Job * newjob = TDEIO::del( (*it).uSource, false /*don't shred*/, false /*no GUI*/ );
             addSubjob( newjob );
             return; // Don't move to next file yet !
         }
@@ -3195,7 +3195,7 @@ void CopyJob::slotResultCopyingFiles( Job * job )
     copyNextFile();
 }
 
-void CopyJob::slotResultConflictCopyingFiles( KIO::Job * job )
+void CopyJob::slotResultConflictCopyingFiles( TDEIO::Job * job )
 {
     // We come here after a conflict has been detected and we've stated the existing file
     // The file we were trying to create:
@@ -3214,10 +3214,10 @@ void CopyJob::slotResultConflictCopyingFiles( KIO::Job * job )
         // Its modification time:
         time_t destmtime = (time_t)-1;
         time_t destctime = (time_t)-1;
-        KIO::filesize_t destsize = 0;
+        TDEIO::filesize_t destsize = 0;
         TQString linkDest;
-        UDSEntry entry = ((KIO::StatJob*)job)->statResult();
-        KIO::UDSEntry::ConstIterator it2 = entry.begin();
+        UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+        TDEIO::UDSEntry::ConstIterator it2 = entry.begin();
         for( ; it2 != entry.end(); it2++ ) {
             switch ((*it2).m_uds) {
                 case UDS_MODIFICATION_TIME:
@@ -3364,7 +3364,7 @@ void CopyJob::copyNextFile()
             bOverwrite = shouldOverwrite( destFile );
 
         m_bCurrentOperationIsLink = false;
-        KIO::Job * newjob = 0L;
+        TDEIO::Job * newjob = 0L;
         if ( m_mode == Link )
         {
             //kdDebug(7007) << "Linking" << endl;
@@ -3376,7 +3376,7 @@ void CopyJob::copyNextFile()
                 ((*it).uSource.pass() == (*it).uDest.pass()) )
             {
                 // This is the case of creating a real symlink
-                KIO::SimpleJob *newJob = KIO::symlink( (*it).uSource.path(), (*it).uDest, bOverwrite, false /*no GUI*/ );
+                TDEIO::SimpleJob *newJob = TDEIO::symlink( (*it).uSource.path(), (*it).uDest, bOverwrite, false /*no GUI*/ );
                 newjob = newJob;
                 Scheduler::scheduleJob(newJob);
                 //kdDebug(7007) << "CopyJob::copyNextFile : Linking target=" << (*it).uSource.path() << " link=" << (*it).uDest << endl;
@@ -3476,7 +3476,7 @@ void CopyJob::copyNextFile()
                   ((*it).uSource.pass() == (*it).uDest.pass()))
             // Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link),
         {
-            KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, (*it).uDest, bOverwrite, false /*no GUI*/ );
+            TDEIO::SimpleJob *newJob = TDEIO::symlink( (*it).linkDest, (*it).uDest, bOverwrite, false /*no GUI*/ );
             Scheduler::scheduleJob(newJob);
             newjob = newJob;
             //kdDebug(7007) << "CopyJob::copyNextFile : Linking target=" << (*it).linkDest << " link=" << (*it).uDest << endl;
@@ -3489,7 +3489,7 @@ void CopyJob::copyNextFile()
             // NOTE: if we are moving stuff, the deletion of the source will be done in slotResultCopyingFiles
         } else if (m_mode == Move) // Moving a file
         {
-            KIO::FileCopyJob * moveJob = KIO::file_move( (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ );
+            TDEIO::FileCopyJob * moveJob = TDEIO::file_move( (*it).uSource, (*it).uDest, (*it).permissions, bOverwrite, false, false/*no GUI*/ );
             moveJob->setSourceSize64( (*it).size );
             newjob = moveJob;
             //kdDebug(7007) << "CopyJob::copyNextFile : Moving " << (*it).uSource << " to " << (*it).uDest << endl;
@@ -3507,7 +3507,7 @@ void CopyJob::copyNextFile()
             int permissions = (*it).permissions;
             if ( d->m_defaultPermissions || ( remoteSource && (*it).uDest.isLocalFile() ) )
                 permissions = -1;
-            KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ );
+            TDEIO::FileCopyJob * copyJob = TDEIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ );
             copyJob->setParentJob( this ); // in case of rename dialog
             copyJob->setSourceSize64( (*it).size );
             copyJob->setModificationTime( (*it).mtime );
@@ -3518,10 +3518,10 @@ void CopyJob::copyNextFile()
             d->m_bURLDirty = true;
         }
         addSubjob(newjob);
-        connect( newjob, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-                 this, TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-        connect( newjob, TQT_SIGNAL( totalSize( KIO::Job*, KIO::filesize_t ) ),
-                 this, TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) );
+        connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
     }
     else
     {
@@ -3539,7 +3539,7 @@ void CopyJob::deleteNextDir()
         d->m_bURLDirty = true;
         // Take first dir to delete out of list - last ones first !
         KURL::List::Iterator it = dirsToRemove.fromLast();
-        SimpleJob *job = KIO::rmdir( *it );
+        SimpleJob *job = TDEIO::rmdir( *it );
         Scheduler::scheduleJob(job);
         dirsToRemove.remove(it);
         addSubjob( job );
@@ -3604,7 +3604,7 @@ void CopyJob::setNextDirAttribute()
     }
 }
 
-void CopyJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
+void CopyJob::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size )
 {
   //kdDebug(7007) << "CopyJob::slotProcessedSize " << data_size << endl;
   m_fileProcessedSize = data_size;
@@ -3621,7 +3621,7 @@ void CopyJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
   emitPercent( m_processedSize + m_fileProcessedSize, m_totalSize );
 }
 
-void CopyJob::slotTotalSize( KIO::Job*, KIO::filesize_t size )
+void CopyJob::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size )
 {
   //kdDebug(7007) << "slotTotalSize: " << size << endl;
   // Special case for copying a single file
@@ -3753,8 +3753,8 @@ void CopyJob::slotResultRenaming( Job* job )
                 // we lack mtime info for both the src (not stated)
                 // and the dest (stated but this info wasn't stored)
                 // Let's do it for local files, at least
-                KIO::filesize_t sizeSrc = (KIO::filesize_t) -1;
-                KIO::filesize_t sizeDest = (KIO::filesize_t) -1;
+                TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1;
+                TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1;
                 time_t ctimeSrc = (time_t) -1;
                 time_t ctimeDest = (time_t) -1;
                 time_t mtimeSrc = (time_t) -1;
@@ -3799,7 +3799,7 @@ void CopyJob::slotResultRenaming( Job* job )
                     // Set m_dest to the chosen destination
                     // This is only for this src url; the next one will revert to d->m_globalDest
                     m_dest.setPath( newPath );
-                    KIO::Job* job = KIO::stat( m_dest, false, 2, false );
+                    TDEIO::Job* job = TDEIO::stat( m_dest, false, 2, false );
                     state = STATE_STATING;
                     destinationState = DEST_NOT_STATED;
                     addSubjob(job);
@@ -3829,7 +3829,7 @@ void CopyJob::slotResultRenaming( Job* job )
                     break;
                 }
             }
-        } else if ( err != KIO::ERR_UNSUPPORTED_ACTION ) {
+        } else if ( err != TDEIO::ERR_UNSUPPORTED_ACTION ) {
             kdDebug(7007) << "Couldn't rename " << m_currentSrcURL << " to " << dest << ", aborting" << endl;
             m_error = err;
             m_errorText = errText;
@@ -3837,8 +3837,8 @@ void CopyJob::slotResultRenaming( Job* job )
             return;
         }
         kdDebug(7007) << "Couldn't rename " << m_currentSrcURL << " to " << dest << ", reverting to normal way, starting with stat" << endl;
-        //kdDebug(7007) << "KIO::stat on " << m_currentSrcURL << endl;
-        KIO::Job* job = KIO::stat( m_currentSrcURL, true, 2, false );
+        //kdDebug(7007) << "TDEIO::stat on " << m_currentSrcURL << endl;
+        TDEIO::Job* job = TDEIO::stat( m_currentSrcURL, true, 2, false );
         state = STATE_STATING;
         addSubjob(job);
         m_bOnlyRenames = false;
@@ -3906,40 +3906,40 @@ void CopyJob::slotResult( Job *job )
     }
 }
 
-void KIO::CopyJob::setDefaultPermissions( bool b )
+void TDEIO::CopyJob::setDefaultPermissions( bool b )
 {
     d->m_defaultPermissions = b;
 }
 
 // KDE4: remove
-void KIO::CopyJob::setInteractive( bool b )
+void TDEIO::CopyJob::setInteractive( bool b )
 {
     Job::setInteractive( b );
 }
 
-CopyJob *KIO::copy(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copy(const KURL& src, const KURL& dest, bool showProgressInfo )
 {
-    //kdDebug(7007) << "KIO::copy src=" << src << " dest=" << dest << endl;
+    //kdDebug(7007) << "TDEIO::copy src=" << src << " dest=" << dest << endl;
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, dest, CopyJob::Copy, false, showProgressInfo );
 }
 
-CopyJob *KIO::copyAs(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copyAs(const KURL& src, const KURL& dest, bool showProgressInfo )
 {
-    //kdDebug(7007) << "KIO::copyAs src=" << src << " dest=" << dest << endl;
+    //kdDebug(7007) << "TDEIO::copyAs src=" << src << " dest=" << dest << endl;
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, dest, CopyJob::Copy, true, showProgressInfo );
 }
 
-CopyJob *KIO::copy( const KURL::List& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::copy( const KURL::List& src, const KURL& dest, bool showProgressInfo )
 {
     //kdDebug(7007) << src << " " << dest << endl;
     return new CopyJob( src, dest, CopyJob::Copy, false, showProgressInfo );
 }
 
-CopyJob *KIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
 {
     //kdDebug(7007) << src << " " << dest << endl;
     KURL::List srcList;
@@ -3947,7 +3947,7 @@ CopyJob *KIO::move(const KURL& src, const KURL& dest, bool showProgressInfo )
     return new CopyJob( srcList, dest, CopyJob::Move, false, showProgressInfo );
 }
 
-CopyJob *KIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
 {
     //kdDebug(7007) << src << " " << dest << endl;
     KURL::List srcList;
@@ -3955,39 +3955,39 @@ CopyJob *KIO::moveAs(const KURL& src, const KURL& dest, bool showProgressInfo )
     return new CopyJob( srcList, dest, CopyJob::Move, true, showProgressInfo );
 }
 
-CopyJob *KIO::move( const KURL::List& src, const KURL& dest, bool showProgressInfo )
+CopyJob *TDEIO::move( const KURL::List& src, const KURL& dest, bool showProgressInfo )
 {
     //kdDebug(7007) << src << " " << dest << endl;
     return new CopyJob( src, dest, CopyJob::Move, false, showProgressInfo );
 }
 
-CopyJob *KIO::link(const KURL& src, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::link(const KURL& src, const KURL& destDir, bool showProgressInfo )
 {
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
 }
 
-CopyJob *KIO::link(const KURL::List& srcList, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::link(const KURL::List& srcList, const KURL& destDir, bool showProgressInfo )
 {
     return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
 }
 
-CopyJob *KIO::linkAs(const KURL& src, const KURL& destDir, bool showProgressInfo )
+CopyJob *TDEIO::linkAs(const KURL& src, const KURL& destDir, bool showProgressInfo )
 {
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, destDir, CopyJob::Link, false, showProgressInfo );
 }
 
-CopyJob *KIO::trash(const KURL& src, bool showProgressInfo )
+CopyJob *TDEIO::trash(const KURL& src, bool showProgressInfo )
 {
     KURL::List srcList;
     srcList.append( src );
     return new CopyJob( srcList, KURL( "trash:/" ), CopyJob::Move, false, showProgressInfo );
 }
 
-CopyJob *KIO::trash(const KURL::List& srcList, bool showProgressInfo )
+CopyJob *TDEIO::trash(const KURL::List& srcList, bool showProgressInfo )
 {
     return new CopyJob( srcList, KURL( "trash:/" ), CopyJob::Move, false, showProgressInfo );
 }
@@ -4001,21 +4001,21 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn
 {
   if ( showProgressInfo ) {
 
-     connect( this, TQT_SIGNAL( totalFiles( KIO::Job*, unsigned long ) ),
-              Observer::self(), TQT_SLOT( slotTotalFiles( KIO::Job*, unsigned long ) ) );
+     connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+              Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
 
-     connect( this, TQT_SIGNAL( totalDirs( KIO::Job*, unsigned long ) ),
-              Observer::self(), TQT_SLOT( slotTotalDirs( KIO::Job*, unsigned long ) ) );
+     connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+              Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
 
      // See slotReport
-     /*connect( this, TQT_SIGNAL( processedFiles( KIO::Job*, unsigned long ) ),
-      m_observer, TQT_SLOT( slotProcessedFiles( KIO::Job*, unsigned long ) ) );
+     /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+      m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
 
-      connect( this, TQT_SIGNAL( processedDirs( KIO::Job*, unsigned long ) ),
-      m_observer, TQT_SLOT( slotProcessedDirs( KIO::Job*, unsigned long ) ) );
+      connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+      m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
 
-      connect( this, TQT_SIGNAL( deleting( KIO::Job*, const KURL& ) ),
-      m_observer, TQT_SLOT( slotDeleting( KIO::Job*, const KURL& ) ) );*/
+      connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
+      m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/
 
      m_reportTimer=new TQTimer(this);
      connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport()));
@@ -4065,7 +4065,7 @@ void DeleteJob::slotReport()
 }
 
 
-void DeleteJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
+void DeleteJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
 {
    UDSEntryListConstIterator it = list.begin();
    UDSEntryListConstIterator end = list.end();
@@ -4098,7 +4098,7 @@ void DeleteJob::slotEntries(KIO::Job* job, const UDSEntryList& list)
             atomsFound++;
             break;
          case UDS_SIZE:
-            m_totalSize += (KIO::filesize_t)((*it2).m_long);
+            m_totalSize += (TDEIO::filesize_t)((*it2).m_long);
             atomsFound++;
             break;
          default:
@@ -4144,9 +4144,9 @@ void DeleteJob::statNextSrc()
         }
         // Stat it
         state = STATE_STATING;
-        KIO::SimpleJob * job = KIO::stat( m_currentURL, true, 1, false );
+        TDEIO::SimpleJob * job = TDEIO::stat( m_currentURL, true, 1, false );
         Scheduler::scheduleJob(job);
-        //kdDebug(7007) << "KIO::stat (DeleteJob) " << m_currentURL << endl;
+        //kdDebug(7007) << "TDEIO::stat (DeleteJob) " << m_currentURL << endl;
         addSubjob(job);
         //if ( m_progressId ) // Did we get an ID from the observer ?
         //  Observer::self()->slotDeleting( this, *it ); // show asap
@@ -4192,7 +4192,7 @@ void DeleteJob::deleteNextFile()
                 }
             } else
             { // if remote - or if unlink() failed (we'll use the job's error handling in that case)
-                job = KIO::file_delete( *it, false /*no GUI*/);
+                job = TDEIO::file_delete( *it, false /*no GUI*/);
                 Scheduler::scheduleJob(job);
                 m_currentURL=(*it);
             }
@@ -4231,9 +4231,9 @@ void DeleteJob::deleteNextDir()
                 if ( KProtocolInfo::canDeleteRecursive( *it ) ) {
                     // If the ioslave supports recursive deletion of a directory, then
                     // we only need to send a single CMD_DEL command, so we use file_delete :)
-                    job = KIO::file_delete( *it, false /*no gui*/ );
+                    job = TDEIO::file_delete( *it, false /*no gui*/ );
                 } else {
-                    job = KIO::rmdir( *it );
+                    job = TDEIO::rmdir( *it );
                 }
                 Scheduler::scheduleJob(job);
                 dirs.remove(it);
@@ -4260,7 +4260,7 @@ void DeleteJob::deleteNextDir()
     emitResult();
 }
 
-void DeleteJob::slotProcessedSize( KIO::Job*, KIO::filesize_t data_size )
+void DeleteJob::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size )
 {
    // Note: this is the same implementation as CopyJob::slotProcessedSize but
    // it's different from FileCopyJob::slotProcessedSize - which is why this
@@ -4307,7 +4307,7 @@ void DeleteJob::slotResult( Job *job )
          UDSEntry entry = ((StatJob*)job)->statResult();
          bool bDir = false;
          bool bLink = false;
-         KIO::filesize_t size = (KIO::filesize_t)-1;
+         TDEIO::filesize_t size = (TDEIO::filesize_t)-1;
          UDSEntry::ConstIterator it2 = entry.begin();
          int atomsFound(0);
          for( ; it2 != entry.end(); it2++ )
@@ -4349,10 +4349,10 @@ void DeleteJob::slotResult( Job *job )
                 ListJob *newjob = listRecursive( url, false );
                 newjob->setUnrestricted(true); // No KIOSK restrictions
                 Scheduler::scheduleJob(newjob);
-                connect(newjob, TQT_SIGNAL(entries( KIO::Job *,
-                                                const KIO::UDSEntryList& )),
-                        TQT_SLOT( slotEntries( KIO::Job*,
-                                           const KIO::UDSEntryList& )));
+                connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *,
+                                                const TDEIO::UDSEntryList& )),
+                        TQT_SLOT( slotEntries( TDEIO::Job*,
+                                           const TDEIO::UDSEntryList& )));
                 addSubjob(newjob);
             } else {
                 ++m_currentStat;
@@ -4417,7 +4417,7 @@ void DeleteJob::slotResult( Job *job )
    }
 }
 
-DeleteJob *KIO::del( const KURL& src, bool shred, bool showProgressInfo )
+DeleteJob *TDEIO::del( const KURL& src, bool shred, bool showProgressInfo )
 {
   KURL::List srcList;
   srcList.append( src );
@@ -4425,7 +4425,7 @@ DeleteJob *KIO::del( const KURL& src, bool shred, bool showProgressInfo )
   return job;
 }
 
-DeleteJob *KIO::del( const KURL::List& src, bool shred, bool showProgressInfo )
+DeleteJob *TDEIO::del( const KURL::List& src, bool shred, bool showProgressInfo )
 {
   DeleteJob *job = new DeleteJob( src, shred, showProgressInfo );
   return job;
@@ -4599,7 +4599,7 @@ void MultiGetJob::slotMimetype( const TQString &_mimetype )
   emit mimetype(m_currentEntry->id, _mimetype);
 }
 
-MultiGetJob *KIO::multi_get(long id, const KURL &url, const MetaData &metaData)
+MultiGetJob *TDEIO::multi_get(long id, const KURL &url, const MetaData &metaData)
 {
     MultiGetJob * job = new MultiGetJob( url, false );
     job->get(id, url, metaData);
@@ -4778,7 +4778,7 @@ void Job::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void SimpleJob::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
 
 void MkdirJob::virtual_hook( int id, void* data )
 { SimpleJob::virtual_hook( id, data ); }
diff --git a/kio/kio/job.h b/tdeio/tdeio/job.h
index fed6f82ab..79a21aeec 100644
--- a/kio/kio/job.h
+++ b/tdeio/tdeio/job.h
@@ -19,12 +19,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_job_h__
-#define __kio_job_h__
+#ifndef __tdeio_job_h__
+#define __tdeio_job_h__
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
-namespace KIO {
+namespace TDEIO {
 
 
     /**
@@ -38,7 +38,7 @@ namespace KIO {
      *                    directory (unix-style), -1 for default permissions.
      * @return A pointer to the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * mkdir( const KURL& url, int permissions = -1 );
+    TDEIO_EXPORT SimpleJob * mkdir( const KURL& url, int permissions = -1 );
 
     /**
      * Removes a single directory.
@@ -50,7 +50,7 @@ namespace KIO {
      * @param url The URL of the directory to remove.
      * @return A pointer to the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * rmdir( const KURL& url );
+    TDEIO_EXPORT SimpleJob * rmdir( const KURL& url );
 
     /**
      * Changes permissions on a file or directory.
@@ -61,7 +61,7 @@ namespace KIO {
      * @param permissions The permissions to set.
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * chmod( const KURL& url, int permissions );
+    TDEIO_EXPORT SimpleJob * chmod( const KURL& url, int permissions );
 
     /**
      * Rename a file or directory.
@@ -74,25 +74,25 @@ namespace KIO {
      * @param overwrite whether to automatically overwrite if the dest exists
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * rename( const KURL& src, const KURL & dest, bool overwrite );
+    TDEIO_EXPORT SimpleJob * rename( const KURL& src, const KURL & dest, bool overwrite );
 
     /**
      * Create or move a symlink.
      * This is the lowlevel operation, similar to file_copy and file_move.
      * It doesn't do any check (other than those the slave does)
-     * and it doesn't show rename and skip dialogs - use KIO::link for that.
+     * and it doesn't show rename and skip dialogs - use TDEIO::link for that.
      * @param target The string that will become the "target" of the link (can be relative)
      * @param dest The symlink to create.
      * @param overwrite whether to automatically overwrite if the dest exists
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * symlink( const TQString & target, const KURL& dest, bool overwrite, bool showProgressInfo = true );
+    TDEIO_EXPORT SimpleJob * symlink( const TQString & target, const KURL& dest, bool overwrite, bool showProgressInfo = true );
 
     /**
      * Execute any command that is specific to one slave (protocol).
      *
-     * Examples are : HTTP POST, mount and unmount (kio_file)
+     * Examples are : HTTP POST, mount and unmount (tdeio_file)
      *
      * @param url The URL isn't passed to the slave, but is used to know
      *        which slave to send it to :-)
@@ -101,12 +101,12 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob * special( const KURL& url, const TQByteArray & data, bool showProgressInfo = true );
+    TDEIO_EXPORT SimpleJob * special( const KURL& url, const TQByteArray & data, bool showProgressInfo = true );
 
     /**
      * Mount filesystem.
      *
-     * Special job for @p kio_file.
+     * Special job for @p tdeio_file.
      *
      * @param ro Mount read-only if @p true.
      * @param fstype File system type (e.g. "ext2", can be 0L).
@@ -115,18 +115,18 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo = true );
+    TDEIO_EXPORT SimpleJob *mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo = true );
 
     /**
      * Unmount filesystem.
      *
-     * Special job for @p kio_file.
+     * Special job for @p tdeio_file.
      *
      * @param point Point to unmount.
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *unmount( const TQString & point, bool showProgressInfo = true );
+    TDEIO_EXPORT SimpleJob *unmount( const TQString & point, bool showProgressInfo = true );
 
     /**
      * Retrieve local URL if available
@@ -134,7 +134,7 @@ namespace KIO {
      * @param remoteURL the remote URL to get the local URL for
      * @return the job handling the operation.
      */
-    KIO_EXPORT LocalURLJob *localURL( const KURL& remoteUrl );
+    TDEIO_EXPORT LocalURLJob *localURL( const KURL& remoteUrl );
 
     /**
      * HTTP cache update
@@ -145,7 +145,7 @@ namespace KIO {
      * supposed to expire.
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *http_update_cache( const KURL& url, bool no_cache, time_t expireDate);
+    TDEIO_EXPORT SimpleJob *http_update_cache( const KURL& url, bool no_cache, time_t expireDate);
 
     /**
      * Find all details for one file or directory.
@@ -154,7 +154,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT StatJob * stat( const KURL& url, bool showProgressInfo = true );
+    TDEIO_EXPORT StatJob * stat( const KURL& url, bool showProgressInfo = true );
     /**
      * Find all details for one file or directory.
      * This version of the call includes two additional booleans, @p sideIsSource and @p details.
@@ -162,7 +162,7 @@ namespace KIO {
      * @param url the URL of the file
      * @param sideIsSource is true when stating a source file (we will do a get on it if
      * the stat works) and false when stating a destination file (target of a copy).
-     * The reason for this parameter is that in some cases the kioslave might not
+     * The reason for this parameter is that in some cases the tdeioslave might not
      * be able to determine a file's existence (e.g. HTTP doesn't allow it, FTP
      * has issues with case-sensitivity on some systems).
      * When the slave can't reliably determine the existence of a file, it will:
@@ -182,7 +182,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT StatJob * stat( const KURL& url, bool sideIsSource, short int details, bool showProgressInfo = true );
+    TDEIO_EXPORT StatJob * stat( const KURL& url, bool sideIsSource, short int details, bool showProgressInfo = true );
 
     /**
      * Get (a.k.a. read).
@@ -193,7 +193,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT TransferJob *get( const KURL& url, bool reload=false, bool showProgressInfo = true );
+    TDEIO_EXPORT TransferJob *get( const KURL& url, bool reload=false, bool showProgressInfo = true );
 
     /**
      * Put (a.k.a. write)
@@ -207,7 +207,7 @@ namespace KIO {
      * @return the job handling the operation.
      * @see multi_get()
      */
-    KIO_EXPORT TransferJob *put( const KURL& url, int permissions,
+    TDEIO_EXPORT TransferJob *put( const KURL& url, int permissions,
                       bool overwrite, bool resume, bool showProgressInfo = true );
 
     /**
@@ -215,7 +215,7 @@ namespace KIO {
      *
      * Example:
      * \code
-     *    job = KIO::http_post( url, postData, false );
+     *    job = TDEIO::http_post( url, postData, false );
      *    job->addMetaData("content-type", contentType );
      *    job->addMetaData("referrer", referrerURL);
      * \endcode
@@ -238,7 +238,7 @@ namespace KIO {
      * @param showProgressInfo true to display
      * @return the job handling the operation.
      */
-    KIO_EXPORT TransferJob *http_post( const KURL& url, const TQByteArray &postData,
+    TDEIO_EXPORT TransferJob *http_post( const KURL& url, const TQByteArray &postData,
                             bool showProgressInfo = true );
 
     /**
@@ -251,7 +251,7 @@ namespace KIO {
      * @return the job handling the operation.
      * @since 3.3
      */
-    KIO_EXPORT StoredTransferJob *storedGet( const KURL& url, bool reload=false, bool showProgressInfo = true );
+    TDEIO_EXPORT StoredTransferJob *storedGet( const KURL& url, bool reload=false, bool showProgressInfo = true );
 
     /**
      * Put (a.k.a. write) data from a single TQByteArray.
@@ -267,7 +267,7 @@ namespace KIO {
      * @return the job handling the operation.
      * @since 3.3
      */
-    KIO_EXPORT StoredTransferJob *storedPut( const TQByteArray& arr, const KURL& url, int permissions,
+    TDEIO_EXPORT StoredTransferJob *storedPut( const TQByteArray& arr, const KURL& url, int permissions,
                                   bool overwrite, bool resume, bool showProgressInfo = true );
 
     /**
@@ -280,7 +280,7 @@ namespace KIO {
      * @return the job handling the operation.
      * @see get()
      */
-    KIO_EXPORT MultiGetJob *multi_get( long id, const KURL &url, const MetaData &metaData);
+    TDEIO_EXPORT MultiGetJob *multi_get( long id, const KURL &url, const MetaData &metaData);
 
     /**
      * Find mimetype for one file or directory.
@@ -289,7 +289,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT MimetypeJob * mimetype( const KURL& url,
+    TDEIO_EXPORT MimetypeJob * mimetype( const KURL& url,
                             bool showProgressInfo = true );
 
     /**
@@ -308,7 +308,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT FileCopyJob *file_copy( const KURL& src, const KURL& dest, int permissions=-1,
+    TDEIO_EXPORT FileCopyJob *file_copy( const KURL& src, const KURL& dest, int permissions=-1,
                             bool overwrite=false, bool resume=false,
                             bool showProgressInfo = true);
 
@@ -327,7 +327,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT FileCopyJob *file_move( const KURL& src, const KURL& dest, int permissions=-1,
+    TDEIO_EXPORT FileCopyJob *file_move( const KURL& src, const KURL& dest, int permissions=-1,
                             bool overwrite=false, bool resume=false,
                             bool showProgressInfo = true);
 
@@ -338,7 +338,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation.
      */
-    KIO_EXPORT SimpleJob *file_delete( const KURL& src, bool showProgressInfo = true);
+    TDEIO_EXPORT SimpleJob *file_delete( const KURL& src, bool showProgressInfo = true);
 
     /**
      * List the contents of @p url, which is assumed to be a directory.
@@ -352,7 +352,7 @@ namespace KIO {
      *                      files/dirs (whose names start with dot)
      * @return the job handling the operation.
      */
-    KIO_EXPORT ListJob *listDir( const KURL& url, bool showProgressInfo = true,
+    TDEIO_EXPORT ListJob *listDir( const KURL& url, bool showProgressInfo = true,
                       bool includeHidden = true );
 
     /**
@@ -368,7 +368,7 @@ namespace KIO {
      *                      files/dirs (whose names start with dot)
      * @return the job handling the operation.
      */
-    KIO_EXPORT ListJob *listRecursive( const KURL& url, bool showProgressInfo = true,
+    TDEIO_EXPORT ListJob *listRecursive( const KURL& url, bool showProgressInfo = true,
                             bool includeHidden = true );
 
     /**
@@ -384,7 +384,7 @@ namespace KIO {
      * @return the job handling the operation
      * @see copyAs()
      */
-    KIO_EXPORT CopyJob *copy( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *copy( const KURL& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Copy a file or directory @p src into the destination @p dest,
@@ -399,7 +399,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT CopyJob *copyAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *copyAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Copy a list of file/dirs @p src into a destination directory @p dest.
@@ -409,7 +409,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT CopyJob *copy( const KURL::List& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *copy( const KURL::List& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Moves a file or directory @p src to the given destination @p dest.
@@ -421,7 +421,7 @@ namespace KIO {
      * @see copy()
      * @see moveAs()
      */
-    KIO_EXPORT CopyJob *move( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *move( const KURL& src, const KURL& dest, bool showProgressInfo = true );
     /**
      * Moves a file or directory @p src to the given destination @p dest. Unlike move()
      * this operation will fail when the directory already exists.
@@ -432,7 +432,7 @@ namespace KIO {
      * @return the job handling the operation
      * @see copyAs()
      */
-    KIO_EXPORT CopyJob *moveAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *moveAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
     /**
      * Moves a list of files or directories @p src to the given destination @p dest.
      *
@@ -442,7 +442,7 @@ namespace KIO {
      * @return the job handling the operation
      * @see copy()
      */
-    KIO_EXPORT CopyJob *move( const KURL::List& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *move( const KURL::List& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Create a link.
@@ -454,7 +454,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT CopyJob *link( const KURL& src, const KURL& destDir, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *link( const KURL& src, const KURL& destDir, bool showProgressInfo = true );
 
     /**
      * Create several links
@@ -467,7 +467,7 @@ namespace KIO {
      * @return the job handling the operation
      * @see link()
      */
-    KIO_EXPORT CopyJob *link( const KURL::List& src, const KURL& destDir, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *link( const KURL::List& src, const KURL& destDir, bool showProgressInfo = true );
 
     /**
      * Create a link. Unlike link() this operation will fail when the directory already
@@ -482,7 +482,7 @@ namespace KIO {
      * @see link ()
      * @see copyAs()
      */
-    KIO_EXPORT CopyJob *linkAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *linkAs( const KURL& src, const KURL& dest, bool showProgressInfo = true );
 
     /**
      * Trash a file or directory.
@@ -494,7 +494,7 @@ namespace KIO {
      * @return the job handling the operation
      * @since 3.4
      */
-    KIO_EXPORT CopyJob *trash( const KURL& src, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *trash( const KURL& src, bool showProgressInfo = true );
 
     /**
      * Trash a list of files or directories.
@@ -505,7 +505,7 @@ namespace KIO {
      * @return the job handling the operation
      * @since 3.4
      */
-    KIO_EXPORT CopyJob *trash( const KURL::List& src, bool showProgressInfo = true );
+    TDEIO_EXPORT CopyJob *trash( const KURL::List& src, bool showProgressInfo = true );
 
     /**
      * Delete a file or directory.
@@ -515,7 +515,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT DeleteJob *del( const KURL& src, bool shred = false, bool showProgressInfo = true );
+    TDEIO_EXPORT DeleteJob *del( const KURL& src, bool shred = false, bool showProgressInfo = true );
 
     /**
      * Deletes a list of files or directories.
@@ -525,7 +525,7 @@ namespace KIO {
      * @param showProgressInfo true to show progress information
      * @return the job handling the operation
      */
-    KIO_EXPORT DeleteJob *del( const KURL::List& src, bool shred = false, bool showProgressInfo = true );
+    TDEIO_EXPORT DeleteJob *del( const KURL::List& src, bool shred = false, bool showProgressInfo = true );
 }
 
 #endif
diff --git a/kio/kio/jobclasses.h b/tdeio/tdeio/jobclasses.h
index d937e8700..cae22e8c5 100644
--- a/kio/kio/jobclasses.h
+++ b/tdeio/tdeio/jobclasses.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_jobclasses_h__
-#define __kio_jobclasses_h__
+#ifndef __tdeio_jobclasses_h__
+#define __tdeio_jobclasses_h__
 
 #include <tqobject.h>
 #include <tqptrlist.h>
@@ -32,14 +32,14 @@
 #include <sys/stat.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class Observer;
 class TQTimer;
 
-#define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by kio_trash.
+#define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by tdeio_trash.
 
-namespace KIO {
+namespace TDEIO {
 
     class Slave;
     class SlaveInterface;
@@ -50,9 +50,9 @@ namespace KIO {
      * For all jobs created in an application, the code looks like
      *
      * \code
-     *   KIO::Job * job = KIO::someoperation( some parameters );
-     *   connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-     *            this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+     *   TDEIO::Job * job = TDEIO::someoperation( some parameters );
+     *   connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+     *            this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
      * \endcode
      *   (other connects, specific to the job)
      *
@@ -62,10 +62,10 @@ namespace KIO {
      *  if ( job->error() )
      *      job->showErrorDialog( this or 0L  );
      * \endcode
-     * @see KIO::Scheduler
-     * @see KIO::Slave
+     * @see TDEIO::Scheduler
+     * @see TDEIO::Slave
      */
-    class KIO_EXPORT Job : public TQObject {
+    class TDEIO_EXPORT Job : public TQObject {
         Q_OBJECT
 
     protected:
@@ -79,7 +79,7 @@ namespace KIO {
          * This kills all subjobs and deletes the job.
 	 *
          * @param quietly if false, Job will emit signal result
-         * and ask kio_uiserver to close the progress window.
+         * and ask tdeio_uiserver to close the progress window.
          * @p quietly is set to true for subjobs. Whether applications
          * should call with true or false depends on whether they rely
          * on result being emitted or not.
@@ -90,7 +90,7 @@ namespace KIO {
 	 * Returns the error code, if there has been an error.
          * Only call this method from the slot connected to result().
          * @return the error code for this job, 0 if no error.
-         * Error codes are defined in KIO::Error.
+         * Error codes are defined in TDEIO::Error.
          */
         int error() const { return m_error; }
 
@@ -230,7 +230,7 @@ namespace KIO {
 
         /**
          * Updates the last user action timestamp to the given time.
-         * See KApplication::updateUserTimestamp() .
+         * See TDEApplication::updateUserTimestamp() .
          * @since 3.5.6
          */
         void updateUserTimestamp( unsigned long time );
@@ -262,7 +262,7 @@ namespace KIO {
 	 * @see addMetaData()
 	 * @see mergeMetaData()
          */
-        void setMetaData( const KIO::MetaData &metaData);
+        void setMetaData( const TDEIO::MetaData &metaData);
 
         /**
          * Add key/value pair to the meta data that is sent to the slave.
@@ -317,7 +317,7 @@ namespace KIO {
          * @see processedSize
          * @since 3.2
          */
-        KIO::filesize_t getProcessedSize();
+        TDEIO::filesize_t getProcessedSize();
 
     signals:
         /**
@@ -325,7 +325,7 @@ namespace KIO {
          * failed...). Use error to know the result.
 	 * @param job the job that emitted this signal
          */
-        void result( KIO::Job *job );
+        void result( TDEIO::Job *job );
 
         /**
          * @deprecated. Don't use !
@@ -334,7 +334,7 @@ namespace KIO {
          * in this case, ERR_USER_CANCELED.
 	 * @param job the job that emitted this signal
          */
-        void canceled( KIO::Job *job );
+        void canceled( TDEIO::Job *job );
 
         /**
          * Emitted to display information about this job, as sent by the slave.
@@ -342,7 +342,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param msg the info message
          */
-        void infoMessage( KIO::Job *job, const TQString & msg );
+        void infoMessage( TDEIO::Job *job, const TQString & msg );
         // KDE4: Separate rich-text string from plain-text string, for different widgets.
 
         /**
@@ -351,7 +351,7 @@ namespace KIO {
          * @param msg the info message
          * @since 3.5
          */
-        void warning( KIO::Job *job, const TQString & msg );
+        void warning( TDEIO::Job *job, const TQString & msg );
         // KDE4: Separate rich-text string from plain-text string, for different widgets.
 
         /**
@@ -360,7 +360,7 @@ namespace KIO {
          * currently unused (in the applications).
 	 * @param job the job that emitted this signal
          */
-        void connected( KIO::Job *job );
+        void connected( TDEIO::Job *job );
 
         /**
          * Progress signal showing the overall progress of the job
@@ -370,7 +370,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param percent the percentage
          */
-        void percent( KIO::Job *job, unsigned long percent );
+        void percent( TDEIO::Job *job, unsigned long percent );
 
         /**
          * Emitted when we know the size of this job (data size for transfers,
@@ -378,7 +378,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param size the total size in bytes
          */
-        void totalSize( KIO::Job *job, KIO::filesize_t size );
+        void totalSize( TDEIO::Job *job, TDEIO::filesize_t size );
 
         /**
          * Regularly emitted to show the progress of this job
@@ -386,14 +386,14 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param size the processed size in bytes
          */
-        void processedSize( KIO::Job *job, KIO::filesize_t size );
+        void processedSize( TDEIO::Job *job, TDEIO::filesize_t size );
 
         /**
          * Emitted to display information about the speed of this job.
 	 * @param job the job that emitted this signal
 	 * @param speed the speed in bytes/s
          */
-        void speed( KIO::Job *job, unsigned long speed );
+        void speed( TDEIO::Job *job, unsigned long speed );
 
     protected slots:
         /**
@@ -404,7 +404,7 @@ namespace KIO {
 	 * @param job the subjob
 	 * @see result()
          */
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
         /**
          * Forward signal from subjob.
@@ -412,14 +412,14 @@ namespace KIO {
 	 * @param speed the speed in bytes/s
 	 * @see speed()
          */
-        void slotSpeed( KIO::Job *job, unsigned long speed );
+        void slotSpeed( TDEIO::Job *job, unsigned long speed );
         /**
          * Forward signal from subjob.
 	 * @param job the subjob
 	 * @param msg the info message
 	 * @see infoMessage()
          */
-        void slotInfoMessage( KIO::Job *job, const TQString &msg );
+        void slotInfoMessage( TDEIO::Job *job, const TQString &msg );
 
         /**
          * Remove speed information.
@@ -465,7 +465,7 @@ namespace KIO {
 	 * @param processedSize the processed size in bytes
 	 * @param totalSize the total size in bytes
          */
-        void emitPercent( KIO::filesize_t processedSize, KIO::filesize_t totalSize );
+        void emitPercent( TDEIO::filesize_t processedSize, TDEIO::filesize_t totalSize );
 
         /**
          * Utility function for inherited jobs.
@@ -485,7 +485,7 @@ namespace KIO {
          * Set the processed size, does not emit processedSize
          * @since 3.2
          */
-        void setProcessedSize(KIO::filesize_t size);
+        void setProcessedSize(TDEIO::filesize_t size);
 
         /**
          * @internal
@@ -525,7 +525,7 @@ namespace KIO {
      * Other jobs are high-level jobs (CopyJob, DeleteJob, FileCopyJob...)
      * that manage subjobs but aren't scheduled directly.
      */
-    class KIO_EXPORT SimpleJob : public KIO::Job {
+    class TDEIO_EXPORT SimpleJob : public TDEIO::Job {
     Q_OBJECT
 
     public:
@@ -553,7 +553,7 @@ namespace KIO {
          * This kills all subjobs and deletes the job.
          * @param quietly if true, Job will emit signal result
          * Should only be set to false when the user kills the job
-         * (from kio_uiserver), not when you want to abort a job.
+         * (from tdeio_uiserver), not when you want to abort a job.
          */
         virtual void kill( bool quietly = true );
 
@@ -598,7 +598,7 @@ namespace KIO {
          * Can also be called by the parent job, when it knows the size.
 	 * @param data_size the total size
          */
-        void slotTotalSize( KIO::filesize_t data_size );
+        void slotTotalSize( TDEIO::filesize_t data_size );
 
     protected slots:
         /**
@@ -631,7 +631,7 @@ namespace KIO {
 	 * @param data_size the processed size in bytes
 	 * @see processedSize()
          */
-        void slotProcessedSize( KIO::filesize_t data_size );
+        void slotProcessedSize( TDEIO::filesize_t data_size );
         /**
          * Forward signal from the slave.
 	 * @param speed the speed in bytes/s
@@ -644,7 +644,7 @@ namespace KIO {
 	 * @param _metaData the meta data
 	 * @see metaData()
          */
-        virtual void slotMetaData( const KIO::MetaData &_metaData);
+        virtual void slotMetaData( const TDEIO::MetaData &_metaData);
 
     public slots:
         /**
@@ -666,7 +666,7 @@ namespace KIO {
         KURL m_url;
         KURL m_subUrl;
         int m_command;
-        KIO::filesize_t m_totalSize;
+        TDEIO::filesize_t m_totalSize;
     protected:
 	virtual void virtual_hook( int id, void* data );
 	/*
@@ -683,15 +683,15 @@ namespace KIO {
 
     /**
      * A KIO job that retrieves information about a file or directory.
-     * @see KIO::stat()
+     * @see TDEIO::stat()
      */
-    class KIO_EXPORT StatJob : public SimpleJob {
+    class TDEIO_EXPORT StatJob : public SimpleJob {
 
     Q_OBJECT
 
     public:
         /**
-	 * Do not use this constructor to create a StatJob, use KIO::stat() instead.
+	 * Do not use this constructor to create a StatJob, use TDEIO::stat() instead.
 	 * @param url the url of the file or directory to check
 	 * @param command the command to issue
 	 * @param packedArgs the arguments
@@ -702,7 +702,7 @@ namespace KIO {
         /**
 	 * A stat() can have two meanings. Either we want to read from this URL,
          * or to check if we can write to it. First case is "source", second is "dest".
-         * It is necessary to know what the StatJob is for, to tune the kioslave's behavior
+         * It is necessary to know what the StatJob is for, to tune the tdeioslave's behavior
          * (e.g. with FTP).
 	 * @param source true for "source" mode, false for "dest" mode
          */
@@ -742,7 +742,7 @@ namespace KIO {
 	 * @param job the job that is redirected
 	 * @param url the new url
          */
-        void redirection( KIO::Job *job, const KURL &url );
+        void redirection( TDEIO::Job *job, const KURL &url );
 
         /**
          * Signals a permanent redirection.
@@ -752,13 +752,13 @@ namespace KIO {
 	 * @param toUrl the new URL
 	 * @since 3.1
          */
-        void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
+        void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
 
     protected slots:
-        void slotStatEntry( const KIO::UDSEntry & entry );
+        void slotStatEntry( const TDEIO::UDSEntry & entry );
         void slotRedirection( const KURL &url);
         virtual void slotFinished();
-        virtual void slotMetaData( const KIO::MetaData &_metaData);
+        virtual void slotMetaData( const TDEIO::MetaData &_metaData);
 
     protected:
         UDSEntry m_statResult;
@@ -774,16 +774,16 @@ namespace KIO {
 
     /**
      * A KIO job that creates a directory
-     * @see KIO::mkdir()
+     * @see TDEIO::mkdir()
      * @since 3.3
      */
-    class KIO_EXPORT MkdirJob : public SimpleJob {
+    class TDEIO_EXPORT MkdirJob : public SimpleJob {
 
     Q_OBJECT
 
     public:
         /**
-	 * Do not use this constructor to create a MkdirJob, use KIO::mkdir() instead.
+	 * Do not use this constructor to create a MkdirJob, use TDEIO::mkdir() instead.
 	 * @param url the url of the file or directory to check
 	 * @param command the command to issue
 	 * @param packedArgs the arguments
@@ -807,7 +807,7 @@ namespace KIO {
 	 * @param job the job that is redirected
 	 * @param url the new url
          */
-        void redirection( KIO::Job *job, const KURL &url );
+        void redirection( TDEIO::Job *job, const KURL &url );
 
         /**
          * Signals a permanent redirection.
@@ -816,7 +816,7 @@ namespace KIO {
 	 * @param fromUrl the original URL
 	 * @param toUrl the new URL
          */
-        void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
+        void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
 
     protected slots:
         void slotRedirection( const KURL &url);
@@ -836,12 +836,12 @@ namespace KIO {
      * @internal
      * Used for direct copy from or to the local filesystem (i.e. SlaveBase::copy())
      */
-    class KIO_EXPORT DirectCopyJob : public SimpleJob {
+    class TDEIO_EXPORT DirectCopyJob : public SimpleJob {
     Q_OBJECT
 
     public:
         /**
-         * Do not create a DirectCopyJob. Use KIO::copy() or KIO::file_copy() instead.
+         * Do not create a DirectCopyJob. Use TDEIO::copy() or TDEIO::file_copy() instead.
          */
         DirectCopyJob(const KURL& url, int command, const TQByteArray &packedArgs,
                       bool showProgressInfo);
@@ -859,10 +859,10 @@ namespace KIO {
          * Emitted if the job found an existing partial file
          * and supports resuming. Used by FileCopyJob.
          */
-        void canResume( KIO::Job *job, KIO::filesize_t offset );
+        void canResume( TDEIO::Job *job, TDEIO::filesize_t offset );
 
     private slots:
-        void slotCanResume( KIO::filesize_t offset );
+        void slotCanResume( TDEIO::filesize_t offset );
     };
 
 
@@ -872,12 +872,12 @@ namespace KIO {
      * If data coming from the slave can not be handled, the
      * reading of data from the slave should be suspended.
      */
-    class KIO_EXPORT TransferJob : public SimpleJob {
+    class TDEIO_EXPORT TransferJob : public SimpleJob {
     Q_OBJECT
 
     public:
        /**
-	* Do not create a TransferJob. Use KIO::get() or KIO::put()
+	* Do not create a TransferJob. Use TDEIO::get() or TDEIO::put()
 	* instead.
 	* @param url the url to get or put
 	* @param command the command to issue
@@ -902,7 +902,7 @@ namespace KIO {
          * Called when m_subJob finishes.
 	 * @param job the job that finished
          */
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
         /**
          * Flow control. Suspend data processing from the slave.
@@ -974,7 +974,7 @@ namespace KIO {
          * should not be certain of data.size() == 0 ever happening (e.g. in case
          * of an error), so you should rely on result() instead.
          */
-        void data( KIO::Job *job, const TQByteArray &data );
+        void data( TDEIO::Job *job, const TQByteArray &data );
 
         /**
          * Request for data.
@@ -987,7 +987,7 @@ namespace KIO {
          * @param data buffer to fill with data to send to the
          * slave. An empty buffer indicates end of data. (EOD)
          */
-        void dataReq( KIO::Job *job, TQByteArray &data );
+        void dataReq( TDEIO::Job *job, TQByteArray &data );
 
         /**
          * Signals a redirection.
@@ -996,7 +996,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param url the new URL
          */
-        void redirection( KIO::Job *job, const KURL &url );
+        void redirection( TDEIO::Job *job, const KURL &url );
 
         /**
          * Signals a permanent redirection.
@@ -1006,14 +1006,14 @@ namespace KIO {
 	 * @param toUrl the new URL
 	 * @since 3.1
          */
-        void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
+        void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
 
         /**
          * Mimetype determined.
 	 * @param job the job that emitted this signal
 	 * @param type the mime type
          */
-        void mimetype( KIO::Job *job, const TQString &type );
+        void mimetype( TDEIO::Job *job, const TQString &type );
 
         /**
          * @internal
@@ -1022,7 +1022,7 @@ namespace KIO {
          * and emitted by the "get" job if it supports resuming to
          * the given offset - in this case @p offset is unused)
          */
-        void canResume( KIO::Job *job, KIO::filesize_t offset );
+        void canResume( TDEIO::Job *job, TDEIO::filesize_t offset );
 
 
     protected slots:
@@ -1032,10 +1032,10 @@ namespace KIO {
         virtual void slotDataReq();
         virtual void slotMimetype( const TQString &mimetype );
         virtual void slotNeedSubURLData();
-        virtual void slotSubURLData(KIO::Job*, const TQByteArray &);
-        virtual void slotMetaData( const KIO::MetaData &_metaData);
+        virtual void slotSubURLData(TDEIO::Job*, const TQByteArray &);
+        virtual void slotMetaData( const TDEIO::MetaData &_metaData);
         void slotErrorPage();
-        void slotCanResume( KIO::filesize_t offset );
+        void slotCanResume( TDEIO::filesize_t offset );
         void slotPostRedirection();
 
     protected:
@@ -1057,14 +1057,14 @@ namespace KIO {
      * also stores a TQByteArray with the data, making it simpler to use than the
      * standard TransferJob.
      *
-     * For KIO::storedGet it puts the data into the member TQByteArray, so the user
+     * For TDEIO::storedGet it puts the data into the member TQByteArray, so the user
      * of this class can get hold of the whole data at once by calling data()
      * when the result signal is emitted.
      * You should only use StoredTransferJob to download data if you cannot
      * process the data by chunks while it's being downloaded, since storing
      * everything in a TQByteArray can potentially require a lot of memory.
      *
-     * For KIO::storedPut the user of this class simply provides the bytearray from
+     * For TDEIO::storedPut the user of this class simply provides the bytearray from
      * the start, and the job takes care of uploading it.
      * You should only use StoredTransferJob to upload data if you cannot
      * provide the in chunks while it's being uploaded, since storing
@@ -1072,7 +1072,7 @@ namespace KIO {
      *
      * @since 3.3
      */
-    class KIO_EXPORT StoredTransferJob : public KIO::TransferJob {
+    class TDEIO_EXPORT StoredTransferJob : public TDEIO::TransferJob {
         Q_OBJECT
 
     public:
@@ -1092,7 +1092,7 @@ namespace KIO {
 
         /**
          * Set data to be uploaded. This is for put jobs.
-         * Automatically called by KIO::storedPut(const TQByteArray &, ...),
+         * Automatically called by TDEIO::storedPut(const TQByteArray &, ...),
          * do not call this yourself.
          */
         void setData( const TQByteArray& arr );
@@ -1104,8 +1104,8 @@ namespace KIO {
         TQByteArray data() const { return m_data; }
 
     private slots:
-        void slotStoredData( KIO::Job *job, const TQByteArray &data );
-        void slotStoredDataReq( KIO::Job *job, TQByteArray &data );
+        void slotStoredData( TDEIO::Job *job, const TQByteArray &data );
+        void slotStoredDataReq( TDEIO::Job *job, TQByteArray &data );
     private:
         TQByteArray m_data;
         int m_uploadOffset;
@@ -1114,15 +1114,15 @@ namespace KIO {
     /**
      * The MultiGetJob is a TransferJob that allows you to get
      * several files from a single server. Don't create directly,
-     * but use KIO::multi_get() instead.
-     * @see KIO::multi_get()
+     * but use TDEIO::multi_get() instead.
+     * @see TDEIO::multi_get()
      */
-    class KIO_EXPORT MultiGetJob : public TransferJob {
+    class TDEIO_EXPORT MultiGetJob : public TransferJob {
     Q_OBJECT
 
     public:
         /**
-	 * Do not create a MultiGetJob directly, use KIO::multi_get()
+	 * Do not create a MultiGetJob directly, use TDEIO::multi_get()
 	 * instead.
 	 *
 	 * @param url the first url to get
@@ -1166,7 +1166,7 @@ namespace KIO {
         /**
          * File transfer completed.
          *
-         * When all files have been processed, result(KIO::Job *) gets
+         * When all files have been processed, result(TDEIO::Job *) gets
          * emitted.
 	 * @param id the id of the request
          */
@@ -1202,15 +1202,15 @@ namespace KIO {
     /**
      * A MimetypeJob is a TransferJob that  allows you to get
      * the mime type of an URL. Don't create directly,
-     * but use KIO::mimetype() instead.
-     * @see KIO::mimetype()
+     * but use TDEIO::mimetype() instead.
+     * @see TDEIO::mimetype()
      */
-    class KIO_EXPORT MimetypeJob : public TransferJob {
+    class TDEIO_EXPORT MimetypeJob : public TransferJob {
     Q_OBJECT
 
     public:
        /**
-	* Do not create a MimetypeJob directly. Use KIO::mimetype()
+	* Do not create a MimetypeJob directly. Use TDEIO::mimetype()
 	* instead.
 	* @param url the url to get
 	* @param command the command to issue
@@ -1244,16 +1244,16 @@ namespace KIO {
 
     /**
      * The FileCopyJob copies data from one place to another.
-     * @see KIO::file_copy()
-     * @see KIO::file_move()
+     * @see TDEIO::file_copy()
+     * @see TDEIO::file_move()
      */
-    class KIO_EXPORT FileCopyJob : public Job {
+    class TDEIO_EXPORT FileCopyJob : public Job {
     Q_OBJECT
 
     public:
 	/**
-	* Do not create a FileCopyJob directly. Use KIO::file_move()
-	* or KIO::file_copy() instead.
+	* Do not create a FileCopyJob directly. Use TDEIO::file_move()
+	* or TDEIO::file_copy() instead.
 	* @param src the source URL
 	* @param dest the destination URL
 	* @param permissions the permissions of the resulting resource
@@ -1272,7 +1272,7 @@ namespace KIO {
 	 * @param size the size of the source file
 	 * @since 3.2
          */
-        void setSourceSize64(KIO::filesize_t size);
+        void setSourceSize64(TDEIO::filesize_t size);
 
         /**
          * Sets the modification time of the file
@@ -1310,45 +1310,45 @@ namespace KIO {
          *
          * @since 3.5.7
          */
-        void mimetype( KIO::Job *job, const TQString &type );
+        void mimetype( TDEIO::Job *job, const TQString &type );
 
     public slots:
         void slotStart();
-        void slotData( KIO::Job *, const TQByteArray &data);
-        void slotDataReq( KIO::Job *, TQByteArray &data);
-        void slotMimetype( KIO::Job *, const TQString& type );
+        void slotData( TDEIO::Job *, const TQByteArray &data);
+        void slotDataReq( TDEIO::Job *, TQByteArray &data);
+        void slotMimetype( TDEIO::Job *, const TQString& type );
 
     protected slots:
         /**
          * Called whenever a subjob finishes.
 	 * @param job the job that emitted this signal
          */
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
         /**
          * Forward signal from subjob
 	 * @param job the job that emitted this signal
 	 * @param size the processed size in bytes
          */
-        void slotProcessedSize( KIO::Job *job, KIO::filesize_t size );
+        void slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t size );
         /**
          * Forward signal from subjob
 	 * @param job the job that emitted this signal
 	 * @param size the total size
          */
-        void slotTotalSize( KIO::Job *job, KIO::filesize_t size );
+        void slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size );
         /**
          * Forward signal from subjob
 	 * @param job the job that emitted this signal
 	 * @param pct the percentage
          */
-        void slotPercent( KIO::Job *job, unsigned long pct );
+        void slotPercent( TDEIO::Job *job, unsigned long pct );
         /**
          * Forward signal from subjob
 	 * @param job the job that emitted this signal
 	 * @param offset the offset to resume from
          */
-        void slotCanResume( KIO::Job *job, KIO::filesize_t offset );
+        void slotCanResume( TDEIO::Job *job, TDEIO::filesize_t offset );
 
     protected:
         void startCopyJob();
@@ -1374,7 +1374,7 @@ namespace KIO {
         SimpleJob *m_copyJob;
         TransferJob *m_getJob;
         TransferJob *m_putJob;
-        KIO::filesize_t m_totalSize;
+        TDEIO::filesize_t m_totalSize;
     protected:
 	virtual void virtual_hook( int id, void* data );
     private:
@@ -1384,18 +1384,18 @@ namespace KIO {
 
     /**
      * A ListJob is allows you to get the get the content of a directory.
-     * Don't create the job directly, but use KIO::listRecursive() or
-     * KIO::listDir() instead.
-     * @see KIO::listRecursive()
-     * @see KIO::listDir()
+     * Don't create the job directly, but use TDEIO::listRecursive() or
+     * TDEIO::listDir() instead.
+     * @see TDEIO::listRecursive()
+     * @see TDEIO::listDir()
      */
-    class KIO_EXPORT ListJob : public SimpleJob {
+    class TDEIO_EXPORT ListJob : public SimpleJob {
     Q_OBJECT
 
     public:
        /**
-	* Do not create a ListJob directly. Use KIO::listDir() or
-	* KIO::listRecursive() instead.
+	* Do not create a ListJob directly. Use TDEIO::listDir() or
+	* TDEIO::listRecursive() instead.
 	* @param url the url of the directory
 	* @param showProgressInfo true to show progress information to the user
 	* @param recursive true to get the data recursively from child directories,
@@ -1439,7 +1439,7 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param list the list of UDSEntries
          */
-        void entries( KIO::Job *job, const KIO::UDSEntryList& list);
+        void entries( TDEIO::Job *job, const TDEIO::UDSEntryList& list);
 
         /**
          * Signals a redirection.
@@ -1448,7 +1448,7 @@ namespace KIO {
 	 * @param job the job that is redirected
 	 * @param url the new url
          */
-        void redirection( KIO::Job *job, const KURL &url );
+        void redirection( TDEIO::Job *job, const KURL &url );
 
         /**
          * Signals a permanent redirection.
@@ -1458,15 +1458,15 @@ namespace KIO {
 	 * @param toUrl the new URL
 	 * @since 3.1
          */
-        void permanentRedirection( KIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
+        void permanentRedirection( TDEIO::Job *job, const KURL &fromUrl, const KURL &toUrl );
 
     protected slots:
         virtual void slotFinished( );
-        virtual void slotMetaData( const KIO::MetaData &_metaData);
-        virtual void slotResult( KIO::Job *job );
-        void slotListEntries( const KIO::UDSEntryList& list );
+        virtual void slotMetaData( const TDEIO::MetaData &_metaData);
+        virtual void slotResult( TDEIO::Job *job );
+        void slotListEntries( const TDEIO::UDSEntryList& list );
         void slotRedirection( const KURL &url );
-        void gotEntries( KIO::Job * subjob, const KIO::UDSEntryList& list );
+        void gotEntries( TDEIO::Job * subjob, const TDEIO::UDSEntryList& list );
 
     private:
         bool recursive;
@@ -1481,7 +1481,7 @@ namespace KIO {
     };
 
     /// @internal
-    struct KIO_EXPORT CopyInfo
+    struct TDEIO_EXPORT CopyInfo
     {
         KURL uSource;
         KURL uDest;
@@ -1490,22 +1490,22 @@ namespace KIO {
         //mode_t type;
         time_t ctime;
         time_t mtime;
-        KIO::filesize_t size; // 0 for dirs
+        TDEIO::filesize_t size; // 0 for dirs
     };
 
     /**
      * CopyJob is used to move, copy or symlink files and directories.
-     * Don't create the job directly, but use KIO::copy(),
-     * KIO::move(), KIO::link() and friends.
+     * Don't create the job directly, but use TDEIO::copy(),
+     * TDEIO::move(), TDEIO::link() and friends.
      *
-     * @see KIO::copy()
-     * @see KIO::copyAs()
-     * @see KIO::move()
-     * @see KIO::moveAs()
-     * @see KIO::link()
-     * @see KIO::linkAs()
+     * @see TDEIO::copy()
+     * @see TDEIO::copyAs()
+     * @see TDEIO::move()
+     * @see TDEIO::moveAs()
+     * @see TDEIO::link()
+     * @see TDEIO::linkAs()
      */
-    class KIO_EXPORT CopyJob : public Job {
+    class TDEIO_EXPORT CopyJob : public Job {
     Q_OBJECT
 
     public:
@@ -1515,21 +1515,21 @@ namespace KIO {
         enum CopyMode{ Copy, Move, Link };
 
 	/**
-	 * Do not create a CopyJob directly. Use KIO::copy(),
-	 * KIO::move(), KIO::link() and friends instead.
+	 * Do not create a CopyJob directly. Use TDEIO::copy(),
+	 * TDEIO::move(), TDEIO::link() and friends instead.
 	 *
 	 * @param src the list of source URLs
 	 * @param dest the destination URL
 	 * @param mode specifies whether the job should copy, move or link
-	 * @param asMethod if true, behaves like KIO::copyAs(),
-	 * KIO::moveAs() or KIO::linkAs()
+	 * @param asMethod if true, behaves like TDEIO::copyAs(),
+	 * TDEIO::moveAs() or TDEIO::linkAs()
 	 * @param showProgressInfo true to show progress information to the user
-	 * @see KIO::copy()
-	 * @see KIO::copyAs()
-	 * @see KIO::move()
-	 * @see KIO::moveAs()
-	 * @see KIO::link()
-	 * @see KIO::linkAs()
+	 * @see TDEIO::copy()
+	 * @see TDEIO::copyAs()
+	 * @see TDEIO::move()
+	 * @see TDEIO::moveAs()
+	 * @see TDEIO::link()
+	 * @see TDEIO::linkAs()
 	 */
         CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool asMethod, bool showProgressInfo );
 
@@ -1579,13 +1579,13 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param files the total number of files
 	 */
-        void totalFiles( KIO::Job *job, unsigned long files );
+        void totalFiles( TDEIO::Job *job, unsigned long files );
         /**
 	 * Emitted when the toal number of direcotries is known.
 	 * @param job the job that emitted this signal
 	 * @param dirs the total number of directories
 	 */
-        void totalDirs( KIO::Job *job, unsigned long dirs );
+        void totalDirs( TDEIO::Job *job, unsigned long dirs );
 
         /**
 	 * Emitted when it is known which files / directories are going
@@ -1594,20 +1594,20 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param files a list of items that are about to be created.
 	 */
-        void aboutToCreate( KIO::Job *job, const TQValueList<KIO::CopyInfo> &files);
+        void aboutToCreate( TDEIO::Job *job, const TQValueList<TDEIO::CopyInfo> &files);
 
         /**
 	 * Sends the number of processed files.
 	 * @param job the job that emitted this signal
 	 * @param files the number of processed files
 	 */
-        void processedFiles( KIO::Job *job, unsigned long files );
+        void processedFiles( TDEIO::Job *job, unsigned long files );
         /**
 	 * Sends the number of processed directories.
 	 * @param job the job that emitted this signal
 	 * @param dirs the number of processed dirs
 	 */
-        void processedDirs( KIO::Job *job, unsigned long dirs );
+        void processedDirs( TDEIO::Job *job, unsigned long dirs );
 
         /**
          * The job is copying a file or directory.
@@ -1616,7 +1616,7 @@ namespace KIO {
 	 *             being copied
 	 * @param to the destination of the current operation
          */
-        void copying( KIO::Job *job, const KURL& from, const KURL& to );
+        void copying( TDEIO::Job *job, const KURL& from, const KURL& to );
         /**
          * The job is creating a symbolic link.
 	 * @param job the job that emitted this signal
@@ -1624,7 +1624,7 @@ namespace KIO {
 	 *             being linked
 	 * @param to the destination of the current operation
          */
-        void linking( KIO::Job *job, const TQString& target, const KURL& to );
+        void linking( TDEIO::Job *job, const TQString& target, const KURL& to );
         /**
          * The job is moving a file or directory.
 	 * @param job the job that emitted this signal
@@ -1632,20 +1632,20 @@ namespace KIO {
 	 *             being moved
 	 * @param to the destination of the current operation
          */
-        void moving( KIO::Job *job, const KURL& from, const KURL& to );
+        void moving( TDEIO::Job *job, const KURL& from, const KURL& to );
         /**
          * The job is creating the directory @p dir.
 	 * @param job the job that emitted this signal
 	 * @param dir the directory that is currently being created
          */
-        void creatingDir( KIO::Job *job, const KURL& dir );
+        void creatingDir( TDEIO::Job *job, const KURL& dir );
         /**
          * The user chose to rename @p from to @p to.
 	 * @param job the job that emitted this signal
 	 * @param from the original name
 	 * @param to the new name
          */
-        void renamed( KIO::Job *job, const KURL& from, const KURL& to );
+        void renamed( TDEIO::Job *job, const KURL& from, const KURL& to );
 
         /**
          * The job emits this signal when copying or moving a file or directory successfully finished.
@@ -1659,7 +1659,7 @@ namespace KIO {
          * @param renamed indicates that the destination URL was created using a
          * rename operation (i.e. fast directory moving). true if is has been renamed
          */
-        void copyingDone( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed );
+        void copyingDone( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed );
         /**
          * The job is copying or moving a symbolic link, that points to target.
          * The new link is created in @p to. The existing one is/was in @p from.
@@ -1669,26 +1669,26 @@ namespace KIO {
 	 * @param target the target
          * @param to the destination URL
          */
-        void copyingLinkDone( KIO::Job *job, const KURL &from, const TQString& target, const KURL& to );
+        void copyingLinkDone( TDEIO::Job *job, const KURL &from, const TQString& target, const KURL& to );
 
     protected:
         void statCurrentSrc();
         void statNextSrc();
 
         // Those aren't slots but submethods for slotResult.
-        void slotResultStating( KIO::Job * job );
+        void slotResultStating( TDEIO::Job * job );
         void startListing( const KURL & src );
-        void slotResultCreatingDirs( KIO::Job * job );
-        void slotResultConflictCreatingDirs( KIO::Job * job );
+        void slotResultCreatingDirs( TDEIO::Job * job );
+        void slotResultConflictCreatingDirs( TDEIO::Job * job );
         void createNextDir();
-        void slotResultCopyingFiles( KIO::Job * job );
-        void slotResultConflictCopyingFiles( KIO::Job * job );
+        void slotResultCopyingFiles( TDEIO::Job * job );
+        void slotResultConflictCopyingFiles( TDEIO::Job * job );
         void copyNextFile();
-        void slotResultDeletingDirs( KIO::Job * job );
+        void slotResultDeletingDirs( TDEIO::Job * job );
         void deleteNextDir();
         void skip( const KURL & sourceURL );
-        void slotResultRenaming( KIO::Job * job );
-        //void slotResultSettingDirAttributes( KIO::Job * job );
+        void slotResultRenaming( TDEIO::Job * job );
+        //void slotResultSettingDirAttributes( TDEIO::Job * job );
         void setNextDirAttribute();
     private:
         void startRenameJob(const KURL &slave_url);
@@ -1698,17 +1698,17 @@ namespace KIO {
 
     protected slots:
         void slotStart();
-        void slotEntries( KIO::Job*, const KIO::UDSEntryList& list );
-        virtual void slotResult( KIO::Job *job );
+        void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& list );
+        virtual void slotResult( TDEIO::Job *job );
         /**
          * Forward signal from subjob
          */
-        void slotProcessedSize( KIO::Job*, KIO::filesize_t data_size );
+        void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size );
         /**
          * Forward signal from subjob
 	 * @param size the total size
          */
-        void slotTotalSize( KIO::Job*, KIO::filesize_t size );
+        void slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size );
 
         void slotReport();
     private:
@@ -1719,9 +1719,9 @@ namespace KIO {
         enum { STATE_STATING, STATE_RENAMING, STATE_LISTING, STATE_CREATING_DIRS,
                STATE_CONFLICT_CREATING_DIRS, STATE_COPYING_FILES, STATE_CONFLICT_COPYING_FILES,
                STATE_DELETING_DIRS, STATE_SETTING_DIR_ATTRIBUTES } state;
-        KIO::filesize_t m_totalSize;
-        KIO::filesize_t m_processedSize;
-        KIO::filesize_t m_fileProcessedSize;
+        TDEIO::filesize_t m_totalSize;
+        TDEIO::filesize_t m_processedSize;
+        TDEIO::filesize_t m_fileProcessedSize;
         int m_processedFiles;
         int m_processedDirs;
         TQValueList<CopyInfo> files;
@@ -1756,22 +1756,22 @@ namespace KIO {
 
     /**
      * A more complex Job to delete files and directories.
-     * Don't create the job directly, but use KIO::del() instead.
+     * Don't create the job directly, but use TDEIO::del() instead.
      *
-     * @see KIO::del()
+     * @see TDEIO::del()
      */
-    class KIO_EXPORT DeleteJob : public Job {
+    class TDEIO_EXPORT DeleteJob : public Job {
     Q_OBJECT
 
     public:
 	/**
-	 * Do not create a DeleteJob directly. Use KIO::del()
+	 * Do not create a DeleteJob directly. Use TDEIO::del()
 	 * instead.
 	 *
 	 * @param src the list of URLs to delete
 	 * @param shred true to shred (make sure that data is not recoverable)a
 	 * @param showProgressInfo true to show progress information to the user
-	 * @see KIO::del()
+	 * @see TDEIO::del()
 	 */
         DeleteJob( const KURL::List& src, bool shred, bool showProgressInfo );
 
@@ -1788,26 +1788,26 @@ namespace KIO {
 	 * @param job the job that emitted this signal
 	 * @param files the total number of files
 	 */
-        void totalFiles( KIO::Job *job, unsigned long files );
+        void totalFiles( TDEIO::Job *job, unsigned long files );
         /**
 	 * Emitted when the toal number of direcotries is known.
 	 * @param job the job that emitted this signal
 	 * @param dirs the total number of directories
 	 */
-        void totalDirs( KIO::Job *job, unsigned long dirs );
+        void totalDirs( TDEIO::Job *job, unsigned long dirs );
 
         /**
 	 * Sends the number of processed files.
 	 * @param job the job that emitted this signal
 	 * @param files the number of processed files
 	 */
-        void processedFiles( KIO::Job *job, unsigned long files );
+        void processedFiles( TDEIO::Job *job, unsigned long files );
         /**
 	 * Sends the number of processed directories.
 	 * @param job the job that emitted this signal
 	 * @param dirs the number of processed dirs
 	 */
-        void processedDirs( KIO::Job *job, unsigned long dirs );
+        void processedDirs( TDEIO::Job *job, unsigned long dirs );
 
         /**
 	 * Sends the URL of the file that is currently being deleted.
@@ -1815,17 +1815,17 @@ namespace KIO {
 	 * @param file the URL of the file or directory that is being
 	 *        deleted
 	 */
-        void deleting( KIO::Job *job, const KURL& file );
+        void deleting( TDEIO::Job *job, const KURL& file );
 
     protected slots:
         void slotStart();
-        void slotEntries( KIO::Job*, const KIO::UDSEntryList& list );
-        virtual void slotResult( KIO::Job *job );
+        void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& list );
+        virtual void slotResult( TDEIO::Job *job );
 
         /**
          * Forward signal from subjob
          */
-        void slotProcessedSize( KIO::Job*, KIO::filesize_t data_size );
+        void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t data_size );
         void slotReport();
 
     private:
@@ -1836,9 +1836,9 @@ namespace KIO {
     private:
         enum { STATE_STATING, STATE_LISTING,
                STATE_DELETING_FILES, STATE_DELETING_DIRS } state;
-        KIO::filesize_t m_totalSize;
-        KIO::filesize_t m_processedSize;
-        KIO::filesize_t m_fileProcessedSize;
+        TDEIO::filesize_t m_totalSize;
+        TDEIO::filesize_t m_processedSize;
+        TDEIO::filesize_t m_fileProcessedSize;
         int m_processedFiles;
         int m_processedDirs;
         int m_totalFilesDirs;
@@ -1860,16 +1860,16 @@ namespace KIO {
 
     /**
      * A KIO job that finds a local URL
-     * @see KIO::localURL()
+     * @see TDEIO::localURL()
      * @since R14.0.0
      */
-    class KIO_EXPORT LocalURLJob : public SimpleJob {
+    class TDEIO_EXPORT LocalURLJob : public SimpleJob {
 
     Q_OBJECT
 
     public:
         /**
-	 * Do not use this constructor to create a LocalURLJob, use KIO::localURL() instead.
+	 * Do not use this constructor to create a LocalURLJob, use TDEIO::localURL() instead.
 	 * @param url the url of the file or directory to check
 	 * @param command the command to issue
 	 * @param packedArgs the arguments
@@ -1891,7 +1891,7 @@ namespace KIO {
 	 * @param url the local url
 	 * @param isLocal true if the returned URL is local, false if not
          */
-        void localURL( KIO::Job *job, const KURL &url, bool isLocal );
+        void localURL( TDEIO::Job *job, const KURL &url, bool isLocal );
 
     protected slots:
         void slotLocalURL( const KURL &url, bool isLocal );
diff --git a/kio/kio/kacl.cpp b/tdeio/tdeio/kacl.cpp
index 432a50d31..432a50d31 100644
--- a/kio/kio/kacl.cpp
+++ b/tdeio/tdeio/kacl.cpp
diff --git a/kio/kio/kacl.h b/tdeio/tdeio/kacl.h
index 53bc762b0..f581f7a8e 100644
--- a/kio/kio/kacl.h
+++ b/tdeio/tdeio/kacl.h
@@ -21,7 +21,7 @@
 #define __kacl_h__
 
 #include <sys/types.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 typedef QPair<TQString, unsigned short> ACLUserPermissions;
 typedef TQValueList<ACLUserPermissions> ACLUserPermissionsList;
@@ -39,7 +39,7 @@ typedef TQValueListConstIterator<ACLGroupPermissions> ACLGroupPermissionsConstIt
  * @short a POSIX ACL encapsulation
  * @author Till Adam <adam@kde.org>
  */
-class KIO_EXPORT KACL
+class TDEIO_EXPORT KACL
 {
 public:
   /**
@@ -197,11 +197,11 @@ protected:
 private:
   class KACLPrivate;
   KACLPrivate * d;
-  KIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KACL & a );
-  KIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KACL & a );
+  TDEIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KACL & a );
+  TDEIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KACL & a );
 };
 
-KIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KACL & a );
-KIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KACL & a );
+TDEIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KACL & a );
+TDEIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KACL & a );
 
 #endif
diff --git a/kio/kio/kar.cpp b/tdeio/tdeio/kar.cpp
index 07072d0c6..07072d0c6 100644
--- a/kio/kio/kar.cpp
+++ b/tdeio/tdeio/kar.cpp
diff --git a/kio/kio/kar.h b/tdeio/tdeio/kar.h
index 1b8f2cef2..83d94e75c 100644
--- a/kio/kio/kar.h
+++ b/tdeio/tdeio/kar.h
@@ -35,7 +35,7 @@
  * @author Laurence Anderson <l.d.anderson@warwick.ac.uk>
  * @since 3.1
  */
-class KIO_EXPORT KAr : public KArchive
+class TDEIO_EXPORT KAr : public KArchive
 {
 public:
     /**
diff --git a/kio/kio/karchive.cpp b/tdeio/tdeio/karchive.cpp
index 0e8d6789d..0e8d6789d 100644
--- a/kio/kio/karchive.cpp
+++ b/tdeio/tdeio/karchive.cpp
diff --git a/kio/kio/karchive.h b/tdeio/tdeio/karchive.h
index 6f0b57cbc..840c560b7 100644
--- a/kio/kio/karchive.h
+++ b/tdeio/tdeio/karchive.h
@@ -39,7 +39,7 @@ class KArchiveFile;
  * @short generic class for reading/writing archives
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT KArchive
+class TDEIO_EXPORT KArchive
 {
 protected:
     /**
@@ -392,7 +392,7 @@ private:
  * @see KArchiveFile
  * @see KArchiveDirectory
  */
-class KIO_EXPORT KArchiveEntry
+class TDEIO_EXPORT KArchiveEntry
 {
 public:
     /**
@@ -487,7 +487,7 @@ private:
  * @see KArchive
  * @see KArchiveDirectory
  */
-class KIO_EXPORT KArchiveFile : public KArchiveEntry
+class TDEIO_EXPORT KArchiveFile : public KArchiveEntry
 {
 public:
     /**
@@ -570,7 +570,7 @@ private:
  * @see KArchive
  * @see KArchiveFile
  */
-class KIO_EXPORT KArchiveDirectory : public KArchiveEntry
+class TDEIO_EXPORT KArchiveDirectory : public KArchiveEntry
 {
 public:
     /**
diff --git a/kio/kio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp
index a4782c313..f167a6ccb 100644
--- a/kio/kio/kautomount.cpp
+++ b/tdeio/tdeio/kautomount.cpp
@@ -19,7 +19,7 @@
 #include "kautomount.h"
 #include "krun.h"
 #include "kdirwatch.h"
-#include "kio/job.h"
+#include "tdeio/job.h"
 #include <kdirnotify_stub.h>
 #include <kdebug.h>
 
@@ -38,11 +38,11 @@ KAutoMount::KAutoMount( bool _readonly, const TQString& _format, const TQString&
   //kdDebug(7015) << "KAutoMount device=" << _device << " mountpoint=" << _mountpoint << endl;
   m_bShowFilemanagerWindow = _show_filemanager_window;
 
-  KIO::Job* job = KIO::mount( _readonly, _format.ascii(), _device, _mountpoint );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+  TDEIO::Job* job = TDEIO::mount( _readonly, _format.ascii(), _device, _mountpoint );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
-void KAutoMount::slotResult( KIO::Job * job )
+void KAutoMount::slotResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     emit error();
@@ -51,12 +51,12 @@ void KAutoMount::slotResult( KIO::Job * job )
   else
   {
     KURL mountpoint;
-    mountpoint.setPath( KIO::findDeviceMountPoint( m_strDevice ) );
+    mountpoint.setPath( TDEIO::findDeviceMountPoint( m_strDevice ) );
     //kdDebug(7015) << "KAutoMount: m_strDevice=" << m_strDevice << " -> mountpoint=" << mountpoint << endl;
     Q_ASSERT( mountpoint.isValid() );
 
     if ( mountpoint.path().isEmpty() )
-        kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::findDeviceMountPoint didn't find it. "
+        kdWarning(7015) << m_strDevice << " was correctly mounted, but TDEIO::findDeviceMountPoint didn't find it. "
                         << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl;
     else if ( m_bShowFilemanagerWindow )
       KRun::runURL( mountpoint, "inode/directory" );
@@ -80,11 +80,11 @@ void KAutoMount::slotResult( KIO::Job * job )
 KAutoUnmount::KAutoUnmount( const TQString & _mountpoint, const TQString & _desktopFile )
   : m_desktopFile( _desktopFile ), m_mountpoint( _mountpoint )
 {
-  KIO::Job * job = KIO::unmount( m_mountpoint );
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+  TDEIO::Job * job = TDEIO::unmount( m_mountpoint );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
-void KAutoUnmount::slotResult( KIO::Job * job )
+void KAutoUnmount::slotResult( TDEIO::Job * job )
 {
   if ( job->error() ) {
     emit error();
diff --git a/kio/kio/kautomount.h b/tdeio/tdeio/kautomount.h
index c5aa30583..203c037d9 100644
--- a/kio/kio/kautomount.h
+++ b/tdeio/tdeio/kautomount.h
@@ -30,19 +30,19 @@
 
 #ifdef Q_OS_UNIX
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
 /**
  * This class implements synchronous mounting of devices,
  * as well as showing a file-manager window after mounting a device, optionally.
- * It is a wrapper around the asychronous KIO::special() call for mount,
+ * It is a wrapper around the asychronous TDEIO::special() call for mount,
  * used by KMimeType.
  *
  * @short This class implements synchronous mounting of devices.
  */
-class KIO_EXPORT KAutoMount : public TQObject
+class TDEIO_EXPORT KAutoMount : public TQObject
 {
   Q_OBJECT
   friend class gcc_gives_a_warning_without_this;
@@ -68,7 +68,7 @@ signals:
   void error();
 
 protected slots:
-  void slotResult( KIO::Job * );
+  void slotResult( TDEIO::Job * );
 
 protected:
   TQString m_strDevice;
@@ -82,12 +82,12 @@ private:
 
 /**
  * This class implements synchronous unmounting of devices,
- * It is a wrapper around the asychronous KIO::special() call for unmount,
+ * It is a wrapper around the asychronous TDEIO::special() call for unmount,
  * used by KMimeType.
  *
  * @short This class implements synchronous unmounting of devices,
  */
-class KIO_EXPORT KAutoUnmount : public TQObject
+class TDEIO_EXPORT KAutoUnmount : public TQObject
 {
   Q_OBJECT
   friend class gcc_gives_a_warning_without_this;
@@ -107,7 +107,7 @@ signals:
   void error();
 
 protected slots:
-  void slotResult( KIO::Job * );
+  void slotResult( TDEIO::Job * );
 private:
   TQString m_desktopFile;
   TQString m_mountpoint;
diff --git a/kio/kio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp
index c5e04537e..5ec790aa7 100644
--- a/kio/kio/kdatatool.cpp
+++ b/tdeio/tdeio/kdatatool.cpp
@@ -26,7 +26,7 @@
 #include <kinstance.h>
 
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqpixmap.h>
 #include <tqfile.h>
@@ -42,7 +42,7 @@ KDataToolInfo::KDataToolInfo()
     m_service = 0;
 }
 
-KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance )
+KDataToolInfo::KDataToolInfo( const KService::Ptr& service, TDEInstance* instance )
 {
     m_service = service;
     m_instance = instance;
@@ -98,7 +98,7 @@ TQPixmap KDataToolInfo::icon() const
         return TQPixmap();
 
     TQPixmap pix;
-    TQStringList lst = KGlobal::dirs()->resourceDirs("icon");
+    TQStringList lst = TDEGlobal::dirs()->resourceDirs("icon");
     TQStringList::ConstIterator it = lst.begin();
     while (!pix.load( *it + "/" + m_service->icon() ) && it != lst.end() )
         it++;
@@ -112,7 +112,7 @@ TQPixmap KDataToolInfo::miniIcon() const
         return TQPixmap();
 
     TQPixmap pix;
-    TQStringList lst = KGlobal::dirs()->resourceDirs("mini");
+    TQStringList lst = TDEGlobal::dirs()->resourceDirs("mini");
     TQStringList::ConstIterator it = lst.begin();
     while (!pix.load( *it + "/" + m_service->icon() ) && it != lst.end() )
         it++;
@@ -159,7 +159,7 @@ KService::Ptr KDataToolInfo::service() const
     return m_service;
 }
 
-TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, KInstance* instance )
+TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, TDEInstance* instance )
 {
     TQValueList<KDataToolInfo> lst;
 
@@ -177,7 +177,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
         else
             constr = constr + " and " + tmp;
     }
-/* Bug in KTrader ? Test with HEAD-tdelibs!
+/* Bug in TDETrader ? Test with HEAD-tdelibs!
     if ( instance )
     {
         TQString tmp = TQString::fromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() );
@@ -189,9 +189,9 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
 
     // Query the trader
     //kdDebug() << "KDataToolInfo::query " << constr << endl;
-    KTrader::OfferList offers = KTrader::self()->query( "KDataTool", constr );
+    TDETrader::OfferList offers = TDETrader::self()->query( "KDataTool", constr );
 
-    KTrader::OfferList::ConstIterator it = offers.begin();
+    TDETrader::OfferList::ConstIterator it = offers.begin();
     for( ; it != offers.end(); ++it )
     {
         // Temporary replacement for the non-working trader query above
@@ -217,7 +217,7 @@ bool KDataToolInfo::isValid() const
  *************************************************/
 KDataToolAction::KDataToolAction( const TQString & text, const KDataToolInfo & info, const TQString & command,
                                     TQObject * parent, const char * name )
-    : KAction( text, info.iconName(), 0, parent, name ),
+    : TDEAction( text, info.iconName(), 0, parent, name ),
       m_command( command ),
       m_info( info )
 {
@@ -228,13 +228,13 @@ void KDataToolAction::slotActivated()
     emit toolActivated( m_info, m_command );
 }
 
-TQPtrList<KAction> KDataToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot )
+TQPtrList<TDEAction> KDataToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot )
 {
-    TQPtrList<KAction> actionList;
+    TQPtrList<TDEAction> actionList;
     if ( tools.isEmpty() )
         return actionList;
 
-    actionList.append( new KActionSeparator() );
+    actionList.append( new TDEActionSeparator() );
     TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin();
     for( ; entry != tools.end(); ++entry )
     {
@@ -271,13 +271,13 @@ KDataTool::KDataTool( TQObject* parent, const char* name )
 {
 }
 
-KInstance* KDataTool::instance() const
+TDEInstance* KDataTool::instance() const
 {
    return m_instance;
 }
 
 void KDataToolAction::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+{ TDEAction::virtual_hook( id, data ); }
 
 void KDataTool::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
diff --git a/kio/kio/kdatatool.h b/tdeio/tdeio/kdatatool.h
index 573bf809e..a77f8a9ea 100644
--- a/kio/kio/kdatatool.h
+++ b/tdeio/tdeio/kdatatool.h
@@ -24,13 +24,13 @@
 #include <tqobject.h>
 #include <tqvaluelist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kservice.h>
 
 class KDataTool;
 class TQPixmap;
 class TQStringList;
-class KInstance;
+class TDEInstance;
 
 // If you're only looking at implementing a data-tool, skip directly to the last
 // class definition, KDataTool.
@@ -44,7 +44,7 @@ class KInstance;
  * described by the service.
  * @see KDataTool
  */
-class KIO_EXPORT KDataToolInfo
+class TDEIO_EXPORT KDataToolInfo
 {
 public:
     /**
@@ -56,7 +56,7 @@ public:
      * @param service the corresponding service
      * @param instance the instance to use
      */
-    KDataToolInfo( const KService::Ptr& service, KInstance* instance );
+    KDataToolInfo( const KService::Ptr& service, TDEInstance* instance );
     /**
      * Copy constructor.
      */
@@ -154,7 +154,7 @@ public:
      * The instance of the service.
      * @return the instance
      */
-    KInstance* instance() const { return m_instance; }
+    TDEInstance* instance() const { return m_instance; }
 
     /**
      * A DataToolInfo may be invalid if the KService passed to its constructor does
@@ -164,18 +164,18 @@ public:
     bool isValid() const;
 
     /**
-     * Queries the KTrader about installed KDataTool implementations.
+     * Queries the TDETrader about installed KDataTool implementations.
      * @param datatype a type that the application can 'export' to the tools (e.g. TQString)
      * @param mimetype the mimetype of the data (e.g. text/plain)
      * @param instance the application (or the part)'s instance (to check if a tool is excluded from this part,
      * and also used if the tool wants to read its configuration in the app's config file).
      * @return the list of results
      */
-    static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, KInstance * instance );
+    static TQValueList<KDataToolInfo> query( const TQString& datatype, const TQString& mimetype, TDEInstance * instance );
 
 private:
     KService::Ptr m_service;
-    KInstance* m_instance;
+    TDEInstance* m_instance;
 private:
     class KDataToolInfoPrivate* d;
 };
@@ -191,7 +191,7 @@ private:
  * The slot defined for step 2 is called when the action is activated, and
  * that's where the tool should be created and run.
  */
-class KIO_EXPORT KDataToolAction : public KAction
+class TDEIO_EXPORT KDataToolAction : public TDEAction
 {
     Q_OBJECT
     
@@ -215,9 +215,9 @@ public:
      * @param tools the list of data tool descriptions
      * @param receiver the receiver for toolActivated() signals
      * @param slot the slot that will receive the toolActivated() signals
-     * @return the KActions
+     * @return the TDEActions
      */
-    static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot );
+    static TQPtrList<TDEAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot );
 
 signals:
     /**
@@ -251,7 +251,7 @@ private:
  * @see KDataToolAction, and for activating a tool, passing it the data
  * (and possibly getting modified data from it).
  */
-class KIO_EXPORT KDataTool : public TQObject
+class TDEIO_EXPORT KDataTool : public TQObject
 {
     Q_OBJECT
     
@@ -267,14 +267,14 @@ public:
     /**
      * @internal. Do not use under any circumstance (including bad weather).
      */
-    void setInstance( KInstance* instance ) { m_instance = instance; }
+    void setInstance( TDEInstance* instance ) { m_instance = instance; }
 
     /**
      * Returns the instance of the part that created this tool.
      * Usually used if the tool wants to read its configuration in the app's config file.
      * @return the instance of the part that created this tool.
      */
-    KInstance* instance() const;
+    TDEInstance* instance() const;
 
     /**
      * Interface for 'running' this tool.
@@ -292,7 +292,7 @@ public:
     virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype) = 0;
 
 private:
-    KInstance * m_instance;
+    TDEInstance * m_instance;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
diff --git a/kio/kio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp
index 3c9b55501..8a7a67632 100644
--- a/kio/kio/kdcopservicestarter.cpp
+++ b/tdeio/tdeio/kdcopservicestarter.cpp
@@ -18,11 +18,11 @@
 
 #include "kdcopservicestarter.h"
 #include "ktrader.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kservice.h"
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 static KStaticDeleter<KDCOPServiceStarter> dss_sd;
@@ -58,7 +58,7 @@ int KDCOPServiceStarter::findServiceFor( const TQString& serviceType,
     if ( !constraint.isEmpty() )
         constraint += " and ";
     constraint += "exist [X-DCOP-ServiceName]";
-    KTrader::OfferList offers = KTrader::self()->query(serviceType, "Application", constraint, preferences);
+    TDETrader::OfferList offers = TDETrader::self()->query(serviceType, "Application", constraint, preferences);
     if ( offers.isEmpty() ) {
         if ( error )
             *error = i18n("No service implementing %1").arg( serviceType );
@@ -88,7 +88,7 @@ int KDCOPServiceStarter::startServiceFor( const TQString& serviceType,
                                           const TQString& preferences,
                                           TQString *error, TQCString* dcopService, int /*flags*/ )
 {
-    KTrader::OfferList offers = KTrader::self()->query(serviceType, "Application", constraint, preferences);
+    TDETrader::OfferList offers = TDETrader::self()->query(serviceType, "Application", constraint, preferences);
     if ( offers.isEmpty() )
         return -1;
     KService::Ptr ptr = offers.first();
diff --git a/kio/kio/kdcopservicestarter.h b/tdeio/tdeio/kdcopservicestarter.h
index b267476e7..04f8d7ee2 100644
--- a/kio/kio/kdcopservicestarter.h
+++ b/tdeio/tdeio/kdcopservicestarter.h
@@ -26,12 +26,12 @@ class KDCOPServiceStarter;
 class TQCString;
 
 /**
- * A generic DCOP service starter, using KTrader.
+ * A generic DCOP service starter, using TDETrader.
  * The default implementation starts new processes, but this interface can
  * also be reimplemented by specific applications to provide dlopened in-process DCOP objects.
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT KDCOPServiceStarter {
+class TDEIO_EXPORT KDCOPServiceStarter {
     friend class KStaticDeleter<KDCOPServiceStarter>;
 public:
 
@@ -46,8 +46,8 @@ public:
      * this method will call startServiceFor to start it.
      *
      * @param serviceType the type of service we're looking for
-     * @param constraint see KTrader
-     * @param preferences see KTrader
+     * @param constraint see TDETrader
+     * @param preferences see TDETrader
      * @param error On failure, @p error contains a description of the error
      *         that occurred. If the pointer is 0, the argument will be
      *         ignored
@@ -67,15 +67,15 @@ public:
     /**
      * Find an implementation of the given @p serviceType,
      * and start it, to use its DCOP interface.
-     * The default implementation uses KTrader to find the preferred Application,
+     * The default implementation uses TDETrader to find the preferred Application,
      * and then starts it using kapp->startService...
      *
      * However applications (like kontact) can reimplement this method, to provide
      * an in-process way of loading the implementation for this service type.
      *
      * @param serviceType the type of service we're looking for
-     * @param constraint see KTrader
-     * @param preferences see KTrader
+     * @param constraint see TDETrader
+     * @param preferences see TDETrader
      * @param error On failure, @p error contains a description of the error
      *         that occurred. If the pointer is 0, the argument will be
      *         ignored
diff --git a/kio/kio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp
index 0641645a6..b0027588d 100644
--- a/kio/kio/kdirlister.cpp
+++ b/tdeio/tdeio/kdirlister.cpp
@@ -26,13 +26,13 @@
 #include <tqtimer.h>
 #include <tqeventloop.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kio/job.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeio/job.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstaticdeleter.h>
 #include <kprotocolinfo.h>
 
@@ -224,8 +224,8 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u,
       if ( lister->d->url == _url )
         lister->d->rootFileItem = 0;
 
-      KIO::ListJob* job = KIO::listDir( _url, false /* no default GUI */ );
-      jobs.insert( job, TQValueList<KIO::UDSEntry>() );
+      TDEIO::ListJob* job = TDEIO::listDir( _url, false /* no default GUI */ );
+      jobs.insert( job, TQValueList<TDEIO::UDSEntry>() );
 
       lister->jobStarted( job );
       lister->connectJob( job );
@@ -233,12 +233,12 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u,
       if ( lister->d->window )
         job->setWindow( lister->d->window );
 
-      connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList & ) ),
-               this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList & ) ) );
-      connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-               this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-      connect( job, TQT_SIGNAL( redirection( KIO::Job *, const KURL & ) ),
-               this, TQT_SLOT( slotRedirection( KIO::Job *, const KURL & ) ) );
+      connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ),
+               this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) );
+      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+               this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+      connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ),
+               this, TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) );
 
       emit lister->started( _url );
 
@@ -253,7 +253,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u,
 
     urlsCurrentlyListed[urlStr]->append( lister );
 
-    KIO::ListJob *job = jobForUrl( urlStr );
+    TDEIO::ListJob *job = jobForUrl( urlStr );
     Q_ASSERT( job );
 
     lister->jobStarted( job );
@@ -322,7 +322,7 @@ void KDirListerCache::stop( KDirLister *lister )
       bool ret = listers->removeRef( lister );
       Q_ASSERT( ret );
       
-      KIO::ListJob *job = jobForUrl( url );
+      TDEIO::ListJob *job = jobForUrl( url );
       if ( job )
         lister->jobDone( job );
 
@@ -388,7 +388,7 @@ void KDirListerCache::stop( KDirLister *lister, const KURL& _u )
   holders->append( lister );
 
 
-  KIO::ListJob *job = jobForUrl( urlStr );
+  TDEIO::ListJob *job = jobForUrl( urlStr );
   if ( job )
     lister->jobDone( job );
 
@@ -472,7 +472,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
       itemsInUse.remove( urlStr );
 
       // this job is a running update
-      KIO::ListJob *job = jobForUrl( urlStr );
+      TDEIO::ListJob *job = jobForUrl( urlStr );
       if ( job )
       {
         lister->jobDone( job );
@@ -499,7 +499,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
         // Generally keep a watch, except when it would prevent
         // unmounting a removable device (#37780)
         const bool isLocal = item->url.isLocalFile();
-        const bool isManuallyMounted = isLocal && KIO::manually_mounted( item->url.path() );
+        const bool isManuallyMounted = isLocal && TDEIO::manually_mounted( item->url.path() );
         bool containsManuallyMounted = false;
         if ( !isManuallyMounted && item->lstItems && isLocal ) 
         {
@@ -509,7 +509,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not
           // of the time this is just a stat per subdir)
           KFileItemListIterator kit( *item->lstItems );
           for ( ; kit.current() && !containsManuallyMounted; ++kit )
-            if ( (*kit)->isDir() && KIO::manually_mounted( (*kit)->url().path() ) )
+            if ( (*kit)->isDir() && TDEIO::manually_mounted( (*kit)->url().path() ) )
               containsManuallyMounted = true;
         }
 
@@ -554,7 +554,7 @@ void KDirListerCache::updateDirectory( const KURL& _dir )
   // restart the job for _dir if it is running already
   bool killed = false;
   TQWidget *window = 0;
-  KIO::ListJob *job = jobForUrl( urlStr );
+  TDEIO::ListJob *job = jobForUrl( urlStr );
   if ( job )
   {
      window = job->window();
@@ -577,13 +577,13 @@ void KDirListerCache::updateDirectory( const KURL& _dir )
 
   Q_ASSERT( !listers || (listers && killed) );
 
-  job = KIO::listDir( _dir, false /* no default GUI */ );
-  jobs.insert( job, TQValueList<KIO::UDSEntry>() );
+  job = TDEIO::listDir( _dir, false /* no default GUI */ );
+  jobs.insert( job, TQValueList<TDEIO::UDSEntry>() );
 
-  connect( job, TQT_SIGNAL(entries( KIO::Job *, const KIO::UDSEntryList & )),
-           this, TQT_SLOT(slotUpdateEntries( KIO::Job *, const KIO::UDSEntryList & )) );
-  connect( job, TQT_SIGNAL(result( KIO::Job * )),
-           this, TQT_SLOT(slotUpdateResult( KIO::Job * )) );
+  connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )),
+           this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) );
+  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
+           this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) );
 
   kdDebug(7004) << k_funcinfo << "update started in " << _dir << endl;
 
@@ -930,9 +930,9 @@ void KDirListerCache::slotFileDeleted( const TQString& _file )
   FilesRemoved( u );
 }
 
-void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entries )
+void KDirListerCache::slotEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries )
 {
-  KURL url = joburl( static_cast<KIO::ListJob *>(job) );
+  KURL url = joburl( static_cast<TDEIO::ListJob *>(job) );
   url.adjustPath(-1);
   TQString urlStr = url.url();
 
@@ -951,20 +951,20 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri
     delayedMimeTypes = delayedMimeTypes && kdl->d->delayedMimeTypes;
 
   // avoid creating these QStrings again and again
-  static const TQString& dot = KGlobal::staticQString(".");
-  static const TQString& dotdot = KGlobal::staticQString("..");
+  static const TQString& dot = TDEGlobal::staticQString(".");
+  static const TQString& dotdot = TDEGlobal::staticQString("..");
 
-  KIO::UDSEntryListConstIterator it = entries.begin();
-  KIO::UDSEntryListConstIterator end = entries.end();
+  TDEIO::UDSEntryListConstIterator it = entries.begin();
+  TDEIO::UDSEntryListConstIterator end = entries.end();
 
   for ( ; it != end; ++it )
   {
     TQString name;
 
     // find out about the name
-    KIO::UDSEntry::ConstIterator entit = (*it).begin();
+    TDEIO::UDSEntry::ConstIterator entit = (*it).begin();
     for( ; entit != (*it).end(); ++entit )
-      if ( (*entit).m_uds == KIO::UDS_NAME )
+      if ( (*entit).m_uds == TDEIO::UDS_NAME )
       {
         name = (*entit).m_str;
         break;
@@ -1000,10 +1000,10 @@ void KDirListerCache::slotEntries( KIO::Job *job, const KIO::UDSEntryList &entri
     kdl->emitItems();
 }
 
-void KDirListerCache::slotResult( KIO::Job *j )
+void KDirListerCache::slotResult( TDEIO::Job *j )
 {
   Q_ASSERT( j );
-  KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
+  TDEIO::ListJob *job = static_cast<TDEIO::ListJob *>( j );
   jobs.remove( job );
 
   KURL jobUrl = joburl( job );
@@ -1067,10 +1067,10 @@ void KDirListerCache::slotResult( KIO::Job *j )
 #endif
 }
 
-void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
+void KDirListerCache::slotRedirection( TDEIO::Job *j, const KURL& url )
 {
   Q_ASSERT( j );
-  KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
+  TDEIO::ListJob *job = static_cast<TDEIO::ListJob *>( j );
 
   KURL oldUrl = job->url();  // here we really need the old url!
   KURL newUrl = url;
@@ -1175,7 +1175,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
 
     // get the job if one's running for newUrl already (can be a list-job or an update-job), but
     // do not return this 'job', which would happen because of the use of redirectionURL()
-    KIO::ListJob *oldJob = jobForUrl( newUrl.url(), job );
+    TDEIO::ListJob *oldJob = jobForUrl( newUrl.url(), job );
 
     // listers of newUrl with oldJob: forget about the oldJob and use the already running one
     // which will be converted to an updateJob
@@ -1305,10 +1305,10 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url )
   // make the job an update job
   job->disconnect( this );
     
-  connect( job, TQT_SIGNAL(entries( KIO::Job *, const KIO::UDSEntryList & )),
-           this, TQT_SLOT(slotUpdateEntries( KIO::Job *, const KIO::UDSEntryList & )) );
-  connect( job, TQT_SIGNAL(result( KIO::Job * )),
-           this, TQT_SLOT(slotUpdateResult( KIO::Job * )) );
+  connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )),
+           this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) );
+  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
+           this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) );
 
   // FIXME: autoUpdate-Counts!!
 
@@ -1385,7 +1385,7 @@ void KDirListerCache::emitRedirections( const KURL &oldUrl, const KURL &url )
   TQString oldUrlStr = oldUrl.url(-1);
   TQString urlStr = url.url(-1);
 
-  KIO::ListJob *job = jobForUrl( oldUrlStr );
+  TDEIO::ListJob *job = jobForUrl( oldUrlStr );
   if ( job )
     killJob( job );
 
@@ -1454,15 +1454,15 @@ void KDirListerCache::removeDirFromCache( const KURL& dir )
   }
 }
 
-void KDirListerCache::slotUpdateEntries( KIO::Job* job, const KIO::UDSEntryList& list )
+void KDirListerCache::slotUpdateEntries( TDEIO::Job* job, const TDEIO::UDSEntryList& list )
 {
-  jobs[static_cast<KIO::ListJob*>(job)] += list;
+  jobs[static_cast<TDEIO::ListJob*>(job)] += list;
 }
 
-void KDirListerCache::slotUpdateResult( KIO::Job * j )
+void KDirListerCache::slotUpdateResult( TDEIO::Job * j )
 {
   Q_ASSERT( j );
-  KIO::ListJob *job = static_cast<KIO::ListJob *>( j );
+  TDEIO::ListJob *job = static_cast<TDEIO::ListJob *>( j );
 
   KURL jobUrl = joburl( job );
   jobUrl.adjustPath(-1);  // need remove trailing slashes again, in case of redirections
@@ -1539,13 +1539,13 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j )
     fileItems.insert( (*kit)->url().url(), *kit );
   }
 
-  static const TQString& dot = KGlobal::staticQString(".");
-  static const TQString& dotdot = KGlobal::staticQString("..");
+  static const TQString& dot = TDEGlobal::staticQString(".");
+  static const TQString& dotdot = TDEGlobal::staticQString("..");
 
   KFileItem *item = 0, *tmp;
 
-  TQValueList<KIO::UDSEntry> buf = jobs[job];
-  TQValueListIterator<KIO::UDSEntry> it = buf.begin();
+  TQValueList<TDEIO::UDSEntry> buf = jobs[job];
+  TQValueListIterator<TDEIO::UDSEntry> it = buf.begin();
   for ( ; it != buf.end(); ++it )
   {
     // Form the complete url
@@ -1641,10 +1641,10 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j )
 
 // private
 
-KIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, KIO::ListJob *not_job )
+TDEIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, TDEIO::ListJob *not_job )
 {
-  KIO::ListJob *job;
-  TQMap< KIO::ListJob *, TQValueList<KIO::UDSEntry> >::Iterator it = jobs.begin();
+  TDEIO::ListJob *job;
+  TQMap< TDEIO::ListJob *, TQValueList<TDEIO::UDSEntry> >::Iterator it = jobs.begin();
   while ( it != jobs.end() )
   {
     job = it.key();
@@ -1655,7 +1655,7 @@ KIO::ListJob *KDirListerCache::jobForUrl( const TQString& url, KIO::ListJob *not
   return 0;
 }
 
-const KURL& KDirListerCache::joburl( KIO::ListJob *job )
+const KURL& KDirListerCache::joburl( TDEIO::ListJob *job )
 {
   if ( job->redirectionURL().isValid() )
      return job->redirectionURL();
@@ -1663,7 +1663,7 @@ const KURL& KDirListerCache::joburl( KIO::ListJob *job )
      return job->url();
 }
 
-void KDirListerCache::killJob( KIO::ListJob *job )
+void KDirListerCache::killJob( TDEIO::ListJob *job )
 {
   jobs.remove( job );
   job->disconnect( this );
@@ -1806,7 +1806,7 @@ void KDirListerCache::printDebug()
     kdDebug(7004) << "   " << it2.currentKey() << "  " << it2.current()->count() << " listers: " << list << endl;
   }
 
-  TQMap< KIO::ListJob *, TQValueList<KIO::UDSEntry> >::Iterator jit = jobs.begin();
+  TQMap< TDEIO::ListJob *, TQValueList<TDEIO::UDSEntry> >::Iterator jit = jobs.begin();
   kdDebug(7004) << "Jobs: " << endl;
   for ( ; jit != jobs.end() ; ++jit )
     kdDebug(7004) << "   " << jit.key() << " listing " << joburl( jit.key() ).prettyURL() << ": " << (*jit).count() << " entries." << endl;
@@ -1867,9 +1867,9 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload )
   // If a local path is available, monitor that instead of the given remote URL...
   KURL realURL = _url;
   if (!realURL.isLocalFile()) {
-      KIO::LocalURLJob* localURLJob = KIO::localURL(_url);
+      TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url);
       if (localURLJob) {
-          connect(localURLJob, TQT_SIGNAL(localURL(KIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(KIO::Job*, const KURL&, bool)));
+          connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::Job*, const KURL&, bool)));
           connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
           d->localURLSlotFired = false;
           while (!d->localURLSlotFired) {
@@ -1885,7 +1885,7 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload )
   return s_pCache->listDir( this, realURL, _keep, _reload );
 }
 
-void KDirLister::slotLocalURL(KIO::Job *job, const KURL& url, bool isLocal) {
+void KDirLister::slotLocalURL(TDEIO::Job *job, const KURL& url, bool isLocal) {
   d->localURLSlotFired = true;
   d->localURLResultURL = url;
   d->localURLResultIsLocal = isLocal;
@@ -1979,8 +1979,8 @@ void KDirLister::emitChanges()
   if ( d->changes == NONE )
     return;
 
-  static const TQString& dot = KGlobal::staticQString(".");
-  static const TQString& dotdot = KGlobal::staticQString("..");
+  static const TQString& dot = TDEGlobal::staticQString(".");
+  static const TQString& dotdot = TDEGlobal::staticQString("..");
 
   for ( KURL::List::Iterator it = d->lstDirs.begin();
         it != d->lstDirs.end(); ++it )
@@ -2180,7 +2180,7 @@ bool KDirLister::matchesMimeFilter( const TQString& mime ) const
 bool KDirLister::matchesFilter( const KFileItem *item ) const
 {
   Q_ASSERT( item );
-  static const TQString& dotdot = KGlobal::staticQString("..");
+  static const TQString& dotdot = TDEGlobal::staticQString("..");
 
   if ( item->text() == dotdot )
     return false;
@@ -2248,7 +2248,7 @@ bool KDirLister::validURL( const KURL& _url ) const
   return s_pCache->validURL( this, _url );
 }
 
-void KDirLister::handleError( KIO::Job *job )
+void KDirLister::handleError( TDEIO::Job *job )
 {
   if ( d->autoErrorHandling )
     job->showErrorDialog( d->errorParent );
@@ -2382,20 +2382,20 @@ void KDirLister::emitDeleteItem( KFileItem *item )
 
 // ================ private slots ================ //
 
-void KDirLister::slotInfoMessage( KIO::Job *, const TQString& message )
+void KDirLister::slotInfoMessage( TDEIO::Job *, const TQString& message )
 {
   emit infoMessage( message );
 }
 
-void KDirLister::slotPercent( KIO::Job *job, unsigned long pcnt )
+void KDirLister::slotPercent( TDEIO::Job *job, unsigned long pcnt )
 {
-  d->jobData[static_cast<KIO::ListJob *>(job)].percent = pcnt;
+  d->jobData[static_cast<TDEIO::ListJob *>(job)].percent = pcnt;
 
   int result = 0;
 
-  KIO::filesize_t size = 0;
+  TDEIO::filesize_t size = 0;
 
-  TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
+  TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
   while ( dataIt != d->jobData.end() )
   {
     result += (*dataIt).percent * (*dataIt).totalSize;
@@ -2410,12 +2410,12 @@ void KDirLister::slotPercent( KIO::Job *job, unsigned long pcnt )
   emit percent( result );
 }
 
-void KDirLister::slotTotalSize( KIO::Job *job, KIO::filesize_t size )
+void KDirLister::slotTotalSize( TDEIO::Job *job, TDEIO::filesize_t size )
 {
-  d->jobData[static_cast<KIO::ListJob *>(job)].totalSize = size;
+  d->jobData[static_cast<TDEIO::ListJob *>(job)].totalSize = size;
 
-  KIO::filesize_t result = 0;
-  TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
+  TDEIO::filesize_t result = 0;
+  TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
   while ( dataIt != d->jobData.end() )
   {
     result += (*dataIt).totalSize;
@@ -2425,12 +2425,12 @@ void KDirLister::slotTotalSize( KIO::Job *job, KIO::filesize_t size )
   emit totalSize( result );
 }
 
-void KDirLister::slotProcessedSize( KIO::Job *job, KIO::filesize_t size )
+void KDirLister::slotProcessedSize( TDEIO::Job *job, TDEIO::filesize_t size )
 {
-  d->jobData[static_cast<KIO::ListJob *>(job)].processedSize = size;
+  d->jobData[static_cast<TDEIO::ListJob *>(job)].processedSize = size;
 
-  KIO::filesize_t result = 0;
-  TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
+  TDEIO::filesize_t result = 0;
+  TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
   while ( dataIt != d->jobData.end() )
   {
     result += (*dataIt).processedSize;
@@ -2440,12 +2440,12 @@ void KDirLister::slotProcessedSize( KIO::Job *job, KIO::filesize_t size )
   emit processedSize( result );
 }
 
-void KDirLister::slotSpeed( KIO::Job *job, unsigned long spd )
+void KDirLister::slotSpeed( TDEIO::Job *job, unsigned long spd )
 {
-  d->jobData[static_cast<KIO::ListJob *>(job)].speed = spd;
+  d->jobData[static_cast<TDEIO::ListJob *>(job)].speed = spd;
 
   int result = 0;
-  TQMap< KIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
+  TQMap< TDEIO::ListJob *, KDirListerPrivate::JobData >::Iterator dataIt = d->jobData.begin();
   while ( dataIt != d->jobData.end() )
   {
     result += (*dataIt).speed;
@@ -2460,12 +2460,12 @@ uint KDirLister::numJobs()
   return d->jobData.count();
 }
 
-void KDirLister::jobDone( KIO::ListJob *job )
+void KDirLister::jobDone( TDEIO::ListJob *job )
 {
   d->jobData.remove( job );
 }
 
-void KDirLister::jobStarted( KIO::ListJob *job )
+void KDirLister::jobStarted( TDEIO::ListJob *job )
 {
   KDirListerPrivate::JobData jobData;
   jobData.speed = 0;
@@ -2477,18 +2477,18 @@ void KDirLister::jobStarted( KIO::ListJob *job )
   d->complete = false;
 }
 
-void KDirLister::connectJob( KIO::ListJob *job )
+void KDirLister::connectJob( TDEIO::ListJob *job )
 {
-  connect( job, TQT_SIGNAL(infoMessage( KIO::Job *, const TQString& )),
-           this, TQT_SLOT(slotInfoMessage( KIO::Job *, const TQString& )) );
-  connect( job, TQT_SIGNAL(percent( KIO::Job *, unsigned long )),
-           this, TQT_SLOT(slotPercent( KIO::Job *, unsigned long )) );
-  connect( job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t )),
-           this, TQT_SLOT(slotTotalSize( KIO::Job *, KIO::filesize_t )) );
-  connect( job, TQT_SIGNAL(processedSize( KIO::Job *, KIO::filesize_t )),
-           this, TQT_SLOT(slotProcessedSize( KIO::Job *, KIO::filesize_t )) );
-  connect( job, TQT_SIGNAL(speed( KIO::Job *, unsigned long )),
-           this, TQT_SLOT(slotSpeed( KIO::Job *, unsigned long )) );
+  connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )),
+           this, TQT_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) );
+  connect( job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long )),
+           this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long )) );
+  connect( job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )),
+           this, TQT_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) );
+  connect( job, TQT_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )),
+           this, TQT_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) );
+  connect( job, TQT_SIGNAL(speed( TDEIO::Job *, unsigned long )),
+           this, TQT_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) );
 }
 
 void KDirLister::setMainWindow( TQWidget *window )
diff --git a/kio/kio/kdirlister.h b/tdeio/tdeio/kdirlister.h
index 2271b2a70..188f9ea7a 100644
--- a/kio/kio/kdirlister.h
+++ b/tdeio/tdeio/kdirlister.h
@@ -21,7 +21,7 @@
 #ifndef kdirlister_h
 #define kdirlister_h
 
-#include "kfileitem.h"
+#include "tdefileitem.h"
 #include "kdirnotify.h"
 
 #include <tqstring.h>
@@ -29,7 +29,7 @@
 
 #include <kurl.h>
 
-namespace KIO { class Job; class ListJob; }
+namespace TDEIO { class Job; class ListJob; }
 
 /**
  * The dir lister deals with the kiojob used to list and update a directory
@@ -52,7 +52,7 @@ namespace KIO { class Job; class ListJob; }
  * @short Helper class for the kiojob used to list and update a directory.
  * @author Michael Brade <brade@kde.org>
  */
-class KIO_EXPORT KDirLister : public TQObject
+class TDEIO_EXPORT KDirLister : public TQObject
 {
   class KDirListerPrivate;
   friend class KDirListerPrivate;
@@ -520,13 +520,13 @@ signals:
    * Emitted when we know the size of the jobs.
    * @param size the total size in bytes
    */
-  void totalSize( KIO::filesize_t size );
+  void totalSize( TDEIO::filesize_t size );
 
   /**
    * Regularly emitted to show the progress of this KDirLister.
    * @param size the processed size in bytes
    */
-  void processedSize( KIO::filesize_t size );
+  void processedSize( TDEIO::filesize_t size );
 
   /**
    * Emitted to display information about the speed of the jobs.
@@ -598,24 +598,24 @@ protected:
   virtual bool validURL( const KURL& ) const;
 
   /** Reimplement to customize error handling */
-  virtual void handleError( KIO::Job * );
+  virtual void handleError( TDEIO::Job * );
 
 protected:
   virtual void virtual_hook( int id, void *data );
 
 private slots:
-  void slotInfoMessage( KIO::Job *, const TQString& );
-  void slotPercent( KIO::Job *, unsigned long );
-  void slotTotalSize( KIO::Job *, KIO::filesize_t );
-  void slotProcessedSize( KIO::Job *, KIO::filesize_t );
-  void slotSpeed( KIO::Job *, unsigned long );
-  void slotLocalURL( KIO::Job *, const KURL&, bool );
+  void slotInfoMessage( TDEIO::Job *, const TQString& );
+  void slotPercent( TDEIO::Job *, unsigned long );
+  void slotTotalSize( TDEIO::Job *, TDEIO::filesize_t );
+  void slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t );
+  void slotSpeed( TDEIO::Job *, unsigned long );
+  void slotLocalURL( TDEIO::Job *, const KURL&, bool );
   void slotLocalURLKIODestroyed( );
 
 private:
-  void jobStarted( KIO::ListJob * );
-  void connectJob( KIO::ListJob * );
-  void jobDone( KIO::ListJob * );
+  void jobStarted( TDEIO::ListJob * );
+  void connectJob( TDEIO::ListJob * );
+  void jobDone( TDEIO::ListJob * );
 
   uint numJobs();
 
diff --git a/kio/kio/kdirlister_p.h b/tdeio/tdeio/kdirlister_p.h
index 047c83148..d6dff7bcf 100644
--- a/kio/kio/kdirlister_p.h
+++ b/tdeio/tdeio/kdirlister_p.h
@@ -20,7 +20,7 @@
 #ifndef kdirlister_p_h
 #define kdirlister_p_h
 
-#include "kfileitem.h"
+#include "tdefileitem.h"
 
 #include <tqmap.h>
 #include <tqdict.h>
@@ -28,13 +28,13 @@
 #include <tqwidget.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdirwatch.h>
 #include <dcopclient.h>
 
 class TQTimer;
 class KDirLister;
-namespace KIO { class Job; class ListJob; }
+namespace TDEIO { class Job; class ListJob; }
 
 
 class KDirLister::KDirListerPrivate
@@ -90,10 +90,10 @@ public:
 
   struct JobData {
     long unsigned int percent, speed;
-    KIO::filesize_t processedSize, totalSize;
+    TDEIO::filesize_t processedSize, totalSize;
   };
 
-  TQMap<KIO::ListJob *, JobData> jobData;
+  TQMap<TDEIO::ListJob *, JobData> jobData;
 
   // file item for the root itself (".")
   KFileItem *rootFileItem;
@@ -195,18 +195,18 @@ private slots:
 
   void slotFileDirtyDelayed();
 
-  void slotEntries( KIO::Job *job, const KIO::UDSEntryList &entries );
-  void slotResult( KIO::Job *j );
-  void slotRedirection( KIO::Job *job, const KURL &url );
+  void slotEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries );
+  void slotResult( TDEIO::Job *j );
+  void slotRedirection( TDEIO::Job *job, const KURL &url );
 
-  void slotUpdateEntries( KIO::Job *job, const KIO::UDSEntryList &entries );
-  void slotUpdateResult( KIO::Job *job );
+  void slotUpdateEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &entries );
+  void slotUpdateResult( TDEIO::Job *job );
 
 private:
-  KIO::ListJob *jobForUrl( const TQString& url, KIO::ListJob *not_job = 0 );
-  const KURL& joburl( KIO::ListJob *job );
+  TDEIO::ListJob *jobForUrl( const TQString& url, TDEIO::ListJob *not_job = 0 );
+  const KURL& joburl( TDEIO::ListJob *job );
 
-  void killJob( KIO::ListJob *job );
+  void killJob( TDEIO::ListJob *job );
 
   // check if _url is held by some lister and return true,
   // otherwise schedule a delayed update and return false
@@ -324,7 +324,7 @@ private:
   };
 
   static const unsigned short MAX_JOBS_PER_LISTER;
-  TQMap<KIO::ListJob *, KIO::UDSEntryList> jobs;
+  TQMap<TDEIO::ListJob *, TDEIO::UDSEntryList> jobs;
 
   // an item is a complete directory
   TQDict<DirItem> itemsInUse;
diff --git a/kio/kio/kdirnotify.cpp b/tdeio/tdeio/kdirnotify.cpp
index fb98196f5..fb98196f5 100644
--- a/kio/kio/kdirnotify.cpp
+++ b/tdeio/tdeio/kdirnotify.cpp
diff --git a/kio/kio/kdirnotify.h b/tdeio/tdeio/kdirnotify.h
index 2082569a1..14d864609 100644
--- a/kio/kio/kdirnotify.h
+++ b/tdeio/tdeio/kdirnotify.h
@@ -29,7 +29,7 @@
  * The information comes from the konqueror/kdesktop instance where the
  * operation was done, and can interest KDirListers, bookmark handlers, etc.
  */
-class KIO_EXPORT KDirNotify : public DCOPObject
+class TDEIO_EXPORT KDirNotify : public DCOPObject
 {
    K_DCOP
 protected:
diff --git a/kio/kio/kdirnotify_stub.cpp b/tdeio/tdeio/kdirnotify_stub.cpp
index 66988d6c9..66988d6c9 100644
--- a/kio/kio/kdirnotify_stub.cpp
+++ b/tdeio/tdeio/kdirnotify_stub.cpp
diff --git a/kio/kio/kdirnotify_stub.h b/tdeio/tdeio/kdirnotify_stub.h
index a807ecf82..56ab168c4 100644
--- a/kio/kio/kdirnotify_stub.h
+++ b/tdeio/tdeio/kdirnotify_stub.h
@@ -14,7 +14,7 @@
 #include <kurl.h>
 
 
-class KIO_EXPORT KDirNotify_stub : virtual public DCOPStub
+class TDEIO_EXPORT KDirNotify_stub : virtual public DCOPStub
 {
 public:
     KDirNotify_stub( const TQCString& app, const TQCString& id );
diff --git a/kio/kio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp
index 330e6cd39..01b4e0876 100644
--- a/kio/kio/kdirwatch.cpp
+++ b/tdeio/tdeio/kdirwatch.cpp
@@ -54,10 +54,10 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
 
@@ -109,7 +109,7 @@
 
 #include "kdirwatch.h"
 #include "kdirwatch_p.h"
-#include "global.h" //  KIO::probably_slow_mounted
+#include "global.h" //  TDEIO::probably_slow_mounted
 
 #define NO_NOTIFY (time_t) 0
 
@@ -196,7 +196,7 @@ void KDirWatchPrivate::dnotify_sigio_handler(int sig, siginfo_t *si, void *p)
  * are supported:
  * - Polling: All files to be watched are polled regularly
  *   using stat (more precise: TQFileInfo.lastModified()).
- *   The polling frequency is determined from global kconfig
+ *   The polling frequency is determined from global tdeconfig
  *   settings, defaulting to 500 ms for local directories
  *   and 5000 ms for remote mounts
  * - FAM (File Alternation Monitor): first used on IRIX, SGI
@@ -226,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate()
   delayRemove = false;
   m_ref = 0;
 
-  KConfigGroup config(KGlobal::config(), TQCString("DirWatch"));
+  TDEConfigGroup config(TDEGlobal::config(), TQCString("DirWatch"));
   m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000);
   m_PollInterval = config.readNumEntry("PollInterval", 500);
 
@@ -744,7 +744,7 @@ bool KDirWatchPrivate::useINotify( Entry* e )
 bool KDirWatchPrivate::useStat(Entry* e)
 {
   if ( e->path.startsWith("/media/") || (e->path == "/media")
-       || (KIO::probably_slow_mounted(e->path)) )
+       || (TDEIO::probably_slow_mounted(e->path)) )
     useFreq(e, m_nfsPollInterval);
   else
     useFreq(e, m_PollInterval);
@@ -1396,7 +1396,7 @@ bool KDirWatchPrivate::isNoisyFile( const char * filename )
     if (strncmp(filename, ".X.err", 6) == 0) return true;
     if (strncmp(filename, ".xsession-errors", 16) == 0) return true;
     // fontconfig updates the cache on every KDE app start
-    // (inclusive kio_thumbnail slaves)
+    // (inclusive tdeio_thumbnail slaves)
     if (strncmp(filename, ".fonts.cache", 12) == 0) return true;
   }
 
diff --git a/kio/kio/kdirwatch.h b/tdeio/tdeio/kdirwatch.h
index ac33a6ed5..4abaa302e 100644
--- a/kio/kio/kdirwatch.h
+++ b/tdeio/tdeio/kdirwatch.h
@@ -60,7 +60,7 @@ class KDirWatchPrivate;
   * @short Class for watching directory and file changes.
   * @author Sven Radej <sven@lisa.exp.univie.ac.at>
   */
-class KIO_EXPORT KDirWatch : public TQObject
+class TDEIO_EXPORT KDirWatch : public TQObject
 {
   Q_OBJECT
     
diff --git a/kio/kio/kdirwatch_p.h b/tdeio/tdeio/kdirwatch_p.h
index 8777f56b2..8777f56b2 100644
--- a/kio/kio/kdirwatch_p.h
+++ b/tdeio/tdeio/kdirwatch_p.h
diff --git a/kio/kio/kfilterbase.cpp b/tdeio/tdeio/kfilterbase.cpp
index f9250cfe9..eeb8e6a34 100644
--- a/kio/kio/kfilterbase.cpp
+++ b/tdeio/tdeio/kfilterbase.cpp
@@ -48,10 +48,10 @@ KFilterBase * KFilterBase::findFilterByFileName( const TQString & fileName )
 
 KFilterBase * KFilterBase::findFilterByMimeType( const TQString & mimeType )
 {
-    KTrader::OfferList offers = KTrader::self()->query( "TDECompressionFilter",
+    TDETrader::OfferList offers = TDETrader::self()->query( "TDECompressionFilter",
                                                         TQString("'") + mimeType + "' in ServiceTypes" );
-    KTrader::OfferList::ConstIterator it = offers.begin();
-    KTrader::OfferList::ConstIterator end = offers.end();
+    TDETrader::OfferList::ConstIterator it = offers.begin();
+    TDETrader::OfferList::ConstIterator end = offers.end();
 
     kdDebug(7005) << "KFilterBase::findFilterByMimeType(" << mimeType << ") got " << offers.count() << " offers" << endl;
     for (; it != end; ++it )
diff --git a/kio/kio/kfilterbase.h b/tdeio/tdeio/kfilterbase.h
index a9d143b6c..25613c101 100644
--- a/kio/kio/kfilterbase.h
+++ b/tdeio/tdeio/kfilterbase.h
@@ -35,7 +35,7 @@ class TQIODevice;
  * such as gzip and bzip2. It's pretty much internal.
  * Don't use directly, use KFilterDev instead.
  */
-class KIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create
+class TDEIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create
 {
     Q_OBJECT
 public:
diff --git a/kio/kio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp
index 87d54f5e3..87d54f5e3 100644
--- a/kio/kio/kfilterdev.cpp
+++ b/tdeio/tdeio/kfilterdev.cpp
diff --git a/kio/kio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h
index 2df49f2cc..8dd0999a9 100644
--- a/kio/kio/kfilterdev.h
+++ b/tdeio/tdeio/kfilterdev.h
@@ -33,7 +33,7 @@ class KFilterBase;
  *
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT KFilterDev : public TQIODevice
+class TDEIO_EXPORT KFilterDev : public TQIODevice
 {
 public:
     /**
diff --git a/kio/kio/kimageio.cpp b/tdeio/tdeio/kimageio.cpp
index 75622bf7d..d3768d297 100644
--- a/kio/kio/kimageio.cpp
+++ b/tdeio/tdeio/kimageio.cpp
@@ -11,7 +11,7 @@
 #include"config.h"
 
 #include <tqdir.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqstring.h>
 #include <tqregexp.h>
@@ -20,12 +20,12 @@
 #include <ltdl.h>
 #include "kimageio.h"
 #include "kimageiofactory.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmimetype.h>
-#include <ksycocaentry.h>
-#include <ksycoca.h>
+#include <tdesycocaentry.h>
+#include <tdesycoca.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
@@ -37,7 +37,7 @@ KImageIOFormat::KImageIOFormat( const TQString &path)
    bLibLoaded = false;
    mReadFunc = 0;
    mWriteFunc = 0;
-   KConfig config(path, true, false);
+   TDEConfig config(path, true, false);
 
    config.setGroup("Image Format");
    mType = config.readEntry("Type");
diff --git a/kio/kio/kimageio.h b/tdeio/tdeio/kimageio.h
index 3c14fb54d..671fb5f61 100644
--- a/kio/kio/kimageio.h
+++ b/tdeio/tdeio/kimageio.h
@@ -66,7 +66,7 @@
  * @see KImageIO, TQPixmap, TQImage, QImageIO
  * @author Sirtaj Singh Kang
  */
-class KIO_EXPORT KImageIO
+class TDEIO_EXPORT KImageIO
 {
 public:
   /**
diff --git a/kio/kio/kimageiofactory.h b/tdeio/tdeio/kimageiofactory.h
index 2ffe58e60..13312a2a2 100644
--- a/kio/kio/kimageiofactory.h
+++ b/tdeio/tdeio/kimageiofactory.h
@@ -8,19 +8,19 @@
 #ifndef SSK_KIMGIOFACTORY_H
 #define SSK_KIMGIOFACTORY_H
 
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include "kimageio.h"
 
 class KImageIOFormat;
 class KImageIOFormatList;
 
 /** \internal */
-class KIO_EXPORT KImageIOFormat : public KSycocaEntry
+class TDEIO_EXPORT KImageIOFormat : public KSycocaEntry
 {
   K_SYCOCATYPE( KST_KImageIOFormat, KSycocaEntry )
 
 public:
-  typedef KSharedPtr<KImageIOFormat> Ptr;
+  typedef TDESharedPtr<KImageIOFormat> Ptr;
   typedef TQValueList<Ptr> List;
 public: // KDoc seems to barf on those typedefs and generates no docs after them
   /**
@@ -76,7 +76,7 @@ protected:
 };
 
 /** \internal */
-class KIO_EXPORT KImageIOFormatList : public KImageIOFormat::List
+class TDEIO_EXPORT KImageIOFormatList : public KImageIOFormat::List
 {
 public:
    KImageIOFormatList() { }
@@ -84,7 +84,7 @@ public:
 
 
 /** \internal */
-class KIO_EXPORT KImageIOFactory : public KSycocaFactory
+class TDEIO_EXPORT KImageIOFactory : public KSycocaFactory
 {
   friend class KImageIO;
   K_SYCOCAFACTORY( KST_KImageIO )
diff --git a/kio/kio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h
index e2946d37a..602ba45a0 100644
--- a/kio/kio/klimitediodevice.h
+++ b/tdeio/tdeio/klimitediodevice.h
@@ -28,7 +28,7 @@
  * @author David Faure <david@mandrakesoft.com>
  * @since 3.1
  */
-class KIO_EXPORT KLimitedIODevice : public TQIODevice
+class TDEIO_EXPORT KLimitedIODevice : public TQIODevice
 {
 public:
     /**
diff --git a/kio/kio/kmdbase.h b/tdeio/tdeio/kmdbase.h
index b0c8f8b7d..b0c8f8b7d 100644
--- a/kio/kio/kmdbase.h
+++ b/tdeio/tdeio/kmdbase.h
diff --git a/kio/kio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h
index 94a960135..524eafa74 100644
--- a/kio/kio/kmessageboxwrapper.h
+++ b/tdeio/tdeio/kmessageboxwrapper.h
@@ -18,8 +18,8 @@
 
 #ifndef KMESSAGEBOXWRAPPER_H
 #define KMESSAGEBOXWRAPPER_H
-#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdemessagebox.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 /**
@@ -27,14 +27,14 @@
  * Allows KIO classes to display dialog boxes with the correct
  * theme/style even in non-GUI apps like kded and kfmclient
  */
-class KIO_EXPORT KMessageBoxWrapper : public KMessageBox
+class TDEIO_EXPORT KMessageBoxWrapper : public KMessageBox
 {
 public:
   static void error(TQWidget *parent, 
                     const TQString &text, 
                     const TQString &caption = TQString::null)
     {
-	if (KApplication::guiEnabled()) {
+	if (TDEApplication::guiEnabled()) {
      	  kapp->enableStyles();
       	  KMessageBox::error( parent, text, caption );
 	} else 
@@ -45,7 +45,7 @@ public:
                     const TQString &text,
                     const TQString &caption = TQString::null)
     {
-      if (KApplication::guiEnabled()) {
+      if (TDEApplication::guiEnabled()) {
 	 kapp->enableStyles();
          KMessageBox::sorry( parent, text, caption );
       } else
diff --git a/kio/kio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index e2c4c1fa7..4d75d8d58 100644
--- a/kio/kio/kmimemagic.cpp
+++ b/tdeio/tdeio/kmimemagic.cpp
@@ -18,7 +18,7 @@
 */
 #include "kmimemagic.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqfile.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
@@ -528,8 +528,8 @@ public:
         tmpDirs << TQString::fromLatin1("/tmp"); // default value
 
         // The trick is that we also don't want the user to override globally set
-        // directories. So we have to misuse KStandardDirs :}
-        TQStringList confDirs = KGlobal::dirs()->resourceDirs( "config" );
+        // directories. So we have to misuse TDEStandardDirs :}
+        TQStringList confDirs = TDEGlobal::dirs()->resourceDirs( "config" );
         if ( !confDirs.isEmpty() )
         {
             TQString globalConf = confDirs.last() + "kmimemagicrc";
@@ -2121,7 +2121,7 @@ KMimeMagic::KMimeMagic()
     TQString mimefile = locate( "mime", "magic" );
     init( mimefile );
     // Add snippets from share/config/magic/*
-    TQStringList snippets = KGlobal::dirs()->findAllResources( "config", "magic/*.magic", true );
+    TQStringList snippets = TDEGlobal::dirs()->findAllResources( "config", "magic/*.magic", true );
     for ( TQStringList::Iterator it = snippets.begin() ; it != snippets.end() ; ++it )
         if ( !mergeConfig( *it ) )
             kdWarning() << k_funcinfo << "Failed to parse " << *it << endl;
diff --git a/kio/kio/kmimemagic.h b/tdeio/tdeio/kmimemagic.h
index 49fb300ad..f5430a219 100644
--- a/kio/kio/kmimemagic.h
+++ b/tdeio/tdeio/kmimemagic.h
@@ -43,7 +43,7 @@ class KMimeMagic; // see below (read this one first)
  * It contains the mimetype and the encoding of
  * the file or buffer read.
  */
-class KIO_EXPORT_DEPRECATED KMimeMagicResult
+class TDEIO_EXPORT_DEPRECATED KMimeMagicResult
 {
 public:
   KMimeMagicResult() { m_iAccuracy = 100; }
@@ -98,7 +98,7 @@ protected:
  *
  * The result is contained in the class KMimeMagicResult.
  */
-class KIO_EXPORT_DEPRECATED KMimeMagic
+class TDEIO_EXPORT_DEPRECATED KMimeMagic
 {
 public:
   /**
diff --git a/kio/kio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 461207d9a..636c04eea 100644
--- a/kio/kio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 #include <kprotocolinfo.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include "kmimetype.h"
 #include "kservicetypefactory.h"
 #include "kmimemagic.h"
@@ -46,20 +46,20 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirwatch.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kde_file.h>
 
-template class KSharedPtr<KMimeType>;
+template class TDESharedPtr<KMimeType>;
 template class TQValueList<KMimeType::Ptr>;
 
 KMimeType::Ptr KMimeType::s_pDefaultType = 0L;
@@ -79,7 +79,7 @@ void KMimeType::buildDefaultType()
   else
   {
      errorMissingMimeType( defaultMimeType() );
-     KStandardDirs stdDirs;
+     TDEStandardDirs stdDirs;
      TQString sDefaultMimeType = stdDirs.resourceDirs("mime").first()+defaultMimeType()+".desktop";
      s_pDefaultType = new KMimeType( sDefaultMimeType, defaultMimeType(),
                                      "unknown", "mime", TQStringList() );
@@ -144,7 +144,7 @@ KMimeType::Ptr KMimeType::mimeType( const TQString& _name )
 
   if ( !mime || !mime->isType( KST_KMimeType ) )
   {
-    // When building ksycoca, findServiceTypeByName doesn't create an object
+    // When building tdesycoca, findServiceTypeByName doesn't create an object
     // but returns one from a dict.
     if ( !KSycoca::self()->isBuilding() )
         delete mime;
@@ -204,7 +204,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode,
 
   TQString fileName ( _url.fileName() );
 
-  static const TQString& slash = KGlobal::staticQString("/");
+  static const TQString& slash = TDEGlobal::staticQString("/");
   if ( ! fileName.isNull() && !path.endsWith( slash ) )
   {
       // Try to find it out by looking at the filename
@@ -230,9 +230,9 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode,
         }
       }
 
-      static const TQString& dotdesktop = KGlobal::staticQString(".desktop");
-      static const TQString& dotkdelnk = KGlobal::staticQString(".kdelnk");
-      static const TQString& dotdirectory = KGlobal::staticQString(".directory");
+      static const TQString& dotdesktop = TDEGlobal::staticQString(".desktop");
+      static const TQString& dotkdelnk = TDEGlobal::staticQString(".kdelnk");
+      static const TQString& dotdirectory = TDEGlobal::staticQString(".directory");
 
       // Another filename binding, hardcoded, is .desktop:
       if ( fileName.endsWith( dotdesktop ) )
@@ -426,7 +426,7 @@ void KMimeType::save( TQDataStream& _str )
 {
   KServiceType::save( _str );
   // Warning adding/removing fields here involves a binary incompatible change - update version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   _str << m_lstPatterns;
 }
 
@@ -450,10 +450,10 @@ KMimeType::~KMimeType()
 {
 }
 
-TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state,
+TQPixmap KMimeType::pixmap( TDEIcon::Group _group, int _force_size, int _state,
                            TQString * _path ) const
 {
-  KIconLoader *iconLoader=KGlobal::iconLoader();
+  TDEIconLoader *iconLoader=TDEGlobal::iconLoader();
   TQString iconName=icon( TQString::null, false );
   if (!iconLoader->extraDesktopThemesAdded())
   {
@@ -466,10 +466,10 @@ TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state,
   return iconLoader->loadIcon( iconName , _group, _force_size, _state, _path, false );
 }
 
-TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_size,
+TQPixmap KMimeType::pixmap( const KURL& _url, TDEIcon::Group _group, int _force_size,
                            int _state, TQString * _path ) const
 {
-  KIconLoader *iconLoader=KGlobal::iconLoader();
+  TDEIconLoader *iconLoader=TDEGlobal::iconLoader();
   TQString iconName=icon( _url, _url.isLocalFile() );
   if (!iconLoader->extraDesktopThemesAdded())
   {
@@ -482,10 +482,10 @@ TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_si
   return iconLoader->loadIcon( iconName , _group, _force_size, _state, _path, false );
 }
 
-TQPixmap KMimeType::pixmapForURL( const KURL & _url, mode_t _mode, KIcon::Group _group,
+TQPixmap KMimeType::pixmapForURL( const KURL & _url, mode_t _mode, TDEIcon::Group _group,
                                  int _force_size, int _state, TQString * _path )
 {
-  KIconLoader *iconLoader=KGlobal::iconLoader();
+  TDEIconLoader *iconLoader=TDEGlobal::iconLoader();
   TQString iconName = iconForURL( _url, _mode );
 
   if (!iconLoader->extraDesktopThemesAdded())
@@ -504,7 +504,7 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode )
 {
     const KMimeType::Ptr mt = findByURL( _url, _mode, _url.isLocalFile(),
                                          false /*HACK*/);
-    static const TQString& unknown = KGlobal::staticQString("unknown");
+    static const TQString& unknown = TDEGlobal::staticQString("unknown");
     const TQString mimeTypeIcon = mt->icon( _url, _url.isLocalFile() );
     TQString i = mimeTypeIcon;
 
@@ -533,8 +533,8 @@ TQString KMimeType::favIconForURL( const KURL& url )
     static bool check = true;
     if ( check ) {
         check = false;
-        KConfig *config = KGlobal::config();
-        KConfigGroupSaver cs( config, "HTML Settings" );
+        TDEConfig *config = TDEGlobal::config();
+        TDEConfigGroupSaver cs( config, "HTML Settings" );
         useFavIcons = config->readBoolEntry( "EnableFavicon", true );
     }
 
@@ -605,9 +605,9 @@ TQString KFolderType::icon( const KURL& _url, bool _is_local ) const
   u.addPath( ".directory" );
 
   TQString icon;
-  // using KStandardDirs as this one checks for path being
+  // using TDEStandardDirs as this one checks for path being
   // a file instead of a directory
-  if ( KStandardDirs::exists( u.path() ) )
+  if ( TDEStandardDirs::exists( u.path() ) )
   {
     KSimpleConfig cfg( u.path(), true );
     cfg.setDesktopGroup();
@@ -717,7 +717,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
     TQString dev = cfg.readEntry( "Dev" );
     if ( !icon.isEmpty() && !unmount_icon.isEmpty() && !dev.isEmpty() )
     {
-      TQString mp = KIO::findDeviceMountPoint( dev );
+      TQString mp = TDEIO::findDeviceMountPoint( dev );
       // Is the device not mounted ?
       if ( mp.isNull() )
         return unmount_icon;
@@ -729,7 +729,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
           const KURL url( u );
           if ( url.protocol() == "trash" ) {
               // We need to find if the trash is empty, preferrably without using a KIO job.
-              // So instead kio_trash leaves an entry in its config file for us.
+              // So instead tdeio_trash leaves an entry in its config file for us.
               KSimpleConfig trashConfig( "trashrc", true );
               trashConfig.setGroup( "Status" );
               if ( trashConfig.readBoolEntry( "Empty", true ) ) {
@@ -745,14 +745,14 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
   return icon;
 }
 
-TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_size,
+TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, TDEIcon::Group _group, int _force_size,
                                     int _state, TQString * _path ) const
 {
   TQString _icon = icon( _url, _url.isLocalFile() );
-  TQPixmap pix = KGlobal::iconLoader()->loadIcon( _icon, _group,
+  TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( _icon, _group,
         _force_size, _state, _path, false );
   if ( pix.isNull() )
-      pix = KGlobal::iconLoader()->loadIcon( "unknown", _group,
+      pix = TDEGlobal::iconLoader()->loadIcon( "unknown", _group,
         _force_size, _state, _path, false );
   return pix;
 }
@@ -831,7 +831,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf
     return retval;
   }
 
-  TQString mp = KIO::findDeviceMountPoint( dev );
+  TQString mp = TDEIO::findDeviceMountPoint( dev );
   // Is the device already mounted ?
   if ( !mp.isNull() )
   {
@@ -900,12 +900,12 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & )
   args << url.path();
 
   int pid;
-  if ( !KApplication::tdeinitExec("kfmclient", args, 0, &pid) )
+  if ( !TDEApplication::tdeinitExec("kfmclient", args, 0, &pid) )
       return pid;
 
-  KProcess p;
+  TDEProcess p;
   p << "kfmclient" << args;
-  p.start(KProcess::DontCare);
+  p.start(TDEProcess::DontCare);
   return p.pid();
 }
 
@@ -933,7 +933,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::builtinServices( co
     }
     else
     {
-      TQString mp = KIO::findDeviceMountPoint( dev );
+      TQString mp = TDEIO::findDeviceMountPoint( dev );
       // not mounted ?
       if ( mp.isEmpty() )
       {
@@ -968,12 +968,12 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices
   return userDefinedServices( path, cfg, bLocalFiles );
 }
 
-TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, KConfig& cfg, bool bLocalFiles )
+TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, TDEConfig& cfg, bool bLocalFiles )
 {
  return userDefinedServices( path, cfg, bLocalFiles, KURL::List() );
 }
 
-TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, KConfig& cfg, bool bLocalFiles, const KURL::List & file_list )
+TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, TDEConfig& cfg, bool bLocalFiles, const KURL::List & file_list )
 {
   TQValueList<Service> result;
 
@@ -985,7 +985,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices
   if ( cfg.hasKey( "TryExec" ) )
   {
       TQString tryexec = cfg.readPathEntry( "TryExec" );
-      TQString exe =  KStandardDirs::findExe( tryexec );
+      TQString exe =  TDEStandardDirs::findExe( tryexec );
       if (exe.isEmpty()) {
           return result;
       }
@@ -1114,7 +1114,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT
       KMessageBoxWrapper::error( 0, tmp );
       return;
     }
-    TQString mp = KIO::findDeviceMountPoint( dev );
+    TQString mp = TDEIO::findDeviceMountPoint( dev );
 
     if ( _service.m_type == ST_MOUNT )
     {
@@ -1152,7 +1152,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT
 const TQString & KMimeType::defaultMimeType()
 {
     static const TQString & s_strDefaultMimeType =
-        KGlobal::staticQString( "application/octet-stream" );
+        TDEGlobal::staticQString( "application/octet-stream" );
     return s_strDefaultMimeType;
 }
 
diff --git a/kio/kio/kmimetype.h b/tdeio/tdeio/kmimetype.h
index b5ffdc9df..894c4556c 100644
--- a/kio/kio/kmimetype.h
+++ b/tdeio/tdeio/kmimetype.h
@@ -29,7 +29,7 @@
 
 #include <kicontheme.h>
 #include <kurl.h>
-#include <ksycocatype.h>
+#include <tdesycocatype.h>
 #include <kservicetype.h>
 
 class KSimpleConfig;
@@ -44,12 +44,12 @@ class KSimpleConfig;
  *
  * @see KServiceType
  */
-class KIO_EXPORT KMimeType : public KServiceType
+class TDEIO_EXPORT KMimeType : public KServiceType
 {
   K_SYCOCATYPE( KST_KMimeType, KServiceType )
 
 public:
-  typedef KSharedPtr<KMimeType> Ptr;
+  typedef TDESharedPtr<KMimeType> Ptr;
   typedef TQValueList<Ptr> List;
 public:
   /**
@@ -120,13 +120,13 @@ public:
    * @param group The icon group where the icon is going to be used.
    * @param force_size Override globallly configured icon size.
    *        Use 0 for the default size
-   * @param state The icon state, one of: @p KIcon::DefaultState,
-   *         @p KIcon::ActiveState or @p KIcon::DisabledState.
+   * @param state The icon state, one of: @p TDEIcon::DefaultState,
+   *         @p TDEIcon::ActiveState or @p TDEIcon::DisabledState.
    * @param path Output parameter to get the full path. Seldom needed.
    *              Ignored if 0
    * @return the pixmap of the mime type, can be a default icon if not found
    */
-  virtual TQPixmap pixmap( KIcon::Group group, int force_size = 0, int state = 0,
+  virtual TQPixmap pixmap( TDEIcon::Group group, int force_size = 0, int state = 0,
                           TQString * path = 0L ) const;
 
   /**
@@ -139,13 +139,13 @@ public:
    * @param _group The icon group where the icon is going to be used.
    * @param _force_size Override globallly configured icon size.
    *        Use 0 for the default size
-   * @param _state The icon state, one of: KIcon::DefaultState,
-   * KIcon::ActiveState or KIcon::DisabledState.
+   * @param _state The icon state, one of: TDEIcon::DefaultState,
+   * TDEIcon::ActiveState or TDEIcon::DisabledState.
    * @param _path Output parameter to get the full path. Seldom needed.
    *              Ignored if 0
    * @return the pixmap of the URL, can be a default icon if not found
    */
-  virtual TQPixmap pixmap( const KURL& _url, KIcon::Group _group, int _force_size = 0,
+  virtual TQPixmap pixmap( const KURL& _url, TDEIcon::Group _group, int _force_size = 0,
 	    int _state = 0, TQString * _path = 0L ) const;
 
   /**
@@ -160,19 +160,19 @@ public:
    * @param _group The icon group where the icon is going to be used.
    * @param _force_size Override globally configured icon size.
    *        Use 0 for the default size
-   * @param _state The icon state, one of: KIcon::DefaultState,
-   * KIcon::ActiveState or KIcon::DisabledState.
+   * @param _state The icon state, one of: TDEIcon::DefaultState,
+   * TDEIcon::ActiveState or TDEIcon::DisabledState.
    * @param _path Output parameter to get the full path. Seldom needed.
    *              Ignored if 0
    * @return the pixmap of the URL, can be a default icon if not found
    */
-  static TQPixmap pixmapForURL( const KURL & _url, mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
+  static TQPixmap pixmapForURL( const KURL & _url, mode_t _mode = 0, TDEIcon::Group _group = TDEIcon::Desktop,
                                int _force_size = 0, int _state = 0, TQString * _path = 0L );
 
 
   /**
    * The same functionality as pixmapForURL(), but this method returns the name
-   * of the icon to load. You'll have to use KIconLoader to load the pixmap for it.
+   * of the icon to load. You'll have to use TDEIconLoader to load the pixmap for it.
    * The advantage of this method is that you can store the result, and then use it
    * later on for any kind of size.
    * @param _url URL for the file
@@ -474,7 +474,7 @@ protected:
  * Folder mime type. Handles locked folders, for instance.
  * @short Mimetype for a folder (inode/directory)
  */
-class KIO_EXPORT KFolderType : public KMimeType
+class TDEIO_EXPORT KFolderType : public KMimeType
 {
   K_SYCOCATYPE( KST_KFolderType, KMimeType )
 
@@ -503,7 +503,7 @@ protected:
  * Handles mount/umount icon, and user-defined properties.
  * @short Mimetype for a .desktop file
  */
-class KIO_EXPORT KDEDesktopMimeType : public KMimeType
+class TDEIO_EXPORT KDEDesktopMimeType : public KMimeType
 {
   K_SYCOCATYPE( KST_KDEDesktopMimeType, KMimeType )
 
@@ -537,7 +537,7 @@ public:
 
   virtual TQString icon( const TQString& _url, bool _is_local ) const;
   virtual TQString icon( const KURL& _url, bool _is_local ) const;
-  virtual TQPixmap pixmap( const KURL& _url, KIcon::Group _group, int _force_size = 0,
+  virtual TQPixmap pixmap( const KURL& _url, TDEIcon::Group _group, int _force_size = 0,
                           int _state = 0, TQString * _path = 0L ) const;
   virtual TQString comment( const TQString& _url, bool _is_local ) const;
   virtual TQString comment( const KURL& _url, bool _is_local ) const;
@@ -561,11 +561,11 @@ public:
   static TQValueList<Service> userDefinedServices( const TQString& path, bool bLocalFiles );
 
   /**
-   * Overload of userDefinedServices for speed purposes: it takes a KConfig* so that
+   * Overload of userDefinedServices for speed purposes: it takes a TDEConfig* so that
    * the caller can check things in the file without having it parsed twice.
    * @since 3.4
    */
-  static TQValueList<Service> userDefinedServices( const TQString& path, KConfig& config, bool bLocalFiles );
+  static TQValueList<Service> userDefinedServices( const TQString& path, TDEConfig& config, bool bLocalFiles );
 
   /**
    * Overload of userDefinedServices but also allows you to pass a list of urls for this file.
@@ -573,7 +573,7 @@ public:
    * the X-TDE-GetActionMenu extension.
    * @since 3.5
    */
-  static TQValueList<Service> userDefinedServices( const TQString& path, KConfig& config, bool bLocalFiles,  const KURL::List & file_list);
+  static TQValueList<Service> userDefinedServices( const TQString& path, TDEConfig& config, bool bLocalFiles,  const KURL::List & file_list);
 
   /**
    * @param path is the path of the desktop entry.
@@ -603,7 +603,7 @@ public:
   static pid_t run( const KURL& _url, bool _is_local );
 
 protected:
-  virtual TQPixmap pixmap( KIcon::Group group, int force_size = 0, int state = 0,
+  virtual TQPixmap pixmap( TDEIcon::Group group, int force_size = 0, int state = 0,
                           TQString * path = 0L ) const
      { return KMimeType::pixmap( group, force_size, state, path ); }
 
@@ -619,7 +619,7 @@ protected:
  * The mime type for executable files.
  * @short MimeType for any executable, like /bin/ls
  */
-class KIO_EXPORT KExecMimeType : public KMimeType
+class TDEIO_EXPORT KExecMimeType : public KMimeType
 {
   K_SYCOCATYPE( KST_KExecMimeType, KMimeType )
 
diff --git a/kio/kio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 78011e143..ffc9a4c78 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -18,14 +18,14 @@
 
 #include "kmimetypechooser.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klistview.h>
-#include <klocale.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <krun.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
@@ -37,7 +37,7 @@
 class KMimeTypeChooserPrivate
 {
   public:
-    KListView *lvMimeTypes;
+    TDEListView *lvMimeTypes;
     TQPushButton *btnEditMimeType;
 
     TQString defaultgroup;
@@ -70,7 +70,7 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text,
     new TQLabel( text, this );
   }
 
-  d->lvMimeTypes = new KListView( this );
+  d->lvMimeTypes = new TDEListView( this );
 
   d->lvMimeTypes->addColumn( i18n("Mime Type") );
 //   d->lvMimeTypes->setColumnWidthMode( 0, TQListView::Manual );
@@ -198,7 +198,7 @@ void KMimeTypeChooser::editMimeType()
   TQString keditfiletype = TQString::fromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype
                     + " --parent " + TQString::number( (ulong)topLevelWidget()->winId())
-                    + " " + KProcess::quote(mt),
+                    + " " + TDEProcess::quote(mt),
                     keditfiletype, keditfiletype /*unused*/);
 }
 
@@ -261,7 +261,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog(
                                   this, "chooser" );
   setMainWidget(m_chooser);
 
-  KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog");
+  TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
   TQSize defaultSize( 400, 300 );
   resize( group.readSizeEntry("size", &defaultSize) );
 }
@@ -280,7 +280,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog(
                                   this, "chooser" );
   setMainWidget(m_chooser);
 
-  KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog");
+  TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
   TQSize defaultSize( 400, 300 );
   resize( group.readSizeEntry("size", &defaultSize) );
 }
@@ -288,7 +288,7 @@ KMimeTypeChooserDialog::KMimeTypeChooserDialog(
 
 KMimeTypeChooserDialog::~KMimeTypeChooserDialog()
 {
-  KConfigGroup group( KGlobal::config(), "KMimeTypeChooserDialog");
+  TDEConfigGroup group( TDEGlobal::config(), "KMimeTypeChooserDialog");
   group.writeEntry("size", size());
 }
 
diff --git a/kio/kio/kmimetypechooser.h b/tdeio/tdeio/kmimetypechooser.h
index 355eeb707..16ec052f5 100644
--- a/kio/kio/kmimetypechooser.h
+++ b/tdeio/tdeio/kmimetypechooser.h
@@ -31,7 +31,7 @@
  *
  * @author Anders Lund (anders at alweb dk), jan 23, 2002
  */
-class KIO_EXPORT KMimeTypeChooser : public TQVBox
+class TDEIO_EXPORT KMimeTypeChooser : public TQVBox
 {
   Q_OBJECT
 
@@ -128,7 +128,7 @@ class KIO_EXPORT KMimeTypeChooser : public TQVBox
   *
   * @author Anders Lund (anders at alweb dk) dec 19, 2001
   */
-class KIO_EXPORT KMimeTypeChooserDialog : public KDialogBase
+class TDEIO_EXPORT KMimeTypeChooserDialog : public KDialogBase
 {
   public:
     /**
diff --git a/kio/kio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h
index fdbbb1e5b..c8828a0da 100644
--- a/kio/kio/kmimetyperesolver.h
+++ b/tdeio/tdeio/kmimetyperesolver.h
@@ -31,7 +31,7 @@
  * A baseclass for KMimeTypeResolver, with the interface,
  * KMimeTypeResolverHelper uses.
  */
-class KIO_EXPORT KMimeTypeResolverBase
+class TDEIO_EXPORT KMimeTypeResolverBase
 {
 public:
     virtual void slotViewportAdjusted() = 0;
@@ -46,7 +46,7 @@ protected:
  * itself. So an object of this class is used to handle signals, slots etc.
  * and forwards them to the KMimeTypeResolver instance.
  */
-class KIO_EXPORT KMimeTypeResolverHelper : public TQObject
+class TDEIO_EXPORT KMimeTypeResolverHelper : public TQObject
 {
     Q_OBJECT
 
diff --git a/kio/kio/knfsshare.cpp b/tdeio/tdeio/knfsshare.cpp
index f0fdfce6d..b4a3d903a 100644
--- a/kio/kio/knfsshare.cpp
+++ b/tdeio/tdeio/knfsshare.cpp
@@ -23,7 +23,7 @@
 #include <kdirwatch.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "knfsshare.h"
 
@@ -47,12 +47,12 @@ KNFSSharePrivate::KNFSSharePrivate()
 
 /**
  * Try to find the nfs config file path
- * First tries the kconfig, then checks
+ * First tries the tdeconfig, then checks
  * several well-known paths
  * @return wether an 'exports' file was found.
  **/
 bool KNFSSharePrivate::findExportsFile() {
-  KConfig config("knfsshare");
+  TDEConfig config("knfsshare");
   config.setGroup("General");
   exportsFile = config.readPathEntry("exportsFile");
 
diff --git a/kio/kio/knfsshare.h b/tdeio/tdeio/knfsshare.h
index fd6587600..64cd28dcf 100644
--- a/kio/kio/knfsshare.h
+++ b/tdeio/tdeio/knfsshare.h
@@ -32,7 +32,7 @@ class KNFSSharePrivate;
  * It parses the /etc/exports file to get its information.
  * Singleton class, call instance() to get an instance.
  */
-class KIO_EXPORT KNFSShare : public TQObject 
+class TDEIO_EXPORT KNFSShare : public TQObject 
 {
 Q_OBJECT
 public:
diff --git a/kio/kio/kprotocolinfo.cpp b/tdeio/tdeio/kprotocolinfo.cpp
index f297907e0..bf11060e4 100644
--- a/kio/kio/kprotocolinfo.cpp
+++ b/tdeio/tdeio/kprotocolinfo.cpp
@@ -18,13 +18,13 @@
 */
 
 #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32)
-#undef KIO_EXPORT
-#define KIO_EXPORT KDE_EXPORT
+#undef TDEIO_EXPORT
+#define TDEIO_EXPORT KDE_EXPORT
 #endif
 
 #include "kprotocolinfo.h"
 #include "kprotocolinfofactory.h"
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
 // Most of this class is implemented in tdecore/kprotocolinfo_tdecore.cpp
 // This file only contains a few static class-functions that depend on
diff --git a/kio/kio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h
index a3c579034..6de45c1a7 100644
--- a/kio/kio/kprotocolinfo.h
+++ b/tdeio/tdeio/kprotocolinfo.h
@@ -24,8 +24,8 @@
 #include <tqdatastream.h>
 
 #include <kurl.h>
-#include <ksycocaentry.h>
-#include <ksycocatype.h>
+#include <tdesycocaentry.h>
+#include <tdesycocatype.h>
 
 /**
  * Information about I/O (Internet, etc.) protocols supported by KDE.
@@ -34,20 +34,20 @@
  * KDE supports. In addition you can find out lots of information
  * about a certain protocol. A KProtocolInfo instance represents a
  * single protocol. Most of the functionality is provided by the static
- * methods that scan the *.protocol files of all installed kioslaves to get
+ * methods that scan the *.protocol files of all installed tdeioslaves to get
  * this information.
  *
  * *.protocol files are installed in the "services" resource.
  *
  * @author Torben Weis <weis@kde.org>
  */
-class KIO_EXPORT KProtocolInfo : public KSycocaEntry
+class TDEIO_EXPORT KProtocolInfo : public KSycocaEntry
 {
   friend class KProtocolInfoFactory;
   K_SYCOCATYPE( KST_KProtocolInfo, KSycocaEntry )
 
 public:
-  typedef KSharedPtr<KProtocolInfo> Ptr;
+  typedef TDESharedPtr<KProtocolInfo> Ptr;
 
 public:
   /**
@@ -104,8 +104,8 @@ public:
 
   /**
    * Returns the library / executable to open for the protocol @p protocol
-   * Example : "kio_ftp", meaning either the executable "kio_ftp" or
-   * the library "kio_ftp.la" (recommended), whichever is available.
+   * Example : "tdeio_ftp", meaning either the executable "tdeio_ftp" or
+   * the library "tdeio_ftp.la" (recommended), whichever is available.
    *
    * This corresponds to the "exec=" field in the protocol description file.
    * @param protocol the protocol to check
@@ -422,7 +422,7 @@ public:
    * copying a file or directory to another directory. By default the destination
    * filename is made out of the filename in the source URL. However if the
    * ioslave displays names that are different from the filename of the URL
-   * (e.g. kio_fonts shows Arial for arial.ttf, or kio_trash shows foo.txt and
+   * (e.g. tdeio_fonts shows Arial for arial.ttf, or tdeio_trash shows foo.txt and
    * uses some internal URL), using Name means that the display name (UDS_NAME)
    * will be used to as the filename in the destination directory.
    *
@@ -555,7 +555,7 @@ public:
   static KURL::URIMode uriParseMode( const TQString& protocol );
 
   /**
-   * Returns the list of capabilities provided by the kioslave implementing
+   * Returns the list of capabilities provided by the tdeioslave implementing
    * this protocol.
    *
    * This corresponds to the "Capabilities=" field in the protocol description file.
@@ -565,7 +565,7 @@ public:
    * special command for mounting, one would add the string "Mount" to the
    * capabilities list, and applications could check for that string
    * before sending a special() command that would otherwise do nothing
-   * on older kioslave implementations.
+   * on older tdeioslave implementations.
    *
    * @param protocol the protocol to check
    * @return the list of capabilities.
@@ -682,7 +682,7 @@ private:
   KProtocolInfoPrivate* d;
 };
 
-KIO_EXPORT TQDataStream& operator>>( TQDataStream& s, KProtocolInfo::ExtraField& field );
-KIO_EXPORT TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& field );
+TDEIO_EXPORT TQDataStream& operator>>( TQDataStream& s, KProtocolInfo::ExtraField& field );
+TDEIO_EXPORT TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& field );
 
 #endif
diff --git a/kio/kio/kremoteencoding.cpp b/tdeio/tdeio/kremoteencoding.cpp
index 632eeb8b2..632eeb8b2 100644
--- a/kio/kio/kremoteencoding.cpp
+++ b/tdeio/tdeio/kremoteencoding.cpp
diff --git a/kio/kio/kremoteencoding.h b/tdeio/tdeio/kremoteencoding.h
index 35191d8e5..18dfe1fdb 100644
--- a/kio/kio/kremoteencoding.h
+++ b/tdeio/tdeio/kremoteencoding.h
@@ -31,17 +31,17 @@ class KRemoteEncodingPrivate;
  * Certain protocols do not specify an appropriate encoding for decoding
  * their 8-bit data into proper Unicode forms. Therefore, ioslaves should
  * use this class in order to convert those forms into QStrings before
- * creating the respective KIO::UDSEntry. The same is true for decoding
+ * creating the respective TDEIO::UDSEntry. The same is true for decoding
  * URLs to its components.
  *
- * Each KIO::SlaveBase has one object of this kind, even if it is not necessary.
- * It can be accessed through KIO::SlaveBase::remoteEncoding.
+ * Each TDEIO::SlaveBase has one object of this kind, even if it is not necessary.
+ * It can be accessed through TDEIO::SlaveBase::remoteEncoding.
  *
  * @short A class for handling remote filenames
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @since 3.3
  */
-class KIO_EXPORT KRemoteEncoding
+class TDEIO_EXPORT KRemoteEncoding
 {
 public:
   /**
diff --git a/kio/kio/krun.cpp b/tdeio/tdeio/krun.cpp
index 93cbe677a..d92e3ca11 100644
--- a/kio/kio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -32,19 +32,19 @@
 #include "kuserprofile.h"
 #include "kmimetype.h"
 #include "kmimemagic.h"
-#include "kio/job.h"
-#include "kio/global.h"
-#include "kio/scheduler.h"
-#include "kio/netaccess.h"
-#include "kfile/kopenwith.h"
-#include "kfile/krecentdocument.h"
+#include "tdeio/job.h"
+#include "tdeio/global.h"
+#include "tdeio/scheduler.h"
+#include "tdeio/netaccess.h"
+#include "tdefile/kopenwith.h"
+#include "tdefile/tderecentdocument.h"
 
 #include <kdatastream.h>
 #include <kmessageboxwrapper.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
@@ -55,7 +55,7 @@
 #include <tqdatetime.h>
 #include <tqregexp.h>
 #include <kdesktopfile.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <kmacroexpander.h>
 #include <kshell.h>
 #include <kde_file.h>
@@ -184,7 +184,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window,
   KURL::List lst;
   lst.append( u );
 
-  static const TQString& app_str = KGlobal::staticQString("Application");
+  static const TQString& app_str = TDEGlobal::staticQString("Application");
 
   KService::Ptr offer = KServiceTypeProfile::preferredService( _mimetype, app_str );
 
@@ -211,7 +211,7 @@ bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles )
 
 bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles, const TQString& suggestedFileName )
 {
-    if (kapp && !kapp->authorizeKAction("openwith"))
+    if (kapp && !kapp->authorizeTDEAction("openwith"))
     {
        // TODO: Better message, i18n freeze :-(
        KMessageBox::sorry(0L, i18n("You are not authorized to open this file."));
@@ -403,24 +403,24 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
   if( !mx1.expandMacrosShellQuote( exec ) )
     goto synerr; // error in shell syntax
 
-  // FIXME: the current way of invoking kioexec disables term and su use
+  // FIXME: the current way of invoking tdeioexec disables term and su use
 
-  // Check if we need "tempexec" (kioexec in fact)
+  // Check if we need "tempexec" (tdeioexec in fact)
   appHasTempFileOption = tempFiles && _service.property("X-TDE-HasTempFileOption").toBool();
   if( tempFiles && !appHasTempFileOption && _urls.size() ) {
-    result << "kioexec" << "--tempfiles" << exec;
+    result << "tdeioexec" << "--tempfiles" << exec;
     result += _urls.toStringList();
     if (has_shell)
       result = KShell::joinArgs( result );
     return result;
   }
 
-  // Check if we need kioexec
+  // Check if we need tdeioexec
   if( !mx1.hasUrls ) {
     for( KURL::List::ConstIterator it = _urls.begin(); it != _urls.end(); ++it )
       if ( !(*it).isLocalFile() && !KProtocolInfo::isHelperProtocol(*it) ) {
-        // We need to run the app through kioexec
-        result << "kioexec";
+        // We need to run the app through tdeioexec
+        result << "tdeioexec";
         if ( tempFiles )
             result << "--tempfiles";
         if ( !suggestedFileName.isEmpty() ) {
@@ -476,8 +476,8 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
 */
 
   if (_service.terminal()) {
-    KConfigGroupSaver gs(KGlobal::config(), "General");
-    TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
+    TDEConfigGroupSaver gs(TDEGlobal::config(), "General");
+    TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
     if (terminal == "konsole")
       terminal += " -caption=%c %i %m";
     terminal += " ";
@@ -549,7 +549,7 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath )
   return TQString();
 }
 
-static pid_t runCommandInternal( KProcess* proc, const KService* service, const TQString& binName,
+static pid_t runCommandInternal( TDEProcess* proc, const KService* service, const TQString& binName,
     const TQString &execName, const TQString & iconName, TQWidget* window, TQCString asn )
 {
   if (service && !service->desktopEntryPath().isEmpty()
@@ -563,13 +563,13 @@ static pid_t runCommandInternal( KProcess* proc, const KService* service, const
 #ifdef Q_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification
   bool silent;
   TQCString wmclass;
-  KStartupInfoId id;
+  TDEStartupInfoId id;
   bool startup_notify = ( asn != "0" && KRun::checkStartupNotify( binName, service, &silent, &wmclass ));
   if( startup_notify )
   {
       id.initId( asn );
       id.setupStartupEnv();
-      KStartupInfoData data;
+      TDEStartupInfoData data;
       data.setHostname();
       data.setBin( bin );
       if( !execName.isEmpty())
@@ -584,29 +584,29 @@ static pid_t runCommandInternal( KProcess* proc, const KService* service, const
       if( !wmclass.isEmpty())
           data.setWMClass( wmclass );
       if( silent )
-          data.setSilent( KStartupInfoData::Yes );
+          data.setSilent( TDEStartupInfoData::Yes );
       data.setDesktop( KWin::currentDesktop());
       if( window )
           data.setLaunchedBy( window->winId());
-      KStartupInfo::sendStartup( id, data );
+      TDEStartupInfo::sendStartup( id, data );
   }
-  pid_t pid = KProcessRunner::run( proc, binName, id );
+  pid_t pid = TDEProcessRunner::run( proc, binName, id );
   if( startup_notify && pid )
   {
-      KStartupInfoData data;
+      TDEStartupInfoData data;
       data.addPid( pid );
-      KStartupInfo::sendChange( id, data );
-      KStartupInfo::resetStartupEnv();
+      TDEStartupInfo::sendChange( id, data );
+      TDEStartupInfo::resetStartupEnv();
   }
   return pid;
 #else
   Q_UNUSED( execName );
   Q_UNUSED( iconName );
-  return KProcessRunner::run( proc, bin );
+  return TDEProcessRunner::run( proc, bin );
 #endif
 }
 
-// This code is also used in klauncher.
+// This code is also used in tdelauncher.
 bool KRun::checkStartupNotify( const TQString& /*binName*/, const KService* service, bool* silent_arg, TQCString* wmclass_arg )
 {
   bool silent = false;
@@ -681,9 +681,9 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls,
   {
       args = KRun::processDesktopExec(_service, _urls, false, tempFiles, suggestedFileName);
   }
-  kdDebug(7010) << "runTempService: KProcess args=" << args << endl;
+  kdDebug(7010) << "runTempService: TDEProcess args=" << args << endl;
 
-  KProcess * proc = new KProcess;
+  TDEProcess * proc = new TDEProcess;
   *proc << args;
 
   if (!_service.path().isEmpty())
@@ -693,7 +693,7 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls,
                              _service.name(), _service.icon(), window, asn );
 }
 
-// WARNING: don't call this from processDesktopExec, since klauncher uses that too...
+// WARNING: don't call this from processDesktopExec, since tdelauncher uses that too...
 static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service )
 {
   // Check which protocols the application supports.
@@ -727,7 +727,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
       if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" )
       {
         // Maybe we can resolve to a local URL?
-        KURL localURL = KIO::NetAccess::mostLocalURL( url, 0 );
+        KURL localURL = TDEIO::NetAccess::mostLocalURL( url, 0 );
         if ( localURL != url ) {
           *it = localURL;
           kdDebug(7010) << "Changed to " << localURL << endl;
@@ -780,8 +780,8 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi
       // Remember we opened those urls, for the "recent documents" menu in kicker
       KURL::List::ConstIterator it = _urls.begin();
       for(; it != _urls.end(); ++it) {
-          //kdDebug(7010) << "KRecentDocument::adding " << (*it).url() << endl;
-          KRecentDocument::add( *it, _service.desktopEntryName() );
+          //kdDebug(7010) << "TDERecentDocument::adding " << (*it).url() << endl;
+          TDERecentDocument::add( *it, _service.desktopEntryName() );
       }
   }
 
@@ -807,18 +807,18 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi
   if( window != NULL )
   {
     if( myasn.isEmpty())
-        myasn = KStartupInfo::createNewStartupId();
+        myasn = TDEStartupInfo::createNewStartupId();
     if( myasn != "0" )
     {
-        KStartupInfoId id;
+        TDEStartupInfoId id;
         id.initId( myasn );
-        KStartupInfoData data;
+        TDEStartupInfoData data;
         data.setLaunchedBy( window->winId());
-        KStartupInfo::sendChange( id, data );
+        TDEStartupInfo::sendChange( id, data );
     }
   }
 
-  int i = KApplication::startServiceByDesktopPath(
+  int i = TDEApplication::startServiceByDesktopPath(
         _service.desktopEntryPath(), urls.toStringList(), &error, 0L, &pid, myasn
         );
 
@@ -856,7 +856,7 @@ pid_t KRun::runCommand( const TQString& cmd, const TQString &execName, const TQS
     TQWidget* window, const TQCString& asn )
 {
   kdDebug(7010) << "runCommand " << cmd << "," << execName << endl;
-  KProcess * proc = new KProcess;
+  TDEProcess * proc = new TDEProcess;
   proc->setUseShell(true);
   *proc << cmd;
   KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) );
@@ -1003,7 +1003,7 @@ void KRun::init()
   }
   if ( !kapp->authorizeURLAction( "open", KURL(), m_strURL))
   {
-    TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, m_strURL.prettyURL());
+    TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, m_strURL.prettyURL());
     d->m_showingError = true;
     KMessageBoxWrapper::error( d->m_window, msg );
     d->m_showingError = false;
@@ -1119,10 +1119,10 @@ void KRun::init()
   kdDebug(7010) << "Testing directory (stating)" << endl;
 
   // It may be a directory or a file, let's stat
-  KIO::StatJob *job = KIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo );
+  TDEIO::StatJob *job = TDEIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo );
   job->setWindow (d->m_window);
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           this, TQT_SLOT( slotStatResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
   m_job = job;
   kdDebug(7010) << " Job " << job << " is about stating " << m_strURL.url() << endl;
 }
@@ -1168,12 +1168,12 @@ void KRun::scanFile()
   }
   kdDebug(7010) << this << " Scanning file " << m_strURL.url() << endl;
 
-  KIO::TransferJob *job = KIO::get( m_strURL, false /*reload*/, m_bProgressInfo );
+  TDEIO::TransferJob *job = TDEIO::get( m_strURL, false /*reload*/, m_bProgressInfo );
   job->setWindow (d->m_window);
-  connect(job, TQT_SIGNAL( result(KIO::Job *)),
-          this, TQT_SLOT( slotScanFinished(KIO::Job *)));
-  connect(job, TQT_SIGNAL( mimetype(KIO::Job *, const TQString &)),
-          this, TQT_SLOT( slotScanMimeType(KIO::Job *, const TQString &)));
+  connect(job, TQT_SIGNAL( result(TDEIO::Job *)),
+          this, TQT_SLOT( slotScanFinished(TDEIO::Job *)));
+  connect(job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &)),
+          this, TQT_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &)));
   m_job = job;
   kdDebug(7010) << " Job " << job << " is about getting from " << m_strURL.url() << endl;
 }
@@ -1217,7 +1217,7 @@ void KRun::slotTimeout()
   }
 }
 
-void KRun::slotStatResult( KIO::Job * job )
+void KRun::slotStatResult( TDEIO::Job * job )
 {
   m_job = 0L;
   if (job->error())
@@ -1237,24 +1237,24 @@ void KRun::slotStatResult( KIO::Job * job )
   } else {
 
     kdDebug(7010) << "Finished" << endl;
-    if(!dynamic_cast<KIO::StatJob*>(job))
+    if(!dynamic_cast<TDEIO::StatJob*>(job))
         kdFatal() << "job is a " << typeid(*job).name() << " should be a StatJob" << endl;
 
     TQString knownMimeType;
-    KIO::UDSEntry entry = ((KIO::StatJob*)job)->statResult();
-    KIO::UDSEntry::ConstIterator it = entry.begin();
+    TDEIO::UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+    TDEIO::UDSEntry::ConstIterator it = entry.begin();
     for( ; it != entry.end(); it++ ) {
         switch( (*it).m_uds ) {
-        case KIO::UDS_FILE_TYPE:
+        case TDEIO::UDS_FILE_TYPE:
             if ( S_ISDIR( (mode_t)((*it).m_long) ) )
                 m_bIsDirectory = true; // it's a dir
             else
                 m_bScanFile = true; // it's a file
             break;
-        case KIO::UDS_MIME_TYPE: // mimetype already known? (e.g. print:/manager)
+        case TDEIO::UDS_MIME_TYPE: // mimetype already known? (e.g. print:/manager)
             knownMimeType = (*it).m_str;
             break;
-        case KIO::UDS_LOCAL_PATH:
+        case TDEIO::UDS_LOCAL_PATH:
             d->m_localPath = (*it).m_str;
             break;
         default:
@@ -1277,15 +1277,15 @@ void KRun::slotStatResult( KIO::Job * job )
   }
 }
 
-void KRun::slotScanMimeType( KIO::Job *, const TQString &mimetype )
+void KRun::slotScanMimeType( TDEIO::Job *, const TQString &mimetype )
 {
   if ( mimetype.isEmpty() )
-    kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't find a mimetype! Probably a kioslave bug." << endl;
+    kdWarning(7010) << "KRun::slotScanFinished : MimetypeJob didn't find a mimetype! Probably a tdeioslave bug." << endl;
   foundMimeType( mimetype );
   m_job = 0;
 }
 
-void KRun::slotScanFinished( KIO::Job *job )
+void KRun::slotScanFinished( TDEIO::Job *job )
 {
   m_job = 0;
   if (job->error())
@@ -1352,19 +1352,19 @@ void KRun::foundMimeType( const TQString& type )
     // We don't know if this is a file or a directory. Let's test this first.
     // (For instance a tar.gz is a directory contained inside a file)
     // It may be a directory or a file, let's stat
-    KIO::StatJob *job = KIO::stat( m_strURL, m_bProgressInfo );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( slotStatResult( KIO::Job * ) ) );
+    TDEIO::StatJob *job = TDEIO::stat( m_strURL, m_bProgressInfo );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) );
     m_job = job;
 
     return;
   }
 */
-  KIO::TransferJob *job = ::tqqt_cast<KIO::TransferJob *>( m_job );
+  TDEIO::TransferJob *job = ::tqqt_cast<TDEIO::TransferJob *>( m_job );
   if ( job )
   {
      job->putOnHold();
-     KIO::Scheduler::publishSlaveOnHold();
+     TDEIO::Scheduler::publishSlaveOnHold();
      m_job = 0;
   }
 
@@ -1440,7 +1440,7 @@ void KRun::abort()
 void KRun::setEnableExternalBrowser(bool b)
 {
    if (b)
-      d->m_externalBrowser = KConfigGroup(KGlobal::config(), "General").readEntry("BrowserApplication");
+      d->m_externalBrowser = TDEConfigGroup(TDEGlobal::config(), "General").readEntry("BrowserApplication");
    else
       d->m_externalBrowser = TQString::null;
 }
@@ -1477,27 +1477,27 @@ bool KRun::isExecutable( const TQString& serviceType )
 /****************/
 
 pid_t
-KProcessRunner::run(KProcess * p, const TQString & binName)
+TDEProcessRunner::run(TDEProcess * p, const TQString & binName)
 {
-  return (new KProcessRunner(p, binName))->pid();
+  return (new TDEProcessRunner(p, binName))->pid();
 }
 
 #ifdef Q_WS_X11
 pid_t
-KProcessRunner::run(KProcess * p, const TQString & binName, const KStartupInfoId& id )
+TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const TDEStartupInfoId& id )
 {
-  return (new KProcessRunner(p, binName, id))->pid();
+  return (new TDEProcessRunner(p, binName, id))->pid();
 }
 #endif
 
-KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName )
+TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName )
   : TQObject(),
     process_(p),
     binName( _binName )
 {
   TQObject::connect(
-      process_, TQT_SIGNAL(processExited(KProcess *)),
-      this,     TQT_SLOT(slotProcessExited(KProcess *)));
+      process_, TQT_SIGNAL(processExited(TDEProcess *)),
+      this,     TQT_SLOT(slotProcessExited(TDEProcess *)));
 
   process_->start();
   if ( !process_->pid() )
@@ -1505,15 +1505,15 @@ KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName )
 }
 
 #ifdef Q_WS_X11
-KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName, const KStartupInfoId& id )
+TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const TDEStartupInfoId& id )
   : TQObject(),
     process_(p),
     binName( _binName ),
     id_( id )
 {
   TQObject::connect(
-      process_, TQT_SIGNAL(processExited(KProcess *)),
-      this,     TQT_SLOT(slotProcessExited(KProcess *)));
+      process_, TQT_SIGNAL(processExited(TDEProcess *)),
+      this,     TQT_SLOT(slotProcessExited(TDEProcess *)));
 
   process_->start();
   if ( !process_->pid() )
@@ -1521,19 +1521,19 @@ KProcessRunner::KProcessRunner(KProcess * p, const TQString & _binName, const KS
 }
 #endif
 
-KProcessRunner::~KProcessRunner()
+TDEProcessRunner::~TDEProcessRunner()
 {
   delete process_;
 }
 
   pid_t
-KProcessRunner::pid() const
+TDEProcessRunner::pid() const
 {
   return process_->pid();
 }
 
   void
-KProcessRunner::slotProcessExited(KProcess * p)
+TDEProcessRunner::slotProcessExited(TDEProcess * p)
 {
   if (p != process_)
     return; // Eh ?
@@ -1549,7 +1549,7 @@ KProcessRunner::slotProcessExited(KProcess * p)
     // We can't just rely on that, but it's a good hint.
     // Before assuming its really so, we'll try to find the binName
     // relatively to current directory,  and then in the PATH.
-    if ( !TQFile( binName ).exists() && KStandardDirs::findExe( binName ).isEmpty() )
+    if ( !TQFile( binName ).exists() && TDEStandardDirs::findExe( binName ).isEmpty() )
     {
       kapp->ref();
       KMessageBox::sorry( 0L, i18n("Could not find the program '%1'").arg( binName ) );
@@ -1559,10 +1559,10 @@ KProcessRunner::slotProcessExited(KProcess * p)
 #ifdef Q_WS_X11
   if( !id_.none())
   {
-      KStartupInfoData data;
+      TDEStartupInfoData data;
       data.addPid( pid()); // announce this pid for the startup notification has finished
       data.setHostname();
-      KStartupInfo::sendFinish( id_, data );
+      TDEStartupInfo::sendFinish( id_, data );
   }
 #endif
   deleteLater();
diff --git a/kio/kio/krun.h b/tdeio/tdeio/krun.h
index e6aa4d027..6e5604f7a 100644
--- a/kio/kio/krun.h
+++ b/tdeio/tdeio/krun.h
@@ -28,11 +28,11 @@
 #include <tqtimer.h>
 #include <tqstring.h>
 #include <kurl.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
-class KProcess;
+class TDEProcess;
 class KService;
-namespace KIO {
+namespace TDEIO {
    class Job;
    class StatJob;
 }
@@ -55,7 +55,7 @@ namespace KIO {
  *
  * @short Opens files with their associated applications in KDE
  */
-class KIO_EXPORT KRun : public TQObject
+class TDEIO_EXPORT KRun : public TQObject
 {
   Q_OBJECT
 public:
@@ -77,7 +77,7 @@ public:
    *
    * @param showProgressInfo
    *        Whether to show progress information when determining the
-   *        type of the file (i.e. when using KIO::stat and KIO::mimetype)
+   *        type of the file (i.e. when using TDEIO::stat and TDEIO::mimetype)
    *        Before you set this to false to avoid a dialog box, think about
    *        a very slow FTP server...
    *        It is always better to provide progress info in such cases.
@@ -104,7 +104,7 @@ public:
    *
    * @param showProgressInfo
    *        Whether to show progress information when determining the
-   *        type of the file (i.e. when using KIO::stat and KIO::mimetype)
+   *        type of the file (i.e. when using TDEIO::stat and TDEIO::mimetype)
    *        Before you set this to false to avoid a dialog box, think about
    *        a very slow FTP server...
    *        It is always better to provide progress info in such cases.
@@ -401,9 +401,9 @@ signals:
 
 protected slots:
   void slotTimeout();
-  void slotScanFinished( KIO::Job * );
-  void slotScanMimeType( KIO::Job *, const TQString &type );
-  virtual void slotStatResult( KIO::Job * );
+  void slotScanFinished( TDEIO::Job * );
+  void slotScanMimeType( TDEIO::Job *, const TQString &type );
+  virtual void slotStatResult( TDEIO::Job * );
 
 protected:
   virtual void init();
@@ -424,7 +424,7 @@ protected:
   bool m_bAutoDelete;
   bool m_bProgressInfo;
   bool m_bFinished;
-  KIO::Job * m_job;
+  TDEIO::Job * m_job;
   TQTimer m_timer;
 
   /**
@@ -461,7 +461,7 @@ private:
  * KRun can open the openwith dialog directly now.
  * Use KRun::displayOpenWithDialog() if you were using KOpenWithHandler directly.
  */
-class KIO_EXPORT_DEPRECATED KOpenWithHandler
+class TDEIO_EXPORT_DEPRECATED KOpenWithHandler
 {
 public:
   KOpenWithHandler() {}
@@ -475,37 +475,37 @@ public:
  * It sends a notification when the process exits (for the taskbar)
  * and it will show an error message if necessary (e.g. "program not found").
  */
-class KIO_EXPORT KProcessRunner : public TQObject
+class TDEIO_EXPORT TDEProcessRunner : public TQObject
 {
   Q_OBJECT
 
   public:
 
-    static pid_t run(KProcess *, const TQString & binName);
-#ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded
-    static pid_t run(KProcess *, const TQString & binName, const KStartupInfoId& id );
+    static pid_t run(TDEProcess *, const TQString & binName);
+#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+    static pid_t run(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id );
 #endif
 
-    virtual ~KProcessRunner();
+    virtual ~TDEProcessRunner();
 
     pid_t pid() const;
 
   protected slots:
 
-    void slotProcessExited(KProcess *);
+    void slotProcessExited(TDEProcess *);
 
   private:
 
-    KProcessRunner(KProcess *, const TQString & binName);
-#ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded
-    KProcessRunner(KProcess *, const TQString & binName, const KStartupInfoId& id );
+    TDEProcessRunner(TDEProcess *, const TQString & binName);
+#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+    TDEProcessRunner(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id );
 #endif
-    KProcessRunner();
+    TDEProcessRunner();
 
-    KProcess * process_;
+    TDEProcess * process_;
     TQString binName;
-#ifdef Q_WS_X11 // We don't have KStartupInfo in Qt/Embedded
-    KStartupInfoId id_;
+#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+    TDEStartupInfoId id_;
 #endif
 };
 
diff --git a/kio/kio/ksambashare.cpp b/tdeio/tdeio/ksambashare.cpp
index defeae4a7..608594ee5 100644
--- a/kio/kio/ksambashare.cpp
+++ b/tdeio/tdeio/ksambashare.cpp
@@ -57,7 +57,7 @@ bool KSambaSharePrivate::load() {
 
 /**
  * Try to find the samba config file path
- * First tries the kconfig, then checks
+ * First tries the tdeconfig, then checks
  * several well-known paths
  * @return wether a smb.conf was found.
  **/
@@ -151,7 +151,7 @@ bool KSambaSharePrivate::readSmbConf() {
       TQString name = completeLine.left(i).stripWhiteSpace().lower();
       TQString value = completeLine.mid(i+1).stripWhiteSpace();
 
-      if (name == KGlobal::staticQString("path")) {
+      if (name == TDEGlobal::staticQString("path")) {
         // Handle quotation marks
         if ( value[0] == '"' )
           value.remove(0,1);
diff --git a/kio/kio/ksambashare.h b/tdeio/tdeio/ksambashare.h
index ba922ecf5..ffd298588 100644
--- a/kio/kio/ksambashare.h
+++ b/tdeio/tdeio/ksambashare.h
@@ -31,7 +31,7 @@ class KSambaSharePrivate;
  * any suid script.
  * Singleton class, call instance() to get an instance.
  */
-class KIO_EXPORT KSambaShare : public TQObject 
+class TDEIO_EXPORT KSambaShare : public TQObject 
 {
 Q_OBJECT
 public:
diff --git a/kio/kio/kscan.cpp b/tdeio/tdeio/kscan.cpp
index 49ae7c5ab..b49459771 100644
--- a/kio/kio/kscan.cpp
+++ b/tdeio/tdeio/kscan.cpp
@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 
 #include "kscan.h"
@@ -28,7 +28,7 @@
 KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name,
 					  bool modal )
 {
-    KTrader::OfferList offers = KTrader::self()->query("KScan/KScanDialog");
+    TDETrader::OfferList offers = TDETrader::self()->query("KScan/KScanDialog");
     if ( offers.isEmpty() )
 	return 0L;
 	
@@ -71,7 +71,7 @@ bool KScanDialog::setup()
 KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name,
 					  bool modal )
 {
-    KTrader::OfferList offers = KTrader::self()->query("KScan/KOCRDialog");
+    TDETrader::OfferList offers = TDETrader::self()->query("KScan/KOCRDialog");
     if ( offers.isEmpty() )
 	return 0L;
 	
diff --git a/kio/kio/kscan.h b/tdeio/tdeio/kscan.h
index 5306156ac..940b8ceaa 100644
--- a/kio/kio/kscan.h
+++ b/tdeio/tdeio/kscan.h
@@ -60,7 +60,7 @@ class TQImage;
  * @short A baseclass and accessor for Scanning Dialogs
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KScanDialog : public KDialogBase
+class TDEIO_EXPORT KScanDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -179,7 +179,7 @@ private:
  * createDialog().
  * @short Factory for creating KScanDialogs
  */
-class KIO_EXPORT KScanDialogFactory : public KLibFactory
+class TDEIO_EXPORT KScanDialogFactory : public KLibFactory
 {
 public:
     virtual ~KScanDialogFactory();
@@ -213,17 +213,17 @@ protected:
      */
     void setName( const TQCString& instanceName ) {
 	delete m_instance;
-	m_instance = new KInstance( instanceName );
+	m_instance = new TDEInstance( instanceName );
     }
 
     /**
      * Returns the instance.
-     * @return the KInstance
+     * @return the TDEInstance
      */
-    KInstance *instance() const { return m_instance; }
+    TDEInstance *instance() const { return m_instance; }
 
 private:
-    KInstance *m_instance;
+    TDEInstance *m_instance;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
@@ -233,7 +233,7 @@ private:
 /**
  * Base class for OCR Dialogs.
  */
-class KIO_EXPORT KOCRDialog : public KDialogBase
+class TDEIO_EXPORT KOCRDialog : public KDialogBase
 {
     Q_OBJECT
 
@@ -315,7 +315,7 @@ private:
  * createDialog().
  * @short Factory for creating KScanDialogs
  */
-class KIO_EXPORT KOCRDialogFactory : public KLibFactory
+class TDEIO_EXPORT KOCRDialogFactory : public KLibFactory
 {
 public:
     virtual ~KOCRDialogFactory();
@@ -349,17 +349,17 @@ protected:
      */
     void setName( const TQCString& instanceName ) {
 	delete m_instance;
-	m_instance = new KInstance( instanceName );
+	m_instance = new TDEInstance( instanceName );
     }
 
     /**
      * Returns the instance.
-     * @return the KInstance
+     * @return the TDEInstance
      */
-    KInstance *instance() const { return m_instance; }
+    TDEInstance *instance() const { return m_instance; }
 
 private:
-    KInstance *m_instance;
+    TDEInstance *m_instance;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
diff --git a/kio/kio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index e3b4a4adb..c9a6fdae2 100644
--- a/kio/kio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -37,13 +37,13 @@
 #include <tqtl.h>
 
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kconfigbase.h>
+#include <tdelocale.h>
+#include <tdeconfigbase.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 
@@ -51,7 +51,7 @@
 #include "kservicetypefactory.h"
 #include "kservicetype.h"
 #include "kuserprofile.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 
 class KService::KServicePrivate
 {
@@ -202,10 +202,10 @@ KService::init( KDesktopFile *config )
   } else if (config->readBoolEntry("X-TDE-SubstituteUID")) {
     int space = m_strExec.find(" ");
     if (space==-1)
-      m_strExec = KStandardDirs::findExe(m_strExec);
+      m_strExec = TDEStandardDirs::findExe(m_strExec);
     else {
       const TQString command = m_strExec.left(space);
-      m_strExec.replace(command,KStandardDirs::findExe(command));
+      m_strExec.replace(command,TDEStandardDirs::findExe(command));
     }
   }
 
@@ -308,9 +308,9 @@ KService::~KService()
   delete d;
 }
 
-TQPixmap KService::pixmap( KIcon::Group _group, int _force_size, int _state, TQString * _path ) const
+TQPixmap KService::pixmap( TDEIcon::Group _group, int _force_size, int _state, TQString * _path ) const
 {
-  KIconLoader *iconLoader=KGlobal::iconLoader();
+  TDEIconLoader *iconLoader=TDEGlobal::iconLoader();
   if (!iconLoader->extraDesktopThemesAdded())
   {
       TQPixmap pixmap=iconLoader->loadIcon( m_strIcon, _group, _force_size, _state, _path, true );
@@ -336,7 +336,7 @@ void KService::load( TQDataStream& s )
   // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   s >> m_strType >> m_strName >> m_strExec >> m_strIcon
     >> term >> m_strTerminalOptions
     >> m_strPath >> m_strComment >> m_lstServiceTypes >> def >> m_mapProps
@@ -369,7 +369,7 @@ void KService::save( TQDataStream& s )
   // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   s << m_strType << m_strName << m_strExec << m_strIcon
     << term << m_strTerminalOptions
     << m_strPath << m_strComment << m_lstServiceTypes << def << m_mapProps
@@ -474,7 +474,7 @@ int KService::initialPreferenceForMimeType( const TQString& mimeType ) const
   return 0;
 }
 
-class KServiceReadProperty : public KConfigBase
+class KServiceReadProperty : public TDEConfigBase
 {
 public:
    KServiceReadProperty(const TQString &_key, const TQCString &_value)
@@ -570,7 +570,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const
     }
   }
 
-  // Then we use a homebuild class based on KConfigBase to convert the TQString.
+  // Then we use a homebuild class based on TDEConfigBase to convert the TQString.
   // For some often used property types we do the conversion ourselves.
   TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name );
   if ( (it == m_mapProps.end()) || (!it.data().isValid()))
@@ -879,14 +879,14 @@ void KService::virtual_hook( int id, void* data )
 
 void KService::rebuildKSycoca(TQWidget *parent)
 {
-  KServiceProgressDialog dlg(parent, "ksycoca_progress",
+  KServiceProgressDialog dlg(parent, "tdesycoca_progress",
                       i18n("Updating System Configuration"),
                       i18n("Updating system configuration."));
 
   TQByteArray data;
   DCOPClient *client = kapp->dcopClient();
 
-  int result = client->callAsync("kded", "kbuildsycoca", "recreate()",
+  int result = client->callAsync("kded", "tdebuildsycoca", "recreate()",
                data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished()));
 
   if (result)
diff --git a/kio/kio/kservice.h b/tdeio/tdeio/kservice.h
index 37f0e0f25..02519c1e8 100644
--- a/kio/kio/kservice.h
+++ b/tdeio/tdeio/kservice.h
@@ -25,7 +25,7 @@
 #include <tqvariant.h>
 #include <kicontheme.h>
 
-#include "ksycocaentry.h"
+#include "tdesycocaentry.h"
 
 class TQDataStream;
 class KDesktopFile;
@@ -45,14 +45,14 @@ class TQWidget;
  * @see KServiceGroup
  * @author Torben Weis <weis@kde.org>
  */
-class KIO_EXPORT KService : public KSycocaEntry
+class TDEIO_EXPORT KService : public KSycocaEntry
 {
   K_SYCOCATYPE( KST_KService, KSycocaEntry )
 
   friend class KBuildSycoca;
 
 public:
-  typedef KSharedPtr<KService> Ptr;
+  typedef TDESharedPtr<KService> Ptr;
   typedef TQValueList<Ptr> List;
 public:
   /**
@@ -129,7 +129,7 @@ public:
    *         null if not set
    * @see icon()
    */
-  TQPixmap pixmap( KIcon::Group _group, int _force_size = 0, int _state = 0,
+  TQPixmap pixmap( TDEIcon::Group _group, int _force_size = 0, int _state = 0,
                   TQString * _path = 0L ) const;
   /**
    * Checks whethe the service should be run in a terminal.
diff --git a/kio/kio/kservice_p.h b/tdeio/tdeio/kservice_p.h
index 180ab8fc3..180ab8fc3 100644
--- a/kio/kio/kservice_p.h
+++ b/tdeio/tdeio/kservice_p.h
diff --git a/kio/kio/kservicefactory.cpp b/tdeio/tdeio/kservicefactory.cpp
index c5784e65a..abd6ec61e 100644
--- a/kio/kio/kservicefactory.cpp
+++ b/tdeio/tdeio/kservicefactory.cpp
@@ -17,16 +17,16 @@
  **/
 
 #include "kservicefactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservice.h"
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 
diff --git a/kio/kio/kservicefactory.h b/tdeio/tdeio/kservicefactory.h
index 8e86f8cbc..4e6df6534 100644
--- a/kio/kio/kservicefactory.h
+++ b/tdeio/tdeio/kservicefactory.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 #include "kservice.h"
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include <assert.h>
 
 class KSycoca;
@@ -35,7 +35,7 @@ class KSycocaDict;
  * It loads the services from parsing directories (e.g. applnk/)
  * but can also create service from data streams or single config files
  */
-class KIO_EXPORT KServiceFactory : public KSycocaFactory
+class TDEIO_EXPORT KServiceFactory : public KSycocaFactory
 {
   K_SYCOCAFACTORY( KST_KServiceFactory )
 public:
diff --git a/kio/kio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp
index af69e1765..4cb3b8dac 100644
--- a/kio/kio/kservicegroup.cpp
+++ b/tdeio/tdeio/kservicegroup.cpp
@@ -19,9 +19,9 @@
 #include <tqdir.h>
 
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ksortablevaluelist.h>
 
@@ -29,7 +29,7 @@
 #include "kservicegroupfactory.h"
 #include "kservicegroup.h"
 #include "kservice.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 
 class KServiceGroup::Private
 {
@@ -128,7 +128,7 @@ int KServiceGroup::childCount()
 {
   if (m_childCount == -1)
   {
-     KConfig global("kdeglobals");
+     TDEConfig global("kdeglobals");
      global.setGroup("KDE");
      bool showUnimportant = global.readBoolEntry("showUnimportant", true);
 
diff --git a/kio/kio/kservicegroup.h b/tdeio/tdeio/kservicegroup.h
index afc043adf..ac4646599 100644
--- a/kio/kio/kservicegroup.h
+++ b/tdeio/tdeio/kservicegroup.h
@@ -28,8 +28,8 @@
 #include <kdesktopfile.h>
 #include <ksortablevaluelist.h>
 
-#include "ksycocaentry.h"
-#include "ksycocatype.h"
+#include "tdesycocaentry.h"
+#include "tdesycocatype.h"
 #include "kservice.h"
 
 class KBuildServiceGroupFactory;
@@ -65,14 +65,14 @@ class KBuildServiceGroupFactory;
  * \endcode
  * @short Represents a group of services
  */
-class KIO_EXPORT KServiceGroup : public KSycocaEntry
+class TDEIO_EXPORT KServiceGroup : public KSycocaEntry
 {
   friend class KBuildServiceGroupFactory;
   K_SYCOCATYPE( KST_KServiceGroup, KSycocaEntry )
 
 public:
-  typedef KSharedPtr<KServiceGroup> Ptr;
-  typedef KSharedPtr<KSycocaEntry> SPtr;
+  typedef TDESharedPtr<KServiceGroup> Ptr;
+  typedef TDESharedPtr<KSycocaEntry> SPtr;
   typedef TQValueList<SPtr> List;
 public:
   /**
@@ -144,7 +144,7 @@ public:
 
   /**
    * Returns true if the NoDisplay flag was set, i.e. if this
-   * group should be hidden from menus, while still being in ksycoca.
+   * group should be hidden from menus, while still being in tdesycoca.
    * @return true to hide this service group, false to display it
    * @since 3.1
    */
@@ -327,12 +327,12 @@ private:
   Private* d;
 };
 
-class KIO_EXPORT KServiceSeparator : public KSycocaEntry
+class TDEIO_EXPORT KServiceSeparator : public KSycocaEntry
 {
   K_SYCOCATYPE( KST_KServiceSeparator, KSycocaEntry )
 
 public:
-  typedef KSharedPtr<KServiceSeparator> Ptr;
+  typedef TDESharedPtr<KServiceSeparator> Ptr;
 public:
   /**
    * Construct a service separator
diff --git a/kio/kio/kservicegroupfactory.cpp b/tdeio/tdeio/kservicegroupfactory.cpp
index d27fab3e2..3caf9c027 100644
--- a/kio/kio/kservicegroupfactory.cpp
+++ b/tdeio/tdeio/kservicegroupfactory.cpp
@@ -17,16 +17,16 @@
  **/
 
 #include "kservicegroupfactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservice.h"
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 KServiceGroupFactory::KServiceGroupFactory()
diff --git a/kio/kio/kservicegroupfactory.h b/tdeio/tdeio/kservicegroupfactory.h
index b1131b398..77bc7c042 100644
--- a/kio/kio/kservicegroupfactory.h
+++ b/tdeio/tdeio/kservicegroupfactory.h
@@ -22,7 +22,7 @@
 #include <tqstringlist.h>
 
 #include "kservicegroup.h"
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include <assert.h>
 
 class KSycoca;
@@ -33,7 +33,7 @@ class KSycocaDict;
  * A sycoca factory for service groups (e.g. list of applications)
  * It loads the services from parsing directories (e.g. applnk/)
  */
-class KIO_EXPORT KServiceGroupFactory : public KSycocaFactory
+class TDEIO_EXPORT KServiceGroupFactory : public KSycocaFactory
 {
   K_SYCOCAFACTORY( KST_KServiceGroupFactory )
 public:
diff --git a/kio/kio/kservicetype.cpp b/tdeio/tdeio/kservicetype.cpp
index 994495921..8565029ee 100644
--- a/kio/kio/kservicetype.cpp
+++ b/tdeio/tdeio/kservicetype.cpp
@@ -18,7 +18,7 @@
  **/
 
 #include "kservice.h"
-#include "ksycoca.h"
+#include "tdesycoca.h"
 #include "kservicetype.h"
 #include "kservicetypefactory.h"
 #include "kservicefactory.h"
@@ -138,7 +138,7 @@ KServiceType::save( TQDataStream& _str )
   KSycocaEntry::save( _str );
   // !! This data structure should remain binary compatible at all times !!
   // You may add new fields at the end. Make sure to update the version
-  // number in ksycoca.h
+  // number in tdesycoca.h
   _str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs
        << (TQ_INT8)m_bValid;
 }
diff --git a/kio/kio/kservicetype.h b/tdeio/tdeio/kservicetype.h
index b96984d43..9b59b39b4 100644
--- a/kio/kio/kservicetype.h
+++ b/tdeio/tdeio/kservicetype.h
@@ -21,7 +21,7 @@
 #ifndef __kservicetype_h__
 #define __kservicetype_h__
 
-#include "ksycocaentry.h"
+#include "tdesycocaentry.h"
 #include "kservice.h"
 
 #include <tqstring.h>
@@ -42,12 +42,12 @@
  * Service types are stored as desktop files in $TDEHOME/share/servicetypes.
  * @see KService
  */
-class KIO_EXPORT KServiceType : public KSycocaEntry
+class TDEIO_EXPORT KServiceType : public KSycocaEntry
 {
   K_SYCOCATYPE( KST_KServiceType, KSycocaEntry )
 
 public:
-  typedef KSharedPtr<KServiceType> Ptr;
+  typedef TDESharedPtr<KServiceType> Ptr;
   typedef TQValueList<Ptr> List;
 public:
 
@@ -210,7 +210,7 @@ public:
    * Returns all services supporting the given servicetype name.
    * This doesn't take care of the user profile.
    * In fact it is used by KServiceTypeProfile,
-   * which is used by KTrader, and that's the one you should use.
+   * which is used by TDETrader, and that's the one you should use.
    * @param _servicetype the name of the service type to search
    * @return the list of all services of the given type
    */
diff --git a/kio/kio/kservicetypefactory.cpp b/tdeio/tdeio/kservicetypefactory.cpp
index f7c0f5969..e198f1333 100644
--- a/kio/kio/kservicetypefactory.cpp
+++ b/tdeio/tdeio/kservicetypefactory.cpp
@@ -17,14 +17,14 @@
  **/
 
 #include "kservicetypefactory.h"
-#include "ksycoca.h"
-#include "ksycocatype.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocatype.h"
+#include "tdesycocadict.h"
 #include "kservicetype.h"
 #include "kmimetype.h"
 #include "kuserprofile.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <assert.h>
 #include <kstringhandler.h>
diff --git a/kio/kio/kservicetypefactory.h b/tdeio/tdeio/kservicetypefactory.h
index fd3c96a1a..e18630b2c 100644
--- a/kio/kio/kservicetypefactory.h
+++ b/tdeio/tdeio/kservicetypefactory.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqvaluevector.h>
 
-#include "ksycocafactory.h"
+#include "tdesycocafactory.h"
 #include "kmimetype.h"
 
 class KSycoca;
@@ -42,7 +42,7 @@ class KExecMimeType;
  * It loads the service types from parsing directories (e.g. mimelnk/)
  * but can also create service types from data streams or single config files
  */
-class KIO_EXPORT KServiceTypeFactory : public KSycocaFactory
+class TDEIO_EXPORT KServiceTypeFactory : public KSycocaFactory
 {
   K_SYCOCAFACTORY( KST_KServiceTypeFactory )
 public:
diff --git a/kio/kio/kshellcompletion.cpp b/tdeio/tdeio/kshellcompletion.cpp
index 2fb67a31f..789a5ce05 100644
--- a/kio/kio/kshellcompletion.cpp
+++ b/tdeio/tdeio/kshellcompletion.cpp
@@ -77,7 +77,7 @@ TQString KShellCompletion::makeCompletion(const TQString &text)
 /*
  * postProcessMatch, postProcessMatches
  *
- * Called by KCompletion before emitting match() and matches()
+ * Called by TDECompletion before emitting match() and matches()
  *
  * Add add the part of the text that was not completed
  * Add quotes when needed
@@ -121,11 +121,11 @@ void KShellCompletion::postProcessMatches( TQStringList *matches ) const
 	}
 }
 
-void KShellCompletion::postProcessMatches( KCompletionMatches *matches ) const
+void KShellCompletion::postProcessMatches( TDECompletionMatches *matches ) const
 {
 	KURLCompletion::postProcessMatches( matches );
 
-	for ( KCompletionMatches::Iterator it = matches->begin();
+	for ( TDECompletionMatches::Iterator it = matches->begin();
 		  it != matches->end(); it++ )
 	{
 		if ( !(*it).value().isNull() ) {
diff --git a/kio/kio/kshellcompletion.h b/tdeio/tdeio/kshellcompletion.h
index acfa638cf..a23fbe78e 100644
--- a/kio/kio/kshellcompletion.h
+++ b/tdeio/tdeio/kshellcompletion.h
@@ -37,7 +37,7 @@ class KShellCompletionPrivate;
  * @short Shell-like completion of file names
  * @author David Smith <dsmith@algonet.se>
  */
-class KIO_EXPORT KShellCompletion : public KURLCompletion 
+class TDEIO_EXPORT KShellCompletion : public KURLCompletion 
 {
 	Q_OBJECT
 
@@ -56,10 +56,10 @@ public:
 	TQString makeCompletion(const TQString &text);
 
 protected:
-	// Called by KCompletion
+	// Called by TDECompletion
 	void postProcessMatch( TQString *match ) const;
 	void postProcessMatches( TQStringList *matches ) const;
-        void postProcessMatches( KCompletionMatches *matches ) const;
+        void postProcessMatches( TDECompletionMatches *matches ) const;
 
 private:
 	// Find the part of text that should be completed
diff --git a/kio/kio/kshred.cpp b/tdeio/tdeio/kshred.cpp
index f3997bf58..0bc01c20a 100644
--- a/kio/kio/kshred.cpp
+++ b/tdeio/tdeio/kshred.cpp
@@ -22,10 +22,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "kshred.h"
 #include <time.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <stdlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // antlarr: KDE 4: Make it const TQString &
 KShred::KShred(TQString fileName)
diff --git a/kio/kio/kshred.h b/tdeio/tdeio/kshred.h
index c38c610ed..5fabcaa5b 100644
--- a/kio/kio/kshred.h
+++ b/tdeio/tdeio/kshred.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 /**
  * @deprecated
@@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * @author Andreas F. Pour <bugs@mieterra.com>
  * @author David Faure <faure@kde.org> (integration into KDE and progress signal)
  */
-class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
+class TDEIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
 
   Q_OBJECT
 
@@ -112,7 +112,7 @@ class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
          * Shows progress of the shredding.
 	 * @param bytes the number of bytes written to the file
          */
-        void processedSize(KIO::filesize_t bytes);
+        void processedSize(TDEIO::filesize_t bytes);
 
         /**
          * Shows a message in the progress dialog
@@ -139,7 +139,7 @@ class KIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
 	/**
 	 * @internal for the size of the file
 	 */
-        KIO::filesize_t fileSize;
+        TDEIO::filesize_t fileSize;
 
 	/**
 	 * @internal for keeping track of progress
diff --git a/kio/kio/ktar.cpp b/tdeio/tdeio/ktar.cpp
index 9bde2873a..cb5bba1fa 100644
--- a/kio/kio/ktar.cpp
+++ b/tdeio/tdeio/ktar.cpp
@@ -30,7 +30,7 @@
 #include <tqfile.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <kfilterdev.h>
 #include <kfilterbase.h>
diff --git a/kio/kio/ktar.h b/tdeio/tdeio/ktar.h
index 67f004a39..fc238073c 100644
--- a/kio/kio/ktar.h
+++ b/tdeio/tdeio/ktar.h
@@ -37,7 +37,7 @@
  * 
  * @author Torben Weis <weis@kde.org>, David Faure <faure@kde.org>
  */
-class KIO_EXPORT KTar : public KArchive
+class TDEIO_EXPORT KTar : public KArchive
 {
 public:
     /**
diff --git a/kio/kio/ktrader.cpp b/tdeio/tdeio/ktrader.cpp
index dbe096075..7ef39638e 100644
--- a/kio/kio/ktrader.cpp
+++ b/tdeio/tdeio/ktrader.cpp
@@ -27,18 +27,18 @@
 #include <kstaticdeleter.h>
 #include <kdebug.h>
 
-template class KStaticDeleter<KTrader>;
+template class KStaticDeleter<TDETrader>;
 
-using namespace KIO;
+using namespace TDEIO;
 
-class KTraderSorter
+class TDETraderSorter
 {
 public:
-  KTraderSorter() { m_pService = 0; };
-  KTraderSorter( const KTraderSorter& s ) : m_userPreference( s.m_userPreference ),
+  TDETraderSorter() { m_pService = 0; };
+  TDETraderSorter( const TDETraderSorter& s ) : m_userPreference( s.m_userPreference ),
     m_bAllowAsDefault( s.m_bAllowAsDefault ),
     m_traderPreference( s.m_traderPreference ), m_pService( s.m_pService ) { }
-  KTraderSorter( const KService::Ptr &_service, double _pref1, int _pref2, bool _default )
+  TDETraderSorter( const KService::Ptr &_service, double _pref1, int _pref2, bool _default )
   { m_pService = _service;
     m_userPreference = _pref2;
     m_traderPreference = _pref1;
@@ -47,7 +47,7 @@ public:
 
   KService::Ptr service() const { return m_pService; }
 
-  bool operator< ( const KTraderSorter& ) const;
+  bool operator< ( const TDETraderSorter& ) const;
 
 private:
   /**
@@ -69,7 +69,7 @@ private:
   KService::Ptr m_pService;
 };
 
-bool KTraderSorter::operator< ( const KTraderSorter& _o ) const
+bool TDETraderSorter::operator< ( const TDETraderSorter& _o ) const
 {
   if ( _o.m_bAllowAsDefault && !m_bAllowAsDefault )
     return true;
@@ -84,32 +84,32 @@ bool KTraderSorter::operator< ( const KTraderSorter& _o ) const
 
 // --------------------------------------------------
 
-KTrader* KTrader::s_self = 0;
-static KStaticDeleter<KTrader> ktradersd;
+TDETrader* TDETrader::s_self = 0;
+static KStaticDeleter<TDETrader> ktradersd;
 
-KTrader* KTrader::self()
+TDETrader* TDETrader::self()
 {
     if ( !s_self )
-	ktradersd.setObject( s_self, new KTrader );
+	ktradersd.setObject( s_self, new TDETrader );
 
     return s_self;
 }
 
-KTrader::KTrader()
+TDETrader::TDETrader()
 {
 }
 
-KTrader::~KTrader()
+TDETrader::~TDETrader()
 {
 }
 
-KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString& _constraint,
+TDETrader::OfferList TDETrader::query( const TQString& _servicetype, const TQString& _constraint,
                                    const TQString& _preferences ) const
 {
     return query( _servicetype, TQString::null, _constraint, _preferences );
 }
 
-KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString& _genericServiceType,
+TDETrader::OfferList TDETrader::query( const TQString& _servicetype, const TQString& _genericServiceType,
                                    const TQString& _constraint,
                                    const TQString& _preferences ) const
 {
@@ -118,13 +118,13 @@ KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString&
   ParseTreeBase::Ptr prefs;
 
   if ( !_constraint.isEmpty() )
-    constr = KIO::parseConstraints( _constraint );
+    constr = TDEIO::parseConstraints( _constraint );
 
   if ( !_preferences.isEmpty() )
-    prefs = KIO::parsePreferences( _preferences );
+    prefs = TDEIO::parsePreferences( _preferences );
 
   KServiceTypeProfile::OfferList lst;
-  KTrader::OfferList ret;
+  TDETrader::OfferList ret;
 
   // Get all services of this service type.
   lst = KServiceTypeProfile::offers( _servicetype, _genericServiceType );
@@ -147,17 +147,17 @@ KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString&
 
   if ( !!prefs )
   {
-    TQValueList<KTraderSorter> sorter;
+    TQValueList<TDETraderSorter> sorter;
     KServiceTypeProfile::OfferList::Iterator it = lst.begin();
     for( ; it != lst.end(); ++it )
     {
       PreferencesReturn p = matchPreferences( prefs, (*it).service(), lst );
       if ( p.type == PreferencesReturn::PRT_DOUBLE )
-	sorter.append( KTraderSorter( (*it).service(), p.f, (*it).preference(), (*it).allowAsDefault() ) );
+	sorter.append( TDETraderSorter( (*it).service(), p.f, (*it).preference(), (*it).allowAsDefault() ) );
     }
     qBubbleSort( sorter );
 
-    TQValueList<KTraderSorter>::Iterator it2 = sorter.begin();
+    TQValueList<TDETraderSorter>::Iterator it2 = sorter.begin();
     for( ; it2 != sorter.end(); ++it2 )
       ret.prepend( (*it2).service() );
   }
@@ -180,7 +180,7 @@ KTrader::OfferList KTrader::query( const TQString& _servicetype, const TQString&
   return ret;
 }
 
-void KTrader::virtual_hook( int, void* )
+void TDETrader::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 #include "ktrader.moc"
diff --git a/kio/kio/ktrader.h b/tdeio/tdeio/ktrader.h
index 8abf09870..6b7e804fb 100644
--- a/kio/kio/ktrader.h
+++ b/tdeio/tdeio/ktrader.h
@@ -36,7 +36,7 @@
  * A few examples will make this a lot more clear.
  *
  * Say you have an application that will display HTML.  In this
- * example, you don't want to link to khtml... and furthermore, you
+ * example, you don't want to link to tdehtml... and furthermore, you
  * really don't care if the HTML browser is ours or not, as long as
  * it works.  The way that you formulate your query as well as the way
  * that you execute the browser depends on whether or not you want the
@@ -48,7 +48,7 @@
  * then will use KRun::run() to invoke the application.  In "trader-speak",
  * this looks like this:
  * \code
- * KTrader::OfferList offers = KTrader::self()->query("text/html", "Type == 'Application'");
+ * TDETrader::OfferList offers = TDETrader::self()->query("text/html", "Type == 'Application'");
  * KService::Ptr ptr = offers.first();
  * KURL::List lst;
  * lst.append("http://www.kde.org/index.html");
@@ -57,7 +57,7 @@
  *
  * Now, say that you want to list all KParts component that can handle HTML. 
  * \code
- * KTrader::OfferList offers = KTrader::self()->query("text/html", "KParts/ReadOnlyPart");
+ * TDETrader::OfferList offers = TDETrader::self()->query("text/html", "KParts/ReadOnlyPart");
  * \endcode
  *
  * If you want to get the preferred KParts component for text/html you could use
@@ -82,7 +82,7 @@
  *        applications or components.
  * @author Torben Weis <weis@kde.org>
  */
-class KIO_EXPORT KTrader : public TQObject
+class TDEIO_EXPORT TDETrader : public TQObject
 {
     Q_OBJECT
 public:
@@ -95,10 +95,10 @@ public:
     /**
      * Standard destructor
      */
-    virtual ~KTrader();
+    virtual ~TDETrader();
 
     /**
-     * The main function in the KTrader class.
+     * The main function in the TDETrader class.
      *
      * It will return a list of services that match your
      * specifications.  The only required parameter is the service
@@ -124,7 +124,7 @@ public:
      *                    a number
      *
      * @return A list of services that satisfy the query
-     * @see http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/kio/kio/html/tradersyntax.html
+     * @see http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/tdeio/tdeio/html/tradersyntax.html
      */
     virtual OfferList query( const TQString& servicetype,
 			     const TQString& constraint = TQString::null,
@@ -158,24 +158,24 @@ public:
                      const TQString& preferences /*= TQString::null*/) const;
 
     /**
-     * This is a static pointer to a KTrader instance.
+     * This is a static pointer to a TDETrader instance.
      *
      *  You will need
-     * to use this to access the KTrader functionality since the
+     * to use this to access the TDETrader functionality since the
      * constuctors are protected.
      *
-     * @return Static KTrader instance
+     * @return Static TDETrader instance
      */
-    static KTrader* self();
+    static TDETrader* self();
 
 protected:
     /**
      * @internal
      */
-    KTrader();
+    TDETrader();
 
 private:
-    static KTrader* s_self;
+    static TDETrader* s_self;
 protected:
     virtual void virtual_hook( int id, void* data );
 };
@@ -185,7 +185,7 @@ protected:
  *
  * @section Literals
  *
- * As elementary atoms of the constraint language, KTrader supports
+ * As elementary atoms of the constraint language, TDETrader supports
  * booleans, integers, floats and strings. Boolean literals are
  * @a TRUE and @a FALSE . Integers can be positive or negative,
  * i.e. @a 42 and @a -10 are legal values. Floating point
@@ -277,7 +277,7 @@ protected:
  *
  * The following examples show filters for .desktop files.
  * <tt>Type</tt>, <tt>ServiceTypes</tt> and <tt>MimeType</tt> are
- * properties in .desktop files. Be aware that within KTrader MimeType
+ * properties in .desktop files. Be aware that within TDETrader MimeType
  * properties are understood as ServiceTypes ones.
  *
  *
diff --git a/kio/kio/ktraderparse.cpp b/tdeio/tdeio/ktraderparse.cpp
index 64d9e449f..242bd1762 100644
--- a/kio/kio/ktraderparse.cpp
+++ b/tdeio/tdeio/ktraderparse.cpp
@@ -30,32 +30,32 @@ extern "C"
 #include "ktraderparsetree.h"
 #include <kdebug.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 static ParseTreeBase::Ptr *pTree = 0;
 static const char* sCode = 0;
 
-ParseTreeBase::Ptr KIO::parseConstraints( const TQString& _constr )
+ParseTreeBase::Ptr TDEIO::parseConstraints( const TQString& _constr )
 {
   TQCString str = _constr.utf8();
   sCode = str.data();
-  KTraderParse_mainParse( sCode );
+  TDETraderParse_mainParse( sCode );
   sCode = 0;
   assert( pTree );
   return *pTree;
 }
 
-ParseTreeBase::Ptr KIO::parsePreferences( const TQString& _prefs )
+ParseTreeBase::Ptr TDEIO::parsePreferences( const TQString& _prefs )
 {
   TQCString str = _prefs.utf8();
   sCode = str.data();
-  KTraderParse_mainParse( sCode );
+  TDETraderParse_mainParse( sCode );
   sCode = 0;
   assert( pTree );
   return *pTree;
 }
 
-void KTraderParse_setParseTree( void *_ptr1 )
+void TDETraderParse_setParseTree( void *_ptr1 )
 {
   if ( !pTree )
     pTree = new ParseTreeBase::Ptr; // ### leak; should use KStaticDeleter
@@ -63,95 +63,95 @@ void KTraderParse_setParseTree( void *_ptr1 )
 }
 
 
-void KTraderParse_error( const char* err )
+void TDETraderParse_error( const char* err )
 {
   kdWarning(7014) << "Parsing '" << sCode << "' gave " << err << endl;
 }
 
-void* KTraderParse_newOR( void *_ptr1, void *_ptr2 )
+void* TDETraderParse_newOR( void *_ptr1, void *_ptr2 )
 {
   return new ParseTreeOR( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
 }
 
-void* KTraderParse_newAND( void *_ptr1, void *_ptr2 )
+void* TDETraderParse_newAND( void *_ptr1, void *_ptr2 )
 {
   return new ParseTreeAND( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
 }
 
-void* KTraderParse_newCMP( void *_ptr1, void *_ptr2, int _i )
+void* TDETraderParse_newCMP( void *_ptr1, void *_ptr2, int _i )
 {
   return new ParseTreeCMP( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2, _i );
 }
 
-void* KTraderParse_newIN( void *_ptr1, void *_ptr2 )
+void* TDETraderParse_newIN( void *_ptr1, void *_ptr2 )
 {
   return new ParseTreeIN( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
 }
 
-void* KTraderParse_newMATCH( void *_ptr1, void *_ptr2 )
+void* TDETraderParse_newMATCH( void *_ptr1, void *_ptr2 )
 {
   return new ParseTreeMATCH( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2 );
 }
 
-void* KTraderParse_newCALC( void *_ptr1, void *_ptr2, int _i )
+void* TDETraderParse_newCALC( void *_ptr1, void *_ptr2, int _i )
 {
   return new ParseTreeCALC( (ParseTreeBase*)_ptr1, (ParseTreeBase*)_ptr2, _i );
 }
 
-void* KTraderParse_newBRACKETS( void *_ptr1 )
+void* TDETraderParse_newBRACKETS( void *_ptr1 )
 {
   return new ParseTreeBRACKETS( (ParseTreeBase*)_ptr1 );
 }
 
-void* KTraderParse_newNOT( void *_ptr1 )
+void* TDETraderParse_newNOT( void *_ptr1 )
 {
   return new ParseTreeNOT( (ParseTreeBase*)_ptr1 );
 }
 
-void* KTraderParse_newEXIST( char *_ptr1 )
+void* TDETraderParse_newEXIST( char *_ptr1 )
 {
   ParseTreeEXIST *t = new ParseTreeEXIST( _ptr1 );
   free(_ptr1);
   return t;
 }
 
-void* KTraderParse_newID( char *_ptr1 )
+void* TDETraderParse_newID( char *_ptr1 )
 {
   ParseTreeID *t = new ParseTreeID( _ptr1 );
   free(_ptr1);
   return t;
 }
 
-void* KTraderParse_newSTRING( char *_ptr1 )
+void* TDETraderParse_newSTRING( char *_ptr1 )
 {
   ParseTreeSTRING *t = new ParseTreeSTRING( _ptr1 );
   free(_ptr1);
   return t;
 }
 
-void* KTraderParse_newNUM( int _i )
+void* TDETraderParse_newNUM( int _i )
 {
   return new ParseTreeNUM( _i );
 }
 
-void* KTraderParse_newFLOAT( float _f )
+void* TDETraderParse_newFLOAT( float _f )
 {
   return new ParseTreeDOUBLE( _f );
 }
 
-void* KTraderParse_newBOOL( char _b )
+void* TDETraderParse_newBOOL( char _b )
 {
   return new ParseTreeBOOL( (bool)_b );
 }
 
-void* KTraderParse_newMAX2( char *_id )
+void* TDETraderParse_newMAX2( char *_id )
 {
   ParseTreeMAX2 *t = new ParseTreeMAX2( _id );
   free(_id);
   return t;
 }
 
-void* KTraderParse_newMIN2( char *_id )
+void* TDETraderParse_newMIN2( char *_id )
 {
   ParseTreeMIN2 *t = new ParseTreeMIN2( _id );
   free(_id);
diff --git a/tdeio/tdeio/ktraderparse.h b/tdeio/tdeio/ktraderparse.h
new file mode 100644
index 000000000..63743d3f3
--- /dev/null
+++ b/tdeio/tdeio/ktraderparse.h
@@ -0,0 +1,52 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef __parse_h__
+#define __parse_h__
+
+/*
+ * Functions definition for yacc
+ */
+void TDETraderParse_mainParse( const char *_code );
+void TDETraderParse_setParseTree( void *_ptr1 );
+void TDETraderParse_error( const char* err );
+void* TDETraderParse_newOR( void *_ptr1, void *_ptr2 );
+void* TDETraderParse_newAND( void *_ptr1, void *_ptr2 );
+void* TDETraderParse_newCMP( void *_ptr1, void *_ptr2, int _i );
+void* TDETraderParse_newIN( void *_ptr1, void *_ptr2 );
+void* TDETraderParse_newMATCH( void *_ptr1, void *_ptr2 );
+void* TDETraderParse_newCALC( void *_ptr1, void *_ptr2, int _i );
+void* TDETraderParse_newBRACKETS( void *_ptr1 );
+void* TDETraderParse_newNOT( void *_ptr1 );
+void* TDETraderParse_newEXIST( char *_ptr1 );
+void* TDETraderParse_newID( char *_ptr1 );
+void* TDETraderParse_newSTRING( char *_ptr1 );
+void* TDETraderParse_newNUM( int _i );
+void* TDETraderParse_newFLOAT( float _f );
+void* TDETraderParse_newBOOL( char _b );
+
+void* TDETraderParse_newWITH( void *_ptr1 );
+void* TDETraderParse_newMAX( void *_ptr1 );
+void* TDETraderParse_newMIN( void *_ptr1 );
+void* TDETraderParse_newMAX2( char *_id );
+void* TDETraderParse_newMIN2( char *_id );
+void* TDETraderParse_newFIRST();
+void* TDETraderParse_newRANDOM();
+
+#endif
diff --git a/kio/kio/ktraderparsetree.cpp b/tdeio/tdeio/ktraderparsetree.cpp
index 711ec5356..0a04b7918 100644
--- a/kio/kio/ktraderparsetree.cpp
+++ b/tdeio/tdeio/ktraderparsetree.cpp
@@ -19,7 +19,7 @@
 
 #include "ktraderparsetree.h"
 
-namespace KIO {
+namespace TDEIO {
 
 bool ParseTreeOR::eval( ParseContext *_context ) const
 {
diff --git a/kio/kio/ktraderparsetree.h b/tdeio/tdeio/ktraderparsetree.h
index 3af4273d0..b0ec95f76 100644
--- a/kio/kio/ktraderparsetree.h
+++ b/tdeio/tdeio/ktraderparsetree.h
@@ -31,12 +31,12 @@
 
 #include "ktrader.h"
 
-namespace KIO {
+namespace TDEIO {
 
 class ParseTreeBase;
 
 /** \internal */
-struct KIO_EXPORT PreferencesReturn
+struct TDEIO_EXPORT PreferencesReturn
 {
   enum Type { PRT_DOUBLE, PRT_ERROR };
 
@@ -59,20 +59,20 @@ struct KIO_EXPORT PreferencesReturn
  *         1  => Does match
  *         <0 => Error
  */
-KIO_EXPORT int matchConstraint( const ParseTreeBase *_tree, const KService::Ptr &,
+TDEIO_EXPORT int matchConstraint( const ParseTreeBase *_tree, const KService::Ptr &,
 		     const KServiceTypeProfile::OfferList& );
 
 /**
  * @internal
  * @return 1 on success or <0 on Error
  */
-KIO_EXPORT PreferencesReturn matchPreferences( const ParseTreeBase *_tree, const KService::Ptr &,
+TDEIO_EXPORT PreferencesReturn matchPreferences( const ParseTreeBase *_tree, const KService::Ptr &,
 				    const KServiceTypeProfile::OfferList& );
 
 /**
  * @internal
  */
-struct KIO_EXPORT PreferencesMaxima
+struct TDEIO_EXPORT PreferencesMaxima
 {
   enum Type { PM_ERROR, PM_INVALID_INT, PM_INVALID_DOUBLE, PM_DOUBLE, PM_INT };
 
@@ -86,7 +86,7 @@ struct KIO_EXPORT PreferencesMaxima
 /**
  * @internal
  */
-class KIO_EXPORT ParseContext
+class TDEIO_EXPORT ParseContext
 {
 public:
   /**
@@ -120,10 +120,10 @@ public:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeBase : public KShared
+class TDEIO_EXPORT ParseTreeBase : public TDEShared
 {
 public:
-  typedef KSharedPtr<ParseTreeBase> Ptr;
+  typedef TDESharedPtr<ParseTreeBase> Ptr;
   ParseTreeBase() { }
 
   virtual bool eval( ParseContext *_context ) const = 0;
@@ -131,13 +131,13 @@ protected:
   virtual ~ParseTreeBase() { };
 };
 
-KIO_EXPORT ParseTreeBase::Ptr parseConstraints( const TQString& _constr );
-KIO_EXPORT ParseTreeBase::Ptr parsePreferences( const TQString& _prefs );
+TDEIO_EXPORT ParseTreeBase::Ptr parseConstraints( const TQString& _constr );
+TDEIO_EXPORT ParseTreeBase::Ptr parsePreferences( const TQString& _prefs );
 
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeOR : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeOR : public ParseTreeBase
 {
 public:
   ParseTreeOR( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; }
@@ -152,7 +152,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeAND : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeAND : public ParseTreeBase
 {
 public:
   ParseTreeAND( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; }
@@ -167,7 +167,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeCMP : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeCMP : public ParseTreeBase
 {
 public:
   ParseTreeCMP( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2, int _i ) { m_pLeft = _ptr1; m_pRight = _ptr2; m_cmd = _i; }
@@ -183,7 +183,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeIN : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeIN : public ParseTreeBase
 {
 public:
   ParseTreeIN( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; }
@@ -198,7 +198,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeMATCH : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeMATCH : public ParseTreeBase
 {
 public:
   ParseTreeMATCH( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2 ) { m_pLeft = _ptr1; m_pRight = _ptr2; }
@@ -213,7 +213,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeCALC : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeCALC : public ParseTreeBase
 {
 public:
   ParseTreeCALC( ParseTreeBase *_ptr1, ParseTreeBase *_ptr2, int _i ) { m_pLeft = _ptr1; m_pRight = _ptr2; m_cmd = _i; }
@@ -229,7 +229,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeBRACKETS : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeBRACKETS : public ParseTreeBase
 {
 public:
   ParseTreeBRACKETS( ParseTreeBase *_ptr ) { m_pLeft = _ptr; }
@@ -243,7 +243,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeNOT : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeNOT : public ParseTreeBase
 {
 public:
   ParseTreeNOT( ParseTreeBase *_ptr ) { m_pLeft = _ptr; }
@@ -257,7 +257,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeEXIST : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeEXIST : public ParseTreeBase
 {
 public:
   ParseTreeEXIST( const char *_id ) { m_id = _id; }
@@ -271,7 +271,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeID : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeID : public ParseTreeBase
 {
 public:
   ParseTreeID( const char *arg ) { m_str = arg; }
@@ -285,7 +285,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeSTRING : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeSTRING : public ParseTreeBase
 {
 public:
   ParseTreeSTRING( const char *arg ) { m_str = arg; }
@@ -299,7 +299,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeNUM : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeNUM : public ParseTreeBase
 {
 public:
   ParseTreeNUM( int arg ) { m_int = arg; }
@@ -313,7 +313,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeDOUBLE : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeDOUBLE : public ParseTreeBase
 {
 public:
   ParseTreeDOUBLE( double arg ) { m_double = arg; }
@@ -327,7 +327,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeBOOL : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeBOOL : public ParseTreeBase
 {
 public:
   ParseTreeBOOL( bool arg ) { m_bool = arg; }
@@ -341,7 +341,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeMAX2 : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeMAX2 : public ParseTreeBase
 {
 public:
   ParseTreeMAX2( const char *_id ) { m_strId = _id; }
@@ -355,7 +355,7 @@ protected:
 /**
  * @internal
  */
-class KIO_EXPORT ParseTreeMIN2 : public ParseTreeBase
+class TDEIO_EXPORT ParseTreeMIN2 : public ParseTreeBase
 {
 public:
   ParseTreeMIN2( const char *_id ) { m_strId = _id; }
diff --git a/kio/kio/kurifilter.cpp b/tdeio/tdeio/kurifilter.cpp
index c7e076eac..809e2f504 100644
--- a/kio/kio/kurifilter.cpp
+++ b/tdeio/tdeio/kurifilter.cpp
@@ -26,7 +26,7 @@
 #include <kmimetype.h>
 #include <klibloader.h>
 #include <kstaticdeleter.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #ifdef HAVE_ELFICON
 #include <tqimage.h>
@@ -186,7 +186,7 @@ TQString KURIFilterData::iconName()
                 if (service && service->icon() != TQString::fromLatin1( "unknown" )) {
                     m_strIconName = service->icon();
                 }
-                else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) {
+                else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0, true ).isNull() ) {
                     m_strIconName = exeName;
                 }
                 else {
@@ -200,7 +200,7 @@ TQString KURIFilterData::iconName()
 		if (service && service->icon() != TQString::fromLatin1( "unknown" )) {
 			m_strIconName = service->icon();
 		}
-		else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) {
+		else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0, true ).isNull() ) {
 			m_strIconName = exeName;
 		}
 		else {
@@ -239,7 +239,7 @@ TQString KURIFilterData::iconName()
 					// See if there is a system icon we can use
 					TQString sysIconName = elf_get_resource(handle, ".metadata_sysicon");
 					if (!sysIconName.isEmpty()) {
-						if (KGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") {
+						if (TDEGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") {
 							m_strIconName = sysIconName;
 						}
 					}
@@ -255,7 +255,7 @@ TQString KURIFilterData::iconName()
 							// Try loading this icon as fallback
 							icon = libr_icon_geticon_byname(handle, entry->name);
 						}
-						if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") {
+						if (TDEGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") {
 							iconresnamefound = 1;
 							m_strIconName = entry->name;
 							break;
@@ -426,10 +426,10 @@ TQStringList KURIFilter::pluginNames() const
 
 void KURIFilter::loadPlugins()
 {
-    KTrader::OfferList offers = KTrader::self()->query( "KURIFilter/Plugin" );
+    TDETrader::OfferList offers = TDETrader::self()->query( "KURIFilter/Plugin" );
 
-    KTrader::OfferList::ConstIterator it = offers.begin();
-    KTrader::OfferList::ConstIterator end = offers.end();
+    TDETrader::OfferList::ConstIterator it = offers.begin();
+    TDETrader::OfferList::ConstIterator end = offers.end();
 
     for (; it != end; ++it )
     {
diff --git a/kio/kio/kurifilter.h b/tdeio/tdeio/kurifilter.h
index cff151cb7..cbd74d4e8 100644
--- a/kio/kio/kurifilter.h
+++ b/tdeio/tdeio/kurifilter.h
@@ -39,7 +39,7 @@
 class KURIFilterPrivate;
 class KURIFilterDataPrivate;
 
-class KCModule;
+class TDECModule;
 
 /**
 * A basic message object used for exchanging filtering
@@ -76,7 +76,7 @@ class KCModule;
 * @author Dawit Alemayehu <adawit at kde.org>
 */
 
-class KIO_EXPORT KURIFilterData
+class TDEIO_EXPORT KURIFilterData
 {
 friend class KURIFilterPlugin;
 
@@ -360,7 +360,7 @@ private:
  *
  * @short Abstract class for URI filter plugins.
  */
-class KIO_EXPORT KURIFilterPlugin : public TQObject
+class TDEIO_EXPORT KURIFilterPlugin : public TQObject
 {
     Q_OBJECT
     
@@ -410,7 +410,7 @@ public:
      *
      * @return A configuration module, 0 if the filter isn't configurable.
      */
-    virtual KCModule *configModule( TQWidget*, const char* ) const { return 0; }
+    virtual TDECModule *configModule( TQWidget*, const char* ) const { return 0; }
 
     /**
      * Returns the name of the configuration module for the filter.
@@ -460,7 +460,7 @@ private:
 /**
  * A list of filter plugins.
  */
-class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
+class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
 {
 public:
     virtual int compareItems(Item a, Item b)
@@ -523,17 +523,17 @@ private:
  * of the filters you want to use to a TQStringList and invoke
  * the appropriate filtering function. The examples below show
  * the use of specific filters. The first one uses a single
- * filter called kshorturifilter while the second example uses
+ * filter called tdeshorturifilter while the second example uses
  * multiple filters:
  *
  * \code
  * TQString text = "kde.org";
- * bool filtered = KURIFilter::self()->filterURI( text, "kshorturifilter" );
+ * bool filtered = KURIFilter::self()->filterURI( text, "tdeshorturifilter" );
  * \endcode
  *
  * \code
  * TQStringList list;
- * list << "kshorturifilter" << "localdomainfilter";
+ * list << "tdeshorturifilter" << "localdomainfilter";
  * bool filtered = KURIFilter::self()->filterURI( text, list );
  * \endcode
  *
@@ -545,7 +545,7 @@ private:
  * @short Filters a given URL into its proper format whenever possible.
  */
 
-class KIO_EXPORT KURIFilter
+class TDEIO_EXPORT KURIFilter
 {
 public:
     /**
diff --git a/kio/kio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index 17caccb88..441d453ac 100644
--- a/kio/kio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -39,16 +39,16 @@
 #include <tqdeepcopy.h>
 #include <tqthread.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <kurl.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <kprotocolinfo.h>
-#include <kconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kde_file.h>
 
 #include <sys/types.h>
@@ -459,10 +459,10 @@ public:
 	bool replace_home;
 	bool complete_url; // if true completing a URL (i.e. 'prepend' is a URL), otherwise a path
 
-	KIO::ListJob *list_job; // kio job to list directories
+	TDEIO::ListJob *list_job; // kio job to list directories
 
 	TQString prepend; // text to prepend to listed items
-	TQString compl_text; // text to pass on to KCompletion
+	TQString compl_text; // text to pass on to TDECompletion
 
 	// Filters for files read with  kio
 	bool list_urls_only_exe; // true = only list executables
@@ -486,13 +486,13 @@ KURLCompletionPrivate::~KURLCompletionPrivate()
 // KURLCompletion
 //
 
-KURLCompletion::KURLCompletion() : KCompletion()
+KURLCompletion::KURLCompletion() : TDECompletion()
 {
 	init();
 }
 
 
-KURLCompletion::KURLCompletion( Mode mode ) : KCompletion()
+KURLCompletion::KURLCompletion( Mode mode ) : TDECompletion()
 {
 	init();
 	setMode ( mode );
@@ -519,8 +519,8 @@ void KURLCompletion::init()
 	d->mode = KURLCompletion::FileCompletion;
 
 	// Read settings
-	KConfig *c = KGlobal::config();
-	KConfigGroupSaver cgs( c, "URLCompletion" );
+	TDEConfig *c = TDEGlobal::config();
+	TDEConfigGroupSaver cgs( c, "URLCompletion" );
 
 	d->url_auto_completion = c->readBoolEntry("alwaysAutoComplete", true);
 	d->popup_append_slash = c->readBoolEntry("popupAppendSlash", true);
@@ -653,15 +653,15 @@ TQString KURLCompletion::makeCompletion(const TQString &text)
 /*
  * finished
  *
- * Go on and call KCompletion.
+ * Go on and call TDECompletion.
  * Called when all matches have been added
  */
 TQString KURLCompletion::finished()
 {
 	if ( d->last_compl_type == CTInfo )
-		return KCompletion::makeCompletion( d->compl_text.lower() );
+		return TDECompletion::makeCompletion( d->compl_text.lower() );
 	else
-		return KCompletion::makeCompletion( d->compl_text );
+		return TDECompletion::makeCompletion( d->compl_text );
 }
 
 /*
@@ -736,10 +736,10 @@ bool KURLCompletion::isListedURL( int complType,
  */
 bool KURLCompletion::isAutoCompletion()
 {
-	return completionMode() == KGlobalSettings::CompletionAuto
-	       || completionMode() == KGlobalSettings::CompletionPopup
-	       || completionMode() == KGlobalSettings::CompletionMan
-	       || completionMode() == KGlobalSettings::CompletionPopupAuto;
+	return completionMode() == TDEGlobalSettings::CompletionAuto
+	       || completionMode() == TDEGlobalSettings::CompletionPopup
+	       || completionMode() == TDEGlobalSettings::CompletionMan
+	       || completionMode() == TDEGlobalSettings::CompletionPopupAuto;
 }
 //////////////////////////////////////////////////
 //////////////////////////////////////////////////
@@ -963,7 +963,7 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match)
 		if (url.url().length() == 1)
 		{
 			*match =
-				( completionMode() == KGlobalSettings::CompletionMan )? "." : "..";
+				( completionMode() == TDEGlobalSettings::CompletionMan )? "." : "..";
 			return true;
 		}
 		if (url.url().length() == 2 && url.url()[1]=='.')
@@ -1008,8 +1008,8 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match)
 
 		// Append '/' to directories in Popup mode?
 		bool append_slash = ( d->popup_append_slash
-	    	&& (completionMode() == KGlobalSettings::CompletionPopup ||
-		    completionMode() == KGlobalSettings::CompletionPopupAuto ) );
+	    	&& (completionMode() == TDEGlobalSettings::CompletionPopup ||
+		    completionMode() == TDEGlobalSettings::CompletionPopupAuto ) );
 
 		bool only_dir = ( d->mode == DirCompletion );
 
@@ -1104,7 +1104,7 @@ bool KURLCompletion::urlCompletion(const MyURL &url, TQString *match)
 /*
  * addMatches
  *
- * Called to add matches to KCompletion
+ * Called to add matches to TDECompletion
  */
 void KURLCompletion::addMatches( const TQStringList &matches )
 {
@@ -1226,12 +1226,12 @@ void KURLCompletion::listURLs(
  *
  * Receive files listed by KIO and call addMatches()
  */
-void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries)
+void KURLCompletion::slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList& entries)
 {
 	TQStringList matches;
 
-	KIO::UDSEntryListConstIterator it = entries.begin();
-	KIO::UDSEntryListConstIterator end = entries.end();
+	TDEIO::UDSEntryListConstIterator it = entries.begin();
+	TDEIO::UDSEntryListConstIterator end = entries.end();
 
 	TQString filter = d->list_urls_filter;
 
@@ -1245,21 +1245,21 @@ void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries)
 		bool is_exe = false;
 		bool is_dir = false;
 
-		KIO::UDSEntry e = *it;
-		KIO::UDSEntry::ConstIterator it_2 = e.begin();
+		TDEIO::UDSEntry e = *it;
+		TDEIO::UDSEntry::ConstIterator it_2 = e.begin();
 
 		for( ; it_2 != e.end(); it_2++ ) {
 			switch ( (*it_2).m_uds ) {
-				case KIO::UDS_NAME:
+				case TDEIO::UDS_NAME:
 					name = (*it_2).m_str;
 					break;
-				case KIO::UDS_ACCESS:
+				case TDEIO::UDS_ACCESS:
 					is_exe = ((*it_2).m_long & MODE_EXE) != 0;
 					break;
-				case KIO::UDS_FILE_TYPE:
+				case TDEIO::UDS_FILE_TYPE:
 					is_dir = ((*it_2).m_long & S_IFDIR) != 0;
 					break;
-				case KIO::UDS_URL:
+				case TDEIO::UDS_URL:
 					url = (*it_2).m_str;
 					break;
 			}
@@ -1301,7 +1301,7 @@ void KURLCompletion::slotEntries(KIO::Job*, const KIO::UDSEntryList& entries)
  * Start a new list job if there are still urls in
  * d->list_urls, otherwise call finished()
  */
-void KURLCompletion::slotIOFinished( KIO::Job * job )
+void KURLCompletion::slotIOFinished( TDEIO::Job * job )
 {
 //	kdDebug() << "slotIOFinished() " << endl;
 
@@ -1311,7 +1311,7 @@ void KURLCompletion::slotIOFinished( KIO::Job * job )
 
 		d->list_job = 0L;
 
-		finished(); // will call KCompletion::makeCompletion()
+		finished(); // will call TDECompletion::makeCompletion()
 
 	}
 	else {
@@ -1322,18 +1322,18 @@ void KURLCompletion::slotIOFinished( KIO::Job * job )
 
 //		kdDebug() << "Start KIO: " << kurl->prettyURL() << endl;
 
-		d->list_job = KIO::listDir( *kurl, false );
+		d->list_job = TDEIO::listDir( *kurl, false );
 		d->list_job->addMetaData("no-auth-prompt", "true");
 
 		assert( d->list_job );
 
 		connect( d->list_job,
-				TQT_SIGNAL(result(KIO::Job*)),
-				TQT_SLOT(slotIOFinished(KIO::Job*)) );
+				TQT_SIGNAL(result(TDEIO::Job*)),
+				TQT_SLOT(slotIOFinished(TDEIO::Job*)) );
 
 		connect( d->list_job,
-				TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)),
-				TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&)) );
+				TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+				TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) );
 
 		delete kurl;
 	}
@@ -1345,7 +1345,7 @@ void KURLCompletion::slotIOFinished( KIO::Job * job )
 /*
  * postProcessMatch, postProcessMatches
  *
- * Called by KCompletion before emitting match() and matches()
+ * Called by TDECompletion before emitting match() and matches()
  *
  * Append '/' to directories for file completion. This is
  * done here to avoid stat()'ing a lot of files
@@ -1405,10 +1405,10 @@ void KURLCompletion::postProcessMatches( TQStringList * matches ) const
 	}
 }
 
-void KURLCompletion::postProcessMatches( KCompletionMatches * matches ) const
+void KURLCompletion::postProcessMatches( TDECompletionMatches * matches ) const
 {
 	if ( !matches->isEmpty() && d->last_compl_type == CTFile ) {
-		KCompletionMatches::Iterator it = matches->begin();
+		TDECompletionMatches::Iterator it = matches->begin();
 		for (; it != matches->end(); ++it ) {
 			adjustMatch( (*it).value() );
 		}
@@ -1598,7 +1598,7 @@ static TQString unescape(const TQString &text)
 }
 
 void KURLCompletion::virtual_hook( int id, void* data )
-{ KCompletion::virtual_hook( id, data ); }
+{ TDECompletion::virtual_hook( id, data ); }
 
 #include "kurlcompletion.moc"
 
diff --git a/kio/kio/kurlcompletion.h b/tdeio/tdeio/kurlcompletion.h
index 2e042c3bc..a5b075f3b 100644
--- a/kio/kio/kurlcompletion.h
+++ b/tdeio/tdeio/kurlcompletion.h
@@ -24,7 +24,7 @@
 #define KURLCOMPLETION_H
 
 #include <kcompletion.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
@@ -38,7 +38,7 @@ class KURLCompletionPrivate;
  * @short Completion of a single URL
  * @author David Smith <dsmith@algonet.se>
  */
-class KIO_EXPORT KURLCompletion : public KCompletion
+class TDEIO_EXPORT KURLCompletion : public TDECompletion
 {
 	Q_OBJECT
 
@@ -168,16 +168,16 @@ public:
 
 	class MyURL;
 protected:
-	// Called by KCompletion, adds '/' to directories
+	// Called by TDECompletion, adds '/' to directories
 	void postProcessMatch( TQString *match ) const;
 	void postProcessMatches( TQStringList *matches ) const;
-	void postProcessMatches( KCompletionMatches* matches ) const;
+	void postProcessMatches( TDECompletionMatches* matches ) const;
 
 	virtual void customEvent( TQCustomEvent *e );
 
 protected slots:
-	void slotEntries( KIO::Job *, const KIO::UDSEntryList& );
-	void slotIOFinished( KIO::Job * );
+	void slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& );
+	void slotIOFinished( TDEIO::Job * );
 
 private:
 
diff --git a/kio/kio/kurlpixmapprovider.cpp b/tdeio/tdeio/kurlpixmapprovider.cpp
index caeedf066..b0ecb7e43 100644
--- a/kio/kio/kurlpixmapprovider.cpp
+++ b/tdeio/tdeio/kurlpixmapprovider.cpp
@@ -26,7 +26,7 @@ TQPixmap KURLPixmapProvider::pixmapFor( const TQString& url, int size ) {
 	    u.setPath( url );
 	else
 	    u = url;
-	return KMimeType::pixmapForURL( u, 0, KIcon::Desktop, size );
+	return KMimeType::pixmapForURL( u, 0, TDEIcon::Desktop, size );
     }
 
 void KURLPixmapProvider::virtual_hook( int id, void* data )
diff --git a/kio/kio/kurlpixmapprovider.h b/tdeio/tdeio/kurlpixmapprovider.h
index 1fa400c1e..3dad217e3 100644
--- a/kio/kio/kurlpixmapprovider.h
+++ b/tdeio/tdeio/kurlpixmapprovider.h
@@ -39,7 +39,7 @@
  * @short Resolves pixmaps for URLs
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KIO_EXPORT KURLPixmapProvider : public KPixmapProvider
+class TDEIO_EXPORT KURLPixmapProvider : public KPixmapProvider
 {
 public:
     /**
@@ -48,7 +48,7 @@ public:
      * @param url the URL to fetch a pixmap for
      * @param size the size of the pixmap in pixels, or 0 for default.
      * @return the resulting pixmap
-     * @see KIcon::StdSizes
+     * @see TDEIcon::StdSizes
      */
     virtual TQPixmap pixmapFor( const TQString& url, int size = 0 );
 protected:
diff --git a/kio/kio/kuserprofile.cpp b/tdeio/tdeio/kuserprofile.cpp
index b7ef68c76..a9bdc40c1 100644
--- a/kio/kio/kuserprofile.cpp
+++ b/tdeio/tdeio/kuserprofile.cpp
@@ -21,9 +21,9 @@
 #include "kservicetype.h"
 #include "kservicetypefactory.h"
 
-#include <kconfig.h>
-#include <kapplication.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
@@ -53,9 +53,9 @@ void KServiceTypeProfile::initStatic()
   profileDeleter.setObject(s_lstProfiles, new KServiceTypeProfileList);
   s_lstProfiles->setAutoDelete( true );
 
-  KConfig config( "profilerc", true, false);
+  TDEConfig config( "profilerc", true, false);
 
-  static const TQString & defaultGroup = KGlobal::staticQString("<default>");
+  static const TQString & defaultGroup = TDEGlobal::staticQString("<default>");
 
   TQStringList tmpList = config.groupList();
   for (TQStringList::Iterator aIt = tmpList.begin();
@@ -98,7 +98,7 @@ void KServiceTypeProfile::initStatic()
 //static
 void KServiceTypeProfile::clear()
 {
-    // HACK ksycoca may open the dummy db, in such case the first call to ksycoca
+    // HACK tdesycoca may open the dummy db, in such case the first call to tdesycoca
     // in initStatic() leads to closing the dummy db and clear() being called
     // in the middle of it, making s_lstProfiles be NULL
     if( s_lstProfiles == NULL || s_lstProfiles->count() == 0 )
@@ -243,7 +243,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const
 KServiceTypeProfile* KServiceTypeProfile::serviceTypeProfile( const TQString& _servicetype, const TQString& _genericServiceType )
 {
   initStatic();
-  static const TQString& app_str = KGlobal::staticQString("Application");
+  static const TQString& app_str = TDEGlobal::staticQString("Application");
 
   const TQString &_genservicetype  = ((!_genericServiceType.isEmpty()) ? _genericServiceType : app_str);
 
diff --git a/kio/kio/kuserprofile.h b/tdeio/tdeio/kuserprofile.h
index 061657625..4c0c6929c 100644
--- a/kio/kio/kuserprofile.h
+++ b/tdeio/tdeio/kuserprofile.h
@@ -37,7 +37,7 @@
  * @see KService
  * @short Holds the user's preference of a service.
  */
-class KIO_EXPORT KServiceOffer
+class TDEIO_EXPORT KServiceOffer
 {
 public:
   /**
@@ -105,16 +105,16 @@ private:
  * of a service type.
  * It consists of a list of services (service offers) for the service type
  * that is sorted by the user's preference.
- * KTrader uses KServiceTypeProfile to sort its results, so usually
- * you can just use KTrader to find the user's preferred service.
+ * TDETrader uses KServiceTypeProfile to sort its results, so usually
+ * you can just use TDETrader to find the user's preferred service.
  *
  * @see KService
  * @see KServiceType
  * @see KServiceOffer
- * @see KTrader
+ * @see TDETrader
  * @short Represents the user's preferences for services of a service type
  */
-class KIO_EXPORT KServiceTypeProfile
+class TDEIO_EXPORT KServiceTypeProfile
 {
 public:
   typedef TQValueList<KServiceOffer> OfferList;
@@ -168,12 +168,12 @@ public:
 
   /**
    * Returns the offers associated with a given servicetype, sorted by preference.
-   * This is what KTrader uses to get the list of offers, before applying the
+   * This is what TDETrader uses to get the list of offers, before applying the
    * constraints and preferences.
    *
    * If @p genericServiceType is specified, a list is returned with
    * the offers associated with the combination of the two service types.
-   * This is almost like an "foo in ServiceTypes" constraint in the KTrader,
+   * This is almost like an "foo in ServiceTypes" constraint in the TDETrader,
    * but the difference is that to order the offers, we will look at entries
    * specifically for those two service types. Typically, this is used for
    * getting the list of embeddable components that can handle a given mimetype.
diff --git a/kio/kio/kzip.cpp b/tdeio/tdeio/kzip.cpp
index 6241cc1ca..85dcb76d1 100644
--- a/kio/kio/kzip.cpp
+++ b/tdeio/tdeio/kzip.cpp
@@ -18,7 +18,7 @@
 */
 
 /*
-	This class implements a kioslave to access ZIP files from KDE.
+	This class implements a tdeioslave to access ZIP files from KDE.
     you can use it in IO_ReadOnly or in IO_WriteOnly mode, and it
     behaves just as expected (i hope ;-) ).
     It can also be used in IO_ReadWrite mode, in this case one can
diff --git a/kio/kio/kzip.h b/tdeio/tdeio/kzip.h
index 26bfc71d3..333736e21 100644
--- a/kio/kio/kzip.h
+++ b/tdeio/tdeio/kzip.h
@@ -30,7 +30,7 @@
 
 class KZipFileEntry;
 /**
- *   This class implements a kioslave to access zip files from KDE.
+ *   This class implements a tdeioslave to access zip files from KDE.
  *   You can use it in IO_ReadOnly or in IO_WriteOnly mode, and it
  *   behaves just as expected.
  *   It can also be used in IO_ReadWrite mode, in this case one can
@@ -50,7 +50,7 @@ class KZipFileEntry;
  * @author Holger Schroeder <holger-kde@holgis.net>
  * @since 3.1
  */
-class KIO_EXPORT KZip : public KArchive
+class TDEIO_EXPORT KZip : public KArchive
 {
 public:
     /**
@@ -223,7 +223,7 @@ private:
 /**
  * @internal
  */
-class KIO_EXPORT KZipFileEntry : public KArchiveFile
+class TDEIO_EXPORT KZipFileEntry : public KArchiveFile
 {
 public:
     /*KZipFileEntry() : st(-1)
diff --git a/kio/kio/lex.c b/tdeio/tdeio/lex.c
index 99848a2f3..8e4ea0ea9 100644
--- a/kio/kio/lex.c
+++ b/tdeio/tdeio/lex.c
@@ -436,12 +436,12 @@ char *yytext;
 #include <stdlib.h>
 #define YY_NO_UNPUT
 
-char* KTraderParse_putSymbol( char *_name );
-char *KTraderParse_putSymbolInBrackets( char *_name );
-char* KTraderParse_putString( char *_name );
+char* TDETraderParse_putSymbol( char *_name );
+char *TDETraderParse_putSymbolInBrackets( char *_name );
+char* TDETraderParse_putString( char *_name );
 int yywrap();
 int kiotraderlex(void);
-void KTraderParse_initFlex( const char *_code );
+void TDETraderParse_initFlex( const char *_code );
 
 #line 447 "lex.c"
 
@@ -763,7 +763,7 @@ YY_RULE_SETUP
 case 17:
 YY_RULE_SETUP
 #line 42 "lex.l"
-{ yylval.name = KTraderParse_putString( yytext ); return VAL_STRING; }
+{ yylval.name = TDETraderParse_putString( yytext ); return VAL_STRING; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
@@ -783,12 +783,12 @@ YY_RULE_SETUP
 case 21:
 YY_RULE_SETUP
 #line 49 "lex.l"
-{ yylval.name = KTraderParse_putSymbolInBrackets( yytext ); return VAL_ID; }
+{ yylval.name = TDETraderParse_putSymbolInBrackets( yytext ); return VAL_ID; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 51 "lex.l"
-{ yylval.name = KTraderParse_putSymbol( yytext ); return VAL_ID; }
+{ yylval.name = TDETraderParse_putSymbol( yytext ); return VAL_ID; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
@@ -1689,7 +1689,7 @@ int main()
 #line 57 "lex.l"
 
 
-char* KTraderParse_putSymbolInBrackets( char *_name )
+char* TDETraderParse_putSymbolInBrackets( char *_name )
 {
   int l = strlen( _name )-1;
   char *p = (char *)malloc( l );
@@ -1702,7 +1702,7 @@ char* KTraderParse_putSymbolInBrackets( char *_name )
   return p;
 }
 
-char *KTraderParse_putSymbol( char *_name )
+char *TDETraderParse_putSymbol( char *_name )
 {
   char *p = (char*)malloc( strlen( _name ) + 1 );
   if (p != NULL)
@@ -1712,7 +1712,7 @@ char *KTraderParse_putSymbol( char *_name )
   return p;
 }
 
-char* KTraderParse_putString( char *_str )
+char* TDETraderParse_putString( char *_str )
 {
   int l = strlen( _str );
   char *p = (char*)malloc( l );
@@ -1747,7 +1747,7 @@ char* KTraderParse_putString( char *_str )
   return p;
 }
 
-void KTraderParse_initFlex( const char *_code )
+void TDETraderParse_initFlex( const char *_code )
 {
   yy_switch_to_buffer( yy_scan_string( _code ) );
 }
diff --git a/kio/kio/lex.l b/tdeio/tdeio/lex.l
index 073a34965..f479d821f 100644
--- a/kio/kio/lex.l
+++ b/tdeio/tdeio/lex.l
@@ -7,12 +7,12 @@
 #include <stdlib.h>
 #define YY_NO_UNPUT
 
-char* KTraderParse_putSymbol( char *_name );
-char *KTraderParse_putSymbolInBrackets( char *_name );
-char* KTraderParse_putString( char *_name );
+char* TDETraderParse_putSymbol( char *_name );
+char *TDETraderParse_putSymbolInBrackets( char *_name );
+char* TDETraderParse_putString( char *_name );
 int yywrap();
 int kiotraderlex(void);
-void KTraderParse_initFlex( const char *_code );
+void TDETraderParse_initFlex( const char *_code );
 
 %}
 
@@ -39,16 +39,16 @@ DIGIT    [0-9]
 "TRUE" { yylval.valb = 1; return VAL_BOOL; }
 "FALSE" { yylval.valb = 0; return VAL_BOOL; }
 
-"'"[^']*"'" { yylval.name = KTraderParse_putString( yytext ); return VAL_STRING; }
+"'"[^']*"'" { yylval.name = TDETraderParse_putString( yytext ); return VAL_STRING; }
 
 "-"{DIGIT}+  { yylval.vali = atoi( yytext ); return VAL_NUM; }
 {DIGIT}+  { yylval.vali = atoi( yytext ); return VAL_NUM; }
 
 {DIGIT}*"\."{DIGIT}+ { yylval.vald = atof( yytext ); return VAL_FLOAT; }
 
-\[[a-zA-Z][a-zA-Z0-9\-]*\] { yylval.name = KTraderParse_putSymbolInBrackets( yytext ); return VAL_ID; }
+\[[a-zA-Z][a-zA-Z0-9\-]*\] { yylval.name = TDETraderParse_putSymbolInBrackets( yytext ); return VAL_ID; }
 
-[a-zA-Z][a-zA-Z0-9]* { yylval.name = KTraderParse_putSymbol( yytext ); return VAL_ID; }
+[a-zA-Z][a-zA-Z0-9]* { yylval.name = TDETraderParse_putSymbol( yytext ); return VAL_ID; }
 
 [ \t\n]+          /* eat up whitespace */
 
@@ -56,7 +56,7 @@ DIGIT    [0-9]
 
 %%
 
-char* KTraderParse_putSymbolInBrackets( char *_name )
+char* TDETraderParse_putSymbolInBrackets( char *_name )
 {
   int l = strlen( _name )-1;
   char *p = (char *)malloc( l );
@@ -69,7 +69,7 @@ char* KTraderParse_putSymbolInBrackets( char *_name )
   return p;
 }
 
-char *KTraderParse_putSymbol( char *_name )
+char *TDETraderParse_putSymbol( char *_name )
 {
   char *p = (char*)malloc( strlen( _name ) + 1 );
   if (p != NULL)
@@ -79,7 +79,7 @@ char *KTraderParse_putSymbol( char *_name )
   return p;
 }
 
-char* KTraderParse_putString( char *_str )
+char* TDETraderParse_putString( char *_str )
 {
   int l = strlen( _str );
   char *p = (char*)malloc( l );
@@ -114,7 +114,7 @@ char* KTraderParse_putString( char *_str )
   return p;
 }
 
-void KTraderParse_initFlex( const char *_code )
+void TDETraderParse_initFlex( const char *_code )
 {
   yy_switch_to_buffer( yy_scan_string( _code ) );
 }
diff --git a/kio/kio/metainfojob.cpp b/tdeio/tdeio/metainfojob.cpp
index 3998584e3..002c76b2a 100644
--- a/kio/kio/metainfojob.cpp
+++ b/tdeio/tdeio/metainfojob.cpp
@@ -21,19 +21,19 @@
 */
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
-#include <kio/kservice.h>
-#include <kparts/componentfactory.h>
+#include <tdefilemetainfo.h>
+#include <tdeio/kservice.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqtimer.h>
 
 #include "metainfojob.moc"
 
-using namespace KIO;
+using namespace TDEIO;
 
-struct KIO::MetaInfoJobPrivate
+struct TDEIO::MetaInfoJobPrivate
 {
     KFileItemList          items;       // all the items we got
     KFileItemListIterator* currentItem; // argh! No default constructor
@@ -42,7 +42,7 @@ struct KIO::MetaInfoJobPrivate
 };
 
 MetaInfoJob::MetaInfoJob(const KFileItemList &items, bool deleteItems)
-    : KIO::Job(false /* no GUI */)
+    : TDEIO::Job(false /* no GUI */)
 {
     d               = new MetaInfoJobPrivate;
     d->deleteItems  = deleteItems;
@@ -113,7 +113,7 @@ void MetaInfoJob::determineNextFile()
     getMetaInfo();
 }
 
-void MetaInfoJob::slotResult( KIO::Job *job )
+void MetaInfoJob::slotResult( TDEIO::Job *job )
 {
     subjobs.remove(job);
     Q_ASSERT(subjobs.isEmpty()); // We should have only one job at a time ...
@@ -129,17 +129,17 @@ void MetaInfoJob::getMetaInfo()
     URL.setProtocol("metainfo");
     URL.setPath(d->currentItem->current()->url().path());
 
-    KIO::TransferJob* job = KIO::get(URL, false, false);
+    TDEIO::TransferJob* job = TDEIO::get(URL, false, false);
     addSubjob(job);
 
-    connect(job,  TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-            this, TQT_SLOT(slotMetaInfo(KIO::Job *, const TQByteArray &)));
+    connect(job,  TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+            this, TQT_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &)));
 
     job->addMetaData("mimeType", d->currentItem->current()->mimetype());
 }
 
 
-void MetaInfoJob::slotMetaInfo(KIO::Job*, const TQByteArray &data)
+void MetaInfoJob::slotMetaInfo(TDEIO::Job*, const TQByteArray &data)
 {
     KFileMetaInfo info;
     TQDataStream s(data, IO_ReadOnly);
@@ -154,8 +154,8 @@ void MetaInfoJob::slotMetaInfo(KIO::Job*, const TQByteArray &data)
 TQStringList MetaInfoJob::availablePlugins()
 {
     TQStringList result;
-    KTrader::OfferList plugins = KTrader::self()->query("KFilePlugin");
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+    TDETrader::OfferList plugins = TDETrader::self()->query("KFilePlugin");
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
         result.append((*it)->desktopEntryName());
     return result;
 }
@@ -163,18 +163,18 @@ TQStringList MetaInfoJob::availablePlugins()
 TQStringList MetaInfoJob::supportedMimeTypes()
 {
     TQStringList result;
-    KTrader::OfferList plugins = KTrader::self()->query("KFilePlugin");
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+    TDETrader::OfferList plugins = TDETrader::self()->query("KFilePlugin");
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
         result += (*it)->property("MimeTypes").toStringList();
     return result;
 }
 
-KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KFileItemList &items)
+TDEIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KFileItemList &items)
 {
     return new MetaInfoJob(items, false);
 }
 
-KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KURL::List &items)
+TDEIO_EXPORT MetaInfoJob *TDEIO::fileMetaInfo( const KURL::List &items)
 {
     KFileItemList fileItems;
     for (KURL::List::ConstIterator it = items.begin(); it != items.end(); ++it)
diff --git a/kio/kio/metainfojob.h b/tdeio/tdeio/metainfojob.h
index 3b96713fb..6bf72a999 100644
--- a/kio/kio/metainfojob.h
+++ b/tdeio/tdeio/metainfojob.h
@@ -19,20 +19,20 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_metainfojob_h__
-#define __kio_metainfojob_h__
+#ifndef __tdeio_metainfojob_h__
+#define __tdeio_metainfojob_h__
 
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 
-namespace KIO {
+namespace TDEIO {
     /**
      * MetaInfoJob is a KIO Job to retrieve meta information from files.
      * 
      * @short KIO Job to retrieve meta information from files.
      * @since 3.1
      */
-    class KIO_EXPORT MetaInfoJob : public KIO::Job
+    class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
@@ -85,11 +85,11 @@ namespace KIO {
         void getMetaInfo();
 
     protected slots:
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
     private slots:
         void start();
-        void slotMetaInfo(KIO::Job *, const TQByteArray &);
+        void slotMetaInfo(TDEIO::Job *, const TQByteArray &);
 
     private:
         void determineNextFile();
@@ -105,7 +105,7 @@ namespace KIO {
      * @param items files to get metainfo for
      * @return the MetaInfoJob to retrieve the items
      */
-    KIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items);
+    TDEIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items);
 
     /**
      * Retrieves meta information for the given items.
@@ -113,7 +113,7 @@ namespace KIO {
      * @param items files to get metainfo for
      * @return the MetaInfoJob to retrieve the items
      */
-    KIO_EXPORT MetaInfoJob* fileMetaInfo(const KURL::List& items);
+    TDEIO_EXPORT MetaInfoJob* fileMetaInfo(const KURL::List& items);
 }
 
 #endif
diff --git a/kio/kio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp
index a7ddb3987..cbab6684e 100644
--- a/kio/kio/netaccess.cpp
+++ b/tdeio/tdeio/netaccess.cpp
@@ -33,17 +33,17 @@
 #include <tqfile.h>
 #include <tqmetaobject.h>
 
-#include <kapplication.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/job.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/scheduler.h>
 
-#include "kio/netaccess.h"
+#include "tdeio/netaccess.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 TQString * NetAccess::lastErrorMsg;
 int NetAccess::lastErrorCode = 0;
@@ -190,12 +190,12 @@ bool NetAccess::exists( const KURL & url, bool source, TQWidget* window )
   return kioNet.statInternal( url, 0 /*no details*/, source, window );
 }
 
-bool NetAccess::stat( const KURL & url, KIO::UDSEntry & entry )
+bool NetAccess::stat( const KURL & url, TDEIO::UDSEntry & entry )
 {
   return NetAccess::stat( url, entry, 0 );
 }
 
-bool NetAccess::stat( const KURL & url, KIO::UDSEntry & entry, TQWidget* window )
+bool NetAccess::stat( const KURL & url, TDEIO::UDSEntry & entry, TQWidget* window )
 {
   NetAccess kioNet;
   bool ret = kioNet.statInternal( url, 2 /*all details*/, true /*source*/, window );
@@ -211,7 +211,7 @@ KURL NetAccess::mostLocalURL(const KURL & url, TQWidget* window)
     return url;
   }
 
-  KIO::UDSEntry entry;
+  TDEIO::UDSEntry entry;
   if (!stat(url, entry, window))
   {
     return url;
@@ -219,12 +219,12 @@ KURL NetAccess::mostLocalURL(const KURL & url, TQWidget* window)
 
   TQString path;
 
-  // Extract the local path from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = entry.begin();
-  const KIO::UDSEntry::ConstIterator end = entry.end();
+  // Extract the local path from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = entry.begin();
+  const TDEIO::UDSEntry::ConstIterator end = entry.end();
   for ( ; it != end; ++it )
   {
-    if ( (*it).m_uds == KIO::UDS_LOCAL_PATH )
+    if ( (*it).m_uds == TDEIO::UDS_LOCAL_PATH )
     {
       path = (*it).m_str;
       break;
@@ -305,13 +305,13 @@ bool NetAccess::filecopyInternal(const KURL& src, const KURL& target, int permis
 {
   bJobOK = true; // success unless further error occurs
 
-  KIO::Scheduler::checkSlaveOnHold(true);
-  KIO::Job * job = move
-                   ? KIO::file_move( src, target, permissions, overwrite, resume )
-                   : KIO::file_copy( src, target, permissions, overwrite, resume );
+  TDEIO::Scheduler::checkSlaveOnHold(true);
+  TDEIO::Job * job = move
+                   ? TDEIO::file_move( src, target, permissions, overwrite, resume )
+                   : TDEIO::file_copy( src, target, permissions, overwrite, resume );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
 
   enter_loop();
   return bJobOK;
@@ -322,12 +322,12 @@ bool NetAccess::dircopyInternal(const KURL::List& src, const KURL& target,
 {
   bJobOK = true; // success unless further error occurs
 
-  KIO::Job * job = move
-                   ? KIO::move( src, target )
-                   : KIO::copy( src, target );
+  TDEIO::Job * job = move
+                   ? TDEIO::move( src, target )
+                   : TDEIO::copy( src, target );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
 
   enter_loop();
   return bJobOK;
@@ -337,12 +337,12 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source,
                               TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
-  KIO::StatJob * job = KIO::stat( url, !url.isLocalFile() && !url.url().startsWith("beagle:?") );
+  TDEIO::StatJob * job = TDEIO::stat( url, !url.isLocalFile() && !url.url().startsWith("beagle:?") );
   job->setWindow (window);
   job->setDetails( details );
   job->setSide( source );
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -350,10 +350,10 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source,
 bool NetAccess::delInternal( const KURL & url, TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
-  KIO::Job * job = KIO::del( url );
+  TDEIO::Job * job = TDEIO::del( url );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -362,10 +362,10 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions,
                                TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
-  KIO::Job * job = KIO::mkdir( url, permissions );
+  TDEIO::Job * job = TDEIO::mkdir( url, permissions );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -374,17 +374,17 @@ TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window )
 {
   bJobOK = true; // success unless further error occurs
   m_mimetype = TQString::fromLatin1("unknown");
-  KIO::Job * job = KIO::mimetype( url );
+  TDEIO::Job * job = TDEIO::mimetype( url );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
-  connect( job, TQT_SIGNAL( mimetype (KIO::Job *, const TQString &) ),
-           this, TQT_SLOT( slotMimetype (KIO::Job *, const TQString &) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
+  connect( job, TQT_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ),
+           this, TQT_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) );
   enter_loop();
   return m_mimetype;
 }
 
-void NetAccess::slotMimetype( KIO::Job *, const TQString & type  )
+void NetAccess::slotMimetype( TDEIO::Job *, const TQString & type  )
 {
   m_mimetype = type;
 }
@@ -412,13 +412,13 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman
 
     stream << int('X') << tempPathUrl << command;
 
-    KIO::Job * job = KIO::special( tempPathUrl, packedArgs, true );
+    TDEIO::Job * job = TDEIO::special( tempPathUrl, packedArgs, true );
     job->setWindow( window );
-    connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-             this, TQT_SLOT( slotResult (KIO::Job *) ) );
+    connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+             this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
     enter_loop();
 
-    // since the KIO::special does not provide feedback we need to download the result
+    // since the TDEIO::special does not provide feedback we need to download the result
     if( NetAccess::download( tempPathUrl, target, window ) )
     {
       TQFile resultFile( target );
@@ -459,21 +459,21 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray*
       }
   }
 
-  connect( job, TQT_SIGNAL( result (KIO::Job *) ),
-           this, TQT_SLOT( slotResult (KIO::Job *) ) );
+  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
+           this, TQT_SLOT( slotResult (TDEIO::Job *) ) );
 
   TQMetaObject *meta = job->metaObject();
 
-  static const char dataSignal[] = "data(KIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)";
+  static const char dataSignal[] = "data(TDEIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)";
   if ( meta->findSignal( dataSignal ) != -1 ) {
-      connect( job, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)),
-               this, TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) );
+      connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+               this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );
   }
 
-  static const char redirSignal[] = "redirection(KIO::Job*,const KURL&)";
+  static const char redirSignal[] = "redirection(TDEIO::Job*,const KURL&)";
   if ( meta->findSignal( redirSignal ) != -1 ) {
-      connect( job, TQT_SIGNAL(redirection(KIO::Job*,const KURL&)),
-               this, TQT_SLOT(slotRedirection(KIO::Job*, const KURL&)) );
+      connect( job, TQT_SIGNAL(redirection(TDEIO::Job*,const KURL&)),
+               this, TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) );
   }
 
   enter_loop();
@@ -499,7 +499,7 @@ void NetAccess::enter_loop()
   tqt_leave_modal(&dummy);
 }
 
-void NetAccess::slotResult( KIO::Job * job )
+void NetAccess::slotResult( TDEIO::Job * job )
 {
   lastErrorCode = job->error();
   bJobOK = !job->error();
@@ -509,8 +509,8 @@ void NetAccess::slotResult( KIO::Job * job )
       lastErrorMsg = new TQString;
     *lastErrorMsg = job->errorString();
   }
-  if ( job->isA("KIO::StatJob") )
-    m_entry = static_cast<KIO::StatJob *>(job)->statResult();
+  if ( job->isA("TDEIO::StatJob") )
+    m_entry = static_cast<TDEIO::StatJob *>(job)->statResult();
 
   if ( m_metaData )
     *m_metaData = job->metaData();
@@ -518,7 +518,7 @@ void NetAccess::slotResult( KIO::Job * job )
   tqApp->exit_loop();
 }
 
-void NetAccess::slotData( KIO::Job*, const TQByteArray& data )
+void NetAccess::slotData( TDEIO::Job*, const TQByteArray& data )
 {
   if ( data.isEmpty() )
     return;
@@ -528,7 +528,7 @@ void NetAccess::slotData( KIO::Job*, const TQByteArray& data )
   std::memcpy( m_data.data() + offset, data.data(), data.size() );
 }
 
-void NetAccess::slotRedirection( KIO::Job*, const KURL& url )
+void NetAccess::slotRedirection( TDEIO::Job*, const KURL& url )
 {
   m_url = url;
 }
diff --git a/kio/kio/netaccess.h b/tdeio/tdeio/netaccess.h
index 110c18053..0c7f020ea 100644
--- a/kio/kio/netaccess.h
+++ b/tdeio/tdeio/netaccess.h
@@ -20,19 +20,19 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_netaccess_h
-#define __kio_netaccess_h
+#ifndef __tdeio_netaccess_h
+#define __tdeio_netaccess_h
 
 #include <tqobject.h>
 #include <tqstring.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class TQStringList;
 class TQWidget;
 class KURL;
 template<typename T, typename K> class TQMap;
 
-namespace KIO {
+namespace TDEIO {
 
   class Job;
 
@@ -40,9 +40,9 @@ namespace KIO {
    * Net Transparency.
    *
    * NetAccess allows you to do simple file operation (load, save,
-   * copy, delete...) without working with KIO::Job directly.
-   * Whereas a KIO::Job is asynchronous, meaning that the
-   * developer has to connect slots for it, KIO::NetAccess provides
+   * copy, delete...) without working with TDEIO::Job directly.
+   * Whereas a TDEIO::Job is asynchronous, meaning that the
+   * developer has to connect slots for it, TDEIO::NetAccess provides
    * synchronous downloads and uploads, as well as temporary file
    * creation and removal. The functions appear to be blocking,
    * but the Qt event loop continues running while the operations
@@ -56,7 +56,7 @@ namespace KIO {
    *
    * @short Provides an easy, synchronous interface to KIO file operations.
    */
-class KIO_EXPORT NetAccess : public TQObject
+class TDEIO_EXPORT NetAccess : public TQObject
 {
   Q_OBJECT
 
@@ -83,12 +83,12 @@ public:
      *
      * \code
      * TQString tmpFile;
-     * if( KIO::NetAccess::download( u, tmpFile, window ) )
+     * if( TDEIO::NetAccess::download( u, tmpFile, window ) )
      * {
      *   loadFile( tmpFile );
-     *   KIO::NetAccess::removeTempFile( tmpFile );
+     *   TDEIO::NetAccess::removeTempFile( tmpFile );
      * } else {
-     *   KMessageBox::error(this, KIO::NetAccess::lastErrorString() );
+     *   KMessageBox::error(this, TDEIO::NetAccess::lastErrorString() );
      * }
      * \endcode
      *
@@ -123,7 +123,7 @@ public:
 
     /**
      * Removes the specified file if and only if it was created
-     * by KIO::NetAccess as a temporary file for a former download.
+     * by TDEIO::NetAccess as a temporary file for a former download.
      *
      * Note: This means that if you created your temporary with KTempFile,
      * use KTempFile::unlink() or KTempFile::setAutoDelete() to have
@@ -165,7 +165,7 @@ public:
      * Overwrite is false, so this will fail if @p target exists.
      *
      * This one takes two URLs and is a direct equivalent
-     * of KIO::file_copy (not KIO::copy!).
+     * of TDEIO::file_copy (not TDEIO::copy!).
      * It will be renamed file_copy in KDE4, so better use file_copy.
      *
      * @param src URL Referencing the file to upload.
@@ -188,13 +188,13 @@ public:
     // KDE4: merge with above
 
     /**
-     * Full-fledged equivalent of KIO::file_copy
+     * Full-fledged equivalent of TDEIO::file_copy
      */
     static bool file_copy( const KURL& src, const KURL& dest, int permissions=-1,
                             bool overwrite=false, bool resume=false, TQWidget* window = 0L );
 
     /**
-     * Full-fledged equivalent of KIO::file_move.
+     * Full-fledged equivalent of TDEIO::file_move.
      * Moves or renames *one file*.
      * @since 3.2
      */
@@ -207,7 +207,7 @@ public:
      * Overwrite is false, so this will fail if @p target exists.
      *
      * This one takes two URLs and is a direct equivalent
-     * of KIO::copy!.
+     * of TDEIO::copy!.
      * This means that it can copy files and directories alike
      * (it should have been named copy()).
      *
@@ -234,14 +234,14 @@ public:
     static bool dircopy( const KURL::List& src, const KURL& target, TQWidget* window = 0L );
 
     /**
-     * Full-fledged equivalent of KIO::move.
+     * Full-fledged equivalent of TDEIO::move.
      * Moves or renames one file or directory.
      * @since 3.2
      */
     static bool move( const KURL& src, const KURL& target, TQWidget* window = 0L );
 
     /**
-     * Full-fledged equivalent of KIO::move.
+     * Full-fledged equivalent of TDEIO::move.
      * Moves or renames a list of files or directories.
      * @since 3.2
      */
@@ -253,7 +253,7 @@ public:
      * @param url the URL we are testing
      * @param source if true, we want to read from that URL.
      *               If false, we want to write to it.
-     * IMPORTANT: see documentation for KIO::stat for more details about this.
+     * IMPORTANT: see documentation for TDEIO::stat for more details about this.
      * @param window main window associated with this job. This is used to
      *               automatically cache and discard authentication information
      *               as needed. If NULL, authentication information will be
@@ -284,7 +284,7 @@ public:
     /**
      * Tests whether a URL exists and return information on it.
      *
-     * This is a convenience function for KIO::stat
+     * This is a convenience function for TDEIO::stat
      * (it saves creating a slot and testing for the job result).
      *
      * @param url The URL we are testing.
@@ -297,17 +297,17 @@ public:
      *               again be prompted for passwords as needed.
      * @return true if successful, false for failure
      */
-    static bool stat(const KURL& url, KIO::UDSEntry & entry, TQWidget* window);
+    static bool stat(const KURL& url, TDEIO::UDSEntry & entry, TQWidget* window);
 
     /**
      * @deprecated. Use the function above instead.
      */
-    static bool stat(const KURL& url, KIO::UDSEntry & entry) KDE_DEPRECATED;
+    static bool stat(const KURL& url, TDEIO::UDSEntry & entry) KDE_DEPRECATED;
 
     /**
      * Tries to map a local URL for the given URL.
      *
-     * This is a convenience function for KIO::stat + parsing the
+     * This is a convenience function for TDEIO::stat + parsing the
      * resulting UDSEntry.
      *
      * @param url The URL we are testing.
@@ -325,7 +325,7 @@ public:
     /**
      * Deletes a file or a directory in a synchronous way.
      *
-     * This is a convenience function for KIO::del
+     * This is a convenience function for TDEIO::del
      * (it saves creating a slot and testing for the job result).
      *
      * @param url The file or directory to delete.
@@ -349,7 +349,7 @@ public:
     /**
      * Creates a directory in a synchronous way.
      *
-     * This is a convenience function for @p KIO::mkdir
+     * This is a convenience function for @p TDEIO::mkdir
      * (it saves creating a slot and testing for the job result).
      *
      * @param url The directory to create.
@@ -397,7 +397,7 @@ public:
      * and after the function returns it will contain all the data fetched by this job.
      *
      * <code>
-     * KIO::Job *job = KIO::get( url, false, false );
+     * TDEIO::Job *job = TDEIO::get( url, false, false );
      * TQMap<TQString, TQString> metaData;
      * metaData.insert( "PropagateHttpHeader", "true" );
      * if ( NetAccess::synchronousRun( job, 0, &data, &url, &metaData ) ) {
@@ -435,7 +435,7 @@ public:
      *
      * Determines the mimetype of a given URL.
      *
-     * This is a convenience function for KIO::mimetype.  You
+     * This is a convenience function for TDEIO::mimetype.  You
      * should call this only when really necessary.
      * KMimeType::findByURL can determine extension a lot faster, but
      * less reliably for remote files. Only when findByURL() returns
@@ -514,10 +514,10 @@ private:
     friend class I_like_this_class;
 
 private slots:
-    void slotResult( KIO::Job * job );
-    void slotMimetype( KIO::Job * job, const TQString & type );
-    void slotData( KIO::Job*, const TQByteArray& );
-    void slotRedirection( KIO::Job*, const KURL& );
+    void slotResult( TDEIO::Job * job );
+    void slotMimetype( TDEIO::Job * job, const TQString & type );
+    void slotData( TDEIO::Job*, const TQByteArray& );
+    void slotRedirection( TDEIO::Job*, const KURL& );
 
 private:
     UDSEntry m_entry;
diff --git a/kio/kio/observer.cpp b/tdeio/tdeio/observer.cpp
index 2a468b1e6..2309c2142 100644
--- a/kio/kio/observer.cpp
+++ b/tdeio/tdeio/observer.cpp
@@ -22,7 +22,7 @@
 #include <assert.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kurl.h>
 
@@ -34,22 +34,22 @@
 #include "passdlg.h"
 #include "slavebase.h"
 #include "observer_stub.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksslinfodlg.h>
 #include <ksslcertdlg.h>
 #include <ksslcertificate.h>
 #include <ksslcertchain.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
-template class TQIntDict<KIO::Job>;
+template class TQIntDict<TDEIO::Job>;
 
 Observer * Observer::s_pObserver = 0L;
 
 const int KDEBUG_OBSERVER = 7007; // Should be 7028
 
-Observer::Observer() : DCOPObject("KIO::Observer")
+Observer::Observer() : DCOPObject("TDEIO::Observer")
 {
     // Register app as able to receive DCOP messages
     if (kapp && !kapp->dcopClient()->isAttached())
@@ -57,28 +57,28 @@ Observer::Observer() : DCOPObject("KIO::Observer")
         kapp->dcopClient()->attach();
     }
 
-    if ( !kapp->dcopClient()->isApplicationRegistered( "kio_uiserver" ) )
+    if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
     {
-        kdDebug(KDEBUG_OBSERVER) << "Starting kio_uiserver" << endl;
+        kdDebug(KDEBUG_OBSERVER) << "Starting tdeio_uiserver" << endl;
         TQString error;
-        int ret = KApplication::startServiceByDesktopPath( "kio_uiserver.desktop",
+        int ret = TDEApplication::startServiceByDesktopPath( "tdeio_uiserver.desktop",
                                                              TQStringList(), &error );
         if ( ret > 0 )
         {
-            kdError() << "Couldn't start kio_uiserver from kio_uiserver.desktop: " << error << endl;
+            kdError() << "Couldn't start tdeio_uiserver from tdeio_uiserver.desktop: " << error << endl;
         } else
             kdDebug(KDEBUG_OBSERVER) << "startServiceByDesktopPath returned " << ret << endl;
 
     }
-    if ( !kapp->dcopClient()->isApplicationRegistered( "kio_uiserver" ) )
-        kdDebug(KDEBUG_OBSERVER) << "The application kio_uiserver is STILL NOT REGISTERED" << endl;
+    if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
+        kdDebug(KDEBUG_OBSERVER) << "The application tdeio_uiserver is STILL NOT REGISTERED" << endl;
     else
-        kdDebug(KDEBUG_OBSERVER) << "kio_uiserver registered" << endl;
+        kdDebug(KDEBUG_OBSERVER) << "tdeio_uiserver registered" << endl;
 
-    m_uiserver = new UIServer_stub( "kio_uiserver", "UIServer" );
+    m_uiserver = new UIServer_stub( "tdeio_uiserver", "UIServer" );
 }
 
-int Observer::newJob( KIO::Job * job, bool showProgress )
+int Observer::newJob( TDEIO::Job * job, bool showProgress )
 {
     // Tell the UI Server about this new job, and give it the application id
     // at the same time
@@ -98,7 +98,7 @@ void Observer::jobFinished( int progressId )
 
 void Observer::killJob( int progressId )
 {
-    KIO::Job * job = m_dctJobs[ progressId ];
+    TDEIO::Job * job = m_dctJobs[ progressId ];
     if (!job)
     {
         kdWarning() << "Can't find job to kill ! There is no job with progressId=" << progressId << " in this process" << endl;
@@ -109,111 +109,111 @@ void Observer::killJob( int progressId )
 
 MetaData Observer::metadata( int progressId )
 {
-    KIO::Job * job = m_dctJobs[ progressId ];
+    TDEIO::Job * job = m_dctJobs[ progressId ];
     assert(job);
     return job->metaData();
 }
 
-void Observer::slotTotalSize( KIO::Job* job, KIO::filesize_t size )
+void Observer::slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size )
 {
-  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalSize " << job << " " << KIO::number(size) << endl;
+  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalSize " << job << " " << TDEIO::number(size) << endl;
   m_uiserver->totalSize64( job->progressId(), size );
 }
 
-void Observer::slotTotalFiles( KIO::Job* job, unsigned long files )
+void Observer::slotTotalFiles( TDEIO::Job* job, unsigned long files )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalFiles " << job << " " << files << endl;
   m_uiserver->totalFiles( job->progressId(), files );
 }
 
-void Observer::slotTotalDirs( KIO::Job* job, unsigned long dirs )
+void Observer::slotTotalDirs( TDEIO::Job* job, unsigned long dirs )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTotalDirs " << job << " " << dirs << endl;
   m_uiserver->totalDirs( job->progressId(), dirs );
 }
 
-void Observer::slotProcessedSize( KIO::Job* job, KIO::filesize_t size )
+void Observer::slotProcessedSize( TDEIO::Job* job, TDEIO::filesize_t size )
 {
-  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedSize " << job << " " << job->progressId() << " " << KIO::number(size) << endl;
+  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedSize " << job << " " << job->progressId() << " " << TDEIO::number(size) << endl;
   m_uiserver->processedSize64( job->progressId(), size );
 }
 
-void Observer::slotProcessedFiles( KIO::Job* job, unsigned long files )
+void Observer::slotProcessedFiles( TDEIO::Job* job, unsigned long files )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedFiles " << job << " " << files << endl;
   m_uiserver->processedFiles( job->progressId(), files );
 }
 
-void Observer::slotProcessedDirs( KIO::Job* job, unsigned long dirs )
+void Observer::slotProcessedDirs( TDEIO::Job* job, unsigned long dirs )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotProcessedDirs " << job << " " << dirs << endl;
   m_uiserver->processedDirs( job->progressId(), dirs );
 }
 
-void Observer::slotSpeed( KIO::Job* job, unsigned long speed )
+void Observer::slotSpeed( TDEIO::Job* job, unsigned long speed )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotSpeed " << job << " " << speed << endl;
   m_uiserver->speed( job->progressId(), speed );
 }
 
-void Observer::slotPercent( KIO::Job* job, unsigned long percent )
+void Observer::slotPercent( TDEIO::Job* job, unsigned long percent )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotPercent " << job << " " << percent << endl;
   m_uiserver->percent( job->progressId(), percent );
 }
 
-void Observer::slotInfoMessage( KIO::Job* job, const TQString & msg )
+void Observer::slotInfoMessage( TDEIO::Job* job, const TQString & msg )
 {
   m_uiserver->infoMessage( job->progressId(), msg );
 }
 
-void Observer::slotCopying( KIO::Job* job, const KURL& from, const KURL& to )
+void Observer::slotCopying( TDEIO::Job* job, const KURL& from, const KURL& to )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCopying " << job << " " << from.url() << " " << to.url() << endl;
   m_uiserver->copying( job->progressId(), from, to );
 }
 
-void Observer::slotMoving( KIO::Job* job, const KURL& from, const KURL& to )
+void Observer::slotMoving( TDEIO::Job* job, const KURL& from, const KURL& to )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotMoving " << job << " " << from.url() << " " << to.url() << endl;
   m_uiserver->moving( job->progressId(), from, to );
 }
 
-void Observer::slotDeleting( KIO::Job* job, const KURL& url )
+void Observer::slotDeleting( TDEIO::Job* job, const KURL& url )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotDeleting " << job << " " << url.url() << endl;
   m_uiserver->deleting( job->progressId(), url );
 }
 
-void Observer::slotTransferring( KIO::Job* job, const KURL& url )
+void Observer::slotTransferring( TDEIO::Job* job, const KURL& url )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotTransferring " << job << " " << url.url() << endl;
   m_uiserver->transferring( job->progressId(), url );
 }
 
-void Observer::slotCreatingDir( KIO::Job* job, const KURL& dir )
+void Observer::slotCreatingDir( TDEIO::Job* job, const KURL& dir )
 {
   //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCreatingDir " << job << " " << dir.url() << endl;
   m_uiserver->creatingDir( job->progressId(), dir );
 }
 
-void Observer::slotCanResume( KIO::Job* job, KIO::filesize_t offset )
+void Observer::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset )
 {
-  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCanResume " << job << " " << KIO::number(offset) << endl;
+  //kdDebug(KDEBUG_OBSERVER) << "** Observer::slotCanResume " << job << " " << TDEIO::number(offset) << endl;
   m_uiserver->canResume64( job->progressId(), offset );
 }
 
-void Observer::stating( KIO::Job* job, const KURL& url )
+void Observer::stating( TDEIO::Job* job, const KURL& url )
 {
   m_uiserver->stating( job->progressId(), url );
 }
 
-void Observer::mounting( KIO::Job* job, const TQString & dev, const TQString & point )
+void Observer::mounting( TDEIO::Job* job, const TQString & dev, const TQString & point )
 {
   m_uiserver->mounting( job->progressId(), dev, point );
 }
 
-void Observer::unmounting( KIO::Job* job, const TQString & point )
+void Observer::unmounting( TDEIO::Job* job, const TQString & point )
 {
   m_uiserver->unmounting( job->progressId(), point );
 }
@@ -235,11 +235,11 @@ bool Observer::openPassDlg( const TQString& prompt, TQString& user,
    return result;
 }
 
-bool Observer::openPassDlg( KIO::AuthInfo& info )
+bool Observer::openPassDlg( TDEIO::AuthInfo& info )
 {
     kdDebug(KDEBUG_OBSERVER) << "Observer::openPassDlg: User= " << info.username
                              << ", Message= " << info.prompt << endl;
-    int result = KIO::PasswordDialog::getNameAndPassword( info.username, info.password,
+    int result = TDEIO::PasswordDialog::getNameAndPassword( info.username, info.password,
                                                           &info.keepPassword, info.prompt,
                                                           info.readOnly, info.caption,
                                                           info.comment, info.commentLabel );
@@ -264,39 +264,39 @@ int Observer::messageBox( int progressId, int type, const TQString &text,
 {
     kdDebug() << "Observer::messageBox " << type << " " << text << " - " << caption << endl;
     int result = -1;
-    KConfig *config = new KConfig("kioslaverc");
+    TDEConfig *config = new TDEConfig("tdeioslaverc");
     KMessageBox::setDontShowAskAgainConfig(config);
 
     switch (type) {
-        case KIO::SlaveBase::QuestionYesNo:
+        case TDEIO::SlaveBase::QuestionYesNo:
             result = KMessageBox::questionYesNo( 0L, // parent ?
                                                text, caption, buttonYes, buttonNo, dontAskAgainName );
             break;
-        case KIO::SlaveBase::WarningYesNo:
+        case TDEIO::SlaveBase::WarningYesNo:
             result = KMessageBox::warningYesNo( 0L, // parent ?
                                               text, caption, buttonYes, buttonNo, dontAskAgainName );
             break;
-        case KIO::SlaveBase::WarningContinueCancel:
+        case TDEIO::SlaveBase::WarningContinueCancel:
             result = KMessageBox::warningContinueCancel( 0L, // parent ?
                                               text, caption, buttonYes, dontAskAgainName );
             break;
-        case KIO::SlaveBase::WarningYesNoCancel:
+        case TDEIO::SlaveBase::WarningYesNoCancel:
             result = KMessageBox::warningYesNoCancel( 0L, // parent ?
                                               text, caption, buttonYes, buttonNo, dontAskAgainName );
             break;
-        case KIO::SlaveBase::Information:
+        case TDEIO::SlaveBase::Information:
             KMessageBox::information( 0L, // parent ?
                                       text, caption, dontAskAgainName );
             result = 1; // whatever
             break;
-        case KIO::SlaveBase::SSLMessageBox:
+        case TDEIO::SlaveBase::SSLMessageBox:
         {
             TQCString observerAppId = caption.utf8(); // hack, see slaveinterface.cpp
-            // Contact the object "KIO::Observer" in the application <appId>
+            // Contact the object "TDEIO::Observer" in the application <appId>
             // Yes, this could be the same application we are, but not necessarily.
-            Observer_stub observer( observerAppId, "KIO::Observer" );
+            Observer_stub observer( observerAppId, "TDEIO::Observer" );
 
-            KIO::MetaData meta = observer.metadata( progressId );
+            TDEIO::MetaData meta = observer.metadata( progressId );
             KSSLInfoDlg *kid = new KSSLInfoDlg(meta["ssl_in_use"].upper()=="TRUE", 0L /*parent?*/, 0L, true);
             KSSLCertificate *x = KSSLCertificate::fromString(meta["ssl_peer_certificate"].local8Bit());
             if (x) {
@@ -353,7 +353,7 @@ int Observer::messageBox( int progressId, int type, const TQString &text,
     arg << caption;
     arg << buttonYes;
     arg << buttonNo;
-    if ( kapp->dcopClient()->call( "kio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true )
+    if ( kapp->dcopClient()->call( "tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true )
         && replyType == "int" )
     {
         int result;
@@ -367,12 +367,12 @@ int Observer::messageBox( int progressId, int type, const TQString &text,
 #endif
 }
 
-RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job,
+RenameDlg_Result Observer::open_RenameDlg( TDEIO::Job* job,
                                            const TQString & caption,
                                            const TQString& src, const TQString & dest,
                                            RenameDlg_Mode mode, TQString& newDest,
-                                           KIO::filesize_t sizeSrc,
-                                           KIO::filesize_t sizeDest,
+                                           TDEIO::filesize_t sizeSrc,
+                                           TDEIO::filesize_t sizeDest,
                                            time_t ctimeSrc,
                                            time_t ctimeDest,
                                            time_t mtimeSrc,
@@ -387,7 +387,7 @@ RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job,
     m_uiserver->setJobVisible( job->progressId(), false );
   // We now do it in process => KDE4: move this code out of Observer (back to job.cpp), so that
   // opening the rename dialog doesn't start uiserver for nothing if progressId=0 (e.g. F2 in konq)
-  RenameDlg_Result res = KIO::open_RenameDlg( caption, src, dest, mode,
+  RenameDlg_Result res = TDEIO::open_RenameDlg( caption, src, dest, mode,
                                                newDest, sizeSrc, sizeDest,
                                                ctimeSrc, ctimeDest, mtimeSrc,
                                                mtimeDest );
@@ -396,7 +396,7 @@ RenameDlg_Result Observer::open_RenameDlg( KIO::Job* job,
   return res;
 }
 
-SkipDlg_Result Observer::open_SkipDlg( KIO::Job* job,
+SkipDlg_Result Observer::open_SkipDlg( TDEIO::Job* job,
                                        bool _multi,
                                        const TQString& _error_text )
 {
@@ -404,8 +404,8 @@ SkipDlg_Result Observer::open_SkipDlg( KIO::Job* job,
   // Hide existing dialog box if any
   if (job && job->progressId())
       m_uiserver->setJobVisible( job->progressId(), false );
-  // We now do it in process. So this method is a useless wrapper around KIO::open_RenameDlg.
-  SkipDlg_Result res = KIO::open_SkipDlg( _multi, _error_text );
+  // We now do it in process. So this method is a useless wrapper around TDEIO::open_RenameDlg.
+  SkipDlg_Result res = TDEIO::open_SkipDlg( _multi, _error_text );
   if (job && job->progressId())
       m_uiserver->setJobVisible( job->progressId(), true );
   return res;
diff --git a/kio/kio/observer.h b/tdeio/tdeio/observer.h
index 94b8cede9..fd3cb6310 100644
--- a/kio/kio/observer.h
+++ b/tdeio/tdeio/observer.h
@@ -16,28 +16,28 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_observer_h__
-#define __kio_observer_h__
+#ifndef __tdeio_observer_h__
+#define __tdeio_observer_h__
 
 #include <tqobject.h>
 #include <dcopobject.h>
 #include <tqintdict.h>
 
-#include <kio/global.h>
-#include <kio/authinfo.h>
-#include "kio/job.h"
-#include "kio/skipdlg.h"
-#include "kio/renamedlg.h"
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
+#include "tdeio/job.h"
+#include "tdeio/skipdlg.h"
+#include "tdeio/renamedlg.h"
 
 class UIServer_stub;
 class KURL;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
 /**
- * Observer for KIO::Job progress information.
+ * Observer for TDEIO::Job progress information.
  *
  * This class, of which there is always only one instance,
  * "observes" what jobs do and forwards this information
@@ -47,12 +47,12 @@ namespace KIO {
  * kill method when the user presses Cancel.
  *
  * Usually jobs are automatically registered by the
- * KIO::Scheduler, so you do not have to care about that.
+ * TDEIO::Scheduler, so you do not have to care about that.
  *
- * @short Observer for KIO::Job progress information
+ * @short Observer for TDEIO::Job progress information
  * @author David Faure <faure@kde.org>
  */
-class KIO_EXPORT Observer : public TQObject, public DCOPObject {
+class TDEIO_EXPORT Observer : public TQObject, public DCOPObject {
 
   K_DCOP
   Q_OBJECT
@@ -75,7 +75,7 @@ public:
    * @param showProgress true to show progress, false otherwise
    * @return the progress ID assigned by the UI Server to the Job.
    */
-  int newJob( KIO::Job * job, bool showProgress );
+  int newJob( TDEIO::Job * job, bool showProgress );
 
   /**
    * Called by the job destructor, to tell the UI Server that
@@ -85,7 +85,7 @@ public:
   void jobFinished( int progressId );
 
   /**
-   * @deprecated use KIO::AutoInfo
+   * @deprecated use TDEIO::AutoInfo
    */
   bool openPassDlg( const TQString& prompt, TQString& user, TQString& pass,
                     bool readOnly );
@@ -95,10 +95,10 @@ public:
    * @param info the authentication information
    * @return true if successful ("ok" clicked), false otherwise
    */
-  bool openPassDlg( KIO::AuthInfo& info );
+  bool openPassDlg( TDEIO::AuthInfo& info );
 
   /**
-   * Popup a message box. See KIO::SlaveBase.
+   * Popup a message box. See TDEIO::SlaveBase.
    * This doesn't use DCOP anymore, it shows the dialog in the application's process.
    * Otherwise, other apps would block when trying to communicate with UIServer.
    * @param progressId the progress ID of the job, as returned by newJob()
@@ -112,7 +112,7 @@ public:
                          const TQString &buttonYes, const TQString &buttonNo );
 
   /**
-   * Popup a message box. See KIO::SlaveBase.
+   * Popup a message box. See TDEIO::SlaveBase.
    * This doesn't use DCOP anymore, it shows the dialog in the application's process.
    * Otherwise, other apps would block when trying to communicate with UIServer.
    * @param progressId the progress ID of the job, as returned by newJob()
@@ -122,7 +122,7 @@ public:
    * @param buttonYes the text of the "Yes" button
    * @param buttonNo the text of the "No button
    * @param dontAskAgainName A checkbox is added with which further confirmation can be turned off.
-   *        The string is used to lookup and store the setting in kioslaverc.
+   *        The string is used to lookup and store the setting in tdeioslaverc.
    * @since 3.3
    */
   static int messageBox( int progressId, int type, const TQString &text, const TQString &caption,
@@ -132,13 +132,13 @@ public:
    * @internal
    * See renamedlg.h
    */
-  KIO::RenameDlg_Result open_RenameDlg( KIO::Job * job,
+  TDEIO::RenameDlg_Result open_RenameDlg( TDEIO::Job * job,
                                         const TQString & caption,
                                         const TQString& src, const TQString & dest,
-                                        KIO::RenameDlg_Mode mode,
+                                        TDEIO::RenameDlg_Mode mode,
                                         TQString& newDest,
-                                        KIO::filesize_t sizeSrc = (KIO::filesize_t) -1,
-                                        KIO::filesize_t sizeDest = (KIO::filesize_t) -1,
+                                        TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1,
+                                        TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1,
                                         time_t ctimeSrc = (time_t) -1,
                                         time_t ctimeDest = (time_t) -1,
                                         time_t mtimeSrc = (time_t) -1,
@@ -149,7 +149,7 @@ public:
    * @internal
    * See skipdlg.h
    */
-  KIO::SkipDlg_Result open_SkipDlg( KIO::Job * job,
+  TDEIO::SkipDlg_Result open_SkipDlg( TDEIO::Job * job,
                                     bool multi,
                                     const TQString & error_text );
 
@@ -164,7 +164,7 @@ k_dcop:
    * Called by the UI Server (using DCOP) to get all the metadata of the job
    * @param progressId the progress IDof the job, as returned by newJob()
    */
-  KIO::MetaData metadata( int progressId );
+  TDEIO::MetaData metadata( int progressId );
 
 protected:
 
@@ -174,35 +174,35 @@ protected:
 
   UIServer_stub * m_uiserver;
 
-  TQIntDict< KIO::Job > m_dctJobs;
+  TQIntDict< TDEIO::Job > m_dctJobs;
 
 public slots:
 
-  void slotTotalSize( KIO::Job*, KIO::filesize_t size );
-  void slotTotalFiles( KIO::Job*, unsigned long files );
-  void slotTotalDirs( KIO::Job*, unsigned long dirs );
+  void slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size );
+  void slotTotalFiles( TDEIO::Job*, unsigned long files );
+  void slotTotalDirs( TDEIO::Job*, unsigned long dirs );
 
-  void slotProcessedSize( KIO::Job*, KIO::filesize_t size );
-  void slotProcessedFiles( KIO::Job*, unsigned long files );
-  void slotProcessedDirs( KIO::Job*, unsigned long dirs );
+  void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t size );
+  void slotProcessedFiles( TDEIO::Job*, unsigned long files );
+  void slotProcessedDirs( TDEIO::Job*, unsigned long dirs );
 
-  void slotSpeed( KIO::Job*, unsigned long speed );
-  void slotPercent( KIO::Job*, unsigned long percent );
-  void slotInfoMessage( KIO::Job*, const TQString & msg );
+  void slotSpeed( TDEIO::Job*, unsigned long speed );
+  void slotPercent( TDEIO::Job*, unsigned long percent );
+  void slotInfoMessage( TDEIO::Job*, const TQString & msg );
 
-  void slotCopying( KIO::Job*, const KURL& from, const KURL& to );
-  void slotMoving( KIO::Job*, const KURL& from, const KURL& to );
-  void slotDeleting( KIO::Job*, const KURL& url );
+  void slotCopying( TDEIO::Job*, const KURL& from, const KURL& to );
+  void slotMoving( TDEIO::Job*, const KURL& from, const KURL& to );
+  void slotDeleting( TDEIO::Job*, const KURL& url );
   /// @since 3.1
-  void slotTransferring( KIO::Job*, const KURL& url );
-  void slotCreatingDir( KIO::Job*, const KURL& dir );
+  void slotTransferring( TDEIO::Job*, const KURL& url );
+  void slotCreatingDir( TDEIO::Job*, const KURL& dir );
   // currently unused
-  void slotCanResume( KIO::Job*, KIO::filesize_t offset );
+  void slotCanResume( TDEIO::Job*, TDEIO::filesize_t offset );
 
 public:
-  void stating( KIO::Job*, const KURL& url );
-  void mounting( KIO::Job*, const TQString & dev, const TQString & point );
-  void unmounting( KIO::Job*, const TQString & point );
+  void stating( TDEIO::Job*, const KURL& url );
+  void mounting( TDEIO::Job*, const TQString & dev, const TQString & point );
+  void unmounting( TDEIO::Job*, const TQString & point );
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
diff --git a/kio/kio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp
index e18666328..91fba050d 100644
--- a/kio/kio/passdlg.cpp
+++ b/tdeio/tdeio/passdlg.cpp
@@ -27,13 +27,13 @@
 #include <tqstylesheet.h>
 
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 struct PasswordDialog::PasswordDialogPrivate
 {
@@ -74,15 +74,15 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
     d->nRow = 0;
     d->keepCheckBox = 0;
 
-    KConfig* cfg = KGlobal::config();
-    KConfigGroupSaver saver( cfg, "Passwords" );
+    TDEConfig* cfg = TDEGlobal::config();
+    TDEConfigGroupSaver saver( cfg, "Passwords" );
 
     d->layout = new TQGridLayout( main, 9, 3, spacingHint(), marginHint());
     d->layout->addColSpacing(1, 5);
 
     // Row 0: pixmap  prompt
     TQLabel* lbl;
-    TQPixmap pix( KGlobal::iconLoader()->loadIcon( "password", KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true));
+    TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( "password", TDEIcon::NoGroup, TDEIcon::SizeHuge, 0, 0, true));
     if ( !pix.isNull() )
     {
         lbl = new TQLabel( main );
@@ -198,7 +198,7 @@ static void calculateLabelSize(TQLabel *label)
    // Calculate a proper size for the text.
    {
        TQSimpleRichText rt(qt_text, label->font());
-       TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget());
+       TQRect d = TDEGlobalSettings::desktopGeometry(label->topLevelWidget());
 
        pref_width = d.width() / 4;
        rt.setWidth(pref_width-10);
diff --git a/kio/kio/passdlg.h b/tdeio/tdeio/passdlg.h
index bbd811328..810993a3e 100644
--- a/kio/kio/passdlg.h
+++ b/tdeio/tdeio/passdlg.h
@@ -17,14 +17,14 @@
    Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_pass_dlg_h__
-#define __kio_pass_dlg_h__
+#ifndef __tdeio_pass_dlg_h__
+#define __tdeio_pass_dlg_h__
 
 #include <kdialogbase.h>
 
 class TQGridLayout;
 
-namespace KIO {
+namespace TDEIO {
 
 /**
  * A dialog for requesting a login and a password from the end user.
@@ -33,7 +33,7 @@ namespace KIO {
  * instead of directly instantiating this dialog.
  * @short dialog for requesting login and password from the end user
  */
-class KIO_EXPORT PasswordDialog : public KDialogBase
+class TDEIO_EXPORT PasswordDialog : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/kio/kio/paste.cpp b/tdeio/tdeio/paste.cpp
index f39aa0746..42fff5ba2 100644
--- a/kio/kio/paste.cpp
+++ b/tdeio/tdeio/paste.cpp
@@ -19,21 +19,21 @@
 #include "paste.h"
 #include "pastedialog.h"
 
-#include "kio/job.h"
-#include "kio/global.h"
-#include "kio/netaccess.h"
-#include "kio/observer.h"
-#include "kio/renamedlg.h"
-#include "kio/kprotocolmanager.h"
+#include "tdeio/job.h"
+#include "tdeio/global.h"
+#include "tdeio/netaccess.h"
+#include "tdeio/observer.h"
+#include "tdeio/renamedlg.h"
+#include "tdeio/tdeprotocolmanager.h"
 
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqapplication.h>
 #include <tqclipboard.h>
@@ -54,10 +54,10 @@ static KURL getNewFileName( const KURL &u, const TQString& text )
   KURL myurl(u);
   myurl.addPath( file );
 
-  if (KIO::NetAccess::exists(myurl, false, 0))
+  if (TDEIO::NetAccess::exists(myurl, false, 0))
   {
       kdDebug(7007) << "Paste will overwrite file.  Prompting..." << endl;
-      KIO::RenameDlg_Result res = KIO::R_OVERWRITE;
+      TDEIO::RenameDlg_Result res = TDEIO::R_OVERWRITE;
 
       TQString newPath;
       // Ask confirmation about resuming previous transfer
@@ -65,13 +65,13 @@ static KURL getNewFileName( const KURL &u, const TQString& text )
                           0L, i18n("File Already Exists"),
                           u.pathOrURL(),
                           myurl.pathOrURL(),
-                          (KIO::RenameDlg_Mode) (KIO::M_OVERWRITE | KIO::M_SINGLE), newPath);
+                          (TDEIO::RenameDlg_Mode) (TDEIO::M_OVERWRITE | TDEIO::M_SINGLE), newPath);
 
-      if ( res == KIO::R_RENAME )
+      if ( res == TDEIO::R_RENAME )
       {
           myurl = newPath;
       }
-      else if ( res == KIO::R_CANCEL )
+      else if ( res == TDEIO::R_CANCEL )
       {
           return KURL();
       }
@@ -81,7 +81,7 @@ static KURL getNewFileName( const KURL &u, const TQString& text )
 }
 
 // The finaly step: write _data to tempfile and move it to neW_url
-static KIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _data )
+static TDEIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _data )
 {
      KTempFile tempFile;
      tempFile.dataStream()->writeRawBytes( _data.data(), _data.size() );
@@ -90,11 +90,11 @@ static KIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray& _
      KURL orig_url;
      orig_url.setPath(tempFile.name());
 
-     return KIO::move( orig_url, new_url );
+     return TDEIO::move( orig_url, new_url );
 }
 
 #ifndef QT_NO_MIMECLIPBOARD
-static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
+static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
                                      const TQValueVector<TQCString>& formats,
                                      const TQString& text,
                                      TQWidget* widget,
@@ -113,7 +113,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
     TQString dialogText( text );
     if ( dialogText.isEmpty() )
         dialogText = i18n( "Filename for clipboard content:" );
-    KIO::PasteDialog dlg( TQString::null, dialogText, TQString::null, formatLabels, widget, clipboard );
+    TDEIO::PasteDialog dlg( TQString::null, dialogText, TQString::null, formatLabels, widget, clipboard );
 
     if ( dlg.exec() != KDialogBase::Accepted )
         return 0;
@@ -143,7 +143,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
 #endif
 
 // KDE4: remove
-KIO_EXPORT bool KIO::isClipboardEmpty()
+TDEIO_EXPORT bool TDEIO::isClipboardEmpty()
 {
 #ifndef QT_NO_MIMECLIPBOARD
   TQMimeSource *data = TQApplication::clipboard()->data();
@@ -161,7 +161,7 @@ KIO_EXPORT bool KIO::isClipboardEmpty()
 
 #ifndef QT_NO_MIMECLIPBOARD
 // The main method for dropping
-KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
+TDEIO::CopyJob* TDEIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
                                     const TQString& dialogText, TQWidget* widget, bool clipboard )
 {
   TQByteArray ba;
@@ -207,7 +207,7 @@ KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
 #endif
 
 // The main method for pasting
-KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move )
+TDEIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move )
 {
   if ( !dest_url.isValid() ) {
     KMessageBox::error( 0L, i18n( "Malformed URL\n%1" ).arg( dest_url.url() ) );
@@ -225,11 +225,11 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move )
       return 0;
     }
 
-    KIO::Job *res = 0;
+    TDEIO::Job *res = 0;
     if ( move )
-      res = KIO::move( urls, dest_url );
+      res = TDEIO::move( urls, dest_url );
     else
-      res = KIO::copy( urls, dest_url );
+      res = TDEIO::copy( urls, dest_url );
 
     // If moving, erase the clipboard contents, the original files don't exist anymore
     if ( move )
@@ -256,10 +256,10 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move )
 }
 
 
-KIO_EXPORT void KIO::pasteData( const KURL& u, const TQByteArray& _data )
+TDEIO_EXPORT void TDEIO::pasteData( const KURL& u, const TQByteArray& _data )
 {
     KURL new_url = getNewFileName( u, TQString::null );
-    // We could use KIO::put here, but that would require a class
+    // We could use TDEIO::put here, but that would require a class
     // for the slotData call. With NetAccess, we can do a synchronous call.
 
     if (new_url.isEmpty())
@@ -270,15 +270,15 @@ KIO_EXPORT void KIO::pasteData( const KURL& u, const TQByteArray& _data )
     tempFile.dataStream()->writeRawBytes( _data.data(), _data.size() );
     tempFile.close();
 
-    (void) KIO::NetAccess::upload( tempFile.name(), new_url, 0 );
+    (void) TDEIO::NetAccess::upload( tempFile.name(), new_url, 0 );
 }
 
-KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& _data )
+TDEIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data )
 {
     return pasteDataAsync( u, _data, TQString::null );
 }
 
-KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text )
+TDEIO_EXPORT TDEIO::CopyJob* TDEIO::pasteDataAsync( const KURL& u, const TQByteArray& _data, const TQString& text )
 {
     KURL new_url = getNewFileName( u, text );
 
@@ -288,7 +288,7 @@ KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray&
     return pasteDataAsyncTo( new_url, _data );
 }
 
-KIO_EXPORT TQString KIO::pasteActionText()
+TDEIO_EXPORT TQString TDEIO::pasteActionText()
 {
     TQMimeSource *data = TQApplication::clipboard()->data();
     KURL::List urls;
diff --git a/kio/kio/paste.h b/tdeio/tdeio/paste.h
index 3fad2c8b6..aff67934c 100644
--- a/kio/kio/paste.h
+++ b/tdeio/tdeio/paste.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_paste_h__
-#define __kio_paste_h__
+#ifndef __tdeio_paste_h__
+#define __tdeio_paste_h__
 
 #include <tqstring.h>
 #include <tqmemarray.h>
@@ -27,7 +27,7 @@ class TQMimeSource;
 
 // KDE4 TODO pass a parent widget to all methods that will display a message box
 
-namespace KIO {
+namespace TDEIO {
   class Job;
   class CopyJob;
 
@@ -42,7 +42,7 @@ namespace KIO {
    * @return the job that handles the operation
    * @see pasteData()
    */
-  KIO_EXPORT Job *pasteClipboard( const KURL& destURL, bool move = false );
+  TDEIO_EXPORT Job *pasteClipboard( const KURL& destURL, bool move = false );
 
   /**
    * Pastes the given @p data to the given destination URL.
@@ -54,7 +54,7 @@ namespace KIO {
    * @param data the data to copy
    * @see pasteClipboard()
    */
-  KIO_EXPORT void pasteData( const KURL& destURL, const TQByteArray& data );
+  TDEIO_EXPORT void pasteData( const KURL& destURL, const TQByteArray& data );
 
   /**
    * Pastes the given @p data to the given destination URL.
@@ -66,7 +66,7 @@ namespace KIO {
    * @param data the data to copy
    * @see pasteClipboard()
    */
-  KIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data );
+  TDEIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data );
 
   /**
    * Pastes the given @p data to the given destination URL.
@@ -79,7 +79,7 @@ namespace KIO {
    * @param dialogText the text to show in the dialog
    * @see pasteClipboard()
    */
-  KIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data, const TQString& dialogText ); // KDE4: merge with above
+  TDEIO_EXPORT CopyJob *pasteDataAsync( const KURL& destURL, const TQByteArray& data, const TQString& dialogText ); // KDE4: merge with above
 
 
   /**
@@ -100,7 +100,7 @@ namespace KIO {
    *
    * @since 3.5
    */
-  KIO_EXPORT CopyJob* pasteMimeSource( TQMimeSource* data, const KURL& destURL,
+  TDEIO_EXPORT CopyJob* pasteMimeSource( TQMimeSource* data, const KURL& destURL,
                                        const TQString& dialogText, TQWidget* widget,
                                        bool clipboard = false );
 
@@ -109,17 +109,17 @@ namespace KIO {
    * @return true if not
    * Not used anymore, wrong method name, so it will disappear in KDE4.
    */
-  KIO_EXPORT_DEPRECATED bool isClipboardEmpty();
+  TDEIO_EXPORT_DEPRECATED bool isClipboardEmpty();
 
   /**
    * Returns the text to use for the Paste action, when the application supports
    * pasting files, urls, and clipboard data, using pasteClipboard().
-   * @return a string suitable for KAction::setText, or an empty string if pasting
+   * @return a string suitable for TDEAction::setText, or an empty string if pasting
    * isn't possible right now.
    *
    * @since 3.5
    */
-  KIO_EXPORT TQString pasteActionText();
+  TDEIO_EXPORT TQString pasteActionText();
 }
 
 #endif
diff --git a/kio/kio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp
index 480eaaba8..d95cc7e88 100644
--- a/kio/kio/pastedialog.cpp
+++ b/tdeio/tdeio/pastedialog.cpp
@@ -20,7 +20,7 @@
 
 #include <klineedit.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 #include <tqclipboard.h>
 
-KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
+TDEIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
                                const TQString &value, const TQStringList& items,
                                TQWidget *parent,
                                bool clipboard )
@@ -66,17 +66,17 @@ KIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
                  this, TQT_SLOT( slotClipboardDataChanged() ) );
 }
 
-void KIO::PasteDialog::slotClipboardDataChanged()
+void TDEIO::PasteDialog::slotClipboardDataChanged()
 {
     m_clipboardChanged = true;
 }
 
-TQString KIO::PasteDialog::lineEditText() const
+TQString TDEIO::PasteDialog::lineEditText() const
 {
     return m_lineEdit->text();
 }
 
-int KIO::PasteDialog::comboItem() const
+int TDEIO::PasteDialog::comboItem() const
 {
     return m_comboBox->currentItem();
 }
diff --git a/kio/kio/pastedialog.h b/tdeio/tdeio/pastedialog.h
index 4f8b79b2e..2e7bdfda1 100644
--- a/kio/kio/pastedialog.h
+++ b/tdeio/tdeio/pastedialog.h
@@ -25,7 +25,7 @@ class TQComboBox;
 class KLineEdit;
 class TQLabel;
 
-namespace KIO {
+namespace TDEIO {
 
 /**
  * @internal
diff --git a/kio/kio/posixacladdons.cpp b/tdeio/tdeio/posixacladdons.cpp
index bae51592b..bae51592b 100644
--- a/kio/kio/posixacladdons.cpp
+++ b/tdeio/tdeio/posixacladdons.cpp
diff --git a/kio/kio/posixacladdons.h b/tdeio/tdeio/posixacladdons.h
index 45c4af245..45c4af245 100644
--- a/kio/kio/posixacladdons.h
+++ b/tdeio/tdeio/posixacladdons.h
diff --git a/kio/kio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp
index 2249a1bfa..5e3148619 100644
--- a/kio/kio/previewjob.cpp
+++ b/tdeio/tdeio/previewjob.cpp
@@ -41,28 +41,28 @@
 #include <tqregexp.h>
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
-#include <kfileitem.h>
-#include <kapplication.h>
-#include <ktempfile.h>
+#include <tdefileitem.h>
+#include <tdeapplication.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <kmdcodec.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
-#include <kio/kservice.h>
+#include <tdeio/kservice.h>
 
 #include "previewjob.moc"
 
-namespace KIO { struct PreviewItem; }
-using namespace KIO;
+namespace TDEIO { struct PreviewItem; }
+using namespace TDEIO;
 
-struct KIO::PreviewItem
+struct TDEIO::PreviewItem
 {
     KFileItem *item;
     KService::Ptr plugin;
 };
 
-struct KIO::PreviewJobPrivate
+struct TDEIO::PreviewJobPrivate
 {
     enum { STATE_STATORIG, // if the thumbnail exists
            STATE_GETORIG, // if we create it
@@ -118,7 +118,7 @@ struct KIO::PreviewJobPrivate
 PreviewJob::PreviewJob( const KFileItemList &items, int width, int height,
     int iconSize, int iconAlpha, bool scale, bool save,
     const TQStringList *enabledPlugins, bool deleteItems )
-    : KIO::Job( false /* no GUI */ )
+    : TDEIO::Job( false /* no GUI */ )
 {
     d = new PreviewJobPrivate;
     d->tOrig = 0;
@@ -159,10 +159,10 @@ PreviewJob::~PreviewJob()
 void PreviewJob::startPreview()
 {
     // Load the list of plugins to determine which mimetypes are supported
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
     TQMap<TQString, KService::Ptr> mimeMap;
 
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
         if (!d->enabledPlugins || d->enabledPlugins->contains((*it)->desktopEntryName()))
     {
         TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
@@ -244,8 +244,8 @@ void PreviewJob::startPreview()
     }
 
   // Read configuration value for the maximum allowed size
-    KConfig * config = KGlobal::config();
-    KConfigGroupSaver cgs( config, "PreviewSettings" );
+    TDEConfig * config = TDEGlobal::config();
+    TDEConfigGroupSaver cgs( config, "PreviewSettings" );
     d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
 
     if (bNeedCache)
@@ -253,7 +253,7 @@ void PreviewJob::startPreview()
         if (d->width <= 128 && d->height <= 128) d->cacheWidth = d->cacheHeight = 128;
         else d->cacheWidth = d->cacheHeight = 256;
         d->thumbPath = d->thumbRoot + (d->cacheWidth == 128 ? "normal/" : "large/");
-        KStandardDirs::makeDir(d->thumbPath, 0700);
+        TDEStandardDirs::makeDir(d->thumbPath, 0700);
     }
     else
         d->bSave = false;
@@ -306,13 +306,13 @@ void PreviewJob::determineNextFile()
         d->currentItem = d->items.first();
         d->succeeded = false;
         d->items.remove(d->items.begin());
-        KIO::Job *job = KIO::stat( d->currentItem.item->url(), false );
+        TDEIO::Job *job = TDEIO::stat( d->currentItem.item->url(), false );
         job->addMetaData( "no-auth-prompt", "true" );
         addSubjob(job);
     }
 }
 
-void PreviewJob::slotResult( KIO::Job *job )
+void PreviewJob::slotResult( TDEIO::Job *job )
 {
     subjobs.remove( job );
     Q_ASSERT ( subjobs.isEmpty() ); // We should have only one job at a time ...
@@ -326,18 +326,18 @@ void PreviewJob::slotResult( KIO::Job *job )
                 determineNextFile();
                 return;
             }
-            KIO::UDSEntry entry = ((KIO::StatJob*)job)->statResult();
-            KIO::UDSEntry::ConstIterator it = entry.begin();
+            TDEIO::UDSEntry entry = ((TDEIO::StatJob*)job)->statResult();
+            TDEIO::UDSEntry::ConstIterator it = entry.begin();
             d->tOrig = 0;
             int found = 0;
             for( ; it != entry.end() && found < 2; it++ )
             {
-                if ( (*it).m_uds == KIO::UDS_MODIFICATION_TIME )
+                if ( (*it).m_uds == TDEIO::UDS_MODIFICATION_TIME )
                 {
                     d->tOrig = (time_t)((*it).m_long);
                     found++;
                 }
-                else if ( (*it).m_uds == KIO::UDS_SIZE )
+                else if ( (*it).m_uds == TDEIO::UDS_SIZE )
                     {
                     if ( filesize_t((*it).m_long) > d->maximumSize &&
                          !d->ignoreMaximumSize &&
@@ -372,7 +372,7 @@ void PreviewJob::slotResult( KIO::Job *job )
                 return;
             }
 
-            createThumbnail( static_cast<KIO::FileCopyJob*>(job)->destURL().path() );
+            createThumbnail( static_cast<TDEIO::FileCopyJob*>(job)->destURL().path() );
             return;
         }
         case PreviewJobPrivate::STATE_CREATETHUMB:
@@ -436,7 +436,7 @@ void PreviewJob::getOrCreateThumbnail()
         KURL localURL;
         localURL.setPath( d->tempName = localFile.name() );
         const KURL currentURL = item->url();
-        KIO::Job * job = KIO::file_copy( currentURL, localURL, -1, true,
+        TDEIO::Job * job = TDEIO::file_copy( currentURL, localURL, -1, true,
                                          false, false /* No GUI */ );
         job->addMetaData("thumbnail","1");
         addSubjob(job);
@@ -450,9 +450,9 @@ void PreviewJob::createThumbnail( TQString pixPath )
     KURL thumbURL;
     thumbURL.setProtocol("thumbnail");
     thumbURL.setPath(pixPath);
-    KIO::TransferJob *job = KIO::get(thumbURL, false, false);
+    TDEIO::TransferJob *job = TDEIO::get(thumbURL, false, false);
     addSubjob(job);
-    connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(KIO::Job *, const TQByteArray &)));
+    connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &)));
     bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool();
     job->addMetaData("mimeType", d->currentItem.item->mimetype());
     job->addMetaData("width", TQString().setNum(save ? d->cacheWidth : d->width));
@@ -486,7 +486,7 @@ void PreviewJob::createThumbnail( TQString pixPath )
 #endif
 }
 
-void PreviewJob::slotThumbData(KIO::Job *, const TQByteArray &data)
+void PreviewJob::slotThumbData(TDEIO::Job *, const TQByteArray &data)
 {
     bool save = d->bSave &&
                 d->currentItem.plugin->property("CacheThumbnail").toBool() &&
@@ -551,8 +551,8 @@ void PreviewJob::emitFailed(const KFileItem *item)
 TQStringList PreviewJob::availablePlugins()
 {
     TQStringList result;
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
         if (!result.contains((*it)->desktopEntryName()))
             result.append((*it)->desktopEntryName());
     return result;
@@ -561,8 +561,8 @@ TQStringList PreviewJob::availablePlugins()
 TQStringList PreviewJob::supportedMimeTypes()
 {
     TQStringList result;
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
         result += (*it)->property("MimeTypes").toStringList();
     return result;
 }
@@ -573,7 +573,7 @@ void PreviewJob::kill( bool quietly )
     Job::kill( quietly );
 }
 
-PreviewJob *KIO::filePreview( const KFileItemList &items, int width, int height,
+PreviewJob *TDEIO::filePreview( const KFileItemList &items, int width, int height,
     int iconSize, int iconAlpha, bool scale, bool save,
     const TQStringList *enabledPlugins )
 {
@@ -581,7 +581,7 @@ PreviewJob *KIO::filePreview( const KFileItemList &items, int width, int height,
                           scale, save, enabledPlugins);
 }
 
-PreviewJob *KIO::filePreview( const KURL::List &items, int width, int height,
+PreviewJob *TDEIO::filePreview( const KURL::List &items, int width, int height,
     int iconSize, int iconAlpha, bool scale, bool save,
     const TQStringList *enabledPlugins )
 {
@@ -593,5 +593,5 @@ PreviewJob *KIO::filePreview( const KURL::List &items, int width, int height,
 }
 
 void PreviewJob::virtual_hook( int id, void* data )
-{ KIO::Job::virtual_hook( id, data ); }
+{ TDEIO::Job::virtual_hook( id, data ); }
 
diff --git a/kio/kio/previewjob.h b/tdeio/tdeio/previewjob.h
index d7686505e..f0730995c 100644
--- a/kio/kio/previewjob.h
+++ b/tdeio/tdeio/previewjob.h
@@ -21,20 +21,20 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_previewjob_h__
-#define __kio_previewjob_h__
+#ifndef __tdeio_previewjob_h__
+#define __tdeio_previewjob_h__
 
-#include <kfileitem.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdeio/job.h>
 
 class TQPixmap;
 
-namespace KIO {
+namespace TDEIO {
     /*!
      * This class catches a preview (thumbnail) for files.
      * @short KIO Job to get a thumbnail picture
      */
-    class KIO_EXPORT PreviewJob : public KIO::Job
+    class TDEIO_EXPORT PreviewJob : public TDEIO::Job
     {
         Q_OBJECT
     public:
@@ -117,11 +117,11 @@ namespace KIO {
         void createThumbnail( TQString );
 
     protected slots:
-        virtual void slotResult( KIO::Job *job );
+        virtual void slotResult( TDEIO::Job *job );
 
     private slots:
         void startPreview();
-        void slotThumbData(KIO::Job *, const TQByteArray &);
+        void slotThumbData(TDEIO::Job *, const TQByteArray &);
 
     private:
         void determineNextFile();
@@ -154,7 +154,7 @@ namespace KIO {
      * @return the new PreviewJob
      * @see PreviewJob::availablePlugins()
      */
-    KIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 );
+    TDEIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 );
 
     /**
      * Creates a PreviewJob to generate or retrieve a preview image 
@@ -176,7 +176,7 @@ namespace KIO {
      * @return the new PreviewJob
      * @see PreviewJob::availablePlugins()
      */
-    KIO_EXPORT PreviewJob *filePreview( const KURL::List &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 );
+    TDEIO_EXPORT PreviewJob *filePreview( const KURL::List &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bool save = true, const TQStringList *enabledPlugins = 0 );
 }
 
 #endif
diff --git a/tdeio/tdeio/progressbase.cpp b/tdeio/tdeio/progressbase.cpp
new file mode 100644
index 000000000..146f4182e
--- /dev/null
+++ b/tdeio/tdeio/progressbase.cpp
@@ -0,0 +1,180 @@
+/* This file is part of the KDE libraries
+   Copyright (C) 2000 Matej Koss <koss@miesto.sk>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "jobclasses.h"
+#include "progressbase.h"
+
+namespace TDEIO {
+
+ProgressBase::ProgressBase( TQWidget *parent )
+  : TQWidget( parent )
+{
+  m_pJob = 0;
+
+  // delete dialog after the job is finished / canceled
+  m_bOnlyClean = false;
+
+  // stop job on close
+  m_bStopOnClose = true;
+}
+
+
+void ProgressBase::setJob( TDEIO::Job *job )
+{
+  // first connect all slots
+  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  // then assign job
+  m_pJob = job;
+}
+
+
+void ProgressBase::setJob( TDEIO::CopyJob *job )
+{
+  // first connect all slots
+  connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ),
+	   TQT_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) );
+  connect( job, TQT_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ),
+	   TQT_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) );
+  connect( job, TQT_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ),
+ 	   TQT_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) );
+
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  // then assign job
+  m_pJob = job;
+}
+
+
+void ProgressBase::setJob( TDEIO::DeleteJob *job )
+{
+  // first connect all slots
+  connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
+	   TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );
+
+  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  // then assign job
+  m_pJob = job;
+}
+
+
+void ProgressBase::closeEvent( TQCloseEvent* ) {
+  // kill job when desired
+  if ( m_bStopOnClose ) {
+    slotStop();
+  } else {
+    // clean or delete dialog
+    if ( m_bOnlyClean ) {
+      slotClean();
+    } else {
+      delete this;
+    }
+  }
+}
+
+void ProgressBase::finished() {
+  // clean or delete dialog
+  if ( m_bOnlyClean ) {
+    slotClean();
+  } else {
+    deleteLater();
+  }
+}
+
+void ProgressBase::slotFinished( TDEIO::Job* ) {
+  finished();
+}
+
+
+void ProgressBase::slotStop() {
+  if ( m_pJob ) {
+    m_pJob->kill(); // this will call slotFinished
+    m_pJob = 0L;
+  } else {
+    slotFinished( 0 ); // here we call it ourselves
+  }
+
+  emit stopped();
+}
+
+
+void ProgressBase::slotClean() {
+  hide();
+}
+
+void ProgressBase::virtual_hook( int, void* )
+{ /*BASE::virtual_hook( id, data );*/ }
+
+} /* namespace */
+
+#include "progressbase.moc"
+
diff --git a/kio/kio/progressbase.h b/tdeio/tdeio/progressbase.h
index d9e3d8f96..655edeee5 100644
--- a/kio/kio/progressbase.h
+++ b/tdeio/tdeio/progressbase.h
@@ -21,16 +21,16 @@
 
 #include <tqwidget.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class KURL;
-namespace KIO {
+namespace TDEIO {
   class Job;
   class CopyJob;
   class DeleteJob;
 }
 
-namespace KIO
+namespace TDEIO
 {
   enum Progress {
     DEFAULT = 1,
@@ -53,7 +53,7 @@ namespace KIO
 * Custom progress dialog will be used like this :
 * \code
 * // create job
-* CopyJob* job = KIO::copy(...);
+* CopyJob* job = TDEIO::copy(...);
 * // create a dialog
 * MyCustomProgress *customProgress;
 * customProgress = new MyCustomProgress();
@@ -67,7 +67,7 @@ namespace KIO
 * @short Base class for IO progress dialogs.
 * @author Matej Koss <koss@miesto.sk>
 */
-class KIO_EXPORT ProgressBase : public TQWidget {
+class TDEIO_EXPORT ProgressBase : public TQWidget {
 
   Q_OBJECT
 
@@ -81,20 +81,20 @@ public:
   ~ProgressBase() {}
 
   /**
-   * Assign a KIO::Job to this progress dialog.
+   * Assign a TDEIO::Job to this progress dialog.
    * @param job the job to assign
    */
-  void setJob( KIO::Job *job );
+  void setJob( TDEIO::Job *job );
   /**
-   * Assign a KIO::Job to this progress dialog.
+   * Assign a TDEIO::Job to this progress dialog.
    * @param job the job to assign
    */
-  void setJob( KIO::CopyJob *job );
+  void setJob( TDEIO::CopyJob *job );
   /**
-   * Assign a KIO::Job to this progress dialog.
+   * Assign a TDEIO::Job to this progress dialog.
    * @param job the job to assign
    */
-  void setJob( KIO::DeleteJob *job );
+  void setJob( TDEIO::DeleteJob *job );
 
   // should we stop the job when the dialog is closed ?
   void setStopOnClose( bool stopOnClose ) { m_bStopOnClose = stopOnClose; }
@@ -103,7 +103,7 @@ public:
   // should we delete the dialog or just clean it when the job is finished ?
   /**
    * This controls whether the dialog should be deleted or only cleaned when
-   * the KIO::Job is finished (or canceled).
+   * the TDEIO::Job is finished (or canceled).
    *
    * If your dialog is an embedded widget and not a separate window, you should
    * setOnlyClean(true) in the constructor of your custom dialog.
@@ -143,101 +143,101 @@ public slots:
   // progress slots
   /**
    * Called to set the total size.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param size the total size in bytes
    */
-  virtual void slotTotalSize( KIO::Job* job, KIO::filesize_t size ) {
+  virtual void slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size ) {
     Q_UNUSED(job);Q_UNUSED(size);}
   /**
    * Called to set the total number of files.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param files the number of files
    */
-  virtual void slotTotalFiles( KIO::Job* job, unsigned long files ) {
+  virtual void slotTotalFiles( TDEIO::Job* job, unsigned long files ) {
     Q_UNUSED(job);Q_UNUSED(files);}
   /**
    * Called to set the total number of directories.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dirs the number of directories
    */
-  virtual void slotTotalDirs( KIO::Job* job, unsigned long dirs ) {
+  virtual void slotTotalDirs( TDEIO::Job* job, unsigned long dirs ) {
     Q_UNUSED(job);Q_UNUSED(dirs);}
 
   /**
    * Called to set the processed size.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param bytes the processed size in bytes
    */
-  virtual void slotProcessedSize( KIO::Job* job, KIO::filesize_t bytes ) {
+  virtual void slotProcessedSize( TDEIO::Job* job, TDEIO::filesize_t bytes ) {
     Q_UNUSED(job);Q_UNUSED(bytes);}
   /**
    * Called to set the number of processed files.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param files the number of files
    */
-  virtual void slotProcessedFiles( KIO::Job* job, unsigned long files ) {
+  virtual void slotProcessedFiles( TDEIO::Job* job, unsigned long files ) {
     Q_UNUSED(job);Q_UNUSED(files);}
   /**
    * Called to set the number of processed directories.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dirs the number of directories
    */
-  virtual void slotProcessedDirs( KIO::Job* job, unsigned long dirs ) {
+  virtual void slotProcessedDirs( TDEIO::Job* job, unsigned long dirs ) {
     Q_UNUSED(job);Q_UNUSED(dirs);}
 
   /**
    * Called to set the speed.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param speed the speed in bytes/second
    */
-  virtual void slotSpeed( KIO::Job* job, unsigned long speed ) {
+  virtual void slotSpeed( TDEIO::Job* job, unsigned long speed ) {
     Q_UNUSED(job);Q_UNUSED(speed);}
 
   /**
    * Called to set the percentage.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param percent the percentage
    */
-  virtual void slotPercent( KIO::Job* job, unsigned long percent ) {
+  virtual void slotPercent( TDEIO::Job* job, unsigned long percent ) {
     Q_UNUSED(job);Q_UNUSED(percent);}
 
   /**
    * Called when the job is copying.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param src the source of the operation
    * @param dest the destination of the operation
    */
-  virtual void slotCopying( KIO::Job* job, const KURL& src, const KURL& dest ) {
+  virtual void slotCopying( TDEIO::Job* job, const KURL& src, const KURL& dest ) {
     Q_UNUSED(job);Q_UNUSED(src);Q_UNUSED(dest);}
   /**
    * Called when the job is moving.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param src the source of the operation
    * @param dest the destination of the operation
    */
-  virtual void slotMoving( KIO::Job* job, const KURL& src, const KURL& dest ) {
+  virtual void slotMoving( TDEIO::Job* job, const KURL& src, const KURL& dest ) {
     Q_UNUSED(job);Q_UNUSED(src);Q_UNUSED(dest);}
   /**
    * Called when the job is deleting.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param url the URL to delete
    */
-  virtual void slotDeleting( KIO::Job* job, const KURL& url) {
+  virtual void slotDeleting( TDEIO::Job* job, const KURL& url) {
     Q_UNUSED(job);Q_UNUSED(url);}
   /**
    * Called when the job is creating a directory.
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param dir the URL of the directory to create
    */
-  virtual void slotCreatingDir( KIO::Job* job, const KURL& dir ) {
+  virtual void slotCreatingDir( TDEIO::Job* job, const KURL& dir ) {
     Q_UNUSED(job);Q_UNUSED(dir);}
 
   /**
    * Called when the job is resuming..
-   * @param job the KIO::Job
+   * @param job the TDEIO::Job
    * @param from the position to resume from in bytes
    */
-  virtual void slotCanResume( KIO::Job* job, KIO::filesize_t from) {
+  virtual void slotCanResume( TDEIO::Job* job, TDEIO::filesize_t from) {
     Q_UNUSED(job);Q_UNUSED(from);}
 
 signals:
@@ -247,13 +247,13 @@ signals:
   void stopped();
 
 protected slots:
-  void slotFinished( KIO::Job* );
+  void slotFinished( TDEIO::Job* );
 
 protected:
 
   virtual void closeEvent( TQCloseEvent * );
 
-  KIO::Job* m_pJob;
+  TDEIO::Job* m_pJob;
 
 private:
   bool m_bOnlyClean;
diff --git a/kio/kio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index 722f2874b..715f73c42 100644
--- a/kio/kio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kio/renamedlg.h"
-#include "kio/renamedlgplugin.h"
+#include "tdeio/renamedlg.h"
+#include "tdeio/renamedlgplugin.h"
 #include <stdio.h>
 #include <assert.h>
 
@@ -30,15 +30,15 @@
 #include <tqlineedit.h>
 #include <tqdir.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <kapplication.h>
-#include <kio/global.h>
+#include <tdeapplication.h>
+#include <tdeio/global.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>
@@ -52,7 +52,7 @@
 #include <twin.h>
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 
 class RenameDlg::RenameDlgPrivate
 {
@@ -84,19 +84,19 @@ class RenameDlg::RenameDlgPrivate
 RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
                      const TQString &_src, const TQString &_dest,
                      RenameDlg_Mode _mode,
-                     KIO::filesize_t sizeSrc,
-                     KIO::filesize_t sizeDest,
+                     TDEIO::filesize_t sizeSrc,
+                     TDEIO::filesize_t sizeDest,
                      time_t ctimeSrc,
                      time_t ctimeDest,
                      time_t mtimeSrc,
                      time_t mtimeDest,
                      bool _modal)
-  : TQDialog ( parent, "KIO::RenameDialog" , _modal )
+  : TQDialog ( parent, "TDEIO::RenameDialog" , _modal )
 {
     d = new RenameDlgPrivate( );
     d->modal = _modal;
 #if 0
-    // Set "StaysOnTop", because this dialog is typically used in kio_uiserver,
+    // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver,
     // i.e. in a separate process.
     // ####### This isn't the case anymore - remove?
 #if !defined(Q_WS_QWS) && !defined(Q_WS_WIN) //FIXME(E): Implement for QT Embedded & win32
@@ -168,17 +168,17 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
         // Figure out the mimetype and load one plugin
         // (This is the only mode that is handled by plugins)
         pluginHandling();
-        KTrader::OfferList plugin_offers;
+        TDETrader::OfferList plugin_offers;
         if( d->mimeSrc != KMimeType::defaultMimeType()   ){
-            plugin_offers = KTrader::self()->query(d->mimeSrc, "'RenameDlg/Plugin' in ServiceTypes");
+            plugin_offers = TDETrader::self()->query(d->mimeSrc, "'RenameDlg/Plugin' in ServiceTypes");
 
         }else if(d->mimeDest != KMimeType::defaultMimeType() ) {
-            plugin_offers = KTrader::self()->query(d->mimeDest, "'RenameDlg/Plugin' in ServiceTypes");
+            plugin_offers = TDETrader::self()->query(d->mimeDest, "'RenameDlg/Plugin' in ServiceTypes");
         }
         if(!plugin_offers.isEmpty() ){
             kdDebug(7024) << "Offers" << endl;
-            KTrader::OfferList::ConstIterator it = plugin_offers.begin();
-            KTrader::OfferList::ConstIterator end = plugin_offers.end();
+            TDETrader::OfferList::ConstIterator it = plugin_offers.begin();
+            TDETrader::OfferList::ConstIterator end = plugin_offers.end();
             for( ; it != end; ++it ){
                 TQString libName = (*it)->library();
                 if( libName.isEmpty() ){
@@ -243,9 +243,9 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
             gridLayout->addMultiCellWidget( lb1, 1, 3, 0, 0 ); // takes the first column on rows 1-3
 
             int row = 1;
-            if ( sizeDest != (KIO::filesize_t)-1 )
+            if ( sizeDest != (TDEIO::filesize_t)-1 )
             {
-                TQLabel * lb = new TQLabel( i18n("size %1").arg( KIO::convertSize(sizeDest) ), this );
+                TQLabel * lb = new TQLabel( i18n("size %1").arg( TDEIO::convertSize(sizeDest) ), this );
                 gridLayout->addWidget( lb, row, 1 );
                 row++;
 
@@ -253,14 +253,14 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
             if ( ctimeDest != (time_t)-1 )
             {
                 TQDateTime dctime; dctime.setTime_t( ctimeDest );
-                TQLabel * lb = new TQLabel( i18n("created on %1").arg( KGlobal::locale()->formatDateTime(dctime) ), this );
+                TQLabel * lb = new TQLabel( i18n("created on %1").arg( TDEGlobal::locale()->formatDateTime(dctime) ), this );
                 gridLayout->addWidget( lb, row, 1 );
                 row++;
             }
             if ( mtimeDest != (time_t)-1 )
             {
                 TQDateTime dmtime; dmtime.setTime_t( mtimeDest );
-                TQLabel * lb = new TQLabel( i18n("modified on %1").arg( KGlobal::locale()->formatDateTime(dmtime) ), this );
+                TQLabel * lb = new TQLabel( i18n("modified on %1").arg( TDEGlobal::locale()->formatDateTime(dmtime) ), this );
                 gridLayout->addWidget( lb, row, 1 );
                 row++;
             }
@@ -279,23 +279,23 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
 
                 row = 6;
 
-                if ( sizeSrc != (KIO::filesize_t)-1 )
+                if ( sizeSrc != (TDEIO::filesize_t)-1 )
                 {
-                    TQLabel * lb = new TQLabel( i18n("size %1").arg( KIO::convertSize(sizeSrc) ), this );
+                    TQLabel * lb = new TQLabel( i18n("size %1").arg( TDEIO::convertSize(sizeSrc) ), this );
                     gridLayout->addWidget( lb, row, 1 );
                     row++;
                 }
                 if ( ctimeSrc != (time_t)-1 )
                 {
                     TQDateTime dctime; dctime.setTime_t( ctimeSrc );
-                    TQLabel * lb = new TQLabel( i18n("created on %1").arg( KGlobal::locale()->formatDateTime(dctime) ), this );
+                    TQLabel * lb = new TQLabel( i18n("created on %1").arg( TDEGlobal::locale()->formatDateTime(dctime) ), this );
                     gridLayout->addWidget( lb, row, 1 );
                     row++;
                 }
                 if ( mtimeSrc != (time_t)-1 )
                 {
                     TQDateTime dmtime; dmtime.setTime_t( mtimeSrc );
-                    TQLabel * lb = new TQLabel( i18n("modified on %1").arg( KGlobal::locale()->formatDateTime(dmtime) ), this );
+                    TQLabel * lb = new TQLabel( i18n("modified on %1").arg( TDEGlobal::locale()->formatDateTime(dmtime) ), this );
                     gridLayout->addWidget( lb, row, 1 );
                     row++;
                 }
@@ -323,7 +323,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
     d->m_pLineEdit = new TQLineEdit( this );
     layout2->addWidget( d->m_pLineEdit );
     TQString fileName = d->dest.fileName();
-    d->m_pLineEdit->setText( KIO::decodeFileName( fileName ) );
+    d->m_pLineEdit->setText( TDEIO::decodeFileName( fileName ) );
     if ( d->bRename || d->bOverwrite )
         connect(d->m_pLineEdit, TQT_SIGNAL(textChanged(const TQString &)),
                 TQT_SLOT(enableRenameButton(const TQString &)));
@@ -391,7 +391,7 @@ RenameDlg::~RenameDlg()
 
 void RenameDlg::enableRenameButton(const TQString &newDest)
 {
-  if ( newDest != KIO::decodeFileName( d->dest.fileName() ) && !newDest.isEmpty() )
+  if ( newDest != TDEIO::decodeFileName( d->dest.fileName() ) && !newDest.isEmpty() )
   {
     d->bRename->setEnabled( true );
     d->bRename->setDefault( true );
@@ -410,7 +410,7 @@ KURL RenameDlg::newDestURL()
 {
   KURL newDest( d->dest );
   TQString fileName = d->m_pLineEdit->text();
-  newDest.setFileName( KIO::encodeFileName( fileName ) );
+  newDest.setFileName( TDEIO::encodeFileName( fileName ) );
   return newDest;
 }
 
@@ -523,7 +523,7 @@ static TQString mime( const KURL& src )
 {
   KMimeType::Ptr type = KMimeType::findByURL( src );
   //if( type->name() == KMimeType::defaultMimeType() ){ // ok no mimetype
-    //    TQString ty = KIO::NetAccess::mimetype(d->src );
+    //    TQString ty = TDEIO::NetAccess::mimetype(d->src );
     // return ty;
     return type->name();
 }
@@ -544,12 +544,12 @@ void RenameDlg::pluginHandling()
 }
 
 
-RenameDlg_Result KIO::open_RenameDlg( const TQString & _caption,
+RenameDlg_Result TDEIO::open_RenameDlg( const TQString & _caption,
                                       const TQString & _src, const TQString & _dest,
                                       RenameDlg_Mode _mode,
                                       TQString& _new,
-                                      KIO::filesize_t sizeSrc,
-                                      KIO::filesize_t sizeDest,
+                                      TDEIO::filesize_t sizeSrc,
+                                      TDEIO::filesize_t sizeDest,
                                       time_t ctimeSrc,
                                       time_t ctimeDest,
                                       time_t mtimeSrc,
diff --git a/kio/kio/renamedlg.h b/tdeio/tdeio/renamedlg.h
index 373abf446..2183d05b6 100644
--- a/kio/kio/renamedlg.h
+++ b/tdeio/tdeio/renamedlg.h
@@ -19,17 +19,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_rename_dlg__
-#define __kio_rename_dlg__
+#ifndef __tdeio_rename_dlg__
+#define __tdeio_rename_dlg__
 
 #include <kurl.h>
 #include <tqdialog.h>
 #include <tqstring.h>
 #include <sys/types.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
-namespace KIO {
+namespace TDEIO {
 
 // KDE4: get rid of M_OVERWRITE_ITSELF, trigger it internally if src==dest
 enum RenameDlg_Mode { M_OVERWRITE = 1, M_OVERWRITE_ITSELF = 2, M_SKIP = 4, M_SINGLE = 8, M_MULTI = 16, M_RESUME = 32, M_NORENAME = 64 };
@@ -45,7 +45,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW
  * @short A dialog for renaming files.
  * @since 3.1
  */
-class KIO_EXPORT RenameDlg : public TQDialog
+class TDEIO_EXPORT RenameDlg : public TQDialog
 {
   Q_OBJECT
 public:
@@ -69,8 +69,8 @@ public:
              // KDE4: make those KURLs, and use pathOrURL() internally.
              const TQString & src, const TQString & dest,
              RenameDlg_Mode mode,
-             KIO::filesize_t sizeSrc = (KIO::filesize_t) -1,
-             KIO::filesize_t sizeDest = (KIO::filesize_t) -1,
+             TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1,
+             TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1,
              time_t ctimeSrc = (time_t) -1,
              time_t ctimeDest = (time_t) -1,
              time_t mtimeSrc = (time_t) -1,
@@ -116,7 +116,7 @@ private:
   /**
    * \addtogroup renamedlg "RenameDlg related Functions"
    *  @{
-   * \relates KIO::RenameDlg
+   * \relates TDEIO::RenameDlg
    * Construct a modal, parent-less "rename" dialog, and return
    * a result code, as well as the new dest. Much easier to use than the
    * class RenameDlg directly.
@@ -135,12 +135,12 @@ private:
    * @param mtimeDest modification time of destination file
    * @return the result
    */
-KIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption,
+TDEIO_EXPORT RenameDlg_Result open_RenameDlg( const TQString & caption,
                                  // KDE4: make those KURLs
                                  const TQString& src, const TQString & dest,
                                  RenameDlg_Mode mode, TQString& newDestPath,
-                                 KIO::filesize_t sizeSrc = (KIO::filesize_t) -1,
-                                 KIO::filesize_t sizeDest = (KIO::filesize_t) -1,
+                                 TDEIO::filesize_t sizeSrc = (TDEIO::filesize_t) -1,
+                                 TDEIO::filesize_t sizeDest = (TDEIO::filesize_t) -1,
                                  time_t ctimeSrc = (time_t) -1,
                                  time_t ctimeDest = (time_t) -1,
                                  time_t mtimeSrc = (time_t) -1,
diff --git a/kio/kio/renamedlgplugin.h b/tdeio/tdeio/renamedlgplugin.h
index b4dd8b9fb..18daab017 100644
--- a/kio/kio/renamedlgplugin.h
+++ b/tdeio/tdeio/renamedlgplugin.h
@@ -20,7 +20,7 @@
 #ifndef renamedlgplugin_h
 #define renamedlgplugin_h
 
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 #include <tqdialog.h>
 #include <sys/types.h>
 #include <tqstring.h>
@@ -31,7 +31,7 @@
  * @short Base class for RenameDlg plugins. 
  * @since 3.1
  */
-class KIO_EXPORT RenameDlgPlugin : public TQWidget
+class TDEIO_EXPORT RenameDlgPlugin : public TQWidget
 {
 public:
   /**
@@ -43,11 +43,11 @@ public:
    * This function will be called by RenameDlg. The params are infos about the files.
    * @return If the plugin want's to display it return true, if not return false
    */
-  virtual bool initialize(KIO::RenameDlg_Mode /*mod*/ ,  const TQString &/*_src*/, const TQString &/*_dest*/,
+  virtual bool initialize(TDEIO::RenameDlg_Mode /*mod*/ ,  const TQString &/*_src*/, const TQString &/*_dest*/,
 		  const TQString &/*mimeSrc*/,
 		  const TQString &/*mimeDest*/,
-		  KIO::filesize_t /*sizeSrc*/,
-		  KIO::filesize_t /*sizeDest*/,
+		  TDEIO::filesize_t /*sizeSrc*/,
+		  TDEIO::filesize_t /*sizeDest*/,
 		  time_t /*ctimeSrc*/,
 		  time_t /*ctimeDest*/,
 		  time_t /*mtimeSrc*/,
diff --git a/kio/kio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp
index 9b518b1ef..3935a91cf 100644
--- a/kio/kio/scheduler.cpp
+++ b/tdeio/tdeio/scheduler.cpp
@@ -17,19 +17,19 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio/sessiondata.h"
-#include "kio/slaveconfig.h"
-#include "kio/scheduler.h"
-#include "kio/authinfo.h"
-#include "kio/slave.h"
+#include "tdeio/sessiondata.h"
+#include "tdeio/slaveconfig.h"
+#include "tdeio/scheduler.h"
+#include "tdeio/authinfo.h"
+#include "tdeio/slave.h"
 #include <tqptrlist.h>
 #include <tqdict.h>
 
 #include <dcopclient.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kprotocolmanager.h>
+#include <tdeglobal.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <assert.h>
 #include <kstaticdeleter.h>
@@ -40,13 +40,13 @@
 // to the system wide slave pool. (3 minutes)
 #define MAX_SLAVE_IDLE (3*60)
 
-using namespace KIO;
+using namespace TDEIO;
 
-template class TQDict<KIO::Scheduler::ProtocolInfo>;
+template class TQDict<TDEIO::Scheduler::ProtocolInfo>;
 
 Scheduler *Scheduler::instance = 0;
 
-class KIO::SlaveList: public TQPtrList<Slave>
+class TDEIO::SlaveList: public TQPtrList<Slave>
 {
    public:
       SlaveList() { }
@@ -67,7 +67,7 @@ class KIO::SlaveList: public TQPtrList<Slave>
 // We schedule slaves based on (2) but tell the slave about (1) via
 // Slave::setProtocol().
 
-class KIO::Scheduler::JobData
+class TDEIO::Scheduler::JobData
 {
 public:
     JobData() : checkOnHold(false) { }
@@ -78,13 +78,13 @@ public:
     bool checkOnHold;
 };
 
-class KIO::Scheduler::ExtraJobData: public TQPtrDict<KIO::Scheduler::JobData>
+class TDEIO::Scheduler::ExtraJobData: public TQPtrDict<TDEIO::Scheduler::JobData>
 {
 public:
     ExtraJobData() { setAutoDelete(true); }
 };
 
-class KIO::Scheduler::ProtocolInfo
+class TDEIO::Scheduler::ProtocolInfo
 {
 public:
     ProtocolInfo() : maxSlaves(1), skipCount(0)
@@ -99,16 +99,16 @@ public:
     TQString protocol;
 };
 
-class KIO::Scheduler::ProtocolInfoDict : public TQDict<KIO::Scheduler::ProtocolInfo>
+class TDEIO::Scheduler::ProtocolInfoDict : public TQDict<TDEIO::Scheduler::ProtocolInfo>
 {
   public:
     ProtocolInfoDict() { }
 
-    KIO::Scheduler::ProtocolInfo *get( const TQString &protocol);
+    TDEIO::Scheduler::ProtocolInfo *get( const TQString &protocol);
 };
 
-KIO::Scheduler::ProtocolInfo *
-KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol)
+TDEIO::Scheduler::ProtocolInfo *
+TDEIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol)
 {
     ProtocolInfo *info = find(protocol);
     if (!info)
@@ -124,13 +124,13 @@ KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol)
 
 
 Scheduler::Scheduler()
-          : DCOPObject( "KIO::Scheduler" ),
+          : DCOPObject( "TDEIO::Scheduler" ),
            TQObject(kapp, "scheduler"),
            slaveTimer(0, "Scheduler::slaveTimer"),
            coSlaveTimer(0, "Scheduler::coSlaveTimer"),
            cleanupTimer(0, "Scheduler::cleanupTimer")
 {
-    checkOnHold = true; // !! Always check with KLauncher for the first request.
+    checkOnHold = true; // !! Always check with TDELauncher for the first request.
     slaveOnHold = 0;
     protInfoDict = new ProtocolInfoDict;
     slaveList = new SlaveList;
@@ -211,7 +211,7 @@ void Scheduler::_doJob(SimpleJob *job) {
     slaveTimer.start(0, true);
 #ifndef NDEBUG
     if (newJobs.count() > 150)
-	kdDebug() << "WARNING - KIO::Scheduler got more than 150 jobs! This shows a misuse in your app (yes, a job is a TQObject)." << endl;
+	kdDebug() << "WARNING - TDEIO::Scheduler got more than 150 jobs! This shows a misuse in your app (yes, a job is a TQObject)." << endl;
 #endif
 }
 
@@ -272,7 +272,7 @@ void Scheduler::startStep()
     {
        (void) startJobDirect();
     }
-    TQDictIterator<KIO::Scheduler::ProtocolInfo> it(*protInfoDict);
+    TQDictIterator<TDEIO::Scheduler::ProtocolInfo> it(*protInfoDict);
     while(it.current())
     {
        if (startJobScheduled(it.current())) return;
@@ -280,7 +280,7 @@ void Scheduler::startStep()
     }
 }
 
-void Scheduler::setupSlave(KIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const KIO::MetaData *config)
+void Scheduler::setupSlave(TDEIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const TDEIO::MetaData *config)
 {
     TQString host = url.host();
     int port = url.port();
@@ -497,13 +497,13 @@ Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact)
     {
        // Make sure that the job wants to do a GET or a POST, and with no offset
        bool bCanReuse = (job->command() == CMD_GET);
-       KIO::TransferJob * tJob = dynamic_cast<KIO::TransferJob *>(job);
+       TDEIO::TransferJob * tJob = dynamic_cast<TDEIO::TransferJob *>(job);
        if ( tJob )
        {
           bCanReuse = (job->command() == CMD_GET || job->command() == CMD_SPECIAL);
           if ( bCanReuse )
           {
-            KIO::MetaData outgoing = tJob->outgoingMetaData();
+            TDEIO::MetaData outgoing = tJob->outgoingMetaData();
             TQString resume = (!outgoing.contains("resume")) ? TQString() : outgoing["resume"];
             kdDebug(7006) << "Resume metadata is '" << resume << "'" << endl;
             bCanReuse = (resume.isEmpty() || resume == "0");
@@ -541,8 +541,8 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL
    {
       slaveList->append(slave);
       idleSlaves->append(slave);
-      connect(slave, TQT_SIGNAL(slaveDied(KIO::Slave *)),
-                TQT_SLOT(slotSlaveDied(KIO::Slave *)));
+      connect(slave, TQT_SIGNAL(slaveDied(TDEIO::Slave *)),
+                TQT_SLOT(slotSlaveDied(TDEIO::Slave *)));
       connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)),
                 TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool)));
 
@@ -607,7 +607,7 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave)
     }
 }
 
-void Scheduler::slotSlaveDied(KIO::Slave *slave)
+void Scheduler::slotSlaveDied(TDEIO::Slave *slave)
 {
     assert(!slave->isAlive());
     ProtocolInfo *protInfo = protInfoDict->get(slave->slaveProtocol());
@@ -662,7 +662,7 @@ void Scheduler::_scheduleCleanup()
     }
 }
 
-void Scheduler::_putSlaveOnHold(KIO::SimpleJob *job, const KURL &url)
+void Scheduler::_putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url)
 {
     Slave *slave = job->slave();
     slave->disconnect(job);
@@ -695,7 +695,7 @@ void Scheduler::_removeSlaveOnHold()
 }
 
 Slave *
-Scheduler::_getConnectedSlave(const KURL &url, const KIO::MetaData &config )
+Scheduler::_getConnectedSlave(const KURL &url, const TDEIO::MetaData &config )
 {
     TQString proxy;
     TQString protocol = KProtocolManager::slaveProtocol(url, proxy);
@@ -792,7 +792,7 @@ Scheduler::slotSlaveError(int errorNr, const TQString &errorMsg)
 }
 
 bool
-Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job)
+Scheduler::_assignJobToSlave(TDEIO::Slave *slave, SimpleJob *job)
 {
 //    kdDebug(7006) << "_assignJobToSlave( " << job << ", " << slave << ")" << endl;
     TQString dummy;
@@ -822,7 +822,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job)
 }
 
 bool
-Scheduler::_disconnectSlave(KIO::Slave *slave)
+Scheduler::_disconnectSlave(TDEIO::Slave *slave)
 {
 //    kdDebug(7006) << "_disconnectSlave( " << slave << ")" << endl;
     JobList *list = coSlaves.take(slave);
diff --git a/kio/kio/scheduler.h b/tdeio/tdeio/scheduler.h
index 4a4f104ba..3b9b23d92 100644
--- a/kio/kio/scheduler.h
+++ b/tdeio/tdeio/scheduler.h
@@ -19,18 +19,18 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _kio_scheduler_h
-#define _kio_scheduler_h
+#ifndef _tdeio_scheduler_h
+#define _tdeio_scheduler_h
 
-#include "kio/job.h"
-#include "kio/jobclasses.h"
+#include "tdeio/job.h"
+#include "tdeio/jobclasses.h"
 #include <tqtimer.h>
 #include <tqptrdict.h>
 #include <tqmap.h>
 
 #include <dcopobject.h>
 
-namespace KIO {
+namespace TDEIO {
 
     class Slave;
     class SlaveList;
@@ -38,7 +38,7 @@ namespace KIO {
     class SessionData;
 
     /**
-     * The KIO::Scheduler manages io-slaves for the application.
+     * The TDEIO::Scheduler manages io-slaves for the application.
      * It also queues jobs and assigns the job to a slave when one
      * becomes available.
      *
@@ -46,12 +46,12 @@ namespace KIO {
      *
      * <h3>1. Direct</h3>
      * This is the default. When you create a job the
-     * KIO::Scheduler will be notified and will find either an existing
+     * TDEIO::Scheduler will be notified and will find either an existing
      * slave that is idle or it will create a new slave for the job.
      *
      * Example:
      * \code
-     *    TransferJob *job = KIO::get(KURL("http://www.kde.org"));
+     *    TransferJob *job = TDEIO::get(KURL("http://www.kde.org"));
      * \endcode
      *
      *
@@ -64,8 +64,8 @@ namespace KIO {
      *
      * Example:
      * \code
-     *    TransferJob *job = KIO::get(KURL("http://www.kde.org"));
-     *    KIO::Scheduler::scheduleJob(job);
+     *    TransferJob *job = TDEIO::get(KURL("http://www.kde.org"));
+     *    TDEIO::Scheduler::scheduleJob(job);
      * \endcode
      *
      * <h3>3. Connection Oriented</h3>
@@ -80,35 +80,35 @@ namespace KIO {
      *
      * Example:
      * \code
-     *    Slave *slave = KIO::Scheduler::getConnectedSlave(
+     *    Slave *slave = TDEIO::Scheduler::getConnectedSlave(
      *            KURL("pop3://bastian:password@mail.kde.org"));
-     *    TransferJob *job1 = KIO::get(
+     *    TransferJob *job1 = TDEIO::get(
      *            KURL("pop3://bastian:password@mail.kde.org/msg1"));
-     *    KIO::Scheduler::assignJobToSlave(slave, job1);
-     *    TransferJob *job2 = KIO::get(
+     *    TDEIO::Scheduler::assignJobToSlave(slave, job1);
+     *    TransferJob *job2 = TDEIO::get(
      *            KURL("pop3://bastian:password@mail.kde.org/msg2"));
-     *    KIO::Scheduler::assignJobToSlave(slave, job2);
-     *    TransferJob *job3 = KIO::get(
+     *    TDEIO::Scheduler::assignJobToSlave(slave, job2);
+     *    TransferJob *job3 = TDEIO::get(
      *            KURL("pop3://bastian:password@mail.kde.org/msg3"));
-     *    KIO::Scheduler::assignJobToSlave(slave, job3);
+     *    TDEIO::Scheduler::assignJobToSlave(slave, job3);
      *
      *    // ... Wait for jobs to finish...
      *
-     *    KIO::Scheduler::disconnectSlave(slave);
+     *    TDEIO::Scheduler::disconnectSlave(slave);
      * \endcode
      *
      * Note that you need to explicitly disconnect the slave when the 
      * connection goes down, so your error handler should contain:
      * \code
-     *    if (error == KIO::ERR_CONNECTION_BROKEN)
-     *        KIO::Scheduler::disconnectSlave(slave);
+     *    if (error == TDEIO::ERR_CONNECTION_BROKEN)
+     *        TDEIO::Scheduler::disconnectSlave(slave);
      * \endcode
      *
-     * @see KIO::Slave
-     * @see KIO::Job
+     * @see TDEIO::Slave
+     * @see TDEIO::Job
      **/
 
-    class KIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject {
+    class TDEIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject {
         Q_OBJECT
 
     public:
@@ -150,7 +150,7 @@ namespace KIO {
 	 * @param job the finished job
 	 * @param slave the slave that executed the @p job
          */
-        static void jobFinished(KIO::SimpleJob *job, KIO::Slave *slave)
+        static void jobFinished(TDEIO::SimpleJob *job, TDEIO::Slave *slave)
         { self()->_jobFinished(job, slave); }
 
         /**
@@ -164,7 +164,7 @@ namespace KIO {
 	 * @param job the job that should be stopped
 	 * @param url the URL that is handled by the @p url
          */
-        static void putSlaveOnHold(KIO::SimpleJob *job, const KURL &url)
+        static void putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url)
         { self()->_putSlaveOnHold(job, url); }
 
         /**
@@ -175,7 +175,7 @@ namespace KIO {
         { self()->_removeSlaveOnHold(); }
 
         /**
-         * Send the slave that was put on hold back to KLauncher. This
+         * Send the slave that was put on hold back to TDELauncher. This
          * allows another process to take over the slave and resume the job
          * that was started.
          */
@@ -193,7 +193,7 @@ namespace KIO {
          * @see assignJobToSlave()
          * @see disconnectSlave()
          */
-        static KIO::Slave *getConnectedSlave(const KURL &url, const KIO::MetaData &config = MetaData() )
+        static TDEIO::Slave *getConnectedSlave(const KURL &url, const TDEIO::MetaData &config = MetaData() )
         { return self()->_getConnectedSlave(url, config); }
 
         /*
@@ -212,7 +212,7 @@ namespace KIO {
          * @see slaveConnected()
          * @see slaveError()
          */
-        static bool assignJobToSlave(KIO::Slave *slave, KIO::SimpleJob *job)
+        static bool assignJobToSlave(TDEIO::Slave *slave, TDEIO::SimpleJob *job)
         { return self()->_assignJobToSlave(slave, job); }
 
         /*
@@ -227,16 +227,16 @@ namespace KIO {
          * @see getConnectedSlave
          * @see assignJobToSlave
          */
-        static bool disconnectSlave(KIO::Slave *slave)
+        static bool disconnectSlave(TDEIO::Slave *slave)
         { return self()->_disconnectSlave(slave); }
 
         /**
-         * Send the slave that was put on hold back to KLauncher. This
+         * Send the slave that was put on hold back to TDELauncher. This
          * allows another process to take over the slave and resume the job
          * the that was started.
          * Register the mainwindow @p wid with the KIO subsystem
          * Do not call this, it is called automatically from
-         * void KIO::Job::setWindow(TQWidget*).
+         * void TDEIO::Job::setWindow(TQWidget*).
 	 * @param wid the window to register
 	 * @since 3.1
          */
@@ -273,9 +273,9 @@ namespace KIO {
         { return TQObject::connect(sender, signal, member); }
 
         /**
-         * When true, the next job will check whether KLauncher has a slave 
+         * When true, the next job will check whether TDELauncher has a slave 
          * on hold that is suitable for the job.
-	 * @param b true when KLauncher has a job on hold
+	 * @param b true when TDELauncher has a job on hold
          */
         static void checkSlaveOnHold(bool b) { self()->_checkSlaveOnHold(b); }
 
@@ -287,15 +287,15 @@ namespace KIO {
         virtual QCStringList functions();
 
     public slots:
-        void slotSlaveDied(KIO::Slave *slave);
+        void slotSlaveDied(TDEIO::Slave *slave);
         void slotSlaveStatus(pid_t pid, const TQCString &protocol,
                              const TQString &host, bool connected);
     signals:
-        void slaveConnected(KIO::Slave *slave);
-        void slaveError(KIO::Slave *slave, int error, const TQString &errorMsg);
+        void slaveConnected(TDEIO::Slave *slave);
+        void slaveError(TDEIO::Slave *slave, int error, const TQString &errorMsg);
 
     protected:
-        void setupSlave(KIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const KIO::MetaData *config=0);
+        void setupSlave(TDEIO::Slave *slave, const KURL &url, const TQString &protocol, const TQString &proxy , bool newSlave, const TDEIO::MetaData *config=0);
         bool startJobScheduled(ProtocolInfo *protInfo);
         bool startJobDirect();
         Scheduler();
@@ -319,13 +319,13 @@ namespace KIO {
         void _doJob(SimpleJob *job);
         void _scheduleJob(SimpleJob *job);
         void _cancelJob(SimpleJob *job);
-        void _jobFinished(KIO::SimpleJob *job, KIO::Slave *slave);
+        void _jobFinished(TDEIO::SimpleJob *job, TDEIO::Slave *slave);
         void _scheduleCleanup();
-        void _putSlaveOnHold(KIO::SimpleJob *job, const KURL &url);
+        void _putSlaveOnHold(TDEIO::SimpleJob *job, const KURL &url);
         void _removeSlaveOnHold();
-        Slave *_getConnectedSlave(const KURL &url, const KIO::MetaData &metaData );
-        bool _assignJobToSlave(KIO::Slave *slave, KIO::SimpleJob *job);
-        bool _disconnectSlave(KIO::Slave *slave);
+        Slave *_getConnectedSlave(const KURL &url, const TDEIO::MetaData &metaData );
+        bool _assignJobToSlave(TDEIO::Slave *slave, TDEIO::SimpleJob *job);
+        bool _disconnectSlave(TDEIO::Slave *slave);
         void _checkSlaveOnHold(bool b);
         void _publishSlaveOnHold();
         void _registerWindow(TQWidget *wid);
diff --git a/kio/kio/sessiondata.cpp b/tdeio/tdeio/sessiondata.cpp
index 8619c2dc4..4e4dd14ac 100644
--- a/kio/kio/sessiondata.cpp
+++ b/tdeio/tdeio/sessiondata.cpp
@@ -22,22 +22,22 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <dcopclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kstandarddirs.h>
 
 #include <tdesu/client.h>
-#include <kio/slaveconfig.h>
-#include <kio/http_slave_defaults.h>
+#include <tdeio/slaveconfig.h>
+#include <tdeio/http_slave_defaults.h>
 
 #include "sessiondata.h"
 #include "sessiondata.moc"
 
-namespace KIO {
+namespace TDEIO {
 
 /***************************** SessionData::AuthData ************************/
 struct SessionData::AuthData
@@ -252,7 +252,7 @@ void SessionData::configDataFor( MetaData &configData, const TQString &proto,
     if ( configData["Charsets"].isEmpty() )
         configData["Charsets"] = d->charsets;
     if ( configData["CacheDir"].isEmpty() )
-        configData["CacheDir"] = KGlobal::dirs()->saveLocation("cache", "http");
+        configData["CacheDir"] = TDEGlobal::dirs()->saveLocation("cache", "http");
     if ( configData["UserAgent"].isEmpty() )
     {
       configData["UserAgent"] = KProtocolManager::defaultUserAgent();
@@ -264,15 +264,15 @@ void SessionData::reset()
 {
     d->initDone = true;
     // Get Cookie settings...
-    KConfig* cfg = new KConfig("kcookiejarrc", true, false);
+    TDEConfig* cfg = new TDEConfig("kcookiejarrc", true, false);
     cfg->setGroup( "Cookie Policy" );
     d->useCookie = cfg->readBoolEntry( "Cookies", true );
     delete cfg;
 
-    static const TQString & english = KGlobal::staticQString( "en" );
+    static const TQString & english = TDEGlobal::staticQString( "en" );
 
     // Get language settings...
-    TQStringList languageList = KGlobal::locale()->languagesTwoAlpha();
+    TQStringList languageList = TDEGlobal::locale()->languagesTwoAlpha();
     TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
     if ( it != languageList.end() )
     {
diff --git a/kio/kio/sessiondata.h b/tdeio/tdeio/sessiondata.h
index 80433679c..a87e63dba 100644
--- a/kio/kio/sessiondata.h
+++ b/tdeio/tdeio/sessiondata.h
@@ -22,9 +22,9 @@
 #define __KIO_SESSIONDATA_H
 
 #include <tqobject.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
-namespace KIO  {
+namespace TDEIO  {
 
 class SlaveConfig;
 
@@ -32,7 +32,7 @@ class SlaveConfig;
 /**
  * @internal
  */
-class KIO_EXPORT SessionData : public TQObject
+class TDEIO_EXPORT SessionData : public TQObject
 {
     Q_OBJECT
 
@@ -40,7 +40,7 @@ public:
     SessionData();
     ~SessionData();
 
-    virtual void configDataFor( KIO::MetaData &configData, const TQString &proto,
+    virtual void configDataFor( TDEIO::MetaData &configData, const TQString &proto,
                                 const TQString &host );
     virtual void reset();
 
diff --git a/kio/kio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp
index 0fe7b230b..5871bbd09 100644
--- a/kio/kio/skipdlg.cpp
+++ b/tdeio/tdeio/skipdlg.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio/skipdlg.h"
+#include "tdeio/skipdlg.h"
 
 #include <stdio.h>
 #include <assert.h>
@@ -26,8 +26,8 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
@@ -36,7 +36,7 @@
 #include <twin.h>
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 
 SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, bool _modal ) :
   KDialog ( parent, "" , _modal )
@@ -44,7 +44,7 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo
   // TODO : port to KDialogBase
   modal = _modal;
 
-  // Set "StaysOnTop", because this dialog is typically used in kio_uiserver,
+  // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver,
   // i.e. in a separate process.
 #ifdef Q_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32
   if (modal)
@@ -132,7 +132,7 @@ void SkipDlg::b2Pressed()
     emit result( this, 2 );
 }
 
-SkipDlg_Result KIO::open_SkipDlg( bool _multi, const TQString& _error_text )
+SkipDlg_Result TDEIO::open_SkipDlg( bool _multi, const TQString& _error_text )
 {
   Q_ASSERT(kapp);
 
diff --git a/kio/kio/skipdlg.h b/tdeio/tdeio/skipdlg.h
index dbf583ef0..c07086463 100644
--- a/kio/kio/skipdlg.h
+++ b/tdeio/tdeio/skipdlg.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_skip_dlg__
-#define __kio_skip_dlg__
+#ifndef __tdeio_skip_dlg__
+#define __tdeio_skip_dlg__
 
 #include <tdelibs_export.h>
 #include <kdialog.h>
@@ -25,16 +25,16 @@
 class TQPushButton;
 class TQWidget;
 
-namespace KIO {
+namespace TDEIO {
 
   enum SkipDlg_Result { S_SKIP = 1, S_AUTO_SKIP = 2, S_CANCEL = 0 };
 
-  KIO_EXPORT SkipDlg_Result open_SkipDlg( bool _multi, const TQString& _error_text = TQString::null );
+  TDEIO_EXPORT SkipDlg_Result open_SkipDlg( bool _multi, const TQString& _error_text = TQString::null );
 
 /**
  * @internal
  */
-class KIO_EXPORT SkipDlg : public KDialog
+class TDEIO_EXPORT SkipDlg : public KDialog
 {
   Q_OBJECT
 public:
diff --git a/kio/kio/slave.cpp b/tdeio/tdeio/slave.cpp
index 3a501d681..b4a7c8f2a 100644
--- a/kio/kio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -35,20 +35,20 @@
 
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
-#include <ktempfile.h>
+#include <tdeapplication.h>
+#include <tdetempfile.h>
 #include <ksock.h>
 #include <kprocess.h>
 #include <klibloader.h>
 
-#include "kio/dataprotocol.h"
-#include "kio/slave.h"
-#include "kio/kservice.h"
-#include <kio/global.h>
-#include <kprotocolmanager.h>
+#include "tdeio/dataprotocol.h"
+#include "tdeio/slave.h"
+#include "tdeio/kservice.h"
+#include <tdeio/global.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 
 #ifdef HAVE_PATHS_H
@@ -59,7 +59,7 @@
 #define _PATH_TMP "/tmp"
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 
 #define SLAVE_CONNECTION_TIMEOUT_MIN	   2
 
@@ -73,7 +73,7 @@ using namespace KIO;
 #define SLAVE_CONNECTION_TIMEOUT_MAX    3600
 #endif
 
-namespace KIO {
+namespace TDEIO {
 
   /**
    * @internal
@@ -87,7 +87,7 @@ namespace KIO {
   };
 }
 
-void Slave::accept(KSocket *socket)
+void Slave::accept(TDESocket *socket)
 {
 #ifndef Q_WS_WIN
     slaveconn.init(socket);
@@ -138,7 +138,7 @@ void Slave::timeout()
    deref();
 }
 
-Slave::Slave(KServerSocket *socket, const TQString &protocol, const TQString &socketname)
+Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString &socketname)
   : SlaveInterface(&slaveconn), serv(socket), contacted(false),
   	d(new SlavePrivate(false))
 {
@@ -152,12 +152,12 @@ Slave::Slave(KServerSocket *socket, const TQString &protocol, const TQString &so
     m_pid = 0;
     m_port = 0;
 #ifndef Q_WS_WIN
-    connect(serv, TQT_SIGNAL(accepted( KSocket* )),
-	    TQT_SLOT(accept(KSocket*) ) );
+    connect(serv, TQT_SIGNAL(accepted( TDESocket* )),
+	    TQT_SLOT(accept(TDESocket*) ) );
 #endif
 }
 
-Slave::Slave(bool /*derived*/, KServerSocket *socket, const TQString &protocol,
+Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol,
 	const TQString &socketname)
   : SlaveInterface(&slaveconn), serv(socket), contacted(false),
   	d(new SlavePrivate(true))
@@ -174,8 +174,8 @@ Slave::Slave(bool /*derived*/, KServerSocket *socket, const TQString &protocol,
     m_port = 0;
     if (serv != 0) {
 #ifndef Q_WS_WIN
-      connect(serv, TQT_SIGNAL(accepted( KSocket* )),
-        TQT_SLOT(accept(KSocket*) ) );
+      connect(serv, TQT_SIGNAL(accepted( TDESocket* )),
+        TQT_SLOT(accept(TDESocket*) ) );
 #endif
     }
 }
@@ -233,7 +233,7 @@ void Slave::hold(const KURL &url)
       emit slaveDied(this);
    }
    deref();
-   // Call KLauncher::waitForSlave(pid);
+   // Call TDELauncher::waitForSlave(pid);
    {
       DCOPClient *client = kapp->dcopClient();
       if (!client->isAttached())
@@ -245,7 +245,7 @@ void Slave::hold(const KURL &url)
       pid_t pid = m_pid;
       stream << pid;
 
-      TQCString launcher = KApplication::launcher();
+      TQCString launcher = TDEApplication::launcher();
       client->call(launcher, launcher, "waitForSlave(pid_t)",
 	    params, replyType, reply);
    }
@@ -363,12 +363,12 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     if (!client->isAttached())
 	client->attach();
 
-    TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName());
+    TQString prefix = locateLocal("socket", TDEGlobal::instance()->instanceName());
     KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket"));
     if ( socketfile.status() != 0 )
     {
 	error_text = i18n("Unable to create io-slave: %1").arg(strerror(errno));
-	error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
+	error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
 	return 0;
     }
 
@@ -377,7 +377,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
 #endif
     
 #ifndef Q_WS_WIN
-    KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data());
+    TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data());
 
     Slave *slave = new Slave(kss, protocol, socketfile.name());
 #else
@@ -385,10 +385,10 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
 #endif
 
     // WABA: if the dcopserver is running under another uid we don't ask
-    // klauncher for a slave, because the slave might have that other uid
+    // tdelauncher for a slave, because the slave might have that other uid
     // as well, which might either be a) undesired or b) make it impossible
     // for the slave to connect to the application.
-    // In such case we start the slave via KProcess.
+    // In such case we start the slave via TDEProcess.
     // It's possible to force this by setting the env. variable
     // TDE_FORK_SLAVES, Clearcase seems to require this.
     static bool bForkSlaves = !TQCString(getenv("TDE_FORK_SLAVES")).isEmpty();
@@ -399,7 +399,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
        if (_name.isEmpty())
        {
           error_text = i18n("Unknown protocol '%1'.").arg(protocol);
-          error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
+          error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
           delete slave;
           return 0;
        }
@@ -407,16 +407,16 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
        if (lib_path.isEmpty())
        {
           error_text = i18n("Can not find io-slave for protocol '%1'.").arg(protocol);
-          error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
+          error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
           return 0;
        }
 
-       KProcess proc;
+       TDEProcess proc;
 
-       proc << locate("exe", "kioslave") << lib_path << protocol << "" << socketfile.name();
-       kdDebug(7002) << "kioslave" << ", " << lib_path << ", " << protocol << ", " << TQString::null << ", " << socketfile.name() << endl;
+       proc << locate("exe", "tdeioslave") << lib_path << protocol << "" << socketfile.name();
+       kdDebug(7002) << "tdeioslave" << ", " << lib_path << ", " << protocol << ", " << TQString::null << ", " << socketfile.name() << endl;
 
-       proc.start(KProcess::DontCare);
+       proc.start(TDEProcess::DontCare);
 
 #ifndef Q_WS_WIN
        slave->setPID(proc.pid());
@@ -431,11 +431,11 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     TQDataStream stream(params, IO_WriteOnly);
     stream << protocol << url.host() << socketfile.name();
 
-    TQCString launcher = KApplication::launcher();
+    TQCString launcher = TDEApplication::launcher();
     if (!client->call(launcher, launcher, "requestSlave(TQString,TQString,TQString)",
 	    params, replyType, reply)) {
-	error_text = i18n("Cannot talk to klauncher");
-	error = KIO::ERR_SLAVE_DEFINED;
+	error_text = i18n("Cannot talk to tdelauncher");
+	error = TDEIO::ERR_SLAVE_DEFINED;
         delete slave;
         return 0;
     }
@@ -445,8 +445,8 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     stream2 >> pid >> errorStr;
     if (!pid)
     {
-        error_text = i18n("Unable to create io-slave:\nklauncher said: %1").arg(errorStr);
-        error = KIO::ERR_CANNOT_LAUNCH_PROCESS;
+        error_text = i18n("Unable to create io-slave:\ntdelauncher said: %1").arg(errorStr);
+        error = TDEIO::ERR_CANNOT_LAUNCH_PROCESS;
         delete slave;
         return 0;
     }
@@ -468,7 +468,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
     if (!client->isAttached())
 	client->attach();
 
-    TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName());
+    TQString prefix = locateLocal("socket", TDEGlobal::instance()->instanceName());
     KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket"));
     if ( socketfile.status() != 0 )
 	return 0;
@@ -479,7 +479,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
 #endif
 
 #ifndef Q_WS_WIN
-    KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data());
+    TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data());
 
     Slave *slave = new Slave(kss, protocol, socketfile.name());
 #else
@@ -491,7 +491,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
     TQDataStream stream(params, IO_WriteOnly);
     stream << url << socketfile.name();
 
-    TQCString launcher = KApplication::launcher();
+    TQCString launcher = TDEApplication::launcher();
     if (!client->call(launcher, launcher, "requestHoldSlave(KURL,TQString)",
         params, replyType, reply)) {
         delete slave;
@@ -513,7 +513,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
 }
 
 void Slave::virtual_hook( int id, void* data ) {
-  KIO::SlaveInterface::virtual_hook( id, data );
+  TDEIO::SlaveInterface::virtual_hook( id, data );
 }
 
 #include "slave.moc"
diff --git a/kio/kio/slave.h b/tdeio/tdeio/slave.h
index e5cdc332c..80ae30d3a 100644
--- a/kio/kio/slave.h
+++ b/tdeio/tdeio/slave.h
@@ -29,19 +29,19 @@
 
 #include <kurl.h>
 
-#include "kio/slaveinterface.h"
-#include "kio/connection.h"
+#include "tdeio/slaveinterface.h"
+#include "tdeio/connection.h"
 
-class KServerSocket;
-class KSocket;
+class TDEServerSocket;
+class TDESocket;
 
-namespace KIO {
+namespace TDEIO {
 
-    /** Attention developers: If you change the implementation of KIO::Slave,
-    * do *not* use connection() or slaveconn but the respective KIO::Slave
+    /** Attention developers: If you change the implementation of TDEIO::Slave,
+    * do *not* use connection() or slaveconn but the respective TDEIO::Slave
     * accessor methods. Otherwise classes derived from Slave might break. (LS)
     */
-    class KIO_EXPORT Slave : public KIO::SlaveInterface
+    class TDEIO_EXPORT Slave : public TDEIO::SlaveInterface
     {
 	Q_OBJECT
 	
@@ -53,11 +53,11 @@ namespace KIO {
 	 * @internal
 	 * @since 3.2
 	 */
-	Slave(bool derived, KServerSocket *unixdomain, const TQString &protocol,
+	Slave(bool derived, TDEServerSocket *unixdomain, const TQString &protocol,
 		const TQString &socketname);	// TODO(BIC): Remove in KDE 4
 
     public:
-	Slave(KServerSocket *unixdomain,
+	Slave(TDEServerSocket *unixdomain,
 	      const TQString &protocol, const TQString &socketname);
 
         virtual ~Slave();
@@ -153,34 +153,34 @@ namespace KIO {
 
         static Slave* holdSlave( const TQString &protocol, const KURL& url );
 
-	// == communication with connected kioslave ==
+	// == communication with connected tdeioslave ==
 	// whenever possible prefer these methods over the respective
 	// methods in connection()
 	/**
-	 * Suspends the operation of the attached kioslave.
+	 * Suspends the operation of the attached tdeioslave.
 	 */
         void suspend();		// TODO(BIC): make virtual
 	/**
-	 * Resumes the operation of the attached kioslave.
+	 * Resumes the operation of the attached tdeioslave.
 	 */
         void resume();		// TODO(BIC): make virtual
 	/**
-	 * Tells wether the kioslave is suspended.
-	 * @return true if the kioslave is suspended.
+	 * Tells wether the tdeioslave is suspended.
+	 * @return true if the tdeioslave is suspended.
 	 * @since 3.2
 	 */
         bool suspended();	// TODO(BIC): make virtual
 	/**
-	 * Sends the given command to the kioslave.
+	 * Sends the given command to the tdeioslave.
 	 * @param cmd command id
 	 * @param data byte array containing data
 	 * @since 3.2
 	 */
         void send(int cmd, const TQByteArray &data = TQByteArray());// TODO(BIC): make virtual
-	// == end communication with connected kioslave ==
+	// == end communication with connected tdeioslave ==
 
 	/**
-	 * Puts the kioslave associated with @p url at halt.
+	 * Puts the tdeioslave associated with @p url at halt.
 	 */
 	void hold(const KURL &url);	// TODO(BIC): make virtual
 
@@ -202,7 +202,7 @@ namespace KIO {
         void setConnected(bool c) { contacted = c; }
 
 	/** @deprecated This method is obsolete, use the accessor methods
-	  * within KIO::Slave instead. Old code directly accessing connection()
+	  * within TDEIO::Slave instead. Old code directly accessing connection()
 	  * will not be able to access special protocols.
 	  */
         KDE_DEPRECATED Connection *connection() { return &slaveconn; }	// TODO(BIC): remove before KDE 4
@@ -211,11 +211,11 @@ namespace KIO {
         void deref() { m_refCount--; if (!m_refCount) delete this; }
 
     public slots:
-        void accept(KSocket *socket);
+        void accept(TDESocket *socket);
 	void gotInput();
 	void timeout();
     signals:
-        void slaveDied(KIO::Slave *slave);
+        void slaveDied(TDEIO::Slave *slave);
 
     protected:
         void unlinkSocket();
@@ -227,14 +227,14 @@ namespace KIO {
         int m_port;
         TQString m_user;
         TQString m_passwd;
-	KServerSocket *serv;
+	TDEServerSocket *serv;
 	TQString m_socket;
 	pid_t m_pid;
 	bool contacted;
 	bool dead;
 	time_t contact_started;
 	time_t idle_since;
-	KIO::Connection slaveconn;
+	TDEIO::Connection slaveconn;
 	int m_refCount;
     protected:
 	virtual void virtual_hook( int id, void* data );
diff --git a/kio/kio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp
index d0734105c..76bbc232d 100644
--- a/kio/kio/slavebase.cpp
+++ b/tdeio/tdeio/slavebase.cpp
@@ -44,19 +44,19 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksock.h>
 #include <kcrash.h>
 #include <tdesu/client.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksocks.h>
 
 #include "kremoteencoding.h"
 
-#include "kio/slavebase.h"
-#include "kio/connection.h"
-#include "kio/ioslave_defaults.h"
-#include "kio/slaveinterface.h"
+#include "tdeio/slavebase.h"
+#include "tdeio/connection.h"
+#include "tdeio/ioslave_defaults.h"
+#include "tdeio/slaveinterface.h"
 
 #include "uiserver_stub.h"
 
@@ -66,7 +66,7 @@
 #endif
 #endif
 
-using namespace KIO;
+using namespace TDEIO;
 
 template class TQPtrList<TQValueList<UDSAtom> >;
 typedef TQValueList<TQCString> AuthKeysList;
@@ -74,9 +74,9 @@ typedef TQMap<TQString,TQCString> AuthKeysMap;
 #define KIO_DATA TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream
 #define KIO_FILESIZE_T(x) (unsigned long)(x & 0xffffffff) << (unsigned long)(x >> 32)
 
-namespace KIO {
+namespace TDEIO {
 
-class SlaveBaseConfig : public KConfigBase
+class SlaveBaseConfig : public TDEConfigBase
 {
 public:
    SlaveBaseConfig(SlaveBase *_slave)
@@ -124,8 +124,8 @@ public:
     KURL onHoldUrl;
 
     struct timeval last_tv;
-    KIO::filesize_t totalSize;
-    KIO::filesize_t sentListEntries;
+    TDEIO::filesize_t totalSize;
+    TDEIO::filesize_t sentListEntries;
     DCOPClient *dcopClient;
     KRemoteEncoding *remotefile;
     time_t timeout;
@@ -147,7 +147,7 @@ static void genericsig_handler(int sigNumber)
    signal(sigNumber,SIG_IGN);
    //WABA: Don't do anything that requires malloc, we can deadlock on it since
    //a SIGTERM signal can come in while we are in malloc/free.
-   //kdDebug()<<"kioslave : exiting due to signal "<<sigNumber<<endl;
+   //kdDebug()<<"tdeioslave : exiting due to signal "<<sigNumber<<endl;
    //set the flag which will be checked in dispatchLoop() and which *should* be checked
    //in lengthy operations in the various slaves
    if (globalSlave!=0)
@@ -170,7 +170,7 @@ SlaveBase::SlaveBase( const TQCString &protocol,
 #ifdef Q_OS_UNIX
     if (!getenv("TDE_DEBUG"))
     {
-        KCrash::setCrashHandler( sigsegv_handler );
+        TDECrash::setCrashHandler( sigsegv_handler );
         signal(SIGILL,&sigsegv_handler);
         signal(SIGTRAP,&sigsegv_handler);
         signal(SIGABRT,&sigsegv_handler);
@@ -246,7 +246,7 @@ DCOPClient *SlaveBase::dcopClient()
 {
     if (!d->dcopClient)
     {
-       d->dcopClient = KApplication::dcopClient();
+       d->dcopClient = TDEApplication::dcopClient();
        if (!d->dcopClient->isAttached())
           d->dcopClient->attach();
        d->dcopClient->setDaemonMode( true );
@@ -341,8 +341,8 @@ void SlaveBase::dispatchLoop()
 
 void SlaveBase::connectSlave(const TQString& path)
 {
-#ifdef Q_OS_UNIX //TODO: KSocket not yet available on WIN32
-    appconn->init(new KSocket(TQFile::encodeName(path).data()));
+#ifdef Q_OS_UNIX //TODO: TDESocket not yet available on WIN32
+    appconn->init(new TDESocket(TQFile::encodeName(path).data()));
     if (!appconn->inited())
     {
         kdDebug(7019) << "SlaveBase: failed to connect to " << path << endl;
@@ -389,7 +389,7 @@ bool SlaveBase::hasMetaData(const TQString &key) {
    return const_cast<const SlaveBase*>(this)->hasMetaData( key );
 }
 
-KConfigBase *SlaveBase::config()
+TDEConfigBase *SlaveBase::config()
 {
    return d->config;
 }
@@ -485,7 +485,7 @@ void SlaveBase::canResume()
     m_pConnection->send( MSG_CANRESUME );
 }
 
-void SlaveBase::totalSize( KIO::filesize_t _bytes )
+void SlaveBase::totalSize( TDEIO::filesize_t _bytes )
 {
     KIO_DATA << KIO_FILESIZE_T(_bytes);
     slaveWriteError = false;
@@ -501,7 +501,7 @@ void SlaveBase::totalSize( KIO::filesize_t _bytes )
     d->sentListEntries=0;
 }
 
-void SlaveBase::processedSize( KIO::filesize_t _bytes )
+void SlaveBase::processedSize( TDEIO::filesize_t _bytes )
 {
     bool           emitSignal=false;
     struct timeval tv;
@@ -739,7 +739,7 @@ void SlaveBase::sigsegv_handler(int sig)
     // Debug and printf should be avoided because they might
     // call malloc.. and get in a nice recursive malloc loop
     char buffer[120];
-    snprintf(buffer, sizeof(buffer), "kioslave: ####### CRASH ###### protocol = %s pid = %d signal = %d\n", s_protocol, getpid(), sig);
+    snprintf(buffer, sizeof(buffer), "tdeioslave: ####### CRASH ###### protocol = %s pid = %d signal = %d\n", s_protocol, getpid(), sig);
     write(2, buffer, strlen(buffer));
 #ifndef NDEBUG
 #ifdef HAVE_BACKTRACE
@@ -861,7 +861,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg )
 
     (void) dcopClient(); // Make sure to have a dcop client.
 
-    UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+    UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
     if (progressId)
       uiserver.setJobVisible( progressId, false );
 
@@ -872,7 +872,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg )
     else
        stream << info << errorMsg << windowId << s_seqNr << userTimestamp;
 
-    bool callOK = d->dcopClient->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo, TQString, long int, long int, unsigned long int)",
+    bool callOK = d->dcopClient->call( "kded", "kpasswdserver", "queryAuthInfo(TDEIO::AuthInfo, TQString, long int, long int, unsigned long int)",
                                         params, replyType, reply );
 
     if (progressId)
@@ -884,7 +884,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg )
        return false;
     }
 
-    if ( replyType == "KIO::AuthInfo" )
+    if ( replyType == "TDEIO::AuthInfo" )
     {
        TQDataStream stream2( reply, IO_ReadOnly );
        stream2 >> authResult >> s_seqNr;
@@ -892,7 +892,7 @@ bool SlaveBase::openPassDlg( AuthInfo& info, const TQString &errorMsg )
     else
     {
        kdError(7019) << "DCOP function queryAuthInfo(...) returns "
-                     << replyType << ", expected KIO::AuthInfo" << endl;
+                     << replyType << ", expected TDEIO::AuthInfo" << endl;
        return false;
     }
 
@@ -930,9 +930,9 @@ int SlaveBase::messageBox( const TQString &text, MessageBoxType type, const TQSt
         return 0; // communication failure
 }
 
-bool SlaveBase::canResume( KIO::filesize_t offset )
+bool SlaveBase::canResume( TDEIO::filesize_t offset )
 {
-    kdDebug(7019) << "SlaveBase::canResume offset=" << KIO::number(offset) << endl;
+    kdDebug(7019) << "SlaveBase::canResume offset=" << TDEIO::number(offset) << endl;
     d->needSendCanResume = false;
     KIO_DATA << KIO_FILESIZE_T(offset);
     m_pConnection->send( MSG_RESUME, data );
@@ -1216,14 +1216,14 @@ bool SlaveBase::checkCachedAuthentication( AuthInfo& info )
     TQDataStream stream(params, IO_WriteOnly);
     stream << info << windowId << userTimestamp;
 
-    if ( !d->dcopClient->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int, unsigned long int)",
+    if ( !d->dcopClient->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int, unsigned long int)",
                                params, replyType, reply ) )
     {
        kdWarning(7019) << "Can't communicate with kded_kpasswdserver!" << endl;
        return false;
     }
 
-    if ( replyType == "KIO::AuthInfo" )
+    if ( replyType == "TDEIO::AuthInfo" )
     {
        TQDataStream stream2( reply, IO_ReadOnly );
        stream2 >> authResult;
@@ -1231,7 +1231,7 @@ bool SlaveBase::checkCachedAuthentication( AuthInfo& info )
     else
     {
        kdError(7019) << "DCOP function checkAuthInfo(...) returns "
-                     << replyType << ", expected KIO::AuthInfo" << endl;
+                     << replyType << ", expected TDEIO::AuthInfo" << endl;
        return false;
     }
     if (!authResult.isModified())
@@ -1253,7 +1253,7 @@ bool SlaveBase::cacheAuthentication( const AuthInfo& info )
     TQDataStream stream(params, IO_WriteOnly);
     stream << info << windowId;
 
-    d->dcopClient->send( "kded", "kpasswdserver", "addAuthInfo(KIO::AuthInfo, long int)", params );
+    d->dcopClient->send( "kded", "kpasswdserver", "addAuthInfo(TDEIO::AuthInfo, long int)", params );
 
     return true;
 }
diff --git a/kio/kio/slavebase.h b/tdeio/tdeio/slavebase.h
index b6e48d5b6..05d3cbbed 100644
--- a/kio/kio/slavebase.h
+++ b/tdeio/tdeio/slavebase.h
@@ -21,28 +21,28 @@
 #define __slavebase_h
 
 #include <kurl.h>
-#include <kconfigbase.h>
-#include <kio/global.h>
-#include <kio/authinfo.h>
+#include <tdeconfigbase.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
 
 class DCOPClient;
 class KRemoteEncoding;
 
-namespace KIO {
+namespace TDEIO {
 
 class Connection;
 class SlaveBasePrivate;
 
 /**
  * There are two classes that specifies the protocol between application (job)
- * and kioslave. SlaveInterface is the class to use on the application end,
+ * and tdeioslave. SlaveInterface is the class to use on the application end,
  * SlaveBase is the one to use on the slave end.
  *
  * Slave implementations should simply inherit SlaveBase
  *
  * A call to foo() results in a call to slotFoo() on the other end.
  */
-class KIO_EXPORT SlaveBase
+class TDEIO_EXPORT SlaveBase
 {
 public:
     SlaveBase( const TQCString &protocol, const TQCString &pool_socket, const TQCString &app_socket);
@@ -93,7 +93,7 @@ public:
      * Call to signal an error.
      * This also finishes the job, no need to call finished.
      *
-     * If the Error code is KIO::ERR_SLAVE_DEFINED then the
+     * If the Error code is TDEIO::ERR_SLAVE_DEFINED then the
      * _text should contain the complete translated text of
      * of the error message.  This message will be displayed
      * in an KTextBrowser which allows rich text complete
@@ -101,9 +101,9 @@ public:
      * mailer, "exec:/command arg1 arg2" will be forked and
      * all other links will call the default browser.
      *
-     * @see KIO::Error
+     * @see TDEIO::Error
      * @see KTextBrowser
-     * @param _errid the error code from KIO::Error
+     * @param _errid the error code from TDEIO::Error
      * @param _text the rich text error message
      */
     void error( int _errid, const TQString &_text );
@@ -154,7 +154,7 @@ public:
      * In this case, the boolean returns whether we can indeed resume or not
      * (we can't if the protocol doing the get() doesn't support setting an offset)
      */
-    bool canResume( KIO::filesize_t offset );
+    bool canResume( TDEIO::filesize_t offset );
 
     /*
      * Call this at the beginning of get(), if the "resume" metadata was set
@@ -171,13 +171,13 @@ public:
      * of the file
      * Call in listDir too, when you know the total number of items.
      */
-    void totalSize( KIO::filesize_t _bytes );
+    void totalSize( TDEIO::filesize_t _bytes );
     /**
      * Call this during get and copy, once in a while,
      * to give some info about the current state.
      * Don't emit it in listDir, listEntries speaks for itself.
      */
-    void processedSize( KIO::filesize_t _bytes );
+    void processedSize( TDEIO::filesize_t _bytes );
 
     /**
      * Only use this if you can't know in advance the size of the
@@ -261,7 +261,7 @@ public:
      * Note: for ContinueCancel, buttonYes is the continue button and buttonNo is unused.
      *       and for Information, none is used.
      * @param dontAskAgainName A checkbox is added with which further confirmation can be turned off.
-     *        The string is used to lookup and store the setting in kioslaverc.
+     *        The string is used to lookup and store the setting in tdeioslaverc.
      * @return a button code, as defined in KMessageBox, or 0 on communication error.
      * @since 3.3
      */
@@ -317,7 +317,7 @@ public:
      * The application provides the slave with all configuration information
      * relevant for the current protocol and host.
      */
-    KConfigBase* config();
+    TDEConfigBase* config();
 
     /**
      * Returns an object that can translate remote filenames into proper
@@ -482,11 +482,11 @@ public:
     virtual void del( const KURL &url, bool isfile);
 
     // TODO KDE4: add setLinkDest() or something, to modify symlink targets.
-    // Will be used for kio_file but also kio_remote (#97129)
+    // Will be used for tdeio_file but also tdeio_remote (#97129)
 
     /**
      * Used for any command that is specific to this slave (protocol)
-     * Examples are : HTTP POST, mount and unmount (kio_file)
+     * Examples are : HTTP POST, mount and unmount (tdeio_file)
      *
      * @param data packed data; the meaning is completely dependent on the
      *        slave, but usually starts with an int for the command number.
@@ -621,7 +621,7 @@ public:
      * simple example:
      *
      * \code
-     * KIO::AuthInfo authInfo;
+     * TDEIO::AuthInfo authInfo;
      * if ( openPassDlg( authInfo ) )
      * {
      *    kdDebug() << TQString::fromLatin1("User: ")
@@ -635,7 +635,7 @@ public:
      * comment as follows:
      *
      * \code
-     * KIO::AuthInfo authInfo;
+     * TDEIO::AuthInfo authInfo;
      * authInfo.caption= "Acme Password Dialog";
      * authInfo.username= "Wile E. Coyote";
      * TQString errorMsg = "You entered an incorrect password.";
@@ -661,13 +661,13 @@ public:
      * @return      @p true if user clicks on "OK", @p false otherwsie.
      * @since 3.1
      */
-    bool openPassDlg( KIO::AuthInfo& info, const TQString &errorMsg );
+    bool openPassDlg( TDEIO::AuthInfo& info, const TQString &errorMsg );
 
     /**
      * Same as above function except it does not need error message.
      * BIC: Combine this function with the above for KDE4.
      */
-    bool openPassDlg( KIO::AuthInfo& info );
+    bool openPassDlg( TDEIO::AuthInfo& info );
 
     /**
      * Checks for cached authentication based on parameters
diff --git a/kio/kio/slaveconfig.cpp b/tdeio/tdeio/slaveconfig.cpp
index fe888c99c..af1b7b793 100644
--- a/kio/kio/slaveconfig.cpp
+++ b/tdeio/tdeio/slaveconfig.cpp
@@ -24,16 +24,16 @@
 
 #include <tqdict.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include "slaveconfig.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
-namespace KIO {
+namespace TDEIO {
 
 class SlaveConfigProtocol
 {
@@ -47,10 +47,10 @@ public:
 public:
   MetaData global;
   TQDict<MetaData> host;
-  KConfig *configFile;
+  TDEConfig *configFile;
 };
 
-static void readConfig(KConfig *config, const TQString & group, MetaData *metaData)
+static void readConfig(TDEConfig *config, const TQString & group, MetaData *metaData)
 {
    *metaData += config->entryMap(group);
 }
@@ -71,8 +71,8 @@ void SlaveConfigPrivate::readGlobalConfig()
 {
    global.clear();
    // Read stuff...
-   KConfig *config = KProtocolManager::config();
-   readConfig(KGlobal::config(), "Socks", &global); // Socks settings.
+   TDEConfig *config = KProtocolManager::config();
+   readConfig(TDEGlobal::config(), "Socks", &global); // Socks settings.
    if ( config )
        readConfig(config, "<default>", &global);
 }
@@ -84,7 +84,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_pro
    {
       TQString filename = KProtocolInfo::config(_protocol);
       scp = new SlaveConfigProtocol;
-      scp->configFile = new KConfig(filename, true, false);
+      scp->configFile = new TDEConfig(filename, true, false);
       protocol.insert(_protocol, scp);
    }
    // Read global stuff...
diff --git a/kio/kio/slaveconfig.h b/tdeio/tdeio/slaveconfig.h
index a7ded457d..08a5e6782 100644
--- a/kio/kio/slaveconfig.h
+++ b/tdeio/tdeio/slaveconfig.h
@@ -22,9 +22,9 @@
 #define KIO_SLAVE_CONFIG_H
 
 #include <tqobject.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
-namespace KIO {
+namespace TDEIO {
 
     class SlaveConfigPrivate;
     /**
@@ -38,13 +38,13 @@ namespace KIO {
      * configuration items of an io-slave when the io-slave is used by
      * your application. 
      *
-     * Normally io-slaves are being configured by "kio_<protocol>rc" 
+     * Normally io-slaves are being configured by "tdeio_<protocol>rc" 
      * configuration files. Groups defined in such files are treated as host 
      * or domain specification. Configuration items defined in a group are 
      * only applied when the slave is connecting with a host that matches with 
      * the host and/or domain specified by the group.
      */
-    class KIO_EXPORT SlaveConfig : public TQObject
+    class TDEIO_EXPORT SlaveConfig : public TQObject
     {
 	Q_OBJECT
     public:
diff --git a/kio/kio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp
index 05036cf8a..6de70b57f 100644
--- a/kio/kio/slaveinterface.cpp
+++ b/tdeio/tdeio/slaveinterface.cpp
@@ -16,9 +16,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kio/slaveinterface.h"
-#include "kio/slavebase.h"
-#include "kio/connection.h"
+#include "tdeio/slaveinterface.h"
+#include "tdeio/slavebase.h"
+#include "tdeio/connection.h"
 #include <errno.h>
 #include <assert.h>
 #include <kdebug.h>
@@ -26,16 +26,16 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <signal.h>
-#include <kio/observer.h>
-#include <kapplication.h>
+#include <tdeio/observer.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <time.h>
 #include <tqtimer.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 
-TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e )
+TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e )
 {
     // On 32-bit platforms we send UDS_SIZE with UDS_SIZE_LARGE in front
     // of it to carry the 32 msb. We can't send a 64 bit UDS_SIZE because
@@ -44,21 +44,21 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e )
     // environment.
 
     TQ_UINT32 size = 0;
-    KIO::UDSEntry::ConstIterator it = e.begin();
+    TDEIO::UDSEntry::ConstIterator it = e.begin();
     for( ; it != e.end(); ++it )
     {
        size++;
-       if ((*it).m_uds == KIO::UDS_SIZE)
+       if ((*it).m_uds == TDEIO::UDS_SIZE)
           size++;
     }
     s << size;
     it = e.begin();
     for( ; it != e.end(); ++it )
     {
-       if ((*it).m_uds == KIO::UDS_SIZE)
+       if ((*it).m_uds == TDEIO::UDS_SIZE)
        {
-          KIO::UDSAtom a;
-          a.m_uds = KIO::UDS_SIZE_LARGE;
+          TDEIO::UDSAtom a;
+          a.m_uds = TDEIO::UDS_SIZE_LARGE;
           a.m_long = (*it).m_long >> 32;
           s << a;
        }
@@ -67,7 +67,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e )
     return s;
 }
 
-TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e )
+TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e )
 {
     e.clear();
     TQ_UINT32 size;
@@ -81,15 +81,15 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e )
     TQ_LLONG msb = 0;
     for(TQ_UINT32 i = 0; i < size; i++)
     {
-       KIO::UDSAtom a;
+       TDEIO::UDSAtom a;
        s >> a;
-       if (a.m_uds == KIO::UDS_SIZE_LARGE)
+       if (a.m_uds == TDEIO::UDS_SIZE_LARGE)
        {
           msb = a.m_long;
        }
        else
        {
-          if (a.m_uds == KIO::UDS_SIZE)
+          if (a.m_uds == TDEIO::UDS_SIZE)
           {
              if (a.m_long < 0)
                 a.m_long += (TQ_LLONG) 1 << 32;
@@ -104,7 +104,7 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e )
 
 static const unsigned int max_nums = 8;
 
-class KIO::SlaveInterfacePrivate
+class TDEIO::SlaveInterfacePrivate
 {
 public:
   SlaveInterfacePrivate() {
@@ -120,9 +120,9 @@ public:
   struct timeval start_time;
   uint nums;
   long times[max_nums];
-  KIO::filesize_t sizes[max_nums];
+  TDEIO::filesize_t sizes[max_nums];
   size_t last_time;
-  KIO::filesize_t filesize, offset;
+  TDEIO::filesize_t filesize, offset;
 
   TQTimer speed_timer;
 };
@@ -146,16 +146,16 @@ SlaveInterface::~SlaveInterface()
     delete d;
 }
 
-static KIO::filesize_t readFilesize_t(TQDataStream &stream)
+static TDEIO::filesize_t readFilesize_t(TQDataStream &stream)
 {
-   KIO::filesize_t result;
+   TDEIO::filesize_t result;
    unsigned long ul;
    stream >> ul;
    result = ul;
    if (stream.atEnd())
       return result;
    stream >> ul;
-   result += ((KIO::filesize_t)ul) << 32;
+   result += ((TDEIO::filesize_t)ul) << 32;
    return result;
 }
 
@@ -199,7 +199,7 @@ void SlaveInterface::calcSpeed()
     d->times[d->nums] = diff;
     d->sizes[d->nums++] = d->filesize - d->offset;
 
-    KIO::filesize_t lspeed = 1000 * (d->sizes[d->nums-1] - d->sizes[0]) / (d->times[d->nums-1] - d->times[0]);
+    TDEIO::filesize_t lspeed = 1000 * (d->sizes[d->nums-1] - d->sizes[0]) / (d->times[d->nums-1] - d->times[0]);
 
 //     kdDebug() << "proceeed " << (long)d->filesize << " " << diff << " " 
 // 	      << long(d->sizes[d->nums-1] - d->sizes[0]) << " " 
@@ -293,7 +293,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
 
     case INF_TOTAL_SIZE:
 	{
-	    KIO::filesize_t size = readFilesize_t(stream);
+	    TDEIO::filesize_t size = readFilesize_t(stream);
 	    gettimeofday(&d->start_time, 0);
 	    d->last_time = 0;
 	    d->filesize = d->offset;
@@ -307,7 +307,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
 	break;
     case INF_PROCESSED_SIZE:
 	{
-	    KIO::filesize_t size = readFilesize_t(stream);
+	    TDEIO::filesize_t size = readFilesize_t(stream);
 	    emit processedSize( size );
 	    d->filesize = size;
 	}
@@ -423,12 +423,12 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata )
     return true;
 }
 
-void SlaveInterface::setOffset( KIO::filesize_t o)
+void SlaveInterface::setOffset( TDEIO::filesize_t o)
 {
     d->offset = o;
 }
 
-KIO::filesize_t SlaveInterface::offset() const { return d->offset; }
+TDEIO::filesize_t SlaveInterface::offset() const { return d->offset; }
 
 void SlaveInterface::requestNetwork(const TQString &host, const TQString &slaveid)
 {
@@ -510,7 +510,7 @@ void SlaveInterface::messageBox( int type, const TQString &text, const TQString
     TQDataStream stream( packedArgs, IO_WriteOnly );
 
     TQString caption( _caption );
-    if ( type == KIO::SlaveBase::SSLMessageBox )
+    if ( type == TDEIO::SlaveBase::SSLMessageBox )
         caption = TQString::fromUtf8(kapp->dcopClient()->appId()); // hack, see observer.cpp
 
     emit needProgressId();
diff --git a/kio/kio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h
index 9d278adfc..946efa291 100644
--- a/kio/kio/slaveinterface.h
+++ b/tdeio/tdeio/slaveinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_slaveinterface_h
-#define __kio_slaveinterface_h
+#ifndef __tdeio_slaveinterface_h
+#define __tdeio_slaveinterface_h
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -26,11 +26,11 @@
 #include <tqobject.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/authinfo.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
 #include <kdatastream.h>
 
-namespace KIO {
+namespace TDEIO {
 
 class Connection;
 // better there is one ...
@@ -85,12 +85,12 @@ class SlaveInterfacePrivate;
 
 /**
  * There are two classes that specifies the protocol between application
- * (KIO::Job) and kioslave. SlaveInterface is the class to use on the application
+ * (TDEIO::Job) and tdeioslave. SlaveInterface is the class to use on the application
  * end, SlaveBase is the one to use on the slave end.
  *
  * A call to foo() results in a call to slotFoo() on the other end.
  */
-class KIO_EXPORT SlaveInterface : public TQObject
+class TDEIO_EXPORT SlaveInterface : public TQObject
 {
     Q_OBJECT
 
@@ -109,8 +109,8 @@ public:
      */
     void sendResumeAnswer( bool resume );
 
-    void setOffset( KIO::filesize_t offset );
-    KIO::filesize_t offset() const;
+    void setOffset( TDEIO::filesize_t offset );
+    TDEIO::filesize_t offset() const;
 
 signals:
     ///////////
@@ -123,19 +123,19 @@ signals:
     void connected();
     void finished();
     void slaveStatus(pid_t, const TQCString &, const TQString &, bool);
-    void listEntries( const KIO::UDSEntryList& );
-    void statEntry( const KIO::UDSEntry& );
+    void listEntries( const TDEIO::UDSEntryList& );
+    void statEntry( const TDEIO::UDSEntry& );
     void needSubURLData();
     void needProgressId();
 
-    void canResume( KIO::filesize_t ) ;
+    void canResume( TDEIO::filesize_t ) ;
 
     ///////////
     // Info sent by the slave
     //////////
-    void metaData( const KIO::MetaData & );
-    void totalSize( KIO::filesize_t ) ;
-    void processedSize( KIO::filesize_t ) ;
+    void metaData( const TDEIO::MetaData & );
+    void totalSize( TDEIO::filesize_t ) ;
+    void processedSize( TDEIO::filesize_t ) ;
     void redirection( const KURL& ) ;
     void localURL( const KURL&, bool ) ;
 
@@ -172,7 +172,7 @@ protected:
     * using default values:
     *
     * \code
-    * KIO::AuthInfo authInfo;
+    * TDEIO::AuthInfo authInfo;
     * bool result = openPassDlg( authInfo );
     * if ( result )
     * {
@@ -203,7 +203,7 @@ protected:
      * @param       info See AuthInfo.
      * @return      true if user clicks on "OK", false otherwsie.
      */
-    void openPassDlg( KIO::AuthInfo& info );
+    void openPassDlg( TDEIO::AuthInfo& info );
 
    /**
     * @deprecated. Use openPassDlg( AuthInfo& ) instead.
@@ -252,16 +252,16 @@ private:
 
 }
 
-inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a )
+inline TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSAtom &a )
 {
     TQ_INT32 l;
     s >> a.m_uds;
 
-    if ( a.m_uds & KIO::UDS_LONG ) {
+    if ( a.m_uds & TDEIO::UDS_LONG ) {
         s >> l;
         a.m_long = l;
         a.m_str = TQString::null;
-    } else if ( a.m_uds & KIO::UDS_STRING ) {
+    } else if ( a.m_uds & TDEIO::UDS_STRING ) {
         s >> a.m_str;
         a.m_long = 0;
     } else {} // DIE!
@@ -270,13 +270,13 @@ inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a )
     return s;
 }
 
-inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a )
+inline TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSAtom &a )
 {
     s << a.m_uds;
 
-    if ( a.m_uds & KIO::UDS_LONG )
+    if ( a.m_uds & TDEIO::UDS_LONG )
         s << (TQ_INT32) a.m_long;
-    else if ( a.m_uds & KIO::UDS_STRING )
+    else if ( a.m_uds & TDEIO::UDS_STRING )
         s << a.m_str;
     else {} // DIE!
     //    assert( 0 );
@@ -284,7 +284,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a )
     return s;
 }
 
-KIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e );
-KIO_EXPORT TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e );
+TDEIO_EXPORT TQDataStream &operator <<(TQDataStream &s, const TDEIO::UDSEntry &e );
+TDEIO_EXPORT TQDataStream &operator >>(TQDataStream &s, TDEIO::UDSEntry &e );
 
 #endif
diff --git a/kio/kio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp
index 777f96e58..d7ef698c4 100644
--- a/kio/kio/statusbarprogress.cpp
+++ b/tdeio/tdeio/statusbarprogress.cpp
@@ -22,15 +22,15 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kprogress.h>
 
 #include "jobclasses.h"
 #include "statusbarprogress.h"
 
-namespace KIO {
+namespace TDEIO {
 
 StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button )
   : ProgressBase( parent ) {
@@ -71,7 +71,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button )
 }
 
 
-void StatusbarProgress::setJob( KIO::Job *job )
+void StatusbarProgress::setJob( TDEIO::Job *job )
 {
   ProgressBase::setJob( job );
 
@@ -118,20 +118,20 @@ void StatusbarProgress::slotClean() {
 }
 
 
-void StatusbarProgress::slotTotalSize( KIO::Job*, KIO::filesize_t size ) {
+void StatusbarProgress::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t size ) {
   m_iTotalSize = size;  // size is measured in bytes
 }
 
-void StatusbarProgress::slotPercent( KIO::Job*, unsigned long percent ) {
+void StatusbarProgress::slotPercent( TDEIO::Job*, unsigned long percent ) {
   m_pProgressBar->setValue( percent );
 }
 
 
-void StatusbarProgress::slotSpeed( KIO::Job*, unsigned long speed ) {
+void StatusbarProgress::slotSpeed( TDEIO::Job*, unsigned long speed ) {
   if ( speed == 0 ) { // spped is measured in bytes-per-second
     m_pLabel->setText( i18n( " Stalled ") );
   } else {
-    m_pLabel->setText( i18n( " %1/s ").arg( KIO::convertSize( speed )) );
+    m_pLabel->setText( i18n( " %1/s ").arg( TDEIO::convertSize( speed )) );
   }
 }
 
diff --git a/kio/kio/statusbarprogress.h b/tdeio/tdeio/statusbarprogress.h
index 6fb460283..d1d591fbe 100644
--- a/kio/kio/statusbarprogress.h
+++ b/tdeio/tdeio/statusbarprogress.h
@@ -27,7 +27,7 @@ class TQPushButton;
 class TQLabel;
 class KProgress;
 
-namespace KIO {
+namespace TDEIO {
 
 class Job;
 
@@ -49,7 +49,7 @@ class Job;
 * statusBar()->insertWidget( statusProgress, statusProgress->width() , 0 );
 * ...
 * // create job and connect it to the progress
-* CopyJob* job = KIO::copy(...);
+* CopyJob* job = TDEIO::copy(...);
 * statusProgress->setJob( job );
 * ...
 * \endcode
@@ -57,7 +57,7 @@ class Job;
 * @short IO progress widget for embedding in a statusbar.
 * @author Matej Koss <koss@miesto.sk>
 */
-class KIO_EXPORT StatusbarProgress : public ProgressBase {
+class TDEIO_EXPORT StatusbarProgress : public ProgressBase {
 
   Q_OBJECT
 
@@ -76,20 +76,20 @@ public:
    * Sets the job to monitor.
    * @param job the job to monitor
    */
-  void setJob( KIO::Job *job );
+  void setJob( TDEIO::Job *job );
 
 public slots:
   virtual void slotClean();
-  virtual void slotTotalSize( KIO::Job* job, KIO::filesize_t size );
-  virtual void slotPercent( KIO::Job* job, unsigned long percent );
-  virtual void slotSpeed( KIO::Job* job, unsigned long speed );
+  virtual void slotTotalSize( TDEIO::Job* job, TDEIO::filesize_t size );
+  virtual void slotPercent( TDEIO::Job* job, unsigned long percent );
+  virtual void slotSpeed( TDEIO::Job* job, unsigned long speed );
 
 protected:
   KProgress* m_pProgressBar;
   TQLabel* m_pLabel;
   TQPushButton* m_pButton;
 
-  KIO::filesize_t m_iTotalSize;
+  TDEIO::filesize_t m_iTotalSize;
 
   enum Mode { None, Label, Progress };
 
diff --git a/kio/kio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index 672cc0a5c..a0d9c86cb 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -43,24 +43,24 @@
 #include <kdebug.h>
 #include <ksslall.h>
 #include <ksslcertdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #ifndef Q_WS_WIN //temporary
 #include <kresolver.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kde_file.h>
 
-#include "kio/tcpslavebase.h"
+#include "tdeio/tcpslavebase.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 class TCPSlaveBase::TcpSlaveBasePrivate
 {
@@ -327,7 +327,7 @@ bool TCPSlaveBase::connectToHost( const TQString &host,
                                    "WarnOnLeaveSSLMode" );
 
            // Move this setting into KSSL instead
-          KConfig *config = new KConfig("kioslaverc");
+          TDEConfig *config = new TDEConfig("tdeioslaverc");
           config->setGroup("Notification Messages");
 
           if (!config->readBoolEntry("WarnOnLeaveSSLMode", true)) {
@@ -369,7 +369,7 @@ bool TCPSlaveBase::connectToHost( const TQString &host,
     m_iSock = ks.fd();
 
     // store the IP for later
-    const KSocketAddress *sa = ks.peerAddress();
+    const TDESocketAddress *sa = ks.peerAddress();
     if (sa)
       d->ip = sa->nodeName();
     else
@@ -630,8 +630,8 @@ KSSLCertificateHome::KSSLAuthAction aa;
     if (!d->dcc) {
         d->dcc = new DCOPClient;
         d->dcc->attach();
-        if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-           KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+        if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) {
+           TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",
                                                    TQStringList() );
         }
     }
@@ -642,7 +642,7 @@ KSSLCertificateHome::KSSLAuthAction aa;
      arg << ourHost;
      arg << certs;
      arg << metaData("window-id").toInt();
-     bool rc = d->dcc->call("kio_uiserver", "UIServer",
+     bool rc = d->dcc->call("tdeio_uiserver", "UIServer",
                                "showSSLCertDialog(TQString, TQStringList,int)",
                                data, rettype, retval);
 
@@ -671,7 +671,7 @@ KSSLCertificateHome::KSSLAuthAction aa;
   // We're almost committed.  If we can read the cert, we'll send it now.
   KSSLPKCS12 *pkcs = KSSLCertificateHome::getCertificateByName(certname);
   if (!pkcs && KSSLCertificateHome::hasCertificateByName(certname)) {           // We need the password
-     KIO::AuthInfo ai;
+     TDEIO::AuthInfo ai;
      bool first = true;
      do {
         ai.prompt = i18n("Enter the certificate password:");
@@ -894,8 +894,8 @@ int TCPSlaveBase::verifyCertificate()
                    if (!d->dcc) {
                       d->dcc = new DCOPClient;
                       d->dcc->attach();
-                      if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                         KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+                      if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) {
+                         TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",
                          TQStringList() );
                       }
 
@@ -905,8 +905,8 @@ int TCPSlaveBase::verifyCertificate()
                    TQDataStream arg(data, IO_WriteOnly);
                    arg << theurl << mOutgoingMetaData;
                    arg << metaData("window-id").toInt();
-                        d->dcc->call("kio_uiserver", "UIServer",
-                                "showSSLInfoDialog(TQString,KIO::MetaData,int)",
+                        d->dcc->call("tdeio_uiserver", "UIServer",
+                                "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                                 data, ignoretype, ignore);
                 }
              } while (result == KMessageBox::Yes);
@@ -1022,8 +1022,8 @@ int TCPSlaveBase::verifyCertificate()
                    if (!d->dcc) {
                       d->dcc = new DCOPClient;
                       d->dcc->attach();
-                      if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                         KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+                      if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) {
+                         TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",
                          TQStringList() );
                       }
                    }
@@ -1032,8 +1032,8 @@ int TCPSlaveBase::verifyCertificate()
                    TQDataStream arg(data, IO_WriteOnly);
                    arg << theurl << mOutgoingMetaData;
                    arg << metaData("window-id").toInt();
-                        d->dcc->call("kio_uiserver", "UIServer",
-                                "showSSLInfoDialog(TQString,KIO::MetaData,int)",
+                        d->dcc->call("tdeio_uiserver", "UIServer",
+                                "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                                 data, ignoretype, ignore);
                 }
           } while (result == KMessageBox::Yes);
@@ -1090,7 +1090,7 @@ int TCPSlaveBase::verifyCertificate()
                                                    i18n("C&onnect"),
                                                    "WarnOnEnterSSLMode" );
       // Move this setting into KSSL instead
-      KConfig *config = new KConfig("kioslaverc");
+      TDEConfig *config = new TDEConfig("tdeioslaverc");
       config->setGroup("Notification Messages");
 
       if (!config->readBoolEntry("WarnOnEnterSSLMode", true)) {
@@ -1106,8 +1106,8 @@ int TCPSlaveBase::verifyCertificate()
           if (!d->dcc) {
              d->dcc = new DCOPClient;
              d->dcc->attach();
-             if (!d->dcc->isApplicationRegistered("kio_uiserver")) {
-                KApplication::startServiceByDesktopPath("kio_uiserver.desktop",
+             if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) {
+                TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",
                 TQStringList() );
              }
           }
@@ -1116,8 +1116,8 @@ int TCPSlaveBase::verifyCertificate()
           TQDataStream arg(data, IO_WriteOnly);
           arg << theurl << mOutgoingMetaData;
           arg << metaData("window-id").toInt();
-          d->dcc->call("kio_uiserver", "UIServer",
-                       "showSSLInfoDialog(TQString,KIO::MetaData,int)",
+          d->dcc->call("tdeio_uiserver", "UIServer",
+                       "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                        data, ignoretype, ignore);
       }
       } while (result != KMessageBox::No);
diff --git a/kio/kio/tcpslavebase.h b/tdeio/tdeio/tcpslavebase.h
index fd148b00d..4903dd7ac 100644
--- a/kio/kio/tcpslavebase.h
+++ b/tdeio/tdeio/tcpslavebase.h
@@ -28,21 +28,21 @@
 #include <stdio.h>
 
 #include <kextsock.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 
-namespace KIO {
+namespace TDEIO {
 
 /**
  * There are two classes that specifies the protocol between application (job)
- * and kioslave. SlaveInterface is the class to use on the application end,
+ * and tdeioslave. SlaveInterface is the class to use on the application end,
  * SlaveBase is the one to use on the slave end.
  *
  * Slave implementations should simply inherit SlaveBase
  *
  * A call to foo() results in a call to slotFoo() on the other end.
  */
-class KIO_EXPORT TCPSlaveBase : public SlaveBase
+class TDEIO_EXPORT TCPSlaveBase : public SlaveBase
 {
 public:
     TCPSlaveBase(unsigned short int defaultPort, const TQCString &protocol,
diff --git a/kio/kio/kemailsettings.cpp b/tdeio/tdeio/tdeemailsettings.cpp
index 2f1ffe7a0..bd46d8708 100644
--- a/kio/kio/kemailsettings.cpp
+++ b/tdeio/tdeio/tdeemailsettings.cpp
@@ -26,17 +26,17 @@
  *	$Id$
  */
 
-#include "kemailsettings.h"
+#include "tdeemailsettings.h"
 
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 class KEMailSettingsPrivate {
 public:
     KEMailSettingsPrivate() : m_pConfig( 0 ) {}
     ~KEMailSettingsPrivate() { delete m_pConfig; }
-	KConfig *m_pConfig;
+	TDEConfig *m_pConfig;
 	TQStringList profiles;
 	TQString m_sDefaultProfile, m_sCurrentProfile;
 };
@@ -242,7 +242,7 @@ KEMailSettings::KEMailSettings()
 	p = new KEMailSettingsPrivate();
 	p->m_sCurrentProfile=TQString::null;
 
-	p->m_pConfig = new KConfig("emaildefaults");
+	p->m_pConfig = new TDEConfig("emaildefaults");
 
 	TQStringList groups = p->m_pConfig->groupList();
 	for (TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it) {
diff --git a/kio/kio/kemailsettings.h b/tdeio/tdeio/tdeemailsettings.h
index 9d35675c6..0ade4520e 100644
--- a/kio/kio/kemailsettings.h
+++ b/tdeio/tdeio/tdeemailsettings.h
@@ -43,7 +43,7 @@ class KEMailSettingsPrivate;
   *
   * @author Alex Zepeda zipzippy@sonic.net
   **/
-class KIO_EXPORT KEMailSettings {
+class TDEIO_EXPORT KEMailSettings {
 public:
 	/**
 	  * The list of settings that I thought of when I wrote this 
diff --git a/kio/kio/kfilefilter.cpp b/tdeio/tdeio/tdefilefilter.cpp
index 05c53c02c..c1663c2e8 100644
--- a/kio/kio/kfilefilter.cpp
+++ b/tdeio/tdeio/tdefilefilter.cpp
@@ -20,10 +20,10 @@
 
 #include <tqregexp.h>
 
-#include <kfileitem.h>
-#include <kglobal.h>
+#include <tdefileitem.h>
+#include <tdeglobal.h>
 
-#include "kfilefilter.h"
+#include "tdefilefilter.h"
 
 KSimpleFileFilter::KSimpleFileFilter()
     : m_filterDotFiles( true ),
@@ -79,8 +79,8 @@ void KSimpleFileFilter::setModeFilter( mode_t mode )
 
 bool KSimpleFileFilter::passesFilter( const KFileItem *item ) const
 {
-    static const TQString& dot    = KGlobal::staticQString(".");
-    static const TQString& dotdot = KGlobal::staticQString("..");
+    static const TQString& dot    = TDEGlobal::staticQString(".");
+    static const TQString& dotdot = TDEGlobal::staticQString("..");
 
     const TQString& name = item->name();
 
diff --git a/kio/kio/kfilefilter.h b/tdeio/tdeio/tdefilefilter.h
index b17d2fe74..c6b396785 100644
--- a/kio/kio/kfilefilter.h
+++ b/tdeio/tdeio/tdefilefilter.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFILEFILTER_H
-#define KFILEFILTER_H
+#ifndef TDEFILEFILTER_H
+#define TDEFILEFILTER_H
 
 #include <tqptrlist.h>
 #include <tqstringlist.h>
@@ -38,7 +38,7 @@ class KFileItem;
  * reimplement passesFilter().
  * @short Base class for file filters.
  */
-class KIO_EXPORT KFileFilter
+class TDEIO_EXPORT KFileFilter
 {
 public:
     /**
@@ -56,7 +56,7 @@ protected:
  * by mime type and by mode.
  * @short A simple file filter.
  */
-class KIO_EXPORT KSimpleFileFilter : public KFileFilter
+class TDEIO_EXPORT KSimpleFileFilter : public KFileFilter
 {
 public:
     /**
@@ -167,4 +167,4 @@ private:
     class KSimpleFileFilterPrivate* d;
 };
 
-#endif // KFILEFILTER_H
+#endif // TDEFILEFILTER_H
diff --git a/kio/kio/kfileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index cf903f712..378cd5f0a 100644
--- a/kio/kio/kfileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include "kfileitem.h"
+#include "tdefileitem.h"
 
 #include <tqdir.h>
 #include <tqfile.h>
@@ -38,14 +38,14 @@
 #include <tqimage.h>
 
 #include <kdebug.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <ksambashare.h>
 #include <knfsshare.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <klargefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <krun.h>
 
@@ -58,7 +58,7 @@ class KFileItem::KFileItemPrivate {
 		TQString iconName;
 };
 
-KFileItem::KFileItem( const KIO::UDSEntry& _entry, const KURL& _url,
+KFileItem::KFileItem( const TDEIO::UDSEntry& _entry, const KURL& _url,
                       bool _determineMimeTypeOnDemand, bool _urlIsDirectory ) :
   m_entry( _entry ),
   m_url( _url ),
@@ -80,7 +80,7 @@ KFileItem::KFileItem( mode_t _mode, mode_t _permissions, const KURL& _url, bool
   m_entry(), // warning !
   m_url( _url ),
   m_strName( _url.fileName() ),
-  m_strText( KIO::decodeFileName( m_strName ) ),
+  m_strText( TDEIO::decodeFileName( m_strName ) ),
   m_pMimeType( 0 ),
   m_fileMode ( _mode ),
   m_permissions( _permissions ),
@@ -97,7 +97,7 @@ KFileItem::KFileItem( mode_t _mode, mode_t _permissions, const KURL& _url, bool
 KFileItem::KFileItem( const KURL &url, const TQString &mimeType, mode_t mode )
 :  m_url( url ),
   m_strName( url.fileName() ),
-  m_strText( KIO::decodeFileName( m_strName ) ),
+  m_strText( TDEIO::decodeFileName( m_strName ) ),
   m_pMimeType( 0 ),
   m_fileMode( mode ),
   m_permissions( KFileItem::Unknown ),
@@ -134,7 +134,7 @@ KFileItem::~KFileItem()
 void KFileItem::init( bool _determineMimeTypeOnDemand )
 {
   m_access = TQString::null;
-  m_size = (KIO::filesize_t) -1;
+  m_size = (TDEIO::filesize_t) -1;
   //  metaInfo = KFileMetaInfo();
   for ( int i = 0; i < NumFlags; i++ )
       m_time[i] = (time_t) -1;
@@ -162,7 +162,7 @@ void KFileItem::init( bool _determineMimeTypeOnDemand )
           m_bLink = true;
           if ( KDE_stat( path.data(), &buf ) == 0 )
               mode = buf.st_mode;
-          else // link pointing to nowhere (see kio/file/file.cc)
+          else // link pointing to nowhere (see tdeio/file/file.cc)
               mode = (S_IFMT-1) | S_IRWXU | S_IRWXG | S_IRWXO;
         }
         // While we're at it, store the times
@@ -195,63 +195,63 @@ void KFileItem::init( bool _determineMimeTypeOnDemand )
 
 void KFileItem::readUDSEntry( bool _urlIsDirectory )
 {
-  // extract the mode and the filename from the KIO::UDS Entry
+  // extract the mode and the filename from the TDEIO::UDS Entry
   bool UDS_URL_seen = false;
 
   if (&m_entry == NULL) return;
 
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it ) {
     switch ((*it).m_uds) {
 
-      case KIO::UDS_FILE_TYPE:
+      case TDEIO::UDS_FILE_TYPE:
         m_fileMode = (mode_t)((*it).m_long);
         break;
 
-      case KIO::UDS_ACCESS:
+      case TDEIO::UDS_ACCESS:
         m_permissions = (mode_t)((*it).m_long);
         break;
 
-      case KIO::UDS_USER:
+      case TDEIO::UDS_USER:
         m_user = ((*it).m_str);
         break;
 
-      case KIO::UDS_GROUP:
+      case TDEIO::UDS_GROUP:
         m_group = ((*it).m_str);
         break;
 
-      case KIO::UDS_NAME:
+      case TDEIO::UDS_NAME:
         m_strName = (*it).m_str;
-        m_strText = KIO::decodeFileName( m_strName );
+        m_strText = TDEIO::decodeFileName( m_strName );
         break;
 
-      case KIO::UDS_URL:
+      case TDEIO::UDS_URL:
         UDS_URL_seen = true;
         m_url = KURL((*it).m_str);
         if ( m_url.isLocalFile() )
            m_bIsLocalURL = true;
         break;
 
-      case KIO::UDS_MIME_TYPE:
+      case TDEIO::UDS_MIME_TYPE:
         m_pMimeType = KMimeType::mimeType((*it).m_str);
         m_bMimeTypeKnown = true;
         break;
 
-      case KIO::UDS_GUESSED_MIME_TYPE:
+      case TDEIO::UDS_GUESSED_MIME_TYPE:
         m_guessedMimeType = (*it).m_str;
         break;
 
-      case KIO::UDS_LINK_DEST:
+      case TDEIO::UDS_LINK_DEST:
         m_bLink = !(*it).m_str.isEmpty(); // we don't store the link dest
         break;
 
-      case KIO::UDS_ICON_NAME:
+      case TDEIO::UDS_ICON_NAME:
         if ( !d )
           d = new KFileItemPrivate();
         d->iconName = (*it).m_str;
         break;
 
-      case KIO::UDS_HIDDEN:
+      case TDEIO::UDS_HIDDEN:
         if ( (*it).m_long )
           m_hidden = Hidden;
         else
@@ -261,7 +261,7 @@ void KFileItem::readUDSEntry( bool _urlIsDirectory )
   }
 
   // avoid creating these QStrings again and again
-  static const TQString& dot = KGlobal::staticQString(".");
+  static const TQString& dot = TDEGlobal::staticQString(".");
   if ( _urlIsDirectory && !UDS_URL_seen && !m_strName.isEmpty() && m_strName != dot )
     m_url.addPath( m_strName );
 }
@@ -280,7 +280,7 @@ void KFileItem::refresh()
   // Everything could have changed...
   // Clearing m_entry makes it possible to detect changes in the size of the file,
   // the time information, etc.
-  m_entry = KIO::UDSEntry();
+  m_entry = TDEIO::UDSEntry();
   init( false );
 }
 
@@ -299,19 +299,19 @@ void KFileItem::setURL( const KURL &url )
 void KFileItem::setName( const TQString& name )
 {
   m_strName = name;
-  m_strText = KIO::decodeFileName( m_strName );
+  m_strText = TDEIO::decodeFileName( m_strName );
 }
 
 TQString KFileItem::linkDest() const
 {
   if (&m_entry == NULL) return TQString::null;
 
-  // Extract it from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  // Extract it from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it )
-    if ( (*it).m_uds == KIO::UDS_LINK_DEST )
+    if ( (*it).m_uds == TDEIO::UDS_LINK_DEST )
       return (*it).m_str;
-  // If not in the KIO::UDSEntry, or if UDSEntry empty, use readlink() [if local URL]
+  // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use readlink() [if local URL]
   if ( m_bIsLocalURL )
   {
     char buf[1000];
@@ -335,33 +335,33 @@ TQString KFileItem::localPath() const
   {
     if (&m_entry == NULL) return TQString::null;
 
-    // Extract the local path from the KIO::UDSEntry
-    KIO::UDSEntry::ConstIterator it = m_entry.begin();
-    const KIO::UDSEntry::ConstIterator end = m_entry.end();
+    // Extract the local path from the TDEIO::UDSEntry
+    TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
+    const TDEIO::UDSEntry::ConstIterator end = m_entry.end();
     for( ; it != end; ++it )
-      if ( (*it).m_uds == KIO::UDS_LOCAL_PATH )
+      if ( (*it).m_uds == TDEIO::UDS_LOCAL_PATH )
         return (*it).m_str;
   }
 
   return TQString::null;
 }
 
-KIO::filesize_t KFileItem::size(bool &exists) const
+TDEIO::filesize_t KFileItem::size(bool &exists) const
 {
   exists = true;
-  if ( m_size != (KIO::filesize_t) -1 )
+  if ( m_size != (TDEIO::filesize_t) -1 )
     return m_size;
 
   if (&m_entry == NULL) return 0L;
 
-  // Extract it from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  // Extract it from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it )
-    if ( (*it).m_uds == KIO::UDS_SIZE ) {
+    if ( (*it).m_uds == TDEIO::UDS_SIZE ) {
       m_size = (*it).m_long;
       return m_size;
     }
-  // If not in the KIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL]
+  // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL]
   if ( m_bIsLocalURL )
   {
     KDE_struct_stat buf;
@@ -375,9 +375,9 @@ KIO::filesize_t KFileItem::size(bool &exists) const
 bool KFileItem::hasExtendedACL() const
 {
   if (&m_entry == NULL) return false;
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); it++ )
-    if ( (*it).m_uds == KIO::UDS_EXTENDED_ACL ) {
+    if ( (*it).m_uds == TDEIO::UDS_EXTENDED_ACL ) {
       return true;
     }
   return false;
@@ -388,10 +388,10 @@ KACL KFileItem::ACL() const
   if ( hasExtendedACL() ) {
     if (&m_entry == NULL) return KACL( m_permissions );
 
-    // Extract it from the KIO::UDSEntry
-    KIO::UDSEntry::ConstIterator it = m_entry.begin();
+    // Extract it from the TDEIO::UDSEntry
+    TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
     for( ; it != m_entry.end(); ++it )
-      if ( (*it).m_uds == KIO::UDS_ACL_STRING )
+      if ( (*it).m_uds == TDEIO::UDS_ACL_STRING )
         return KACL((*it).m_str);
   }
   // create one from the basic permissions
@@ -402,15 +402,15 @@ KACL KFileItem::defaultACL() const
 {
   if (&m_entry == NULL) return KACL();
 
-  // Extract it from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  // Extract it from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it )
-    if ( (*it).m_uds == KIO::UDS_DEFAULT_ACL_STRING )
+    if ( (*it).m_uds == TDEIO::UDS_DEFAULT_ACL_STRING )
       return KACL((*it).m_str);
   return KACL();
 }
 
-KIO::filesize_t KFileItem::size() const
+TDEIO::filesize_t KFileItem::size() const
 {
   bool exists;
   return size(exists);
@@ -427,13 +427,13 @@ time_t KFileItem::time( unsigned int which, bool &hasTime ) const
   unsigned int mappedWhich = 0;
 
   switch( which ) {
-    case KIO::UDS_MODIFICATION_TIME:
+    case TDEIO::UDS_MODIFICATION_TIME:
       mappedWhich = Modification;
       break;
-    case KIO::UDS_ACCESS_TIME:
+    case TDEIO::UDS_ACCESS_TIME:
       mappedWhich = Access;
       break;
-    case KIO::UDS_CREATION_TIME:
+    case TDEIO::UDS_CREATION_TIME:
       mappedWhich = Creation;
       break;
   }
@@ -443,29 +443,29 @@ time_t KFileItem::time( unsigned int which, bool &hasTime ) const
 
   if (&m_entry == NULL) return static_cast<time_t>(0);
 
-  // Extract it from the KIO::UDSEntry
-  KIO::UDSEntry::ConstIterator it = m_entry.begin();
+  // Extract it from the TDEIO::UDSEntry
+  TDEIO::UDSEntry::ConstIterator it = m_entry.begin();
   for( ; it != m_entry.end(); ++it )
     if ( (*it).m_uds == which ) {
       m_time[mappedWhich] = static_cast<time_t>((*it).m_long);
       return m_time[mappedWhich];
     }
 
-  // If not in the KIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL]
+  // If not in the TDEIO::UDSEntry, or if UDSEntry empty, use stat() [if local URL]
   if ( m_bIsLocalURL )
   {
     KDE_struct_stat buf;
     if ( KDE_stat( TQFile::encodeName(m_url.path(-1)), &buf ) == 0 )
     {
-	if(which == KIO::UDS_CREATION_TIME) {
+	if(which == TDEIO::UDS_CREATION_TIME) {
 	    // We can't determine creation time for local files
 	    hasTime = false;
             m_time[mappedWhich] = static_cast<time_t>(0);
 	    return m_time[mappedWhich];
 	}
-        m_time[mappedWhich] = (which == KIO::UDS_MODIFICATION_TIME) ?
+        m_time[mappedWhich] = (which == TDEIO::UDS_MODIFICATION_TIME) ?
                                buf.st_mtime :
-                               /* which == KIO::UDS_ACCESS_TIME)*/
+                               /* which == TDEIO::UDS_ACCESS_TIME)*/
 			       buf.st_atime;
         return m_time[mappedWhich];
     }
@@ -570,14 +570,14 @@ int KFileItem::overlays() const
 {
   int _state = 0;
   if ( m_bLink )
-      _state |= KIcon::LinkOverlay;
+      _state |= TDEIcon::LinkOverlay;
 
   if ( !S_ISDIR( m_fileMode ) // Locked dirs have a special icon, use the overlay for files only
        && !isReadable())
-     _state |= KIcon::LockOverlay;
+     _state |= TDEIcon::LockOverlay;
 
   if ( isHidden() )
-     _state |= KIcon::HiddenOverlay;
+     _state |= TDEIcon::HiddenOverlay;
 
   if( S_ISDIR( m_fileMode ) && m_bIsLocalURL)
   {
@@ -585,12 +585,12 @@ int KFileItem::overlays() const
         KNFSShare::instance()->isDirectoryShared( m_url.path() ))
     {
       //kdDebug()<<"KFileShare::isDirectoryShared : "<<m_url.path()<<endl;
-      _state |= KIcon::ShareOverlay;
+      _state |= TDEIcon::ShareOverlay;
     }
   }
 
   if ( m_pMimeType->name() == "application/x-gzip" && m_url.fileName().right(3) == ".gz" )
-     _state |= KIcon::ZipOverlay;
+     _state |= TDEIcon::ZipOverlay;
   return _state;
 }
 
@@ -602,7 +602,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
   if ( !m_pMimeType )
   {
     static const TQString & defaultFolderIcon =
-       KGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon());
+       TDEGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon());
 
     if ( S_ISDIR( m_fileMode ) )
      return DesktopIcon( defaultFolderIcon, _size, _state );
@@ -632,7 +632,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
   bool isLocalURL;
   KURL url = mostLocalURL(isLocalURL);
 
-  TQPixmap p = mime->pixmap( url, KIcon::Desktop, _size, _state );
+  TQPixmap p = mime->pixmap( url, TDEIcon::Desktop, _size, _state );
   //kdDebug() << "finding pixmap for " << url.url() << " : " << mime->name() << endl;
   if (p.isNull())
       kdWarning() << "Pixmap not found for mimetype " << m_pMimeType->name() << endl;
@@ -672,7 +672,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
 		// See if there is a system icon we can use
 		TQString sysIconName = elf_get_resource(handle, ".metadata_sysicon");
 		if (!sysIconName.isEmpty()) {
-			if (KGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") {
+			if (TDEGlobal::iconLoader()->iconPath(sysIconName.ascii(), 0, true) != "") {
 				p = DesktopIcon( sysIconName.ascii(), _size, _state );
 			}
 		}
@@ -688,7 +688,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
 				// Try loading this icon as fallback
 				icon = libr_icon_geticon_byname(handle, entry->name);
 			}
-			if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") {
+			if (TDEGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") {
 				iconresnamefound = 1;
 				p = DesktopIcon( entry->name, _size, _state );
 				break;
@@ -843,9 +843,9 @@ TQString KFileItem::getStatusBarInfo()
   else if ( S_ISREG( m_fileMode ) )
   {
       bool hasSize;
-      KIO::filesize_t sizeValue = size(hasSize);
+      TDEIO::filesize_t sizeValue = size(hasSize);
       if(hasSize)
-        text += TQString(" (%1)  ").arg( KIO::convertSize( sizeValue ) );
+        text += TQString(" (%1)  ").arg( TDEIO::convertSize( sizeValue ) );
       text += mimeComment();
   }
   else if ( S_ISDIR ( m_fileMode ) )
@@ -887,12 +887,12 @@ TQString KFileItem::getToolTipText(int maxcount)
 
   if ( !S_ISDIR ( m_fileMode ) ) {
     bool hasSize;
-    KIO::filesize_t sizeValue = size(hasSize);
+    TDEIO::filesize_t sizeValue = size(hasSize);
     if(hasSize)
       tip += start + i18n("Size:") + mid +
-             KIO::convertSizeWithBytes(sizeValue) + end;
+             TDEIO::convertSizeWithBytes(sizeValue) + end;
   }
-  TQString timeStr = timeString( KIO::UDS_MODIFICATION_TIME);
+  TQString timeStr = timeString( TDEIO::UDS_MODIFICATION_TIME);
   if(!timeStr.isEmpty())
     tip += start + i18n("Modified:") + mid +
            timeStr + end;
@@ -966,7 +966,7 @@ bool KFileItem::cmp( const KFileItem & item )
              && m_hidden == item.m_hidden
              && size(hasSize1) == item.size(hasSize2)
 	     && hasSize1 == hasSize2
-             && time(KIO::UDS_MODIFICATION_TIME, hasTime1) == item.time(KIO::UDS_MODIFICATION_TIME, hasTime2)
+             && time(TDEIO::UDS_MODIFICATION_TIME, hasTime1) == item.time(TDEIO::UDS_MODIFICATION_TIME, hasTime2)
 	     && hasTime1 == hasTime2
              && (!d || !item.d || d->iconName == item.d->iconName) );
 
@@ -1014,7 +1014,7 @@ void KFileItem::assign( const KFileItem & item )
     }
 }
 
-void KFileItem::setUDSEntry( const KIO::UDSEntry& _entry, const KURL& _url,
+void KFileItem::setUDSEntry( const TDEIO::UDSEntry& _entry, const KURL& _url,
     bool _determineMimeTypeOnDemand, bool _urlIsDirectory )
 {
   m_entry = _entry;
@@ -1137,7 +1137,7 @@ TQString KFileItem::timeString( unsigned int which ) const
 
     TQDateTime t;
     t.setTime_t( time_);
-    return KGlobal::locale()->formatDateTime( t );
+    return TDEGlobal::locale()->formatDateTime( t );
 }
 
 void KFileItem::setMetaInfo( const KFileMetaInfo & info )
@@ -1151,7 +1151,7 @@ const KFileMetaInfo & KFileItem::metaInfo(bool autoget, int) const
     KURL url = mostLocalURL(isLocalURL);
 
     if ( autoget && !m_metaInfo.isValid() &&
-         KGlobalSettings::showFilePreview(url) )
+         TDEGlobalSettings::showFilePreview(url) )
     {
         m_metaInfo = KFileMetaInfo( url, mimetype() );
     }
diff --git a/kio/kio/kfileitem.h b/tdeio/tdeio/tdefileitem.h
index cf6344669..95207a537 100644
--- a/kio/kio/kfileitem.h
+++ b/tdeio/tdeio/tdefileitem.h
@@ -17,35 +17,35 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kfileitem_h__
-#define __kfileitem_h__
+#ifndef __tdefileitem_h__
+#define __tdefileitem_h__
 
 #include <tqstringlist.h>
 #include <sys/stat.h>
 
 #include <tqptrlist.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <kacl.h>
 #include <kmimetype.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
-#define KFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cc, will be removed for 3.4
+#define TDEFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cc, will be removed for 3.4
 
 /**
  * A KFileItem is a generic class to handle a file, local or remote.
- * In particular, it makes it easier to handle the result of KIO::listDir
+ * In particular, it makes it easier to handle the result of TDEIO::listDir
  * (UDSEntry isn't very friendly to use).
  * It includes many file attributes such as mimetype, icon, text, mode, link...
  */
-class KIO_EXPORT KFileItem
+class TDEIO_EXPORT KFileItem
 {
 public:
   enum { Unknown = (mode_t) - 1 };
 
   /**
    * Creates an item representing a file, from a UDSEntry.
-   * This is the preferred constructor when using KIO::listDir().
+   * This is the preferred constructor when using TDEIO::listDir().
    *
    * @param _entry the KIO entry used to get the file, contains info about it
    * @param _url the file url
@@ -54,7 +54,7 @@ public:
    * @param _urlIsDirectory specifies if the url is just the directory of the
    *       fileitem and the filename from the UDSEntry should be used.
    */
-  KFileItem( const KIO::UDSEntry& _entry, const KURL& _url,
+  KFileItem( const TDEIO::UDSEntry& _entry, const KURL& _url,
              bool _determineMimeTypeOnDemand = false,
              bool _urlIsDirectory = false );
 
@@ -239,14 +239,14 @@ public:
    * Returns the size of the file, if known.
    * @return the file size, or 0 if not known
    */
-  KIO::filesize_t size() const;
+  TDEIO::filesize_t size() const;
 
   /**
    * Returns the size of the file, if known, and sets @p hasSize to false if not known
    * @param @hasSize This is set to true if the size is known, and false if not known
    * @return the file size, or 0 if not known
    */ 
-  KIO::filesize_t size(bool &hasSize) const;
+  TDEIO::filesize_t size(bool &hasSize) const;
   
   //FIXME KDE4 deprecate this in favor of time(unsigned int which, bool &hasSize)
   /**
@@ -273,7 +273,7 @@ public:
    * @returns a formatted string of the requested time, TQString::null if time is not known
    * @see time
    */
-  TQString timeString( unsigned int which = KIO::UDS_MODIFICATION_TIME ) const;
+  TQString timeString( unsigned int which = TDEIO::UDS_MODIFICATION_TIME ) const;
 
   /**
    * Returns true if the file is a local file.
@@ -346,14 +346,14 @@ public:
    * Returns a pixmap representing the file.
    * @param _size Size for the pixmap in pixels. Zero will return the
    * globally configured default size.
-   * @param _state The state of the icon: KIcon::DefaultState,
-   * KIcon::ActiveState or KIcon::DisabledState.
+   * @param _state The state of the icon: TDEIcon::DefaultState,
+   * TDEIcon::ActiveState or TDEIcon::DisabledState.
    * @return the pixmap
    */
   TQPixmap pixmap( int _size, int _state=0 ) const;
 
   /**
-   * Returns the overlays (bitfield of KIcon::*Overlay flags) that are used
+   * Returns the overlays (bitfield of TDEIcon::*Overlay flags) that are used
    * for this item's pixmap. Overlays are used to show for example, whether
    * a file can be modified.
    * @return the overlays of the pixmap
@@ -396,7 +396,7 @@ public:
    * by position.
    * @return the UDS entry
    */
-  const KIO::UDSEntry & entry() const { return m_entry; }
+  const TDEIO::UDSEntry & entry() const { return m_entry; }
 
   /**
    * Used when updating a directory. marked == seen when refreshing.
@@ -434,13 +434,13 @@ public:
    * for use with TQIconView) does
    *
    * \code
-   * kfileItem->setExtraData( this, iconViewItem );
+   * tdefileItem->setExtraData( this, iconViewItem );
    * \endcode
    *
    * and can later access the iconViewItem by doing
    *
    * \code
-   * KFileIconViewItem *iconViewItem = static_cast<KFileIconViewItem*>( kfileItem->extraData( this ));
+   * KFileIconViewItem *iconViewItem = static_cast<KFileIconViewItem*>( tdefileItem->extraData( this ));
    * \endcode
    *
    * This is usually more efficient then having every view associate data to
@@ -536,7 +536,7 @@ public:
    *        fileitem and the filename from the UDSEntry should be used.
    * @since 3.4.1
    */
-  void setUDSEntry( const KIO::UDSEntry& entry, const KURL& url,
+  void setUDSEntry( const TDEIO::UDSEntry& entry, const KURL& url,
                     bool determineMimeTypeOnDemand = false,
                     bool urlIsDirectory = false );
 
@@ -576,7 +576,7 @@ private:
   /**
    * We keep a copy of the UDSEntry since we need it for getStatusBarInfo
    */
-  KIO::UDSEntry m_entry;
+  TDEIO::UDSEntry m_entry;
   /**
    * The url of the file
    */
@@ -643,15 +643,15 @@ private:
 
   enum { Modification = 0, Access = 1, Creation = 2, NumFlags = 3 };
   mutable time_t m_time[3];
-  mutable KIO::filesize_t m_size;
+  mutable TDEIO::filesize_t m_size;
 
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
   class KFileItemPrivate;
   KFileItemPrivate * d;
-  KIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a );
-  KIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KFileItem & a );
+  TDEIO_EXPORT friend TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a );
+  TDEIO_EXPORT friend TQDataStream & operator>> ( TQDataStream & s, KFileItem & a );
 };
 
 /**
@@ -664,8 +664,8 @@ typedef TQPtrList<KFileItem> KFileItemList;
  */
 typedef TQPtrListIterator<KFileItem> KFileItemListIterator;
 
-KIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a );
-KIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KFileItem & a );
+TDEIO_EXPORT TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a );
+TDEIO_EXPORT TQDataStream & operator>> ( TQDataStream & s, KFileItem & a );
 
 
 #endif
diff --git a/kio/kio/kfilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp
index d04a22ca1..c1389695d 100644
--- a/kio/kio/kfilemetainfo.cpp
+++ b/tdeio/tdeio/tdefilemetainfo.cpp
@@ -27,15 +27,15 @@
 
 #include <ktrader.h>
 #include <kstaticdeleter.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kuserprofile.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <kdatastream.h> // needed for serialization of bool
-#include <klocale.h>
-#include <kio/global.h>
+#include <tdelocale.h>
+#include <tdeio/global.h>
 
-#include "kfilemetainfo.h"
+#include "tdefilemetainfo.h"
 
 // shared data of a KFileMetaInfoItem
 class KFileMetaInfoItem::Data : public TQShared
@@ -942,7 +942,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const
         queryMimeType = "KFilePlugin";
         // hopefully using KFilePlugin as genericMimeType too isn't a problem
     }
-    const KTrader::OfferList offers = KTrader::self()->query( queryMimeType, "KFilePlugin", query, TQString::null );
+    const TDETrader::OfferList offers = TDETrader::self()->query( queryMimeType, "KFilePlugin", query, TQString::null );
     if ( offers.isEmpty() )
         return 0;
     KService::Ptr service = *(offers.begin());
@@ -1120,17 +1120,17 @@ KFileMimeTypeInfo * KFileMetaInfoProvider::addMimeTypeInfo(
 TQStringList KFileMetaInfoProvider::supportedMimeTypes() const
 {
     TQStringList allMimeTypes;
-    TQString kfilePlugin = "KFilePlugin";
+    TQString tdefilePlugin = "KFilePlugin";
 
-    KTrader::OfferList offers = KTrader::self()->query( "KFilePlugin" );
-    KTrader::OfferListIterator it = offers.begin();
+    TDETrader::OfferList offers = TDETrader::self()->query( "KFilePlugin" );
+    TDETrader::OfferListIterator it = offers.begin();
     for ( ; it != offers.end(); ++it )
     {
         const TQStringList mimeTypes = (*it)->serviceTypes();
         TQStringList::ConstIterator it2 = mimeTypes.begin();
         for ( ; it2 != mimeTypes.end(); ++it2 )
             if ( allMimeTypes.find( *it2 ) == allMimeTypes.end() &&
-                 *it2 != kfilePlugin ) // also in serviceTypes()
+                 *it2 != tdefilePlugin ) // also in serviceTypes()
                 allMimeTypes.append( *it2 );
     }
 
@@ -1626,48 +1626,48 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle
             else if (unit() == KFileMimeTypeInfo::Bytes)
             {
                 // convertSize already adds the correct suffix
-                return KIO::convertSize(value.toInt());
+                return TDEIO::convertSize(value.toInt());
             }
             else if (unit() == KFileMimeTypeInfo::KiloBytes)
             {
                 // convertSizeFromKB already adds the correct suffix
-                return KIO::convertSizeFromKB(value.toInt());
+                return TDEIO::convertSizeFromKB(value.toInt());
             }
             else
-                s = KGlobal::locale()->formatNumber( value.toInt() , 0);
+                s = TDEGlobal::locale()->formatNumber( value.toInt() , 0);
             break;
 
         case TQVariant::LongLong :
-            s = KGlobal::locale()->formatNumber( value.toLongLong(), 0 );
+            s = TDEGlobal::locale()->formatNumber( value.toLongLong(), 0 );
             break;
 
 	case TQVariant::ULongLong :
             if ( unit() == KFileMimeTypeInfo::Bytes )
-                return KIO::convertSize( value.toULongLong() );
+                return TDEIO::convertSize( value.toULongLong() );
             else if ( unit() == KFileMimeTypeInfo::KiloBytes )
-                return KIO::convertSizeFromKB( value.toULongLong() );
+                return TDEIO::convertSizeFromKB( value.toULongLong() );
             else
-                s = KGlobal::locale()->formatNumber( value.toULongLong(), 0 );
+                s = TDEGlobal::locale()->formatNumber( value.toULongLong(), 0 );
             break;
 
         case TQVariant::UInt :
-            s = KGlobal::locale()->formatNumber( value.toUInt() , 0);
+            s = TDEGlobal::locale()->formatNumber( value.toUInt() , 0);
             break;
 
         case TQVariant::Double :
-            s = KGlobal::locale()->formatNumber( value.toDouble(), 3);
+            s = TDEGlobal::locale()->formatNumber( value.toDouble(), 3);
             break;
 
         case TQVariant::Date :
-            s = KGlobal::locale()->formatDate( value.toDate(), true );
+            s = TDEGlobal::locale()->formatDate( value.toDate(), true );
             break;
 
         case TQVariant::Time :
-            s = KGlobal::locale()->formatTime( value.toTime(), true );
+            s = TDEGlobal::locale()->formatTime( value.toTime(), true );
             break;
 
         case TQVariant::DateTime :
-            s = KGlobal::locale()->formatDateTime( value.toDateTime(),
+            s = TDEGlobal::locale()->formatDateTime( value.toDateTime(),
                                                    true, true );
             break;
 
@@ -1705,7 +1705,7 @@ TQString KFileMimeTypeInfo::ItemInfo::string(const TQVariant& value, bool mangle
    first a bool that says if the items is valid, and if yes,
    all the elements of the Data
 */
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& item )
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& item )
 {
 
      KFileMetaInfoItem::Data* d = item.d;
@@ -1725,7 +1725,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& i
 }
 
 
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item )
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item )
 {
      bool isValid;
      s >> isValid;
@@ -1758,7 +1758,7 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& item )
 // serialization of a KFileMetaInfoGroup
 // we serialize the name of the mimetype here instead of the mimetype info
 // on the other side, we can simply use this to ask the provider for the info
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& group )
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& group )
 {
     KFileMetaInfoGroup::Data* d = group.d;
 
@@ -1775,7 +1775,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup&
     return s;
 }
 
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group )
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group )
 {
     TQString mimeType;
     bool isValid;
@@ -1812,7 +1812,7 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& group
 // serialization of a KFileMetaInfo object
 // we serialize the name of the mimetype here instead of the mimetype info
 // on the other side, we can simply use this to ask the provider for the info
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info )
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info )
 {
     KFileMetaInfo::Data* d = info.d;
 
@@ -1830,7 +1830,7 @@ KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& info
     return s;
 }
 
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info )
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info )
 {
     TQString mimeType;
     bool isValid;
@@ -1856,4 +1856,4 @@ KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& info )
     return s;
 }
 
-#include "kfilemetainfo.moc"
+#include "tdefilemetainfo.moc"
diff --git a/kio/kio/kfilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h
index 63a08c277..dde596d19 100644
--- a/kio/kio/kfilemetainfo.h
+++ b/tdeio/tdeio/tdefilemetainfo.h
@@ -47,7 +47,7 @@ class KFileMetaInfoGroup;
  * @author Rolf Magnus
  * @author Carsten Pfeiffer
  */
-class KIO_EXPORT KFileMimeTypeInfo
+class TDEIO_EXPORT KFileMimeTypeInfo
 {
     // the plugin needs to be a friend because it puts the data into the object,
     // and it should be the only one allowed to do this.
@@ -135,7 +135,7 @@ public:
      *  It contains, among other things, the information about the group's name
      *  and a list of supported items.
      */
-    class KIO_EXPORT GroupInfo
+    class TDEIO_EXPORT GroupInfo
     {
 
     friend class KFilePlugin;
@@ -247,7 +247,7 @@ public:
      *  It contains every information about a KFileMetaInfoItem that this
      *  item has in common for each file of a specific mimetype.
      **/
-    class KIO_EXPORT ItemInfo
+    class TDEIO_EXPORT ItemInfo
     {
     friend class KFilePlugin;
     friend class GroupInfo;
@@ -493,7 +493,7 @@ protected:
  * This is one item of the meta information about a file (see
  * KFileMetaInfo).
  */
-class KIO_EXPORT KFileMetaInfoItem
+class TDEIO_EXPORT KFileMetaInfoItem
 {
 public:
     class Data;
@@ -660,9 +660,9 @@ public:
      */
     bool isValid() const;
 
-    KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& );
-    KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
-    KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& );
+    TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& );
+    TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
+    TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& );
     friend class KFileMetaInfoGroup;
 
 protected:
@@ -681,12 +681,12 @@ protected:
  * This is one group of meta information items about a file (see
  * KFileMetaInfo).
  */
-class KIO_EXPORT KFileMetaInfoGroup
+class TDEIO_EXPORT KFileMetaInfoGroup
 {
   friend class KFilePlugin;
   friend class KFileMetaInfo;
-  KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
-  KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& );
+  TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
+  TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& );
 
 public:
     class Data;
@@ -923,7 +923,7 @@ protected:
  * The groups and the What enum are not yet supported, but already added to
  * the interface so that adding support doesn't break compatibility.
  */
-class KIO_EXPORT KFileMetaInfo
+class TDEIO_EXPORT KFileMetaInfo
 {
 public:
     typedef KFileMimeTypeInfo::Hint Hint;
@@ -1223,8 +1223,8 @@ public:
      */
     KURL url() const;
 
-    KIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
-    KIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
+    TDEIO_EXPORT friend TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
+    TDEIO_EXPORT friend TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
     friend class KFilePlugin;
 
 protected:
@@ -1359,7 +1359,7 @@ private:
  * Example:
  *  @code
  *  typedef KGenericFactory<FooPlugin> FooFactory;
- *  K_EXPORT_COMPONENT_FACTORY(kfile_foo, FooFactory("kfile_foo"));
+ *  K_EXPORT_COMPONENT_FACTORY(tdefile_foo, FooFactory("tdefile_foo"));
  *  @endcode
  *
  * To make your plugin available within KDE, you also need to provide a
@@ -1385,13 +1385,13 @@ private:
  *  Type=Service
  *  Name=Foo Info
  *  ServiceTypes=KFilePlugin
- *  X-TDE-Library=kfile_foo
+ *  X-TDE-Library=tdefile_foo
  *  MimeType=application/x-foo
  *  PreferredGroups=FooInfo
  *  PreferredItems=Items,Size
  *  @endcode
  **/
-class KIO_EXPORT KFilePlugin : public TQObject
+class TDEIO_EXPORT KFilePlugin : public TQObject
 {
     Q_OBJECT
 
@@ -1643,7 +1643,7 @@ private:
  *  supported and which groups and items are provided for it, you can ask
  *  the KFileMetainfoProvider for it.
  **/
-class KIO_EXPORT KFileMetaInfoProvider: private QObject
+class TDEIO_EXPORT KFileMetaInfoProvider: private QObject
 {
     friend class KFilePlugin;
 
@@ -1698,7 +1698,7 @@ private:
         KFilePlugin* plugin;
         KFileMimeTypeInfo* mimeTypeInfo;
         // The problem here is that plugin can be shared in multiple instances,
-        // so the memory management isn't easy. KDE4 solution: use KSharedPtr?
+        // so the memory management isn't easy. KDE4 solution: use TDESharedPtr?
         // For now we flag one copy of the KFilePlugin pointer as being "owned".
         bool ownsPlugin;
     };
@@ -1725,14 +1725,14 @@ private:
 
 };
 
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& );
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& );
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoItem& );
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoItem& );
 
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& );
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfoGroup& );
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfoGroup& );
 
-KIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
-KIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
+TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
+TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
 
 
 #endif // KILEMETAINFO_H
diff --git a/kio/kio/kfileshare.cpp b/tdeio/tdeio/tdefileshare.cpp
index 1f6dca285..dc3f8c05a 100644
--- a/kio/kio/kfileshare.cpp
+++ b/tdeio/tdeio/tdefileshare.cpp
@@ -17,13 +17,13 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kfileshare.h"
+#include "tdefileshare.h"
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -181,7 +181,7 @@ void KFileShare::readShareList()
     }
     KProcIO proc;
     proc << exe;
-    if ( !proc.start( KProcess::Block ) ) {
+    if ( !proc.start( TDEProcess::Block ) ) {
         kdError() << "Can't run " << exe << endl;
         s_authorization = ErrorNotFound;
         return;
@@ -242,7 +242,7 @@ TQString KFileShare::findExe( const char* exeName )
 {
    // /usr/sbin on Mandrake, $PATH allows flexibility for other distributions
    TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::fromLatin1(":/usr/sbin");
-   TQString exe = KStandardDirs::findExe( exeName, path );
+   TQString exe = TDEStandardDirs::findExe( exeName, path );
    if (exe.isEmpty())
        kdError() << exeName << " not found in " << path << endl;
    return exe;
@@ -264,11 +264,11 @@ bool KFileShare::SuSEsetShared( const TQString& path, bool shared, bool rw )
         return false;
 
     // we want to share, so we kick it first - just to be sure
-    KProcess proc;
+    TDEProcess proc;
     proc << exe;
     proc << "--remove";
     proc << path;
-    proc.start( KProcess::Block );
+    proc.start( TDEProcess::Block );
     proc.clearArguments();
         
     proc << exe;
@@ -279,7 +279,7 @@ bool KFileShare::SuSEsetShared( const TQString& path, bool shared, bool rw )
     else
         proc << "--remove";
     proc << path;
-    proc.start( KProcess::Block ); // should be ok, the perl script terminates fast
+    proc.start( TDEProcess::Block ); // should be ok, the perl script terminates fast
     bool ok = proc.normalExit() && (proc.exitStatus() == 0);
     kdDebug(7000) << "KFileSharePropsPlugin::setShared normalExit=" 
                   << proc.normalExit() << endl;
@@ -343,4 +343,4 @@ bool KFileShare::nfsActive()
     return false;
 }
 
-#include "kfileshare.moc"
+#include "tdefileshare.moc"
diff --git a/kio/kio/kfileshare.h b/tdeio/tdeio/tdefileshare.h
index e46d0903b..e18749972 100644
--- a/kio/kio/kfileshare.h
+++ b/tdeio/tdeio/tdefileshare.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef kfileshare_h
-#define kfileshare_h
+#ifndef tdefileshare_h
+#define tdefileshare_h
 #include <tqobject.h>
 
 #include <tdelibs_export.h>
@@ -48,7 +48,7 @@ protected slots: // this is why this class needs to be in the .h
  * (communication with the backend)
  * @since 3.1
  */
-class KIO_EXPORT KFileShare
+class TDEIO_EXPORT KFileShare
 {
 
   
diff --git a/kio/kio/tdelficon.cpp b/tdeio/tdeio/tdelficon.cpp
index 49ceffd24..49ceffd24 100644
--- a/kio/kio/tdelficon.cpp
+++ b/tdeio/tdeio/tdelficon.cpp
diff --git a/kio/kio/tdelficon.h b/tdeio/tdeio/tdelficon.h
index 7a962bdaa..7a962bdaa 100644
--- a/kio/kio/tdelficon.h
+++ b/tdeio/tdeio/tdelficon.h
diff --git a/kio/kio/kprotocolmanager.cpp b/tdeio/tdeio/tdeprotocolmanager.cpp
index a3d8e0302..65ad393a3 100644
--- a/kio/kio/kprotocolmanager.cpp
+++ b/tdeio/tdeio/tdeprotocolmanager.cpp
@@ -23,18 +23,18 @@
 
 #include <dcopref.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>
-#include <kio/slaveconfig.h>
-#include <kio/ioslave_defaults.h>
-#include <kio/http_slave_defaults.h>
+#include <tdeio/slaveconfig.h>
+#include <tdeio/ioslave_defaults.h>
+#include <tdeio/http_slave_defaults.h>
 
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
 
 class
 KProtocolManagerPrivate
@@ -44,8 +44,8 @@ public:
 
    ~KProtocolManagerPrivate();
 
-   KConfig *config;
-   KConfig *http_config;
+   TDEConfig *config;
+   TDEConfig *http_config;
    bool init_busy;
    KURL url;
    TQString protocol;
@@ -72,7 +72,7 @@ KProtocolManagerPrivate::~KProtocolManagerPrivate()
 
 // DEFAULT USERAGENT STRING
 #define CFG_DEFAULT_UAGENT(X) \
-TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \
+TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) TDEHTML/%4.%5.%6 (like Gecko)") \
         .arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(X).arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE)
 
 void KProtocolManager::reparseConfiguration()
@@ -80,29 +80,29 @@ void KProtocolManager::reparseConfiguration()
   kpmpksd.destructObject();
 
   // Force the slave config to re-read its config...
-  KIO::SlaveConfig::self()->reset ();
+  TDEIO::SlaveConfig::self()->reset ();
 }
 
-KConfig *KProtocolManager::config()
+TDEConfig *KProtocolManager::config()
 {
   if (!d)
      d = new KProtocolManagerPrivate;
 
   if (!d->config)
   {
-     d->config = new KConfig("kioslaverc", true, false);
+     d->config = new TDEConfig("tdeioslaverc", true, false);
   }
   return d->config;
 }
 
-KConfig *KProtocolManager::http_config()
+TDEConfig *KProtocolManager::http_config()
 {
   if (!d)
      d = new KProtocolManagerPrivate;
 
   if (!d->http_config)
   {
-     d->http_config = new KConfig("kio_httprc", false, false);
+     d->http_config = new TDEConfig("tdeio_httprc", false, false);
   }
   return d->http_config;
 }
@@ -111,7 +111,7 @@ KConfig *KProtocolManager::http_config()
 
 int KProtocolManager::readTimeout()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ReadTimeout", DEFAULT_READ_TIMEOUT );
   return QMAX(MIN_TIMEOUT_VALUE, val);
@@ -119,7 +119,7 @@ int KProtocolManager::readTimeout()
 
 int KProtocolManager::connectTimeout()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ConnectTimeout", DEFAULT_CONNECT_TIMEOUT );
   return QMAX(MIN_TIMEOUT_VALUE, val);
@@ -127,7 +127,7 @@ int KProtocolManager::connectTimeout()
 
 int KProtocolManager::proxyConnectTimeout()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ProxyConnectTimeout", DEFAULT_PROXY_CONNECT_TIMEOUT );
   return QMAX(MIN_TIMEOUT_VALUE, val);
@@ -135,7 +135,7 @@ int KProtocolManager::proxyConnectTimeout()
 
 int KProtocolManager::responseTimeout()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   int val = cfg->readNumEntry( "ResponseTimeout", DEFAULT_RESPONSE_TIMEOUT );
   return QMAX(MIN_TIMEOUT_VALUE, val);
@@ -150,21 +150,21 @@ bool KProtocolManager::useProxy()
 
 bool KProtocolManager::useReverseProxy()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return cfg->readBoolEntry("ReversedException", false);
 }
 
 KProtocolManager::ProxyType KProtocolManager::proxyType()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return static_cast<ProxyType>(cfg->readNumEntry( "ProxyType" ));
 }
 
 KProtocolManager::ProxyAuthMode KProtocolManager::proxyAuthMode()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return static_cast<ProxyAuthMode>(cfg->readNumEntry( "AuthMode" ));
 }
@@ -173,40 +173,40 @@ KProtocolManager::ProxyAuthMode KProtocolManager::proxyAuthMode()
 
 bool KProtocolManager::useCache()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   return cfg->readBoolEntry( "UseCache", true );
 }
 
-KIO::CacheControl KProtocolManager::cacheControl()
+TDEIO::CacheControl KProtocolManager::cacheControl()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   TQString tmp = cfg->readEntry("cache");
   if (tmp.isEmpty())
     return DEFAULT_CACHE_CONTROL;
-  return KIO::parseCacheControl(tmp);
+  return TDEIO::parseCacheControl(tmp);
 }
 
 TQString KProtocolManager::cacheDir()
 {
-  KConfig *cfg = http_config();
-  return cfg->readPathEntry("CacheDir", KGlobal::dirs()->saveLocation("cache","http"));
+  TDEConfig *cfg = http_config();
+  return cfg->readPathEntry("CacheDir", TDEGlobal::dirs()->saveLocation("cache","http"));
 }
 
 int KProtocolManager::maxCacheAge()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   return cfg->readNumEntry( "MaxCacheAge", DEFAULT_MAX_CACHE_AGE ); // 14 days
 }
 
 int KProtocolManager::maxCacheSize()
 {
-  KConfig *cfg = http_config();
+  TDEConfig *cfg = http_config();
   return cfg->readNumEntry( "MaxCacheSize", DEFAULT_MAX_CACHE_SIZE ); // 5 MB
 }
 
 TQString KProtocolManager::noProxyForRaw()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
 
   return cfg->readEntry( "NoProxyFor" );
@@ -230,7 +230,7 @@ TQString KProtocolManager::proxyFor( const TQString& protocol )
   else if (scheme == "webdavs")
     scheme = "https";
 
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return cfg->readEntry( scheme + "Proxy" );
 }
@@ -417,11 +417,11 @@ TQString KProtocolManager::slaveProtocol(const KURL &url, TQString &proxy)
 
 TQString KProtocolManager::userAgentForHost( const TQString& hostname )
 {
-  TQString sendUserAgent = KIO::SlaveConfig::self()->configData("http", hostname.lower(), "SendUserAgent").lower();
+  TQString sendUserAgent = TDEIO::SlaveConfig::self()->configData("http", hostname.lower(), "SendUserAgent").lower();
   if (sendUserAgent == "false")
      return TQString::null;
 
-  TQString useragent = KIO::SlaveConfig::self()->configData("http", hostname.lower(), "UserAgent");
+  TQString useragent = TDEIO::SlaveConfig::self()->configData("http", hostname.lower(), "UserAgent");
 
   // Return the default user-agent if none is specified
   // for the requested host.
@@ -433,7 +433,7 @@ TQString KProtocolManager::userAgentForHost( const TQString& hostname )
 
 TQString KProtocolManager::defaultUserAgent( )
 {
-  TQString modifiers = KIO::SlaveConfig::self()->configData("http", TQString::null, "UserAgentKeys");
+  TQString modifiers = TDEIO::SlaveConfig::self()->configData("http", TQString::null, "UserAgentKeys");
   return defaultUserAgent(modifiers);
 }
 
@@ -470,7 +470,7 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers )
     }
     if( modifiers.contains('l') )
     {
-      TQStringList languageList = KGlobal::locale()->languageList();
+      TQStringList languageList = TDEGlobal::locale()->languageList();
       TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
       if( it != languageList.end() )
       {
@@ -492,14 +492,14 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers )
 
 bool KProtocolManager::markPartial()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readBoolEntry( "MarkPartial", true );
 }
 
 int KProtocolManager::minimumKeepSize()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readNumEntry( "MinimumKeepSize",
                             DEFAULT_MINIMUM_KEEP_SIZE ); // 5000 byte
@@ -507,28 +507,28 @@ int KProtocolManager::minimumKeepSize()
 
 bool KProtocolManager::autoResume()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readBoolEntry( "AutoResume", false );
 }
 
 bool KProtocolManager::persistentConnections()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readBoolEntry( "PersistentConnections", true );
 }
 
 bool KProtocolManager::persistentProxyConnection()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( TQString::null );
   return cfg->readBoolEntry( "PersistentProxyConnection", false );
 }
 
 TQString KProtocolManager::proxyConfigScript()
 {
-  KConfig *cfg = config();
+  TDEConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
   return cfg->readEntry( "Proxy Config Script" );
 }
diff --git a/kio/kio/kprotocolmanager.h b/tdeio/tdeio/tdeprotocolmanager.h
index ec59342af..95106f90d 100644
--- a/kio/kio/kprotocolmanager.h
+++ b/tdeio/tdeio/tdeprotocolmanager.h
@@ -22,13 +22,13 @@
 
 #include <tqstringlist.h>
 
-#include <kapplication.h>
-#include <kio/global.h>
+#include <tdeapplication.h>
+#include <tdeio/global.h>
 
 /** @deprecated Use KProtocolManager::defaultUserAgent() instead. */
 #define DEFAULT_USERAGENT_STRING ""
 
-class KConfig;
+class TDEConfig;
 
 /**
  * Provides information about I/O (Internet, etc.) settings chosen/set
@@ -51,7 +51,7 @@ class KConfig;
  * @author Dawit Alemayehu <adawit@kde.org>
  * @see KPAC
  */
-class KIO_EXPORT KProtocolManager
+class TDEIO_EXPORT KProtocolManager
 {
 public:
 
@@ -311,7 +311,7 @@ public:
    * Returns the Cache control directive to be used.
    * @return the cache control value
    */
-  static KIO::CacheControl cacheControl();
+  static TDEIO::CacheControl cacheControl();
 
 
 /*============================ DOWNLOAD CONFIG ==============================*/
@@ -362,7 +362,7 @@ public:
 
   /**
    * Force a reload of the general config file of
-   * io-slaves ( kioslaverc).
+   * io-slaves ( tdeioslaverc).
    */
   static void reparseConfiguration();
 
@@ -382,8 +382,8 @@ public:
    * @internal
    * (Shared with SlaveConfig)
    */
-  static KConfig *config();
+  static TDEConfig *config();
 private:
-  static KConfig *http_config();
+  static TDEConfig *http_config();
 };
 #endif
diff --git a/kio/kio/thumbcreator.h b/tdeio/tdeio/thumbcreator.h
index 3ad6ca8aa..756dd0cf9 100644
--- a/kio/kio/thumbcreator.h
+++ b/tdeio/tdeio/thumbcreator.h
@@ -26,9 +26,9 @@ class TQString;
 class TQImage;
 /**
  * This is the baseclass for "thumbnail-plugins" in KDE. Using the class
- * KIO::PreviewJob allows you to generate small images (thumbnails)
+ * TDEIO::PreviewJob allows you to generate small images (thumbnails)
  * for any kind of file, where a "ThumbCreator" is available. Have a look
- * at tdebase/kioslave/thumbnail/ for existing ThumbCreators.
+ * at tdebase/tdeioslave/thumbnail/ for existing ThumbCreators.
  *
  * What you need to do to create and register a ThumbCreator:
  * @li Inherit from this class and reimplement the create() method to
diff --git a/kio/kio/yacc.c b/tdeio/tdeio/yacc.c
index a6fa63428..f69aa9810 100644
--- a/kio/kio/yacc.c
+++ b/tdeio/tdeio/yacc.c
@@ -113,7 +113,7 @@
 
 void yyerror(const char *s);
 int yylex();
-void KTraderParse_initFlex( const char *s );
+void TDETraderParse_initFlex( const char *s );
 
 
 
@@ -1101,12 +1101,12 @@ yyreduce:
     {
         case 2:
 #line 56 "yacc.y"
-    { KTraderParse_setParseTree( 0L ); ;}
+    { TDETraderParse_setParseTree( 0L ); ;}
     break;
 
   case 3:
 #line 57 "yacc.y"
-    { KTraderParse_setParseTree( (yyvsp[0].ptr) ); ;}
+    { TDETraderParse_setParseTree( (yyvsp[0].ptr) ); ;}
     break;
 
   case 4:
@@ -1116,7 +1116,7 @@ yyreduce:
 
   case 5:
 #line 63 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newOR( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
+    { (yyval.ptr) = TDETraderParse_newOR( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
     break;
 
   case 6:
@@ -1126,7 +1126,7 @@ yyreduce:
 
   case 7:
 #line 67 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newAND( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
+    { (yyval.ptr) = TDETraderParse_newAND( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
     break;
 
   case 8:
@@ -1136,32 +1136,32 @@ yyreduce:
 
   case 9:
 #line 71 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
     break;
 
   case 10:
 #line 72 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
     break;
 
   case 11:
 #line 73 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
     break;
 
   case 12:
 #line 74 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
     break;
 
   case 13:
 #line 75 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 5 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 5 ); ;}
     break;
 
   case 14:
 #line 76 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 6 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCMP( (yyvsp[-2].ptr), (yyvsp[0].ptr), 6 ); ;}
     break;
 
   case 15:
@@ -1171,7 +1171,7 @@ yyreduce:
 
   case 16:
 #line 80 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newIN( (yyvsp[-2].ptr), KTraderParse_newID( (yyvsp[0].name) ) ); ;}
+    { (yyval.ptr) = TDETraderParse_newIN( (yyvsp[-2].ptr), TDETraderParse_newID( (yyvsp[0].name) ) ); ;}
     break;
 
   case 17:
@@ -1181,7 +1181,7 @@ yyreduce:
 
   case 18:
 #line 84 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newMATCH( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
+    { (yyval.ptr) = TDETraderParse_newMATCH( (yyvsp[-2].ptr), (yyvsp[0].ptr) ); ;}
     break;
 
   case 19:
@@ -1191,12 +1191,12 @@ yyreduce:
 
   case 20:
 #line 88 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 1 ); ;}
     break;
 
   case 21:
 #line 89 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 2 ); ;}
     break;
 
   case 22:
@@ -1206,12 +1206,12 @@ yyreduce:
 
   case 23:
 #line 93 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 3 ); ;}
     break;
 
   case 24:
 #line 94 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
+    { (yyval.ptr) = TDETraderParse_newCALC( (yyvsp[-2].ptr), (yyvsp[0].ptr), 4 ); ;}
     break;
 
   case 25:
@@ -1221,7 +1221,7 @@ yyreduce:
 
   case 26:
 #line 98 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newNOT( (yyvsp[0].ptr) ); ;}
+    { (yyval.ptr) = TDETraderParse_newNOT( (yyvsp[0].ptr) ); ;}
     break;
 
   case 27:
@@ -1231,47 +1231,47 @@ yyreduce:
 
   case 28:
 #line 102 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newBRACKETS( (yyvsp[-1].ptr) ); ;}
+    { (yyval.ptr) = TDETraderParse_newBRACKETS( (yyvsp[-1].ptr) ); ;}
     break;
 
   case 29:
 #line 103 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newEXIST( (yyvsp[0].name) ); ;}
+    { (yyval.ptr) = TDETraderParse_newEXIST( (yyvsp[0].name) ); ;}
     break;
 
   case 30:
 #line 104 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newID( (yyvsp[0].name) ); ;}
+    { (yyval.ptr) = TDETraderParse_newID( (yyvsp[0].name) ); ;}
     break;
 
   case 31:
 #line 105 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newNUM( (yyvsp[0].vali) ); ;}
+    { (yyval.ptr) = TDETraderParse_newNUM( (yyvsp[0].vali) ); ;}
     break;
 
   case 32:
 #line 106 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newFLOAT( (yyvsp[0].vald) ); ;}
+    { (yyval.ptr) = TDETraderParse_newFLOAT( (yyvsp[0].vald) ); ;}
     break;
 
   case 33:
 #line 107 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newSTRING( (yyvsp[0].name) ); ;}
+    { (yyval.ptr) = TDETraderParse_newSTRING( (yyvsp[0].name) ); ;}
     break;
 
   case 34:
 #line 108 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newBOOL( (yyvsp[0].valb) ); ;}
+    { (yyval.ptr) = TDETraderParse_newBOOL( (yyvsp[0].valb) ); ;}
     break;
 
   case 35:
 #line 109 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newMAX2( (yyvsp[0].name) ); ;}
+    { (yyval.ptr) = TDETraderParse_newMAX2( (yyvsp[0].name) ); ;}
     break;
 
   case 36:
 #line 110 "yacc.y"
-    { (yyval.ptr) = KTraderParse_newMIN2( (yyvsp[0].name) ); ;}
+    { (yyval.ptr) = TDETraderParse_newMIN2( (yyvsp[0].name) ); ;}
     break;
 
 
@@ -1511,12 +1511,12 @@ yyreturn:
 
 void yyerror ( const char *s )  /* Called by yyparse on error */
 {
-    KTraderParse_error( s );
+    TDETraderParse_error( s );
 }
 
-void KTraderParse_mainParse( const char *_code )
+void TDETraderParse_mainParse( const char *_code )
 {
-  KTraderParse_initFlex( _code );
+  TDETraderParse_initFlex( _code );
   yyparse();
 }
 
diff --git a/kio/kio/yacc.h b/tdeio/tdeio/yacc.h
index ca84fb025..ca84fb025 100644
--- a/kio/kio/yacc.h
+++ b/tdeio/tdeio/yacc.h
diff --git a/tdeio/tdeio/yacc.y b/tdeio/tdeio/yacc.y
new file mode 100644
index 000000000..4c5c619e5
--- /dev/null
+++ b/tdeio/tdeio/yacc.y
@@ -0,0 +1,126 @@
+%{
+#include <stdlib.h>
+#include <stdio.h>
+#include "ktraderparse.h"
+
+void yyerror(const char *s);
+int yylex();
+void TDETraderParse_initFlex( const char *s );
+
+%}
+
+%union
+{
+     char valb;
+     int vali;
+     double vald;
+     char *name;
+     void *ptr;
+}
+
+%token NOT
+%token EQ
+%token NEQ
+%token LEQ
+%token GEQ
+%token LE
+%token GR
+%token OR
+%token AND
+%token TOKEN_IN
+%token EXIST
+%token MAX
+%token MIN
+
+%token <valb> VAL_BOOL
+%token <name> VAL_STRING
+%token <name> VAL_ID
+%token <vali> VAL_NUM
+%token <vald> VAL_FLOAT
+
+%type <ptr> bool
+%type <ptr> bool_or
+%type <ptr> bool_and
+%type <ptr> bool_compare
+%type <ptr> expr_in
+%type <ptr> expr_twiddle
+%type <ptr> expr
+%type <ptr> term
+%type <ptr> factor_non
+%type <ptr> factor
+
+/* Grammar follows */
+
+%%
+
+constraint: /* empty */ { TDETraderParse_setParseTree( 0L ); }
+          | bool { TDETraderParse_setParseTree( $<ptr>1 ); }
+;
+
+bool: bool_or { $$ = $<ptr>1; }
+;
+
+bool_or: bool_and OR bool_or { $$ = TDETraderParse_newOR( $<ptr>1, $<ptr>3 ); }
+       | bool_and { $$ = $<ptr>1; }
+;
+
+bool_and: bool_compare AND bool_and { $$ = TDETraderParse_newAND( $<ptr>1, $<ptr>3 ); }
+        | bool_compare { $$ = $<ptr>1; }
+;
+
+bool_compare: expr_in EQ expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 1 ); }
+            | expr_in NEQ expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 2 ); }
+            | expr_in GEQ expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 3 ); }
+            | expr_in LEQ expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 4 ); }
+            | expr_in LE expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 5 ); }
+            | expr_in GR expr_in { $$ = TDETraderParse_newCMP( $<ptr>1, $<ptr>3, 6 ); }
+            | expr_in { $$ = $<ptr>1; }
+;
+
+expr_in: expr_twiddle TOKEN_IN VAL_ID { $$ = TDETraderParse_newIN( $<ptr>1, TDETraderParse_newID( $<name>3 ) ); }
+       | expr_twiddle { $$ = $<ptr>1; }
+;
+
+expr_twiddle: expr '~' expr { $$ = TDETraderParse_newMATCH( $<ptr>1, $<ptr>3 ); }
+            | expr { $$ = $<ptr>1; }
+;
+
+expr: expr '+' term { $$ = TDETraderParse_newCALC( $<ptr>1, $<ptr>3, 1 ); }
+    | expr '-' term { $$ = TDETraderParse_newCALC( $<ptr>1, $<ptr>3, 2 ); }
+    | term { $$ = $<ptr>1; }
+;
+
+term: term '*' factor_non { $$ = TDETraderParse_newCALC( $<ptr>1, $<ptr>3, 3 ); }
+    | term '/' factor_non { $$ = TDETraderParse_newCALC( $<ptr>1, $<ptr>3, 4 ); }
+    | factor_non { $$ = $<ptr>1; }
+;
+
+factor_non: NOT factor { $$ = TDETraderParse_newNOT( $<ptr>2 ); }
+          | factor { $$ = $<ptr>1; }
+;
+
+factor: '(' bool_or ')' { $$ = TDETraderParse_newBRACKETS( $<ptr>2 ); }
+      | EXIST VAL_ID { $$ = TDETraderParse_newEXIST( $<name>2 ); }
+      | VAL_ID { $$ = TDETraderParse_newID( $<name>1 ); }
+      | VAL_NUM { $$ = TDETraderParse_newNUM( $<vali>1 ); }
+      | VAL_FLOAT { $$ = TDETraderParse_newFLOAT( $<vald>1 ); }
+      | VAL_STRING { $$ = TDETraderParse_newSTRING( $<name>1 ); }
+      | VAL_BOOL { $$ = TDETraderParse_newBOOL( $<valb>1 ); }
+      | MAX VAL_ID { $$ = TDETraderParse_newMAX2( $<name>2 ); }
+      | MIN VAL_ID { $$ = TDETraderParse_newMIN2( $<name>2 ); }
+;
+
+/* End of grammar */
+
+%%
+
+void yyerror ( const char *s )  /* Called by yyparse on error */
+{
+    TDETraderParse_error( s );
+}
+
+void TDETraderParse_mainParse( const char *_code )
+{
+  TDETraderParse_initFlex( _code );
+  yyparse();
+}
diff --git a/kio/kioexec/CMakeLists.txt b/tdeio/tdeioexec/CMakeLists.txt
index 0ab606643..b0cdf0b52 100644
--- a/kio/kioexec/CMakeLists.txt
+++ b/tdeio/tdeioexec/CMakeLists.txt
@@ -16,8 +16,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -25,9 +25,9 @@ link_directories(
 )
 
 
-##### kioexec ###################################
+##### tdeioexec ###################################
 
-set( target kioexec )
+set( target tdeioexec )
 
 set( ${target}_SRCS
   main.cpp
@@ -35,7 +35,7 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/tdeio/tdeioexec/Makefile.am b/tdeio/tdeioexec/Makefile.am
new file mode 100644
index 000000000..2879342ff
--- /dev/null
+++ b/tdeio/tdeioexec/Makefile.am
@@ -0,0 +1,19 @@
+AM_CPPFLAGS = $(all_includes)
+
+bin_PROGRAMS = tdeioexec
+
+tdeioexec_SOURCES = main.cpp
+tdeioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeioexec_LDADD   = $(LIB_KIO)
+
+noinst_HEADERS = main.h
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) $(tdeioexec_SOURCES) -o $(podir)/tdeioexec.pot
+
+install-exec-local:
+	@rm -f $(DESTDIR)$(bindir)/kfmexec
+	@$(LN_S) tdeioexec $(DESTDIR)$(bindir)/kfmexec
+
+include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kio/kioexec/README b/tdeio/tdeioexec/README
index 9f844bb97..daaa38bdb 100644
--- a/kio/kioexec/README
+++ b/tdeio/tdeioexec/README
@@ -14,7 +14,7 @@ so we have no way to know when the user finished editing the file...
 
 Conclusion: if the application has network transparency built-in, it should
 put "%u" in its desktop file - and kfmexec isn't used -. If it doesn't, either
-it's a KApplication and kfmexec does its job, or it's a KUniqueApplication
+it's a TDEApplication and kfmexec does its job, or it's a KUniqueApplication
 and... kfmexec can't see modifications to the file. Be warned.
 
 From Waldo: "The program doesn't return _at once_. It returns
diff --git a/kio/kioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index 63f1164dd..f6324afa5 100644
--- a/kio/kioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -26,19 +26,19 @@
 
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdemessagebox.h>
+#include <tdeio/job.h>
 #include <krun.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprocess.h>
 #include <kservice.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kstartupinfo.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdestartupinfo.h>
 #include <kshell.h>
 #include <kde_file.h>
 
@@ -49,28 +49,28 @@
 static const char description[] =
         I18N_NOOP("KIO Exec - Opens remote files, watches modifications, asks for upload");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
    { "tempfiles", I18N_NOOP("Treat URLs as local files and delete them afterwards"), 0 },
    { "suggestedfilename <file name>", I18N_NOOP("Suggested file name for the downloaded file"), 0 },
    { "+command", I18N_NOOP("Command to execute"), 0 },
    { "+[URLs]", I18N_NOOP("URL(s) or local file(s) used for 'command'"), 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 
 int jobCounter = 0;
 
-TQPtrList<KIO::Job>* jobList = 0L;
+TQPtrList<TDEIO::Job>* jobList = 0L;
 
 KIOExec::KIOExec()
 {
-    jobList = new TQPtrList<KIO::Job>;
+    jobList = new TQPtrList<TDEIO::Job>;
     jobList->setAutoDelete( false ); // jobs autodelete themselves
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if (args->count() < 1)
-        KCmdLineArgs::usage(i18n("'command' expected.\n"));
+        TDECmdLineArgs::usage(i18n("'command' expected.\n"));
 
     tempfiles = args->isSet("tempfiles");
     if ( args->isSet( "suggestedfilename" ) )
@@ -83,7 +83,7 @@ KIOExec::KIOExec()
     {
         KURL url = args->url(i);
         // we need to map system:/ etc to make sure we get this right
-        url = KIO::NetAccess::mostLocalURL( url, 0 );
+        url = TDEIO::NetAccess::mostLocalURL( url, 0 );
 
         //kdDebug() << "url=" << url.url() << " filename=" << url.fileName() << endl;
         // A local file, not an URL ?
@@ -105,13 +105,13 @@ KIOExec::KIOExec()
             else
             // We must fetch the file
             {
-                TQString fileName = KIO::encodeFileName( url.fileName() );
+                TQString fileName = TDEIO::encodeFileName( url.fileName() );
                 if ( !suggestedFileName.isEmpty() )
                     fileName = suggestedFileName;
                 // Build the destination filename, in ~/.trinity/cache-*/krun/
                 // Unlike KDE-1.1, we put the filename at the end so that the extension is kept
                 // (Some programs rely on it)
-                TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) +
+                TQString tmp = TDEGlobal::dirs()->saveLocation( "cache", "krun/" ) +
                               TQString("%1.%2.%3").arg(getpid()).arg(jobCounter++).arg(fileName);
                 fileInfo file;
                 file.path = tmp;
@@ -122,10 +122,10 @@ KIOExec::KIOExec()
                 KURL dest;
                 dest.setPath( tmp );
                 kdDebug() << "Copying " << url.prettyURL() << " to " << dest << endl;
-                KIO::Job *job = KIO::file_copy( url, dest );
+                TDEIO::Job *job = TDEIO::file_copy( url, dest );
                 jobList->append( job );
 
-                connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) );
+                connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
             }
         }
     }
@@ -143,16 +143,16 @@ KIOExec::KIOExec()
         slotResult( 0L );
 }
 
-void KIOExec::slotResult( KIO::Job * job )
+void KIOExec::slotResult( TDEIO::Job * job )
 {
     if (job && job->error())
     {
         // That error dialog would be queued, i.e. not immediate...
         //job->showErrorDialog();
-        if ( (job->error() != KIO::ERR_USER_CANCELED) )
+        if ( (job->error() != TDEIO::ERR_USER_CANCELED) )
             KMessageBox::error( 0L, job->errorString() );
 
-        TQString path = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
+        TQString path = static_cast<TDEIO::FileCopyJob*>(job)->destURL().path();
 
         TQValueList<fileInfo>::Iterator it = fileList.begin();
         for(;it != fileList.end(); ++it)
@@ -164,7 +164,7 @@ void KIOExec::slotResult( KIO::Job * job )
         if ( it != fileList.end() )
            fileList.remove( it );
         else
-           kdDebug() <<  static_cast<KIO::FileCopyJob*>(job)->destURL().path() << " not found in list" << endl;
+           kdDebug() <<  static_cast<TDEIO::FileCopyJob*>(job)->destURL().path() << " not found in list" << endl;
     }
 
     counter++;
@@ -206,17 +206,17 @@ void KIOExec::slotRunApp()
 
 #ifdef Q_WS_X11
     // propagate the startup indentification to the started process
-    KStartupInfoId id;
+    TDEStartupInfoId id;
     id.initId( kapp->startupId());
     id.setupStartupEnv();
 #endif
 
-    KProcess proc;
+    TDEProcess proc;
     proc << params;
-    proc.start( KProcess::Block );
+    proc.start( TDEProcess::Block );
 
 #ifdef Q_WS_X11
-    KStartupInfo::resetStartupEnv();
+    TDEStartupInfo::resetStartupEnv();
 #endif
 
     kdDebug() << "EXEC done" << endl;
@@ -246,9 +246,9 @@ void KIOExec::slotRunApp()
                 {
                     kdDebug() << TQString(TQString("src='%1'  dest='%2'").arg(src).arg(dest.url())).ascii() << endl;
                     // Do it the synchronous way.
-                    if ( !KIO::NetAccess::upload( src, dest, 0 ) )
+                    if ( !TDEIO::NetAccess::upload( src, dest, 0 ) )
                     {
-                        KMessageBox::error( 0L, KIO::NetAccess::lastErrorString() );
+                        KMessageBox::error( 0L, TDEIO::NetAccess::lastErrorString() );
                         continue; // don't delete the temp file
                     }
                 }
@@ -271,8 +271,8 @@ void KIOExec::slotRunApp()
 
 int main( int argc, char **argv )
 {
-    KAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
-        VERSION, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "tdeioexec", I18N_NOOP("KIOExec"),
+        VERSION, description, TDEAboutData::License_GPL,
         "(c) 1998-2000,2003 The KFM/Konqueror Developers");
     aboutData.addAuthor("David Faure",0, "faure@kde.org");
     aboutData.addAuthor("Stephan Kulow",0, "coolo@kde.org");
@@ -280,10 +280,10 @@ int main( int argc, char **argv )
     aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org");
     aboutData.addAuthor("Oswald Buddenhagen",0, "ossi@kde.org");
 
-    KCmdLineArgs::init( argc, argv, &aboutData );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, &aboutData );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     KIOExec exec;
 
diff --git a/kio/kioexec/main.h b/tdeio/tdeioexec/main.h
index 6a5dee65e..beb6a2297 100644
--- a/kio/kioexec/main.h
+++ b/tdeio/tdeioexec/main.h
@@ -6,7 +6,7 @@
 #include <tqstrlist.h>
 #include <tqtimer.h>
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class KIOExec : public TQObject
 {
@@ -15,7 +15,7 @@ public:
     KIOExec();
 
 public slots:
-    void slotResult( KIO::Job * );
+    void slotResult( TDEIO::Job * );
     void slotRunApp();
 
 protected:
diff --git a/kio/kioslave.upd b/tdeio/tdeioslave.upd
index f1ad015d3..842f8bb56 100644
--- a/kio/kioslave.upd
+++ b/tdeio/tdeioslave.upd
@@ -1,18 +1,18 @@
 # Hello world
 Id=kde2.2/r1
-File=kioslaverc,kio_httprc
+File=tdeioslaverc,tdeio_httprc
 Group=Cache Settings,
 Key=MaxCacheSize
 Key=MaxCacheAge
 Key=UseCache
-File=kioslaverc
+File=tdeioslaverc
 Group=Browser Settings/UserAgent,UserAgent
 AllKeys
 Id=kde2.2/r2
-File=kioslaverc,kio_httprc
+File=tdeioslaverc,tdeio_httprc
 Group=UserAgent
 Script=useragent.pl,perl
 Id=kde2.2/r3
-File=kioslaverc
+File=tdeioslaverc
 Group=Proxy Settings
 Script=proxytype.pl,perl
diff --git a/kio/tests/CMakeLists.txt b/tdeio/tests/CMakeLists.txt
index 54378f5c8..a9f6bd4ef 100644
--- a/kio/tests/CMakeLists.txt
+++ b/tdeio/tests/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -21,16 +21,16 @@ link_directories(
 )
 
 
-##### ktradertest ###############################
+##### tdetradertest ###############################
 
-set( target ktradertest )
+set( target tdetradertest )
 
 set( ${target}_SRCS
-  ktradertest.cpp
+  tdetradertest.cpp
 )
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kio/tests/Makefile.am b/tdeio/tests/Makefile.am
index fe0b6d7ca..138d0f0d2 100644
--- a/kio/tests/Makefile.am
+++ b/tdeio/tests/Makefile.am
@@ -16,17 +16,17 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio $(all_includes)
 LDADD = $(LIB_KIO)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
-                 kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
+check_PROGRAMS = tdesycocatest getalltest kruntest ktartest kziptest\
+                 tdeioslavetest kdirwatchtest kshredtest speed kurifiltertest \
                  kdefaultprogresstest kmimemagictest \
                  kfiltertest kiopassdlgtest kscantest kdirlistertest \
                  previewtest kionetrctest kdcopcheck metatest \
 		 kmimefromext kpropsdlgtest kmfitest dataprotocoltest \
-		 kprotocolinfotest ksycocaupdatetest netaccesstest jobtest \
+		 kprotocolinfotest tdesycocaupdatetest netaccesstest jobtest \
 		 kurlcompletiontest kmimetypetest kacltest
 
 # Unfortunately some tests depend on the network settings, it seems
@@ -37,23 +37,23 @@ check-local: kziptest
 
 TESTS = kmimetypetest
 
-bin_PROGRAMS = ktradertest
+bin_PROGRAMS = tdetradertest
 
 METASOURCES = AUTO
 
 speed_SOURCES = speed.cpp
-kioslavetest_SOURCES = kioslavetest.cpp
+tdeioslavetest_SOURCES = tdeioslavetest.cpp
 kshredtest_SOURCES = kshredtest.cpp
 kdefaultprogresstest_SOURCES = kdefaultprogresstest.cpp
 kionetrctest_SOURCES = kionetrctest.cpp
 kiopassdlgtest_SOURCES = kiopassdlgtest.cpp
 kurifiltertest_SOURCES = kurifiltertest.cpp
-ksycocatest_SOURCES = ksycocatest.cpp
+tdesycocatest_SOURCES = tdesycocatest.cpp
 kdcopcheck_SOURCES = kdcopcheck.cpp
 getalltest_SOURCES = getalltest.cpp
 kruntest_SOURCES = kruntest.cpp
 kdirwatchtest_SOURCES = kdirwatchtest.cpp
-ktradertest_SOURCES = ktradertest.cpp
+tdetradertest_SOURCES = tdetradertest.cpp
 kmimemagictest_SOURCES = kmimemagictest.cpp
 kfiltertest_SOURCES = kfiltertest.cpp
 kscantest_SOURCES = kscantest.cpp
@@ -67,7 +67,7 @@ kpropsdlgtest_SOURCES = kpropsdlgtest.cpp
 kmfitest_SOURCES = kmfitest.cpp
 dataprotocoltest_SOURCES = dataprotocoltest.cpp
 kprotocolinfotest_SOURCES = kprotocolinfotest.cpp
-ksycocaupdatetest_SOURCES = ksycocaupdatetest.cpp
+tdesycocaupdatetest_SOURCES = tdesycocaupdatetest.cpp
 netaccesstest_SOURCES = netaccesstest.cpp
 jobtest_SOURCES = jobtest.cpp
 kurlcompletiontest_SOURCES = kurlcompletiontest.cpp
@@ -75,12 +75,12 @@ kmimetypetest_SOURCES = kmimetypetest.cpp
 kacltest_SOURCES = kacltest.cpp
 
 
-check_LTLIBRARIES = kunittest_kdirwatch.la
-kunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
-kunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
-kunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
+check_LTLIBRARIES = tdeunittest_kdirwatch.la
+tdeunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
+tdeunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
+tdeunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
 
-# kfile meta stuff. Comment this in, if you want a small
+# tdefile meta stuff. Comment this in, if you want a small
 # metadata plugin test and "make install".
 #kde_module_LTLIBRARIES = dummymeta.la
 #dummymeta_la_SOURCES = dummymeta.cpp
diff --git a/kio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp
index 0c8470a61..e9af8574d 100644
--- a/kio/tests/dataprotocoltest.cpp
+++ b/tdeio/tests/dataprotocoltest.cpp
@@ -1,4 +1,4 @@
-// testing the data kioslave
+// testing the data tdeioslave
 // (C) 2002, 2003 Leo Savernik
 //
 // invoke "make dataprotocoltest" to generate the binary inside KDE CVS
@@ -16,7 +16,7 @@
 #  define TESTKIO
 #endif
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqcstring.h>
 #include <tqstring.h>
@@ -39,7 +39,7 @@ public:
     testStrings("MIME Type: ",mime_type_expected,type);
   }
 
-  void totalSize(KIO::filesize_t bytes) {
+  void totalSize(TDEIO::filesize_t bytes) {
 //    cout << "content size: " << bytes << " bytes" << endl;
   }
 
@@ -47,7 +47,7 @@ public:
 //    meta_data[key] = value;
 //    cout << "§ " << key << " = " << value << endl;
     TQString prefix = "Metadata[\""+key+"\"]: ";
-    KIO::MetaData::Iterator it = attributes_expected.find(key);
+    TDEIO::MetaData::Iterator it = attributes_expected.find(key);
     if (it != attributes_expected.end()) {
       testStrings(prefix,it.data(),value);
       // remove key from map
@@ -60,8 +60,8 @@ public:
 
   void sendMetaData() {
     // check here if attributes_expected contains any excess keys
-    KIO::MetaData::ConstIterator it = attributes_expected.begin();
-    KIO::MetaData::ConstIterator end = attributes_expected.end();
+    TDEIO::MetaData::ConstIterator it = attributes_expected.begin();
+    TDEIO::MetaData::ConstIterator end = attributes_expected.end();
     for (; it != end; ++it) {
       cout << endl << "Metadata[\"" << it.key()
       		<< "\"] was expected but not defined";
@@ -93,7 +93,7 @@ private:
   // -- testcase related members
   TQString mime_type_expected;	// expected mime type
   /** contains all attributes and values the testcase has to set */
-  KIO::MetaData attributes_expected;
+  TDEIO::MetaData attributes_expected;
   /** contains the content as it is expected to be returned */
   TQByteArray content_expected;
   int passed;		// # of passed tests
@@ -150,7 +150,7 @@ public:
   /**
    * sets all attribute-value pairs the testcase must deliver.
    */
-  void setExpectedAttributes(const KIO::MetaData &attres) {
+  void setExpectedAttributes(const TDEIO::MetaData &attres) {
     attributes_expected = attres;
   }
 
@@ -250,12 +250,12 @@ const TQChar * const charset_urls[] = {
 #endif
 
 int main(int /*argc*/,char* /*argv*/[]) {
-  DataProtocol kio_data;
+  DataProtocol tdeio_data;
 
-  kio_data.initTestrun();
+  tdeio_data.initTestrun();
   for (uint i = 0; i < sizeof testcases/sizeof testcases[0]; i++) {
-    kio_data.beginTestcase(testcases[i].name);
-    kio_data.setExpectedMimeType(testcases[i].exp_mime_type != 0
+    tdeio_data.beginTestcase(testcases[i].name);
+    tdeio_data.setExpectedMimeType(testcases[i].exp_mime_type != 0
     		? testcases[i].exp_mime_type : "text/plain");
 
     bool has_charset = false;
@@ -268,20 +268,20 @@ int main(int /*argc*/,char* /*argv*/[]) {
       }/*next j*/
     }
     if (!has_charset) exp_attrs["charset"] = "us-ascii";
-    kio_data.setExpectedAttributes(exp_attrs);
+    tdeio_data.setExpectedAttributes(exp_attrs);
 
     TQByteArray exp_content;
     uint exp_content_len = strlen(testcases[i].exp_content);
     exp_content.setRawData(testcases[i].exp_content,exp_content_len);
-    kio_data.setExpectedContent(exp_content);
+    tdeio_data.setExpectedContent(exp_content);
 
-    kio_data.get(testcases[i].url);
+    tdeio_data.get(testcases[i].url);
 
-    kio_data.endTestcase();
+    tdeio_data.endTestcase();
     exp_content.resetRawData(testcases[i].exp_content,exp_content_len);
   }/*next i*/
-  kio_data.endTestrun();
+  tdeio_data.endTestrun();
 
-  return kio_data.hasFailedTestcases() ? 1 : 0;
+  return tdeio_data.hasFailedTestcases() ? 1 : 0;
 }
 
diff --git a/kio/tests/dummymeta.cpp b/tdeio/tests/dummymeta.cpp
index 938b4d00b..938b4d00b 100644
--- a/kio/tests/dummymeta.cpp
+++ b/tdeio/tests/dummymeta.cpp
diff --git a/kio/tests/dummymeta.desktop b/tdeio/tests/dummymeta.desktop
index 6d2748c82..6d2748c82 100644
--- a/kio/tests/dummymeta.desktop
+++ b/tdeio/tests/dummymeta.desktop
diff --git a/kio/tests/dummymeta.h b/tdeio/tests/dummymeta.h
index 053c48ecb..4cefcc01d 100644
--- a/kio/tests/dummymeta.h
+++ b/tdeio/tests/dummymeta.h
@@ -1,7 +1,7 @@
 #ifndef DUMMYMETA_H
 #define DUMMYMETA_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class KFileMetaInfo;
 
diff --git a/kio/tests/getalltest.cpp b/tdeio/tests/getalltest.cpp
index 58c8d5a3f..37f9b1ab2 100644
--- a/kio/tests/getalltest.cpp
+++ b/tdeio/tests/getalltest.cpp
@@ -2,12 +2,12 @@
 #include <kmimetype.h>
 #include <kservicetype.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"getalltest",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
 //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted
    kdDebug() << "All services" << endl;
diff --git a/kio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index 463c464d3..a2d5b40d1 100644
--- a/kio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -22,11 +22,11 @@
 #include <config.h>
 
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klargefile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kprotocolinfo.h>
 
 #include <tqfileinfo.h>
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <utime.h>
 
-// The code comes partly from tdebase/kioslave/trash/testtrash.cpp
+// The code comes partly from tdebase/tdeioslave/trash/testtrash.cpp
 
 static bool check(const TQString& txt, TQString a, TQString b)
 {
@@ -64,9 +64,9 @@ static bool check(const TQString& txt, TQString a, TQString b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
-    KCmdLineArgs::init(argc,argv,"jobtest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication::disableAutoDcopRegistration();
+    TDECmdLineArgs::init(argc,argv,"jobtest", 0, 0, 0, 0);
+    TDEApplication app;
 
     JobTest test;
     test.setup();
@@ -135,9 +135,9 @@ void JobTest::runAll()
 
 void JobTest::cleanup()
 {
-    KIO::NetAccess::del( homeTmpDir(), 0 );
-    KIO::NetAccess::del( otherTmpDir(), 0 );
-    KIO::NetAccess::del( systemTmpDir(), 0 );
+    TDEIO::NetAccess::del( homeTmpDir(), 0 );
+    TDEIO::NetAccess::del( otherTmpDir(), 0 );
+    TDEIO::NetAccess::del( systemTmpDir(), 0 );
 }
 
 static void setTimeStamp( const TQString& path )
@@ -194,19 +194,19 @@ void JobTest::get()
     createTestFile( filePath );
     KURL u; u.setPath( filePath );
     m_result = -1;
-    KIO::StoredTransferJob* job = KIO::storedGet( u );
-    connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
-            this, TQT_SLOT( slotGetResult( KIO::Job* ) ) );
+    TDEIO::StoredTransferJob* job = TDEIO::storedGet( u );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+            this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) );
     kapp->eventLoop()->enterLoop();
     assert( m_result == 0 ); // no error
     assert( m_data.size() == 11 );
     assert( TQCString( m_data ) == "Hello world" );
 }
 
-void JobTest::slotGetResult( KIO::Job* job )
+void JobTest::slotGetResult( TDEIO::Job* job )
 {
     m_result = job->error();
-    m_data = static_cast<KIO::StoredTransferJob *>(job)->data();
+    m_data = static_cast<TDEIO::StoredTransferJob *>(job)->data();
     kapp->eventLoop()->exitLoop();
 }
 
@@ -220,23 +220,23 @@ void JobTest::copyLocalFile( const TQString& src, const TQString& dest )
     d.setPath( dest );
 
     // copy the file with file_copy
-    bool ok = KIO::NetAccess::file_copy( u, d );
+    bool ok = TDEIO::NetAccess::file_copy( u, d );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( TQFile::exists( src ) ); // still there
 
     {
         // check that the timestamp is the same (#24443)
-        // Note: this only works because of copy() in kio_file.
+        // Note: this only works because of copy() in tdeio_file.
         // The datapump solution ignores mtime, the app has to call FileCopyJob::setModificationTime()
         TQFileInfo srcInfo( src );
         TQFileInfo destInfo( dest );
         assert( srcInfo.lastModified() == destInfo.lastModified() );
     }
 
-    // cleanup and retry with KIO::copy()
+    // cleanup and retry with TDEIO::copy()
     TQFile::remove( dest );
-    ok = KIO::NetAccess::dircopy( u, d, 0 );
+    ok = TDEIO::NetAccess::dircopy( u, d, 0 );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( TQFile::exists( src ) ); // still there
@@ -262,7 +262,7 @@ void JobTest::copyLocalDirectory( const TQString& src, const TQString& _dest, in
     else
         assert( !TQFile::exists( dest ) );
 
-    bool ok = KIO::NetAccess::dircopy( u, d, 0 );
+    bool ok = TDEIO::NetAccess::dircopy( u, d, 0 );
     assert( ok );
 
     if ( flags & AlreadyExists ) {
@@ -341,13 +341,13 @@ void JobTest::moveLocalFile( const TQString& src, const TQString& dest )
     d.setPath( dest );
 
     // move the file with file_move
-    bool ok = KIO::NetAccess::file_move( u, d );
+    bool ok = TDEIO::NetAccess::file_move( u, d );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( !TQFile::exists( src ) ); // not there anymore
 
-    // move it back with KIO::move()
-    ok = KIO::NetAccess::move( d, u, 0 );
+    // move it back with TDEIO::move()
+    ok = TDEIO::NetAccess::move( d, u, 0 );
     assert( ok );
     assert( !TQFile::exists( dest ) );
     assert( TQFile::exists( src ) ); // it's back
@@ -363,15 +363,15 @@ static void moveLocalSymlink( const TQString& src, const TQString& dest )
     d.setPath( dest );
 
     // move the symlink with move, NOT with file_move
-    bool ok = KIO::NetAccess::move( u, d );
+    bool ok = TDEIO::NetAccess::move( u, d );
     if ( !ok )
-        kdWarning() << KIO::NetAccess::lastError() << endl;
+        kdWarning() << TDEIO::NetAccess::lastError() << endl;
     assert( ok );
     assert ( KDE_lstat( TQFile::encodeName( dest ), &buf ) == 0 );
     assert( !TQFile::exists( src ) ); // not there anymore
 
-    // move it back with KIO::move()
-    ok = KIO::NetAccess::move( d, u, 0 );
+    // move it back with TDEIO::move()
+    ok = TDEIO::NetAccess::move( d, u, 0 );
     assert( ok );
     assert ( KDE_lstat( TQFile::encodeName( dest ), &buf ) != 0 ); // doesn't exist anymore
     assert ( KDE_lstat( TQFile::encodeName( src ), &buf ) == 0 ); // it's back
@@ -388,7 +388,7 @@ void JobTest::moveLocalDirectory( const TQString& src, const TQString& dest )
     KURL d;
     d.setPath( dest );
 
-    bool ok = KIO::NetAccess::move( u, d, 0 );
+    bool ok = TDEIO::NetAccess::move( u, d, 0 );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( TQFileInfo( dest ).isDir() );
@@ -455,12 +455,12 @@ void JobTest::moveFileNoPermissions()
     KURL d;
     d.setPath( dest );
 
-    KIO::CopyJob* job = KIO::move( u, d, 0 );
+    TDEIO::CopyJob* job = TDEIO::move( u, d, 0 );
     job->setInteractive( false ); // no skip dialog, thanks
     TQMap<TQString, TQString> metaData;
-    bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
+    bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
     assert( !ok );
-    assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED );
+    assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED );
     // OK this is fishy. Just like mv(1), KIO's behavior depends on whether
     // a direct rename(2) was used, or a full copy+del. In the first case
     // there is no destination file created, but in the second case the
@@ -482,12 +482,12 @@ void JobTest::moveDirectoryNoPermissions()
     KURL d;
     d.setPath( dest );
 
-    KIO::CopyJob* job = KIO::move( u, d, 0 );
+    TDEIO::CopyJob* job = TDEIO::move( u, d, 0 );
     job->setInteractive( false ); // no skip dialog, thanks
     TQMap<TQString, TQString> metaData;
-    bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
+    bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
     assert( !ok );
-    assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED );
+    assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED );
     assert( TQFile::exists( dest ) ); // see moveFileNoPermissions
     assert( TQFile::exists( src ) );
 }
@@ -497,10 +497,10 @@ void JobTest::listRecursive()
     const TQString src = homeTmpDir();
     KURL u;
     u.setPath( src );
-    KIO::ListJob* job = KIO::listRecursive( u );
-    connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
-             TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
-    bool ok = KIO::NetAccess::synchronousRun( job, 0 );
+    TDEIO::ListJob* job = TDEIO::listRecursive( u );
+    connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+             TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+    bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
     m_names.sort();
     check( "listRecursive", m_names.join( "," ), ".,..,"
@@ -510,18 +510,18 @@ void JobTest::listRecursive()
             "fileFromHome,fileFromHome_copied" );
 }
 
-void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst )
+void JobTest::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst )
 {
-    for( KIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
-        KIO::UDSEntry::ConstIterator it2 = (*it).begin();
+    for( TDEIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+        TDEIO::UDSEntry::ConstIterator it2 = (*it).begin();
         TQString displayName;
         KURL url;
         for( ; it2 != (*it).end(); it2++ ) {
             switch ((*it2).m_uds) {
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
                 displayName = (*it2).m_str;
                 break;
-            case KIO::UDS_URL:
+            case TDEIO::UDS_URL:
                 url = (*it2).m_str;
                 break;
             }
@@ -533,7 +533,7 @@ void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst )
 void JobTest::copyFileToSystem()
 {
     if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) {
-        kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl;
+        kdDebug() << k_funcinfo << "no tdeio_system, skipping test" << endl;
         return;
     }
 
@@ -551,8 +551,8 @@ void JobTest::copyFileToSystem()
 void JobTest::copyFileToSystem( bool resolve_local_urls )
 {
     kdDebug() << k_funcinfo << resolve_local_urls << endl;
-    extern KIO_EXPORT bool kio_resolve_local_urls;
-    kio_resolve_local_urls = resolve_local_urls;
+    extern TDEIO_EXPORT bool tdeio_resolve_local_urls;
+    tdeio_resolve_local_urls = resolve_local_urls;
 
     const TQString src = homeTmpDir() + "fileFromHome";
     createTestFile( src );
@@ -564,10 +564,10 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
     kdDebug() << "copying " << u << " to " << d << endl;
 
     // copy the file with file_copy
-    KIO::FileCopyJob* job = KIO::file_copy( u, d );
-    connect( job, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&)),
-             this, TQT_SLOT(slotMimetype(KIO::Job*,const TQString&)) );
-    bool ok = KIO::NetAccess::synchronousRun( job, 0 );
+    TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d );
+    connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)),
+             this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
+    bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
 
     TQString dest = realSystemPath() + "fileFromHome_copied";
@@ -583,13 +583,13 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
 
     // Check mimetype
     kdDebug() << m_mimetype << endl;
-    // There's no mimemagic determination in kio_file in trinity. Fixing this for kde4...
+    // There's no mimemagic determination in tdeio_file in trinity. Fixing this for kde4...
     assert( m_mimetype == "application/octet-stream" );
     //assert( m_mimetype == "text/plain" );
 
-    // cleanup and retry with KIO::copy()
+    // cleanup and retry with TDEIO::copy()
     TQFile::remove( dest );
-    ok = KIO::NetAccess::dircopy( u, d, 0 );
+    ok = TDEIO::NetAccess::dircopy( u, d, 0 );
     assert( ok );
     assert( TQFile::exists( dest ) );
     assert( TQFile::exists( src ) ); // still there
@@ -601,10 +601,10 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
     }
 
     // restore normal behavior
-    kio_resolve_local_urls = true;
+    tdeio_resolve_local_urls = true;
 }
 
-void JobTest::slotMimetype(KIO::Job* job, const TQString& type)
+void JobTest::slotMimetype(TDEIO::Job* job, const TQString& type)
 {
     assert( job );
     m_mimetype = type;
diff --git a/kio/tests/jobtest.h b/tdeio/tests/jobtest.h
index 83ec2da7c..5bff6d0e3 100644
--- a/kio/tests/jobtest.h
+++ b/tdeio/tests/jobtest.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 #include <tqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class JobTest : public TQObject
 {
@@ -34,7 +34,7 @@ public:
     void runAll();
     void cleanup();
 
-    // Local tests (kio_file only)
+    // Local tests (tdeio_file only)
     void get();
     void copyFileToSamePartition();
     void copyDirectoryToSamePartition();
@@ -54,9 +54,9 @@ public:
     void copyFileToSystem();
 
 private slots:
-    void slotEntries( KIO::Job*, const KIO::UDSEntryList& lst );
-    void slotGetResult( KIO::Job* );
-    void slotMimetype(KIO::Job*,const TQString&);
+    void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst );
+    void slotGetResult( TDEIO::Job* );
+    void slotMimetype(TDEIO::Job*,const TQString&);
 
 private:
     TQString homeTmpDir() const;
diff --git a/kio/tests/kacltest.cpp b/tdeio/tests/kacltest.cpp
index e97f7c110..50d3bc25a 100644
--- a/kio/tests/kacltest.cpp
+++ b/tdeio/tests/kacltest.cpp
@@ -22,9 +22,9 @@
 #include <config.h>
 
 #include <kacl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfileinfo.h>
 #include <tqeventloop.h>
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <tqdir.h>
 
-// The code comes partly from tdebase/kioslave/trash/testtrash.cpp
+// The code comes partly from tdebase/tdeioslave/trash/testtrash.cpp
 
 static bool check(const TQString& txt, TQString a, TQString b)
 {
@@ -67,9 +67,9 @@ static bool check(const TQString& txt, T a, T b)
 
 int main(int argc, char *argv[])
 {
-    KApplication::disableAutoDcopRegistration();
-    KCmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication::disableAutoDcopRegistration();
+    TDECmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0);
+    TDEApplication app;
 
     KACLTest test;
     test.setup();
diff --git a/kio/tests/kacltest.h b/tdeio/tests/kacltest.h
index 1a85e4109..1a85e4109 100644
--- a/kio/tests/kacltest.h
+++ b/tdeio/tests/kacltest.h
diff --git a/kio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp
index 7d373824e..5f1ad611a 100644
--- a/kio/tests/kdcopcheck.cpp
+++ b/tdeio/tests/kdcopcheck.cpp
@@ -13,7 +13,7 @@
 #include "kdcopcheck.h"
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,7 +44,7 @@ TestService::TestService(const TQString &exec)
            this, TQT_SLOT(newApp(const TQCString&)));
    connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)),
            this, TQT_SLOT(endApp(const TQCString&)));
-   connect(&proc, TQT_SIGNAL(processExited(KProcess *)),
+   connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)),
            this, TQT_SLOT(appExit()));
 
    TQTimer::singleShot(20*1000, this, TQT_SLOT(stop()));
@@ -91,7 +91,7 @@ int TestService::exec()
 int main(int argc, char *argv[])
 {
    putenv("IGNORE_SYCOCA_VERSION=true");
-   KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
    k.dcopClient()->setNotifications(true);
 
diff --git a/kio/tests/kdcopcheck.h b/tdeio/tests/kdcopcheck.h
index 9a76e6246..593dbba1e 100644
--- a/kio/tests/kdcopcheck.h
+++ b/tdeio/tests/kdcopcheck.h
@@ -22,7 +22,7 @@ public slots:
 protected:  
     int result;
     TQString m_exec;
-    KProcess proc;
+    TDEProcess proc;
 };
 
 #endif
diff --git a/kio/tests/kdefaultprogresstest.cpp b/tdeio/tests/kdefaultprogresstest.cpp
index a831041e1..7f1bad6a4 100644
--- a/kio/tests/kdefaultprogresstest.cpp
+++ b/tdeio/tests/kdefaultprogresstest.cpp
@@ -1,13 +1,13 @@
-#include <kapplication.h>
-#include <kio/defaultprogress.h>
+#include <tdeapplication.h>
+#include <tdeio/defaultprogress.h>
 #include <kurl.h>
 #include <kdebug.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kdefaultprogresstest");
+    TDEApplication app(argc, argv, "kdefaultprogresstest");
 
     DefaultProgress* dlg = new DefaultProgress();
     KURL src("http://this.host.doesn't.exist/this/dir/neither/andthisfileneither");
diff --git a/kio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp
index 6137f5e71..aaba5400a 100644
--- a/kio/tests/kdirlistertest.cpp
+++ b/tdeio/tests/kdirlistertest.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirlister.h>
 #include <kdebug.h>
 
@@ -82,10 +82,10 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name )
            debug,  TQT_SLOT( infoMessage( const TQString& ) ) );
   connect( lister, TQT_SIGNAL( percent( int ) ),
            debug,  TQT_SLOT( percent( int ) ) );
-  connect( lister, TQT_SIGNAL( totalSize( KIO::filesize_t ) ),
-           debug,  TQT_SLOT( totalSize( KIO::filesize_t ) ) );
-  connect( lister, TQT_SIGNAL( processedSize( KIO::filesize_t ) ),
-           debug,  TQT_SLOT( processedSize( KIO::filesize_t ) ) );
+  connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+           debug,  TQT_SLOT( totalSize( TDEIO::filesize_t ) ) );
+  connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+           debug,  TQT_SLOT( processedSize( TDEIO::filesize_t ) ) );
   connect( lister, TQT_SIGNAL( speed( int ) ),
            debug,  TQT_SLOT( speed( int ) ) );
 
@@ -151,7 +151,7 @@ void KDirListerTest::completed()
 
 int main ( int argc, char *argv[] )
 {
-  KApplication app( argc, argv, "kdirlistertest" );
+  TDEApplication app( argc, argv, "kdirlistertest" );
 
   KDirListerTest *test = new KDirListerTest( 0 );
   test->show();
diff --git a/kio/tests/kdirlistertest.h b/tdeio/tests/kdirlistertest.h
index 12e72c911..484121eef 100644
--- a/kio/tests/kdirlistertest.h
+++ b/tdeio/tests/kdirlistertest.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <iostream>
 
@@ -88,10 +88,10 @@ public slots:
    void percent( int percent )
    { cout << "*** percent: " << percent << endl; }
 
-   void totalSize( KIO::filesize_t size )
+   void totalSize( TDEIO::filesize_t size )
    { cout << "*** totalSize: " << (long)size << endl; }
 
-   void processedSize( KIO::filesize_t size )
+   void processedSize( TDEIO::filesize_t size )
    { cout << "*** processedSize: " << (long)size << endl; }
 
    void speed( int bytes_per_second )
diff --git a/kio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp
index 48bc59a14..9f50c2170 100644
--- a/kio/tests/kdirwatchtest.cpp
+++ b/tdeio/tests/kdirwatchtest.cpp
@@ -12,26 +12,26 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "kdirwatchtest.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"+[directory ...]", "Directory(ies) to watch", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
 int main (int argc, char **argv)
 {
-  KCmdLineArgs::init(argc, argv, "KDirWatchTest",
+  TDECmdLineArgs::init(argc, argv, "KDirWatchTest",
 		     "Test for KDirWatch", "1.0");
-  KCmdLineArgs::addCmdLineOptions( options );
-  KApplication::addCmdLineOptions();
+  TDECmdLineArgs::addCmdLineOptions( options );
+  TDEApplication::addCmdLineOptions();
 
-  KApplication a;
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDEApplication a;
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   myTest testObject;
 
diff --git a/kio/tests/kdirwatchtest.h b/tdeio/tests/kdirwatchtest.h
index 24dc94a91..493043c01 100644
--- a/kio/tests/kdirwatchtest.h
+++ b/tdeio/tests/kdirwatchtest.h
@@ -17,7 +17,7 @@
 #include <tqobject.h>
 
 #include "kdirwatch.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 class myTest : public TQObject 
 {
diff --git a/kio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp
index 870b85de9..3d7505a3f 100644
--- a/kio/tests/kdirwatchunittest.cpp
+++ b/tdeio/tests/kdirwatchunittest.cpp
@@ -106,7 +106,7 @@ void KDirWatchTest::rename_file(const TQString& from, const TQString& to)
   ::rename(TQFile::encodeName(from), TQFile::encodeName(to));
 }
 
-KUNITTEST_MODULE ( kunittest_kdirwatch, "KDirWatchTest" )
+KUNITTEST_MODULE ( tdeunittest_kdirwatch, "KDirWatchTest" )
 KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
 
 #define SLEEP() TQApplication::processEvents();
diff --git a/kio/tests/kdirwatchunittest.h b/tdeio/tests/kdirwatchunittest.h
index 053ab2882..416aeecfe 100644
--- a/kio/tests/kdirwatchunittest.h
+++ b/tdeio/tests/kdirwatchunittest.h
@@ -17,10 +17,10 @@
 #include <tqobject.h>
 
 #include "kdirwatch.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
-#include <kunittest/tester.h>
-#include <kunittest/module.h>
+#include <tdeunittest/tester.h>
+#include <tdeunittest/module.h>
 
 class KDirWatchTest : public KUnitTest::Tester
 {
diff --git a/kio/tests/kfiltertest.cpp b/tdeio/tests/kfiltertest.cpp
index e070418e4..1922e207e 100644
--- a/kio/tests/kfiltertest.cpp
+++ b/tdeio/tests/kfiltertest.cpp
@@ -88,7 +88,7 @@ void test_textstream(  const TQString & fileName )
 
 int main()
 {
-    KInstance instance("kfiltertest");
+    TDEInstance instance("kfiltertest");
 
     char currentdir[PATH_MAX+1];
     getcwd( currentdir, PATH_MAX );
diff --git a/kio/tests/kionetrctest.cpp b/tdeio/tests/kionetrctest.cpp
index 852a06453..b0fbf7087 100644
--- a/kio/tests/kionetrctest.cpp
+++ b/tdeio/tests/kionetrctest.cpp
@@ -1,15 +1,15 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "authinfo.h"
 
 void output( const KURL& u )
 {
     kdDebug() << "Looking up auto login for: " << u.url() << endl;
-    KIO::NetRC::AutoLogin l;
-    bool result = KIO::NetRC::self()->lookup( u, l, true );
+    TDEIO::NetRC::AutoLogin l;
+    bool result = TDEIO::NetRC::self()->lookup( u, l, true );
     if ( !result )
     {
        kdDebug() << "Either no .netrc and/or .kionetrc file was "
@@ -38,17 +38,17 @@ int main(int argc, char **argv)
 {
     const char *version = "0.5";
     const char *description = "Unit test for .netrc and kionetrc parser.";
-    KCmdLineOptions options[] =
+    TDECmdLineOptions options[] =
     {
         { "+command", "[url1,url2 ,...]", 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
-    KCmdLineArgs::init( argc, argv, "kionetrctest", description, version );
-    KCmdLineArgs::addCmdLineOptions( options );
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init( argc, argv, "kionetrctest", description, version );
+    TDECmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     int count = args->count();
-    KApplication app;
+    TDEApplication app;
 
     if ( !count )
         args->usage();
diff --git a/kio/tests/kiopassdlgtest.cpp b/tdeio/tests/kiopassdlgtest.cpp
index 2e8894108..ba429e67a 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/tdeio/tests/kiopassdlgtest.cpp
@@ -1,21 +1,21 @@
-#include <kapplication.h>
-#include <klocale.h>
-#include <kaboutdata.h>
-#include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdeaboutdata.h>
+#include <tdemessagebox.h>
+#include <tdecmdlineargs.h>
 
 #include "passdlg.h"
 
 int main ( int argc, char** argv )
 {
-    KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
+    TDEAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDEApplication app;
 
     TQString usr, pass, comment, label;
     label = "Site:";
     comment = "<b>localhost</b>";
-    int res = KIO::PasswordDialog::getNameAndPassword( usr, pass, 0L,
+    int res = TDEIO::PasswordDialog::getNameAndPassword( usr, pass, 0L,
                                                        TQString::null, false,
                                                        TQString::null, comment,
                                                        label );
diff --git a/kio/tests/kmfitest.cpp b/tdeio/tests/kmfitest.cpp
index df37df997..a2ec91717 100644
--- a/kio/tests/kmfitest.cpp
+++ b/tdeio/tests/kmfitest.cpp
@@ -3,12 +3,12 @@
 #include <tqfile.h>
 #include <kinstance.h>
 #include <kurl.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kmimetype.h>
 
 int main (int argc, char **argv)
 {
-	KInstance ins("kmfitest");
+	TDEInstance ins("kmfitest");
 
 	if (argc < 2) {
 		printf("usage: %s <file>\n", argv[0]);
diff --git a/kio/tests/kmimefromext.cpp b/tdeio/tests/kmimefromext.cpp
index 248407f95..d2cc0bca8 100644
--- a/kio/tests/kmimefromext.cpp
+++ b/tdeio/tests/kmimefromext.cpp
@@ -18,26 +18,26 @@
 
 #include <ktrader.h>
 #include <kmimetype.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+filename", "the filename to test", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc, char *argv[])
 {
-  KCmdLineArgs::init( argc, argv, "kmimefromext", "A mimetype testing tool, gives the mimetype for a given filename", "0.0" );
+  TDECmdLineArgs::init( argc, argv, "kmimefromext", "A mimetype testing tool, gives the mimetype for a given filename", "0.0" );
 
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   TQString fileName = args->arg( 0 );
 
   // The "true" here means only the filename will be looked at.
diff --git a/kio/tests/kmimemagictest.cpp b/tdeio/tests/kmimemagictest.cpp
index eb01137c9..00c545c3c 100644
--- a/kio/tests/kmimemagictest.cpp
+++ b/tdeio/tests/kmimemagictest.cpp
@@ -30,7 +30,7 @@ int main( int argc, char** argv )
              "Usage : ./kmimemagictest file\n");
       return 1;
   }
-  KInstance blah("kmimemagictest");
+  TDEInstance blah("kmimemagictest");
 
   TQString file = TQString::fromLocal8Bit( argv[1] );
 
diff --git a/kio/tests/kmimetypetest.cpp b/tdeio/tests/kmimetypetest.cpp
index 5802a4084..5d963c81c 100644
--- a/kio/tests/kmimetypetest.cpp
+++ b/tdeio/tests/kmimetypetest.cpp
@@ -38,7 +38,7 @@ static void checkIcon( const KURL& url, const TQString& expectedIcon )
 
 int main( int argc, char** argv )
 {
-  KInstance blah("kmimetypetest");
+  TDEInstance blah("kmimetypetest");
 
   // Obviously those tests will need to be fixed if we ever change the name of the icons
   // but at least they unit-test KMimeType::iconForURL.
diff --git a/kio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp
index 5f9e6ae3b..527077eb0 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/tdeio/tests/kpropsdlgtest.cpp
@@ -1,31 +1,31 @@
-#include <kapplication.h>
-#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdeaboutdata.h>
 #include <kpropertiesdialog.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+url", "the path or url to the file/dir for which to show properties", 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main ( int argc, char** argv )
 {
-    KAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDEAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if ( args->count() < 1 )
-        KCmdLineArgs::usage();
+        TDECmdLineArgs::usage();
     KURL u = args->url( 0 );
 
     // This is the test for the KPropertiesDialog constructor that is now
-    // documented to NOT work. Passing only a URL means a KIO::stat will happen,
+    // documented to NOT work. Passing only a URL means a TDEIO::stat will happen,
     // and asking for the dialog to be modal too creates problems.
     // (A non-modal, URL-only dialog is the one kicker uses for app buttons, no problem there)
     KPropertiesDialog* dlg = new KPropertiesDialog( u, 0, 0, true /*modal*/, false /*we do exec ourselves*/ );
diff --git a/kio/tests/kprotocolinfotest.cpp b/tdeio/tests/kprotocolinfotest.cpp
index b0fe392f2..9b5242d65 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/tdeio/tests/kprotocolinfotest.cpp
@@ -17,20 +17,20 @@
  */
 
 #include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
-#include <kapplication.h>
-#include <kglobalsettings.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeprotocolmanager.h>
+#include <tdeapplication.h>
+#include <tdeglobalsettings.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <assert.h>
 
 int main(int argc, char **argv) {
-    KAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
+    TDEAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
                         "1.0");
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDEApplication app;
 
     KURL url;
     url.setPath("/tmp");
@@ -45,14 +45,14 @@ int main(int argc, char **argv) {
 
     assert( KProtocolInfo::showFilePreview( "file" ) == true );
     assert( KProtocolInfo::showFilePreview( "audiocd" ) == false );
-    assert( KGlobalSettings::showFilePreview( "audiocd:/" ) == false );
+    assert( TDEGlobalSettings::showFilePreview( "audiocd:/" ) == false );
 
     TQString proxy;
     TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.kde.org", proxy );
     assert( protocol == "http" );
 
     TQStringList capabilities = KProtocolInfo::capabilities( "imap" );
-    kdDebug() << "kio_imap capabilities: " << capabilities << endl;
+    kdDebug() << "tdeio_imap capabilities: " << capabilities << endl;
     //assert(capabilities.contains("ACL"));
 
     return 0;
diff --git a/kio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp
index 673948374..f2065f8b8 100644
--- a/kio/tests/kruntest.cpp
+++ b/tdeio/tests/kruntest.cpp
@@ -21,7 +21,7 @@
 
 #include "kruntest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kshell.h>
 #include <kservice.h>
@@ -121,7 +121,7 @@ void checkPDE(const KService &service, const KURL::List &urls, bool hs, bool tf,
 
 int main(int argc, char **argv)
 {
-  KApplication app( argc, argv, "kruntest", true /* it _has_ a GUI ! */);
+  TDEApplication app( argc, argv, "kruntest", true /* it _has_ a GUI ! */);
 
   // First some non-interactive tests
   checkBN( "/usr/bin/ls", true, "ls");
diff --git a/kio/tests/kruntest.h b/tdeio/tests/kruntest.h
index 68e7a7280..68e7a7280 100644
--- a/kio/tests/kruntest.h
+++ b/tdeio/tests/kruntest.h
diff --git a/kio/tests/kscantest.cpp b/tdeio/tests/kscantest.cpp
index 347993af8..d37f2eb97 100644
--- a/kio/tests/kscantest.cpp
+++ b/tdeio/tests/kscantest.cpp
@@ -1,9 +1,9 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kscan.h>
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kscantest" );
+    TDEApplication app( argc, argv, "kscantest" );
     KScanDialog *dlg = KScanDialog::getScanDialog();
     if ( !dlg ) {
 	tqDebug("*** EEK, no Scan-service available, aborting!");
diff --git a/kio/tests/kshredtest.cpp b/tdeio/tests/kshredtest.cpp
index 76e87fca4..76e87fca4 100644
--- a/kio/tests/kshredtest.cpp
+++ b/tdeio/tests/kshredtest.cpp
diff --git a/kio/tests/ktartest.cpp b/tdeio/tests/ktartest.cpp
index 5fe4a4f1f..2c470f6e4 100644
--- a/kio/tests/ktartest.cpp
+++ b/tdeio/tests/ktartest.cpp
@@ -50,7 +50,7 @@ int main( int argc, char** argv )
  " ./ktartest iodevice /path/to/existing_file.tar.gz   tests KArchiveFile::device()\n");
     return 1;
   }
-  KInstance instance("ktartest");
+  TDEInstance instance("ktartest");
   TQString command = argv[1];
   if ( command == "list" )
   {
diff --git a/kio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index 7f448c541..5cc79bd82 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -22,16 +22,16 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 static const char * const s_uritypes[] = { "NET_PROTOCOL", "LOCAL_FILE", "LOCAL_DIR", "EXECUTABLE", "HELP", "SHELL", "BLOCKED", "ERROR", "UNKNOWN" };
 #define NO_FILTERING -2
@@ -145,28 +145,28 @@ static const char programName[] = I18N_NOOP("kurifiltertest");
 static const char description[] = I18N_NOOP("Unit test for the URI filter plugin framework.");
 static const char version[] = "1.5";
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
    { "s", I18N_NOOP("Use space as keyword delimeter for web shortcuts"), 0},
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
 {
     // Ensure that user configuration doesn't change the results of those tests
-    // TDEHOME needs to be writable though, for a ksycoca database
+    // TDEHOME needs to be writable though, for a tdesycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
-    KAboutData aboutData(appName, programName, version, description);
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDEAboutData aboutData(appName, programName, version, description);
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
     app.disableAutoDcopRegistration();
 
     // Allow testing of the search engine using both delimiters...
-    char delimiter = KCmdLineArgs::parsedArgs()->isSet("s") ? ' ' : ':';
+    char delimiter = TDECmdLineArgs::parsedArgs()->isSet("s") ? ' ' : ':';
 
     // Many tests check the "default search engine" feature.
     // There is no default search engine by default (since it was annoying when making typos),
@@ -182,13 +182,13 @@ int main(int argc, char **argv)
 
     // Enable verbosity for debugging
     {
-      KSimpleConfig cfg( "kshorturifilterrc" );
+      KSimpleConfig cfg( "tdeshorturifilterrc" );
       cfg.writeEntry( "Verbose", true );
       cfg.sync();
     }
 
     TQStringList minicliFilters;
-    minicliFilters << "kshorturifilter" << "kurisearchfilter" << "localdomainurifilter";
+    minicliFilters << "tdeshorturifilter" << "kurisearchfilter" << "localdomainurifilter";
 
     // URI that should require no filtering
     filter( "http://www.kde.org", "http://www.kde.org", KURIFilterData::NET_PROTOCOL );
@@ -213,8 +213,8 @@ int main(int argc, char **argv)
     filter( "ftp://username@ftp.kde.org:500", "ftp://username@ftp.kde.org:500", KURIFilterData::NET_PROTOCOL );
 
     // ShortURI/LocalDomain filter tests. NOTE: any of these tests can fail
-    // if you have specified your own patterns in kshorturifilterrc. For
-    // examples, see $TDEDIR/share/config/kshorturifilterrc .
+    // if you have specified your own patterns in tdeshorturifilterrc. For
+    // examples, see $TDEDIR/share/config/tdeshorturifilterrc .
     filter( "linuxtoday.com", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL );
     filter( "LINUXTODAY.COM", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL );
     filter( "kde.org", "http://kde.org", KURIFilterData::NET_PROTOCOL );
@@ -240,10 +240,10 @@ int main(int argc, char **argv)
     // filter( "localhost/~blah", "http://localhost.localdomain/~blah", KURIFilterData::NET_PROTOCOL );
 
     filter( "/", "/", KURIFilterData::LOCAL_DIR );
-    filter( "/", "/", KURIFilterData::LOCAL_DIR, "kshorturifilter" );
-    filter( "~/.bashrc", TQDir::homeDirPath().local8Bit()+"/.bashrc", KURIFilterData::LOCAL_FILE, "kshorturifilter" );
-    filter( "~", TQDir::homeDirPath().local8Bit(), KURIFilterData::LOCAL_DIR, "kshorturifilter", "/tmp" );
-    filter( "~foobar", 0, KURIFilterData::ERROR, "kshorturifilter" );
+    filter( "/", "/", KURIFilterData::LOCAL_DIR, "tdeshorturifilter" );
+    filter( "~/.bashrc", TQDir::homeDirPath().local8Bit()+"/.bashrc", KURIFilterData::LOCAL_FILE, "tdeshorturifilter" );
+    filter( "~", TQDir::homeDirPath().local8Bit(), KURIFilterData::LOCAL_DIR, "tdeshorturifilter", "/tmp" );
+    filter( "~foobar", 0, KURIFilterData::ERROR, "tdeshorturifilter" );
     filter( "user@host.domain", "mailto:user@host.domain", KURIFilterData::NET_PROTOCOL ); // new in KDE-3.2
 
     // Windows style SMB (UNC) URL. Should be converted into the valid smb format...
@@ -292,7 +292,7 @@ int main(int argc, char **argv)
     TQCString home = getenv("HOME");
     TQCString tdehome = getenv("TDEHOME");
 
-    filter( "$SOMEVAR/tdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
+    filter( "$SOMEVAR/tdelibs/tdeio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
     filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
     filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
     filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion
@@ -305,11 +305,11 @@ int main(int argc, char **argv)
     }
 
     filter( "$TDEHOME/share", tdehome+"/share", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( tdehome+"/a+plus" );
+    TDEStandardDirs::makeDir( tdehome+"/a+plus" );
     filter( "$TDEHOME/a+plus", tdehome+"/a+plus", KURIFilterData::LOCAL_DIR );
 
     // BR 27788
-    KStandardDirs::makeDir( tdehome+"/share/Dir With Space" );
+    TDEStandardDirs::makeDir( tdehome+"/share/Dir With Space" );
     filter( "$TDEHOME/share/Dir With Space", tdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR );
 
     // support for name filters (BR 93825)
@@ -318,11 +318,11 @@ int main(int argc, char **argv)
     filter( "$TDEHOME/a?c.txt", tdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR );
     filter( "$TDEHOME/?c.txt", tdehome+"/?c.txt", KURIFilterData::LOCAL_DIR );
     // but let's check that a directory with * in the name still works
-    KStandardDirs::makeDir( tdehome+"/share/Dir*With*Stars" );
+    TDEStandardDirs::makeDir( tdehome+"/share/Dir*With*Stars" );
     filter( "$TDEHOME/share/Dir*With*Stars", tdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( tdehome+"/share/Dir?QuestionMark" );
+    TDEStandardDirs::makeDir( tdehome+"/share/Dir?QuestionMark" );
     filter( "$TDEHOME/share/Dir?QuestionMark", tdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( tdehome+"/share/Dir[Bracket" );
+    TDEStandardDirs::makeDir( tdehome+"/share/Dir[Bracket" );
     filter( "$TDEHOME/share/Dir[Bracket", tdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
 
     filter( "$HOME/$TDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
@@ -333,8 +333,8 @@ int main(int argc, char **argv)
     // the shortURI filter will return the string
     // itself if the requested environment variable
     // is not already set.
-    filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "kshorturifilter" ); //use specific filter.
-    filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "kshorturifilter" ); //use specific filter.
+    filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
+    filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
 
 
     TQCString sc;
@@ -348,13 +348,13 @@ int main(int argc, char **argv)
     filter( sc.sprintf("gg%cé", delimiter) /*eaccent in utf8*/, "http://www.google.com/search?q=%C3%A9&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );
     filter( sc.sprintf("gg%cпрйвет", delimiter) /* greetings in russian utf-8*/, "http://www.google.com/search?q=%D0%BF%D1%80%D0%B9%D0%B2%D0%B5%D1%82&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );
 
-    // Absolute Path tests for kshorturifilter
-    filter( "./", tdehome+"/share", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share/" ); // cleanDirPath removes the trailing slash
-    filter( "../", tdehome, KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" );
-    filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" );
+    // Absolute Path tests for tdeshorturifilter
+    filter( "./", tdehome+"/share", KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share/" ); // cleanDirPath removes the trailing slash
+    filter( "../", tdehome, KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share" );
+    filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "tdeshorturifilter", tdehome+"/share" );
 
     // Clean up
-    KIO::NetAccess::del( tdehome, 0 );
+    TDEIO::NetAccess::del( tdehome, 0 );
 
     kdDebug() << "All tests done. Go home..." << endl;
     return 0;
diff --git a/kio/tests/kurlcompletiontest.cpp b/tdeio/tests/kurlcompletiontest.cpp
index cd1919def..7d479d156 100644
--- a/kio/tests/kurlcompletiontest.cpp
+++ b/tdeio/tests/kurlcompletiontest.cpp
@@ -16,14 +16,14 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurlcompletion.h>
 #include <kdebug.h>
 #include <tqdir.h>
 #include <assert.h>
 #include <tqfile.h>
 #include <ktempdir.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <unistd.h>
 
 class KURLCompletionTest
@@ -164,9 +164,9 @@ void KURLCompletionTest::testLocalURL()
 
 int main( int argc, char **argv )
 {
-    KApplication::disableAutoDcopRegistration();
-    KCmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0);
-    KApplication app;
+    TDEApplication::disableAutoDcopRegistration();
+    TDECmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0);
+    TDEApplication app;
 
     {
         KURLCompletionTest test;
diff --git a/kio/tests/kziptest.cpp b/tdeio/tests/kziptest.cpp
index 5b784c40b..84d38d134 100644
--- a/kio/tests/kziptest.cpp
+++ b/tdeio/tests/kziptest.cpp
@@ -98,7 +98,7 @@ int main( int argc, char** argv )
  " ./kziptest iodevice /path/to/existing_file.zip   tests KArchiveFile::device()\n");
     return 1;
   }
-  KInstance instance("kziptest");
+  TDEInstance instance("kziptest");
   TQString command = argv[1];
   if ( command == "list" )
   {
diff --git a/kio/tests/metatest.cpp b/tdeio/tests/metatest.cpp
index 54b87b6a0..cd391e0d5 100644
--- a/kio/tests/metatest.cpp
+++ b/tdeio/tests/metatest.cpp
@@ -1,6 +1,6 @@
-#include <kapplication.h>
-#include <kfilemetainfo.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdefilemetainfo.h>
+#include <tdecmdlineargs.h>
 #include <tqstringlist.h>
 #include <tqimage.h>
 #include <kdebug.h>
@@ -9,7 +9,7 @@
 
 #define I18N_NOOP
 
- static KCmdLineOptions options[] = 
+ static TDECmdLineOptions options[] = 
   {
      { "+file", "File name", 0 },
      { "addgroup ", "Add a group to a file", 0},
@@ -23,7 +23,7 @@
      { "set ", "Set the value of --item in --group", 0},
      { "groups",  "list the groups of this file", 0 },
      { "mimetypeinfo ", "the mimetype info for a mimetype", 0 },
-     KCmdLineLastOption
+     TDECmdLineLastOption
   };
   
 void printKeyValues(KFileMetaInfo& info)
@@ -181,17 +181,17 @@ void removeGroup(KFileMetaInfo& info, TQString group)
 int main( int argc, char **argv )
 {
     // Initialize command line args
-    KCmdLineArgs::init(argc, argv, "kfilemetatest", "testing kfilmetainfo", "X");
+    TDECmdLineArgs::init(argc, argv, "tdefilemetatest", "testing kfilmetainfo", "X");
 
     // Tell which options are supported
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
     // Add options from other components
-    KApplication::addCmdLineOptions();
+    TDEApplication::addCmdLineOptions();
     
-    KApplication app;
+    TDEApplication app;
 
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
     TQCString ov;
     ov = args->getOption("mimetypeinfo");
diff --git a/kio/tests/netaccesstest.cpp b/tdeio/tests/netaccesstest.cpp
index 9fb0ff07a..b9b0ffab7 100644
--- a/kio/tests/netaccesstest.cpp
+++ b/tdeio/tests/netaccesstest.cpp
@@ -16,23 +16,23 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqfile.h>
 
 int main(int argc, char **argv)
 {
-  KApplication app( argc, argv, "netaccesstest", true /* it _has_ a GUI ! */);
+  TDEApplication app( argc, argv, "netaccesstest", true /* it _has_ a GUI ! */);
 
   KURL srcURL( "ftp://ftp.kde.org/pub/kde/README" );
   KURL tmpURL( "file:/tmp/netaccesstest_README" );
 
   for ( uint i = 0; i < 4 ; ++i ) {
     kdDebug() << "file_copy" << endl;
-    if ( !KIO::NetAccess::file_copy(srcURL, tmpURL, -1, true, false, 0) )
-      kdError() << "file_copy failed: " << KIO::NetAccess::lastErrorString() << endl;
+    if ( !TDEIO::NetAccess::file_copy(srcURL, tmpURL, -1, true, false, 0) )
+      kdError() << "file_copy failed: " << TDEIO::NetAccess::lastErrorString() << endl;
     else {
       TQFile f( tmpURL.path() );
       if (!f.open(IO_ReadOnly))
diff --git a/kio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp
index f2b740224..6d0cd78b2 100644
--- a/kio/tests/previewtest.cpp
+++ b/tdeio/tests/previewtest.cpp
@@ -3,11 +3,11 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include "previewtest.moc"
 
@@ -30,13 +30,13 @@ void PreviewTest::slotGenerate()
 {
     KURL::List urls;
     urls.append(m_url->text());
-    KIO::PreviewJob *job = KIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48);
-    connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*)));
+    TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48);
+    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
     connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &)));
     connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed()));
 }
 
-void PreviewTest::slotResult(KIO::Job*)
+void PreviewTest::slotResult(TDEIO::Job*)
 {
     kdDebug() << "PreviewTest::slotResult(...)" << endl;
 }
@@ -55,7 +55,7 @@ void PreviewTest::slotFailed()
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "previewtest");
+    TDEApplication app(argc, argv, "previewtest");
     PreviewTest *w = new PreviewTest;
     w->show();
     app.setMainWidget(w);
diff --git a/kio/tests/previewtest.h b/tdeio/tests/previewtest.h
index 27d797403..5ef82916d 100644
--- a/kio/tests/previewtest.h
+++ b/tdeio/tests/previewtest.h
@@ -1,6 +1,6 @@
 
 #include <tqwidget.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class KLineEdit;
 class TQLabel;
@@ -14,7 +14,7 @@ public:
 
 private slots:
     void slotGenerate();
-    void slotResult(KIO::Job *);
+    void slotResult(TDEIO::Job *);
     void slotPreview( const KFileItem *, const TQPixmap & );
     void slotFailed();
 
diff --git a/kio/tests/speed.cpp b/tdeio/tests/speed.cpp
index d8ddae20a..4b14a6bb6 100644
--- a/kio/tests/speed.cpp
+++ b/tdeio/tests/speed.cpp
@@ -17,29 +17,29 @@
  *  Boston, MA 02110-1301, USA.
  */
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <time.h>
 #include "speed.h"
-#include <kio/job.h>
-#include <kcmdlineargs.h>
+#include <tdeio/job.h>
+#include <tdecmdlineargs.h>
 #include <tqdir.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 SpeedTest::SpeedTest( const KURL & url )
     : TQObject(0, "speed")
 {
     Job *job = listRecursive( url );
     //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS !
-    connect(job, TQT_SIGNAL( result( KIO::Job*)),
-	    TQT_SLOT( finished( KIO::Job* ) ));
-    /*connect(job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)),
-	    TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList&)));
+    connect(job, TQT_SIGNAL( result( TDEIO::Job*)),
+	    TQT_SLOT( finished( TDEIO::Job* ) ));
+    /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+	    TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     */
 }
 
-void SpeedTest::entries(KIO::Job*, const UDSEntryList& list) {
+void SpeedTest::entries(TDEIO::Job*, const UDSEntryList& list) {
 
     UDSEntryListConstIterator it=list.begin();
     for (; it != list.end(); ++it) {
@@ -57,21 +57,21 @@ void SpeedTest::finished(Job*) {
     kapp->quit();
 }
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+[URL]", "the URL to list", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc, char **argv) {
 
-    KCmdLineArgs::init( argc, argv, "speedapp", "A KIO::listRecursive testing tool", "0.0" );
+    TDECmdLineArgs::init( argc, argv, "speedapp", "A TDEIO::listRecursive testing tool", "0.0" );
 
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     KURL url;
     if ( args->count() == 1 )
@@ -79,15 +79,15 @@ int main(int argc, char **argv) {
     else
       url = "file:" + TQDir::currentDirPath();
 
-    kdDebug() << url.url() << " is probably " << (KIO::probably_slow_mounted(url.path()) ? "slow" : "normal") << " mounted\n";
-    kdDebug() << url.url() << " is " << (KIO::manually_mounted(url.path()) ? "manually" : "system") << " mounted\n";
-    TQString mp = KIO::findDeviceMountPoint(url.path());
+    kdDebug() << url.url() << " is probably " << (TDEIO::probably_slow_mounted(url.path()) ? "slow" : "normal") << " mounted\n";
+    kdDebug() << url.url() << " is " << (TDEIO::manually_mounted(url.path()) ? "manually" : "system") << " mounted\n";
+    TQString mp = TDEIO::findDeviceMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for device " << url.url() << " found\n";
     } else
         kdDebug() << mp << " is the mount point for device " << url.url() << endl;
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
     // SpeedTest test( url );
     // app.exec();
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -105,7 +105,7 @@ int main(int argc, char **argv) {
 
     url.setPath(TQDir::homeDirPath());
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
     // SpeedTest test( url );
     // app.exec();
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
@@ -126,7 +126,7 @@ int main(int argc, char **argv) {
     else
       url = "file:" + TQDir::currentDirPath();
 
-    mp = KIO::findPathMountPoint(url.path());
+    mp = TDEIO::findPathMountPoint(url.path());
     if (mp.isEmpty()) {
         kdDebug() << "no mount point for path " << url.url() << " found\n";
     } else
diff --git a/kio/tests/speed.h b/tdeio/tests/speed.h
index 69b12465f..d7801ae47 100644
--- a/kio/tests/speed.h
+++ b/tdeio/tests/speed.h
@@ -2,10 +2,10 @@
 #ifndef _SPEED_H
 #define _SPEED_H
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
@@ -16,8 +16,8 @@ public:
     SpeedTest(const KURL & url);
 
 private slots:
-    void entries( KIO::Job *, const KIO::UDSEntryList& );
-    void finished( KIO::Job *job );
+    void entries( TDEIO::Job *, const TDEIO::UDSEntryList& );
+    void finished( TDEIO::Job *job );
 
 };
 
diff --git a/kio/tests/kioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index 0db23457d..3cc22d8e2 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -14,22 +14,22 @@
 #include <tqdir.h>
 
 #include <kacl.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstatusbar.h>
-#include <kio/job.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/scheduler.h>
 #include <kprotocolinfo.h>
 
-#include "kioslavetest.h"
+#include "tdeioslavetest.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
-  : KMainWindow(0, "")
+  : TDEMainWindow(0, "")
 {
 
   job = 0L;
@@ -165,10 +165,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
   setCentralWidget( main_widget );
 
   slave = 0;
-//  slave = KIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org"));
-  KIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(KIO::Slave*)),
+//  slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org"));
+  TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)),
 	this, TQT_SLOT(slotSlaveConnected()));
-  KIO::Scheduler::connect(TQT_SIGNAL(slaveError(KIO::Slave*,int,const TQString&)),
+  TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)),
 	this, TQT_SLOT(slotSlaveError()));
 }
 
@@ -183,7 +183,7 @@ void KioslaveTest::slotQuit(){
     job->kill( true );  // kill the job quietly
   }
   if (slave)
-    KIO::Scheduler::disconnectSlave(slave);
+    TDEIO::Scheduler::disconnectSlave(slave);
   kapp->quit();
 }
 
@@ -241,70 +241,70 @@ void KioslaveTest::startJob() {
 
   switch ( selectedOperation ) {
   case List:
-    myJob = KIO::listDir( src );
-    connect(myJob, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)),
-            TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&)));
+    myJob = TDEIO::listDir( src );
+    connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+            TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     break;
 
   case ListRecursive:
-    myJob = KIO::listRecursive( src );
-    connect(myJob, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList&)),
-            TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList&)));
+    myJob = TDEIO::listRecursive( src );
+    connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+            TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     break;
 
   case Stat:
-    myJob = KIO::stat( src, false, 2 );
+    myJob = TDEIO::stat( src, false, 2 );
     break;
 
   case Get:
-    myJob = KIO::get( src, true );
-    connect(myJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray &)),
-            TQT_SLOT( slotData( KIO::Job*, const TQByteArray &)));
+    myJob = TDEIO::get( src, true );
+    connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+            TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
     break;
 
   case Put:
     putBuffer = 0;
-    myJob = KIO::put( src, -1, true, false);
-    connect(myJob, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray &)),
-            TQT_SLOT( slotDataReq( KIO::Job*, TQByteArray &)));
+    myJob = TDEIO::put( src, -1, true, false);
+    connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)),
+            TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &)));
     break;
 
   case Copy:
-    job = KIO::copy( src, dest, observe );
+    job = TDEIO::copy( src, dest, observe );
     break;
 
   case Move:
-    job = KIO::move( src, dest, observe );
+    job = TDEIO::move( src, dest, observe );
     break;
 
   case Delete:
-    job = KIO::del( src, false, observe );
+    job = TDEIO::del( src, false, observe );
     break;
 
   case Shred:
-    job = KIO::del(src, true, observe);
+    job = TDEIO::del(src, true, observe);
     break;
 
   case Mkdir:
-    myJob = KIO::mkdir( src );
+    myJob = TDEIO::mkdir( src );
     break;
 
   case Mimetype:
-    myJob = KIO::mimetype( src );
+    myJob = TDEIO::mimetype( src );
     break;
   }
   if (myJob)
   {
     if (slave)
-      KIO::Scheduler::assignJobToSlave(slave, myJob);
+      TDEIO::Scheduler::assignJobToSlave(slave, myJob);
     job = myJob;
   }
 
-  connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 
-  connect( job, TQT_SIGNAL( canceled( KIO::Job * ) ),
-           TQT_SLOT( slotResult( KIO::Job * ) ) );
+  connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ),
+           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 
   if (progressMode == ProgressStatus) {
     statusProgress->setJob( job );
@@ -314,7 +314,7 @@ void KioslaveTest::startJob() {
 }
 
 
-void KioslaveTest::slotResult( KIO::Job * _job )
+void KioslaveTest::slotResult( TDEIO::Job * _job )
 {
   if ( _job->error() )
   {
@@ -322,12 +322,12 @@ void KioslaveTest::slotResult( KIO::Job * _job )
   }
   else if ( selectedOperation == Stat )
   {
-      UDSEntry entry = ((KIO::StatJob*)_job)->statResult();
+      UDSEntry entry = ((TDEIO::StatJob*)_job)->statResult();
       printUDSEntry( entry );
   }
   else if ( selectedOperation == Mimetype )
   {
-      kdDebug() << "mimetype is " << ((KIO::MimetypeJob*)_job)->mimetype() << endl;
+      kdDebug() << "mimetype is " << ((TDEIO::MimetypeJob*)_job)->mimetype() << endl;
   }
 
   if (job == _job)
@@ -357,62 +357,62 @@ static void printACL( const TQString& acl )
 }
 
 
-void KioslaveTest::printUDSEntry( const KIO::UDSEntry & entry )
+void KioslaveTest::printUDSEntry( const TDEIO::UDSEntry & entry )
 {
-    KIO::UDSEntry::ConstIterator it = entry.begin();
+    TDEIO::UDSEntry::ConstIterator it = entry.begin();
     for( ; it != entry.end(); it++ ) {
         switch ((*it).m_uds) {
-            case KIO::UDS_FILE_TYPE:
+            case TDEIO::UDS_FILE_TYPE:
                 kdDebug() << "File Type : " << (mode_t)((*it).m_long) << endl;
                 if ( S_ISDIR( (mode_t)((*it).m_long) ) )
                 {
                     kdDebug() << "is a dir" << endl;
                 }
                 break;
-            case KIO::UDS_ACCESS:
+            case TDEIO::UDS_ACCESS:
                 kdDebug() << "Access permissions : " << (*it).m_long << endl;
                 break;
-            case KIO::UDS_EXTENDED_ACL:
+            case TDEIO::UDS_EXTENDED_ACL:
                 if( (*it).m_long == 1 )
                   kdDebug() << "Has extended ACL information." << endl;
                 break;
-            case KIO::UDS_ACL_STRING:
+            case TDEIO::UDS_ACL_STRING:
                 kdDebug() << "ACL: " << ( (*it).m_str.ascii() ) << endl;
                 printACL( (*it).m_str );
                 break;
-            case KIO::UDS_DEFAULT_ACL_STRING:
+            case TDEIO::UDS_DEFAULT_ACL_STRING:
                 kdDebug() << "Default ACL: " << ( (*it).m_str.ascii() ) << endl;
                 printACL( (*it).m_str );
                 break;
-            case KIO::UDS_USER:
+            case TDEIO::UDS_USER:
                 kdDebug() << "User : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_GROUP:
+            case TDEIO::UDS_GROUP:
                 kdDebug() << "Group : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
                 kdDebug() << "Name : " << ((*it).m_str.ascii() ) << endl;
                 //m_strText = decodeFileName( (*it).m_str );
                 break;
-            case KIO::UDS_URL:
+            case TDEIO::UDS_URL:
                 kdDebug() << "URL : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_MIME_TYPE:
+            case TDEIO::UDS_MIME_TYPE:
                 kdDebug() << "MimeType : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_LINK_DEST:
+            case TDEIO::UDS_LINK_DEST:
                 kdDebug() << "LinkDest : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_SIZE:
-                kdDebug() << "Size: " << KIO::convertSize((*it).m_long) << endl;
+            case TDEIO::UDS_SIZE:
+                kdDebug() << "Size: " << TDEIO::convertSize((*it).m_long) << endl;
                 break;
         }
     }
 }
 
-void KioslaveTest::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list) {
+void KioslaveTest::slotEntries(TDEIO::Job* job, const TDEIO::UDSEntryList& list) {
 
-    KURL url = static_cast<KIO::ListJob*>( job )->url();
+    KURL url = static_cast<TDEIO::ListJob*>( job )->url();
     KProtocolInfo::ExtraFieldList extraFields = KProtocolInfo::extraFields(url);
     UDSEntryListConstIterator it=list.begin();
     for (; it != list.end(); ++it) {
@@ -433,7 +433,7 @@ void KioslaveTest::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list) {
     }
 }
 
-void KioslaveTest::slotData(KIO::Job*, const TQByteArray &data)
+void KioslaveTest::slotData(TDEIO::Job*, const TQByteArray &data)
 {
     if (data.size() == 0)
     {
@@ -445,7 +445,7 @@ void KioslaveTest::slotData(KIO::Job*, const TQByteArray &data)
     }
 }
 
-void KioslaveTest::slotDataReq(KIO::Job*, TQByteArray &data)
+void KioslaveTest::slotDataReq(TDEIO::Job*, TQByteArray &data)
 {
     const char *fileDataArray[] =
        {
@@ -479,8 +479,8 @@ void KioslaveTest::stopJob() {
 }
 
 static const char version[] = "v0.0.0 0000";   // :-)
-static const char description[] = "Test for kioslaves";
-static KCmdLineOptions options[] =
+static const char description[] = "Test for tdeioslaves";
+static TDECmdLineOptions options[] =
 {
  { "s", 0, 0 },
  { "src <src>", "Source URL", "" },
@@ -490,15 +490,15 @@ static KCmdLineOptions options[] =
  { "operation <operation>", "Operation (list,listrecursive,stat,get,put,copy,move,del,shred,mkdir)", "copy" },
  { "p", 0, 0 },
  { "progress <progress>", "Progress Type (none,default,status)", "default" },
- KCmdLineLastOption
+ TDECmdLineLastOption
 };
 
 int main(int argc, char **argv) {
-  KCmdLineArgs::init( argc, argv, "kioslavetest", description, version );
-  KCmdLineArgs::addCmdLineOptions( options );
-  KApplication app;
+  TDECmdLineArgs::init( argc, argv, "tdeioslavetest", description, version );
+  TDECmdLineArgs::addCmdLineOptions( options );
+  TDEApplication app;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   TQString src = args->getOption("src");
   TQString dest = args->getOption("dest");
@@ -529,7 +529,7 @@ int main(int argc, char **argv) {
     op = KioslaveTest::Shred;
   } else if ( tmps == "mkdir") {
     op = KioslaveTest::Mkdir;
-  } else KCmdLineArgs::usage("unknown operation");
+  } else TDECmdLineArgs::usage("unknown operation");
 
   tmps = args->getOption("progress");
   if ( tmps == "none") {
@@ -538,7 +538,7 @@ int main(int argc, char **argv) {
     pr = KioslaveTest::ProgressDefault;
   } else if ( tmps == "status") {
     pr = KioslaveTest::ProgressStatus;
-  } else KCmdLineArgs::usage("unknown progress mode");
+  } else TDECmdLineArgs::usage("unknown progress mode");
 
   args->clear(); // Free up memory
 
@@ -552,4 +552,4 @@ int main(int argc, char **argv) {
 }
 
 
-#include "kioslavetest.moc"
+#include "tdeioslavetest.moc"
diff --git a/kio/tests/kioslavetest.h b/tdeio/tests/tdeioslavetest.h
index 02fae7f23..04992f889 100644
--- a/kio/tests/kioslavetest.h
+++ b/tdeio/tests/tdeioslavetest.h
@@ -19,14 +19,14 @@
 #include <tqbuttongroup.h>
 #include <tqwidget.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
-#include "kio/job.h"
-#include "kio/global.h"
-#include "kio/statusbarprogress.h"
-#include "kio/slave.h"
+#include "tdeio/job.h"
+#include "tdeio/global.h"
+#include "tdeio/statusbarprogress.h"
+#include "tdeio/slave.h"
 
-class KioslaveTest : public KMainWindow {
+class KioslaveTest : public TDEMainWindow {
   Q_OBJECT
 
 public:
@@ -41,7 +41,7 @@ protected:
 
   void closeEvent( TQCloseEvent * );
 
-  void printUDSEntry( const KIO::UDSEntry & entry );
+  void printUDSEntry( const TDEIO::UDSEntry & entry );
 
   // info stuff
   TQLabel *lb_from;
@@ -84,25 +84,25 @@ protected slots:
   void startJob();
   void stopJob();
 
-  void slotResult( KIO::Job * );
-  void slotEntries( KIO::Job *, const KIO::UDSEntryList& );
-  void slotData( KIO::Job *, const TQByteArray &data );
-  void slotDataReq( KIO::Job *, TQByteArray &data );
+  void slotResult( TDEIO::Job * );
+  void slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& );
+  void slotData( TDEIO::Job *, const TQByteArray &data );
+  void slotDataReq( TDEIO::Job *, TQByteArray &data );
 
   void slotQuit();
   void slotSlaveConnected();
   void slotSlaveError();
 
 private:
-  KIO::Job *job;
+  TDEIO::Job *job;
   TQWidget *main_widget;
 
-  KIO::StatusbarProgress *statusProgress;
+  TDEIO::StatusbarProgress *statusProgress;
 
   int selectedOperation;
   int progressMode;
   int putBuffer;
-  KIO::Slave *slave;
+  TDEIO::Slave *slave;
 };
 
 #endif // _KIOSLAVETEST_H
diff --git a/kio/tests/ksycocatest.cpp b/tdeio/tests/tdesycocatest.cpp
index 086836f37..719d90da8 100644
--- a/kio/tests/ksycocatest.cpp
+++ b/tdeio/tests/tdesycocatest.cpp
@@ -28,7 +28,7 @@
 #include <kprotocolinfo.h>
 #include <kiconloader.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -67,7 +67,7 @@ void debug(const char *format, const char *txt)
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
+   TDEApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
 
    TQCString instname = "kword";
    TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname );
@@ -182,9 +182,9 @@ int main(int argc, char *argv[])
    }
 
    debug("Querying trader for Konqueror/Plugin");
-   KTrader::OfferList traderoffers = KTrader::self()->query("Konqueror/Plugin");
+   TDETrader::OfferList traderoffers = TDETrader::self()->query("Konqueror/Plugin");
    debug(TQString("got %1 offers").arg(traderoffers.count()));
-   KTrader::OfferList::Iterator trit = traderoffers.begin();
+   TDETrader::OfferList::Iterator trit = traderoffers.begin();
    for ( ; trit != traderoffers.end() ; trit++ )
    {
      debug((*trit)->name());
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
 
    //
    debug("\nTrying findByURL for $TDEDIR/bin/kdesktop");
-   KMimeType::Ptr mf  = KMimeType::findByURL( KStandardDirs::findExe( "kdesktop" ), 0,
+   KMimeType::Ptr mf  = KMimeType::findByURL( TDEStandardDirs::findExe( "kdesktop" ), 0,
 				 true, false );
    assert( mf );
    check( "A binary's mimetype", mf->name(), "application/x-executable" );
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
    //
    debug("\nTrying findByURL for folder_home.png");
    TQString fh;
-   (void)k.iconLoader()->loadIcon("folder_home.png",KIcon::Desktop,0,KIcon::DefaultState,&fh);
+   (void)k.iconLoader()->loadIcon("folder_home.png",TDEIcon::Desktop,0,TDEIcon::DefaultState,&fh);
    mf  = KMimeType::findByURL( fh, 0, true, false );
    assert( mf );
    check( "A PNG's mimetype", mf->name(), "image/png" );
diff --git a/tdeio/tests/tdesycocaupdatetest.cpp b/tdeio/tests/tdesycocaupdatetest.cpp
new file mode 100644
index 000000000..48a195a00
--- /dev/null
+++ b/tdeio/tests/tdesycocaupdatetest.cpp
@@ -0,0 +1,11 @@
+#include <kservice.h>
+
+#include <tdeapplication.h>
+
+int main(int argc, char *argv[])
+{
+   TDEApplication k(argc,argv,"whatever"); // KMessageBox needs KApp for makeStdCaption
+
+   KService::rebuildKSycoca(0);
+   return 0;
+}
diff --git a/kio/tests/ktradertest.cpp b/tdeio/tests/tdetradertest.cpp
index 34ce8e3bc..b33dcf398 100644
--- a/kio/tests/ktradertest.cpp
+++ b/tdeio/tests/tdetradertest.cpp
@@ -16,33 +16,33 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <ktrader.h>
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <stdio.h>
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+query", "the query", 0 },
   { "+[genericServiceType]", "Application (default), or KParts/ReadOnlyPart", 0 },
   { "+[constraint]", "constraint", 0 },
   { "+[preference]", "preference", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, "ktradertest", "KTradertest", "A KTrader testing tool", "0.0" );
+  TDECmdLineArgs::init( argc, argv, "tdetradertest", "TDETradertest", "A TDETrader testing tool", "0.0" );
 
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false, false ); // no GUI
+  TDEApplication app( false, false ); // no GUI
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->count() < 1 )
-      KCmdLineArgs::usage();
+      TDECmdLineArgs::usage();
 
   TQString query = TQString::fromLocal8Bit( args->arg( 0 ) );
 
@@ -62,13 +62,13 @@ int main( int argc, char **argv )
   printf( "constraint is : %s\n", constraint.local8Bit().data() );
   printf( "preference is : %s\n", preference.local8Bit().data() );
 
-  KTrader::OfferList offers = KTrader::self()->query( query, genericServiceType, constraint, preference );
+  TDETrader::OfferList offers = TDETrader::self()->query( query, genericServiceType, constraint, preference );
 
   printf("got %d offers.\n", offers.count());
 
   int i = 0;
-  KTrader::OfferList::ConstIterator it = offers.begin();
-  KTrader::OfferList::ConstIterator end = offers.end();
+  TDETrader::OfferList::ConstIterator it = offers.begin();
+  TDETrader::OfferList::ConstIterator end = offers.end();
   for (; it != end; ++it, ++i )
   {
     printf("---- Offer %d ----\n", i);
diff --git a/kio/tests/wronglocalsizes.zip b/tdeio/tests/wronglocalsizes.zip
index 3f76738ba..3f76738ba 100644
--- a/kio/tests/wronglocalsizes.zip
+++ b/tdeio/tests/wronglocalsizes.zip
diff --git a/kio/useragent.pl b/tdeio/useragent.pl
index f31e31e1d..f31e31e1d 100755
--- a/kio/useragent.pl
+++ b/tdeio/useragent.pl
diff --git a/kioslave/CMakeLists.txt b/tdeioslave/CMakeLists.txt
index 4c7bfe1c4..4c7bfe1c4 100644
--- a/kioslave/CMakeLists.txt
+++ b/tdeioslave/CMakeLists.txt
diff --git a/kioslave/Mainpage.dox b/tdeioslave/Mainpage.dox
index 44979b667..44979b667 100644
--- a/kioslave/Mainpage.dox
+++ b/tdeioslave/Mainpage.dox
diff --git a/kioslave/Makefile.am b/tdeioslave/Makefile.am
index e6472a9c8..e6472a9c8 100644
--- a/kioslave/Makefile.am
+++ b/tdeioslave/Makefile.am
diff --git a/kioslave/bzip2/CMakeLists.txt b/tdeioslave/bzip2/CMakeLists.txt
index a2354d6b0..22b904ffa 100644
--- a/kioslave/bzip2/CMakeLists.txt
+++ b/tdeioslave/bzip2/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -37,6 +37,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared ${BZIP2_LIBRARIES}
+  LINK tdeio-shared ${BZIP2_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/bzip2/Makefile.am b/tdeioslave/bzip2/Makefile.am
index 9353959ab..963f27e31 100644
--- a/kioslave/bzip2/Makefile.am
+++ b/tdeioslave/bzip2/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kio $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio $(all_includes)
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kbzip2filter.la
diff --git a/kioslave/bzip2/configure.in.in b/tdeioslave/bzip2/configure.in.in
index 99392042d..99392042d 100644
--- a/kioslave/bzip2/configure.in.in
+++ b/tdeioslave/bzip2/configure.in.in
diff --git a/kioslave/bzip2/kbzip2filter.cpp b/tdeioslave/bzip2/kbzip2filter.cpp
index ae72990d8..ae72990d8 100644
--- a/kioslave/bzip2/kbzip2filter.cpp
+++ b/tdeioslave/bzip2/kbzip2filter.cpp
diff --git a/kioslave/bzip2/kbzip2filter.desktop b/tdeioslave/bzip2/kbzip2filter.desktop
index 51f1c0a84..51f1c0a84 100644
--- a/kioslave/bzip2/kbzip2filter.desktop
+++ b/tdeioslave/bzip2/kbzip2filter.desktop
diff --git a/kioslave/bzip2/kbzip2filter.h b/tdeioslave/bzip2/kbzip2filter.h
index 2a7b13cf3..2a7b13cf3 100644
--- a/kioslave/bzip2/kbzip2filter.h
+++ b/tdeioslave/bzip2/kbzip2filter.h
diff --git a/kioslave/file/CMakeLists.txt b/tdeioslave/file/CMakeLists.txt
index 2cf415745..287e1ebe2 100644
--- a/kioslave/file/CMakeLists.txt
+++ b/tdeioslave/file/CMakeLists.txt
@@ -20,8 +20,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -31,7 +31,7 @@ link_directories(
 
 ##### headers ###################################
 
-install( FILES file.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install( FILES file.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
 
 
 ##### other data ################################
@@ -39,9 +39,9 @@ install( FILES file.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
 install( FILES file.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_file ##################################
+##### tdeio_file ##################################
 
-set( target kio_file )
+set( target tdeio_file )
 
 set( ${target}_SRCS
   file.cc
@@ -49,7 +49,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/tdeioslave/file/Makefile.am b/tdeioslave/file/Makefile.am
new file mode 100644
index 000000000..0e34dda74
--- /dev/null
+++ b/tdeioslave/file/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am of tdebase/tdeioslave/file
+
+AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
+
+INCLUDES = $(all_includes)
+
+####### Files
+
+kde_module_LTLIBRARIES = tdeio_file.la
+
+tdeio_file_la_SOURCES = file.cc
+tdeio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(ACL_LIBS)
+tdeio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
+noinst_HEADERS = file.h
+
+fileinclude_HEADERS = file.h
+fileincludedir = $(includedir)/tdeio
+
+METASOURCES = AUTO
+
+kdelnkdir = $(kde_servicesdir)
+kdelnk_DATA = file.protocol
diff --git a/kioslave/file/file.cc b/tdeioslave/file/file.cc
index 2deeb3535..1caeaef3e 100644
--- a/kioslave/file/file.cc
+++ b/tdeioslave/file/file.cc
@@ -75,8 +75,8 @@
 #include <kurl.h>
 #include <kinstance.h>
 #include <ksimpleconfig.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqstrlist.h>
 #include "file.h"
@@ -91,12 +91,12 @@
 #endif
 
 #include <kstandarddirs.h>
-#include <kio/ioslave_defaults.h>
+#include <tdeio/ioslave_defaults.h>
 #include <klargefile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmimetype.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 #define MAX_IPC_SIZE (1024*32)
 
@@ -112,15 +112,15 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  KLocale::setMainCatalogue("tdelibs");
-  KInstance instance( "kio_file" );
-  ( void ) KGlobal::locale();
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEInstance instance( "tdeio_file" );
+  ( void ) TDEGlobal::locale();
 
   kdDebug(7101) << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_file protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_file protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
@@ -192,16 +192,16 @@ void FileProtocol::chmod( const KURL& url, int permissions )
         switch (errno) {
             case EPERM:
             case EACCES:
-                error( KIO::ERR_ACCESS_DENIED, url.path() );
+                error( TDEIO::ERR_ACCESS_DENIED, url.path() );
                 break;
             case ENOTSUP:
-                error( KIO::ERR_UNSUPPORTED_ACTION, url.path() );
+                error( TDEIO::ERR_UNSUPPORTED_ACTION, url.path() );
                 break;
             case ENOSPC:
-                error( KIO::ERR_DISK_FULL, url.path() );
+                error( TDEIO::ERR_DISK_FULL, url.path() );
                 break;
             default:
-                error( KIO::ERR_CANNOT_CHMOD, url.path() );
+                error( TDEIO::ERR_CANNOT_CHMOD, url.path() );
         }
     } else
         finished();
@@ -217,13 +217,13 @@ void FileProtocol::mkdir( const KURL& url, int permissions )
     if ( KDE_stat( _path.data(), &buff ) == -1 ) {
         if ( ::mkdir( _path.data(), 0777 /*umask will be applied*/ ) != 0 ) {
             if ( errno == EACCES ) {
-          error( KIO::ERR_ACCESS_DENIED, url.path() );
+          error( TDEIO::ERR_ACCESS_DENIED, url.path() );
           return;
             } else if ( errno == ENOSPC ) {
-          error( KIO::ERR_DISK_FULL, url.path() );
+          error( TDEIO::ERR_DISK_FULL, url.path() );
           return;
             } else {
-          error( KIO::ERR_COULD_NOT_MKDIR, url.path() );
+          error( TDEIO::ERR_COULD_NOT_MKDIR, url.path() );
           return;
             }
         } else {
@@ -237,10 +237,10 @@ void FileProtocol::mkdir( const KURL& url, int permissions )
 
     if ( S_ISDIR( buff.st_mode ) ) {
         kdDebug(7101) << "ERR_DIR_ALREADY_EXIST" << endl;
-        error( KIO::ERR_DIR_ALREADY_EXIST, url.path() );
+        error( TDEIO::ERR_DIR_ALREADY_EXIST, url.path() );
         return;
     }
-    error( KIO::ERR_FILE_ALREADY_EXIST, url.path() );
+    error( TDEIO::ERR_FILE_ALREADY_EXIST, url.path() );
     return;
 }
 
@@ -258,24 +258,24 @@ void FileProtocol::get( const KURL& url )
     KDE_struct_stat buff;
     if ( KDE_stat( _path.data(), &buff ) == -1 ) {
         if ( errno == EACCES )
-           error( KIO::ERR_ACCESS_DENIED, url.path() );
+           error( TDEIO::ERR_ACCESS_DENIED, url.path() );
         else
-           error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+           error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
         return;
     }
 
     if ( S_ISDIR( buff.st_mode ) ) {
-        error( KIO::ERR_IS_DIRECTORY, url.path() );
+        error( TDEIO::ERR_IS_DIRECTORY, url.path() );
         return;
     }
     if ( !S_ISREG( buff.st_mode ) ) {
-        error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
+        error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
         return;
     }
 
     int fd = KDE_open( _path.data(), O_RDONLY);
     if ( fd < 0 ) {
-        error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
+        error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() );
         return;
     }
 
@@ -288,20 +288,20 @@ void FileProtocol::get( const KURL& url )
     KMimeType::Ptr mt = KMimeType::findByURL( url, buff.st_mode, true /* local URL */ );
     emit mimeType( mt->name() );
 
-    KIO::filesize_t processed_size = 0;
+    TDEIO::filesize_t processed_size = 0;
 
     TQString resumeOffset = metaData("resume");
     if ( !resumeOffset.isEmpty() )
     {
         bool ok;
-        KIO::fileoffset_t offset = resumeOffset.toLongLong(&ok);
+        TDEIO::fileoffset_t offset = resumeOffset.toLongLong(&ok);
         if (ok && (offset > 0) && (offset < buff.st_size))
         {
             if (KDE_lseek(fd, offset, SEEK_SET) == offset)
             {
                 canResume ();
                 processed_size = offset;
-                kdDebug( 7101 ) << "Resume offset: " << KIO::number(offset) << endl;
+                kdDebug( 7101 ) << "Resume offset: " << TDEIO::number(offset) << endl;
             }
         }
     }
@@ -318,7 +318,7 @@ void FileProtocol::get( const KURL& url )
        {
           if (errno == EINTR)
               continue;
-          error( KIO::ERR_COULD_NOT_READ, url.path());
+          error( TDEIO::ERR_COULD_NOT_READ, url.path());
           close(fd);
           return;
        }
@@ -332,7 +332,7 @@ void FileProtocol::get( const KURL& url )
        processed_size += n;
        processedSize( processed_size );
 
-       //kdDebug( 7101 ) << "Processed: " << KIO::number (processed_size) << endl;
+       //kdDebug( 7101 ) << "Processed: " << TDEIO::number (processed_size) << endl;
     }
 
     data( TQByteArray() );
@@ -395,7 +395,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
         if (bPartExists && !_resume && !_overwrite && buff_part.st_size > 0 && S_ISREG(buff_part.st_mode))
         {
             kdDebug(7101) << "FileProtocol::put : calling canResume with "
-                          << KIO::number(buff_part.st_size) << endl;
+                          << TDEIO::number(buff_part.st_size) << endl;
 
             // Maybe we can use this partial file for resuming
             // Tell about the size we have, and the app will tell us
@@ -409,9 +409,9 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
     if ( bOrigExists && !_overwrite && !_resume)
     {
         if (S_ISDIR(buff_orig.st_mode))
-            error( KIO::ERR_DIR_ALREADY_EXIST, dest_orig );
+            error( TDEIO::ERR_DIR_ALREADY_EXIST, dest_orig );
         else
-            error( KIO::ERR_FILE_ALREADY_EXIST, dest_orig );
+            error( TDEIO::ERR_FILE_ALREADY_EXIST, dest_orig );
         return;
     }
 
@@ -479,9 +479,9 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
                     kdDebug(7101) << "####################### COULD NOT WRITE " << dest << " _mode=" << _mode << endl;
                     kdDebug(7101) << "errno==" << errno << "(" << strerror(errno) << ")" << endl;
                     if ( errno == EACCES )
-                        error( KIO::ERR_WRITE_ACCESS_DENIED, dest );
+                        error( TDEIO::ERR_WRITE_ACCESS_DENIED, dest );
                     else
-                        error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest );
+                        error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest );
                     return;
                 }
             }
@@ -490,13 +490,13 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
             {
                 if ( errno == ENOSPC ) // disk full
                 {
-                  error( KIO::ERR_DISK_FULL, dest_orig);
+                  error( TDEIO::ERR_DISK_FULL, dest_orig);
                   result = -2; // means: remove dest file
                 }
                 else
                 {
                   kdWarning(7101) << "Couldn't write. Error:" << strerror(errno) << endl;
-                  error( KIO::ERR_COULD_NOT_WRITE, dest_orig);
+                  error( TDEIO::ERR_COULD_NOT_WRITE, dest_orig);
                   result = -1;
                 }
             }
@@ -534,7 +534,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
     if ( close(fd) )
     {
         kdWarning(7101) << "Error when closing file descriptor:" << strerror(errno) << endl;
-        error( KIO::ERR_COULD_NOT_WRITE, dest_orig);
+        error( TDEIO::ERR_COULD_NOT_WRITE, dest_orig);
         return;
     }
 
@@ -550,7 +550,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
         if ( ::rename( _dest.data(), _dest_orig.data() ) )
         {
             kdWarning(7101) << " Couldn't rename " << _dest << " to " << _dest_orig << endl;
-            error( KIO::ERR_CANNOT_RENAME_PARTIAL, dest_orig );
+            error( TDEIO::ERR_CANNOT_RENAME_PARTIAL, dest_orig );
             return;
         }
     }
@@ -561,7 +561,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
         if (::chmod(_dest_orig.data(), _mode) != 0)
         {
             // couldn't chmod. Eat the error if the filesystem apparently doesn't support it.
-            if ( KIO::testFileSystemFlag( _dest_orig, KIO::SupportsChmod ) )
+            if ( TDEIO::testFileSystemFlag( _dest_orig, TDEIO::SupportsChmod ) )
                  warning( i18n( "Could not change permissions for\n%1" ).arg( dest_orig ) );
         }
     }
@@ -602,18 +602,18 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
 
     if ( KDE_stat( _src.data(), &buff_src ) == -1 ) {
         if ( errno == EACCES )
-           error( KIO::ERR_ACCESS_DENIED, src.path() );
+           error( TDEIO::ERR_ACCESS_DENIED, src.path() );
         else
-           error( KIO::ERR_DOES_NOT_EXIST, src.path() );
+           error( TDEIO::ERR_DOES_NOT_EXIST, src.path() );
 	return;
     }
 
     if ( S_ISDIR( buff_src.st_mode ) ) {
-	error( KIO::ERR_IS_DIRECTORY, src.path() );
+	error( TDEIO::ERR_IS_DIRECTORY, src.path() );
 	return;
     }
     if ( S_ISFIFO( buff_src.st_mode ) || S_ISSOCK ( buff_src.st_mode ) ) {
-	error( KIO::ERR_CANNOT_OPEN_FOR_READING, src.path() );
+	error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.path() );
 	return;
     }
 
@@ -623,19 +623,19 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
     {
         if (S_ISDIR(buff_dest.st_mode))
         {
-           error( KIO::ERR_DIR_ALREADY_EXIST, dest.path() );
+           error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.path() );
            return;
         }
 
 	if ( same_inode( buff_dest, buff_src) ) 
 	{
-	    error( KIO::ERR_IDENTICAL_FILES, dest.path() );
+	    error( TDEIO::ERR_IDENTICAL_FILES, dest.path() );
 	    return;
 	}
 
         if (!_overwrite)
         {
-           error( KIO::ERR_FILE_ALREADY_EXIST, dest.path() );
+           error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.path() );
            return;
         }
 
@@ -651,7 +651,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
 
     int src_fd = KDE_open( _src.data(), O_RDONLY);
     if ( src_fd < 0 ) {
-	error( KIO::ERR_CANNOT_OPEN_FOR_READING, src.path() );
+	error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.path() );
 	return;
     }
 
@@ -670,9 +670,9 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
     if ( dest_fd < 0 ) {
 	kdDebug(7101) << "###### COULD NOT WRITE " << dest.url() << endl;
         if ( errno == EACCES ) {
-            error( KIO::ERR_WRITE_ACCESS_DENIED, dest.path() );
+            error( TDEIO::ERR_WRITE_ACCESS_DENIED, dest.path() );
         } else {
-            error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.path() );
+            error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.path() );
         }
         close(src_fd);
         return;
@@ -692,7 +692,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
 #endif
     totalSize( buff_src.st_size );
 
-    KIO::filesize_t processed_size = 0;
+    TDEIO::filesize_t processed_size = 0;
     char buffer[ MAX_IPC_SIZE ];
     int n;
 #ifdef USE_SENDFILE
@@ -723,17 +723,17 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
             kdDebug(7101) << "sendfile() error:" << strerror(errno) << endl;
             if ( errno == ENOSPC ) // disk full
             {
-                error( KIO::ERR_DISK_FULL, dest.path());
+                error( TDEIO::ERR_DISK_FULL, dest.path());
                 remove( _dest.data() );
             }
             else {
-                error( KIO::ERR_SLAVE_DEFINED,
+                error( TDEIO::ERR_SLAVE_DEFINED,
                         i18n("Cannot copy file from %1 to %2. (Errno: %3)")
                         .arg( src.path() ).arg( dest.path() ).arg( errno ) );
             }
           } else
 #endif
-          error( KIO::ERR_COULD_NOT_READ, src.path());
+          error( TDEIO::ERR_COULD_NOT_READ, src.path());
           close(src_fd);
           close(dest_fd);
 #ifdef USE_POSIX_ACL
@@ -753,13 +753,13 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
 
            if ( errno == ENOSPC ) // disk full
            {
-              error( KIO::ERR_DISK_FULL, dest.path());
+              error( TDEIO::ERR_DISK_FULL, dest.path());
               remove( _dest.data() );
            }
            else
            {
               kdWarning(7101) << "Couldn't write[2]. Error:" << strerror(errno) << endl;
-              error( KIO::ERR_COULD_NOT_WRITE, dest.path());
+              error( TDEIO::ERR_COULD_NOT_WRITE, dest.path());
            }
 #ifdef USE_POSIX_ACL
            if (acl) acl_free(acl);
@@ -778,7 +778,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
     if (close( dest_fd))
     {
         kdWarning(7101) << "Error when closing file descriptor[2]:" << strerror(errno) << endl;
-        error( KIO::ERR_COULD_NOT_WRITE, dest.path());
+        error( TDEIO::ERR_COULD_NOT_WRITE, dest.path());
 #ifdef USE_POSIX_ACL
         if (acl) acl_free(acl);
 #endif
@@ -795,7 +795,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
         )
        {
         // Eat the error if the filesystem apparently doesn't support chmod.
-        if ( KIO::testFileSystemFlag( _dest, KIO::SupportsChmod ) )
+        if ( TDEIO::testFileSystemFlag( _dest, TDEIO::SupportsChmod ) )
             warning( i18n( "Could not change permissions for\n%1" ).arg( dest.path() ) );
        }
     }
@@ -824,9 +824,9 @@ void FileProtocol::rename( const KURL &src, const KURL &dest,
     KDE_struct_stat buff_src;
     if ( KDE_lstat( _src.data(), &buff_src ) == -1 ) {
         if ( errno == EACCES )
-           error( KIO::ERR_ACCESS_DENIED, src.path() );
+           error( TDEIO::ERR_ACCESS_DENIED, src.path() );
         else
-           error( KIO::ERR_DOES_NOT_EXIST, src.path() );
+           error( TDEIO::ERR_DOES_NOT_EXIST, src.path() );
         return;
     }
 
@@ -836,19 +836,19 @@ void FileProtocol::rename( const KURL &src, const KURL &dest,
     {
         if (S_ISDIR(buff_dest.st_mode))
         {
-           error( KIO::ERR_DIR_ALREADY_EXIST, dest.path() );
+           error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.path() );
            return;
         }
 
 	if ( same_inode( buff_dest, buff_src) ) 
 	{
-	    error( KIO::ERR_IDENTICAL_FILES, dest.path() );
+	    error( TDEIO::ERR_IDENTICAL_FILES, dest.path() );
 	    return;
 	}
 
         if (!_overwrite)
         {
-           error( KIO::ERR_FILE_ALREADY_EXIST, dest.path() );
+           error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.path() );
            return;
         }
     }
@@ -856,16 +856,16 @@ void FileProtocol::rename( const KURL &src, const KURL &dest,
     if ( ::rename( _src.data(), _dest.data()))
     {
         if (( errno == EACCES ) || (errno == EPERM)) {
-            error( KIO::ERR_ACCESS_DENIED, dest.path() );
+            error( TDEIO::ERR_ACCESS_DENIED, dest.path() );
         }
         else if (errno == EXDEV) {
-           error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename"));
+           error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename"));
         }
         else if (errno == EROFS) { // The file is on a read-only filesystem
-           error( KIO::ERR_CANNOT_DELETE, src.path() );
+           error( TDEIO::ERR_CANNOT_DELETE, src.path() );
         }
         else {
-           error( KIO::ERR_CANNOT_RENAME, src.path() );
+           error( TDEIO::ERR_CANNOT_RENAME, src.path() );
         }
         return;
     }
@@ -886,7 +886,7 @@ void FileProtocol::symlink( const TQString &target, const KURL &dest, bool overw
                 // Try to delete the destination
                 if ( unlink( TQFile::encodeName( dest.path() ) ) != 0 )
                 {
-                    error( KIO::ERR_CANNOT_DELETE, dest.path() );
+                    error( TDEIO::ERR_CANNOT_DELETE, dest.path() );
                     return;
                 }
                 // Try again - this won't loop forever since unlink succeeded
@@ -897,16 +897,16 @@ void FileProtocol::symlink( const TQString &target, const KURL &dest, bool overw
                 KDE_struct_stat buff_dest;
                 KDE_lstat( TQFile::encodeName( dest.path() ), &buff_dest );
                 if (S_ISDIR(buff_dest.st_mode))
-                    error( KIO::ERR_DIR_ALREADY_EXIST, dest.path() );
+                    error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.path() );
                 else
-                    error( KIO::ERR_FILE_ALREADY_EXIST, dest.path() );
+                    error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.path() );
                 return;
             }
         }
         else
         {
             // Some error occurred while we tried to symlink
-            error( KIO::ERR_CANNOT_SYMLINK, dest.path() );
+            error( TDEIO::ERR_CANNOT_SYMLINK, dest.path() );
             return;
         }
     }
@@ -927,11 +927,11 @@ void FileProtocol::del( const KURL& url, bool isfile)
 
 	if ( unlink( _path.data() ) == -1 ) {
             if ((errno == EACCES) || (errno == EPERM))
-               error( KIO::ERR_ACCESS_DENIED, url.path());
+               error( TDEIO::ERR_ACCESS_DENIED, url.path());
             else if (errno == EISDIR)
-               error( KIO::ERR_IS_DIRECTORY, url.path());
+               error( TDEIO::ERR_IS_DIRECTORY, url.path());
             else
-               error( KIO::ERR_CANNOT_DELETE, url.path() );
+               error( TDEIO::ERR_CANNOT_DELETE, url.path() );
 	    return;
 	}
     } else {
@@ -944,10 +944,10 @@ void FileProtocol::del( const KURL& url, bool isfile)
 
       if ( ::rmdir( _path.data() ) == -1 ) {
 	if ((errno == EACCES) || (errno == EPERM))
-	  error( KIO::ERR_ACCESS_DENIED, url.path());
+	  error( TDEIO::ERR_ACCESS_DENIED, url.path());
 	else {
 	  kdDebug( 7101 ) << "could not rmdir " << perror << endl;
-	  error( KIO::ERR_COULD_NOT_RMDIR, url.path() );
+	  error( TDEIO::ERR_COULD_NOT_RMDIR, url.path() );
 	  return;
 	}
       }
@@ -998,10 +998,10 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString &
 {
     assert(entry.count() == 0); // by contract :-)
     // Note: details = 0 (only "file or directory or symlink or doesn't exist") isn't implemented
-    // because there's no real performance penalty in kio_file for returning the complete
-    // details. Please consider doing it in your kioslave if you're using this one as a model :)
+    // because there's no real performance penalty in tdeio_file for returning the complete
+    // details. Please consider doing it in your tdeioslave if you're using this one as a model :)
     UDSAtom atom;
-    atom.m_uds = KIO::UDS_NAME;
+    atom.m_uds = TDEIO::UDS_NAME;
     atom.m_str = filename;
     entry.append( atom );
 
@@ -1019,7 +1019,7 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString &
                 buffer2[ n ] = 0;
             }
 
-            atom.m_uds = KIO::UDS_LINK_DEST;
+            atom.m_uds = TDEIO::UDS_LINK_DEST;
             atom.m_str = TQFile::decodeName( buffer2 );
             entry.append( atom );
 
@@ -1029,15 +1029,15 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString &
                 type = S_IFMT - 1;
                 access = S_IRWXU | S_IRWXG | S_IRWXO;
 
-                atom.m_uds = KIO::UDS_FILE_TYPE;
+                atom.m_uds = TDEIO::UDS_FILE_TYPE;
                 atom.m_long = type;
                 entry.append( atom );
 
-                atom.m_uds = KIO::UDS_ACCESS;
+                atom.m_uds = TDEIO::UDS_ACCESS;
                 atom.m_long = access;
                 entry.append( atom );
 
-                atom.m_uds = KIO::UDS_SIZE;
+                atom.m_uds = TDEIO::UDS_SIZE;
                 atom.m_long = 0L;
                 entry.append( atom );
 
@@ -1053,15 +1053,15 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString &
     type = buff.st_mode & S_IFMT; // extract file type
     access = buff.st_mode & 07777; // extract permissions
 
-    atom.m_uds = KIO::UDS_FILE_TYPE;
+    atom.m_uds = TDEIO::UDS_FILE_TYPE;
     atom.m_long = type;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = access;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_SIZE;
+    atom.m_uds = TDEIO::UDS_SIZE;
     atom.m_long = buff.st_size;
     entry.append( atom );
 
@@ -1073,19 +1073,19 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString &
 #endif
 
  notype:
-    atom.m_uds = KIO::UDS_MODIFICATION_TIME;
+    atom.m_uds = TDEIO::UDS_MODIFICATION_TIME;
     atom.m_long = buff.st_mtime;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_USER;
+    atom.m_uds = TDEIO::UDS_USER;
     atom.m_str = getUserName( buff.st_uid );
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_GROUP;
+    atom.m_uds = TDEIO::UDS_GROUP;
     atom.m_str = getGroupName( buff.st_gid );
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_ACCESS_TIME;
+    atom.m_uds = TDEIO::UDS_ACCESS_TIME;
     atom.m_long = buff.st_atime;
     entry.append( atom );
 
@@ -1123,40 +1123,40 @@ void FileProtocol::stat( const KURL & url )
     UDSEntry entry;
     if ( !createUDSEntry( url.fileName(), _path, entry, details, true /*with acls*/ ) )
     {
-        error( KIO::ERR_DOES_NOT_EXIST, url.path(-1) );
+        error( TDEIO::ERR_DOES_NOT_EXIST, url.path(-1) );
         return;
     }
 #if 0
 ///////// debug code
-    KIO::UDSEntry::ConstIterator it = entry.begin();
+    TDEIO::UDSEntry::ConstIterator it = entry.begin();
     for( ; it != entry.end(); it++ ) {
         switch ((*it).m_uds) {
-            case KIO::UDS_FILE_TYPE:
+            case TDEIO::UDS_FILE_TYPE:
                 kdDebug(7101) << "File Type : " << (mode_t)((*it).m_long) << endl;
                 break;
-            case KIO::UDS_ACCESS:
+            case TDEIO::UDS_ACCESS:
                 kdDebug(7101) << "Access permissions : " << (mode_t)((*it).m_long) << endl;
                 break;
-            case KIO::UDS_USER:
+            case TDEIO::UDS_USER:
                 kdDebug(7101) << "User : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_GROUP:
+            case TDEIO::UDS_GROUP:
                 kdDebug(7101) << "Group : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_NAME:
+            case TDEIO::UDS_NAME:
                 kdDebug(7101) << "Name : " << ((*it).m_str.ascii() ) << endl;
                 //m_strText = decodeFileName( (*it).m_str );
                 break;
-            case KIO::UDS_URL:
+            case TDEIO::UDS_URL:
                 kdDebug(7101) << "URL : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_MIME_TYPE:
+            case TDEIO::UDS_MIME_TYPE:
                 kdDebug(7101) << "MimeType : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_LINK_DEST:
+            case TDEIO::UDS_LINK_DEST:
                 kdDebug(7101) << "LinkDest : " << ((*it).m_str.ascii() ) << endl;
                 break;
-            case KIO::UDS_EXTENDED_ACL:
+            case TDEIO::UDS_EXTENDED_ACL:
                 kdDebug(7101) << "Contains extended ACL " << endl;
                 break;
         }
@@ -1188,12 +1188,12 @@ void FileProtocol::listDir( const KURL& url)
 
     KDE_struct_stat buff;
     if ( KDE_stat( _path.data(), &buff ) == -1 ) {
-	error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+	error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
 	return;
     }
 
     if ( !S_ISDIR( buff.st_mode ) ) {
-	error( KIO::ERR_IS_FILE, url.path() );
+	error( TDEIO::ERR_IS_FILE, url.path() );
 	return;
     }
 
@@ -1211,7 +1211,7 @@ void FileProtocol::listDir( const KURL& url)
             break;
 #endif
         default:
-            error( KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() );
+            error( TDEIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() );
             break;
         }
 	return;
@@ -1280,7 +1280,7 @@ void FileProtocol::testDir( const TQString& path )
     TQCString _path( TQFile::encodeName(path));
     KDE_struct_stat buff;
     if ( KDE_stat( _path.data(), &buff ) == -1 ) {
-	error( KIO::ERR_DOES_NOT_EXIST, path );
+	error( TDEIO::ERR_DOES_NOT_EXIST, path );
 	return;
     }
 
@@ -1335,12 +1335,12 @@ void FileProtocol::special( const TQByteArray &data)
       TQString filename;
       stream >> filename;
       KShred shred( filename );
-      connect( &shred, TQT_SIGNAL( processedSize( KIO::filesize_t ) ),
-               this, TQT_SLOT( slotProcessedSize( KIO::filesize_t ) ) );
+      connect( &shred, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+               this, TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) );
       connect( &shred, TQT_SIGNAL( infoMessage( const TQString & ) ),
                this, TQT_SLOT( slotInfoMessage( const TQString & ) ) );
       if (!shred.shred())
-          error( KIO::ERR_CANNOT_DELETE, filename );
+          error( TDEIO::ERR_CANNOT_DELETE, filename );
       else
           finished();
       break;
@@ -1351,7 +1351,7 @@ void FileProtocol::special( const TQByteArray &data)
 }
 
 // Connected to KShred
-void FileProtocol::slotProcessedSize( KIO::filesize_t bytes )
+void FileProtocol::slotProcessedSize( TDEIO::filesize_t bytes )
 {
   kdDebug(7101) << "FileProtocol::slotProcessedSize (" << (unsigned int) bytes << ")" << endl;
   processedSize( bytes );
@@ -1382,7 +1382,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
 			kdDebug(7101) << "VOLMGT: no media in "
 					<< devname.data() << endl;
 			err = i18n("No Media inserted or Media not recognized.");
-			error( KIO::ERR_COULD_NOT_MOUNT, err );
+			error( TDEIO::ERR_COULD_NOT_MOUNT, err );
 			return;
 		} else {
 			kdDebug(7101) << "VOLMGT: " << devname.data()
@@ -1393,7 +1393,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
 	} else {
 		err = i18n("\"vold\" is not running.");
 		kdDebug(7101) << "VOLMGT: " << err << endl;
-		error( KIO::ERR_COULD_NOT_MOUNT, err );
+		error( TDEIO::ERR_COULD_NOT_MOUNT, err );
 		return;
 	}
 #else
@@ -1406,26 +1406,26 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
     if ( _dev.startsWith( "LABEL=" ) ) { // turn LABEL=foo into -L foo (#71430)
         TQString labelName = _dev.mid( 6 );
         dev = "-L ";
-        dev += TQFile::encodeName( KProcess::quote( labelName ) ); // is it correct to assume same encoding as filesystem?
+        dev += TQFile::encodeName( TDEProcess::quote( labelName ) ); // is it correct to assume same encoding as filesystem?
     } else if ( _dev.startsWith( "UUID=" ) ) { // and UUID=bar into -U bar
         TQString uuidName = _dev.mid( 5 );
         dev = "-U ";
-        dev += TQFile::encodeName( KProcess::quote( uuidName ) );
+        dev += TQFile::encodeName( TDEProcess::quote( uuidName ) );
     }
     else
-        dev = TQFile::encodeName( KProcess::quote(_dev) ); // get those ready to be given to a shell
+        dev = TQFile::encodeName( TDEProcess::quote(_dev) ); // get those ready to be given to a shell
 
-    TQCString point = TQFile::encodeName( KProcess::quote(_point) );
+    TQCString point = TQFile::encodeName( TDEProcess::quote(_point) );
     bool fstype_empty = !_fstype || !*_fstype;
-    TQCString fstype = KProcess::quote(_fstype).latin1(); // good guess
+    TQCString fstype = TDEProcess::quote(_fstype).latin1(); // good guess
     TQCString readonly = _ro ? "-r" : "";
     TQString epath = TQString::fromLatin1(getenv("PATH"));
     TQString path = TQString::fromLatin1("/sbin:/bin");
     if(!epath.isEmpty())
         path += TQString::fromLatin1(":") + epath;
-    TQString mountProg = KGlobal::dirs()->findExe("mount", path);
+    TQString mountProg = TDEGlobal::dirs()->findExe("mount", path);
     if (mountProg.isEmpty()){
-      error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\""));
+      error( TDEIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\""));
       return;
     }
 
@@ -1472,7 +1472,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
         else
         {
             // Didn't work - or maybe we just got a warning
-            TQString mp = KIO::findDeviceMountPoint( _dev );
+            TQString mp = TDEIO::findDeviceMountPoint( _dev );
             // Is the device mounted ?
             if ( !mp.isEmpty() && mount_ret == 0)
             {
@@ -1501,7 +1501,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
                 }
                 else
                 {
-                    error( KIO::ERR_COULD_NOT_MOUNT, err );
+                    error( TDEIO::ERR_COULD_NOT_MOUNT, err );
                     return;
                 }
             }
@@ -1536,7 +1536,7 @@ void FileProtocol::unmount( const TQString& _point )
 		if( (mnttab = KDE_fopen( MNTTAB, "r" )) == NULL ) {
 			err = "couldn't open mnttab";
 			kdDebug(7101) << "VOLMGT: " << err << endl;
-			error( KIO::ERR_COULD_NOT_UNMOUNT, err );
+			error( TDEIO::ERR_COULD_NOT_UNMOUNT, err );
 			return;
 		}
 
@@ -1561,7 +1561,7 @@ void FileProtocol::unmount( const TQString& _point )
 			kdDebug(7101) << "VOLMGT: "
 				<< TQFile::encodeName(_point).data()
 				<< ": " << err << endl;
-			error( KIO::ERR_COULD_NOT_UNMOUNT, err );
+			error( TDEIO::ERR_COULD_NOT_UNMOUNT, err );
 			return;
 		}
 
@@ -1572,7 +1572,7 @@ void FileProtocol::unmount( const TQString& _point )
 		 */
 		ptr = strrchr( devname, '/' );
 		*ptr = '\0';
-                TQCString qdevname(TQFile::encodeName(KProcess::quote(TQFile::decodeName(TQCString(devname)))).data());
+                TQCString qdevname(TQFile::encodeName(TDEProcess::quote(TQFile::decodeName(TQCString(devname)))).data());
 		buffer.sprintf( "/usr/bin/eject %s 2>%s", qdevname.data(), tmp );
 		kdDebug(7101) << "VOLMGT: eject " << qdevname << endl;
 
@@ -1599,7 +1599,7 @@ void FileProtocol::unmount( const TQString& _point )
 		 */
 		err = i18n("\"vold\" is not running.");
 		kdDebug(7101) << "VOLMGT: " << err << endl;
-		error( KIO::ERR_COULD_NOT_UNMOUNT, err );
+		error( TDEIO::ERR_COULD_NOT_UNMOUNT, err );
 		return;
 	}
 #else
@@ -1607,13 +1607,13 @@ void FileProtocol::unmount( const TQString& _point )
     TQString path = TQString::fromLatin1("/sbin:/bin");
     if (!epath.isEmpty())
        path += ":" + epath;
-    TQString umountProg = KGlobal::dirs()->findExe("umount", path);
+    TQString umountProg = TDEGlobal::dirs()->findExe("umount", path);
 
     if (umountProg.isEmpty()) {
-        error( KIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\""));
+        error( TDEIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\""));
         return;
     }
-    buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(KProcess::quote(_point)).data(), tmp );
+    buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(TDEProcess::quote(_point)).data(), tmp );
     system( buffer.data() );
 #endif /* HAVE_VOLMGT */
 
@@ -1646,7 +1646,7 @@ void FileProtocol::unmount( const TQString& _point )
     if ( err.isEmpty() )
 	finished();
     else
-        error( KIO::ERR_COULD_NOT_UNMOUNT, err );
+        error( TDEIO::ERR_COULD_NOT_UNMOUNT, err );
 }
 
 /*************************************
@@ -1661,14 +1661,14 @@ bool FileProtocol::pmount(const TQString &dev)
     TQString path = TQString::fromLatin1("/sbin:/bin");
     if (!epath.isEmpty())
         path += ":" + epath;
-    TQString pmountProg = KGlobal::dirs()->findExe("pmount", path);
+    TQString pmountProg = TDEGlobal::dirs()->findExe("pmount", path);
 
     if (pmountProg.isEmpty())
         return false;
 
     TQCString buffer;
     buffer.sprintf( "%s %s", TQFile::encodeName(pmountProg).data(),
-                    TQFile::encodeName(KProcess::quote(dev)).data() );
+                    TQFile::encodeName(TDEProcess::quote(dev)).data() );
 
     int res = system( buffer.data() );
 
@@ -1677,7 +1677,7 @@ bool FileProtocol::pmount(const TQString &dev)
 
 bool FileProtocol::pumount(const TQString &point)
 {
-    TQString real_point = KStandardDirs::realPath(point);
+    TQString real_point = TDEStandardDirs::realPath(point);
 
     KMountPoint::List mtab = KMountPoint::currentMountPoints();
 
@@ -1690,10 +1690,10 @@ bool FileProtocol::pumount(const TQString &point)
     {
         TQString tmp = (*it)->mountedFrom();
         TQString mp = (*it)->mountPoint();
-        mp = KStandardDirs::realPath(mp);
+        mp = TDEStandardDirs::realPath(mp);
 
         if (mp==real_point)
-            dev = KStandardDirs::realPath(tmp);
+            dev = TDEStandardDirs::realPath(tmp);
     }
 
     if (dev.isEmpty()) return false;
@@ -1703,14 +1703,14 @@ bool FileProtocol::pumount(const TQString &point)
     TQString path = TQString::fromLatin1("/sbin:/bin");
     if (!epath.isEmpty())
         path += ":" + epath;
-    TQString pumountProg = KGlobal::dirs()->findExe("pumount", path);
+    TQString pumountProg = TDEGlobal::dirs()->findExe("pumount", path);
 
     if (pumountProg.isEmpty())
         return false;
 
     TQCString buffer;
     buffer.sprintf( "%s %s", TQFile::encodeName(pumountProg).data(),
-                    TQFile::encodeName(KProcess::quote(dev)).data() );
+                    TQFile::encodeName(TDEProcess::quote(dev)).data() );
 
     int res = system( buffer.data() );
 
@@ -1805,19 +1805,19 @@ static void appendACLAtoms( const TQCString & path, UDSEntry& entry, mode_t type
 
     if ( acl || defaultAcl ) {
       kdDebug(7101) << path.data() << " has extended ACL entries " << endl;
-      atom.m_uds = KIO::UDS_EXTENDED_ACL;
+      atom.m_uds = TDEIO::UDS_EXTENDED_ACL;
       atom.m_long = 1;
       entry.append( atom );
     }
     if ( withACL ) {
         if ( acl ) {
-            atom.m_uds = KIO::UDS_ACL_STRING;
+            atom.m_uds = TDEIO::UDS_ACL_STRING;
             atom.m_str = aclAsString( acl );
             entry.append( atom );
             kdDebug(7101) << path.data() << "ACL: " << atom.m_str << endl;
         }
         if ( defaultAcl ) {
-            atom.m_uds = KIO::UDS_DEFAULT_ACL_STRING;
+            atom.m_uds = TDEIO::UDS_DEFAULT_ACL_STRING;
             atom.m_str = aclAsString( defaultAcl );
             entry.append( atom );
             kdDebug(7101) << path.data() << "DEFAULT ACL: " << atom.m_str << endl;
diff --git a/kioslave/file/file.h b/tdeioslave/file/file.h
index 350703da5..226e0a428 100644
--- a/kioslave/file/file.h
+++ b/tdeioslave/file/file.h
@@ -34,13 +34,13 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 // Note that this header file is installed, so think twice
 // before breaking binary compatibility (read: it is forbidden :)
 
-class FileProtocol : public TQObject, public KIO::SlaveBase
+class FileProtocol : public TQObject, public TDEIO::SlaveBase
 {
   Q_OBJECT
 public:
@@ -76,12 +76,12 @@ public:
   bool pmount( const TQString &dev );
 
 protected slots:
-  void slotProcessedSize( KIO::filesize_t _bytes );
+  void slotProcessedSize( TDEIO::filesize_t _bytes );
   void slotInfoMessage( const TQString & msg );
 
 protected:
 
-  bool createUDSEntry( const TQString & filename, const TQCString & path, KIO::UDSEntry & entry, 
+  bool createUDSEntry( const TQString & filename, const TQCString & path, TDEIO::UDSEntry & entry, 
                        short int details, bool withACL );
   int setACL( const char *path, mode_t perm, bool _directoryDefault );
   
diff --git a/kioslave/file/file.protocol b/tdeioslave/file/file.protocol
index ae3487999..270a2f208 100644
--- a/kioslave/file/file.protocol
+++ b/tdeioslave/file/file.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_file
+exec=tdeio_file
 protocol=file
 input=none
 output=filesystem
@@ -11,5 +11,5 @@ deleting=true
 linking=true
 moving=true
 maxInstances=4
-DocPath=kioslave/file.html
+DocPath=tdeioslave/file.html
 Class=:local
diff --git a/kioslave/ftp/CMakeLists.txt b/tdeioslave/ftp/CMakeLists.txt
index e0287639b..5cc0694b8 100644
--- a/kioslave/ftp/CMakeLists.txt
+++ b/tdeioslave/ftp/CMakeLists.txt
@@ -15,8 +15,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -29,9 +29,9 @@ link_directories(
 install( FILES ftp.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_ftp ###################################
+##### tdeio_ftp ###################################
 
-set( target kio_ftp )
+set( target tdeio_ftp )
 
 set( ${target}_SRCS
   ftp.cc
@@ -39,6 +39,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/ftp/Makefile.am b/tdeioslave/ftp/Makefile.am
new file mode 100644
index 000000000..93ee77a5a
--- /dev/null
+++ b/tdeioslave/ftp/Makefile.am
@@ -0,0 +1,16 @@
+INCLUDES= $(all_includes)
+
+####### Files
+
+kde_module_LTLIBRARIES = tdeio_ftp.la
+
+tdeio_ftp_la_SOURCES = ftp.cc
+tdeio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+tdeio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
+
+noinst_HEADERS = ftp.h
+
+kdelnk_DATA = ftp.protocol
+kdelnkdir = $(kde_servicesdir)
+
+
diff --git a/kioslave/ftp/configure.in.in b/tdeioslave/ftp/configure.in.in
index 0c94a9b9b..b072643ca 100644
--- a/kioslave/ftp/configure.in.in
+++ b/tdeioslave/ftp/configure.in.in
@@ -1,4 +1,4 @@
-dnl For kio_ftp
+dnl For tdeio_ftp
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 AC_CHECK_FUNCS( setfsent )
diff --git a/kioslave/ftp/ftp.cc b/tdeioslave/ftp/ftp.cc
index 5f0f993bc..cf358ce39 100644
--- a/kioslave/ftp/ftp.cc
+++ b/tdeioslave/ftp/ftp.cc
@@ -22,7 +22,7 @@
 */
 
 
-#define  KIO_FTP_PRIVATE_INCLUDE
+#define  TDEIO_FTP_PRIVATE_INCLUDE
 #include "ftp.h"
 
 #include <sys/stat.h>
@@ -53,14 +53,14 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kmimemagic.h>
 #include <kmimetype.h>
 #include <ksockaddr.h>
 #include <tdesocketaddress.h>
-#include <kio/ioslave_defaults.h>
-#include <kio/slaveconfig.h>
+#include <tdeio/ioslave_defaults.h>
+#include <tdeio/slaveconfig.h>
 #include <kremoteencoding.h>
 #include <klargefile.h>
 
@@ -81,17 +81,17 @@
 //#undef  kdDebug
 #define ENABLE_CAN_RESUME
 
-// JPF: somebody should find a better solution for this or move this to KIO
+// JPF: somebody should find a better solution for this or move this to TDEIO
 // JPF: anyhow, in KDE 3.2.0 I found diffent MAX_IPC_SIZE definitions!
-namespace KIO {
+namespace TDEIO {
     enum buffersizes
     {  /**
         * largest buffer size that should be used to transfer data between
-        * KIO slaves using the data() function
+        * TDEIO slaves using the data() function
         */
         maximumIpcSize = 32 * 1024,
         /**
-         * this is a reasonable value for an initial read() that a KIO slave
+         * this is a reasonable value for an initial read() that a TDEIO slave
          * can do to obtain data via a slow network connection.
          */
         initialIpcSize =  2 * 1024,
@@ -131,23 +131,23 @@ namespace KIO {
    }
 }
 
-KIO::filesize_t Ftp::UnknownSize = (KIO::filesize_t)-1;
+TDEIO::filesize_t Ftp::UnknownSize = (TDEIO::filesize_t)-1;
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  KLocale::setMainCatalogue("tdelibs");
-  KInstance instance( "kio_ftp" );
-  ( void ) KGlobal::locale();
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEInstance instance( "tdeio_ftp" );
+  ( void ) TDEGlobal::locale();
 
   kdDebug(7102) << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_ftp protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_ftp protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
@@ -849,7 +849,7 @@ int Ftp::ftpOpenPASVDataConnection()
   assert(m_data == NULL);       // ... but no data connection
 
   // Check that we can do PASV
-  const KSocketAddress *sa = m_control->peerAddress();
+  const TDESocketAddress *sa = m_control->peerAddress();
   if (sa != NULL && sa->family() != PF_INET)
     return ERR_INTERNAL;       // no PASV for non-PF_INET connections
 
@@ -910,7 +910,7 @@ int Ftp::ftpOpenEPSVDataConnection()
   assert(m_control != NULL);    // must have control connection socket
   assert(m_data == NULL);       // ... but no data connection
 
-  const KSocketAddress *sa = m_control->peerAddress();
+  const TDESocketAddress *sa = m_control->peerAddress();
   int portnum;
   // we are sure sa is a KInetSocketAddress, because we asked for KExtendedSocket::inetSocket
   // when we connected
@@ -1127,7 +1127,7 @@ int Ftp::ftpAcceptConnect()
 }
 
 bool Ftp::ftpOpenCommand( const char *_command, const TQString & _path, char _mode,
-                          int errorcode, KIO::fileoffset_t _offset )
+                          int errorcode, TDEIO::fileoffset_t _offset )
 {
   int errCode = 0;
   if( !ftpDataMode(_mode) )
@@ -1428,15 +1428,15 @@ void Ftp::ftpShortStatAnswer( const TQString& filename, bool isDir )
     UDSEntry entry;
     UDSAtom atom;
 
-    atom.m_uds = KIO::UDS_NAME;
+    atom.m_uds = TDEIO::UDS_NAME;
     atom.m_str = filename;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_FILE_TYPE;
+    atom.m_uds = TDEIO::UDS_FILE_TYPE;
     atom.m_long = isDir ? S_IFDIR : S_IFREG;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
     entry.append( atom );
 
@@ -1484,22 +1484,22 @@ void Ftp::stat( const KURL &url)
     UDSEntry entry;
     UDSAtom atom;
 
-    atom.m_uds = KIO::UDS_NAME;
+    atom.m_uds = TDEIO::UDS_NAME;
     atom.m_str = TQString::null;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_FILE_TYPE;
+    atom.m_uds = TDEIO::UDS_FILE_TYPE;
     atom.m_long = S_IFDIR;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_USER;
+    atom.m_uds = TDEIO::UDS_USER;
     atom.m_str = "root";
     entry.append( atom );
-    atom.m_uds = KIO::UDS_GROUP;
+    atom.m_uds = TDEIO::UDS_GROUP;
     entry.append( atom );
 
     // no size
@@ -1551,15 +1551,15 @@ void Ftp::stat( const KURL &url)
     UDSEntry entry;
     UDSAtom atom;
 
-    atom.m_uds = KIO::UDS_NAME;
+    atom.m_uds = TDEIO::UDS_NAME;
     atom.m_str = filename;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_FILE_TYPE;
+    atom.m_uds = TDEIO::UDS_FILE_TYPE;
     atom.m_long = S_IFDIR;
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
     entry.append( atom );
 
@@ -1926,7 +1926,7 @@ bool Ftp::ftpReadDir(FtpEntry& de)
       // Get day number (always second field)
       tmptr->tm_mday = atoi( p_date_2 );
       // Get month from first field
-      // NOTE : no, we don't want to use KLocale here
+      // NOTE : no, we don't want to use TDELocale here
       // It seems all FTP servers use the English way
       //kdDebug(7102) << "Looking for month " << p_date_1 << endl;
       static const char * s_months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -1987,7 +1987,7 @@ void Ftp::get( const KURL & url )
   ftpCloseCommand();                        // must close command!
 }
 
-Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t llOffset)
+Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, TDEIO::fileoffset_t llOffset)
 {
   // Calls error() by itself!
   if( !ftpOpenConnection(loginImplicit) )
@@ -2028,12 +2028,12 @@ Ftp::StatusCode Ftp::ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fi
     if (!m_size) m_size = UnknownSize;
   }
 
-  KIO::filesize_t bytesLeft = 0;
+  TDEIO::filesize_t bytesLeft = 0;
   if ( m_size != UnknownSize )
     bytesLeft = m_size - llOffset;
 
   kdDebug(7102) << "ftpGet: starting with offset=" << llOffset << endl;
-  KIO::fileoffset_t processed_size = llOffset;
+  TDEIO::fileoffset_t processed_size = llOffset;
 
   TQByteArray array;
   bool mimetypeEmitted = false;
@@ -2137,7 +2137,7 @@ void Ftp::mimetype( const KURL& url )
   }
   char buffer[ 2048 ];
   TQByteArray array;
-  // Get one chunk of data only and send it, KIO::Job will determine the
+  // Get one chunk of data only and send it, TDEIO::Job will determine the
   // mimetype from it using KMimeMagic
   int n = m_data->read( buffer, 2048 );
   array.setRawData(buffer, n);
@@ -2284,7 +2284,7 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
   } else
     dest = dest_orig;
 
-  KIO::fileoffset_t offset = 0;
+  TDEIO::fileoffset_t offset = 0;
 
   // set the mode according to offset
   if( resume && m_size > 0 )
@@ -2304,7 +2304,7 @@ Ftp::StatusCode Ftp::ftpPut(int& iError, int iCopyFile, const KURL& dest_url,
      return statusServerError;
 
   kdDebug(7102) << "ftpPut: starting with offset=" << offset << endl;
-  KIO::fileoffset_t processed_size = offset;
+  TDEIO::fileoffset_t processed_size = offset;
 
   TQByteArray buffer;
   int result;
@@ -2481,7 +2481,7 @@ bool Ftp::ftpFolder(const TQString& path, bool bReportError)
 
 
 //===============================================================================
-// public: copy          don't use kio data pump if one side is a local file
+// public: copy          don't use tdeio data pump if one side is a local file
 // helper: ftpCopyPut    called from copy() on upload
 // helper: ftpCopyGet    called from copy() on download
 //===============================================================================
@@ -2590,7 +2590,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop
     sPart = TQFile::encodeName(sCopyFile);
   }
   else if(bPartExists && buff.st_size > 0)
-  { // must not be a folder! please fix a similar bug in kio_file!!
+  { // must not be a folder! please fix a similar bug in tdeio_file!!
     if(S_ISDIR(buff.st_mode))
     {
       iError = ERR_DIR_ALREADY_EXIST;
@@ -2607,7 +2607,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop
   if(bPartExists && !bResume)                  // get rid of an unwanted ".part" file
     remove(sPart.data());
 
-  // JPF: in kio_file overwrite disables ".part" operations. I do not believe
+  // JPF: in tdeio_file overwrite disables ".part" operations. I do not believe
   // JPF: that this is a good behaviour!
   if(bDestExists)                             // must delete for overwrite
     remove(sDest.data());
@@ -2621,7 +2621,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop
     initialMode = 0666;
 
   // open the output file ...
-  KIO::fileoffset_t hCopyOffset = 0;
+  TDEIO::fileoffset_t hCopyOffset = 0;
   if(bResume)
   {
     iCopyFile = KDE_open( sPart.data(), O_RDWR );  // append if resuming
diff --git a/kioslave/ftp/ftp.h b/tdeioslave/ftp/ftp.h
index 44f0bdc71..c95b25410 100644
--- a/kioslave/ftp/ftp.h
+++ b/tdeioslave/ftp/ftp.h
@@ -32,7 +32,7 @@
 #include <tqstring.h>
 
 #include <kurl.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <kextsock.h>
 #include <ksocks.h>
 
@@ -43,7 +43,7 @@ struct FtpEntry
   TQString group;
   TQString link;
 
-  KIO::filesize_t size;
+  TDEIO::filesize_t size;
   mode_t type;
   mode_t access;
   time_t date;
@@ -53,7 +53,7 @@ struct FtpEntry
 // FtpTextReader  A helper class to read text lines from a socket
 //===============================================================================
 
-#ifdef  KIO_FTP_PRIVATE_INCLUDE
+#ifdef  TDEIO_FTP_PRIVATE_INCLUDE
 class FtpSocket;
 
 class FtpTextReader
@@ -131,12 +131,12 @@ private:
    */
   int m_iTextBuff;
 };
-#endif // KIO_FTP_PRIVATE_INCLUDE
+#endif // TDEIO_FTP_PRIVATE_INCLUDE
 
 //===============================================================================
 // FtpSocket  Helper Class for Data or Control Connections
 //===============================================================================
-#ifdef  KIO_FTP_PRIVATE_INCLUDE
+#ifdef  TDEIO_FTP_PRIVATE_INCLUDE
 class FtpSocket : public FtpTextReader, public KExtendedSocket
 {
 private:
@@ -228,12 +228,12 @@ private:
 };
 #else
    class FtpSocket;
-#endif // KIO_FTP_PRIVATE_INCLUDE
+#endif // TDEIO_FTP_PRIVATE_INCLUDE
 
 //===============================================================================
 // Ftp
 //===============================================================================
-class Ftp : public KIO::SlaveBase
+class Ftp : public TDEIO::SlaveBase
 {
   // Ftp()	{}
 
@@ -369,7 +369,7 @@ private:
    * @return true if the command was accepted by the server.
    */
   bool ftpOpenCommand( const char *command, const TQString & path, char mode,
-                       int errorcode, KIO::fileoffset_t offset = 0 );
+                       int errorcode, TDEIO::fileoffset_t offset = 0 );
 
   /**
    * The counterpart to openCommand.
@@ -436,7 +436,7 @@ private:
   /**
     * Helper to fill an UDSEntry
     */
-  void ftpCreateUDSEntry( const TQString & filename, FtpEntry& ftpEnt, KIO::UDSEntry& entry, bool isDir );
+  void ftpCreateUDSEntry( const TQString & filename, FtpEntry& ftpEnt, TDEIO::UDSEntry& entry, bool isDir );
 
   void ftpShortStatAnswer( const TQString& filename, bool isDir );
 
@@ -482,7 +482,7 @@ private:
    * @param hCopyOffset local file only: non-zero for resume
    * @return 0 for success, -1 for server error, -2 for client error
    */
-  StatusCode ftpGet(int& iError, int iCopyFile, const KURL& url, KIO::fileoffset_t hCopyOffset);
+  StatusCode ftpGet(int& iError, int iCopyFile, const KURL& url, TDEIO::fileoffset_t hCopyOffset);
 
   /**
    * This is the internal implementation of put() - see copy().
@@ -575,8 +575,8 @@ private: // data members
   bool m_bPasv;
   bool m_bUseProxy;
 
-  KIO::filesize_t m_size;
-  static KIO::filesize_t UnknownSize;
+  TDEIO::filesize_t m_size;
+  static TDEIO::filesize_t UnknownSize;
 
   enum
   {
diff --git a/kioslave/ftp/ftp.protocol b/tdeioslave/ftp/ftp.protocol
index 3af1e33ec..363b27c7c 100644
--- a/kioslave/ftp/ftp.protocol
+++ b/tdeioslave/ftp/ftp.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_ftp
+exec=tdeio_ftp
 protocol=ftp
 input=none
 output=filesystem
@@ -14,5 +14,5 @@ moving=true
 ProxiedBy=http
 Icon=ftp
 maxInstances=2
-DocPath=kioslave/ftp.html
+DocPath=tdeioslave/ftp.html
 Class=:internet
diff --git a/kioslave/gzip/CMakeLists.txt b/tdeioslave/gzip/CMakeLists.txt
index e71908c31..d08fc7e64 100644
--- a/kioslave/gzip/CMakeLists.txt
+++ b/tdeioslave/gzip/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -36,6 +36,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/gzip/Makefile.am b/tdeioslave/gzip/Makefile.am
index 3da565fb7..22918aef2 100644
--- a/kioslave/gzip/Makefile.am
+++ b/tdeioslave/gzip/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/kio $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+INCLUDES = -I$(top_srcdir)/tdeio $(all_includes)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kgzipfilter.la
diff --git a/kioslave/gzip/kgzipfilter.cpp b/tdeioslave/gzip/kgzipfilter.cpp
index 375f9f9bc..375f9f9bc 100644
--- a/kioslave/gzip/kgzipfilter.cpp
+++ b/tdeioslave/gzip/kgzipfilter.cpp
diff --git a/kioslave/gzip/kgzipfilter.desktop b/tdeioslave/gzip/kgzipfilter.desktop
index a3b6c027b..a3b6c027b 100644
--- a/kioslave/gzip/kgzipfilter.desktop
+++ b/tdeioslave/gzip/kgzipfilter.desktop
diff --git a/kioslave/gzip/kgzipfilter.h b/tdeioslave/gzip/kgzipfilter.h
index 73b5173f3..73b5173f3 100644
--- a/kioslave/gzip/kgzipfilter.h
+++ b/tdeioslave/gzip/kgzipfilter.h
diff --git a/kioslave/http/CMakeLists.txt b/tdeioslave/http/CMakeLists.txt
index 51bcfe092..aff6d0a4e 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/tdeioslave/http/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/interfaces
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/httpfilter
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/httpfilter
 )
 
 link_directories(
@@ -38,9 +38,9 @@ install( FILES
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_http_cache_cleaner ####################
+##### tdeio_http_cache_cleaner ####################
 
-set( target kio_http_cache_cleaner )
+set( target tdeio_http_cache_cleaner )
 
 set( ${target}_SRCS
   http_cache_cleaner.cpp
@@ -48,15 +48,15 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
 
 
-##### kio_http ##################################
+##### tdeio_http ##################################
 
 # FIXME GSSAPI support is not handled yet
 
-set( target kio_http )
+set( target tdeio_http )
 
 set( ${target}_SRCS
   http.cc
@@ -64,6 +64,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK httpfilter-static kntlm-shared kio-shared
+  LINK httpfilter-static tdentlm-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/http/Makefile.am b/tdeioslave/http/Makefile.am
new file mode 100644
index 000000000..71b6d0c60
--- /dev/null
+++ b/tdeioslave/http/Makefile.am
@@ -0,0 +1,31 @@
+# $Id$
+# Makefile.am of tdebase/tdeioslave/http
+
+SUBDIRS = kcookiejar
+
+INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcdir)/tdecore/network $(all_includes) $(GSSAPI_INCS)
+AM_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH)
+
+####### Files
+
+bin_PROGRAMS=
+lib_LTLIBRARIES=
+tdeinit_LTLIBRARIES = tdeio_http_cache_cleaner.la
+kde_module_LTLIBRARIES = tdeio_http.la
+
+tdeio_http_la_SOURCES = http.cc
+tdeio_http_la_METASOURCES = AUTO
+tdeio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
+tdeio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
+
+tdeio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
+tdeio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+tdeio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
+
+noinst_HEADERS = http.h
+
+kdelnkdir = $(kde_servicesdir)
+kdelnk_DATA = http_cache_cleaner.desktop http.protocol https.protocol \
+              webdav.protocol webdavs.protocol
+
+include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kioslave/http/README.http_cache_cleaner b/tdeioslave/http/README.http_cache_cleaner
index 7714bfba6..839394aa4 100644
--- a/kioslave/http/README.http_cache_cleaner
+++ b/tdeioslave/http/README.http_cache_cleaner
@@ -10,11 +10,11 @@ TODO:
 30 minutes / delte entries which end in .new and are
 older than 30 minutes.
 
-* Let kio_http fill in expire dates other than 0.
+* Let tdeio_http fill in expire dates other than 0.
 
 DONE:
 
-* Start khttpcache from kio_http if the file "cleaned"
+* Start khttpcache from tdeio_http if the file "cleaned"
 is older than 30(?) minutes.
 
 * Accept command line parameteres
diff --git a/kioslave/http/README.webdav b/tdeioslave/http/README.webdav
index c7ee900bb..d7f6cca26 100644
--- a/kioslave/http/README.webdav
+++ b/tdeioslave/http/README.webdav
@@ -15,7 +15,7 @@ Applications supporting extended webdav features
 Much of the info here is elaborated by rfc #2518; the rest can be understood by reading
 davPropStat() in http.cc, specifically the setMetaData() calls.
 
-Extended information is transferred via kio's metadata system...
+Extended information is transferred via tdeio's metadata system...
 
 === MISCELLANEOUS ===
 Display Names (names suitable for presentation to the user) are passed as the metadata
diff --git a/kioslave/http/THOUGHTS b/tdeioslave/http/THOUGHTS
index 9715b5c2f..5fabc3fcb 100644
--- a/kioslave/http/THOUGHTS
+++ b/tdeioslave/http/THOUGHTS
@@ -17,7 +17,7 @@ to configure access.
 WebDAV support.  MSIE5 calls it web folders support, and a similar
 approach would probably be a good idea.  Perhaps with an exists()
 function.. one could tell if an http url was part of a WebDAV collection..
-and this could be used for some kind of integration with kfile... to
+and this could be used for some kind of integration with tdefile... to
 provide seamless integration.  Uhm, also, this might entail an external
 program (xml parser and such).
 
diff --git a/kioslave/http/TODO b/tdeioslave/http/TODO
index 12a929525..adf81a978 100644
--- a/kioslave/http/TODO
+++ b/tdeioslave/http/TODO
@@ -1,5 +1,5 @@
 The following is a list of items that are currently missing or partially implemented
-in kio_http:
+in tdeio_http:
 
 - HTTP/1.1 Persistant Connections:
 The header often specifies the timeout value used for connections.
@@ -19,8 +19,8 @@ features such as locking.
 - Rating(s) support.  http://www.w3.org/PICS:
 This might involve an external program to parse the labels, and something to
 configure access accordingly.  There is only some basic things that need to be
-added to kio_http to support this.  The majority of the work has to be done at the
-application level.  A khtml plugin in tdeaddons to do this might be a nice idea.
+added to tdeio_http to support this.  The majority of the work has to be done at the
+application level.  A tdehtml plugin in tdeaddons to do this might be a nice idea.
 
 - P3P support:
 This can also be implemented as a plugin to konqueror and does
diff --git a/kioslave/http/configure.in.bot b/tdeioslave/http/configure.in.bot
index 56d051424..56d051424 100644
--- a/kioslave/http/configure.in.bot
+++ b/tdeioslave/http/configure.in.bot
diff --git a/kioslave/http/configure.in.in b/tdeioslave/http/configure.in.in
index a7d1ca7cf..a7d1ca7cf 100644
--- a/kioslave/http/configure.in.in
+++ b/tdeioslave/http/configure.in.in
diff --git a/kioslave/http/http.cc b/tdeioslave/http/http.cc
index 16b785d03..a492221d5 100644
--- a/kioslave/http/http.cc
+++ b/tdeioslave/http/http.cc
@@ -51,8 +51,8 @@
 #include <kidna.h>
 #include <ksocks.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kextsock.h>
 #include <kservice.h>
 #include <krfcdate.h>
@@ -62,13 +62,13 @@
 #include <kmimemagic.h>
 #include <dcopclient.h>
 #include <kdatastream.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <kremoteencoding.h>
 
-#include "kio/ioslave_defaults.h"
-#include "kio/http_slave_defaults.h"
+#include "tdeio/ioslave_defaults.h"
+#include "tdeio/http_slave_defaults.h"
 
 #include "httpfilter.h"
 #include "http.h"
@@ -88,9 +88,9 @@
 
 #endif /* HAVE_LIBGSSAPI */
 
-#include <misc/kntlm/kntlm.h>
+#include <misc/tdentlm/tdentlm.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C" {
   KDE_EXPORT int kdemain(int argc, char **argv);
@@ -98,13 +98,13 @@ extern "C" {
 
 int kdemain( int argc, char **argv )
 {
-  KLocale::setMainCatalogue("tdelibs");
-  KInstance instance( "kio_http" );
-  ( void ) KGlobal::locale();
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEInstance instance( "tdeio_http" );
+  ( void ) TDEGlobal::locale();
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_http protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_http protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
@@ -185,7 +185,7 @@ static TQString sanitizeCustomHTTPHeader(const TQString& _header)
 }
 
 
-#define NO_SIZE		((KIO::filesize_t) -1)
+#define NO_SIZE		((TDEIO::filesize_t) -1)
 
 #ifdef HAVE_STRTOLL
 #define STRTOLL	strtoll
@@ -465,7 +465,7 @@ bool HTTPProtocol::checkRequestURL( const KURL& u )
 
   if (m_request.hostname.isEmpty())
   {
-     error( KIO::ERR_UNKNOWN_HOST, i18n("No host specified."));
+     error( TDEIO::ERR_UNKNOWN_HOST, i18n("No host specified."));
      return false;
   }
 
@@ -619,15 +619,15 @@ void HTTPProtocol::stat(const KURL& url)
     // When downloading we assume it exists
     UDSEntry entry;
     UDSAtom atom;
-    atom.m_uds = KIO::UDS_NAME;
+    atom.m_uds = TDEIO::UDS_NAME;
     atom.m_str = url.fileName();
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_FILE_TYPE;
+    atom.m_uds = TDEIO::UDS_FILE_TYPE;
     atom.m_long = S_IFREG; // a file
     entry.append( atom );
 
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = S_IRUSR | S_IRGRP | S_IROTH; // readable by everybody
     entry.append( atom );
 
@@ -762,7 +762,7 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )
 
       KURL thisURL ( urlStr, encoding );
 
-      atom.m_uds = KIO::UDS_NAME;
+      atom.m_uds = TDEIO::UDS_NAME;
 
       if ( thisURL.isValid() ) {
         // don't list the base dir of a listDir()
@@ -811,7 +811,7 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )
   }
 }
 
-void HTTPProtocol::davGeneric( const KURL& url, KIO::HTTP_METHOD method )
+void HTTPProtocol::davGeneric( const KURL& url, TDEIO::HTTP_METHOD method )
 {
   kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::davGeneric " << url.url()
                 << endl;
@@ -877,7 +877,7 @@ void HTTPProtocol::davParsePropstats( const TQDomNodeList& propstats, UDSEntry&
 
     if ( hasMetaData( "davRequestResponse" ) )
     {
-      atom.m_uds = KIO::UDS_XML_PROPERTIES;
+      atom.m_uds = TDEIO::UDS_XML_PROPERTIES;
       TQDomDocument doc;
       doc.appendChild(prop);
       atom.m_str = doc.toString();
@@ -899,14 +899,14 @@ void HTTPProtocol::davParsePropstats( const TQDomNodeList& propstats, UDSEntry&
       if ( property.tagName() == "creationdate" )
       {
         // Resource creation date. Should be is ISO 8601 format.
-        atom.m_uds = KIO::UDS_CREATION_TIME;
+        atom.m_uds = TDEIO::UDS_CREATION_TIME;
         atom.m_long = parseDateTime( property.text(), property.attribute("dt") );
         entry.append( atom );
       }
       else if ( property.tagName() == "getcontentlength" )
       {
         // Content length (file size)
-        atom.m_uds = KIO::UDS_SIZE;
+        atom.m_uds = TDEIO::UDS_SIZE;
         atom.m_long = property.text().toULong();
         entry.append( atom );
       }
@@ -952,7 +952,7 @@ void HTTPProtocol::davParsePropstats( const TQDomNodeList& propstats, UDSEntry&
       else if ( property.tagName() == "getlastmodified" )
       {
         // Last modification date
-        atom.m_uds = KIO::UDS_MODIFICATION_TIME;
+        atom.m_uds = TDEIO::UDS_MODIFICATION_TIME;
         atom.m_long = parseDateTime( property.text(), property.attribute("dt") );
         entry.append( atom );
 
@@ -1009,27 +1009,27 @@ void HTTPProtocol::davParsePropstats( const TQDomNodeList& propstats, UDSEntry&
   setMetaData( "davLockCount", TQString("%1").arg(lockCount) );
   setMetaData( "davSupportedLockCount", TQString("%1").arg(supportedLockCount) );
 
-  atom.m_uds = KIO::UDS_FILE_TYPE;
+  atom.m_uds = TDEIO::UDS_FILE_TYPE;
   atom.m_long = isDirectory ? S_IFDIR : S_IFREG;
   entry.append( atom );
 
   if ( foundExecutable || isDirectory )
   {
     // File was executable, or is a directory.
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = 0700;
     entry.append(atom);
   }
   else
   {
-    atom.m_uds = KIO::UDS_ACCESS;
+    atom.m_uds = TDEIO::UDS_ACCESS;
     atom.m_long = 0600;
     entry.append(atom);
   }
 
   if ( !isDirectory && !mimeType.isEmpty() )
   {
-    atom.m_uds = KIO::UDS_MIME_TYPE;
+    atom.m_uds = TDEIO::UDS_MIME_TYPE;
     atom.m_str = mimeType;
     entry.append( atom );
   }
@@ -1553,7 +1553,7 @@ TQString HTTPProtocol::davError( int code /* = -1 */, TQString url )
     url = m_request.url.url();
 
   TQString action, errorString;
-  KIO::Error kError;
+  TDEIO::Error kError;
 
   // for 412 Precondition Failed
   TQString ow = i18n( "Otherwise, the request would have succeeded." );
@@ -1742,7 +1742,7 @@ TQString HTTPProtocol::davError( int code /* = -1 */, TQString url )
 void HTTPProtocol::httpError()
 {
   TQString action, errorString;
-  KIO::Error kError;
+  TDEIO::Error kError;
 
   switch ( m_request.method ) {
     case HTTP_PUT:
@@ -2056,7 +2056,7 @@ bool HTTPProtocol::httpOpenConnection()
   kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::httpOpenConnection" << endl;
 
   setBlockConnection( true );
-  // kio_http uses its own proxying:
+  // tdeio_http uses its own proxying:
   KSocks::self()->disableSocks();
 
   if ( m_state.doProxy )
@@ -2152,7 +2152,7 @@ bool HTTPProtocol::httpOpenConnection()
  * data to be sent in addition to the header (POST requests) and there is no
  * way for this function to get that data.  This function is called in the
  * slotPut() or slotGet() functions which, in turn, are called (indirectly) as
- * a result of a KIOJob::put() or KIOJob::get().  It is those latter functions
+ * a result of a TDEIOJob::put() or TDEIOJob::get().  It is those latter functions
  * which are responsible for starting up this ioslave in the first place.
  * This means that 'httpOpen' is called (essentially) as soon as the ioslave
  * is created -- BEFORE any data gets to this slave.
@@ -2187,10 +2187,10 @@ bool HTTPProtocol::httpOpen()
   {
      m_request.fcache = checkCacheEntry( );
 
-     bool bCacheOnly = (m_request.cache == KIO::CC_CacheOnly);
+     bool bCacheOnly = (m_request.cache == TDEIO::CC_CacheOnly);
      bool bOffline = isOffline(m_request.doProxy ? m_proxyURL : m_request.url);
-     if (bOffline && (m_request.cache != KIO::CC_Reload))
-        m_request.cache = KIO::CC_CacheOnly;
+     if (bOffline && (m_request.cache != TDEIO::CC_Reload))
+        m_request.cache = TDEIO::CC_CacheOnly;
 
      if (m_request.cache == CC_Reload && m_request.fcache)
      {
@@ -2198,7 +2198,7 @@ bool HTTPProtocol::httpOpen()
           fclose(m_request.fcache);
         m_request.fcache = 0;
      }
-     if ((m_request.cache == KIO::CC_CacheOnly) || (m_request.cache == KIO::CC_Cache))
+     if ((m_request.cache == TDEIO::CC_CacheOnly) || (m_request.cache == TDEIO::CC_Cache))
         m_request.bMustRevalidate = false;
 
      m_request.bCachedWrite = true;
@@ -2429,8 +2429,8 @@ bool HTTPProtocol::httpOpen()
 
     if ( m_request.offset > 0 )
     {
-      header += TQString("Range: bytes=%1-\r\n").arg(KIO::number(m_request.offset));
-      kdDebug(7103) << "kio_http : Range = " << KIO::number(m_request.offset) << endl;
+      header += TQString("Range: bytes=%1-\r\n").arg(TDEIO::number(m_request.offset));
+      kdDebug(7103) << "tdeio_http : Range = " << TDEIO::number(m_request.offset) << endl;
     }
 
     if ( m_request.cache == CC_Reload )
@@ -2842,7 +2842,7 @@ try_again:
     {
       // We get XML / HTTP without a proper header
       // put string back
-      kdDebug(7103) << "kio_http: No valid HTTP header found! Document starts with XML/HTML tag" << endl;
+      kdDebug(7103) << "tdeio_http: No valid HTTP header found! Document starts with XML/HTML tag" << endl;
 
       // Document starts with a tag, assume html instead of text/plain
       m_strMimeType = "text/html";
@@ -3217,7 +3217,7 @@ try_again:
 
     // content?
     else if (strncasecmp(buf, "Content-Encoding:", 17) == 0) {
-      // This is so wrong !!  No wonder kio_http is stripping the
+      // This is so wrong !!  No wonder tdeio_http is stripping the
       // gzip encoding from downloaded files.  This solves multiple
       // bug reports and caitoo's problem with downloads when such a
       // header is encountered...
@@ -3982,7 +3982,7 @@ void HTTPProtocol::httpClose( bool keepAlive )
   // Only allow persistent connections for GET requests.
   // NOTE: we might even want to narrow this down to non-form
   // based submit requests which will require a meta-data from
-  // khtml.
+  // tdehtml.
   if (keepAlive && (!m_bUseProxy ||
       m_bPersistentProxyConnection || m_bIsTunneled))
   {
@@ -4092,7 +4092,7 @@ void HTTPProtocol::special( const TQByteArray &data )
       KURL url;
       int method;
       stream >> url >> method;
-      davGeneric( url, (KIO::HTTP_METHOD) method );
+      davGeneric( url, (TDEIO::HTTP_METHOD) method );
       break;
     }
     case 99: // Close Connection
@@ -4317,7 +4317,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d)
 /**
  * This function is our "receive" function.  It is responsible for
  * downloading the message (not the header) from the HTTP server.  It
- * is called either as a response to a client's KIOJob::dataEnd()
+ * is called either as a response to a client's TDEIOJob::dataEnd()
  * (meaning that the client is done sending data) or by 'httpOpen()'
  * (if we are in the process of a PUT/POST request). It can also be
  * called by a webDAV function, to receive stat/list/property/etc.
@@ -4343,7 +4343,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
   bool useMD5 = !m_sContentMD5.isEmpty();
 
   // Deal with the size of the file.
-  KIO::filesize_t sz = m_request.offset;
+  TDEIO::filesize_t sz = m_request.offset;
   if ( sz )
     m_iSize += sz;
 
@@ -4354,7 +4354,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
   if ( !dataInternal ) {
     if ( (m_iSize > 0) && (m_iSize != NO_SIZE)) {
        totalSize(m_iSize);
-       infoMessage( i18n( "Retrieving %1 from %2...").arg(KIO::convertSize(m_iSize))
+       infoMessage( i18n( "Retrieving %1 from %2...").arg(TDEIO::convertSize(m_iSize))
          .arg( m_request.hostname ) );
     }
     else
@@ -4411,7 +4411,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
     m_iBytesLeft = NO_SIZE;
 
   kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::readBody: retrieve data. "
-                << KIO::number(m_iBytesLeft) << " left." << endl;
+                << TDEIO::number(m_iBytesLeft) << " left." << endl;
 
   // Main incoming loop...  Gather everything while we can...
   m_cpMimeBuffer = false;
@@ -4527,7 +4527,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
 
     if (m_iBytesLeft == 0)
     {
-      kdDebug(7113) << "("<<m_pid<<") EOD received! Left = "<< KIO::number(m_iBytesLeft) << endl;
+      kdDebug(7113) << "("<<m_pid<<") EOD received! Left = "<< TDEIO::number(m_iBytesLeft) << endl;
       break;
     }
   }
@@ -4554,13 +4554,13 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
   }
   else
   {
-    kdDebug(7113) << "(" << m_pid << ") still "<< KIO::number(m_iBytesLeft)
+    kdDebug(7113) << "(" << m_pid << ") still "<< TDEIO::number(m_iBytesLeft)
                   << " bytes left! can't close cache entry!\n";
   }
 
   if (sz <= 1)
   {
-    /* kdDebug(7113) << "(" << m_pid << ") readBody: sz = " << KIO::number(sz)
+    /* kdDebug(7113) << "(" << m_pid << ") readBody: sz = " << TDEIO::number(sz)
                      << ", responseCode =" << m_responseCode << endl; */
     if (m_responseCode >= 500 && m_responseCode <= 599)
       error(ERR_INTERNAL_SERVER, m_state.hostname);
@@ -5011,7 +5011,7 @@ void HTTPProtocol::cleanCache()
    {
       // Touch file.
       utime(TQFile::encodeName(cleanFile), 0);
-      KApplication::startServiceByDesktopPath("http_cache_cleaner.desktop");
+      TDEApplication::startServiceByDesktopPath("http_cache_cleaner.desktop");
    }
 }
 
@@ -5120,7 +5120,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy )
     {
       //for sites like lib.homelinux.org
       TQTextCodec* oldCodec=TQTextCodec::codecForCStrings();
-      if (KGlobal::locale()->language().contains("ru"))
+      if (TDEGlobal::locale()->language().contains("ru"))
         TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("CP1251"));
 
       p += 6;
@@ -5789,7 +5789,7 @@ TQString HTTPProtocol::createDigestAuth ( bool isForProxy )
   info.qop = "";
 
   // cnonce is recommended to contain about 64 bits of entropy
-  info.cnonce = KApplication::randomString(16).latin1();
+  info.cnonce = TDEApplication::randomString(16).latin1();
 
   // HACK: Should be fixed according to RFC 2617 section 3.2.2
   info.nc = "00000001";
diff --git a/kioslave/http/http.h b/tdeioslave/http/http.h
index 2985eb938..aacdf1d47 100644
--- a/kioslave/http/http.h
+++ b/tdeioslave/http/http.h
@@ -35,18 +35,18 @@
 #include <tqstringlist.h>
 
 #include <kurl.h>
-#include "kio/tcpslavebase.h"
-#include "kio/http.h"
+#include "tdeio/tcpslavebase.h"
+#include "tdeio/http.h"
 
 class DCOPClient;
 class TQDomElement;
 class TQDomNodeList;
 
-namespace KIO {
+namespace TDEIO {
     class AuthInfo;
 }
 
-class HTTPProtocol : public TQObject, public KIO::TCPSlaveBase
+class HTTPProtocol : public TQObject, public TDEIO::TCPSlaveBase
 {
   Q_OBJECT
 public:
@@ -61,7 +61,7 @@ public:
   enum HTTP_AUTH   {AUTH_None, AUTH_Basic, AUTH_NTLM, AUTH_Digest, AUTH_Negotiate};
 
   /** HTTP / DAV method **/
-  // Removed to interfaces/kio/http.h
+  // Removed to interfaces/tdeio/http.h
   //enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,
   //                  HTTP_OPTIONS, DAV_PROPFIND, DAV_PROPPATCH, DAV_MKCOL,
   //                  DAV_COPY, DAV_MOVE, DAV_LOCK, DAV_UNLOCK, DAV_SEARCH };
@@ -103,7 +103,7 @@ public:
     HTTPRequest ()
     {
       port = 0;
-      method = KIO::HTTP_UNKNOWN;
+      method = TDEIO::HTTP_UNKNOWN;
       offset = 0;
       doProxy = false;
       allowCompressedPage = false;
@@ -128,9 +128,9 @@ public:
     TQString passwd;
     TQString path;
     TQString query;
-    KIO::HTTP_METHOD method;
-    KIO::CacheControl cache;
-    KIO::filesize_t offset;
+    TDEIO::HTTP_METHOD method;
+    TDEIO::CacheControl cache;
+    TDEIO::filesize_t offset;
     bool doProxy;
     KURL url;
     TQString window;                 // Window Id this request is related to.
@@ -205,7 +205,7 @@ public:
   bool davHostOk();
 
   // send generic DAV request
-  void davGeneric( const KURL& url, KIO::HTTP_METHOD method );
+  void davGeneric( const KURL& url, TDEIO::HTTP_METHOD method );
 
   // Send requests to lock and unlock resources
   void davLock( const KURL& url, const TQString& scope,
@@ -307,7 +307,7 @@ protected:
    */
   void davSetRequest( const TQCString& requestXML );
   void davStatList( const KURL& url, bool stat = true );
-  void davParsePropstats( const TQDomNodeList& propstats, KIO::UDSEntry& entry );
+  void davParsePropstats( const TQDomNodeList& propstats, TDEIO::UDSEntry& entry );
   void davParseActiveLocks( const TQDomNodeList& activeLocks,
                             uint& lockCount );
 
@@ -463,7 +463,7 @@ protected:
   /**
    * Creates authorization prompt info.
    */
-  void promptInfo( KIO::AuthInfo& info );
+  void promptInfo( TDEIO::AuthInfo& info );
 
 protected:
   HTTPState m_state;
@@ -481,9 +481,9 @@ protected:
 
   // Processing related
   bool m_bChunked; // Chunked tranfer encoding
-  KIO::filesize_t m_iSize; // Expected size of message
-  KIO::filesize_t m_iBytesLeft; // # of bytes left to receive in this message.
-  KIO::filesize_t m_iContentLeft; // # of content bytes left
+  TDEIO::filesize_t m_iSize; // Expected size of message
+  TDEIO::filesize_t m_iBytesLeft; // # of bytes left to receive in this message.
+  TDEIO::filesize_t m_iContentLeft; // # of content bytes left
   TQByteArray m_bufReceive; // Receive buffer
   bool m_dataInternal; // Data is for internal consumption
   char m_lineBuf[1024];
diff --git a/kioslave/http/http.protocol b/tdeioslave/http/http.protocol
index ea7b57869..d5ad11f28 100644
--- a/kioslave/http/http.protocol
+++ b/tdeioslave/http/http.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_http
+exec=tdeio_http
 protocol=http
 input=none
 output=filesystem
@@ -8,5 +8,5 @@ defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
 Icon=www
 maxInstances=3
-DocPath=kioslave/http.html
+DocPath=tdeioslave/http.html
 Class=:internet
diff --git a/kioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index fcf58b683..aaf94d25a 100644
--- a/kioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -33,12 +33,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqptrlist.h>
 
 #include <kinstance.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include <unistd.h>
 
@@ -48,16 +48,16 @@ time_t currentDate;
 int m_maxCacheAge;
 int m_maxCacheSize;
 
-static const char appName[] = "kio_http_cache_cleaner";
+static const char appName[] = "tdeio_http_cache_cleaner";
 
 static const char description[] = I18N_NOOP("TDE HTTP cache maintenance tool");
 
 static const char version[] = "1.0.0";
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
    {"clear-all", I18N_NOOP("Empty the cache"), 0},
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 struct FileInfo {
@@ -189,18 +189,18 @@ void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQStri
 
 extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 {
-   KLocale::setMainCatalogue("tdelibs");
-   KCmdLineArgs::init( argc, argv, appName,
+   TDELocale::setMainCatalogue("tdelibs");
+   TDECmdLineArgs::init( argc, argv, appName,
 		       I18N_NOOP("TDE HTTP cache maintenance tool"),
 		       description, version, true);
 
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::addCmdLineOptions( options );
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
    bool deleteAll = args->isSet("clear-all");
 
-   KInstance ins( appName );
+   TDEInstance ins( appName );
 
    if (!deleteAll)
    {
@@ -220,7 +220,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    if (deleteAll)
       m_maxCacheSize = -1;
 
-   TQString strCacheDir = KGlobal::dirs()->saveLocation("cache", "http");
+   TQString strCacheDir = TDEGlobal::dirs()->saveLocation("cache", "http");
 
    TQDir cacheDir( strCacheDir );
    if (!cacheDir.exists())
diff --git a/kioslave/http/http_cache_cleaner.desktop b/tdeioslave/http/http_cache_cleaner.desktop
index 33cebb731..63410bdd5 100644
--- a/kioslave/http/http_cache_cleaner.desktop
+++ b/tdeioslave/http/http_cache_cleaner.desktop
@@ -82,7 +82,7 @@ Name[zh_CN]=HTTP 缓存清除程�
 Name[zh_HK]=HTTP 快�清除程�
 Name[zh_TW]=HTTP 快�清除程�
 Name[zu]=Umhlanzi we-Cache ye-HTTP
-Exec=kio_http_cache_cleaner
+Exec=tdeio_http_cache_cleaner
 Comment=Cleans up old entries from the HTTP cache
 Comment[af]=Skoonmaak begin ou inskrywings van die Http kas
 Comment[ar]=يزيل المداخل القديمة من كاش HTTP
diff --git a/kioslave/http/https.protocol b/tdeioslave/http/https.protocol
index 8a9c2f0da..75ea1ad0f 100644
--- a/kioslave/http/https.protocol
+++ b/tdeioslave/http/https.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_http
+exec=tdeio_http
 protocol=https
 input=none
 output=filesystem
@@ -8,5 +8,5 @@ defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
 Icon=www
 config=http
-DocPath=kioslave/https.html
+DocPath=tdeioslave/https.html
 Class=:internet
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/tdeioslave/http/kcookiejar/CMakeLists.txt
index eef5e9654..289daa4f0 100644
--- a/kioslave/http/kcookiejar/CMakeLists.txt
+++ b/tdeioslave/http/kcookiejar/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 
 install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 install( FILES kcookiescfg.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
-install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/khtml )
+install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/tdehtml )
 
 
 ##### kcookiejar ################################
diff --git a/kioslave/http/kcookiejar/Makefile.am b/tdeioslave/http/kcookiejar/Makefile.am
index 3cfb540fb..dc331a4aa 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/tdeioslave/http/kcookiejar/Makefile.am
@@ -1,4 +1,4 @@
-# Makefile.am of tdebase/kioslave/http
+# Makefile.am of tdebase/tdeioslave/http
 
 SUBDIRS=tests
 INCLUDES=	$(all_includes)
@@ -24,8 +24,8 @@ kded_DATA = kcookiejar.desktop
 kdeddir = $(kde_servicesdir)/kded
 
 update_DATA = kcookiescfg.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 cookie_DATA = domain_info
-cookiedir = $(kde_datadir)/khtml
+cookiedir = $(kde_datadir)/tdehtml
 
diff --git a/kioslave/http/kcookiejar/domain_info b/tdeioslave/http/kcookiejar/domain_info
index 94baf8dae..94baf8dae 100644
--- a/kioslave/http/kcookiejar/domain_info
+++ b/tdeioslave/http/kcookiejar/domain_info
diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/tdeioslave/http/kcookiejar/kcookiejar.cpp
index ec0a423a6..731dbd996 100644
--- a/kioslave/http/kcookiejar/kcookiejar.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiejar.cpp
@@ -65,7 +65,7 @@
 
 #include <kurl.h>
 #include <krfcdate.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksavefile.h>
 #include <kdebug.h>
 
@@ -85,7 +85,7 @@
 #define IP_ADDRESS_EXPRESSION "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
 
 // Note with respect to TQString::fromLatin1( )
-// Cookies are stored as 8 bit data and passed to kio_http as
+// Cookies are stored as 8 bit data and passed to tdeio_http as
 // latin1 regardless of their actual encoding.
 
 // L1 is used to indicate latin1 constants
@@ -146,6 +146,7 @@ KHttpCookie::KHttpCookie(const TQString &_host,
        mExpireDate(_expireDate),
        mProtocolVersion(_protocolVersion),
        mSecure(_secure),
+       mCrossDomain(false),
        mHttpOnly(_httpOnly),
        mExplicitPath(_explicitPath)
 {
@@ -256,7 +257,7 @@ KCookieJar::KCookieJar()
     m_configChanged = false;
     m_cookiesChanged = false;
     
-    KConfig cfg("khtml/domain_info", true, false, "data");
+    TDEConfig cfg("tdehtml/domain_info", true, false, "data");
     TQStringList countries = cfg.readListEntry("twoLevelTLD");
     for(TQStringList::ConstIterator it = countries.begin();
         it != countries.end(); ++it)
@@ -1478,7 +1479,7 @@ bool KCookieJar::loadCookies(const TQString &_filename)
 // Save the cookie configuration
 //
 
-void KCookieJar::saveConfig(KConfig *_config)
+void KCookieJar::saveConfig(TDEConfig *_config)
 {
     if (!m_configChanged)
         return;
@@ -1514,7 +1515,7 @@ void KCookieJar::saveConfig(KConfig *_config)
 // Load the cookie configuration
 //
 
-void KCookieJar::loadConfig(KConfig *_config, bool reparse )
+void KCookieJar::loadConfig(TDEConfig *_config, bool reparse )
 {
     if ( reparse )
         _config->reparseConfiguration();
diff --git a/kioslave/http/kcookiejar/kcookiejar.desktop b/tdeioslave/http/kcookiejar/kcookiejar.desktop
index ebc76e2f8..ebc76e2f8 100644
--- a/kioslave/http/kcookiejar/kcookiejar.desktop
+++ b/tdeioslave/http/kcookiejar/kcookiejar.desktop
diff --git a/kioslave/http/kcookiejar/kcookiejar.h b/tdeioslave/http/kcookiejar/kcookiejar.h
index eb64485ea..bb16d75d3 100644
--- a/kioslave/http/kcookiejar/kcookiejar.h
+++ b/tdeioslave/http/kcookiejar/kcookiejar.h
@@ -31,7 +31,7 @@
 #include <tqptrlist.h>
 #include <time.h>
 
-class KConfig;
+class TDEConfig;
 class KCookieJar;
 class KHttpCookie;
 class KHttpCookieList;
@@ -146,12 +146,12 @@ public:
     /**
      * Save the cookie configuration
      */
-    void saveConfig(KConfig *_config);
+    void saveConfig(TDEConfig *_config);
 
     /**
      * Load the cookie configuration
      */
-    void loadConfig(KConfig *_config, bool reparse = false);
+    void loadConfig(TDEConfig *_config, bool reparse = false);
 
     /**
      * Looks for cookies in the cookie jar which are appropriate for _url.
diff --git a/kioslave/http/kcookiejar/kcookiescfg.upd b/tdeioslave/http/kcookiejar/kcookiescfg.upd
index 0ff26bde0..0ff26bde0 100644
--- a/kioslave/http/kcookiejar/kcookiescfg.upd
+++ b/tdeioslave/http/kcookiejar/kcookiescfg.upd
diff --git a/kioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp
index da9c16ce7..798b06318 100644
--- a/kioslave/http/kcookiejar/kcookieserver.cpp
+++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp
@@ -35,10 +35,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <dcopclient.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "kcookiejar.h"
@@ -88,7 +88,7 @@ KCookieServer::KCookieServer(const TQCString &name)
    mAdvicePending = false;
    mTimer = new TQTimer();
    connect( mTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotSave()));
-   mConfig = new KConfig("kcookiejarrc");
+   mConfig = new TDEConfig("kcookiejarrc");
    mCookieJar->loadConfig( mConfig );
 
    TQString filename = locateLocal("data", "kcookiejar/cookies");
diff --git a/kioslave/http/kcookiejar/kcookieserver.h b/tdeioslave/http/kcookiejar/kcookieserver.h
index 0c36f10b1..2cbb9ccf1 100644
--- a/kioslave/http/kcookiejar/kcookieserver.h
+++ b/tdeioslave/http/kcookiejar/kcookieserver.h
@@ -34,7 +34,7 @@ class KHttpCookie;
 class TQTimer;
 class RequestList;
 class DCOPClient;
-class KConfig;
+class TDEConfig;
 
 class KCookieServer : public KDEDModule
 {
@@ -86,7 +86,7 @@ protected:
   TQTimer *mTimer;
   bool mAdvicePending;
   DCOPClient *mOldCookieServer;
-  KConfig *mConfig;
+  TDEConfig *mConfig;
 
 private:
   virtual int newInstance(TQValueList<TQCString>) { return 0; }
diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index ca86e0a16..faa9cdc65 100644
--- a/kioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
@@ -58,12 +58,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kidna.h>
 #include <twin.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kurllabel.h>
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
@@ -357,7 +357,7 @@ void KCookieDetail::slotNextCookie()
         TQDateTime cookiedate;
         cookiedate.setTime_t( m_cookie->expireDate() );
         if ( m_cookie->expireDate() )
-          m_expires->setText( KGlobal::locale()->formatDateTime(cookiedate) );
+          m_expires->setText( TDEGlobal::locale()->formatDateTime(cookiedate) );
         else
           m_expires->setText( i18n("End of Session") );
         TQString sec;
diff --git a/kioslave/http/kcookiejar/kcookiewin.h b/tdeioslave/http/kcookiejar/kcookiewin.h
index d739732dc..d739732dc 100644
--- a/kioslave/http/kcookiejar/kcookiewin.h
+++ b/tdeioslave/http/kcookiejar/kcookiewin.h
diff --git a/kioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp
index 67177823b..414afb41f 100644
--- a/kioslave/http/kcookiejar/main.cpp
+++ b/tdeioslave/http/kcookiejar/main.cpp
@@ -22,37 +22,37 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 
 static const char description[] =
 	I18N_NOOP("HTTP Cookie Daemon");
 
 static const char version[] = "1.0";
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
  { "shutdown", I18N_NOOP("Shut down cookie jar"), 0 },
  { "remove <domain>", I18N_NOOP("Remove cookies for domain"), 0 },
  { "remove-all", I18N_NOOP("Remove all cookies"), 0 },
  { "reload-config", I18N_NOOP("Reload configuration file"), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
 };
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-   KLocale::setMainCatalogue("tdelibs");
-   KCmdLineArgs::init(argc, argv, "kcookiejar", I18N_NOOP("HTTP cookie daemon"),
+   TDELocale::setMainCatalogue("tdelibs");
+   TDECmdLineArgs::init(argc, argv, "kcookiejar", I18N_NOOP("HTTP cookie daemon"),
 		      description, version);
 
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::addCmdLineOptions( options );
 
-   KInstance a("kcookiejar");
+   TDEInstance a("kcookiejar");
    
    kapp->dcopClient()->attach();
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    TQCString replyType;
    TQByteArray replyData;
    if (args->isSet("remove-all"))
diff --git a/kioslave/http/kcookiejar/netscape_cookie_spec.html b/tdeioslave/http/kcookiejar/netscape_cookie_spec.html
index eb190f2e3..eb190f2e3 100644
--- a/kioslave/http/kcookiejar/netscape_cookie_spec.html
+++ b/tdeioslave/http/kcookiejar/netscape_cookie_spec.html
diff --git a/kioslave/http/kcookiejar/rfc2109 b/tdeioslave/http/kcookiejar/rfc2109
index 432fdcc6e..432fdcc6e 100644
--- a/kioslave/http/kcookiejar/rfc2109
+++ b/tdeioslave/http/kcookiejar/rfc2109
diff --git a/kioslave/http/kcookiejar/rfc2965 b/tdeioslave/http/kcookiejar/rfc2965
index 8a4d02b17..8a4d02b17 100644
--- a/kioslave/http/kcookiejar/rfc2965
+++ b/tdeioslave/http/kcookiejar/rfc2965
diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/tdeioslave/http/kcookiejar/tests/Makefile.am
index 44a453feb..3af4677f1 100644
--- a/kioslave/http/kcookiejar/tests/Makefile.am
+++ b/tdeioslave/http/kcookiejar/tests/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
-# Makefile.am of tdebase/kioslave/http
+# Makefile.am of tdebase/tdeioslave/http
 
 INCLUDES=	$(all_includes) 
 
@@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
 
 kcookiejartest_SOURCES = kcookiejartest.cpp 
 kcookiejartest_LDADD   = $(LIB_KIO)
-kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 check-local: kcookiejartest
 	./kcookiejartest $(srcdir)/cookie.test
diff --git a/kioslave/http/kcookiejar/tests/cookie.test b/tdeioslave/http/kcookiejar/tests/cookie.test
index 6619bf82d..6619bf82d 100644
--- a/kioslave/http/kcookiejar/tests/cookie.test
+++ b/tdeioslave/http/kcookiejar/tests/cookie.test
diff --git a/kioslave/http/kcookiejar/tests/cookie_rfc.test b/tdeioslave/http/kcookiejar/tests/cookie_rfc.test
index e1d8a40de..e1d8a40de 100644
--- a/kioslave/http/kcookiejar/tests/cookie_rfc.test
+++ b/tdeioslave/http/kcookiejar/tests/cookie_rfc.test
diff --git a/kioslave/http/kcookiejar/tests/cookie_saving.test b/tdeioslave/http/kcookiejar/tests/cookie_saving.test
index cb9f34c42..cb9f34c42 100644
--- a/kioslave/http/kcookiejar/tests/cookie_saving.test
+++ b/tdeioslave/http/kcookiejar/tests/cookie_saving.test
diff --git a/kioslave/http/kcookiejar/tests/cookie_settings.test b/tdeioslave/http/kcookiejar/tests/cookie_settings.test
index 7fc1a03a7..7fc1a03a7 100644
--- a/kioslave/http/kcookiejar/tests/cookie_settings.test
+++ b/tdeioslave/http/kcookiejar/tests/cookie_settings.test
diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
index a150fc420..9d720d6c4 100644
--- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
@@ -24,9 +24,9 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 
 #include "../kcookiejar.cpp"
@@ -36,13 +36,13 @@ static const char *description = "KCookiejar regression test";
 static KCookieJar *jar;
 static TQCString *lastYear;
 static TQCString *nextYear;
-static KConfig *config = 0;
+static TDEConfig *config = 0;
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+testfile", "Regression test to run", 0},
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 static void FAIL(const TQString &msg)
@@ -87,7 +87,7 @@ static void clearConfig()
    delete config;
    TQString file = locateLocal("config", "kcookiejar-testconfig");
    TQFile::remove(file);
-   config = new KConfig(file);
+   config = new TDEConfig(file);
    config->setGroup("Cookie Policy");
    config->writeEntry("RejectCrossDomainCookies", false);
    config->writeEntry("AcceptSessionCookies", false);
@@ -249,16 +249,16 @@ int main(int argc, char *argv[])
    lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()-1).utf8());
    nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8());
 
-   KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
-   KCmdLineArgs::init( argc, argv, &about);
+   TDEAboutData about("kcookietest", "kcookietest", "1.0", description, TDEAboutData::License_GPL, "(C) 2004 Waldo Bastian");
+   TDECmdLineArgs::init( argc, argv, &about);
 
-   KCmdLineArgs::addCmdLineOptions( options );
+   TDECmdLineArgs::addCmdLineOptions( options );
 
-   KInstance a("kcookietest");
+   TDEInstance a("kcookietest");
    
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    if (args->count() != 1)
-      KCmdLineArgs::usage();
+      TDECmdLineArgs::usage();
 
    jar = new KCookieJar;
 
diff --git a/kioslave/http/rfc2518.txt b/tdeioslave/http/rfc2518.txt
index 34d2e942a..34d2e942a 100644
--- a/kioslave/http/rfc2518.txt
+++ b/tdeioslave/http/rfc2518.txt
diff --git a/kioslave/http/rfc2616.txt b/tdeioslave/http/rfc2616.txt
index 7be662a97..7be662a97 100644
--- a/kioslave/http/rfc2616.txt
+++ b/tdeioslave/http/rfc2616.txt
diff --git a/kioslave/http/rfc2617.txt b/tdeioslave/http/rfc2617.txt
index da74cc63a..da74cc63a 100644
--- a/kioslave/http/rfc2617.txt
+++ b/tdeioslave/http/rfc2617.txt
diff --git a/kioslave/http/rfc2817.txt b/tdeioslave/http/rfc2817.txt
index a29dfc44b..a29dfc44b 100644
--- a/kioslave/http/rfc2817.txt
+++ b/tdeioslave/http/rfc2817.txt
diff --git a/kioslave/http/rfc2818.txt b/tdeioslave/http/rfc2818.txt
index fff91b1a9..fff91b1a9 100644
--- a/kioslave/http/rfc2818.txt
+++ b/tdeioslave/http/rfc2818.txt
diff --git a/kioslave/http/rfc3229.txt b/tdeioslave/http/rfc3229.txt
index 54a19b685..54a19b685 100644
--- a/kioslave/http/rfc3229.txt
+++ b/tdeioslave/http/rfc3229.txt
diff --git a/kioslave/http/rfc3253.txt b/tdeioslave/http/rfc3253.txt
index 9968eea02..9968eea02 100644
--- a/kioslave/http/rfc3253.txt
+++ b/tdeioslave/http/rfc3253.txt
diff --git a/kioslave/http/shoutcast-icecast.txt b/tdeioslave/http/shoutcast-icecast.txt
index f7bdcf1e7..f7bdcf1e7 100644
--- a/kioslave/http/shoutcast-icecast.txt
+++ b/tdeioslave/http/shoutcast-icecast.txt
diff --git a/kioslave/http/webdav.protocol b/tdeioslave/http/webdav.protocol
index f4f4df462..0c696e5e6 100644
--- a/kioslave/http/webdav.protocol
+++ b/tdeioslave/http/webdav.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_http
+exec=tdeio_http
 protocol=webdav
 input=none
 output=filesystem
@@ -14,5 +14,5 @@ defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
 Icon=www
 maxInstances=3
-DocPath=kioslave/webdav.html
+DocPath=tdeioslave/webdav.html
 Class=:internet
diff --git a/kioslave/http/webdavs.protocol b/tdeioslave/http/webdavs.protocol
index c8b7cba3f..eb88675b1 100644
--- a/kioslave/http/webdavs.protocol
+++ b/tdeioslave/http/webdavs.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_http
+exec=tdeio_http
 protocol=webdavs
 input=none
 output=filesystem
@@ -14,5 +14,5 @@ defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=false
 Icon=www
 config=webdav
-DocPath=kioslave/webdavs.html
+DocPath=tdeioslave/webdavs.html
 Class=:internet
diff --git a/kioslave/iso/CMakeLists.txt b/tdeioslave/iso/CMakeLists.txt
index da6315b77..89b5f0f38 100644
--- a/kioslave/iso/CMakeLists.txt
+++ b/tdeioslave/iso/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -31,13 +31,13 @@ link_directories(
 
 install( FILES iso.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES isoservice.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
-install( FILES kio_isorc DESTINATION ${CONFIG_INSTALL_DIR} )
-install( FILES kio_iso.desktop DESTINATION ${APPS_INSTALL_DIR} )
+install( FILES tdeio_isorc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdeio_iso.desktop DESTINATION ${APPS_INSTALL_DIR} )
 
 
-##### kio_iso ###################################
+##### tdeio_iso ###################################
 
-set( target kio_iso )
+set( target tdeio_iso )
 
 set( ${target}_SRCS
   kisodirectory.cpp kisofile.cpp qfilehack.cpp
@@ -46,6 +46,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK isofs-static kio-shared
+  LINK isofs-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/iso/Makefile.am b/tdeioslave/iso/Makefile.am
index f9c0bb754..e7eec33f6 100644
--- a/kioslave/iso/Makefile.am
+++ b/tdeioslave/iso/Makefile.am
@@ -1,4 +1,4 @@
-kde_module_LTLIBRARIES = kio_iso.la
+kde_module_LTLIBRARIES = tdeio_iso.la
 
 
 INCLUDES = $(all_includes)
@@ -6,18 +6,18 @@ INCLUDES = $(all_includes)
 
 #LDFLAGS =      
 
-kio_iso_la_METASOURCES=AUTO
+tdeio_iso_la_METASOURCES=AUTO
 
-kio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
-kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
+tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
+tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
 
-kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 
 SUBDIRS = libisofs
 
 noinst_HEADERS = iso.h kiso.h qfilehack.h kisofile.h kisodirectory.h
-EXTRA_DIST = iso.protocol isoservice.desktop kio_iso.desktop
+EXTRA_DIST = iso.protocol isoservice.desktop tdeio_iso.desktop
 
 install-data-local:
 	$(mkinstalldirs)  $(DESTDIR)$(kde_servicesdir)/
@@ -25,15 +25,15 @@ install-data-local:
 	$(mkinstalldirs)  $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/
 	$(INSTALL_DATA) $(srcdir)/isoservice.desktop  $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop
 	$(mkinstalldirs)  $(DESTDIR)$(kde_confdir)/
-	$(INSTALL_DATA) $(srcdir)/kio_isorc $(DESTDIR)$(kde_confdir)/kio_isorc
+	$(INSTALL_DATA) $(srcdir)/tdeio_isorc $(DESTDIR)$(kde_confdir)/tdeio_isorc
 	$(mkinstalldirs)  $(DESTDIR)$(kde_appsdir)/
-	$(INSTALL_DATA) $(srcdir)/kio_iso.desktop  $(DESTDIR)$(kde_appsdir)/kio_iso.desktop
+	$(INSTALL_DATA) $(srcdir)/tdeio_iso.desktop  $(DESTDIR)$(kde_appsdir)/tdeio_iso.desktop
 
 uninstall-local:
 	-rm -f  $(DESTDIR)$(kde_servicesdir)/iso.protocol
 	-rm -f  $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop
-	-rm -f  $(DESTDIR)$(kde_confdir)/kio_isorc
-	-rm -f  $(DESTDIR)$(kde_appsdir)/kio_iso.desktop
+	-rm -f  $(DESTDIR)$(kde_confdir)/tdeio_isorc
+	-rm -f  $(DESTDIR)$(kde_appsdir)/tdeio_iso.desktop
 
 # These paths are KDE specific. Use them:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.
diff --git a/kioslave/iso/iso.cpp b/tdeioslave/iso/iso.cpp
index 4bd128e49..8696b0c67 100644
--- a/kioslave/iso/iso.cpp
+++ b/tdeioslave/iso/iso.cpp
@@ -54,23 +54,23 @@ static const unsigned char zisofs_magic[8] = {
     0x37, 0xE4, 0x53, 0x96, 0xC9, 0xDB, 0xD6, 0x07
 };
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_iso" );
+  TDEInstance instance( "tdeio_iso" );
 
   kdDebug()   << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_iso protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_iso protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
-  kio_isoProtocol slave(argv[2], argv[3]);
+  tdeio_isoProtocol slave(argv[2], argv[3]);
   slave.dispatchLoop();
 
   kdDebug()   << "Done" << endl;
@@ -78,20 +78,20 @@ int kdemain( int argc, char **argv )
 }
 
 
-kio_isoProtocol::kio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app )
+tdeio_isoProtocol::tdeio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app )
 {
-  kdDebug() << "kio_isoProtocol::kio_isoProtocol" << endl;
+  kdDebug() << "tdeio_isoProtocol::tdeio_isoProtocol" << endl;
   m_isoFile = 0L;
 }
 
-kio_isoProtocol::~kio_isoProtocol()
+tdeio_isoProtocol::~tdeio_isoProtocol()
 {
     delete m_isoFile;
 }
 
-bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec )
+bool tdeio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec )
 {
-    kdDebug()   << "kio_isoProtocol::checkNewFile " << fullPath << " startsec: " <<
+    kdDebug()   << "tdeio_isoProtocol::checkNewFile " << fullPath << " startsec: " <<
         startsec << endl;
 
     // Are we already looking at that file ?
@@ -105,7 +105,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
             if ( m_mtime == statbuf.st_mtime )
             {
                 path = fullPath.mid( m_isoFile->fileName().length() );
-                kdDebug()   << "kio_isoProtocol::checkNewFile returning " << path << endl;
+                kdDebug()   << "tdeio_isoProtocol::checkNewFile returning " << path << endl;
                 return true;
             }
         }
@@ -157,7 +157,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
     }
     if ( isoFile.isEmpty() )
     {
-        kdDebug()   << "kio_isoProtocol::checkNewFile: not found" << endl;
+        kdDebug()   << "tdeio_isoProtocol::checkNewFile: not found" << endl;
         return false;
     }
 
@@ -177,7 +177,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
 }
 
 
-void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry )
+void tdeio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry )
 {
     UDSAtom atom;
 
@@ -230,9 +230,9 @@ void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry &
     entry.append( atom );
 }
 
-void kio_isoProtocol::listDir( const KURL & url )
+void tdeio_isoProtocol::listDir( const KURL & url )
 {
-    kdDebug() << "kio_isoProtocol::listDir " << url.url() << endl;
+    kdDebug() << "tdeio_isoProtocol::listDir " << url.url() << endl;
 
     TQString path;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
@@ -241,7 +241,7 @@ void kio_isoProtocol::listDir( const KURL & url )
         kdDebug()  << "Checking (stat) on " << _path << endl;
         struct stat buff;
         if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
-            error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+            error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
             return;
         }
         // It's a real dir -> redirect
@@ -263,7 +263,7 @@ void kio_isoProtocol::listDir( const KURL & url )
         kdDebug() << "url.path()==" << url.path() << endl;
         if (url.hasRef()) redir.setRef(url.htmlRef());
         redir.setPath( url.path() + TQString::fromLatin1("/") );
-        kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl;
+        kdDebug() << "tdeio_isoProtocol::listDir: redirection " << redir.url() << endl;
         redirection( redir );
         finished();
         return;
@@ -278,12 +278,12 @@ void kio_isoProtocol::listDir( const KURL & url )
         const KArchiveEntry* e = root->entry( path );
         if ( !e )
         {
-            error( KIO::ERR_DOES_NOT_EXIST, path );
+            error( TDEIO::ERR_DOES_NOT_EXIST, path );
             return;
         }
         if ( ! e->isDirectory() )
         {
-            error( KIO::ERR_IS_FILE, path );
+            error( TDEIO::ERR_IS_FILE, path );
             return;
         }
         dir = (KArchiveDirectory*)e;
@@ -310,35 +310,35 @@ void kio_isoProtocol::listDir( const KURL & url )
 
     finished();
 
-    kdDebug()  << "kio_isoProtocol::listDir done" << endl;
+    kdDebug()  << "tdeio_isoProtocol::listDir done" << endl;
 }
 
-void kio_isoProtocol::stat( const KURL & url )
+void tdeio_isoProtocol::stat( const KURL & url )
 {
     TQString path;
     UDSEntry entry;
 
-    kdDebug() << "kio_isoProtocol::stat " << url.url() << endl;
+    kdDebug() << "tdeio_isoProtocol::stat " << url.url() << endl;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
     {
         // We may be looking at a real directory - this happens
         // when pressing up after being in the root of an archive
         TQCString _path( TQFile::encodeName(url.path()));
-        kdDebug()  << "kio_isoProtocol::stat (stat) on " << _path << endl;
+        kdDebug()  << "tdeio_isoProtocol::stat (stat) on " << _path << endl;
         struct stat buff;
         if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
             kdDebug() << "isdir=" << S_ISDIR( buff.st_mode ) << "  errno=" << strerror(errno) << endl;
-            error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+            error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
             return;
         }
         // Real directory. Return just enough information for KRun to work
         UDSAtom atom;
-        atom.m_uds = KIO::UDS_NAME;
+        atom.m_uds = TDEIO::UDS_NAME;
         atom.m_str = url.fileName();
         entry.append( atom );
-        kdDebug()  << "kio_isoProtocol::stat returning name=" << url.fileName() << endl;
+        kdDebug()  << "tdeio_isoProtocol::stat returning name=" << url.fileName() << endl;
 
-        atom.m_uds = KIO::UDS_FILE_TYPE;
+        atom.m_uds = TDEIO::UDS_FILE_TYPE;
         atom.m_long = buff.st_mode & S_IFMT;
         entry.append( atom );
 
@@ -363,7 +363,7 @@ void kio_isoProtocol::stat( const KURL & url )
     }
     if ( !isoEntry )
     {
-        error( KIO::ERR_DOES_NOT_EXIST, path );
+        error( TDEIO::ERR_DOES_NOT_EXIST, path );
         return;
     }
     createUDSEntry( isoEntry, entry );
@@ -371,7 +371,7 @@ void kio_isoProtocol::stat( const KURL & url )
     finished();
 }
 
-void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path )
+void tdeio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path )
 {
     unsigned long long size, pos = 0;
     bool mime=false,zlib=false;
@@ -412,7 +412,7 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
                     
                 pptr = pointer_block.data();
             } else {
-                error(KIO::ERR_COULD_NOT_READ, path);
+                error(TDEIO::ERR_COULD_NOT_READ, path);
                 return;
             }
         } else {
@@ -474,7 +474,7 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
     }
 
     if (pos!=size) {
-        error(KIO::ERR_COULD_NOT_READ, path);
+        error(TDEIO::ERR_COULD_NOT_READ, path);
         return;
     }
 
@@ -485,14 +485,14 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
 
 }
 
-void kio_isoProtocol::get( const KURL & url )
+void tdeio_isoProtocol::get( const KURL & url )
 {
-    kdDebug()  << "kio_isoProtocol::get" << url.url() << endl;
+    kdDebug()  << "tdeio_isoProtocol::get" << url.url() << endl;
 
     TQString path;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
     {
-        error( KIO::ERR_DOES_NOT_EXIST, url.path() );
+        error( TDEIO::ERR_DOES_NOT_EXIST, url.path() );
         return;
     }
 
@@ -501,12 +501,12 @@ void kio_isoProtocol::get( const KURL & url )
 
     if ( !isoEntry )
     {
-        error( KIO::ERR_DOES_NOT_EXIST, path );
+        error( TDEIO::ERR_DOES_NOT_EXIST, path );
         return;
     }
     if ( isoEntry->isDirectory() )
     {
-        error( KIO::ERR_IS_DIRECTORY, path );
+        error( TDEIO::ERR_IS_DIRECTORY, path );
         return;
     }
 
diff --git a/kioslave/iso/iso.h b/tdeioslave/iso/iso.h
index 2a488bd9d..b284e2295 100644
--- a/kioslave/iso/iso.h
+++ b/tdeioslave/iso/iso.h
@@ -22,17 +22,17 @@
 #ifndef _ISO_H
 #define _ISO_H
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <sys/types.h>
 #include "kisofile.h"
 
 class KIso;
 
-class kio_isoProtocol : public KIO::SlaveBase
+class tdeio_isoProtocol : public TDEIO::SlaveBase
 {
 public:
-    kio_isoProtocol( const TQCString &pool, const TQCString &app );
-    virtual ~kio_isoProtocol();
+    tdeio_isoProtocol( const TQCString &pool, const TQCString &app );
+    virtual ~tdeio_isoProtocol();
 
     virtual void listDir( const KURL & url );
     virtual void stat( const KURL & url );
@@ -40,7 +40,7 @@ public:
 
 protected:
     void getFile( const KIsoFile *isoFileEntry, const TQString &path );
-    void createUDSEntry( const KArchiveEntry * isoEntry, KIO::UDSEntry & entry );
+    void createUDSEntry( const KArchiveEntry * isoEntry, TDEIO::UDSEntry & entry );
     bool checkNewFile( TQString fullPath, TQString & path, int startsec );
 
     KIso * m_isoFile;
diff --git a/kioslave/iso/iso.protocol b/tdeioslave/iso/iso.protocol
index 0e7d71b64..150b03634 100644
--- a/kioslave/iso/iso.protocol
+++ b/tdeioslave/iso/iso.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_iso
+exec=tdeio_iso
 protocol=iso
 listing=Name,Type,Size,Date,AccessDate,CreationDate,Access,Owner,Group,Link
 input=filesystem
@@ -7,5 +7,5 @@ output=filesystem
 reading=true
 source=true
 Icon=cd
-Description=A kioslave for ISO9660 filesystems
+Description=A tdeioslave for ISO9660 filesystems
 MimeType=application/x-iso
diff --git a/kioslave/iso/isoservice.desktop b/tdeioslave/iso/isoservice.desktop
index 00093709b..00093709b 100644
--- a/kioslave/iso/isoservice.desktop
+++ b/tdeioslave/iso/isoservice.desktop
diff --git a/kioslave/iso/kiso.cpp b/tdeioslave/iso/kiso.cpp
index 9ec1f1c3e..513bd7c04 100644
--- a/kioslave/iso/kiso.cpp
+++ b/tdeioslave/iso/kiso.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfilterdev.h>
 #include <kfilterbase.h>
 
@@ -324,9 +324,9 @@ void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
 
 void KIso::readParams()
 {
-    KConfig *config;
+    TDEConfig *config;
 
-    config = new KConfig("kio_isorc");
+    config = new TDEConfig("tdeio_isorc");
     
     showhidden=config->readBoolEntry("showhidden",false);
     showrr=config->readBoolEntry("showrr",true);
diff --git a/kioslave/iso/kiso.h b/tdeioslave/iso/kiso.h
index de0f06dca..de0f06dca 100644
--- a/kioslave/iso/kiso.h
+++ b/tdeioslave/iso/kiso.h
diff --git a/kioslave/iso/kisodirectory.cpp b/tdeioslave/iso/kisodirectory.cpp
index 74987a232..74987a232 100644
--- a/kioslave/iso/kisodirectory.cpp
+++ b/tdeioslave/iso/kisodirectory.cpp
diff --git a/kioslave/iso/kisodirectory.h b/tdeioslave/iso/kisodirectory.h
index 74045ac75..74045ac75 100644
--- a/kioslave/iso/kisodirectory.h
+++ b/tdeioslave/iso/kisodirectory.h
diff --git a/kioslave/iso/kisofile.cpp b/tdeioslave/iso/kisofile.cpp
index ffae0d3bc..ffae0d3bc 100644
--- a/kioslave/iso/kisofile.cpp
+++ b/tdeioslave/iso/kisofile.cpp
diff --git a/kioslave/iso/kisofile.h b/tdeioslave/iso/kisofile.h
index 696a8c191..696a8c191 100644
--- a/kioslave/iso/kisofile.h
+++ b/tdeioslave/iso/kisofile.h
diff --git a/kioslave/iso/libisofs/CMakeLists.txt b/tdeioslave/iso/libisofs/CMakeLists.txt
index a9ef936a8..a9ef936a8 100644
--- a/kioslave/iso/libisofs/CMakeLists.txt
+++ b/tdeioslave/iso/libisofs/CMakeLists.txt
diff --git a/kioslave/iso/libisofs/COPYING b/tdeioslave/iso/libisofs/COPYING
index c7aea1896..c7aea1896 100644
--- a/kioslave/iso/libisofs/COPYING
+++ b/tdeioslave/iso/libisofs/COPYING
diff --git a/kioslave/iso/libisofs/ChangeLog b/tdeioslave/iso/libisofs/ChangeLog
index fb46b8056..fb46b8056 100644
--- a/kioslave/iso/libisofs/ChangeLog
+++ b/tdeioslave/iso/libisofs/ChangeLog
diff --git a/kioslave/iso/libisofs/Makefile.am b/tdeioslave/iso/libisofs/Makefile.am
index a1278ff41..a1278ff41 100644
--- a/kioslave/iso/libisofs/Makefile.am
+++ b/tdeioslave/iso/libisofs/Makefile.am
diff --git a/kioslave/iso/libisofs/README b/tdeioslave/iso/libisofs/README
index 45d3bff04..45d3bff04 100644
--- a/kioslave/iso/libisofs/README
+++ b/tdeioslave/iso/libisofs/README
diff --git a/kioslave/iso/libisofs/bswap.h b/tdeioslave/iso/libisofs/bswap.h
index 95520c6ef..95520c6ef 100644
--- a/kioslave/iso/libisofs/bswap.h
+++ b/tdeioslave/iso/libisofs/bswap.h
diff --git a/kioslave/iso/libisofs/el_torito.h b/tdeioslave/iso/libisofs/el_torito.h
index cba83f785..cba83f785 100644
--- a/kioslave/iso/libisofs/el_torito.h
+++ b/tdeioslave/iso/libisofs/el_torito.h
diff --git a/kioslave/iso/libisofs/iso_fs.h b/tdeioslave/iso/libisofs/iso_fs.h
index 43353b0d9..43353b0d9 100644
--- a/kioslave/iso/libisofs/iso_fs.h
+++ b/tdeioslave/iso/libisofs/iso_fs.h
diff --git a/kioslave/iso/libisofs/isofs.c b/tdeioslave/iso/libisofs/isofs.c
index f1db4427c..f1db4427c 100644
--- a/kioslave/iso/libisofs/isofs.c
+++ b/tdeioslave/iso/libisofs/isofs.c
diff --git a/kioslave/iso/libisofs/isofs.h b/tdeioslave/iso/libisofs/isofs.h
index 1d17de4bb..1d17de4bb 100644
--- a/kioslave/iso/libisofs/isofs.h
+++ b/tdeioslave/iso/libisofs/isofs.h
diff --git a/kioslave/iso/libisofs/rock.h b/tdeioslave/iso/libisofs/rock.h
index e85919261..e85919261 100644
--- a/kioslave/iso/libisofs/rock.h
+++ b/tdeioslave/iso/libisofs/rock.h
diff --git a/kioslave/iso/qfilehack.cpp b/tdeioslave/iso/qfilehack.cpp
index f4f788f25..f4f788f25 100644
--- a/kioslave/iso/qfilehack.cpp
+++ b/tdeioslave/iso/qfilehack.cpp
diff --git a/kioslave/iso/qfilehack.h b/tdeioslave/iso/qfilehack.h
index 3f0b1f6a6..3f0b1f6a6 100644
--- a/kioslave/iso/qfilehack.h
+++ b/tdeioslave/iso/qfilehack.h
diff --git a/kioslave/iso/kio_iso.desktop b/tdeioslave/iso/tdeio_iso.desktop
index 8578f44b4..8578f44b4 100644
--- a/kioslave/iso/kio_iso.desktop
+++ b/tdeioslave/iso/tdeio_iso.desktop
diff --git a/kioslave/iso/kio_isorc b/tdeioslave/iso/tdeio_isorc
index 3a874172e..3a874172e 100644
--- a/kioslave/iso/kio_isorc
+++ b/tdeioslave/iso/tdeio_isorc
diff --git a/kioslave/metainfo/CMakeLists.txt b/tdeioslave/metainfo/CMakeLists.txt
index 9c5fcdf20..75ed33dff 100644
--- a/kioslave/metainfo/CMakeLists.txt
+++ b/tdeioslave/metainfo/CMakeLists.txt
@@ -14,8 +14,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -28,9 +28,9 @@ link_directories(
 install( FILES metainfo.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_metainfo ##############################
+##### tdeio_metainfo ##############################
 
-set( target kio_metainfo )
+set( target tdeio_metainfo )
 
 set( ${target}_SRCS
   metainfo.cpp
@@ -38,6 +38,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kioslave/metainfo/Makefile.am b/tdeioslave/metainfo/Makefile.am
index e2de616c6..fd089f7a5 100644
--- a/kioslave/metainfo/Makefile.am
+++ b/tdeioslave/metainfo/Makefile.am
@@ -1,15 +1,15 @@
 ## $Id$
-## Makefile.am of tdebase/kioslave/metainfo
+## Makefile.am of tdebase/tdeioslave/metainfo
 
 INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_metainfo.la
+kde_module_LTLIBRARIES = tdeio_metainfo.la
 
-kio_metainfo_la_SOURCES = metainfo.cpp
-kio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
-kio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_metainfo_la_SOURCES = metainfo.cpp
+tdeio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+tdeio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = metainfo.h 
 
diff --git a/kioslave/metainfo/metainfo.cpp b/tdeioslave/metainfo/metainfo.cpp
index 21e24e428..389a9182e 100644
--- a/kioslave/metainfo/metainfo.cpp
+++ b/tdeioslave/metainfo/metainfo.cpp
@@ -20,11 +20,11 @@
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <kfilemetainfo.h>
-#include <klocale.h>
+#include <tdefilemetainfo.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 #include "metainfo.h"
@@ -33,7 +33,7 @@
 // mimeType     - the mime type of the file, so we need not extra determine it
 // what         - what to load
  
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C"
 {
@@ -42,11 +42,11 @@ extern "C"
 
 int kdemain(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kio_metainfo", false, true);
+    TDEApplication app(argc, argv, "tdeio_metainfo", false, true);
 
     if (argc != 4)
     {
-        kdError() << "Usage: kio_metainfo protocol domain-socket1 domain-socket2" << endl;
+        kdError() << "Usage: tdeio_metainfo protocol domain-socket1 domain-socket2" << endl;
         exit(-1);
     }
 
diff --git a/kioslave/metainfo/metainfo.h b/tdeioslave/metainfo/metainfo.h
index 491da62eb..cc179cc98 100644
--- a/kioslave/metainfo/metainfo.h
+++ b/tdeioslave/metainfo/metainfo.h
@@ -21,9 +21,9 @@
 #ifndef _METAINFO_H_
 #define _METAINFO_H_
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
-class MetaInfoProtocol : public KIO::SlaveBase
+class MetaInfoProtocol : public TDEIO::SlaveBase
 {
 public:
     MetaInfoProtocol(const TQCString &pool, const TQCString &app);
diff --git a/kioslave/metainfo/metainfo.protocol b/tdeioslave/metainfo/metainfo.protocol
index f1fa9adac..8609ad520 100644
--- a/kioslave/metainfo/metainfo.protocol
+++ b/tdeioslave/metainfo/metainfo.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_metainfo
+exec=tdeio_metainfo
 protocol=metainfo
 input=stream
 output=stream
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp
index a3ba789c5..1db2a3d8b 100644
--- a/tdelfeditor/tdelfeditor.cpp
+++ b/tdelfeditor/tdelfeditor.cpp
@@ -42,11 +42,11 @@ extern "C" {
 #include <tqstringlist.h>
 #include <tqfileinfo.h>
 
-#include <kglobal.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeglobal.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 /* return application name */
@@ -536,18 +536,18 @@ int main_console(int argc, char **argv)
 		case MODE_TDE_AUTOADD_ICON:
 		{
 			printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]);
-			KApplication::disableAutoDcopRegistration();
-			KAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1");
-			KCmdLineArgs::init(&aboutd);
-			KApplication app(false, false);
+			TDEApplication::disableAutoDcopRegistration();
+			TDEAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1");
+			TDECmdLineArgs::init(&aboutd);
+			TDEApplication app(false, false);
 
-			TQStringList rds = KGlobal::dirs()->resourceDirs("icon");
+			TQStringList rds = TDEGlobal::dirs()->resourceDirs("icon");
 			for ( TQStringList::Iterator it = rds.begin(); it != rds.end(); ++it ) {
 				printf(" * %s\n\r", (*it).ascii()); fflush(stdout);
 			}
-			TQString systemIcon = KGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true);
+			TQString systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true);
 			if (systemIcon.isNull()) {
-				systemIcon = KGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false);
+				systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false);
 				printf("NOT FOUND, refusing to add unknown icon (this message is harmless)\n\r");
 				section = ICON_SECTION;
 				clear_resource(handle, section);
diff --git a/kmdi/CMakeLists.txt b/tdemdi/CMakeLists.txt
index ab54cb550..e0837b136 100644
--- a/kmdi/CMakeLists.txt
+++ b/tdemdi/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-add_subdirectory( kmdi )
+add_subdirectory( tdemdi )
 
 include_directories(
   ${TQT_INCLUDE_DIRS}
@@ -21,8 +21,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kutils
-  ${CMAKE_SOURCE_DIR}/kmdi
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_SOURCE_DIR}/tdemdi
 )
 
 link_directories(
@@ -33,28 +33,28 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kmdichildarea.h kmdichildfrm.h kmdichildfrmcaption.h
-    kmdidefines.h kmdiiterator.h kmdilistiterator.h
-    kmdimainfrm.h kmdinulliterator.h kmditaskbar.h
-    kmdichildview.h kmditoolviewaccessor.h
+    tdemdichildarea.h tdemdichildfrm.h tdemdichildfrmcaption.h
+    tdemdidefines.h tdemdiiterator.h tdemdilistiterator.h
+    tdemdimainfrm.h tdemdinulliterator.h tdemditaskbar.h
+    tdemdichildview.h tdemditoolviewaccessor.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-#### kmdi #######################################
+#### tdemdi #######################################
 
-set( target kmdi )
+set( target tdemdi )
 
 set( ${target}_SRCS
-  kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp
-  kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp
-  kmdidockcontainer.cpp kmditoolviewaccessor.cpp
-  kmdiguiclient.cpp kmdidocumentviewtabwidget.cpp
-  kmdifocuslist.cpp
+  tdemdichildarea.cpp tdemdichildfrm.cpp tdemdichildfrmcaption.cpp
+  tdemdichildview.cpp tdemdimainfrm.cpp tdemditaskbar.cpp
+  tdemdidockcontainer.cpp tdemditoolviewaccessor.cpp
+  tdemdiguiclient.cpp tdemdidocumentviewtabwidget.cpp
+  tdemdifocuslist.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kmdi2-shared
+  LINK tdemdi2-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdemdi/Makefile.am b/tdemdi/Makefile.am
new file mode 100644
index 000000000..ec8547375
--- /dev/null
+++ b/tdemdi/Makefile.am
@@ -0,0 +1,20 @@
+SUBDIRS = tdemdi . test
+
+INCLUDES = -I$(top_srcdir)/tdemdi/res -I$(top_srcdir)/tdeutils -I$(top_srcdir) -I$(top_srcdir)/tdemdi $(all_includes)
+
+lib_LTLIBRARIES = libtdemdi.la
+libtdemdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
+libtdemdi_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/tdeutils/libtdeutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
+
+libtdemdi_la_SOURCES = tdemdichildarea.cpp tdemdichildfrm.cpp tdemdichildfrmcaption.cpp \
+                     tdemdichildview.cpp tdemdimainfrm.cpp tdemditaskbar.cpp tdemdidockcontainer.cpp \
+		     tdemditoolviewaccessor.cpp tdemdiguiclient.cpp tdemdidocumentviewtabwidget.cpp \
+                     tdemdifocuslist.cpp
+
+include_HEADERS = tdemdichildarea.h tdemdichildfrm.h tdemdichildfrmcaption.h tdemdidefines.h \
+                  tdemdiiterator.h tdemdilistiterator.h tdemdimainfrm.h tdemdinulliterator.h \
+                  tdemditaskbar.h tdemdichildview.h tdemditoolviewaccessor.h
+
+METASOURCES = AUTO
+
+include ../admin/Doxyfile.am
diff --git a/kmdi/TODO b/tdemdi/TODO
index b04df59db..b04df59db 100644
--- a/kmdi/TODO
+++ b/tdemdi/TODO
diff --git a/kmdi/res/filenew.xpm b/tdemdi/res/filenew.xpm
index b261800d6..b261800d6 100644
--- a/kmdi/res/filenew.xpm
+++ b/tdemdi/res/filenew.xpm
diff --git a/kmdi/res/kde2_closebutton.xpm b/tdemdi/res/kde2_closebutton.xpm
index 5c05e7149..5c05e7149 100644
--- a/kmdi/res/kde2_closebutton.xpm
+++ b/tdemdi/res/kde2_closebutton.xpm
diff --git a/kmdi/res/kde2_maxbutton.xpm b/tdemdi/res/kde2_maxbutton.xpm
index c8ef81139..c8ef81139 100644
--- a/kmdi/res/kde2_maxbutton.xpm
+++ b/tdemdi/res/kde2_maxbutton.xpm
diff --git a/kmdi/res/kde2_minbutton.xpm b/tdemdi/res/kde2_minbutton.xpm
index 98669195d..98669195d 100644
--- a/kmdi/res/kde2_minbutton.xpm
+++ b/tdemdi/res/kde2_minbutton.xpm
diff --git a/kmdi/res/kde2_restorebutton.xpm b/tdemdi/res/kde2_restorebutton.xpm
index a6e01fcba..a6e01fcba 100644
--- a/kmdi/res/kde2_restorebutton.xpm
+++ b/tdemdi/res/kde2_restorebutton.xpm
diff --git a/kmdi/res/kde2_undockbutton.xpm b/tdemdi/res/kde2_undockbutton.xpm
index 711bf01cc..711bf01cc 100644
--- a/kmdi/res/kde2_undockbutton.xpm
+++ b/tdemdi/res/kde2_undockbutton.xpm
diff --git a/kmdi/res/kde2laptop_closebutton.xpm b/tdemdi/res/kde2laptop_closebutton.xpm
index 6801e4e33..6801e4e33 100644
--- a/kmdi/res/kde2laptop_closebutton.xpm
+++ b/tdemdi/res/kde2laptop_closebutton.xpm
diff --git a/kmdi/res/kde2laptop_closebutton_menu.xpm b/tdemdi/res/kde2laptop_closebutton_menu.xpm
index 9d0712319..9d0712319 100644
--- a/kmdi/res/kde2laptop_closebutton_menu.xpm
+++ b/tdemdi/res/kde2laptop_closebutton_menu.xpm
diff --git a/kmdi/res/kde2laptop_maxbutton.xpm b/tdemdi/res/kde2laptop_maxbutton.xpm
index b8ce6de2c..b8ce6de2c 100644
--- a/kmdi/res/kde2laptop_maxbutton.xpm
+++ b/tdemdi/res/kde2laptop_maxbutton.xpm
diff --git a/kmdi/res/kde2laptop_minbutton.xpm b/tdemdi/res/kde2laptop_minbutton.xpm
index 6bcf76c57..6bcf76c57 100644
--- a/kmdi/res/kde2laptop_minbutton.xpm
+++ b/tdemdi/res/kde2laptop_minbutton.xpm
diff --git a/kmdi/res/kde2laptop_restorebutton.xpm b/tdemdi/res/kde2laptop_restorebutton.xpm
index 803ce6db4..803ce6db4 100644
--- a/kmdi/res/kde2laptop_restorebutton.xpm
+++ b/tdemdi/res/kde2laptop_restorebutton.xpm
diff --git a/kmdi/res/kde2laptop_undockbutton.xpm b/tdemdi/res/kde2laptop_undockbutton.xpm
index 1f23ecaf8..1f23ecaf8 100644
--- a/kmdi/res/kde2laptop_undockbutton.xpm
+++ b/tdemdi/res/kde2laptop_undockbutton.xpm
diff --git a/kmdi/res/kde_closebutton.xpm b/tdemdi/res/kde_closebutton.xpm
index e714359a8..e714359a8 100644
--- a/kmdi/res/kde_closebutton.xpm
+++ b/tdemdi/res/kde_closebutton.xpm
diff --git a/kmdi/res/kde_maxbutton.xpm b/tdemdi/res/kde_maxbutton.xpm
index 2af3bf882..2af3bf882 100644
--- a/kmdi/res/kde_maxbutton.xpm
+++ b/tdemdi/res/kde_maxbutton.xpm
diff --git a/kmdi/res/kde_minbutton.xpm b/tdemdi/res/kde_minbutton.xpm
index c4e609ae7..c4e609ae7 100644
--- a/kmdi/res/kde_minbutton.xpm
+++ b/tdemdi/res/kde_minbutton.xpm
diff --git a/kmdi/res/kde_restorebutton.xpm b/tdemdi/res/kde_restorebutton.xpm
index 4ec185133..4ec185133 100644
--- a/kmdi/res/kde_restorebutton.xpm
+++ b/tdemdi/res/kde_restorebutton.xpm
diff --git a/kmdi/res/kde_undockbutton.xpm b/tdemdi/res/kde_undockbutton.xpm
index de97e9e77..de97e9e77 100644
--- a/kmdi/res/kde_undockbutton.xpm
+++ b/tdemdi/res/kde_undockbutton.xpm
diff --git a/kmdi/res/win_closebutton.xpm b/tdemdi/res/win_closebutton.xpm
index d8be02435..d8be02435 100644
--- a/kmdi/res/win_closebutton.xpm
+++ b/tdemdi/res/win_closebutton.xpm
diff --git a/kmdi/res/win_maxbutton.xpm b/tdemdi/res/win_maxbutton.xpm
index 95e501a82..95e501a82 100644
--- a/kmdi/res/win_maxbutton.xpm
+++ b/tdemdi/res/win_maxbutton.xpm
diff --git a/kmdi/res/win_minbutton.xpm b/tdemdi/res/win_minbutton.xpm
index 1e8787e78..1e8787e78 100644
--- a/kmdi/res/win_minbutton.xpm
+++ b/tdemdi/res/win_minbutton.xpm
diff --git a/kmdi/res/win_restorebutton.xpm b/tdemdi/res/win_restorebutton.xpm
index 87bb5b30f..87bb5b30f 100644
--- a/kmdi/res/win_restorebutton.xpm
+++ b/tdemdi/res/win_restorebutton.xpm
diff --git a/kmdi/res/win_undockbutton.xpm b/tdemdi/res/win_undockbutton.xpm
index 386ebd8a9..386ebd8a9 100644
--- a/kmdi/res/win_undockbutton.xpm
+++ b/tdemdi/res/win_undockbutton.xpm
diff --git a/kmdi/kmdi/CMakeLists.txt b/tdemdi/tdemdi/CMakeLists.txt
index 2314d79ab..7f2b3c7ad 100644
--- a/kmdi/kmdi/CMakeLists.txt
+++ b/tdemdi/tdemdi/CMakeLists.txt
@@ -16,11 +16,11 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/kmdi
+  ${CMAKE_SOURCE_DIR}/tdemdi
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
 )
 
 link_directories(
@@ -32,12 +32,12 @@ link_directories(
 
 install( FILES
     global.h mainwindow.h toolviewaccessor.h tabwidget.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kmdi )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdemdi )
 
 
-#### kmdi2 ######################################
+#### tdemdi2 ######################################
 
-set( target kmdi2 )
+set( target tdemdi2 )
 
 set( ${target}_SRCS
   mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp
@@ -47,6 +47,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdemdi/tdemdi/Makefile.am b/tdemdi/tdemdi/Makefile.am
new file mode 100644
index 000000000..82abae6e6
--- /dev/null
+++ b/tdemdi/tdemdi/Makefile.am
@@ -0,0 +1,14 @@
+INCLUDES = -I$(top_srcdir)/tdeutils -I$(top_srcdir) -I$(top_srcdir)/tdemdi $(all_includes)
+
+lib_LTLIBRARIES = libtdemdi2.la
+libtdemdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
+libtdemdi2_la_LIBADD  = $(LIB_KPARTS) $(top_builddir)/tdeutils/libtdeutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+
+libtdemdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
+
+tdemdiincludedir = $(includedir)/tdemdi
+tdemdiinclude_HEADERS = global.h mainwindow.h toolviewaccessor.h tabwidget.h
+
+METASOURCES = AUTO
+
+include ../../admin/Doxyfile.am
diff --git a/kmdi/kmdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index 65433cfaa..be7c00929 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -28,17 +28,17 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
-#include <kmultitabbar.h>
-#include <kglobalsettings.h>
+#include <tdemultitabbar.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
-static const char* const kmdi_not_close_xpm[]={
+static const char* const tdemdi_not_close_xpm[]={
 "5 5 2 1",
 "# c black",
 ". c None",
@@ -195,7 +195,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
       TQToolTip::add( btn, i18n("Switch between overlap and side by side mode", "Overlap") );
 
       btn->setToggleButton( true );
-      btn->setPixmap( const_cast< const char** >(kmdi_not_close_xpm) );
+      btn->setPixmap( const_cast< const char** >(tdemdi_not_close_xpm) );
       hdr->addButton(btn);
       m_overlapButtons.insert(w,btn);
       btn->setOn(!isOverlapMode());
@@ -278,7 +278,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
       case TQEvent::MouseMove:
 		if (m_movingState==WaitingForMoveStart) {
 			TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() );
-		        if( p.manhattanLength() > KGlobalSettings::dndEventDelay()) {
+		        if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay()) {
 				m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent));
 				m_dockManager->eventFilter(m_dragPanel,event);
 				m_movingState=Moving;
@@ -460,7 +460,7 @@ void DockContainer::setPixmap(KDockWidget* widget ,const TQPixmap& pixmap)
   tab->setIcon(pixmap.isNull()?SmallIcon("misc"):pixmap);
 }
 
-void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
+void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix)
 {
   // group name
   TQString grp=cfg->group();
@@ -504,7 +504,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
   cfg->setGroup(grp);
 }
 
-void DockContainer::load(KConfig* cfg,const TQString& group_or_prefix)
+void DockContainer::load(TDEConfig* cfg,const TQString& group_or_prefix)
 {
   TQString grp=cfg->group();
   cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name()));
diff --git a/kmdi/kmdi/dockcontainer.h b/tdemdi/tdemdi/dockcontainer.h
index ac27f8644..9b7478378 100644
--- a/kmdi/kmdi/dockcontainer.h
+++ b/tdemdi/tdemdi/dockcontainer.h
@@ -91,8 +91,8 @@ class DockContainer: public TQWidget, public KDockContainer
 
     void hideIfNeeded();
 
-    virtual void save(KConfig *,const TQString& group_or_prefix);
-    virtual void load(KConfig *,const TQString& group_or_prefix);
+    virtual void save(TDEConfig *,const TQString& group_or_prefix);
+    virtual void load(TDEConfig *,const TQString& group_or_prefix);
 
     void setStyle(int);
   protected:
diff --git a/kmdi/kmdi/global.h b/tdemdi/tdemdi/global.h
index 6ea09a93e..6ea09a93e 100644
--- a/kmdi/kmdi/global.h
+++ b/tdemdi/tdemdi/global.h
diff --git a/kmdi/kmdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 1233bc64b..9201df7b3 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
    Copyright (C) 2004 Christoph Cullmann <cullmann@kde.org>
-   based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+   based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -22,11 +22,11 @@
 #include "guiclient.moc"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <ktoolbar.h>
-#include <klocale.h>
-#include <kaction.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdetoolbar.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
 #include <tqstring.h>
 #include <kdebug.h>
 #include <kdockwidget.h>
@@ -35,7 +35,7 @@
 #include "toolviewaccessor.h"
 #include "toolviewaccessor_p.h"
 
-static const char *actionListName = "show_kmdi_document_tool_view_actions";
+static const char *actionListName = "show_tdemdi_document_tool_view_actions";
 
 static const char *guiDescription = ""
         "<!DOCTYPE kpartgui><kpartgui name=\"KMDIViewActions\">"
@@ -46,7 +46,7 @@ static const char *guiDescription = ""
         "</MenuBar>"
         "</kpartgui>";
 
-static const char *resourceFileName = "kmdiviewactions.rc";
+static const char *resourceFileName = "tdemdiviewactions.rc";
 
 namespace KMDIPrivate
 {
@@ -73,25 +73,25 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
     setXML( completeDescription, false /*merge*/ );
   }
 
-  if (actionCollection()->kaccel()==0)
+  if (actionCollection()->tdeaccel()==0)
     actionCollection()->setWidget(mdiMainFrm);
 
-  m_toolMenu=new KActionMenu(i18n("Tool &Views"),actionCollection(),"kmdi_toolview_menu");
-
-  m_gotoToolDockMenu=new KActionMenu(i18n("Tool &Docks"),actionCollection(),"kmdi_tooldock_menu");
-  m_gotoToolDockMenu->insert(new KAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()),
-  actionCollection(),"kmdi_activate_top"));
-  m_gotoToolDockMenu->insert(new KAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()),
-  actionCollection(),"kmdi_activate_left"));
-  m_gotoToolDockMenu->insert(new KAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()),
-  actionCollection(),"kmdi_activate_right"));
-  m_gotoToolDockMenu->insert(new KAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()),
-  actionCollection(),"kmdi_activate_bottom"));
-  m_gotoToolDockMenu->insert(new KActionSeparator(actionCollection(),"kmdi_goto_menu_separator"));
-  m_gotoToolDockMenu->insert(new KAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()),
-  actionCollection(),"kmdi_prev_toolview"));
-  m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()),
-  actionCollection(),"kmdi_next_toolview"));
+  m_toolMenu=new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu");
+
+  m_gotoToolDockMenu=new TDEActionMenu(i18n("Tool &Docks"),actionCollection(),"tdemdi_tooldock_menu");
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()),
+  actionCollection(),"tdemdi_activate_top"));
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()),
+  actionCollection(),"tdemdi_activate_left"));
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()),
+  actionCollection(),"tdemdi_activate_right"));
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()),
+  actionCollection(),"tdemdi_activate_bottom"));
+  m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator"));
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()),
+  actionCollection(),"tdemdi_prev_toolview"));
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()),
+  actionCollection(),"tdemdi_next_toolview"));
 
   actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
 }
@@ -115,7 +115,7 @@ void GUIClient::setupActions()
 
   unplugActionList( actionListName );
 
-  TQPtrList<KAction> addList;
+  TQPtrList<TDEAction> addList;
   if (m_toolViewActions.count()<3)
   {
     for (uint i=0;i<m_toolViewActions.count();i++)
@@ -135,17 +135,17 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)
 {
   kdDebug(760)<<"*****void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)*****"<<endl;
 
-  TQString aname = TQString("kmdi_toolview_") + mtva->wrappedWidget()->name();
+  TQString aname = TQString("tdemdi_toolview_") + mtva->wrappedWidget()->name();
 
   // try to read the action shortcut
-  KShortcut sc;
-  KConfig *cfg = kapp->config();
+  TDEShortcut sc;
+  TDEConfig *cfg = kapp->config();
   TQString _grp = cfg->group();
   cfg->setGroup("Shortcuts");
-  sc = KShortcut( cfg->readEntry( aname, "" ) );
+  sc = TDEShortcut( cfg->readEntry( aname, "" ) );
   cfg->setGroup( _grp );
 
-  KAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()),
+  TDEAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()),
     /*TQString::null*/sc,tqt_dynamic_cast<KDockWidget*>(mtva->wrapperWidget()),
     m_mdiMainFrm,actionCollection(), aname.latin1() );
 
@@ -162,7 +162,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)
 
 void GUIClient::actionDeleted(TQObject* a)
 {
-  m_toolViewActions.remove(static_cast<KAction*>(a));
+  m_toolViewActions.remove(static_cast<TDEAction*>(a));
   setupActions();
 }
 
@@ -173,9 +173,9 @@ void GUIClient::clientAdded( KXMLGUIClient *client )
     setupActions();
 }
 
-ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const KShortcut& cut,KDockWidget *dw, KMDI::MainWindow *mdiMainFrm,
+ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut,KDockWidget *dw, KMDI::MainWindow *mdiMainFrm,
                                              TQObject* parent, const char* name )
- : KToggleAction(text,cut,parent,name)
+ : TDEToggleAction(text,cut,parent,name)
  , m_dw(dw)
  , m_mdiMainFrm(mdiMainFrm)
 {
diff --git a/kmdi/kmdi/guiclient.h b/tdemdi/tdemdi/guiclient.h
index c3784fe6e..4f12e4b30 100644
--- a/kmdi/kmdi/guiclient.h
+++ b/tdemdi/tdemdi/guiclient.h
@@ -1,7 +1,7 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
    Copyright (C) 2004 Christoph Cullmann <cullmann@kde.org>
-   based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+   based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -24,12 +24,12 @@
 #include <tqobject.h>
 #include <tqguardedptr.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
-#include <kmdi/global.h>
+#include <tdemdi/global.h>
 
-class KMainWindow;
-class KToolBar;
+class TDEMainWindow;
+class TDEToolBar;
 
 namespace KMDI {
   class MainWindow;
@@ -67,21 +67,21 @@ class GUIClient : public TQObject, public KXMLGUIClient
     GUIClientPrivate *d;
 
     TQGuardedPtr<KMDI::MainWindow> m_mdiMainFrm;
-    TQPtrList<KAction> m_toolViewActions;
-    TQPtrList<KAction> m_documentViewActions;
+    TQPtrList<TDEAction> m_toolViewActions;
+    TQPtrList<TDEAction> m_documentViewActions;
 
-    KActionMenu *m_docMenu;
-    KActionMenu *m_toolMenu;
+    TDEActionMenu *m_docMenu;
+    TDEActionMenu *m_toolMenu;
 
-    KActionMenu *m_gotoToolDockMenu;
+    TDEActionMenu *m_gotoToolDockMenu;
 };
 
-class ToggleToolViewAction:public KToggleAction
+class ToggleToolViewAction:public TDEToggleAction
 {
   Q_OBJECT
 
   public:
-    ToggleToolViewAction ( const TQString& text, const KShortcut& cut = KShortcut(),
+    ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut = TDEShortcut(),
                            KDockWidget *dw=0,KMDI::MainWindow *mdiMainFrm=0, TQObject* parent = 0, const char* name = 0 );
 
     virtual ~ToggleToolViewAction();
diff --git a/kmdi/kmdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 358791ab0..411d11771 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -51,12 +51,12 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 
-#include <kmenubar.h>
-#include <kapplication.h>
+#include <tdemenubar.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kiconloader.h>
 #include "dockcontainer.h"
diff --git a/kmdi/kmdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index 953d248de..0c333a151 100644
--- a/kmdi/kmdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -42,21 +42,21 @@
 #ifndef _KMDI_MAINWINDOW_H_
 #define _KMDI_MAINWINDOW_H_
 
-#include <kparts/dockmainwindow.h>
-#include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdeparts/dockmainwindow.h>
+#include <tdemenubar.h>
+#include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
 #include <tqrect.h>
 #include <tqapplication.h>
 #include <tqguardedptr.h>
 
-#include <kmdi/global.h>
+#include <tdemdi/global.h>
 
 class TQPopupMenu;
 class TQMenuBar;
 
-#include <kmdi/toolviewaccessor.h>
+#include <tdemdi/toolviewaccessor.h>
 
 namespace KMDIPrivate {
   class MainWindowPrivate;
diff --git a/kmdi/kmdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 2d9603bf5..261fb6d55 100644
--- a/kmdi/kmdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
@@ -40,7 +40,7 @@
 */
 
 #include <ktabbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 #include <tqobjectlist.h>
diff --git a/kmdi/kmdi/tabwidget.h b/tdemdi/tdemdi/tabwidget.h
index 61f9e7d32..992aa657d 100644
--- a/kmdi/kmdi/tabwidget.h
+++ b/tdemdi/tdemdi/tabwidget.h
@@ -43,7 +43,7 @@
 #define _KMDI_TABWIDGET_H_
 
 #include <ktabwidget.h>
-#include <kmdi/global.h>
+#include <tdemdi/global.h>
 
 namespace KMDIPrivate
 {
diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/tdemdi/tdemdi/toolviewaccessor.cpp
index c0d191ff4..c0d191ff4 100644
--- a/kmdi/kmdi/toolviewaccessor.cpp
+++ b/tdemdi/tdemdi/toolviewaccessor.cpp
diff --git a/kmdi/kmdi/toolviewaccessor.h b/tdemdi/tdemdi/toolviewaccessor.h
index 75d9a863e..75d9a863e 100644
--- a/kmdi/kmdi/toolviewaccessor.h
+++ b/tdemdi/tdemdi/toolviewaccessor.h
diff --git a/kmdi/kmdi/toolviewaccessor_p.h b/tdemdi/tdemdi/toolviewaccessor_p.h
index 71ffb286a..e5f2b9138 100644
--- a/kmdi/kmdi/toolviewaccessor_p.h
+++ b/tdemdi/tdemdi/toolviewaccessor_p.h
@@ -22,7 +22,7 @@
 
 #include <kdockwidget.h>
 #include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 namespace KMDIPrivate
 {
@@ -48,7 +48,7 @@ class ToolViewAccessorPrivate
 
     TQGuardedPtr<KDockWidget> widgetContainer;
     TQWidget *widget;
-    TQGuardedPtr<KAction> action;
+    TQGuardedPtr<TDEAction> action;
 };
 
 }
diff --git a/kmdi/kmdichildarea.cpp b/tdemdi/tdemdichildarea.cpp
index fe28fdff9..29b0b3d2d 100644
--- a/kmdi/kmdichildarea.cpp
+++ b/tdemdi/tdemdichildarea.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildarea.cpp
+//    filename             : tdemdichildarea.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -25,15 +25,15 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildarea.h"
-#include "kmdichildarea.moc"
+#include "tdemdichildarea.h"
+#include "tdemdichildarea.moc"
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include <math.h>
 #include <tqpopupmenu.h>
@@ -46,16 +46,16 @@
 //============ KMdiChildArea ============//
 
 KMdiChildArea::KMdiChildArea( TQWidget *parent )
-		: TQFrame( parent, "kmdi_childarea" )
+		: TQFrame( parent, "tdemdi_childarea" )
 {
 	setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	m_captionFont = TQFont();
 	TQFontMetrics fm( m_captionFont );
 	m_captionFontLineSpacing = fm.lineSpacing();
-	m_captionActiveBackColor = KGlobalSettings::activeTitleColor();
-	m_captionActiveForeColor = KGlobalSettings::activeTextColor();
-	m_captionInactiveBackColor = KGlobalSettings::inactiveTitleColor();
-	m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor();
+	m_captionActiveBackColor = TDEGlobalSettings::activeTitleColor();
+	m_captionActiveForeColor = TDEGlobalSettings::activeTextColor();
+	m_captionInactiveBackColor = TDEGlobalSettings::inactiveTitleColor();
+	m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor();
 	m_pZ = new TQPtrList<KMdiChildFrm>;
 	m_pZ->setAutoDelete( true );
 	setFocusPolicy( TQ_ClickFocus );
@@ -784,10 +784,10 @@ void KMdiChildArea::setMdiCaptionInactiveBackColor( const TQColor& clr )
 void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeBG,
                                       TQColor& activeFG, TQColor& inactiveBG, TQColor& inactiveFG )
 {
-	activeBG = KGlobalSettings::activeTitleColor();
-	activeFG = KGlobalSettings::activeTextColor();
-	inactiveBG = KGlobalSettings::inactiveTitleColor();
-	inactiveFG = KGlobalSettings::inactiveTextColor();
+	activeBG = TDEGlobalSettings::activeTitleColor();
+	activeFG = TDEGlobalSettings::activeTextColor();
+	inactiveBG = TDEGlobalSettings::inactiveTitleColor();
+	inactiveFG = TDEGlobalSettings::inactiveTextColor();
 }
 
 // kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
diff --git a/kmdi/kmdichildarea.h b/tdemdi/tdemdichildarea.h
index 747919a4a..9d8f33f51 100644
--- a/kmdi/kmdichildarea.h
+++ b/tdemdi/tdemdichildarea.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildarea.h
+//    filename             : tdemdichildarea.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -31,8 +31,8 @@
 #include <tqframe.h>
 #include <tqptrlist.h>
 
-#include "kmdichildfrm.h"
-#include "kmdichildview.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildview.h"
 
 class KMdiChildAreaPrivate;
 
@@ -188,8 +188,8 @@ public:
 	 * This method is useful not only for KMDI child windows.
 	 * Colors are returned via activeBG, activeFG, inactiveBG, inactiveFG references.
 	 *
-	 * @deprecated Use KGlobalSettings::activeTitleColor(), KGlobalSettings::activeTextColor(),
-	 * KGlobalSettings::inactiveTitleColor() and KGlobalSettings::inactiveTextColor() instead.
+	 * @deprecated Use TDEGlobalSettings::activeTitleColor(), TDEGlobalSettings::activeTextColor(),
+	 * TDEGlobalSettings::inactiveTitleColor() and TDEGlobalSettings::inactiveTextColor() instead.
 	 */
 	static void getCaptionColors( const TQPalette &pal, TQColor &activeBG, TQColor &activeFG,
 	                              TQColor &inactiveBG, TQColor &inactiveFG ) KDE_DEPRECATED;
diff --git a/kmdi/kmdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp
index 449c8befe..40ced6ffb 100644
--- a/kmdi/kmdichildfrm.cpp
+++ b/tdemdi/tdemdichildfrm.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrm.cpp
+//    filename             : tdemdichildfrm.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,13 +27,13 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildfrm.h"
-#include "kmdichildfrm.moc"
+#include "tdemdichildfrm.h"
+#include "tdemdichildfrm.moc"
 
-#include "kmdidefines.h"
-#include "kmdichildfrmcaption.h"
-#include "kmdichildarea.h"
-#include "kmdimainfrm.h"
+#include "tdemdidefines.h"
+#include "tdemdichildfrmcaption.h"
+#include "tdemdichildarea.h"
+#include "tdemdimainfrm.h"
 
 #include <tqpainter.h>
 #include <tqapplication.h>
@@ -45,7 +45,7 @@
 #include <tqnamespace.h>
 #include <tqimage.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,7 @@ void KMdiWin32IconButton::mousePressEvent( TQMouseEvent* )
 //============ KMdiChildFrm ============//
 
 KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
-	: TQFrame( parent, "kmdi_childfrm" )
+	: TQFrame( parent, "tdemdi_childfrm" )
 	, m_pClient( 0L )
 	, m_pManager( 0L )
 	, m_pCaption( 0L )
@@ -131,12 +131,12 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
 
 	m_pManager = parent;
 
-	m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "kmdi_iconbutton_icon" );
-	m_pUnixIcon = new TQToolButton( m_pCaption, "kmdi_toolbutton_icon" );
-	m_pMinimize = new TQToolButton( m_pCaption, "kmdi_toolbutton_min" );
-	m_pMaximize = new TQToolButton( m_pCaption, "kmdi_toolbutton_max" );
-	m_pClose = new TQToolButton( m_pCaption, "kmdi_toolbutton_close" );
-	m_pUndock = new TQToolButton( m_pCaption, "kmdi_toolbutton_undock" );
+	m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "tdemdi_iconbutton_icon" );
+	m_pUnixIcon = new TQToolButton( m_pCaption, "tdemdi_toolbutton_icon" );
+	m_pMinimize = new TQToolButton( m_pCaption, "tdemdi_toolbutton_min" );
+	m_pMaximize = new TQToolButton( m_pCaption, "tdemdi_toolbutton_max" );
+	m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" );
+	m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" );
 
 	TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
 	TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) );
diff --git a/kmdi/kmdichildfrm.h b/tdemdi/tdemdichildfrm.h
index 0fe2cd2b2..79a7dd821 100644
--- a/kmdi/kmdichildfrm.h
+++ b/tdemdi/tdemdichildfrm.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrm.h
+//    filename             : tdemdichildfrm.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -37,7 +37,7 @@
 
 #include <tqdict.h>
 
-#include "kmdichildfrmcaption.h"
+#include "tdemdichildfrmcaption.h"
 
 class KMdiChildArea;
 class KMdiChildView;
@@ -61,7 +61,7 @@ signals:
 };
 
 //==============================================================================
-/* some special events, see kmdidefines.h
+/* some special events, see tdemdidefines.h
 */ 
 //------------------------------------------------------------------------------
 /**
diff --git a/kmdi/kmdichildfrmcaption.cpp b/tdemdi/tdemdichildfrmcaption.cpp
index 9ebbefb34..e8e91ea94 100644
--- a/kmdi/kmdichildfrmcaption.cpp
+++ b/tdemdi/tdemdichildfrmcaption.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrmcaption.cpp
+//    filename             : tdemdichildfrmcaption.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -25,8 +25,8 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildfrmcaption.h"
-#include "kmdichildfrmcaption.moc"
+#include "tdemdichildfrmcaption.h"
+#include "tdemdichildfrmcaption.moc"
 
 #include <tqpainter.h>
 #include <tqapplication.h>
@@ -34,11 +34,11 @@
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
 
-#include "kmdidefines.h"
-#include "kmdichildfrm.h"
-#include "kmdichildarea.h"
-#include "kmdimainfrm.h"
-#include <klocale.h>
+#include "tdemdidefines.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildarea.h"
+#include "tdemdimainfrm.h"
+#include <tdelocale.h>
 #include <iostream>
 
 #ifdef Q_WS_WIN 
@@ -66,7 +66,7 @@
 //============== KMdiChildFrmCaption =============//
 
 KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent )
-		: TQWidget( parent, "kmdi_childfrmcaption" )
+		: TQWidget( parent, "tdemdi_childfrmcaption" )
 {
 	m_szCaption = i18n( "Unnamed" );
 	m_bActive = false;
diff --git a/kmdi/kmdichildfrmcaption.h b/tdemdi/tdemdichildfrmcaption.h
index 0a209bcd9..d9f0bb1b2 100644
--- a/kmdi/kmdichildfrmcaption.h
+++ b/tdemdi/tdemdichildfrmcaption.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildfrmcaption.h
+//    filename             : tdemdichildfrmcaption.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -29,7 +29,7 @@
 
 #include <tqwidget.h>
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 class KMdiChildFrm;
 
diff --git a/kmdi/kmdichildview.cpp b/tdemdi/tdemdichildview.cpp
index ad5328cc9..4d0aa4166 100644
--- a/kmdi/kmdichildview.cpp
+++ b/tdemdi/tdemdichildview.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildview.cpp
+//    filename             : tdemdichildview.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -29,17 +29,17 @@
 //
 //----------------------------------------------------------------------------
 
-#include "kmdichildview.h"
-#include "kmdichildview.moc"
+#include "tdemdichildview.h"
+#include "tdemdichildview.moc"
 
 #include <tqdatetime.h>
 #include <tqobjectlist.h>
 
-#include "kmdimainfrm.h"
-#include "kmdichildfrm.h"
-#include "kmdidefines.h"
+#include "tdemdimainfrm.h"
+#include "tdemdichildfrm.h"
+#include "tdemdidefines.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqiconset.h>
 
 //============ KMdiChildView ============//
diff --git a/kmdi/kmdichildview.h b/tdemdi/tdemdichildview.h
index 11e74259e..04d784be3 100644
--- a/kmdi/kmdichildview.h
+++ b/tdemdi/tdemdichildview.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdichildview.h
+//    filename             : tdemdichildview.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -37,7 +37,7 @@
 #include <tqapplication.h>
 #include <tqdatetime.h>
 
-#include "kmdichildfrm.h"
+#include "tdemdichildfrm.h"
 
 class KMdiChildViewPrivate;
 
diff --git a/kmdi/kmdidefines.h b/tdemdi/tdemdidefines.h
index 8673876a5..13beb0b51 100644
--- a/kmdi/kmdidefines.h
+++ b/tdemdi/tdemdidefines.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdidefines.h
+//    filename             : tdemdidefines.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/kmdi/kmdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index cf7053c51..d6771b597 100644
--- a/kmdi/kmdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -17,9 +17,9 @@
  Boston, MA 02110-1301, USA.
 */
 
-#include "kmdimainfrm.h"
-#include "kmdidockcontainer.h"
-#include "kmdidockcontainer.moc"
+#include "tdemdimainfrm.h"
+#include "tdemdidockcontainer.h"
+#include "tdemdidockcontainer.moc"
 
 #include "kdockwidget_private.h"
 
@@ -27,17 +27,17 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
-#include <kmultitabbar.h>
-#include <kglobalsettings.h>
+#include <tdemultitabbar.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
-static const char* const kmdi_not_close_xpm[] =
+static const char* const tdemdi_not_close_xpm[] =
     {
         "5 5 2 1",
         "# c black",
@@ -218,7 +218,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 			TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) );
 
 			btn->setToggleButton( true );
-			btn->setPixmap( const_cast< const char** >( kmdi_not_close_xpm ) );
+			btn->setPixmap( const_cast< const char** >( tdemdi_not_close_xpm ) );
 			hdr->addButton( btn );
 			m_overlapButtons.insert( w, btn );
 			btn->setOn( !isOverlapMode() );
@@ -301,7 +301,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 		if ( m_movingState == WaitingForMoveStart )
 		{
 			TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() );
-			if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() )
+			if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
 			{
 				m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) );
 				m_dockManager->eventFilter( m_dragPanel, event );
@@ -624,7 +624,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 		TQTimer::singleShot( 0, this, TQT_SLOT( init() ) );
 }
 
-void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
+void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
 	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
@@ -671,7 +671,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 
 }
 
-void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
+void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
 	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
diff --git a/kmdi/kmdidockcontainer.h b/tdemdi/tdemdidockcontainer.h
index cb0d6e4ce..8dfe6664b 100644
--- a/kmdi/kmdidockcontainer.h
+++ b/tdemdi/tdemdidockcontainer.h
@@ -88,22 +88,22 @@ public:
 	void hideIfNeeded();
 
 	/**
-	 * Save the config using a KConfig object
+	 * Save the config using a TDEConfig object
 	 *
 	 * The combination of the group_or_prefix variable and the parent
 	 * dockwidget's name will be the group the configuration is saved in
 	 * \param group_or_prefix the prefix to append to the parent dockwidget's name
 	 */
-	virtual void save( KConfig *, const TQString& group_or_prefix );
+	virtual void save( TDEConfig *, const TQString& group_or_prefix );
 
 	/**
-	 * Load the config using a KConfig object
+	 * Load the config using a TDEConfig object
 	 * 
 	 * The combination of the group_or_prefix variable and the parent
 	 * dockwidget's name will be the group the configuration is loaded from
 	 * \param group_or_prefix the prefix to append to the parent dockwidget's name
 	 */
-	virtual void load( KConfig *, const TQString& group_or_prefix );
+	virtual void load( TDEConfig *, const TQString& group_or_prefix );
 
 	/**
 	 * Save the config to a QDomElement
diff --git a/kmdi/kmdidocumentviewtabwidget.cpp b/tdemdi/tdemdidocumentviewtabwidget.cpp
index 90b618e47..936125e7f 100644
--- a/kmdi/kmdidocumentviewtabwidget.cpp
+++ b/tdemdi/tdemdidocumentviewtabwidget.cpp
@@ -10,8 +10,8 @@
 #include <tqtimer.h>
 
 #include <ktabbar.h>
-#include <kpopupmenu.h>
-#include "kmdidocumentviewtabwidget.h"
+#include <tdepopupmenu.h>
+#include "tdemdidocumentviewtabwidget.h"
 
 KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
 {
@@ -141,7 +141,7 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( )
 
 
 #ifndef NO_INCLUDE_MOCFILES
-#include "kmdidocumentviewtabwidget.moc"
+#include "tdemdidocumentviewtabwidget.moc"
 #endif
 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdidocumentviewtabwidget.h b/tdemdi/tdemdidocumentviewtabwidget.h
index d731a9a03..8b8025cbf 100644
--- a/kmdi/kmdidocumentviewtabwidget.h
+++ b/tdemdi/tdemdidocumentviewtabwidget.h
@@ -11,9 +11,9 @@
 #define _KMDI_DOCUMENT_VIEW_TAB_WIDGET_H_
 
 #include <ktabwidget.h>
-#include <kmdidefines.h>
+#include <tdemdidefines.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 //KDE4: Add a d pointer
 /**
diff --git a/kmdi/kmdifocuslist.cpp b/tdemdi/tdemdifocuslist.cpp
index e8f71ff25..a4592e38b 100644
--- a/kmdi/kmdifocuslist.cpp
+++ b/tdemdi/tdemdifocuslist.cpp
@@ -16,8 +16,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include "kmdifocuslist.h"
-#include "kmdifocuslist.moc"
+#include "tdemdifocuslist.h"
+#include "tdemdifocuslist.moc"
 #include <tqobjectlist.h>
 #include <kdebug.h>
 
diff --git a/kmdi/kmdifocuslist.h b/tdemdi/tdemdifocuslist.h
index 8de19bf33..8de19bf33 100644
--- a/kmdi/kmdifocuslist.h
+++ b/tdemdi/tdemdifocuslist.h
diff --git a/kmdi/kmdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 0057172d6..0a66ea6ff 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -1,6 +1,6 @@
 /* This file is part of the KDE libraries
   Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org>
-  based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+  based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
@@ -17,27 +17,27 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include "kmdiguiclient.h"
-#include "kmdiguiclient.moc"
+#include "tdemdiguiclient.h"
+#include "tdemdiguiclient.moc"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
-#include <klocale.h>
-#include <kaction.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
 #include <tqstring.h>
 #include <assert.h>
 #include <kdebug.h>
 #include <kdockwidget.h>
 #include <tdeversion.h>
-#include "kmdimainfrm.h"
-#include "kmditoolviewaccessor.h"
-#include "kmditoolviewaccessor_p.h"
+#include "tdemdimainfrm.h"
+#include "tdemditoolviewaccessor.h"
+#include "tdemditoolviewaccessor_p.h"
 namespace
 {
-const char *actionListName = "show_kmdi_document_tool_view_actions";
+const char *actionListName = "show_tdemdi_document_tool_view_actions";
 
 const char *guiDescription = ""
                              "<!DOCTYPE kpartgui><kpartgui name=\"KMDIViewActions\">"
@@ -48,7 +48,7 @@ const char *guiDescription = ""
                              "</MenuBar>"
                              "</kpartgui>";
 
-const char *resourceFileName = "kmdiviewactions.rc";
+const char *resourceFileName = "tdemdiviewactions.rc";
 
 }
 
@@ -57,9 +57,9 @@ using namespace KMDIPrivate;
 
 
 
-ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const KShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm,
+ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm,
         TQObject* parent, const char* name )
-		: KToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
+		: TDEToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
 {
 	if ( m_dw )
 	{
@@ -134,12 +134,12 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 		setXML( completeDescription, false /*merge*/ );
 	}
 
-	if ( actionCollection() ->kaccel() == 0 )
+	if ( actionCollection() ->tdeaccel() == 0 )
 		actionCollection() ->setWidget( mdiMainFrm );
-	m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "kmdi_toolview_menu" );
+	m_toolMenu = new TDEActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
 	if ( showMDIModeAction )
 	{
-		m_mdiModeAction = new KSelectAction( i18n( "MDI Mode" ), 0, actionCollection() );
+		m_mdiModeAction = new TDESelectAction( i18n( "MDI Mode" ), 0, actionCollection() );
 		TQStringList modes;
 		modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" );
 		m_mdiModeAction->setItems( modes );
@@ -151,20 +151,20 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
 	         this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
 
-	m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "kmdi_tooldock_menu" );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ),
-	                            actionCollection(), "kmdi_activate_top" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ),
-	                            actionCollection(), "kmdi_activate_left" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ),
-	                            actionCollection(), "kmdi_activate_right" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ),
-	                            actionCollection(), "kmdi_activate_bottom" ) );
-	m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "kmdi_goto_menu_separator" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
-	                            actionCollection(), "kmdi_prev_toolview" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
-	                            actionCollection(), "kmdi_next_toolview" ) );
+	m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ),
+	                            actionCollection(), "tdemdi_activate_top" ) );
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ),
+	                            actionCollection(), "tdemdi_activate_left" ) );
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ),
+	                            actionCollection(), "tdemdi_activate_right" ) );
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ),
+	                            actionCollection(), "tdemdi_activate_bottom" ) );
+	m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
+	                            actionCollection(), "tdemdi_prev_toolview" ) );
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
+	                            actionCollection(), "tdemdi_next_toolview" ) );
 
 	actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
 }
@@ -224,10 +224,10 @@ void KMDIGUIClient::setupActions()
 
 	//    m_toolBars = builder.toolBars();
 
-	//    m_toolViewActions.append(new KAction( "TESTKMDIGUICLIENT", TQString::null, 0,
+	//    m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString::null, 0,
 	//             this, TQT_SLOT(blah()),actionCollection(),"nothing"));
 
-	TQPtrList<KAction> addList;
+	TQPtrList<TDEAction> addList;
 	if ( m_toolViewActions.count() < 3 )
 		for ( uint i = 0;i < m_toolViewActions.count();i++ )
 			addList.append( m_toolViewActions.at( i ) );
@@ -247,17 +247,17 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 {
 	kdDebug( 760 ) << "*****void KMDIGUIClient::addToolView(KMdiToolViewAccessor* mtva)*****" << endl;
 	//	kdDebug()<<"name: "<<mtva->wrappedWidget()->name()<<endl;
-	TQString aname = TQString( "kmdi_toolview_" ) + mtva->wrappedWidget() ->name();
+	TQString aname = TQString( "tdemdi_toolview_" ) + mtva->wrappedWidget() ->name();
 
 	// try to read the action shortcut
-	KShortcut sc;
-	KConfig *cfg = kapp->config();
+	TDEShortcut sc;
+	TDEConfig *cfg = kapp->config();
 	TQString _grp = cfg->group();
 	cfg->setGroup( "Shortcuts" );
 	// 	if ( cfg->hasKey( aname ) )
-	sc = KShortcut( cfg->readEntry( aname, "" ) );
+	sc = TDEShortcut( cfg->readEntry( aname, "" ) );
 	cfg->setGroup( _grp );
-	KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
+	TDEAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
 	                                       /*TQString::null*/sc, tqt_dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
 	                                       m_mdiMainFrm, actionCollection(), aname.latin1() );
 #if KDE_IS_VERSION(3,2,90)
@@ -275,8 +275,8 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 
 void KMDIGUIClient::actionDeleted( TQObject* a )
 {
-	m_toolViewActions.remove( static_cast<KAction*>( a ) );
-	/*	if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast<KAction*>(a));*/
+	m_toolViewActions.remove( static_cast<TDEAction*>( a ) );
+	/*	if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast<TDEAction*>(a));*/
 	setupActions();
 }
 
diff --git a/kmdi/kmdiguiclient.h b/tdemdi/tdemdiguiclient.h
index 9c9634314..711cf9f0d 100644
--- a/kmdi/kmdiguiclient.h
+++ b/tdemdi/tdemdiguiclient.h
@@ -22,11 +22,11 @@
 #include <tqobject.h>
 #include <tqguardedptr.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
-#include "kmdidefines.h"
+#include <tdeaction.h>
+#include "tdemdidefines.h"
 
-class KMainWindow;
-class KToolBar;
+class TDEMainWindow;
+class TDEToolBar;
 class KMdiToolViewAccessor;
 class KMdiMainFrm;
 class KDockWidget;
@@ -104,26 +104,26 @@ private:
 	KMdi::MdiMode m_mdiMode;
 
 	TQGuardedPtr<KMdiMainFrm> m_mdiMainFrm;
-	TQPtrList<KAction> m_toolViewActions;
-	TQPtrList<KAction> m_documentViewActions;
+	TQPtrList<TDEAction> m_toolViewActions;
+	TQPtrList<TDEAction> m_documentViewActions;
 
-	KActionMenu *m_docMenu;
-	KActionMenu *m_toolMenu;
-	KSelectAction *m_mdiModeAction;
+	TDEActionMenu *m_docMenu;
+	TDEActionMenu *m_toolMenu;
+	TDESelectAction *m_mdiModeAction;
 
-	KActionMenu *m_gotoToolDockMenu;
+	TDEActionMenu *m_gotoToolDockMenu;
 };
 
 /**
- * A KToggleAction specifically for toggling the showing
+ * A TDEToggleAction specifically for toggling the showing
  * or the hiding of a KMDI tool view
  */
-class KMDI_EXPORT ToggleToolViewAction: public KToggleAction
+class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction
 {
 	Q_OBJECT
 public:
 
-	ToggleToolViewAction( const TQString& text, const KShortcut& cut = KShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
+	ToggleToolViewAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
 	                      TQObject* parent = 0, const char* name = 0 );
 
 	virtual ~ToggleToolViewAction();
diff --git a/kmdi/kmdiiterator.h b/tdemdi/tdemdiiterator.h
index 0b0ec235a..59949529d 100644
--- a/kmdi/kmdiiterator.h
+++ b/tdemdi/tdemdiiterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdiiterator.h
+//    filename             : tdemdiiterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/kmdi/kmdilistiterator.h b/tdemdi/tdemdilistiterator.h
index 2bc5d6bc0..9c6980783 100644
--- a/kmdi/kmdilistiterator.h
+++ b/tdemdi/tdemdilistiterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdilistiterator.h
+//    filename             : tdemdilistiterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,7 +27,7 @@
 #ifndef _KMDILISTITERATOR_H_
 #define _KMDILISTITERATOR_H_
 
-#include <kmdiiterator.h>
+#include <tdemdiiterator.h>
 
 template <class I>
 class TQPtrList;
diff --git a/kmdi/kmdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index f101ff700..f21cc384b 100644
--- a/kmdi/kmdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdimainfrm.cpp
+//    filename             : tdemdimainfrm.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -43,16 +43,16 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 
-#include <kmenubar.h>
-#include <kapplication.h>
+#include <tdemenubar.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
-#include <kstdaccel.h>
+#include <tdelocale.h>
+#include <tdestdaccel.h>
 
 #include <kiconloader.h>
-#include <kmdidockcontainer.h>
+#include <tdemdidockcontainer.h>
 
 
 #include <tqtoolbutton.h>
@@ -64,16 +64,16 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include "kmdimainfrm.h"
-#include "kmditaskbar.h"
-#include "kmdichildfrm.h"
-#include "kmdichildarea.h"
-#include "kmdichildview.h"
-#include "kmdidockcontainer.h"
-#include "kmditoolviewaccessor_p.h"
-#include "kmdifocuslist.h"
-#include "kmdidocumentviewtabwidget.h"
-#include "kmdiguiclient.h"
+#include "tdemdimainfrm.h"
+#include "tdemditaskbar.h"
+#include "tdemdichildfrm.h"
+#include "tdemdichildarea.h"
+#include "tdemdichildview.h"
+#include "tdemdidockcontainer.h"
+#include "tdemditoolviewaccessor_p.h"
+#include "tdemdifocuslist.h"
+#include "tdemdidocumentviewtabwidget.h"
+#include "tdemdiguiclient.h"
 
 #include "win_undockbutton.xpm"
 #include "win_minbutton.xpm"
@@ -132,7 +132,7 @@ public:
 	KMdiFocusList *focusList;
 	int m_styleIDEAlMode;
 	int m_toolviewStyle;
-	KAction *closeWindowAction;
+	TDEAction *closeWindowAction;
 };
 
 //============ constructor ============//
@@ -217,7 +217,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
 
 	m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
 
-	d->closeWindowAction = new KAction(i18n("&Close"), KStdAccel::close(),
+	d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(),
 	                                   TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
 
 	// the MDI view taskbar
@@ -1196,10 +1196,10 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
 	{
 		if ( switching() )
 		{
-			KAction * a = actionCollection() ->action( "view_last_window" ) ;
+			TDEAction * a = actionCollection() ->action( "view_last_window" ) ;
 			if ( a )
 			{
-				const KShortcut cut( a->shortcut() );
+				const TDEShortcut cut( a->shortcut() );
 				const KKeySequence& seq = cut.seq( 0 );
 				const KKey& key = seq.key( 0 );
 				int modFlags = key.modFlags();
@@ -1222,7 +1222,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
 			}
 			else
 			{
-				kdDebug(760) << "KAction( \"view_last_window\") not found." << endl;
+				kdDebug(760) << "TDEAction( \"view_last_window\") not found." << endl;
 			}
 		}
 	}
@@ -1418,22 +1418,22 @@ void KMdiMainFrm::switchToToplevelMode()
    
 	//FIXME although i don't know what to fix
 	// 5. show the child views again
-	TQPtrListIterator<KMdiChildView> kmdicvit( *m_pDocumentViews );
-	for ( kmdicvit.toFirst(); ( *kmdicvit ); ++kmdicvit )
+	TQPtrListIterator<KMdiChildView> tdemdicvit( *m_pDocumentViews );
+	for ( tdemdicvit.toFirst(); ( *tdemdicvit ); ++tdemdicvit )
 	{
 #ifdef Q_WS_X11
-		XSetTransientForHint( tqt_xdisplay(), ( *kmdicvit )->winId(), winId() );
+		XSetTransientForHint( tqt_xdisplay(), ( *tdemdicvit )->winId(), winId() );
 #endif
-		( *kmdicvit )->show();
+		( *tdemdicvit )->show();
 	}
 
 	// 6.) reset all memorized positions of the undocked ones and show them again
 	TQValueList<TQRect>::Iterator qvlqrit;
 	TQValueList<TQRect>::Iterator qvlEnd = positionList.end();
-	for ( kmdicvit.toFirst(), qvlqrit = positionList.begin() ; ( *kmdicvit ) && qvlqrit != qvlEnd; ++kmdicvit, ++qvlqrit )
+	for ( tdemdicvit.toFirst(), qvlqrit = positionList.begin() ; ( *tdemdicvit ) && qvlqrit != qvlEnd; ++tdemdicvit, ++qvlqrit )
 	{
-		( *kmdicvit )->setGeometry( ( *qvlqrit ) );
-		( *kmdicvit )->show();
+		( *tdemdicvit )->setGeometry( ( *qvlqrit ) );
+		( *tdemdicvit )->show();
 	}
 
 	m_pDockbaseAreaOfDocumentViews->setDockSite( KDockWidget::DockNone );
@@ -2931,7 +2931,7 @@ KTabWidget * KMdiMainFrm::tabWidget() const
 	return m_documentTabWidget;
 }
 
-#include "kmdimainfrm.moc"
+#include "tdemdimainfrm.moc"
 
 // vim: ts=2 sw=2 et
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmdimainfrm.h b/tdemdi/tdemdimainfrm.h
index af2134a39..c73fa5af1 100644
--- a/kmdi/kmdimainfrm.h
+++ b/tdemdi/tdemdimainfrm.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdimainfrm.h
+//    filename             : tdemdimainfrm.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -31,9 +31,9 @@
 #ifndef _KMDIMAINFRM_H_
 #define _KMDIMAINFRM_H_
 
-#include <kparts/dockmainwindow.h>
-#include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdeparts/dockmainwindow.h>
+#include <tdemenubar.h>
+#include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
 #include <tqrect.h>
@@ -41,13 +41,13 @@
 #include <tqdom.h>
 #include <tqguardedptr.h>
 
-#include "kmditaskbar.h"
-#include "kmdichildarea.h"
-#include "kmdichildview.h"
-#include "kmdiiterator.h"
-#include "kmdilistiterator.h"
-#include "kmdinulliterator.h"
-#include "kmditoolviewaccessor.h"
+#include "tdemditaskbar.h"
+#include "tdemdichildarea.h"
+#include "tdemdichildview.h"
+#include "tdemdiiterator.h"
+#include "tdemdilistiterator.h"
+#include "tdemdinulliterator.h"
+#include "tdemditoolviewaccessor.h"
 
 class TQTimer;
 class TQPopupMenu;
diff --git a/kmdi/kmdinulliterator.h b/tdemdi/tdemdinulliterator.h
index ffa375d36..6eb36ab16 100644
--- a/kmdi/kmdinulliterator.h
+++ b/tdemdi/tdemdinulliterator.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmdinulliterator.h
+//    filename             : tdemdinulliterator.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,7 +27,7 @@
 #ifndef _KMDINULLITERATOR_H_
 #define _KMDINULLITERATOR_H_
 
-#include "kmdiiterator.h"
+#include "tdemdiiterator.h"
 
 template <class Item>
 class KMdiNullIterator : public KMdiIterator<Item> {
diff --git a/kmdi/kmditaskbar.cpp b/tdemdi/tdemditaskbar.cpp
index 018e2b38e..3dcb901ab 100644
--- a/kmdi/kmditaskbar.cpp
+++ b/tdemdi/tdemditaskbar.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditaskbar.cpp
+//    filename             : tdemditaskbar.cpp
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -30,12 +30,12 @@
 #undef None
 #endif
 
-#include "kmditaskbar.h"
-#include "kmditaskbar.moc"
+#include "tdemditaskbar.h"
+#include "tdemditaskbar.moc"
 
-#include "kmdimainfrm.h"
-#include "kmdichildview.h"
-#include "kmdidefines.h"
+#include "tdemdimainfrm.h"
+#include "tdemdichildview.h"
+#include "tdemdidefines.h"
 
 #include <tqtooltip.h>
 #include <tqlabel.h>
@@ -145,7 +145,7 @@ TQString KMdiTaskBarButton::actualText() const
 //####################################################################
 
 KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
-		: KToolBar( parent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
+		: TDEToolBar( parent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
 		, m_pCurrentFocusedWindow( 0 )
 		, m_pStretchSpace( 0 )
 		, m_layoutIsPending( false )
@@ -388,7 +388,7 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse )
 			layoutTaskBar( rse->size().width() );
 		}
 	}
-	KToolBar::resizeEvent( rse );
+	TDEToolBar::resizeEvent( rse );
 }
 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/kmdi/kmditaskbar.h b/tdemdi/tdemditaskbar.h
index 35393b733..3f90fb346 100644
--- a/kmdi/kmditaskbar.h
+++ b/tdemdi/tdemditaskbar.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditaskbar.h
+//    filename             : tdemditaskbar.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -28,13 +28,13 @@
 #ifndef _KMDITASKBAR_H_
 #define _KMDITASKBAR_H_
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqptrlist.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include "kmdidefines.h"
+#include "tdemdidefines.h"
 
 class KMdiMainFrm;
 class KMdiChildView;
@@ -126,7 +126,7 @@ class KMdiTaskBarPrivate;
  * KMdiTaskBarButtons can be added or removed dynamically.<br>
  * The button sizes are adjusted dynamically, as well.
  */
-class KMDI_EXPORT KMdiTaskBar : public KToolBar
+class KMDI_EXPORT KMdiTaskBar : public TDEToolBar
 {
 	Q_OBJECT
 public:
diff --git a/kmdi/kmditoolviewaccessor.cpp b/tdemdi/tdemditoolviewaccessor.cpp
index c85921a27..3baaafd07 100644
--- a/kmdi/kmditoolviewaccessor.cpp
+++ b/tdemdi/tdemditoolviewaccessor.cpp
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor.h
+//    filename             : tdemditoolviewaccessor.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -22,12 +22,12 @@
 #ifndef NO_KDE
 # include <kdebug.h>
 #endif
-#include "kmditoolviewaccessor_p.h"
-#include "kmdiguiclient.h"
-#include "kmdimainfrm.h"
+#include "tdemditoolviewaccessor_p.h"
+#include "tdemdiguiclient.h"
+#include "tdemdimainfrm.h"
 
-#include "kmditoolviewaccessor.h"
-#include "kmditoolviewaccessor_p.h"
+#include "tdemditoolviewaccessor.h"
+#include "tdemditoolviewaccessor_p.h"
 
 KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption )
 		: TQObject( parent )
@@ -263,7 +263,7 @@ void KMdiToolViewAccessor::show()
 
 
 #ifndef NO_INCLUDE_MOCFILES
-#include "kmditoolviewaccessor.moc"
+#include "tdemditoolviewaccessor.moc"
 #endif 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
 
diff --git a/kmdi/kmditoolviewaccessor.h b/tdemdi/tdemditoolviewaccessor.h
index a58375ec8..8c1448cae 100644
--- a/kmdi/kmditoolviewaccessor.h
+++ b/tdemdi/tdemditoolviewaccessor.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor.h
+//    filename             : tdemditoolviewaccessor.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
diff --git a/kmdi/kmditoolviewaccessor_p.h b/tdemdi/tdemditoolviewaccessor_p.h
index ecbaa76a3..ec19b8629 100644
--- a/kmdi/kmditoolviewaccessor_p.h
+++ b/tdemdi/tdemditoolviewaccessor_p.h
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//    filename             : kmditoolviewaccessor_p.h
+//    filename             : tdemditoolviewaccessor_p.h
 //----------------------------------------------------------------------------
 //    Project              : KDE MDI extension
 //
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <kdockwidget.h>
 #include <tqguardedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KMDI_EXPORT KMdiToolViewAccessorPrivate {
 public:
@@ -42,7 +42,7 @@ public:
 	}
 	TQGuardedPtr<KDockWidget> widgetContainer;
 	TQWidget* widget;
-	TQGuardedPtr<KAction> action;
+	TQGuardedPtr<TDEAction> action;
 };
 
 
diff --git a/kmdi/test/Makefile.am b/tdemdi/test/Makefile.am
index 73e0b8a13..4a5b21458 100644
--- a/kmdi/test/Makefile.am
+++ b/tdemdi/test/Makefile.am
@@ -1,10 +1,10 @@
 check_PROGRAMS = kfourchildren
 METASOURCES = AUTO
 
-INCLUDES = -I$(top_srcdir)/kmdi -I.. $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdemdi -I.. $(all_includes)
 
 kfourchildren_SOURCES = hello.cpp main.cpp mainwidget.cpp
 kfourchildren_LDFLAGS = -no-undefined $(all_libraries)
-kfourchildren_LDADD = $(top_builddir)/kmdi/libkmdi.la \
-	$(top_builddir)/kutils/libkutils.la
+kfourchildren_LDADD = $(top_builddir)/tdemdi/libtdemdi.la \
+	$(top_builddir)/tdeutils/libtdeutils.la
 
diff --git a/kmdi/test/README b/tdemdi/test/README
index cf3902083..cf3902083 100644
--- a/kmdi/test/README
+++ b/tdemdi/test/README
diff --git a/kmdi/test/hello.cpp b/tdemdi/test/hello.cpp
index d92233ea6..d92233ea6 100644
--- a/kmdi/test/hello.cpp
+++ b/tdemdi/test/hello.cpp
diff --git a/kmdi/test/hello.h b/tdemdi/test/hello.h
index 808d25b90..b6ce589a0 100644
--- a/kmdi/test/hello.h
+++ b/tdemdi/test/hello.h
@@ -12,7 +12,7 @@
 #define HELLO_H
 
 #include <tqstring.h>
-#include <kmdichildview.h>
+#include <tdemdichildview.h>
 
 class TQWidget;
 class TQMouseEvent;
diff --git a/kmdi/test/main.cpp b/tdemdi/test/main.cpp
index 7a1cab885..29a91e39f 100644
--- a/kmdi/test/main.cpp
+++ b/tdemdi/test/main.cpp
@@ -26,8 +26,8 @@
 //----------------------------------------------------------------------------
 
 #ifndef NO_KDE
-# include <kapplication.h>
- KApplication* theApp;
+# include <tdeapplication.h>
+ TDEApplication* theApp;
 #else
 # include <tqapplication.h>
  TQApplication* theApp;
@@ -42,7 +42,7 @@
 int main( int argc, char **argv )
 {
 #ifndef NO_KDE
-   KApplication a(argc,argv,"KFourChildren");
+   TDEApplication a(argc,argv,"KFourChildren");
 #else
    TQApplication a(argc,argv);
 #endif
diff --git a/kmdi/test/mainwidget.cpp b/tdemdi/test/mainwidget.cpp
index e8aa8da1d..a95af3d2f 100644
--- a/kmdi/test/mainwidget.cpp
+++ b/tdemdi/test/mainwidget.cpp
@@ -21,8 +21,8 @@
 #include <tqmultilineedit.h>
 #include <tqlistview.h>
 #include <tqfile.h>
-#include <kmdimainfrm.h>
-#include <kmditoolviewaccessor.h>
+#include <tdemdimainfrm.h>
+#include <tdemditoolviewaccessor.h>
 
 #include "mainwidget.h"
 
@@ -107,7 +107,7 @@ void MainWidget::resizeEvent( TQResizeEvent *pRSE)
    setSysButtonsAtMenuPosition();
 }
 
-RestartWidget::RestartWidget():KMainWindow()
+RestartWidget::RestartWidget():TDEMainWindow()
 {
     mdimode=KMdi::ChildframeMode;
     TQVBoxLayout* bl = new TQVBoxLayout(this);
diff --git a/kmdi/test/mainwidget.h b/tdemdi/test/mainwidget.h
index 953512005..7de1f9570 100644
--- a/kmdi/test/mainwidget.h
+++ b/tdemdi/test/mainwidget.h
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdom.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 
 /**
   *@author Falk Brettschneider
@@ -48,7 +48,7 @@ private:
   * This allows me to test KMdiMainFrm::read/writeDockConfig by
   * closing and restarting the MainWidget via checkbox click.
   */
-class RestartWidget : public KMainWindow
+class RestartWidget : public TDEMainWindow
 {
     Q_OBJECT
 // methods
diff --git a/kparts/AUTHORS b/tdeparts/AUTHORS
index 7c8680a5a..7c8680a5a 100644
--- a/kparts/AUTHORS
+++ b/tdeparts/AUTHORS
diff --git a/kparts/CMakeLists.txt b/tdeparts/CMakeLists.txt
index aeda0cb81..341734461 100644
--- a/kparts/CMakeLists.txt
+++ b/tdeparts/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 link_directories(
@@ -35,7 +35,7 @@ install( FILES
     event.h browserextension.h factory.h historyprovider.h
     browserinterface.h genericfactory.h componentfactory.h
     browserrun.h statusbarextension.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kparts )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeparts )
 
 
 ##### other data ################################
@@ -45,9 +45,9 @@ install( FILES
   DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-#### kparts #####################################
+#### tdeparts #####################################
 
-set( target kparts )
+set( target tdeparts )
 
 set( ${target}_SRCS
   part.cpp plugin.cpp partmanager.cpp mainwindow.cpp
@@ -59,6 +59,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 2.1.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kparts/COMMENTS b/tdeparts/COMMENTS
index 80e5671d1..7d17ebdc0 100644
--- a/kparts/COMMENTS
+++ b/tdeparts/COMMENTS
@@ -28,7 +28,7 @@ In this case, yes, that could be saved in the part.
 --------------
 
 4) Perhaps a part wants to know if it got activated, so we might want to
-   re-introduce that PartActivateEvent from tdelibs/kparts.
+   re-introduce that PartActivateEvent from tdelibs/tdeparts.
    Question: Shall this event be sent when the GUI of the part is activated
    or shall it be sent when the part "really" got activated (via KPartManager)?
 
@@ -180,7 +180,7 @@ What do you think ? Did I overlook something ?
 
 (Simon) I don't think there's a problem with the async stuff
 	(BrowserView/KReadOnlyPart) . Mosfet's KGhostView browserview or
-	his dviview are both 100% like KReadOnlyPart (yes, they launch KIOJob::copy()
+	his dviview are both 100% like KReadOnlyPart (yes, they launch TDEIOJob::copy()
 	and copy the file to some local temp) . It works :-) and noone complains :-))
 	-> I see no problem with that :-)
 (David) Sure - but does that answer the question : KReadOnlyPart==KBrowserPart ?
@@ -243,7 +243,7 @@ changes.
 
 <weis> Hi
 <dfaure> Hi !
-<weis> dfaure: Just looked into new kparts
+<weis> dfaure: Just looked into new tdeparts
 <dfaure> ah ?
 <weis> dfaure: You have a major problem: One can NOT mix QDomElements of different documents!
 <dfaure> weis: why ?
@@ -253,9 +253,9 @@ changes.
 <dfaure> the problem is .. memory management, right ?
 <weis> dfaure: I just checked in my CVS irc stuff :-)
 <dfaure> ok :-)
-<weis> dfaure: Can you have a look at kparts/COMMENTS ?
+<weis> dfaure: Can you have a look at tdeparts/COMMENTS ?
 --
-<dfaure> weis: you should have come before. coolo is talking about re-writing libkio.
+<dfaure> weis: you should have come before. coolo is talking about re-writing libtdeio.
 <dfaure> well in fact he started the rewrite
  dfaure having a look
 <weis> dfaure: Unfortunately I am not paid for KDE but for Qt hacking :-( So I fear I have no time for kio anyway.
@@ -322,7 +322,7 @@ changes.
 <dfaure> ah yes
 <weis> dfaure: If window W1 becomes active (focus) it may activate its KPartManager. If W2 becomes active its KPartManager may do something.
 <weis> dfaure: Ooooops, I think I am on the wrong track perhaps.....
-<weis> dfaure: I started dealing with kparts like I do with widgets. If a kpart is just a widget that you can load at runtime, then it wont do gui merging anyway. So may above example seems to be very theoretically, perhaps ....
+<weis> dfaure: I started dealing with tdeparts like I do with widgets. If a kpart is just a widget that you can load at runtime, then it wont do gui merging anyway. So may above example seems to be very theoretically, perhaps ....
 <dfaure> yes, if you have two KPartManager you have a problem anyway (if the parts have a GUI)
 <dfaure> you want only ONE part active at a time ... one gui .
 <dfaure> so you can't have one part active in each kpartmanager, unless the whole partmanager can be deactivated.
@@ -383,7 +383,7 @@ Torben brainstorming about Nested Parts
 
 Imagine a very complex situation like this:
 
-KOfficeMainWindow (a kparts aware shell)
+KOfficeMainWindow (a tdeparts aware shell)
  |
  |- KWordView/Part (a koffice component)
     |
@@ -391,7 +391,7 @@ KOfficeMainWindow (a kparts aware shell)
        |
        |- KReportGeneratorView/Part (a koffice component)
           |
-          |- KHTMLBrowserView/Part (something like konqui, this is a kpart)
+          |- TDEHTMLBrowserView/Part (something like konqui, this is a kpart)
 
 Imagine all are added to one KPartManager.
 Now the user clicks on the report generator and gets the
@@ -454,7 +454,7 @@ This is no problem, since the Part never directly talks to the GUIBuilder anyway
 
 Now imagine someone made a KOffice component out of KalenderWidget and embeds it in KWord:
 
-KOfficeMainWindow (a kparts aware shell)
+KOfficeMainWindow (a tdeparts aware shell)
  |
  |- KWordView/Part (a koffice component)
     |
@@ -479,7 +479,7 @@ Observation 4) There may be multiple KPartManagers in one toplevel window, but o
 
 Lets take another look at our first example:
 
-KOfficeMainWindow (a kparts aware shell)
+KOfficeMainWindow (a tdeparts aware shell)
  |
  |- KWordView/Part (a koffice component)
     |
@@ -487,7 +487,7 @@ KOfficeMainWindow (a kparts aware shell)
        |
        |- KReportGeneratorView/Part (a koffice component)
           |
-          |- KHTMLBrowserView/Part (something like konqui, this is a kpart)
+          |- TDEHTMLBrowserView/Part (something like konqui, this is a kpart)
 
 The report generator does not want GUI merging of its HTML browser. But it wants to offer an action
 called "HTMLSettings" to allow choosing the default font of the HTML Widget. Obviously this action
@@ -498,7 +498,7 @@ action() function if queried for an action named "HTMLSettings".
 Observation 5) In addition to turning GUI building on or off for components one may do partial gui merging.
                That means actions of some child component are propagated by the parent component.
 
-Observation5 does not cause additional code in libkparts. It just shows a possible usage and the flexibility of the
+Observation5 does not cause additional code in libtdeparts. It just shows a possible usage and the flexibility of the
 action concept.
 
 
diff --git a/kparts/Mainpage.dox b/tdeparts/Mainpage.dox
index 994503d44..994503d44 100644
--- a/kparts/Mainpage.dox
+++ b/tdeparts/Mainpage.dox
diff --git a/tdeparts/Makefile.am b/tdeparts/Makefile.am
new file mode 100644
index 000000000..6796745a9
--- /dev/null
+++ b/tdeparts/Makefile.am
@@ -0,0 +1,32 @@
+####### General stuff
+
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
+
+INCLUDES= -I$(srcdir)/../ -I$(top_srcdir)/tdeio/ -I$(top_srcdir)/libltdl \
+	-I$(top_srcdir)/tdefile $(all_includes)
+libtdeparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
+libtdeparts_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+
+check-local:
+	(cd tests && $(MAKE) check )
+
+####### Files
+
+lib_LTLIBRARIES = libtdeparts.la
+
+libtdeparts_la_SOURCES = part.cpp plugin.cpp partmanager.cpp mainwindow.cpp dockmainwindow.cpp \
+		       event.cpp browserextension.cpp factory.cpp  historyprovider.cpp \
+		       browserinterface.cpp browserrun.cpp statusbarextension.cpp
+
+tdepartsincludedir = $(includedir)/tdeparts
+tdepartsinclude_HEADERS = part.h plugin.h partmanager.h mainwindow.h dockmainwindow.h event.h \
+	browserextension.h factory.h historyprovider.h browserinterface.h genericfactory.h \
+	componentfactory.h browserrun.h statusbarextension.h
+
+libtdeparts_la_METASOURCES = AUTO
+
+servicetype_DATA = kpart.desktop krop.desktop krwp.desktop browserview.desktop 
+servicetypedir = $(kde_servicetypesdir)
+
+DOXYGEN_REFERENCES = tdecore tdeui tdefx kio
+include ../admin/Doxyfile.am
diff --git a/kparts/browserextension.cpp b/tdeparts/browserextension.cpp
index 630e4cb5a..85bfa4a94 100644
--- a/kparts/browserextension.cpp
+++ b/tdeparts/browserextension.cpp
@@ -29,8 +29,8 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <kurifilter.h>
 #include <assert.h>
diff --git a/kparts/browserextension.h b/tdeparts/browserextension.h
index bc5e9cc92..8dcbe68f7 100644
--- a/kparts/browserextension.h
+++ b/tdeparts/browserextension.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kparts_browserextension_h__
-#define __kparts_browserextension_h__
+#ifndef __tdeparts_browserextension_h__
+#define __tdeparts_browserextension_h__
 
 #include <sys/types.h>
 
@@ -29,8 +29,8 @@
 #include <tqstringlist.h>
 #include <tqpair.h>
 
-#include <kparts/part.h>
-#include <kparts/event.h>
+#include <tdeparts/part.h>
+#include <tdeparts/event.h>
 
 class KFileItem;
 typedef TQPtrList<KFileItem> KFileItemList;
@@ -65,7 +65,7 @@ struct KPARTS_EXPORT URLArgs
 
   /**
    * This buffer can be used by the part to save and restore its contents.
-   * See KHTMLPart for instance.
+   * See TDEHTMLPart for instance.
    */
   TQStringList docState;
 
@@ -89,26 +89,26 @@ struct KPARTS_EXPORT URLArgs
   TQString serviceType;
 
   /**
-   * KHTML-specific field, contents of the HTTP POST data.
+   * TDEHTML-specific field, contents of the HTTP POST data.
    */
   TQByteArray postData;
 
   /**
-   * KHTML-specific field, header defining the type of the POST data.
+   * TDEHTML-specific field, header defining the type of the POST data.
    */
   void setContentType( const TQString & contentType );
   /**
-   * KHTML-specific field, header defining the type of the POST data.
+   * TDEHTML-specific field, header defining the type of the POST data.
    */
   TQString contentType() const;
   /**
-   * KHTML-specific field, whether to do a POST instead of a GET,
+   * TDEHTML-specific field, whether to do a POST instead of a GET,
    * for the next openURL.
    */
   void setDoPost( bool enable );
 
   /**
-   * KHTML-specific field, whether to do a POST instead of a GET,
+   * TDEHTML-specific field, whether to do a POST instead of a GET,
    * for the next openURL.
    */
   bool doPost() const;
@@ -129,12 +129,12 @@ struct KPARTS_EXPORT URLArgs
 
   /**
    * Meta-data to associate with the next KIO operation
-   * @see KIO::TransferJob etc.
+   * @see TDEIO::TransferJob etc.
    */
   TQMap<TQString, TQString> &metaData();
 
   /**
-   * The frame in which to open the URL. KHTML/Konqueror-specific.
+   * The frame in which to open the URL. TDEHTML/Konqueror-specific.
    */
   TQString frameName;
 
@@ -569,7 +569,7 @@ signals:
    * Since the part emits the jobid in the started() signal,
    * progress information is automatically displayed.
    *
-   * However, if you don't use a KIO::Job in the part,
+   * However, if you don't use a TDEIO::Job in the part,
    * you can use loadingProgress() and speedProgress()
    * to display progress information.
    */
@@ -719,7 +719,7 @@ private:
 /**
  * An extension class for container parts, i.e. parts that contain
  * other parts.
- * For instance a KHTMLPart hosts one part per frame.
+ * For instance a TDEHTMLPart hosts one part per frame.
  */
 class KPARTS_EXPORT BrowserHostExtension : public TQObject
 {
diff --git a/kparts/browserinterface.cpp b/tdeparts/browserinterface.cpp
index e02ae34cc..e02ae34cc 100644
--- a/kparts/browserinterface.cpp
+++ b/tdeparts/browserinterface.cpp
diff --git a/kparts/browserinterface.h b/tdeparts/browserinterface.h
index 82521376f..82521376f 100644
--- a/kparts/browserinterface.h
+++ b/tdeparts/browserinterface.h
diff --git a/kparts/browserrun.cpp b/tdeparts/browserrun.cpp
index 0500e0631..3abd01524 100644
--- a/kparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -17,15 +17,15 @@
  */
 
 #include "browserrun.h"
-#include <kmessagebox.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
-#include <kio/scheduler.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/scheduler.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
 #include <kuserprofile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <assert.h>
@@ -75,7 +75,7 @@ void BrowserRun::init()
     // is either malformed, or points to a non-existing local file...
     // So we need to reimplement some of the checks, to handle m_bHideErrorDialog
     if ( !m_strURL.isValid() ) {
-        redirectToError( KIO::ERR_MALFORMED_URL, m_strURL.url() );
+        redirectToError( TDEIO::ERR_MALFORMED_URL, m_strURL.url() );
         return;
     }
     if ( !m_bIsLocalFile && !m_bFault && m_strURL.isLocalFile() )
@@ -86,7 +86,7 @@ void BrowserRun::init()
       if ( stat( TQFile::encodeName(m_strURL.path()), &buff ) == -1 )
       {
         kdDebug(1000) << "BrowserRun::init : " << m_strURL.prettyURL() << " doesn't exist." << endl;
-        redirectToError( KIO::ERR_DOES_NOT_EXIST, m_strURL.path() );
+        redirectToError( TDEIO::ERR_DOES_NOT_EXIST, m_strURL.path() );
         return;
       }
       m_mode = buff.st_mode; // while we're at it, save it for KRun::init() to use it
@@ -132,38 +132,38 @@ void BrowserRun::scanFile()
           m_args.metaData().insert("PropagateHttpHeader", "TRUE");
   }
 
-  KIO::TransferJob *job;
+  TDEIO::TransferJob *job;
   if ( m_args.doPost() && m_strURL.protocol().startsWith("http"))
   {
-      job = KIO::http_post( m_strURL, m_args.postData, false );
+      job = TDEIO::http_post( m_strURL, m_args.postData, false );
       job->addMetaData( "content-type", m_args.contentType() );
   }
   else
-      job = KIO::get(m_strURL, m_args.reload, false);
+      job = TDEIO::get(m_strURL, m_args.reload, false);
 
   if ( m_bRemoveReferrer )
      m_args.metaData().remove("referrer");
 
   job->addMetaData( m_args.metaData() );
   job->setWindow( m_window );
-  connect( job, TQT_SIGNAL( result( KIO::Job *)),
-           this, TQT_SLOT( slotBrowserScanFinished(KIO::Job *)));
-  connect( job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &)),
-           this, TQT_SLOT( slotBrowserMimetype(KIO::Job *, const TQString &)));
+  connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
+           this, TQT_SLOT( slotBrowserScanFinished(TDEIO::Job *)));
+  connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
+           this, TQT_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &)));
   m_job = job;
 }
 
-void BrowserRun::slotBrowserScanFinished(KIO::Job *job)
+void BrowserRun::slotBrowserScanFinished(TDEIO::Job *job)
 {
   kdDebug(1000) << "BrowserRun::slotBrowserScanFinished" << endl;
-  if ( job->error() == KIO::ERR_IS_DIRECTORY )
+  if ( job->error() == TDEIO::ERR_IS_DIRECTORY )
   {
       // It is in fact a directory. This happens when HTTP redirects to FTP.
       // Due to the "protocol doesn't support listing" code in BrowserRun, we
       // assumed it was a file.
       kdDebug(1000) << "It is in fact a directory!" << endl;
       // Update our URL in case of a redirection
-      m_strURL = static_cast<KIO::TransferJob *>(job)->url();
+      m_strURL = static_cast<TDEIO::TransferJob *>(job)->url();
       m_job = 0;
       foundMimeType( "inode/directory" );
   }
@@ -176,10 +176,10 @@ void BrowserRun::slotBrowserScanFinished(KIO::Job *job)
   }
 }
 
-void BrowserRun::slotBrowserMimetype( KIO::Job *_job, const TQString &type )
+void BrowserRun::slotBrowserMimetype( TDEIO::Job *_job, const TQString &type )
 {
   Q_ASSERT( _job == m_job );
-  KIO::TransferJob *job = static_cast<KIO::TransferJob *>(m_job);
+  TDEIO::TransferJob *job = static_cast<TDEIO::TransferJob *>(m_job);
   // Update our URL in case of a redirection
   //kdDebug(1000) << "old URL=" << m_strURL.url() << endl;
   //kdDebug(1000) << "new URL=" << job->url().url() << endl;
@@ -242,10 +242,10 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
                 KTempFile tempFile( TQString::null, extension );
                 KURL destURL;
                 destURL.setPath( tempFile.name() );
-                KIO::Job *job = KIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ );
+                TDEIO::Job *job = TDEIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ );
                 job->setWindow (m_window);
-                connect( job, TQT_SIGNAL( result( KIO::Job *)),
-                         this, TQT_SLOT( slotCopyToTempFileResult(KIO::Job *)) );
+                connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
+                         this, TQT_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) );
                 return Delayed; // We'll continue after the job has finished
             }
         }
@@ -259,7 +259,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
         return Handled;
     }
 
-    KIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
+    TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
     return NotHandled;
 }
 
@@ -333,7 +333,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
     // - images (reasoning: no need to save, most of the time, because fast to see)
     // e.g. postscript is different, because takes longer to read, so
     // it's more likely that the user might want to save it.
-    // - multipart/* ("server push", see kmultipart)
+    // - multipart/* ("server push", see tdemultipart)
     // - other strange 'internal' mimetypes like print/manager...
     // KEEP IN SYNC!!!
     if (flags != (int)AttachmentDisposition && (
@@ -356,7 +356,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
     // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
 }
 
-// Default implementation, overridden in KHTMLRun
+// Default implementation, overridden in TDEHTMLRun
 void BrowserRun::save( const KURL & url, const TQString & suggestedFilename )
 {
     simpleSave( url, suggestedFilename, m_window );
@@ -377,14 +377,14 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
     // only use the downloadmanager for non-local urls
     if ( !url.isLocalFile() )
     {
-        KConfig cfg("konquerorrc", false, false);
+        TDEConfig cfg("konquerorrc", false, false);
         cfg.setGroup("HTML Settings");
         TQString downloadManger = cfg.readPathEntry("DownloadManager");
         if (!downloadManger.isEmpty())
         {
             // then find the download manager location
             kdDebug(1000) << "Using: "<<downloadManger <<" as Download Manager" <<endl;
-            TQString cmd=KStandardDirs::findExe(downloadManger);
+            TQString cmd=TDEStandardDirs::findExe(downloadManger);
             if (cmd.isEmpty())
             {
                 TQString errMsg=i18n("The Download Manager (%1) could not be found in your $PATH ").arg(downloadManger);
@@ -399,13 +399,13 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
                 // the duplicated code) with shiny new KDownload class for 3.2 (pfeiffer)
                 // Until the shiny new class comes about, send the suggestedFilename
                 // along with the actual URL to download. (DA)
-                cmd += " " + KProcess::quote(url.url());
+                cmd += " " + TDEProcess::quote(url.url());
                 if ( !suggestedFilename.isEmpty() )
-                    cmd +=" " + KProcess::quote(suggestedFilename);
+                    cmd +=" " + TDEProcess::quote(suggestedFilename);
 
                 kdDebug(1000) << "Calling command  " << cmd << endl;
                 // slave is already on hold (slotBrowserMimetype())
-                KIO::Scheduler::publishSlaveOnHold();
+                TDEIO::Scheduler::publishSlaveOnHold();
                 KRun::runCommand(cmd);
                 return;
             }
@@ -424,7 +424,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
         KURL destURL( dlg->selectedURL() );
         if ( destURL.isValid() )
         {
-            KIO::Job *job = KIO::copy( url, destURL );
+            TDEIO::Job *job = TDEIO::copy( url, destURL );
             job->setWindow (window);
             job->setAutoErrorHandlingEnabled( true );
         }
@@ -432,7 +432,7 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam
     delete dlg;
 }
 
-void BrowserRun::slotStatResult( KIO::Job *job )
+void BrowserRun::slotStatResult( TDEIO::Job *job )
 {
     if ( job->error() ) {
         kdDebug(1000) << "BrowserRun::slotStatResult : " << job->errorString() << endl;
@@ -441,14 +441,14 @@ void BrowserRun::slotStatResult( KIO::Job *job )
         KRun::slotStatResult( job );
 }
 
-void BrowserRun::handleError( KIO::Job * job )
+void BrowserRun::handleError( TDEIO::Job * job )
 {
     if ( !job ) { // Shouldn't happen, see docu.
         kdWarning(1000) << "BrowserRun::handleError called with job=0! hideErrorDialog=" << d->m_bHideErrorDialog << endl;
         return;
     }
 
-    if (d->m_bHideErrorDialog && job->error() != KIO::ERR_NO_CONTENT)
+    if (d->m_bHideErrorDialog && job->error() != TDEIO::ERR_NO_CONTENT)
     {
         redirectToError( job->error(), job->errorText() );
         return;
@@ -461,9 +461,9 @@ void BrowserRun::handleError( KIO::Job * job )
 void BrowserRun::redirectToError( int error, const TQString& errorText )
 {
     /**
-     * To display this error in KHTMLPart instead of inside a dialog box,
+     * To display this error in TDEHTMLPart instead of inside a dialog box,
      * we tell konq that the mimetype is text/html, and we redirect to
-     * an error:/ URL that sends the info to khtml.
+     * an error:/ URL that sends the info to tdehtml.
      *
      * The format of the error:/ URL is error:/?query#url,
      * where two variables are passed in the query:
@@ -483,13 +483,13 @@ void BrowserRun::redirectToError( int error, const TQString& errorText )
     foundMimeType( "text/html" );
 }
 
-void BrowserRun::slotCopyToTempFileResult(KIO::Job *job)
+void BrowserRun::slotCopyToTempFileResult(TDEIO::Job *job)
 {
     if ( job->error() ) {
         job->showErrorDialog( m_window );
     } else {
         // Same as KRun::foundMimeType but with a different URL
-        (void) (KRun::runURL( static_cast<KIO::FileCopyJob *>(job)->destURL(), m_sMimeType ));
+        (void) (KRun::runURL( static_cast<TDEIO::FileCopyJob *>(job)->destURL(), m_sMimeType ));
     }
     m_bFault = true; // see above
     m_bFinished = true;
diff --git a/kparts/browserrun.h b/tdeparts/browserrun.h
index 79a7386c6..f84e088b3 100644
--- a/kparts/browserrun.h
+++ b/tdeparts/browserrun.h
@@ -16,12 +16,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kparts_browserrun_h
-#define kparts_browserrun_h
+#ifndef tdeparts_browserrun_h
+#define tdeparts_browserrun_h
 
 #include <krun.h>
 #include <kservice.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KParts {
 
@@ -47,7 +47,7 @@ namespace KParts {
          * @param url the URL we're probing
          * @param args URL args - includes data for a HTTP POST, etc.
          * @param part the part going to open this URL - can be 0L if not created yet
-         * @param window the mainwindow - passed to KIO::Job::setWindow()
+         * @param window the mainwindow - passed to TDEIO::Job::setWindow()
          * @param removeReferrer if true, the "referrer" metadata from @p args isn't passed on
          * @param trustedSource if false, a warning will be shown before launching an executable
          * Always pass false for @p trustedSource, except for local directory views.
@@ -61,7 +61,7 @@ namespace KParts {
          * @param url the URL we're probing
          * @param args URL args - includes data for a HTTP POST, etc.
          * @param part the part going to open this URL - can be 0L if not created yet
-         * @param window the mainwindow - passed to KIO::Job::setWindow()
+         * @param window the mainwindow - passed to TDEIO::Job::setWindow()
          * @param removeReferrer if true, the "referrer" metadata from @p args isn't passed on
          * @param trustedSource if false, a warning will be shown before launching an executable.
          * Always pass false for @p  trustedSource, except for local directory views.
@@ -123,7 +123,7 @@ namespace KParts {
          */
         static AskSaveResult askEmbedOrSave( const KURL & url, const TQString& mimeType, const TQString & suggestedFilename = TQString::null, int flags = 0 );
 
-        // virtual so that KHTML can implement differently (HTML cache)
+        // virtual so that TDEHTML can implement differently (HTML cache)
         virtual void save( const KURL & url, const TQString & suggestedFilename );
 
         // static so that it can be called from other classes
@@ -155,7 +155,7 @@ namespace KParts {
          * It is strongly recommended to reimplement this method if
          * you passed hideErrorDialog=true.
          */
-        virtual void handleError( KIO::Job * job );
+        virtual void handleError( TDEIO::Job * job );
 
         /**
          * NotHandled means that foundMimeType should call KRun::foundMimeType,
@@ -169,10 +169,10 @@ namespace KParts {
         NonEmbeddableResult handleNonEmbeddable( const TQString& mimeType );
 
     protected slots:
-        void slotBrowserScanFinished(KIO::Job *job);
-        void slotBrowserMimetype(KIO::Job *job, const TQString &type);
-        void slotCopyToTempFileResult(KIO::Job *job);
-        virtual void slotStatResult( KIO::Job *job );
+        void slotBrowserScanFinished(TDEIO::Job *job);
+        void slotBrowserMimetype(TDEIO::Job *job, const TQString &type);
+        void slotCopyToTempFileResult(TDEIO::Job *job);
+        virtual void slotStatResult( TDEIO::Job *job );
 
     protected:
         KParts::URLArgs m_args;
diff --git a/kparts/browserview.desktop b/tdeparts/browserview.desktop
index 42d6131ec..9c534c8f1 100644
--- a/kparts/browserview.desktop
+++ b/tdeparts/browserview.desktop
@@ -149,7 +149,7 @@ Type=bool
 [PropertyDef::X-TDE-BrowserView-Built-Into]
 Type=TQString
 
-# If the part has a plugin for KHTML Javascript's window.navigator.plugins
+# If the part has a plugin for TDEHTML Javascript's window.navigator.plugins
 # array, it should create a plugin info file and set this property to the
 # file path here. The path should be relative to TDE's data dir
 # ($TDEDIR/share/apps)
diff --git a/kparts/componentfactory.h b/tdeparts/componentfactory.h
index 67f98a90f..20b3ebee8 100644
--- a/kparts/componentfactory.h
+++ b/tdeparts/componentfactory.h
@@ -1,8 +1,8 @@
-#ifndef __kparts_componentfactory_h__
-#define __kparts_componentfactory_h__
+#ifndef __tdeparts_componentfactory_h__
+#define __tdeparts_componentfactory_h__
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 #include <ktrader.h>
 #include <tqmetaobject.h>
 
@@ -73,7 +73,7 @@ namespace KParts
         }
 
         /**
-         * This template function allows to ask the given kparts factory to create an
+         * This template function allows to ask the given tdeparts factory to create an
          * instance of the given template type.
          *
          * Example of usage:
@@ -307,7 +307,7 @@ namespace KParts
          * \endcode
          *
          * @param serviceType the type of service for which to find a plugin
-         * @param constraint an optional constraint to pass to the trader (see KIO::KTrader)
+         * @param constraint an optional constraint to pass to the trader (see TDEIO::TDETrader)
          * @param parent the parent object for the part itself
          * @param name the name that will be given to the part
          * @param args A list of string arguments, passed to the factory and possibly
@@ -325,7 +325,7 @@ namespace KParts
                                            const TQStringList &args = TQStringList(),
                                            int *error = 0 )
         {
-            KTrader::OfferList offers = KTrader::self()->query( serviceType, constraint );
+            TDETrader::OfferList offers = TDETrader::self()->query( serviceType, constraint );
             if ( offers.isEmpty() )
             {
                 if ( error )
@@ -354,7 +354,7 @@ namespace KParts
          * \endcode
          *
          * @param serviceType the type of service for which to find a part, e.g. a mimetype
-         * @param constraint an optional constraint to pass to the trader (see KTrader)
+         * @param constraint an optional constraint to pass to the trader (see TDETrader)
          * @param parentWidget the parent widget, will be set as the parent of the part's widget
          * @param widgetName the name that will be given to the part's widget
          * @param parent the parent object for the part itself
@@ -376,7 +376,7 @@ namespace KParts
                                                const TQStringList &args = TQStringList(),
                                                int *error = 0 )
         {
-            KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
+            TDETrader::OfferList offers = TDETrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
             if ( offers.isEmpty() )
             {
                 if ( error )
diff --git a/kparts/design.h b/tdeparts/design.h
index ba608d777..ba608d777 100644
--- a/kparts/design.h
+++ b/tdeparts/design.h
diff --git a/kparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp
index 9f7703ab6..9c8d72112 100644
--- a/kparts/dockmainwindow.cpp
+++ b/tdeparts/dockmainwindow.cpp
@@ -19,11 +19,11 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kparts/dockmainwindow.h>
-#include <kparts/event.h>
-#include <kparts/part.h>
-#include <kaccel.h>
-#include <kparts/plugin.h>
+#include <tdeparts/dockmainwindow.h>
+#include <tdeparts/event.h>
+#include <tdeparts/part.h>
+#include <tdeaccel.h>
+#include <tdeparts/plugin.h>
 #include <kstatusbar.h>
 #include <kinstance.h>
 #include <khelpmenu.h>
@@ -97,7 +97,7 @@ void DockMainWindow::createGUI( Part * part )
 
   if ( !d->m_bShellGUIActivated )
   {
-    loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() );
+    loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
     createShellGUI();
     d->m_bShellGUIActivated = true;
   }
diff --git a/kparts/dockmainwindow.h b/tdeparts/dockmainwindow.h
index 32b1df1d4..5f9209092 100644
--- a/kparts/dockmainwindow.h
+++ b/tdeparts/dockmainwindow.h
@@ -22,11 +22,11 @@
 #define __DOCKMAINWINDOW_H
 
 #include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kdockwidget.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQString;
 
diff --git a/kparts/event.cpp b/tdeparts/event.cpp
index 4f0efd617..a25d61640 100644
--- a/kparts/event.cpp
+++ b/tdeparts/event.cpp
@@ -17,7 +17,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 using namespace KParts;
 
diff --git a/kparts/event.h b/tdeparts/event.h
index 70916dd47..65f1c7be9 100644
--- a/kparts/event.h
+++ b/tdeparts/event.h
@@ -17,8 +17,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kparts_event_h__
-#define __kparts_event_h__
+#ifndef __tdeparts_event_h__
+#define __tdeparts_event_h__
 
 #include <tqevent.h>
 
diff --git a/kparts/factory.cpp b/tdeparts/factory.cpp
index 7d04b43d1..485bd9a36 100644
--- a/kparts/factory.cpp
+++ b/tdeparts/factory.cpp
@@ -23,8 +23,8 @@
 
 #include <tqwidget.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <assert.h>
 
@@ -47,7 +47,7 @@ Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObj
     return part;
 }
 
-const KInstance *Factory::partInstance()
+const TDEInstance *Factory::partInstance()
 {
     QueryInstanceParams params;
     params.instance = 0;
@@ -55,7 +55,7 @@ const KInstance *Factory::partInstance()
     return params.instance;
 }
 
-const KInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
+const TDEInstance *Factory::partInstanceFromLibrary( const TQCString &libraryName )
 {
     KLibrary *library = KLibLoader::self()->library( libraryName );
     if ( !library )
diff --git a/kparts/factory.h b/tdeparts/factory.h
index 26c53b9dc..3a6f3e4ed 100644
--- a/kparts/factory.h
+++ b/tdeparts/factory.h
@@ -17,8 +17,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kparts_factory_h__
-#define __kparts_factory_h__
+#ifndef __tdeparts_factory_h__
+#define __tdeparts_factory_h__
 
 #include <klibloader.h>
 
@@ -50,7 +50,7 @@ public:
      * The TQStringList can be used to pass additional arguments to the part.
      * If the part needs additional arguments, it should take them as
      * name="value" pairs. This is the way additional arguments will get passed
-     * to the part from eg. khtml. You can for example embed the part into HTML
+     * to the part from eg. tdehtml. You can for example embed the part into HTML
      * by using the following code:
      * \code
      *    <object type="my_mimetype" data="url_to_my_data">
@@ -75,12 +75,12 @@ public:
 
      /**
       * If you have a part contained in a shared library you might want to query
-      * for meta-information like the about-data, or the KInstance in general.
+      * for meta-information like the about-data, or the TDEInstance in general.
       * If the part is exported using KParts::GenericFactory then this method will
       * return the instance that belongs to the part without the need to instantiate
       * the part component.
       */
-     const KInstance *partInstance();
+     const TDEInstance *partInstance();
 
      /**
       * A convenience method for partInstance() that takes care of retrieving
@@ -88,7 +88,7 @@ public:
       *
       * @param libraryName name of the library to query the instance from
       */
-     static const KInstance *partInstanceFromLibrary( const TQCString &libraryName );
+     static const TDEInstance *partInstanceFromLibrary( const TQCString &libraryName );
 
 protected:
 
@@ -98,7 +98,7 @@ protected:
      * The TQStringList can be used to pass additional arguments to the part.
      * If the part needs additional arguments, it should take them as
      * name="value" pairs. This is the way additional arguments will get passed
-     * to the part from eg. khtml. You can for example emebed the part into HTML
+     * to the part from eg. tdehtml. You can for example emebed the part into HTML
      * by using the following code:
      * \code
      *    <object type="my_mimetype" data="url_to_my_data">
@@ -129,7 +129,7 @@ protected:
     enum { VIRTUAL_QUERY_INSTANCE_PARAMS = 0x10 };
     struct QueryInstanceParams
     {
-        const KInstance *instance;
+        const TDEInstance *instance;
     };
 };
 
diff --git a/kparts/genericfactory.h b/tdeparts/genericfactory.h
index f4ab3be16..eb54959a4 100644
--- a/kparts/genericfactory.h
+++ b/tdeparts/genericfactory.h
@@ -1,10 +1,10 @@
-#ifndef __kparts__genericfactory_h__
-#define __kparts__genericfactory_h__
+#ifndef __tdeparts__genericfactory_h__
+#define __tdeparts__genericfactory_h__
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 namespace KParts
@@ -32,13 +32,13 @@ namespace KParts
             s_self = 0;
         }
 
-        static KInstance *instance();
-        static KAboutData *aboutData();
+        static TDEInstance *instance();
+        static TDEAboutData *aboutData();
 
     protected:
-        virtual KInstance *createInstance()
+        virtual TDEInstance *createInstance()
         {
-            return new KInstance( aboutData() );
+            return new TDEInstance( aboutData() );
         }
 
         virtual void virtual_hook( int id, void *data )
@@ -54,31 +54,31 @@ namespace KParts
 
     private:
         static GenericFactoryBase<T> *s_self;
-        static KInstance *s_instance;
-        static KAboutData *s_aboutData;
+        static TDEInstance *s_instance;
+        static TDEAboutData *s_aboutData;
     };
 
     /**
      * A template for a KParts::Factory implementation. It implements the pure virtual
      * createPartObject method by instantiating the template argument when requested
-     * through the className field. In addition it is a container for a part's KInstance
-     * object, by providing a static KInstance *instance() method.
+     * through the className field. In addition it is a container for a part's TDEInstance
+     * object, by providing a static TDEInstance *instance() method.
      *
      * The template argument has to inherit from KParts::Part and has to implement two methods:
      *  1) There needs to be a public constructor with the following signature:
      *         MyPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args )
      *
-     *  2) It needs to provide one static method to create a KAboutData object per
+     *  2) It needs to provide one static method to create a TDEAboutData object per
      *     request, holding information about the component's name, its authors, license, etc.
      *     The signature of that static method has to be
-     *         KAboutData *createAboutData()
+     *         TDEAboutData *createAboutData()
      *
-     * The template will take care of memory management of the KInstance and the KAboutData object,
+     * The template will take care of memory management of the TDEInstance and the TDEAboutData object,
      * meaning ownership of what createAboutData returns is passed to the caller (this template) .
      *
      * For advanced use you can also inherit from the template and re-implement additionally the
-     * virtual KInstance *createInstance() method, for example in case you want to extend the
-     * paths of your instance's KStandardDirs object.
+     * virtual TDEInstance *createInstance() method, for example in case you want to extend the
+     * paths of your instance's TDEStandardDirs object.
      *
      * If a KParts::ReadOnlyPart is requested through this factory and the template argument
      * implements a KParts::ReadWritePart then setReadWrite( false ) will automatically be
@@ -159,26 +159,26 @@ namespace KParts
      * @internal
      */
     template <class T>
-    KInstance *GenericFactoryBase<T>::s_instance = 0;
+    TDEInstance *GenericFactoryBase<T>::s_instance = 0;
 
     /**
      * @internal
      */
     template <class T>
-    KAboutData *GenericFactoryBase<T>::s_aboutData = 0;
+    TDEAboutData *GenericFactoryBase<T>::s_aboutData = 0;
 
     /**
      * @internal
      */
     template <class T>
-    KInstance *GenericFactoryBase<T>::instance()
+    TDEInstance *GenericFactoryBase<T>::instance()
     {
         if ( !s_instance )
         {
             if ( s_self )
                 s_instance = s_self->createInstance();
             else
-                s_instance = new KInstance( aboutData() );
+                s_instance = new TDEInstance( aboutData() );
         }
         return s_instance;
     }
@@ -187,7 +187,7 @@ namespace KParts
      * @internal
      */
     template <class T>
-    KAboutData *GenericFactoryBase<T>::aboutData()
+    TDEAboutData *GenericFactoryBase<T>::aboutData()
     {
         if ( !s_aboutData )
             s_aboutData = T::createAboutData();
diff --git a/kparts/historyprovider.cpp b/tdeparts/historyprovider.cpp
index 17cf609a1..9c893ae53 100644
--- a/kparts/historyprovider.cpp
+++ b/tdeparts/historyprovider.cpp
@@ -19,7 +19,7 @@
 
 #include <tqdict.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "historyprovider.h"
 
diff --git a/kparts/historyprovider.h b/tdeparts/historyprovider.h
index 1acd8d272..1123981ec 100644
--- a/kparts/historyprovider.h
+++ b/tdeparts/historyprovider.h
@@ -32,9 +32,9 @@ namespace KParts {
  * for fast lookup, if an item is in the history or not.
  *
  * May be subclassed to implement a persistent history for example.
- * For usage with khtml, just create your provider and call the
- * HistoryProvider constructor _before_ you do any khtml stuff. That way,
- * khtml, using the self()-method, will use your subclassed provider.
+ * For usage with tdehtml, just create your provider and call the
+ * HistoryProvider constructor _before_ you do any tdehtml stuff. That way,
+ * tdehtml, using the self()-method, will use your subclassed provider.
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
diff --git a/kparts/kpart.desktop b/tdeparts/kpart.desktop
index ba69bd704..ba69bd704 100644
--- a/kparts/kpart.desktop
+++ b/tdeparts/kpart.desktop
diff --git a/kparts/krop.desktop b/tdeparts/krop.desktop
index 62de2d454..62de2d454 100644
--- a/kparts/krop.desktop
+++ b/tdeparts/krop.desktop
diff --git a/kparts/krwp.desktop b/tdeparts/krwp.desktop
index 5c6bfee1a..5c6bfee1a 100644
--- a/kparts/krwp.desktop
+++ b/tdeparts/krwp.desktop
diff --git a/kparts/mainwindow.cpp b/tdeparts/mainwindow.cpp
index c0c4cd086..b3245da9b 100644
--- a/kparts/mainwindow.cpp
+++ b/tdeparts/mainwindow.cpp
@@ -18,10 +18,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kparts/mainwindow.h>
-#include <kparts/event.h>
-#include <kparts/part.h>
-#include <kparts/plugin.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/event.h>
+#include <tdeparts/part.h>
+#include <tdeparts/plugin.h>
 #include <kinstance.h>
 #include <kstatusbar.h>
 #include <khelpmenu.h>
@@ -29,7 +29,7 @@
 #include <tqapplication.h>
 #include <kxmlguifactory.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
 
 #include <assert.h>
@@ -58,21 +58,21 @@ public:
 }
 
 MainWindow::MainWindow( TQWidget* parent,  const char *name, WFlags f )
-    : KMainWindow( parent, name, f )
+    : TDEMainWindow( parent, name, f )
 {
   d = new MainWindowPrivate();
   PartBase::setPartObject( TQT_TQOBJECT(this) );
 }
 
 MainWindow::MainWindow( const char *name, WFlags f )
-  : KMainWindow( 0L, name, f )
+  : TDEMainWindow( 0L, name, f )
 {
   d = new MainWindowPrivate();
   PartBase::setPartObject( TQT_TQOBJECT(this) );
 }
 
 MainWindow::MainWindow( int cflags, TQWidget* parent,  const char *name, WFlags f )
-    : KMainWindow( cflags, parent, name, f )
+    : TDEMainWindow( cflags, parent, name, f )
 {
   d = new MainWindowPrivate();
   PartBase::setPartObject( TQT_TQOBJECT(this) );
@@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part )
 
   if ( !d->m_bShellGUIActivated )
   {
-    loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() );
+    loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
     createShellGUI();
     d->m_bShellGUIActivated = true;
   }
@@ -134,7 +134,7 @@ void MainWindow::createGUI( Part * part )
     TQApplication::sendEvent( part, &ev );
 
     if ( autoSaveSettings() )
-        applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+        applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
   }
 
   setUpdatesEnabled( true );
@@ -185,7 +185,7 @@ void MainWindow::createShellGUI( bool create )
 void KParts::MainWindow::saveNewToolbarConfig()
 {
     createGUI( d->m_activePart );
-    applyMainWindowSettings( KGlobal::config() );
+    applyMainWindowSettings( TDEGlobal::config() );
 }
 
 #include "mainwindow.moc"
diff --git a/kparts/mainwindow.h b/tdeparts/mainwindow.h
index f1c386a6a..5872ae9c2 100644
--- a/kparts/mainwindow.h
+++ b/tdeparts/mainwindow.h
@@ -21,11 +21,11 @@
 #define __MAINWINDOW_H
 
 #include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQString;
 
@@ -41,15 +41,15 @@ class MainWindowPrivate;
  * and don't forget to call setXMLFile() in the inherited constructor.
  *
  * It implements all internal interfaces in the case of a
- * KMainWindow as host: the builder and servant interface (for menu
+ * TDEMainWindow as host: the builder and servant interface (for menu
  * merging).
  */
-class KPARTS_EXPORT MainWindow : public KMainWindow, virtual public PartBase
+class KPARTS_EXPORT MainWindow : public TDEMainWindow, virtual public PartBase
 {
   Q_OBJECT
  public:
   /**
-   * Constructor, same signature as KMainWindow.
+   * Constructor, same signature as TDEMainWindow.
    */
 #ifdef qdoc
   MainWindow( TQWidget* parent,  const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
@@ -65,7 +65,7 @@ class KPARTS_EXPORT MainWindow : public KMainWindow, virtual public PartBase
   MainWindow( const char *name = 0L, WFlags f = (WFlags)WDestructiveClose );
 #endif
   /**
-   * Constructor with creation flags, see KMainWindow.
+   * Constructor with creation flags, see TDEMainWindow.
    * @since 3.2
    */
 #ifdef qdoc
diff --git a/kparts/part.cpp b/tdeparts/part.cpp
index a76fce282..954fc83d5 100644
--- a/kparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -18,11 +18,11 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kparts/part.h>
-#include <kparts/event.h>
-#include <kparts/plugin.h>
-#include <kparts/mainwindow.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/part.h>
+#include <tdeparts/event.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/partmanager.h>
 
 #include <tqapplication.h>
 #include <tqfile.h>
@@ -33,12 +33,12 @@
 #include <tqfileinfo.h>
 
 #include <kinstance.h>
-#include <klocale.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdirnotify_stub.h>
 
 #include <stdio.h>
@@ -102,24 +102,24 @@ TQObject *PartBase::partObject() const
   return m_obj;
 }
 
-void PartBase::setInstance( KInstance *inst )
+void PartBase::setInstance( TDEInstance *inst )
 {
   setInstance( inst, true );
 }
 
-void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
+void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins )
 {
   KXMLGUIClient::setInstance( inst );
-  KGlobal::locale()->insertCatalogue( inst->instanceName() );
+  TDEGlobal::locale()->insertCatalogue( inst->instanceName() );
   // install 'instancename'data resource type
-  KGlobal::dirs()->addResourceType( inst->instanceName() + "data",
-                                    KStandardDirs::kde_default( "data" )
+  TDEGlobal::dirs()->addResourceType( inst->instanceName() + "data",
+                                    TDEStandardDirs::kde_default( "data" )
                                     + TQString::fromLatin1( inst->instanceName() ) + '/' );
   if ( bLoadPlugins )
     loadPlugins( m_obj, this, instance() );
 }
 
-void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance )
+void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance )
 {
   if( d->m_pluginLoadingMode != DoNotLoadPlugins )
     Plugin::loadPlugins( parent, parentGUIClient, instance, d->m_pluginLoadingMode == LoadPlugins );
@@ -204,7 +204,7 @@ void Part::setWidget( TQWidget *widget )
 
   // Since KParts objects are XML-based, shortcuts should
   //  be connected to the widget when the XML settings
-  //  are processed, rather than on KAction construction.
+  //  are processed, rather than on TDEAction construction.
   actionCollection()->setAutoConnectShortcuts( false );
 }
 
@@ -289,8 +289,8 @@ public:
   {
   }
 
-  KIO::FileCopyJob * m_job;
-  KIO::FileCopyJob * m_uploadJob;
+  TDEIO::FileCopyJob * m_job;
+  TDEIO::FileCopyJob * m_uploadJob;
   KURL m_originalURL; // for saveAs
   TQString m_originalFilePath; // for saveAs
   bool m_showProgressInfo : 1;
@@ -364,10 +364,10 @@ bool ReadOnlyPart::openURL( const KURL &url )
 
     KURL destURL;
     destURL.setPath( m_file );
-    d->m_job = KIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo );
+    d->m_job = TDEIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo );
     d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 );
     emit started( d->m_job );
-    connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
+    connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
     return true;
   }
 }
@@ -397,7 +397,7 @@ bool ReadOnlyPart::closeURL()
   return true;
 }
 
-void ReadOnlyPart::slotJobFinished( KIO::Job * job )
+void ReadOnlyPart::slotJobFinished( TDEIO::Job * job )
 {
   kdDebug(1000) << "ReadOnlyPart::slotJobFinished" << endl;
   assert( job == d->m_job );
@@ -637,14 +637,14 @@ bool ReadWritePart::saveToURL()
        // Uh oh, some error happened.
        return false;
     }
-    d->m_uploadJob = KIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ );
+    d->m_uploadJob = TDEIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ );
     d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 );
-    connect( d->m_uploadJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
+    connect( d->m_uploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
     return true;
   }
 }
 
-void ReadWritePart::slotUploadFinished( KIO::Job * )
+void ReadWritePart::slotUploadFinished( TDEIO::Job * )
 {
   if (d->m_uploadJob->error())
   {
diff --git a/kparts/part.h b/tdeparts/part.h
index 0c4023f6c..7550bce38 100644
--- a/kparts/part.h
+++ b/tdeparts/part.h
@@ -27,14 +27,14 @@
 
 #include <kxmlguiclient.h>
 
-class KInstance;
+class TDEInstance;
 class TQWidget;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class TQEvent;
 struct QUnknownInterface;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -79,24 +79,24 @@ public:
 
 protected:
   /**
-   * Set the instance ( KInstance) for this part.
+   * Set the instance ( TDEInstance) for this part.
    *
    * Call this *first* in the inherited class constructor,
    * because it loads the i18n catalogues.
    */
-  virtual void setInstance( KInstance *instance );
+  virtual void setInstance( TDEInstance *instance );
 
   /**
-   * Set the instance ( KInstance) for this part.
+   * Set the instance ( TDEInstance) for this part.
    *
    * Call this *first* in the inherited class constructor,
    * because it loads the i18n catalogues.
    */
-  virtual void setInstance( KInstance *instance, bool loadPlugins );
+  virtual void setInstance( TDEInstance *instance, bool loadPlugins );
 
   /**
    * We have three different policies, whether to load new plugins or not. The
-   * value in the KConfig object of the KInstance object always overrides
+   * value in the TDEConfig object of the TDEInstance object always overrides
    * LoadPlugins and LoadPluginsIfEnabled.
    */
   enum PluginLoadingMode {
@@ -140,7 +140,7 @@ protected:
    * }
    * \endcode
    */
-  void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance );
+  void loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance );
 
   /**
    * For a KParts::Part: call this before setInstance().
@@ -230,7 +230,7 @@ public:
      * Returns the part (this, or a child part) at the given global position.
      * This is called by the part manager to ask whether a part should be activated
      * when clicking somewhere. In most cases the default implementation is enough.
-     * Reimplement this if your part has child parts in some areas (like in khtml or koffice)
+     * Reimplement this if your part has child parts in some areas (like in tdehtml or koffice)
      * @param widget the part widget being clicked - usually the same as widget(), except in koffice.
      * @param globalPos the mouse coordinates in global coordinates
      */
@@ -452,10 +452,10 @@ private: // Makes no sense for inherited classes to call those. But make it prot
 signals:
   /**
    * The part emits this when starting data.
-   * If using a KIO::Job, it sets the job in the signal, so that
+   * If using a TDEIO::Job, it sets the job in the signal, so that
    * progress information can be shown. Otherwise, job is 0.
    **/
-  void started( KIO::Job * );
+  void started( TDEIO::Job * );
 
   /**
    * Emit this when you have completed loading data.
@@ -482,7 +482,7 @@ signals:
   void canceled( const TQString &errMsg );
 
 protected slots:
-  void slotJobFinished( KIO::Job * job );
+  void slotJobFinished( TDEIO::Job * job );
 
 protected:
   /**
@@ -554,7 +554,7 @@ public:
    * Destructor.
    * Applications using a ReadWritePart should make sure, before
    * destroying it, to call closeURL().
-   * In KMainWindow::queryClose(), for instance, they should allow
+   * In TDEMainWindow::queryClose(), for instance, they should allow
    * closing only if the return value of closeURL() was true.
    * This allows to cancel.
    */
@@ -578,7 +578,7 @@ public:
 
   /**
    * If the document has been modified, ask the user to save changes.
-   * This method is meant to be called from KMainWindow::queryClose().
+   * This method is meant to be called from TDEMainWindow::queryClose().
    * It will also be called from closeURL().
    *
    * @return true if closeURL() can be called without the user losing
@@ -605,7 +605,7 @@ public:
   /**
    * Call this method instead of the above if you need control if
    * the save prompt is shown. For example, if you call queryClose()
-   * from KMainWindow::queryClose(), you would not want to prompt
+   * from TDEMainWindow::queryClose(), you would not want to prompt
    * again when closing the url.
    *
    * Equivalent to promptToSave ? closeURL() : ReadOnlyPart::closeURL()
@@ -667,8 +667,8 @@ protected:
    * @return true on success, false on failure.
    * On failure the function should inform the user about the
    * problem with an appropriate message box. Standard error
-   * messages can be constructed using KIO::buildErrorString()
-   * in combination with the error codes defined in kio/global.h
+   * messages can be constructed using TDEIO::buildErrorString()
+   * in combination with the error codes defined in tdeio/global.h
    */
   virtual bool saveFile() = 0;
 
@@ -686,7 +686,7 @@ protected slots:
   /**
    * @internal
    */
-  void slotUploadFinished( KIO::Job * job );
+  void slotUploadFinished( TDEIO::Job * job );
 
 private:
   void prepareSaving();
diff --git a/kparts/partmanager.cpp b/tdeparts/partmanager.cpp
index 97a8b9961..0f6f59561 100644
--- a/kparts/partmanager.cpp
+++ b/tdeparts/partmanager.cpp
@@ -20,9 +20,9 @@
 */
 
 #include "partmanager.h"
-#include <kparts/event.h>
-#include <kparts/part.h>
-#include <kglobal.h>
+#include <tdeparts/event.h>
+#include <tdeparts/part.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqapplication.h>
@@ -479,17 +479,17 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
       TQApplication::sendEvent( d->m_activeWidget, &ev );
     }
   }
-  // Set the new active instance in KGlobal
+  // Set the new active instance in TDEGlobal
   setActiveInstance( d->m_activePart ? d->m_activePart->instance() : 0L );
 
   kdDebug(1000) << this << " emitting activePartChanged " << d->m_activePart << endl;
   emit activePartChanged( d->m_activePart );
 }
 
-void PartManager::setActiveInstance( KInstance * instance )
+void PartManager::setActiveInstance( TDEInstance * instance )
 {
   // It's a separate method to allow redefining this behavior
-  KGlobal::_activeInstance = instance;
+  TDEGlobal::_activeInstance = instance;
 }
 
 Part *PartManager::activePart() const
diff --git a/kparts/partmanager.h b/tdeparts/partmanager.h
index 33c13d3ed..1d9e0da84 100644
--- a/kparts/partmanager.h
+++ b/tdeparts/partmanager.h
@@ -27,7 +27,7 @@
 
 #include <tdelibs_export.h>
 
-class KInstance;
+class TDEInstance;
 
 namespace KParts
 {
@@ -253,10 +253,10 @@ signals:
 protected:
   /**
    * Changes the active instance when the active part changes.
-   * The active instance is used by KBugReport and KAboutDialog.
+   * The active instance is used by KBugReport and TDEAboutDialog.
    * Override if you really need to - usually you don't need to.
    */
-  virtual void setActiveInstance( KInstance * instance );
+  virtual void setActiveInstance( TDEInstance * instance );
 
 protected slots:
   /**
diff --git a/kparts/plugin.cpp b/tdeparts/plugin.cpp
index b5c50be2c..378db4a27 100644
--- a/kparts/plugin.cpp
+++ b/tdeparts/plugin.cpp
@@ -19,9 +19,9 @@
 */
 
 #include <config.h>
-#include <kparts/plugin.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 
 #include <assert.h>
 
@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kxmlguifactory.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 
 using namespace KParts;
@@ -45,7 +45,7 @@ class Plugin::PluginPrivate
 public:
     PluginPrivate() : m_parentInstance( 0 ) {}
 
-    const KInstance *m_parentInstance;
+    const TDEInstance *m_parentInstance;
     TQString m_library; // filename of the library
 };
 
@@ -86,7 +86,7 @@ TQString Plugin::localXMLFile() const
 }
 
 //static
-TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance )
+TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const TDEInstance * instance )
 {
   if ( !instance )
     kdError(1000) << "No instance ???" << endl;
@@ -138,12 +138,12 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance
   return plugins;
 }
 
-void Plugin::loadPlugins( TQObject *parent, const KInstance *instance )
+void Plugin::loadPlugins( TQObject *parent, const TDEInstance *instance )
 {
   loadPlugins( parent, pluginInfos( instance ), instance );
 }
 
-void Plugin::loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const KInstance *instance )
+void Plugin::loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const TDEInstance *instance )
 {
    TQValueList<PluginInfo>::ConstIterator pIt = pluginInfos.begin();
    TQValueList<PluginInfo>::ConstIterator pEnd = pluginInfos.end();
@@ -218,15 +218,15 @@ bool Plugin::hasPlugin( TQObject* parent, const TQString& library )
   return false;
 }
 
-void Plugin::setInstance( KInstance *instance )
+void Plugin::setInstance( TDEInstance *instance )
 {
-    KGlobal::locale()->insertCatalogue( instance->instanceName() );
+    TDEGlobal::locale()->insertCatalogue( instance->instanceName() );
     KXMLGUIClient::setInstance( instance );
 }
 
-void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KInstance* instance, bool enableNewPluginsByDefault )
+void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault )
 {
-    KConfigGroup cfgGroup( instance->config(), "KParts Plugins" );
+    TDEConfigGroup cfgGroup( instance->config(), "KParts Plugins" );
     TQValueList<PluginInfo> plugins = pluginInfos( instance );
     TQValueList<PluginInfo>::ConstIterator pIt = plugins.begin();
     TQValueList<PluginInfo>::ConstIterator pEnd = plugins.end();
diff --git a/kparts/plugin.h b/tdeparts/plugin.h
index 0da0a46e0..751ee9c99 100644
--- a/kparts/plugin.h
+++ b/tdeparts/plugin.h
@@ -21,10 +21,10 @@
 #define PLUGIN_H
 
 #include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kxmlguiclient.h>
 
-class KInstance;
+class TDEInstance;
 
 namespace KParts
 {
@@ -86,7 +86,7 @@ public:
      * It is recommended to use the last loadPlugins method instead,
      * to support enabling and disabling of plugins.
      */
-    static void loadPlugins( TQObject *parent, const KInstance * instance );
+    static void loadPlugins( TQObject *parent, const TDEInstance * instance );
 
     /**
      * Load the plugin libraries specified by the list @p docs and make the
@@ -104,14 +104,14 @@ public:
      * It is recommended to use the last loadPlugins method instead,
      * to support enabling and disabling of plugins.
      */
-    static void loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const KInstance * instance );
+    static void loadPlugins( TQObject *parent, const TQValueList<PluginInfo> &pluginInfos, const TDEInstance * instance );
 
     /**
      * Load the plugin libraries for the given @p instance, make the
      * Plugin objects children of @p parent, and insert the plugin as a child GUI client
      * of @p parentGUIClient.
      *
-     * This method uses the KConfig object of the given instance, to find out which
+     * This method uses the TDEConfig object of the given instance, to find out which
      * plugins are enabled and which are disabled. What happens by default (i.e.
      * for new plugins that are not in that config file) is controlled by
      * @p enableNewPluginsByDefault. It can be overridden by the plugin if it
@@ -140,7 +140,7 @@ public:
      * }
      * \endcode
      */
-    static void loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KInstance* instance, bool enableNewPluginsByDefault = true );
+    static void loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, TDEInstance* instance, bool enableNewPluginsByDefault = true );
 
     /**
      * Returns a list of plugin objects loaded for @p parent. This
@@ -156,7 +156,7 @@ protected:
      *
      * @return A list of TQDomDocument s, containing the parsed xml documents returned by plugins.
      */
-    static TQValueList<Plugin::PluginInfo> pluginInfos( const KInstance * instance );
+    static TQValueList<Plugin::PluginInfo> pluginInfos( const TDEInstance * instance );
 
     /**
      * @internal
@@ -164,7 +164,7 @@ protected:
      */
     static Plugin* loadPlugin( TQObject * parent, const char* libname );
 
-    virtual void setInstance( KInstance *instance );
+    virtual void setInstance( TDEInstance *instance );
 
 private:
     static bool hasPlugin( TQObject* parent, const TQString& library );
diff --git a/kparts/statusbarextension.cpp b/tdeparts/statusbarextension.cpp
index a90a50689..3803efa95 100644
--- a/kparts/statusbarextension.cpp
+++ b/tdeparts/statusbarextension.cpp
@@ -24,11 +24,11 @@
 #include <tqobjectlist.h>
 
 #include <kstatusbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdebug.h>
 #include <tdelibs_export.h>
-#include <kparts/part.h>
-#include <kparts/event.h>
+#include <tdeparts/part.h>
+#include <tdeparts/event.h>
 
 using namespace KParts;
 
@@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const
 {
   if ( !m_statusBar )  {
     TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget();
-    KMainWindow* mw = tqt_dynamic_cast<KMainWindow *>( w->topLevelWidget() );
+    TDEMainWindow* mw = tqt_dynamic_cast<TDEMainWindow *>( w->topLevelWidget() );
     if ( mw )
       m_statusBar = mw->statusBar();
   }
diff --git a/kparts/statusbarextension.h b/tdeparts/statusbarextension.h
index fa635a12b..8e6ea062d 100644
--- a/kparts/statusbarextension.h
+++ b/tdeparts/statusbarextension.h
@@ -27,7 +27,7 @@
 #include <tdelibs_export.h>
 
 class KStatusBar;
-class KMainWindow;
+class TDEMainWindow;
 class TQEvent;
 
 namespace KParts
@@ -87,7 +87,7 @@ namespace KParts
       void removeStatusBarItem( TQWidget * widget );
 
       /**
-       * @return the statusbar of the KMainWindow in which this part is currently embedded.
+       * @return the statusbar of the TDEMainWindow in which this part is currently embedded.
        * WARNING: this could return 0L
        */
       KStatusBar* statusBar() const;
@@ -95,7 +95,7 @@ namespace KParts
       /**
        * This allows the hosting application to set a particular KStatusBar
        * for this part. If it doesn't do this, the statusbar used will be
-       * the one of the KMainWindow in which the part is embedded.
+       * the one of the TDEMainWindow in which the part is embedded.
        * Konqueror uses this to assign a view-statusbar to the part.
        * The part should never call this method!
        */
diff --git a/kparts/tests/Makefile.am b/tdeparts/tests/Makefile.am
index e593cb6da..0e77c3e4c 100644
--- a/kparts/tests/Makefile.am
+++ b/tdeparts/tests/Makefile.am
@@ -1,12 +1,12 @@
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/kfile -I$(top_srcdir)/kio $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdeio $(all_includes)
 AM_LDFLAGS = $(all_libraries)
 LDADD = $(LIB_KPARTS)
 
-check_PROGRAMS = kpartstest normalktmtest ghostviewtest
+check_PROGRAMS = tdepartstest normalktmtest ghostviewtest
 
-kpartstest_SOURCES = example.cpp parts.cpp
-kpartstest_LDADD = libnotepad.la $(LIB_KPARTS)
+tdepartstest_SOURCES = example.cpp parts.cpp
+tdepartstest_LDADD = libnotepad.la $(LIB_KPARTS)
 normalktmtest_SOURCES = normalktm.cpp parts.cpp
 normalktmtest_LDADD = libnotepad.la $(LIB_KPARTS)
 ghostviewtest_SOURCES = ghostview.cpp
@@ -27,11 +27,11 @@ libnotepadpart_la_LDFLAGS = -module $(KDE_PLUGIN)
 noinst_LTLIBRARIES = libnotepad.la
 libnotepad_la_SOURCES = notepad.cpp
 
-rcdir = $(kde_datadir)/kpartstest
-rc_DATA = kpartstest_shell.rc
+rcdir = $(kde_datadir)/tdepartstest
+rc_DATA = tdepartstest_shell.rc
 
-testpartdir = $(kde_datadir)/kpartstestpart
-testpart_DATA = kpartstest_part1.rc
+testpartdir = $(kde_datadir)/tdepartstestpart
+testpart_DATA = tdepartstest_part1.rc
 
 notepaddir = $(kde_datadir)/notepadpart
 notepad_DATA = notepadpart.rc
diff --git a/kparts/tests/README b/tdeparts/tests/README
index a0bee7ca6..a0bee7ca6 100644
--- a/kparts/tests/README
+++ b/tdeparts/tests/README
diff --git a/kparts/tests/example.cpp b/tdeparts/tests/example.cpp
index 7792c5d43..c8fb77b29 100644
--- a/kparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -9,14 +9,14 @@
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <kaction.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
 
 Shell::Shell()
 {
-  setXMLFile( "kpartstest_shell.rc" );
+  setXMLFile( "tdepartstest_shell.rc" );
 
   m_manager = new KParts::PartManager( this );
 
@@ -32,19 +32,19 @@ Shell::Shell()
   m_part1 = new Part1(this, m_splitter);
   m_part2 = new Part2(this, m_splitter);
 
-  KActionCollection *coll = actionCollection();
+  TDEActionCollection *coll = actionCollection();
 
-  (void)new KAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" );
-  (void)new KAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" );
+  (void)new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" );
+  (void)new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" );
 
-  m_paEditFile = new KAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" );
-  m_paCloseEditor = new KAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
+  m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" );
+  m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
   m_paCloseEditor->setEnabled(false);
-  KAction * paQuit = new KAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" );
+  TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" );
   paQuit->setIconSet(TQIconSet(BarIcon("exit")));
 
-  (void)new KAction( "Yet another menu item", 0, coll, "shell_yami" );
-  (void)new KAction( "Yet another submenu item", 0, coll, "shell_yasmi" );
+  (void)new TDEAction( "Yet another menu item", 0, coll, "shell_yami" );
+  (void)new TDEAction( "Yet another submenu item", 0, coll, "shell_yasmi" );
 
   setCentralWidget( m_splitter );
   m_splitter->setMinimumSize( 400, 300 );
@@ -63,7 +63,7 @@ Shell::~Shell()
 
 void Shell::slotFileOpen()
 {
-  if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) )
+  if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/tdepartstest_shell.rc" ) ) )
     KMessageBox::error(this,"Couldn't open file !");
 }
 
@@ -115,13 +115,13 @@ void Shell::slotFileEdit()
   if ( !m_editorpart )
     embedEditor();
   // TODO use KFileDialog to allow testing remote files
-  if ( ! m_editorpart->openURL( TQDir::current().absPath()+"/kpartstest_shell.rc" ) )
+  if ( ! m_editorpart->openURL( TQDir::current().absPath()+"/tdepartstest_shell.rc" ) )
     KMessageBox::error(this,"Couldn't open file !");
 }
 
 int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "kpartstest" );
+  TDEApplication app( argc, argv, "tdepartstest" );
 
   Shell *shell = new Shell;
 
diff --git a/kparts/tests/example.h b/tdeparts/tests/example.h
index 87c907390..76541437d 100644
--- a/kparts/tests/example.h
+++ b/tdeparts/tests/example.h
@@ -2,10 +2,10 @@
 #ifndef __example_h__
 #define __example_h__
 
-#include <kparts/partmanager.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/mainwindow.h>
 
-class KAction;
+class TDEAction;
 class TQWidget;
 
 class Shell : public KParts::MainWindow
@@ -26,8 +26,8 @@ protected:
 
 private:
 
-  KAction * m_paEditFile;
-  KAction * m_paCloseEditor;
+  TDEAction * m_paEditFile;
+  TDEAction * m_paCloseEditor;
 
   KParts::ReadOnlyPart *m_part1;
   KParts::Part *m_part2;
diff --git a/kparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index a1ace7720..d83ec8f41 100644
--- a/kparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -1,11 +1,11 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
-#include <kaction.h>
-#include <klocale.h>
-#include <kfiledialog.h>
-#include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
+#include <tdefiledialog.h>
+#include <tdemessagebox.h>
+#include <tdecmdlineargs.h>
 #include <klibloader.h>
 
 #include <tqwidget.h>
@@ -20,17 +20,17 @@ Shell::Shell()
 {
   setXMLFile( "ghostviewtest_shell.rc" );
 
-  KAction * paOpen = new KAction( "&Open file" , "fileopen", 0, this,
+  TDEAction * paOpen = new TDEAction( "&Open file" , "fileopen", 0, this,
     TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" );
 
-  KAction * paQuit = new KAction( "&Quit" , "exit", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );
+  TDEAction * paQuit = new TDEAction( "&Quit" , "exit", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );
 
   // Try to find a postscript component first
-  KTrader::OfferList offers = KTrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
+  TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
 
   KLibFactory *factory = 0;
   m_gvpart = 0;
-  KTrader::OfferList::Iterator it(offers.begin());
+  TDETrader::OfferList::Iterator it(offers.begin());
   for( ; it != offers.end(); ++it)
   {
     KService::Ptr ptr = (*it);
@@ -91,20 +91,20 @@ void Shell::slotFileOpen()
      openURL( url );
 }
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
  { "+file(s)",          "Files to load", 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
 };
 static const char version[] = "v0.0.1 2000 (c) David Faure";
 static const char description[] = "This is a test shell for the kghostview part.";
 
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init(argc, argv, "ghostviewtest", description, version);
-  KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
-  KApplication app;
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs::init(argc, argv, "ghostviewtest", description, version);
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
+  TDEApplication app;
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   Shell *shell = new Shell;
   if ( args->count() == 1 )
   {
diff --git a/kparts/tests/ghostview.h b/tdeparts/tests/ghostview.h
index 5d99d4f0e..2974ded5e 100644
--- a/kparts/tests/ghostview.h
+++ b/tdeparts/tests/ghostview.h
@@ -1,7 +1,7 @@
 #ifndef __example_h__
 #define __example_h__
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class Shell : public KParts::MainWindow
 {
diff --git a/kparts/tests/ghostviewtest_shell.rc b/tdeparts/tests/ghostviewtest_shell.rc
index 0bae67c82..0bae67c82 100644
--- a/kparts/tests/ghostviewtest_shell.rc
+++ b/tdeparts/tests/ghostviewtest_shell.rc
diff --git a/kparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index bb54521d1..92e46254e 100644
--- a/kparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -9,12 +9,12 @@
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <kaction.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 Shell::Shell()
 {
@@ -29,21 +29,21 @@ Shell::Shell()
   TQPopupMenu * pFile = new TQPopupMenu( this );
   menuBar()->insertItem( "File", pFile );
   TQObject * coll = this;
-  KAction * paLocal = new KAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" );
+  TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" );
   // No XML : we need to plug our actions ourselves
   paLocal->plug( pFile );
 
-  KAction * paRemote = new KAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" );
+  TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" );
   paRemote->plug( pFile );
 
-  m_paEditFile = new KAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" );
+  m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" );
   m_paEditFile->plug( pFile );
 
-  m_paCloseEditor = new KAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
+  m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
   m_paCloseEditor->setEnabled(false);
   m_paCloseEditor->plug( pFile );
 
-  KAction * paQuit = new KAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" );
+  TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" );
   paQuit->setIconSet(TQIconSet(BarIcon("exit")));
   paQuit->plug( pFile );
 
@@ -61,7 +61,7 @@ Shell::~Shell()
 
 void Shell::slotFileOpen()
 {
-  if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) )
+  if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/tdepartstest_shell.rc" ) ) )
     KMessageBox::error(this,"Couldn't open file !");
 }
 
@@ -102,13 +102,13 @@ void Shell::slotFileEdit()
   if ( !m_editorpart )
     embedEditor();
   // TODO use KFileDialog to allow testing remote files
-  if ( ! m_editorpart->openURL( TQDir::current().absPath()+"/kpartstest_shell.rc" ) )
+  if ( ! m_editorpart->openURL( TQDir::current().absPath()+"/tdepartstest_shell.rc" ) )
     KMessageBox::error(this,"Couldn't open file !");
 }
 
 int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "kpartstest" ); // we cheat and call ourselves kpartstest for Shell::slotFileOpen()
+  TDEApplication app( argc, argv, "tdepartstest" ); // we cheat and call ourselves tdepartstest for Shell::slotFileOpen()
 
   Shell *shell = new Shell;
 
diff --git a/kparts/tests/normalktm.h b/tdeparts/tests/normalktm.h
index e8b1e12ef..f60d490a6 100644
--- a/kparts/tests/normalktm.h
+++ b/tdeparts/tests/normalktm.h
@@ -2,13 +2,13 @@
 #ifndef __normalktm_h__
 #define __normalktm_h__
 
-#include <kparts/part.h>
-#include <kmainwindow.h>
+#include <tdeparts/part.h>
+#include <tdemainwindow.h>
 
-class KAction;
+class TDEAction;
 class TQWidget;
 
-class Shell : public KMainWindow
+class Shell : public TDEMainWindow
 {
   Q_OBJECT
 public:
@@ -26,8 +26,8 @@ protected:
 
 private:
 
-  KAction * m_paEditFile;
-  KAction * m_paCloseEditor;
+  TDEAction * m_paEditFile;
+  TDEAction * m_paCloseEditor;
 
   KParts::ReadOnlyPart *m_part1;
   KParts::Part *m_part2;
diff --git a/kparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp
index e0857a51e..ad81b91b3 100644
--- a/kparts/tests/notepad.cpp
+++ b/tdeparts/tests/notepad.cpp
@@ -1,18 +1,18 @@
 
 #include "notepad.h"
-#include <kparts/partmanager.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/mainwindow.h>
 
 #include <tqsplitter.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqmultilineedit.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <klocale.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 
@@ -26,7 +26,7 @@ NotepadPart::NotepadPart( TQWidget* parentWidget, const char*,
   m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" );
   setWidget( m_edit );
 
-  (void)new KAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" );
+  (void)new TDEAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" );
   setXMLFile( "notepadpart.rc" );
   setReadWrite( true );
 }
@@ -46,9 +46,9 @@ void NotepadPart::setReadWrite( bool rw )
     ReadWritePart::setReadWrite( rw );
 }
 
-KAboutData* NotepadPart::createAboutData()
+TDEAboutData* NotepadPart::createAboutData()
 {
-  return new KAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
+  return new TDEAboutData( "notepadpart", I18N_NOOP( "Notepad" ), "2.0" );
 }
 
 bool NotepadPart::openFile()
diff --git a/kparts/tests/notepad.desktop b/tdeparts/tests/notepad.desktop
index a529d69a1..a529d69a1 100644
--- a/kparts/tests/notepad.desktop
+++ b/tdeparts/tests/notepad.desktop
diff --git a/kparts/tests/notepad.h b/tdeparts/tests/notepad.h
index d192d42ec..bd502599b 100644
--- a/kparts/tests/notepad.h
+++ b/tdeparts/tests/notepad.h
@@ -2,10 +2,10 @@
 #ifndef __notepad_h__
 #define __notepad_h__
 
-#include <kparts/genericfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/part.h>
 
-class KAboutData;
+class TDEAboutData;
 class TQMultiLineEdit;
 
 /**
@@ -24,7 +24,7 @@ public:
 
   virtual void setReadWrite( bool rw );
 
-  static KAboutData* createAboutData();
+  static TDEAboutData* createAboutData();
 
 protected:
   virtual bool openFile();
diff --git a/kparts/tests/notepadpart.cpp b/tdeparts/tests/notepadpart.cpp
index 072503fd1..072503fd1 100644
--- a/kparts/tests/notepadpart.cpp
+++ b/tdeparts/tests/notepadpart.cpp
diff --git a/kparts/tests/notepadpart.rc b/tdeparts/tests/notepadpart.rc
index ba30eb322..ba30eb322 100644
--- a/kparts/tests/notepadpart.rc
+++ b/tdeparts/tests/notepadpart.rc
diff --git a/kparts/tests/parts.cpp b/tdeparts/tests/parts.cpp
index d932a168f..ebfd9c9f1 100644
--- a/kparts/tests/parts.cpp
+++ b/tdeparts/tests/parts.cpp
@@ -1,5 +1,5 @@
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include "parts.h"
 
@@ -12,22 +12,22 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <kaction.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
 
 Part1::Part1( TQObject *parent, TQWidget * parentWidget )
  : KParts::ReadOnlyPart( parent, "Part1" )
 {
-  m_instance = new KInstance( "kpartstestpart" );
+  m_instance = new TDEInstance( "tdepartstestpart" );
   setInstance( m_instance );
   m_edit = new TQMultiLineEdit( parentWidget );
   setWidget( m_edit );
-  setXMLFile( "kpartstest_part1.rc" );
+  setXMLFile( "tdepartstest_part1.rc" );
 
-  /*KAction * paBlah = */ new KAction( "Blah", "filemail", 0, actionCollection(), "p1_blah" );
+  /*TDEAction * paBlah = */ new TDEAction( "Blah", "filemail", 0, actionCollection(), "p1_blah" );
 }
 
 Part1::~Part1()
@@ -59,7 +59,7 @@ bool Part1::openFile()
 Part2::Part2( TQObject *parent, TQWidget * parentWidget )
  : KParts::Part( parent, "Part2" )
 {
-  m_instance = new KInstance( "part2" );
+  m_instance = new TDEInstance( "part2" );
   setInstance( m_instance );
   TQWidget * w = new TQWidget( parentWidget, "Part2Widget" );
   setWidget( w );
diff --git a/kparts/tests/parts.h b/tdeparts/tests/parts.h
index 6f373a85c..37af4911e 100644
--- a/kparts/tests/parts.h
+++ b/tdeparts/tests/parts.h
@@ -2,7 +2,7 @@
 #ifndef __parts_h__
 #define __parts_h__
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQMultiLineEdit;
 namespace KParts {
@@ -21,7 +21,7 @@ protected:
 
 protected:
   TQMultiLineEdit * m_edit;
-  KInstance *m_instance;
+  TDEInstance *m_instance;
 };
 
 class Part2 : public KParts::Part
@@ -37,7 +37,7 @@ protected:
   // (i.e. in a part manager)
   // There is a default impl for ReadOnlyPart...
   virtual void guiActivateEvent( KParts::GUIActivateEvent * );
-  KInstance *m_instance;
+  TDEInstance *m_instance;
 };
 
 #endif
diff --git a/kparts/tests/plugin_foobar.rc b/tdeparts/tests/plugin_foobar.rc
index e614e505f..e614e505f 100644
--- a/kparts/tests/plugin_foobar.rc
+++ b/tdeparts/tests/plugin_foobar.rc
diff --git a/kparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp
index 5521bf22f..d7cf06eac 100644
--- a/kparts/tests/plugin_spellcheck.cpp
+++ b/tdeparts/tests/plugin_spellcheck.cpp
@@ -1,17 +1,17 @@
 #include "notepad.h" // this plugin applies to a notepad part
 #include <tqmultilineedit.h>
 #include "plugin_spellcheck.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name, 
                                     const TQStringList& )
     : Plugin( parent, name )
 {
-    (void) new KAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()),
+    (void) new TDEAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()),
                         actionCollection(), "spellcheck" );
 }
 
diff --git a/kparts/tests/plugin_spellcheck.h b/tdeparts/tests/plugin_spellcheck.h
index 56f0e657a..d27966c0c 100644
--- a/kparts/tests/plugin_spellcheck.h
+++ b/tdeparts/tests/plugin_spellcheck.h
@@ -1,7 +1,7 @@
 #ifndef __plugin_spellcheck_h
 #define __plugin_spellcheck_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class PluginSpellCheck : public KParts::Plugin
 {
diff --git a/kparts/tests/plugin_spellcheck.rc b/tdeparts/tests/plugin_spellcheck.rc
index 1980186cf..1980186cf 100644
--- a/kparts/tests/plugin_spellcheck.rc
+++ b/tdeparts/tests/plugin_spellcheck.rc
diff --git a/kparts/tests/kpartstest_part1.rc b/tdeparts/tests/tdepartstest_part1.rc
index 9f4a75687..9f4a75687 100644
--- a/kparts/tests/kpartstest_part1.rc
+++ b/tdeparts/tests/tdepartstest_part1.rc
diff --git a/kparts/tests/kpartstest_shell.rc b/tdeparts/tests/tdepartstest_shell.rc
index 52790f9b6..52790f9b6 100644
--- a/kparts/tests/kpartstest_shell.rc
+++ b/tdeparts/tests/tdepartstest_shell.rc
diff --git a/tdeprint/CMakeLists.txt b/tdeprint/CMakeLists.txt
index a7a97809f..724b0a0cb 100644
--- a/tdeprint/CMakeLists.txt
+++ b/tdeprint/CMakeLists.txt
@@ -32,9 +32,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
   ${CMAKE_SOURCE_DIR}/kded
 )
 
@@ -84,7 +84,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared tdeinit_kded-shared
+  LINK tdeio-shared tdeinit_kded-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
@@ -104,7 +104,7 @@ set( ${target}_SRCS
   kpgeneralpage.cpp kpqtpage.cpp kmthreadjob.cpp
   kpipeprocess.cpp kpfilterpage.cpp kmspecialmanager.cpp
   tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp
-  kfilelist.cpp kprintaction.cpp kpfileselectpage.cpp
+  tdefilelist.cpp kprintaction.cpp kpfileselectpage.cpp
   treecombobox.cpp kxmlcommand.cpp util.cpp printerfilter.cpp
   marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp
   kpmarginpage.cpp messagewindow.cpp posterpreview.cpp
@@ -116,7 +116,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
-  LINK kio-shared
+  LINK tdeio-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdeprint/ChangeLog b/tdeprint/ChangeLog
index 5ce11bd36..86f8bbf16 100644
--- a/tdeprint/ChangeLog
+++ b/tdeprint/ChangeLog
@@ -59,7 +59,7 @@ Since 2.2 release, Michael Goffioul <tdeprint@swing.be>
     printers (to not confuse the CUPS daemon for example)
   * Improved how the default printer is selected in print dialog to
     work in any cases
-  * General: make use of KLocale::pageSize() to determine the default
+  * General: make use of TDELocale::pageSize() to determine the default
     page size (used for example for pseudo printers and classes)
   * Wizard: fix buffer overflow when adding a remote LPD queue having
     a lot of jobs waiting
@@ -108,7 +108,7 @@ Since 2.2 release, Michael Goffioul <tdeprint@swing.be>
   * tdeprintfax: added possibility to view files being faxed and
     file action (remove and view) are enabled only when needed.
   * KPrinter: when printing to a file, support encoding and spaces
-    in file names + system --> KProcess.
+    in file names + system --> TDEProcess.
 
 07/11/2001 Michael Goffioul <tdeprint@swing.be>
   * tdeprint: fixed some problems:
@@ -389,7 +389,7 @@ Since 2.2 release, Michael Goffioul <tdeprint@swing.be>
     page ranges (problem with option encoding in CUPS).
 
 15/02/2002 Michael Goffioul <tdeprint@swing.be>
-  * general: fixed infinite recursion bug in KIconSelectAction
+  * general: fixed infinite recursion bug in TDEIconSelectAction
   * CUPS: temporarily disabled edition of page-ranges as it seems CUPS is
     buggy. I should find a workaround.
   * general (CUPS): enable some actions for jobs on remote hosts. It seems
diff --git a/tdeprint/Makefile.am b/tdeprint/Makefile.am
index b70e46e93..e3461ed84 100644
--- a/tdeprint/Makefile.am
+++ b/tdeprint/Makefile.am
@@ -23,14 +23,14 @@ libtdeprint_la_SOURCES = kmfactory.cpp kmjob.cpp kmjobmanager.cpp kmmanager.cpp
 		         kprintpreview.cpp kprintdialog.cpp kprinter.cpp kprinterimpl.cpp kprintdialogpage.cpp \
 			 kpcopiespage.cpp kpdriverpage.cpp kprinterpropertydialog.cpp kpgeneralpage.cpp kpqtpage.cpp \
 			 kmthreadjob.cpp kpipeprocess.cpp kpfilterpage.cpp \
-			 kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp kfilelist.cpp \
+			 kmspecialmanager.cpp tdeprintcheck.cpp plugincombobox.cpp kpreloadobject.cpp tdefilelist.cpp \
 			 kprintaction.cpp kpfileselectpage.cpp treecombobox.cpp kmfactory.skel kxmlcommand.cpp \
 			 util.cpp printerfilter.cpp marginpreview.cpp marginvaluewidget.cpp marginwidget.cpp \
 			 kpmarginpage.cpp messagewindow.cpp posterpreview.cpp kpposterpage.cpp foomatic2loader.cpp \
 			 fooparser.cpp fooscanner.cpp ppdparser.cpp ppdscanner.cpp ppdloader.cpp
 
 libtdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
+libtdeprint_la_LIBADD = $(LIBZ) $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEFILE)
 libtdeprint_la_DEPENDENCIES =  $(LIB_KPARTS) 
 libtdeprint_la_METASOURCES = AUTO
 
@@ -40,7 +40,7 @@ noinst_HEADERS = kmdbentry.h kmfactory.h \
 		 kpcopiespage.h kpdriverpage.h kprinterpropertydialog.h kpgeneralpage.h \
 		 kpqtpage.h kprintprocess.h kmthreadjob.h kpipeprocess.h tdeprintd.h \
 		 kpfilterpage.h kmspecialmanager.h tdeprintcheck.h plugincombobox.h \
-		 kfilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \
+		 tdefilelist.h kpfileselectpage.h treecombobox.h kxmlcommand.h \
 		 util.h driverparse.h printerfilter.h marginpreview.h marginwidget.h \
 		 marginvaluewidget.h kpmarginpage.h messagewindow.h \
 		 posterpreview.h kpposterpage.h foomatic2loader.h ppdloader.h
@@ -104,7 +104,7 @@ noinst_LIBRARIES = libdriverparse.a
 libdriverparse_a_SOURCES = driverparse.c
 
 update_DATA = tdeprintrc.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp
diff --git a/tdeprint/cups/CMakeLists.txt b/tdeprint/cups/CMakeLists.txt
index 62c48618c..aa882ca7e 100644
--- a/tdeprint/cups/CMakeLists.txt
+++ b/tdeprint/cups/CMakeLists.txt
@@ -26,9 +26,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore/network
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
   ${CMAKE_SOURCE_DIR}/tdeprint
   ${CMAKE_SOURCE_DIR}/tdeprint/management
 )
diff --git a/tdeprint/cups/Makefile.am b/tdeprint/cups/Makefile.am
index 64e8b997d..cdbb0b92c 100644
--- a/tdeprint/cups/Makefile.am
+++ b/tdeprint/cups/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
 SUBDIRS = cupsdconf2
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management -I$(top_srcdir)/tdecore/network $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile -I$(top_srcdir)/tdeprint -I$(top_srcdir)/tdeprint/management -I$(top_srcdir)/tdecore/network $(all_includes)
 
 kde_module_LTLIBRARIES = tdeprint_cups.la
 
diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp
index f0cb1c359..256f5ee23 100644
--- a/tdeprint/cups/cupsaddsmb2.cpp
+++ b/tdeprint/cups/cupsaddsmb2.cpp
@@ -26,11 +26,11 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqmessagebox.h>
 #include <tqfile.h>
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 #include <kdebug.h>
 #include <kseparator.h>
 #include <kactivelabel.h>
@@ -47,9 +47,9 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
 	m_state = None;
 	m_status = false;
 	m_actionindex = 0;
-	connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
+	connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int)));
+	connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int)));
+	connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
 
 	m_side = new SidePixmap(this);
 	m_doit = new TQPushButton(i18n("&Export"), this);
@@ -145,7 +145,7 @@ void CupsAddSmb::slotActionClicked()
 		m_proc.kill();
 }
 
-void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen)
+void CupsAddSmb::slotReceived(TDEProcess*, char *buf, int buflen)
 {
 	TQString	line;
 	int		index(0);
@@ -309,7 +309,7 @@ void CupsAddSmb::doNextAction()
 	}
 }
 
-void CupsAddSmb::slotProcessExited(KProcess*)
+void CupsAddSmb::slotProcessExited(TDEProcess*)
 {
 	kdDebug(500) << "PROCESS EXITED (" << m_state << ")" << endl;
 	if (m_proc.normalExit() && m_state != Start && m_status)
@@ -470,7 +470,7 @@ bool CupsAddSmb::startProcess()
 	m_actionindex = 0;
 	m_buffer.clear();
 	kdDebug(500) << "PROCESS STARTED = " << m_proc.args()[0] << endl;
-	return m_proc.start(KProcess::NotifyOnExit, KProcess::All);
+	return m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::All);
 }
 
 #include "cupsaddsmb2.moc"
diff --git a/tdeprint/cups/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h
index 84166f53c..9aeccdd4a 100644
--- a/tdeprint/cups/cupsaddsmb2.h
+++ b/tdeprint/cups/cupsaddsmb2.h
@@ -44,9 +44,9 @@ public:
 	static bool exportDest(const TQString& dest, const TQString& datadir);
 
 protected slots:
-	void slotReceived(KProcess*, char*, int);
+	void slotReceived(TDEProcess*, char*, int);
 	void doNextAction();
-	void slotProcessExited(KProcess*);
+	void slotProcessExited(TDEProcess*);
 	void slotActionClicked();
 
 protected:
@@ -58,7 +58,7 @@ protected:
 	void showError(const TQString& msg);
 
 private:
-	KProcess	m_proc;
+	TDEProcess	m_proc;
 	TQStringList	m_buffer;
 	int			m_state;
 	TQStringList	m_actions;
diff --git a/tdeprint/cups/cupsdconf2/CMakeLists.txt b/tdeprint/cups/cupsdconf2/CMakeLists.txt
index ceee1bc47..749d84182 100644
--- a/tdeprint/cups/cupsdconf2/CMakeLists.txt
+++ b/tdeprint/cups/cupsdconf2/CMakeLists.txt
@@ -17,9 +17,9 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 link_directories(
@@ -50,5 +50,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared ${CUPS_LIBRARIES}
+  LINK tdeio-shared ${CUPS_LIBRARIES}
 )
diff --git a/tdeprint/cups/cupsdconf2/Makefile.am b/tdeprint/cups/cupsdconf2/Makefile.am
index eb7e42159..b0c111bf8 100644
--- a/tdeprint/cups/cupsdconf2/Makefile.am
+++ b/tdeprint/cups/cupsdconf2/Makefile.am
@@ -1,6 +1,6 @@
 #$Id$
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile $(all_includes)
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
diff --git a/tdeprint/cups/cupsdconf2/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp
index fab6a6fba..83b4d0813 100644
--- a/tdeprint/cups/cupsdconf2/addressdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 AddressDialog::AddressDialog(TQWidget *parent, const char *name)
 	: KDialogBase(Swallow, i18n("ACL Address"), Ok|Cancel, Ok, parent, name, true, true)
diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp
index b337eb883..3268c72bc 100644
--- a/tdeprint/cups/cupsdconf2/browsedialog.cpp
+++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp
@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 BrowseDialog::BrowseDialog(TQWidget *parent, const char *name)
 	: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
index 4b056cdb0..e66048b73 100644
--- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
@@ -28,7 +28,7 @@
 #include <tqcombobox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
index d17c8bd0c..8a788cad3 100644
--- a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
@@ -21,7 +21,7 @@
 
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 TQString Comment::comment()
diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
index 971da38ff..2c5610411 100644
--- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -22,9 +22,9 @@
 
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <stdlib.h>
 #include <cups/cups.h>
@@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line)
 
 bool CupsdConf::loadAvailableResources()
 {
-	KConfig	conf("tdeprintrc");
+	TDEConfig	conf("tdeprintrc");
 	conf.setGroup("CUPS");
 	TQString	host = conf.readEntry("Host",cupsServer());
 	int 	port = conf.readNumEntry("Port",ippPort());
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index bc91f9ffe..22a3b2d54 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -33,15 +33,15 @@
 
 #include <tqdir.h>
 #include <tqvbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tqstringlist.h>
 #include <tqwhatsthis.h>
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 #include <kguiitem.h>
 #include <kprocess.h>
 
@@ -95,7 +95,7 @@ const char* getPassword(const char*)
 	TQString	user(cupsUser());
 	TQString	pass;
 
-	if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted)
+	if (TDEIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted)
 	{
 		cupsSetUser(user.latin1());
 		pass_string = pass;
@@ -113,8 +113,8 @@ const char* getPassword(const char*)
 CupsdDialog::CupsdDialog(TQWidget *parent, const char *name)
 	: KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help"))
 {
-	KGlobal::iconLoader()->addAppDir("tdeprint");
-	KGlobal::locale()->insertCatalogue("cupsdconf");
+	TDEGlobal::iconLoader()->addAppDir("tdeprint");
+	TDEGlobal::locale()->insertCatalogue("cupsdconf");
 
 	setShowIconsInTreeList(true);
 	setRootIsDecorated(false);
@@ -136,10 +136,10 @@ CupsdDialog::~CupsdDialog()
 
 void CupsdDialog::addConfPage(CupsdPage *page)
 {
-	TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon(
+	TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon(
 	                                                           page->pixmap(),
-                                                                   KIcon::NoGroup,
-                                                                   KIcon::SizeMedium
+                                                                   TDEIcon::NoGroup,
+                                                                   TDEIcon::SizeMedium
 	                                                          );
 
 	TQVBox	*box = addVBoxPage(page->pageLabel(), page->header(), icon);
@@ -207,9 +207,9 @@ bool CupsdDialog::restartServer(TQString& msg)
 	else
 	{
                 bool success = false;
-		KProcess proc;
+		TDEProcess proc;
 		proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart";
-		success = proc.start( KProcess::Block ) && proc.normalExit();
+		success = proc.start( TDEProcess::Block ) && proc.normalExit();
                 if( !success )    
 			msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid);
 	}
@@ -256,7 +256,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString
 	}
 	else
 	{
-		KGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help"
+		TDEGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help"
 		CupsdDialog	dlg(parent);
 		if (dlg.setConfigFile(fn) && dlg.exec())
 		{
diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
index 268465a76..282657255 100644
--- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
index 79c8a9401..e9cb1a0ad 100644
--- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
@@ -27,7 +27,7 @@
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
index f12f82f1e..49fdecc7c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
index 61a89f933..22128b39c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
@@ -27,8 +27,8 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdelocale.h>
+#include <tdefiledialog.h>
 
 CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
index 9edca5868..e939c151f 100644
--- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
index d11851c60..6d6061264 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
@@ -28,9 +28,9 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index cfd731430..e89356af9 100644
--- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 int findComboItem(TQComboBox *cb, const TQString& str)
 {
diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
index a058299f0..c28329e67 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index 754c9659e..936dee212 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -19,17 +19,17 @@
 
 #include "editlist.h"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 
 EditList::EditList(TQWidget *parent, const char *name)
 	: TQWidget(parent, name)
 {
-	list_ = new KListBox(this);
+	list_ = new TDEListBox(this);
 	addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "filenew"), this);
 	editbtn_ = new KPushButton(KGuiItem(i18n("Edit..."), "edit"), this);
 	delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "editdelete"), this);
diff --git a/tdeprint/cups/cupsdconf2/editlist.h b/tdeprint/cups/cupsdconf2/editlist.h
index a0fc7ee0a..19a2da8c8 100644
--- a/tdeprint/cups/cupsdconf2/editlist.h
+++ b/tdeprint/cups/cupsdconf2/editlist.h
@@ -23,7 +23,7 @@
 #include <tqwidget.h>
 #include <tqpixmap.h>
 
-class KListBox;
+class TDEListBox;
 class TQPushButton;
 
 class EditList : public TQWidget
@@ -53,7 +53,7 @@ protected slots:
 	void slotSelected(int);
 
 private:
-	KListBox	*list_;
+	TDEListBox	*list_;
 	TQPushButton	*addbtn_, *editbtn_, *delbtn_, *defbtn_;
 };
 
diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp
index 3896f7845..0754ae573 100644
--- a/tdeprint/cups/cupsdconf2/locationdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 LocationDialog::LocationDialog(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp
index f3c317afd..78b0e1edf 100644
--- a/tdeprint/cups/cupsdconf2/main.cpp
+++ b/tdeprint/cups/cupsdconf2/main.cpp
@@ -20,24 +20,24 @@
 #include "cupsddialog.h"
 
 #include <tqfile.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
 	{ "+[file]", I18N_NOOP("Configuration file to load"), 0},
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-	KCmdLineArgs::init(argc,argv,"cupsdconf",
+	TDECmdLineArgs::init(argc,argv,"cupsdconf",
 			   I18N_NOOP("A CUPS configuration tool"),
 			   I18N_NOOP("A CUPS configuration tool"),"0.0.1");
-	KCmdLineArgs::addCmdLineOptions(options);
-	KApplication	app;
-	KCmdLineArgs	*args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs::addCmdLineOptions(options);
+	TDEApplication	app;
+	TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 
 	KURL	configfile;
 	if (args->count() > 0)
diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp
index 18cade9fc..f758d5d1e 100644
--- a/tdeprint/cups/cupsdconf2/portdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/portdialog.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 PortDialog::PortDialog(TQWidget *parent, const char *name)
 	: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
index 7cf0ea74e..25c984ec4 100644
--- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
@@ -22,7 +22,7 @@
 #include <tqlineedit.h>
 #include <tqlayout.h>
 #include <kpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index b1bd96ee6..0992e2935 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -22,15 +22,15 @@
 #include <tqlayout.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
-#include <klistview.h>
-#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
 : TQWidget(parent, name)
 {
-	m_view = new KListView(this);
+	m_view = new TDEListView(this);
 	m_view->header()->hide();
 	m_view->addColumn("");
 	m_view->setFullWidth(true);
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
index c3765362e..a55f3355e 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQPushButton;
 
@@ -46,7 +46,7 @@ private slots:
 	void slotSelected(TQListViewItem*);
 
 private:
-	KListView	*m_view;
+	TDEListView	*m_view;
 	TQPushButton	*m_add, *m_remove;
 };
 
diff --git a/tdeprint/cups/cupsdconf2/sizewidget.cpp b/tdeprint/cups/cupsdconf2/sizewidget.cpp
index 742702e48..eaa39152f 100644
--- a/tdeprint/cups/cupsdconf2/sizewidget.cpp
+++ b/tdeprint/cups/cupsdconf2/sizewidget.cpp
@@ -23,7 +23,7 @@
 #include <tqspinbox.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SizeWidget::SizeWidget( TQWidget *parent, const char *name )
 	: TQWidget( parent, name )
diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp
index 2f7031503..f6d392bd9 100644
--- a/tdeprint/cups/cupsinfos.cpp
+++ b/tdeprint/cups/cupsinfos.cpp
@@ -22,11 +22,11 @@
 #include "kmtimer.h"
 #include "messagewindow.h"
 
-#include <kio/passdlg.h>
-#include <kio/authinfo.h>
-#include <klocale.h>
-#include <kconfig.h>
-#include <kapplication.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/authinfo.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kstringhandler.h>
@@ -117,7 +117,7 @@ const char* CupsInfos::getPasswordCB()
 
 void CupsInfos::load()
 {
-	KConfig	*conf_ = KMFactory::self()->printConfig();
+	TDEConfig	*conf_ = KMFactory::self()->printConfig();
 	conf_->setGroup("CUPS");
 	host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer()));
 	port_ = conf_->readNumEntry("Port",ippPort());
@@ -141,7 +141,7 @@ void CupsInfos::load()
 
 void CupsInfos::save()
 {
-	KConfig	*conf_ = KMFactory::self()->printConfig();
+	TDEConfig	*conf_ = KMFactory::self()->printConfig();
 	conf_->setGroup("CUPS");
 	conf_->writeEntry("Host",host_);
 	conf_->writeEntry("Port",port_);
diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp
index 1e07789ac..ed56804bc 100644
--- a/tdeprint/cups/ippreportdlg.cpp
+++ b/tdeprint/cups/ippreportdlg.cpp
@@ -21,9 +21,9 @@
 #include "ipprequest.h"
 #include "kprinter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <ktextedit.h>
 #include <tqsimplerichtext.h>
diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp
index 0fde06159..ebbefefe9 100644
--- a/tdeprint/cups/ipprequest.cpp
+++ b/tdeprint/cups/ipprequest.cpp
@@ -24,8 +24,8 @@
 #include <string>
 #include <cups/language.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
 #include <cups/cups.h>
@@ -208,8 +208,8 @@ void IppRequest::init()
 		request_ = 0;
 	}
 	request_ = ippNew();
-	//kdDebug(500) << "tdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl;
-        TQCString langstr = KGlobal::locale()->language().latin1();
+	//kdDebug(500) << "tdeprint: IPP request, lang=" << TDEGlobal::locale()->language() << endl;
+        TQCString langstr = TDEGlobal::locale()->language().latin1();
 	cups_lang_t*	lang = cupsLangGet(langstr.data());
 	// default charset to UTF-8 (ugly hack)
 	lang->encoding = CUPS_UTF8;
diff --git a/tdeprint/cups/kcupsprinterimpl.cpp b/tdeprint/cups/kcupsprinterimpl.cpp
index 5c2de105b..5c2245e8d 100644
--- a/tdeprint/cups/kcupsprinterimpl.cpp
+++ b/tdeprint/cups/kcupsprinterimpl.cpp
@@ -155,5 +155,5 @@ static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd
 		}
 	}
 	if (!optstr.isEmpty())
-		cmd.append(" -o ").append( KProcess::quote( optstr ) );
+		cmd.append(" -o ").append( TDEProcess::quote( optstr ) );
 }
diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp
index 7e03dae01..6bc9ec155 100644
--- a/tdeprint/cups/kmconfigcups.cpp
+++ b/tdeprint/cups/kmconfigcups.cpp
@@ -20,8 +20,8 @@
 #include "kmconfigcups.h"
 #include "kmcupsconfigwidget.h"
 
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 #include <tqlayout.h>
@@ -40,12 +40,12 @@ KMConfigCups::KMConfigCups(TQWidget *parent)
 	lay0->addStretch(1);
 }
 
-void KMConfigCups::loadConfig(KConfig *)
+void KMConfigCups::loadConfig(TDEConfig *)
 {
 	m_widget->load();
 }
 
-void KMConfigCups::saveConfig(KConfig *conf)
+void KMConfigCups::saveConfig(TDEConfig *conf)
 {
 	m_widget->saveConfig(conf);
 }
diff --git a/tdeprint/cups/kmconfigcups.h b/tdeprint/cups/kmconfigcups.h
index c0f1ab2ba..5d7032403 100644
--- a/tdeprint/cups/kmconfigcups.h
+++ b/tdeprint/cups/kmconfigcups.h
@@ -29,8 +29,8 @@ class KMConfigCups : public KMConfigPage
 public:
 	KMConfigCups(TQWidget *parent = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	KMCupsConfigWidget	*m_widget;
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index fbec34f2a..10a455226 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -21,9 +21,9 @@
 
 #include <tqcheckbox.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 #include <kcursor.h>
@@ -52,7 +52,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
 	m_stddir->setChecked(true);
 }
 
-void KMConfigCupsDir::loadConfig(KConfig *conf)
+void KMConfigCupsDir::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("CUPS");
 	QString	dir = conf->readPathEntry("InstallDir");
@@ -60,7 +60,7 @@ void KMConfigCupsDir::loadConfig(KConfig *conf)
 	m_installdir->setURL(dir);
 }
 
-void KMConfigCupsDir::saveConfig(KConfig *conf)
+void KMConfigCupsDir::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("CUPS");
 	conf->writePathEntry("InstallDir",(m_stddir->isChecked() ? TQString::null : m_installdir->url()));
diff --git a/tdeprint/cups/kmconfigcupsdir.h b/tdeprint/cups/kmconfigcupsdir.h
index 352388c99..6affa62b0 100644
--- a/tdeprint/cups/kmconfigcupsdir.h
+++ b/tdeprint/cups/kmconfigcupsdir.h
@@ -30,8 +30,8 @@ class KMConfigCupsDir : public KMConfigPage
 public:
 	KMConfigCupsDir(TQWidget *parent = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	KURLRequester		*m_installdir;
diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp
index ca2f4aedb..f93c1a4b3 100644
--- a/tdeprint/cups/kmcupsconfigwidget.cpp
+++ b/tdeprint/cups/kmcupsconfigwidget.cpp
@@ -28,9 +28,9 @@
 #include <tqpushbutton.h>
 #include <tqvalidator.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 
 class PortValidator : public TQIntValidator
@@ -143,7 +143,7 @@ void KMCupsConfigWidget::save(bool sync)
 	if (sync) inf->save();
 }
 
-void KMCupsConfigWidget::saveConfig(KConfig *conf)
+void KMCupsConfigWidget::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("CUPS");
 	conf->writeEntry("Host",m_host->text());
diff --git a/tdeprint/cups/kmcupsconfigwidget.h b/tdeprint/cups/kmcupsconfigwidget.h
index 7eee42d80..b8e253ba8 100644
--- a/tdeprint/cups/kmcupsconfigwidget.h
+++ b/tdeprint/cups/kmcupsconfigwidget.h
@@ -24,7 +24,7 @@
 
 class TQLineEdit;
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 
 class KMCupsConfigWidget : public TQWidget
 {
@@ -33,7 +33,7 @@ public:
 
 	void load();
 	void save(bool sync = true);
-	void saveConfig(KConfig*);
+	void saveConfig(TDEConfig*);
 
 protected:
 	TQLineEdit	*m_host, *m_port, *m_login, *m_password;
diff --git a/tdeprint/cups/kmcupsfactory.cpp b/tdeprint/cups/kmcupsfactory.cpp
index 47384eab6..f42bc449e 100644
--- a/tdeprint/cups/kmcupsfactory.cpp
+++ b/tdeprint/cups/kmcupsfactory.cpp
@@ -22,7 +22,7 @@
 #include "kmcupsuimanager.h"
 #include "kcupsprinterimpl.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
 
 typedef K_TYPELIST_4( KMCupsManager, KMCupsJobManager, KMCupsUiManager, KCupsPrinterImpl ) Products;
diff --git a/tdeprint/cups/kmcupsjobmanager.cpp b/tdeprint/cups/kmcupsjobmanager.cpp
index 0b31489cc..fa208e551 100644
--- a/tdeprint/cups/kmcupsjobmanager.cpp
+++ b/tdeprint/cups/kmcupsjobmanager.cpp
@@ -32,7 +32,7 @@
 #include "kpcopiespage.h"
 #include "kptagspage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 
@@ -352,10 +352,10 @@ bool KMCupsJobManager::jobIppReport(KMJob *j)
 	return result;
 }
 
-TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *coll)
+TQValueList<TDEAction*> KMCupsJobManager::createPluginActions(TDEActionCollection *coll)
 {
-	TQValueList<KAction*>	list;
-	KAction	*act(0);
+	TQValueList<TDEAction*>	list;
+	TDEAction	*act(0);
 
 	list <<  (act = new PluginAction(0, i18n("&Job IPP Report"), "tdeprint_report", 0, coll, "plugin_ipp"));
 	act->setGroup("plugin");
@@ -369,7 +369,7 @@ TQValueList<KAction*> KMCupsJobManager::createPluginActions(KActionCollection *c
 	return list;
 }
 
-void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const TQPtrList<KMJob>& joblist)
+void KMCupsJobManager::validatePluginActions(TDEActionCollection *coll, const TQPtrList<KMJob>& joblist)
 {
 	TQPtrListIterator<KMJob>	it(joblist);
 	bool	flag(true);
@@ -380,7 +380,7 @@ void KMCupsJobManager::validatePluginActions(KActionCollection *coll, const TQPt
 			/*&& !it.current()->isRemote()*/);
 	}
 	flag = (flag && joblist.count() > 0);
-	KAction *a;
+	TDEAction *a;
 	if ( ( a = coll->action( "plugin_ipp" ) ) )
 		a->setEnabled( joblist.count() == 1 );
 	if ( ( a = coll->action( "plugin_prioup" ) ) )
diff --git a/tdeprint/cups/kmcupsjobmanager.h b/tdeprint/cups/kmcupsjobmanager.h
index 7e8a75a53..0635dd8ea 100644
--- a/tdeprint/cups/kmcupsjobmanager.h
+++ b/tdeprint/cups/kmcupsjobmanager.h
@@ -35,8 +35,8 @@ public:
 	virtual ~KMCupsJobManager();
 
 	int actions();
-	TQValueList<KAction*> createPluginActions(KActionCollection*);
-	void validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&);
+	TQValueList<TDEAction*> createPluginActions(TDEActionCollection*);
+	void validatePluginActions(TDEActionCollection*, const TQPtrList<KMJob>&);
 	bool doPluginAction(int, const TQPtrList<KMJob>&);
 
 protected:
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 66acb8daf..eaf5070b8 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -41,14 +41,14 @@
 #include <tqdatetime.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdesocketbase.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
-#include <kaction.h>
+#include <tdemessagebox.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kextendedsocket.h>
 #include <kprocess.h>
@@ -111,7 +111,7 @@ TQString KMCupsManager::driverDirectory()
 
 TQString KMCupsManager::cupsInstallDir()
 {
-	KConfig	*conf=  KMFactory::self()->printConfig();
+	TDEConfig	*conf=  KMFactory::self()->printConfig();
 	conf->setGroup("CUPS");
 	TQString	dir = conf->readPathEntry("InstallDir");
 	return dir;
@@ -628,7 +628,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
 	TQStringList	comps = TQStringList::split('/', drname, false);
 	TQString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-	TQString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
+	TQString	exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
 		setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
@@ -638,11 +638,11 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
 
 	KPipeProcess	in;
 	TQFile		out(tmpFile);
-	TQString cmd = KProcess::quote(exe);
+	TQString cmd = TDEProcess::quote(exe);
 	cmd += " -t cups -d ";
-	cmd += KProcess::quote(comps[2]);
+	cmd += TDEProcess::quote(comps[2]);
 	cmd += " -p ";
-	cmd += KProcess::quote(comps[1]);
+	cmd += TDEProcess::quote(comps[1]);
 	if (in.open(cmd) && out.open(IO_WriteOnly))
 	{
 		TQTextStream	tin(&in), tout(&out);
@@ -915,15 +915,15 @@ TQStringList KMCupsManager::detectLocalPrinters()
 	return list;
 }
 
-void KMCupsManager::createPluginActions(KActionCollection *coll)
+void KMCupsManager::createPluginActions(TDEActionCollection *coll)
 {
-	KAction	*act = new KAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver");
+	TDEAction	*act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver");
 	act->setGroup("plugin");
-	act = new KAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
+	act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
 	act->setGroup("plugin");
 }
 
-void KMCupsManager::validatePluginActions(KActionCollection *coll, KMPrinter *pr)
+void KMCupsManager::validatePluginActions(TDEActionCollection *coll, KMPrinter *pr)
 {
 	// save selected printer for future use in slots
 	m_currentprinter = pr;
@@ -992,7 +992,7 @@ void KMCupsManager::checkUpdatePossibleInternal()
 {
 	kdDebug(500) << "Checking for update possible" << endl;
 	delete m_socket;
-        m_socket = new KNetwork::KBufferedSocket;
+        m_socket = new KNetwork::TDEBufferedSocket;
 	m_socket->setTimeout( 1500 );
 	connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), 
                 TQT_SLOT( slotConnectionSuccess() ) );
@@ -1055,14 +1055,14 @@ void KMCupsManager::slotConnectionFailed( int errcode )
     TQString einfo;
 
     switch (errcode) {
-    case KNetwork::KSocketBase::ConnectionRefused:
-    case KNetwork::KSocketBase::ConnectionTimedOut:
+    case KNetwork::TDESocketBase::ConnectionRefused:
+    case KNetwork::TDESocketBase::ConnectionTimedOut:
         einfo = i18n("connection refused") + TQString(" (%1)").arg(errcode);
         break;
-    case KNetwork::KSocketBase::LookupFailure:
+    case KNetwork::TDESocketBase::LookupFailure:
         einfo = i18n("host not found") + TQString(" (%1)").arg(errcode);
         break;
-    case KNetwork::KSocketBase::WouldBlock:
+    case KNetwork::TDESocketBase::WouldBlock:
     default:
         einfo = i18n("read failed (%1)").arg(errcode);
         break;
diff --git a/tdeprint/cups/kmcupsmanager.h b/tdeprint/cups/kmcupsmanager.h
index d574bb686..1e7c21b19 100644
--- a/tdeprint/cups/kmcupsmanager.h
+++ b/tdeprint/cups/kmcupsmanager.h
@@ -63,8 +63,8 @@ public:
 	bool configureServer(TQWidget *parent = 0);
 	TQStringList detectLocalPrinters();
 
-	void createPluginActions(KActionCollection*);
-	void validatePluginActions(KActionCollection*, KMPrinter*);
+	void createPluginActions(TDEActionCollection*);
+	void validatePluginActions(TDEActionCollection*, KMPrinter*);
 	TQString stateInformation();
 
 public slots:
diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp
index d0dfe3cdc..03b85bb0a 100644
--- a/tdeprint/cups/kmcupsuimanager.cpp
+++ b/tdeprint/cups/kmcupsuimanager.cpp
@@ -55,10 +55,10 @@
 
 #include <tqlistview.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kmessagebox.h>
+#include <tdeaction.h>
+#include <tdemessagebox.h>
 
 #include "config.h"
 
diff --git a/tdeprint/cups/kmpropbanners.cpp b/tdeprint/cups/kmpropbanners.cpp
index 22098cdff..602af7f6d 100644
--- a/tdeprint/cups/kmpropbanners.cpp
+++ b/tdeprint/cups/kmpropbanners.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropBanners::KMPropBanners(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/cups/kmpropquota.cpp b/tdeprint/cups/kmpropquota.cpp
index 9df6cbcb2..773e667e9 100644
--- a/tdeprint/cups/kmpropquota.cpp
+++ b/tdeprint/cups/kmpropquota.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // some forward declarations (see kmwquota.cpp)
 const char* unitKeyword(int);
diff --git a/tdeprint/cups/kmpropusers.cpp b/tdeprint/cups/kmpropusers.cpp
index 0f67205b0..2a2147aed 100644
--- a/tdeprint/cups/kmpropusers.cpp
+++ b/tdeprint/cups/kmpropusers.cpp
@@ -23,7 +23,7 @@
 
 #include <tqtextview.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropUsers::KMPropUsers(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/cups/kmwbanners.cpp b/tdeprint/cups/kmwbanners.cpp
index c221f69d7..86f1347fb 100644
--- a/tdeprint/cups/kmwbanners.cpp
+++ b/tdeprint/cups/kmwbanners.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQStringList defaultBanners()
 {
diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp
index 51ecbab73..15d4f8180 100644
--- a/tdeprint/cups/kmwfax.cpp
+++ b/tdeprint/cups/kmwfax.cpp
@@ -25,8 +25,8 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klistbox.h>
-#include <klocale.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurl.h>
 
@@ -41,7 +41,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name)
 
 	TQLabel	*lab = new TQLabel(this);
 	lab->setText(i18n("<p>Select the device which your serial Fax/Modem is connected to.</p>"));
-	m_list = new KListBox(this);
+	m_list = new TDEListBox(this);
 
 	TQVBoxLayout	*l1 = new TQVBoxLayout(this,0,10);
 	l1->addWidget(lab,0);
diff --git a/tdeprint/cups/kmwfax.h b/tdeprint/cups/kmwfax.h
index 1a822165e..50b2aec0c 100644
--- a/tdeprint/cups/kmwfax.h
+++ b/tdeprint/cups/kmwfax.h
@@ -22,7 +22,7 @@
 
 #include "kmwizardpage.h"
 
-class KListBox;
+class TDEListBox;
 
 class KMWFax : public KMWizardPage
 {
@@ -33,7 +33,7 @@ public:
 	void updatePrinter(KMPrinter*);
 
 private:
-	KListBox	*m_list;
+	TDEListBox	*m_list;
 };
 
 #endif
diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp
index cb9dedd6c..a8ec8d425 100644
--- a/tdeprint/cups/kmwipp.cpp
+++ b/tdeprint/cups/kmwipp.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqvalidator.h>
 
 #include <cups/http.h>
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index 044f9cb6d..f7a4f0593 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -24,17 +24,17 @@
 #include "kmcupsmanager.h"
 #include "networkscanner.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqheader.h>
 #include <kpushbutton.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtextview.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 #include <kurl.h>
@@ -46,7 +46,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
 	m_ID = KMWizard::Custom+1;
 	m_nextpage = KMWizard::Driver;
 
-	m_list = new KListView(this);
+	m_list = new TDEListView(this);
 	m_list->addColumn("");
 	m_list->header()->hide();
 	m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
diff --git a/tdeprint/cups/kmwippprinter.h b/tdeprint/cups/kmwippprinter.h
index 5d9d33f7a..f578afba9 100644
--- a/tdeprint/cups/kmwippprinter.h
+++ b/tdeprint/cups/kmwippprinter.h
@@ -22,7 +22,7 @@
 
 #include "kmwizardpage.h"
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQLineEdit;
 class TQTextView;
@@ -46,7 +46,7 @@ protected slots:
 	void slotIppReport();
 
 private:
-	KListView	*m_list;
+	TDEListView	*m_list;
 	NetworkScanner *m_scanner;
 	TQLineEdit	*m_uri;
 	TQTextView	*m_info;
diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp
index a10a14ba5..237d74fd1 100644
--- a/tdeprint/cups/kmwippselect.cpp
+++ b/tdeprint/cups/kmwippselect.cpp
@@ -23,9 +23,9 @@
 #include "cupsinfos.h"
 #include "ipprequest.h"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
@@ -38,7 +38,7 @@ KMWIppSelect::KMWIppSelect(TQWidget *parent, const char *name)
 	m_title = i18n("Remote IPP Printer Selection");
 	m_nextpage = KMWizard::Driver;
 
-	m_list = new KListBox(this);
+	m_list = new TDEListBox(this);
 
 	TQVBoxLayout	*lay = new TQVBoxLayout(this, 0, 0);
 	lay->addWidget(m_list);
diff --git a/tdeprint/cups/kmwippselect.h b/tdeprint/cups/kmwippselect.h
index 8d1711e8c..6b8d788e6 100644
--- a/tdeprint/cups/kmwippselect.h
+++ b/tdeprint/cups/kmwippselect.h
@@ -22,7 +22,7 @@
 
 #include "kmwizardpage.h"
 
-class KListBox;
+class TDEListBox;
 
 class KMWIppSelect : public KMWizardPage
 {
@@ -34,7 +34,7 @@ public:
 	void updatePrinter(KMPrinter*);
 
 private:
-	KListBox	*m_list;
+	TDEListBox	*m_list;
 };
 
 #endif
diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp
index 596f61990..497fa03c3 100644
--- a/tdeprint/cups/kmwother.cpp
+++ b/tdeprint/cups/kmwother.cpp
@@ -29,8 +29,8 @@
 #include <tqheader.h>
 #include <tqdict.h>
 
-#include <klocale.h>
-#include <klistview.h>
+#include <tdelocale.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -49,7 +49,7 @@ KMWOther::KMWOther(TQWidget *parent, const char *name)
 					 "<li>lpd://server/queue</li>"
 					 "<li>parallel:/dev/lp0</li></ul>"));
 	TQLabel	*l2 = new TQLabel(i18n("URI:"), this);
-	m_uriview = new KListView( this );
+	m_uriview = new TDEListView( this );
 	m_uriview->addColumn( "" );
 	m_uriview->header()->hide();
 	m_uriview->setSorting( -1 );
diff --git a/tdeprint/cups/kmwother.h b/tdeprint/cups/kmwother.h
index eba5ac2b1..a650482f4 100644
--- a/tdeprint/cups/kmwother.h
+++ b/tdeprint/cups/kmwother.h
@@ -23,7 +23,7 @@
 #include "kmwizardpage.h"
 
 class TQLineEdit;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 
 class KMWOther : public KMWizardPage
@@ -40,7 +40,7 @@ protected slots:
 
 private:
 	TQLineEdit	*m_uri;
-	KListView *m_uriview;
+	TDEListView *m_uriview;
 };
 
 #endif
diff --git a/tdeprint/cups/kmwquota.cpp b/tdeprint/cups/kmwquota.cpp
index 67245fb20..5085913d0 100644
--- a/tdeprint/cups/kmwquota.cpp
+++ b/tdeprint/cups/kmwquota.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
diff --git a/tdeprint/cups/kmwusers.cpp b/tdeprint/cups/kmwusers.cpp
index 714f6f4d4..eed7c08af 100644
--- a/tdeprint/cups/kmwusers.cpp
+++ b/tdeprint/cups/kmwusers.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <keditlistbox.h>
 
 KMWUsers::KMWUsers(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp
index 67ad61aec..f804b249d 100644
--- a/tdeprint/cups/kphpgl2page.cpp
+++ b/tdeprint/cups/kphpgl2page.cpp
@@ -23,7 +23,7 @@
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp
index 669bab190..8d23fe3e0 100644
--- a/tdeprint/cups/kpimagepage.cpp
+++ b/tdeprint/cups/kpimagepage.cpp
@@ -32,7 +32,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp
index f778139dc..d7f13c8a4 100644
--- a/tdeprint/cups/kpschedulepage.cpp
+++ b/tdeprint/cups/kpschedulepage.cpp
@@ -27,7 +27,7 @@
 #include <tqdatetime.h>
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <knuminput.h>
 
diff --git a/tdeprint/cups/kptagspage.cpp b/tdeprint/cups/kptagspage.cpp
index a5d465683..db134d9ba 100644
--- a/tdeprint/cups/kptagspage.cpp
+++ b/tdeprint/cups/kptagspage.cpp
@@ -26,7 +26,7 @@
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name)
 : KPrintDialogPage(parent, name)
diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp
index eb8bc3553..955434da4 100644
--- a/tdeprint/cups/kptextpage.cpp
+++ b/tdeprint/cups/kptextpage.cpp
@@ -29,7 +29,7 @@
 #include <tqradiobutton.h>
 #include <tqwhatsthis.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 #include <kdebug.h>
diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp
index abc468f7a..6afc75d0f 100644
--- a/tdeprint/driver.cpp
+++ b/tdeprint/driver.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tqstringlist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <math.h>
 
diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp
index 68e705a7d..fece6c40c 100644
--- a/tdeprint/driverview.cpp
+++ b/tdeprint/driverview.cpp
@@ -27,10 +27,10 @@
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DrListView::DrListView(TQWidget *parent, const char *name)
-: KListView(parent,name)
+: TDEListView(parent,name)
 {
 	addColumn("");
 	header()->hide();
diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h
index a975fd26e..7e06648fa 100644
--- a/tdeprint/driverview.h
+++ b/tdeprint/driverview.h
@@ -22,7 +22,7 @@
 #define DRIVERVIEW_H
 
 #include <tqwidget.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqmap.h>
 
 #include <tdelibs_export.h>
@@ -30,7 +30,7 @@
 class DrOptionView;
 class DrMain;
 
-class TDEPRINT_EXPORT DrListView : public KListView
+class TDEPRINT_EXPORT DrListView : public TDEListView
 {
 public:
 	DrListView(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index 2ba4d1799..77a910b0c 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 #include <tqslider.h>
 #include <tqlabel.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqwidgetstack.h>
@@ -34,7 +34,7 @@
 
 #include <kcursor.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 OptionBaseView::OptionBaseView(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
@@ -191,7 +191,7 @@ void OptionStringView::setValue(const TQString& val)
 OptionListView::OptionListView(TQWidget *parent, const char *name)
 : OptionBaseView(parent,name)
 {
-	m_list = new KListBox(this);
+	m_list = new TDEListBox(this);
 
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	main_->addWidget(m_list);
diff --git a/tdeprint/droptionview.h b/tdeprint/droptionview.h
index 70f60a814..6114efcbd 100644
--- a/tdeprint/droptionview.h
+++ b/tdeprint/droptionview.h
@@ -27,7 +27,7 @@
 class TQLineEdit;
 class TQSlider;
 class TQLabel;
-class KListBox;
+class TDEListBox;
 class TQListBoxItem;
 class TQVButtonGroup;
 class TQWidgetStack;
@@ -92,7 +92,7 @@ protected slots:
 	void slotSelectionChanged();
 
 private:
-	KListBox	*m_list;
+	TDEListBox	*m_list;
 	TQStringList	m_choices;
 };
 
diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp
index c976f54e0..7923ea729 100644
--- a/tdeprint/ext/kextprinterimpl.cpp
+++ b/tdeprint/ext/kextprinterimpl.cpp
@@ -22,8 +22,8 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 
 KExtPrinterImpl::KExtPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KPrinterImpl(parent,name)
diff --git a/tdeprint/ext/kmextmanager.cpp b/tdeprint/ext/kmextmanager.cpp
index 598dd6648..abc832d6f 100644
--- a/tdeprint/ext/kmextmanager.cpp
+++ b/tdeprint/ext/kmextmanager.cpp
@@ -20,7 +20,7 @@
 #include "kmextmanager.h"
 #include "kmprinter.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMExtManager::KMExtManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMManager(parent,name)
diff --git a/tdeprint/ext/kmextuimanager.cpp b/tdeprint/ext/kmextuimanager.cpp
index 2fa200848..ee1c4e186 100644
--- a/tdeprint/ext/kmextuimanager.cpp
+++ b/tdeprint/ext/kmextuimanager.cpp
@@ -21,7 +21,7 @@
 #include "kpqtpage.h"
 #include "kprinterpropertydialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMExtUiManager::KMExtUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
index b628ac6d9..dd694b31b 100644
--- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -21,7 +21,7 @@
 #include "kprinter.h"
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KFoomaticPrinterImpl::KFoomaticPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KPrinterImpl(parent,name)
@@ -35,7 +35,7 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl()
 // look for executable
 TQString KFoomaticPrinterImpl::executable()
 {
-	QString	exe = KStandardDirs::findExe("foomatic-printjob");
+	QString	exe = TDEStandardDirs::findExe("foomatic-printjob");
 	return exe;
 }
 
diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp
index 6a4de31eb..e1e741003 100644
--- a/tdeprint/foomatic/kmfoomaticmanager.cpp
+++ b/tdeprint/foomatic/kmfoomaticmanager.cpp
@@ -22,7 +22,7 @@
 #include "driver.h"
 
 #include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kprocess.h>
 
@@ -77,9 +77,9 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool)
 	}
 
 	QString	cmd = "foomatic-combo-xml -p ";
-	cmd += KProcess::quote(printer->option("printer"));
+	cmd += TDEProcess::quote(printer->option("printer"));
 	cmd += " -d ";
-	cmd += KProcess::quote(printer->option("driver"));
+	cmd += TDEProcess::quote(printer->option("driver"));
 	KPipeProcess	proc(cmd);
 	QDomDocument	doc;
 	doc.setContent(&proc);
diff --git a/tdeprint/foomatic2loader.cpp b/tdeprint/foomatic2loader.cpp
index 6add13378..0d0637c90 100644
--- a/tdeprint/foomatic2loader.cpp
+++ b/tdeprint/foomatic2loader.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <tqbuffer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 void tdeprint_foomatic2scanner_init( TQIODevice* );
 void tdeprint_foomatic2scanner_terminate();
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index 8daa2fe20..16ec56c32 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -32,18 +32,18 @@
 #include <tqsettings.h>
 
 #include <klibloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 
 #include <unistd.h>
 
@@ -113,8 +113,8 @@ KMFactory::KMFactory()
 	if ( !ok )
 		settings.writeEntry( "/qt/embedFonts", true );
 
-	KGlobal::iconLoader()->addAppDir("tdeprint");
-        KGlobal::locale()->insertCatalogue("tdeprint");
+	TDEGlobal::iconLoader()->addAppDir("tdeprint");
+        TDEGlobal::locale()->insertCatalogue("tdeprint");
 
 	// create DCOP signal connection
 	connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false);
@@ -224,11 +224,11 @@ void KMFactory::loadFactory(const TQString& syst)
 	}
 }
 
-KConfig* KMFactory::printConfig(const TQString& group)
+TDEConfig* KMFactory::printConfig(const TQString& group)
 {
 	if (!m_printconfig)
 	{
-		m_printconfig = new KConfig("tdeprintrc");
+		m_printconfig = new TDEConfig("tdeprintrc");
 		TQ_CHECK_PTR(m_printconfig);
 	}
 	if (!group.isEmpty())
@@ -238,7 +238,7 @@ KConfig* KMFactory::printConfig(const TQString& group)
 
 TQString KMFactory::printSystem()
 {
-	KConfig	*conf = printConfig();
+	TDEConfig	*conf = printConfig();
 	conf->setGroup("General");
 	TQString	sys = conf->readEntry("PrintSystem");
 	if (sys.isEmpty())
@@ -276,7 +276,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst)
 	unload();
 	if (saveSyst)
 	{
-		KConfig	*conf = printConfig();
+		TDEConfig	*conf = printConfig();
 		conf->setGroup("General");
 		conf->writeEntry("PrintSystem", syst);
 		conf->sync();
@@ -403,7 +403,7 @@ void KMFactory::slot_configChanged()
 
 void KMFactory::saveConfig()
 {
-	KConfig	*conf = printConfig();
+	TDEConfig	*conf = printConfig();
 	conf->sync();
 	kdDebug(500) << "KMFactory (" << getpid() << ") emitting DCOP signal configChanged()" << endl;
 	emit configChanged();
diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h
index 8bfc9961d..baaf48477 100644
--- a/tdeprint/kmfactory.h
+++ b/tdeprint/kmfactory.h
@@ -39,7 +39,7 @@ class KXmlCommandManager;
 class KMSpecialManager;
 class KPrinterImpl;
 class KLibFactory;
-class KConfig;
+class TDEConfig;
 class KPReloadObject;
 
 class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
@@ -72,7 +72,7 @@ public:
 	KMSpecialManager* specialManager();
 	KXmlCommandManager* commandManager();
 	KPrinterImpl* printerImplementation();
-	KConfig* printConfig(const TQString& group = TQString::null);
+	TDEConfig* printConfig(const TQString& group = TQString::null);
 	TQString printSystem();
 	TQValueList<PluginInfo> pluginList();
 	PluginInfo pluginInfo(const TQString& name);
@@ -121,7 +121,7 @@ private:
 	KPrinterImpl		*m_implementation;
 	KLibFactory		*m_factory;
 
-	KConfig			*m_printconfig;
+	TDEConfig			*m_printconfig;
 	Settings		*m_settings;
 	TQPtrList<KPReloadObject> m_objects;
 };
diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp
index 7ff1efb95..2b42506f5 100644
--- a/tdeprint/kmjob.cpp
+++ b/tdeprint/kmjob.cpp
@@ -19,7 +19,7 @@
 
 #include "kmjob.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMJob::KMJob()
 : KMObject()
diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp
index 30a1fb993..de71d4dc7 100644
--- a/tdeprint/kmjobmanager.cpp
+++ b/tdeprint/kmjobmanager.cpp
@@ -22,9 +22,9 @@
 #include "kmthreadjob.h"
 #include "kmfactory.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMJobManager::KMJobManager(TQObject *parent, const char *name)
 : TQObject(parent,name)
@@ -203,12 +203,12 @@ int KMJobManager::actions()
 	return 0;
 }
 
-TQValueList<KAction*> KMJobManager::createPluginActions(KActionCollection*)
+TQValueList<TDEAction*> KMJobManager::createPluginActions(TDEActionCollection*)
 {
-	return TQValueList<KAction*>();
+	return TQValueList<TDEAction*>();
 }
 
-void KMJobManager::validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&)
+void KMJobManager::validatePluginActions(TDEActionCollection*, const TQPtrList<KMJob>&)
 {
 }
 
@@ -242,14 +242,14 @@ bool KMJobManager::doPluginAction(int, const TQPtrList<KMJob>&)
 
 void KMJobManager::setLimit(int val)
 {
-	KConfig *conf = KMFactory::self()->printConfig();
+	TDEConfig *conf = KMFactory::self()->printConfig();
 	conf->setGroup("Jobs");
 	conf->writeEntry("Limit", val);
 }
 
 int KMJobManager::limit()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("Jobs");
 	return conf->readNumEntry("Limit", 0);
 }
diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h
index b1cdac627..fce6e61d2 100644
--- a/tdeprint/kmjobmanager.h
+++ b/tdeprint/kmjobmanager.h
@@ -33,8 +33,8 @@
 
 class KMJob;
 class KMThreadJob;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
 
 /**
  * @internal
@@ -78,8 +78,8 @@ public:
 	KMThreadJob* threadJob();
 
 	virtual int actions();
-	virtual TQValueList<KAction*> createPluginActions(KActionCollection*);
-	virtual void validatePluginActions(KActionCollection*, const TQPtrList<KMJob>&);
+	virtual TQValueList<TDEAction*> createPluginActions(TDEActionCollection*);
+	virtual void validatePluginActions(TDEActionCollection*, const TQPtrList<KMJob>&);
 	virtual bool doPluginAction(int, const TQPtrList<KMJob>&);
 
 protected:
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index c9730adba..d43239fd7 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -29,10 +29,10 @@
 #include <zlib.h>
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klibloader.h>
 #include <unistd.h>
 
@@ -362,7 +362,7 @@ bool KMManager::uncompressFile(const TQString& filename, TQString& destname)
 		if ((uchar)(buf[0]) == 037 && (uchar)(buf[1]) == 0213)
 		{
 			f.close();
-			destname = locateLocal("tmp","tdeprint_") + KApplication::randomString(8);
+			destname = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8);
 			f.setName(destname);
 
 			if (f.open(IO_WriteOnly))
@@ -418,7 +418,7 @@ bool KMManager::configureServer(TQWidget*)
 
 TQString KMManager::testPage()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	QString	tpage = conf->readPathEntry("TestPage");
 	if (tpage.isEmpty())
@@ -511,11 +511,11 @@ bool KMManager::invokeOptionsDialog(TQWidget *parent)
 	return false;
 }
 
-void KMManager::createPluginActions(KActionCollection*)
+void KMManager::createPluginActions(TDEActionCollection*)
 {
 }
 
-void KMManager::validatePluginActions(KActionCollection*, KMPrinter*)
+void KMManager::validatePluginActions(TDEActionCollection*, KMPrinter*)
 {
 }
 
diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h
index be69c73e6..9c5820f3a 100644
--- a/tdeprint/kmmanager.h
+++ b/tdeprint/kmmanager.h
@@ -35,7 +35,7 @@ class KMDBEntry;
 class KMVirtualManager;
 class KMSpecialManager;
 class TQWidget;
-class KActionCollection;
+class TDEActionCollection;
 class PrinterFilter;
 
 /**
@@ -135,8 +135,8 @@ public:
 	virtual TQStringList detectLocalPrinters();
 
 	// additional actions (for print manager)
-	virtual void createPluginActions(KActionCollection*);
-	virtual void validatePluginActions(KActionCollection*, KMPrinter*);
+	virtual void createPluginActions(TDEActionCollection*);
+	virtual void validatePluginActions(TDEActionCollection*, KMPrinter*);
 
 	// utility function
 	void checkUpdatePossible();
diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp
index b18116ef8..c7676e382 100644
--- a/tdeprint/kmprinter.cpp
+++ b/tdeprint/kmprinter.cpp
@@ -21,8 +21,8 @@
 #include "kprinter.h"
 #include "driver.h"
 
-#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdelocale.h>
+#include <tdefiledialog.h>
 
 KMPrinter::KMPrinter()
 : KMObject()
diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp
index d26515a16..910de4931 100644
--- a/tdeprint/kmspecialmanager.cpp
+++ b/tdeprint/kmspecialmanager.cpp
@@ -26,9 +26,9 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <unistd.h>
@@ -47,7 +47,7 @@ bool KMSpecialManager::savePrinters()
 	if (getuid() == 0)
 	{
 		confname = locate("data", "tdeprint/specials.desktop");
-		if (confname.startsWith(KGlobal::dirs()->localtdedir()))
+		if (confname.startsWith(TDEGlobal::dirs()->localtdedir()))
 		{
 			// seems there's a problem here
 			m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your "
@@ -107,8 +107,8 @@ bool KMSpecialManager::loadPrinters()
 	if (m_loaded) return true;
 
 	bool	result(true);
-	TQString	localDir = KGlobal::dirs()->localtdedir();
-	TQStringList	files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop");
+	TQString	localDir = TDEGlobal::dirs()->localtdedir();
+	TQStringList	files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop");
 	// local files should processed last, so we need to reorder the list
 	// and put local files at the end
 	TQStringList	orderedFiles;
diff --git a/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp
index 962653dd2..4dd6966d3 100644
--- a/tdeprint/kmuimanager.cpp
+++ b/tdeprint/kmuimanager.cpp
@@ -36,7 +36,7 @@
 #include "kxmlcommand.h"
 #include "kpposterpage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 KMUiManager::KMUiManager(TQObject *parent, const char *name)
diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp
index 2f1d80e54..dabad3093 100644
--- a/tdeprint/kmvirtualmanager.cpp
+++ b/tdeprint/kmvirtualmanager.cpp
@@ -28,11 +28,11 @@
 #include <tqtextstream.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <unistd.h>
 
@@ -297,7 +297,7 @@ void KMVirtualManager::triggerSave()
 	QString	filename;
 	if (getuid() == 0)
 	{
-		if (KStandardDirs::makeDir(TQFile::decodeName("/etc/cups")))
+		if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups")))
 			filename = TQFile::decodeName("/etc/cups/lpoptions");
 	}
 	else
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index 3557fe4d4..10eb6e204 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -34,8 +34,8 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/kpdriverpage.cpp b/tdeprint/kpdriverpage.cpp
index 18cfeb207..2bea47bc8 100644
--- a/tdeprint/kpdriverpage.cpp
+++ b/tdeprint/kpdriverpage.cpp
@@ -22,7 +22,7 @@
 #include "driver.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KPDriverPage::KPDriverPage(KMPrinter *p, DrMain *d, TQWidget *parent, const char *name)
 : KPrintDialogPage(p,d,parent,name)
diff --git a/tdeprint/kpfileselectpage.cpp b/tdeprint/kpfileselectpage.cpp
index f3131717a..8b20386bd 100644
--- a/tdeprint/kpfileselectpage.cpp
+++ b/tdeprint/kpfileselectpage.cpp
@@ -18,13 +18,13 @@
  **/
 
 #include "kpfileselectpage.h"
-#include "kfilelist.h"
+#include "tdefilelist.h"
 
 #include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
 #include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 KPFileSelectPage::KPFileSelectPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp
index 66eda203d..6f46085ee 100644
--- a/tdeprint/kpfilterpage.cpp
+++ b/tdeprint/kpfilterpage.cpp
@@ -26,13 +26,13 @@
 #include <tqtooltip.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klistview.h>
-#include <klocale.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kactivelabel.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 
 KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
@@ -126,7 +126,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
 	m_activefilters.setAutoDelete(true);
 	m_valid = true;
 
-	m_view = new KListView(this);
+	m_view = new TDEListView(this);
 	  TQWhatsThis::add(m_view, whatsThisFilterchainListView);
 	m_view->addColumn("");
 	m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
diff --git a/tdeprint/kpfilterpage.h b/tdeprint/kpfilterpage.h
index 72065b3f1..a5bc7f757 100644
--- a/tdeprint/kpfilterpage.h
+++ b/tdeprint/kpfilterpage.h
@@ -25,7 +25,7 @@
 #include <tqdict.h>
 #include <tqstringlist.h>
 
-class KListView;
+class TDEListView;
 class KXmlCommand;
 class TQListViewItem;
 class TQToolButton;
@@ -57,7 +57,7 @@ protected:
 	TQStringList activeList();
     void updateButton();
 private:
-	KListView		*m_view;
+	TDEListView		*m_view;
 	TQStringList		m_filters;	// <idname,description> pairs
 	TQDict<KXmlCommand>	m_activefilters;
 	TQToolButton		*m_add, *m_remove, *m_up, *m_down, *m_configure;
diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp
index b64ce075e..821290704 100644
--- a/tdeprint/kpgeneralpage.cpp
+++ b/tdeprint/kpgeneralpage.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Some ID's
 #define ORIENT_PORTRAIT_ID	0
@@ -440,7 +440,7 @@ void KPGeneralPage::initialize()
 			for ( int i=HIGHSIZE_BEGIN+1; i<DEFAULT_SIZE; i+=2 )
 				m_pagesize->insertItem(i18n(default_size[i]));
 		// set default page size using locale settings
-		TQString	psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize()));
+		TQString	psname = pageSizeToPageName((KPrinter::PageSize)(TDEGlobal::locale()->pageSize()));
 		int index = findOption(default_size, DEFAULT_SIZE, psname);
 		if (index >= 0)
 			m_pagesize->setCurrentItem(index);
diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp
index 554679ee7..78b9ca6ef 100644
--- a/tdeprint/kpmarginpage.cpp
+++ b/tdeprint/kpmarginpage.cpp
@@ -31,9 +31,9 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, const char *name)
 : KPrintDialogPage(0, driver, parent, name)
@@ -62,7 +62,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
 	// first retrieve the Qt values for page size and margins
 	TQPrinter	prt(TQPrinter::PrinterResolution);
 	prt.setFullPage(true);
-	prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? KGlobal::locale()->pageSize() : ps.toInt()));
+	prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? TDEGlobal::locale()->pageSize() : ps.toInt()));
 	TQPaintDeviceMetrics	metrics(&prt);
 	float	w = metrics.width();
 	float	h = metrics.height();
diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp
index f719e251b..9c0a42501 100644
--- a/tdeprint/kpposterpage.cpp
+++ b/tdeprint/kpposterpage.cpp
@@ -31,7 +31,7 @@
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 
diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp
index 3a0982661..c0ca5656e 100644
--- a/tdeprint/kpqtpage.cpp
+++ b/tdeprint/kpqtpage.cpp
@@ -32,7 +32,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #define ORIENT_PORTRAIT_ID	0
@@ -203,7 +203,7 @@ void KPQtPage::init()
 		for (int i=0; i<KPrinter::NPageSize-1; i++)
 			m_pagesize->insertItem(i18n(page_sizes[i].text));
 		// default page size to locale settings
-		m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize())));
+		m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(TDEGlobal::locale()->pageSize())));
 	}
 	else
 	{
diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp
index a9e1b2bb8..4a4aac597 100644
--- a/tdeprint/kprintaction.cpp
+++ b/tdeprint/kprintaction.cpp
@@ -22,8 +22,8 @@
 #include <kprinter.h>
 #include <tdeprint/kmmanager.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
-#include <klocale.h>
+#include <tdepopupmenu.h>
+#include <tdelocale.h>
 
 class KPrintAction::KPrintActionPrivate
 {
@@ -40,21 +40,21 @@ public:
 };
 
 KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
-: KActionMenu(text, parent, name)
+: TDEActionMenu(text, parent, name)
 {
 	d = new KPrintActionPrivate();
 	initialize(type, parentWidget);
 }
 
 KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
-: KActionMenu(text, icon, parent, name)
+: TDEActionMenu(text, icon, parent, name)
 {
 	d = new KPrintActionPrivate();
 	initialize(type, parentWidget);
 }
 
 KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name)
-: KActionMenu(text, icon, parent, name)
+: TDEActionMenu(text, icon, parent, name)
 {
 	d = new KPrintActionPrivate();
 	initialize(type, parentWidget);
diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h
index 5c8688e8f..94549402f 100644
--- a/tdeprint/kprintaction.h
+++ b/tdeprint/kprintaction.h
@@ -20,11 +20,11 @@
 #ifndef KPRINTACTION_H
 #define KPRINTACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KPrinter;
 
-class TDEPRINT_EXPORT KPrintAction : public KActionMenu
+class TDEPRINT_EXPORT KPrintAction : public TDEActionMenu
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 1e0e141a9..d881971ff 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -46,23 +46,23 @@
 #include <tqvbox.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqdir.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
-#include <kapplication.h>
-#include <kio/renamedlg.h>
+#include <tdeapplication.h>
+#include <tdeio/renamedlg.h>
 
 #include <time.h>
 
@@ -439,7 +439,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	}
 	else
 	{
-		KConfig	*config = KGlobal::config();
+		TDEConfig	*config = TDEGlobal::config();
 		config->setGroup("KPrinter Settings");
 		expandDialog(!config->readBoolEntry("DialogReduced", (KMFactory::self()->settings()->application != KPrinter::StandAlone)));
 	}
@@ -447,7 +447,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 
 KPrintDialog::~KPrintDialog()
 {
-	KConfig	*config = KGlobal::config();
+	TDEConfig	*config = TDEGlobal::config();
 	config->setGroup("KPrinter Settings");
 	config->writeEntry("DialogReduced", d->m_reduced);
 
@@ -570,7 +570,7 @@ void KPrintDialog::initialize(KPrinter *printer)
 				sep = true;
 				d->m_printers->insertItem(TQPixmap(), TQString::fromLatin1("--------"));
 			}
-			d->m_printers->insertItem(SmallIcon(it.current()->pixmap(),0,(it.current()->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay)),it.current()->name(),false/*sep*/);
+			d->m_printers->insertItem(SmallIcon(it.current()->pixmap(),0,(it.current()->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay)),it.current()->name(),false/*sep*/);
 			if (it.current()->isSoftDefault())
 				defsoft = d->m_printers->count()-1;
 			if (it.current()->isHardDefault())
@@ -730,19 +730,19 @@ bool KPrintDialog::checkOutputFile()
 			{
 				//value = (KMessageBox::warningYesNo(this,i18n("File \"%1\" already exists. Overwrite?").arg(f.absFilePath())) == KMessageBox::Yes);
 				time_t mtimeDest = f.lastModified().toTime_t();
-				KIO::RenameDlg dlg( this, i18n( "Print" ), TQString::null, d->m_file->url(),
-						KIO::M_OVERWRITE, ( time_t ) -1, f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true );
+				TDEIO::RenameDlg dlg( this, i18n( "Print" ), TQString::null, d->m_file->url(),
+						TDEIO::M_OVERWRITE, ( time_t ) -1, f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true );
 				int result = dlg.exec();
 				switch ( result )
 				{
-					case KIO::R_OVERWRITE:
+					case TDEIO::R_OVERWRITE:
 						value = true;
 						break;
 					default:
-					case KIO::R_CANCEL:
+					case TDEIO::R_CANCEL:
 						value = false;
 						break;
-					case KIO::R_RENAME:
+					case TDEIO::R_RENAME:
 						url = dlg.newDestURL();
 						d->m_file->setURL( url.path() );
 						value = true;
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 86ef04f66..4b9a1c98f 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -33,17 +33,17 @@
 #include <tqtl.h>
 #include <tqdir.h>
 #include <tqguardedptr.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <krun.h>
 #include <knotifyclient.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 static void dumpOptions(const TQMap<TQString,TQString>& opts);
 static void reportError(KPrinter*);
@@ -174,7 +174,7 @@ void KPrinter::loadSettings()
 	setSearchName(option("kde-searchname"));
 	d->m_options.remove("kde-searchname");
 
-	KConfig	*conf = KGlobal::config(), *pconf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig();
 	conf->setGroup("KPrinter Settings");
 	pconf->setGroup("General");
 
@@ -199,7 +199,7 @@ void KPrinter::saveSettings()
 	}
 
 	// save latest used printer to config file
-	KConfig	*conf = KGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	conf->writeEntry("Printer",searchName());
 	// latest used print command
@@ -850,7 +850,7 @@ void KPrinter::setFromTo(int m, int M)
 
 // if no page size defined, use the localized one
 KPrinter::PageSize KPrinter::pageSize() const
-{ return (option("kde-pagesize").isEmpty() ? (PageSize)KGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); }
+{ return (option("kde-pagesize").isEmpty() ? (PageSize)TDEGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); }
 
 KPrinter::PageSetType KPrinter::pageSet() const
 { return (option("kde-pageset").isEmpty() ? AllPages : (PageSetType)(option("kde-pageset").toInt())); }
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index 05e1aa0df..edd380009 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -32,16 +32,16 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdatastream.h>
 #include <kdebug.h>
 #include <kmimemagic.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <stdlib.h>
 
@@ -158,9 +158,9 @@ bool KPrinterImpl::printFiles(KPrinter *p, const TQStringList& f, bool flag)
 				}
 				else
 				{
-					KProcess proc;
+					TDEProcess proc;
 					proc << (flag?"mv":"cp") << f[0] << p->outputFileName();
-					if (!proc.start(KProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0)
+					if (!proc.start(TDEProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0)
 					{
 						p->setErrorMessage(i18n("Cannot save print file to %1. Check that you have write access to it.").arg(p->outputFileName()));
 						return false;
@@ -223,7 +223,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool
 void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
 {
 	kdDebug(500) << "tdeprint: status message: " << msg << endl;
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	if (!conf->readBoolEntry("ShowStatusMsg", true))
 		return;
@@ -296,7 +296,7 @@ TQString KPrinterImpl::tempFile()
 {
 	TQString	f;
 	// be sure the file doesn't exist
-	do f = locateLocal("tmp","tdeprint_") + KApplication::randomString(8); while (TQFile::exists(f));
+	do f = locateLocal("tmp","tdeprint_") + TDEApplication::randomString(8); while (TQFile::exists(f));
 	return f;
 }
 
@@ -573,7 +573,7 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin
 }
 
 TQString KPrinterImpl::quote(const TQString& s)
-{ return KProcess::quote(s); }
+{ return TDEProcess::quote(s); }
 
 void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts)
 {
@@ -583,7 +583,7 @@ void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts)
 
 void KPrinterImpl::loadAppOptions()
 {
-	KConfig	*conf = KGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	TQStringList	opts = conf->readListEntry("ApplicationOptions");
 	for (uint i=0; i<opts.count(); i+=2)
@@ -598,7 +598,7 @@ void KPrinterImpl::saveAppOptions()
 		if (it.key().startsWith("app-"))
 			optlist << it.key() << it.data();
 
-	KConfig	*conf = KGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	conf->writeEntry("ApplicationOptions", optlist);
 }
diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp
index 1128a7d3a..c120ba843 100644
--- a/tdeprint/kprinterpropertydialog.cpp
+++ b/tdeprint/kprinterpropertydialog.cpp
@@ -25,9 +25,9 @@
 #include "kmprinter.h"
 #include "driver.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
 
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index 32381af28..623a7f934 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -25,27 +25,27 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 
-#include <kparts/part.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeparts/part.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <klibloader.h>
 #include <ktrader.h>
 #include <kuserprofile.h>
 #include <krun.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <ktoolbar.h>
+#include <tdeconfig.h>
+#include <tdetoolbar.h>
 #include <kmimetype.h>
 
 KPreviewProc::KPreviewProc()
-: KProcess()
+: TDEProcess()
 {
 	m_bOk = false;
-	connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
+	connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
 }
 
 KPreviewProc::~KPreviewProc()
@@ -63,7 +63,7 @@ bool KPreviewProc::startPreview()
 		return false;
 }
 
-void KPreviewProc::slotProcessExited(KProcess* proc)
+void KPreviewProc::slotProcessExited(TDEProcess* proc)
 {
 	kapp->exit_loop();
 	if ( proc->normalExit() && proc->exitStatus() == 0 )
@@ -81,26 +81,26 @@ public:
 	KPrintPreviewPrivate(KPrintPreview *dlg) : gvpart_(0)
 	{
 		mainwidget_ = new TQWidget(dlg, "MainWidget");
-		toolbar_ = new KToolBar(mainwidget_, "PreviewToolBar", true);
-		actions_ = new KActionCollection(dlg);
-		accel_ = new KAccel(dlg);
+		toolbar_ = new TDEToolBar(mainwidget_, "PreviewToolBar", true);
+		actions_ = new TDEActionCollection(dlg);
+		accel_ = new TDEAccel(dlg);
 		previewonly_ = false;
 	}
 	~KPrintPreviewPrivate()
 	{
 		if (gvpart_) delete gvpart_;
 	}
-	void plugAction(KAction *act)
+	void plugAction(TDEAction *act)
 	{
 		act->plug(toolbar_);
 		act->plugAccel(accel_);
 	}
 
 	KParts::ReadOnlyPart	*gvpart_;
-	KToolBar		*toolbar_;
-	KActionCollection	*actions_;
+	TDEToolBar		*toolbar_;
+	TDEActionCollection	*actions_;
 	TQWidget		*mainwidget_;
-	KAccel			*accel_;
+	TDEAccel			*accel_;
 	bool			previewonly_;
 };
 
@@ -111,8 +111,8 @@ static KLibFactory* componentFactory()
 	factory = KLibLoader::self()->factory("libkghostviewpart");
         if( factory )
             return factory;
-	KTrader::OfferList	offers = KTrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null);
-	for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
+	TDETrader::OfferList	offers = TDETrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null);
+	for (TDETrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
 	{
 		KService::Ptr	service = *it;
 		factory = KLibLoader::self()->factory(TQFile::encodeName(service->library()));
@@ -157,8 +157,8 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
 		KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print");
 	else
 	{
-		new KAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
-		new KAction(i18n("Cancel"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
+		new TDEAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
+		new TDEAction(i18n("Cancel"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
 	}
 
 }
@@ -193,13 +193,13 @@ void KPrintPreview::initView(KLibFactory *factory)
 				TQDomElement a = acts.item( i ).toElement();
 				if ( a.attribute( "name" ) == "goToPage" )
 					continue;
-				KAction *act = d->gvpart_->action( a );
+				TDEAction *act = d->gvpart_->action( a );
 				if ( act != 0 )
 					d->plugAction( act );
 			}
 		}
 		/*
-		KAction	*act;
+		TDEAction	*act;
 		d->toolbar_->insertLineSeparator();
 		if ((act = d->gvpart_->action("zoomIn")) != 0)
 			d->plugAction(act);
@@ -212,8 +212,8 @@ void KPrintPreview::initView(KLibFactory *factory)
 			d->plugAction(act);
 			*/
 	}
-	d->toolbar_->setIconText(KToolBar::IconTextRight);
-	d->toolbar_->setBarPos(KToolBar::Top);
+	d->toolbar_->setIconText(TDEToolBar::IconTextRight);
+	d->toolbar_->setBarPos(TDEToolBar::Top);
 	d->toolbar_->setMovingEnabled(false);
 	//d->adjustSize();
 
@@ -244,7 +244,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	if ( !isPS )
 		kdDebug( 500 ) << "Previewing a non PostScript file, built-in preview disabled" << endl;
 
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	KLibFactory	*factory(0);
 	bool	externalPreview = conf->readBoolEntry("ExternalPreview", false);
@@ -273,7 +273,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	if (externalPreview && isPS )
 	{
 		exe = conf->readPathEntry("PreviewCommand", "gv");
-		if (KStandardDirs::findExe(exe).isEmpty())
+		if (TDEStandardDirs::findExe(exe).isEmpty())
 		{
 			QString	msg = i18n("The preview program %1 cannot be found. "
 						       "Check that the program is correctly installed and "
diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h
index 5fd581fe7..ae99fb405 100644
--- a/tdeprint/kprintpreview.h
+++ b/tdeprint/kprintpreview.h
@@ -47,7 +47,7 @@ private:
 	KPrintPreviewPrivate	*d;
 };
 
-class KPreviewProc : public KProcess
+class KPreviewProc : public TDEProcess
 {
 	Q_OBJECT
 public:
@@ -57,7 +57,7 @@ public:
 	bool startPreview();
 
 protected slots:
-	void slotProcessExited(KProcess*);
+	void slotProcessExited(TDEProcess*);
 private:
 	bool m_bOk;
 };
diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp
index fb1df2840..89ef5e2ca 100644
--- a/tdeprint/kprintprocess.cpp
+++ b/tdeprint/kprintprocess.cpp
@@ -18,17 +18,17 @@
  **/
 
 #include "kprintprocess.h"
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 KPrintProcess::KPrintProcess()
 : KShellProcess()
 {
 	// redirect everything to a single buffer
-	connect(this,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)));
-	connect(this,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)));
-	connect( this, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotExited( KProcess* ) ) );
+	connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) );
 	m_state = None;
 }
 
@@ -53,7 +53,7 @@ bool KPrintProcess::print()
 	return start(NotifyOnExit,All);
 }
 
-void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len)
+void KPrintProcess::slotReceivedStderr(TDEProcess *proc, char *buf, int len)
 {
 	if (proc == this)
 	{
@@ -62,7 +62,7 @@ void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len)
 	}
 }
 
-void KPrintProcess::slotExited( KProcess* )
+void KPrintProcess::slotExited( TDEProcess* )
 {
 	switch ( m_state )
 	{
diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h
index 976b35afe..5ceb3835e 100644
--- a/tdeprint/kprintprocess.h
+++ b/tdeprint/kprintprocess.h
@@ -50,8 +50,8 @@ signals:
 	void printError( KPrintProcess*, const TQString& );
 
 protected slots:
-	void slotReceivedStderr(KProcess*, char*, int);
-	void slotExited( KProcess* );
+	void slotReceivedStderr(TDEProcess*, char*, int);
+	void slotExited( TDEProcess* );
 
 private:
 	QString	m_buffer;
diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp
index 212b53fb5..2d5712674 100644
--- a/tdeprint/kxmlcommand.cpp
+++ b/tdeprint/kxmlcommand.cpp
@@ -30,13 +30,13 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 static void setOptionText(DrBase *opt, const TQString& s)
 {
@@ -393,7 +393,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi
 				}
 				else
 				{
-					format.replace( re, KProcess::quote( dopt->valueText() ) );
+					format.replace( re, TDEProcess::quote( dopt->valueText() ) );
 				}
 				str.append(format).append(" ");
 			}
@@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList()
 {
 	if (d->m_cmdlist.isEmpty())
 	{
-		TQStringList	dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/");
+		TQStringList	dirs = TDEGlobal::dirs()->findDirs("data", "tdeprint/filters/");
 
 		for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it)
 		{
diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp
index 2704cc46a..3647f0b38 100644
--- a/tdeprint/lpd/klpdprinterimpl.cpp
+++ b/tdeprint/lpd/klpdprinterimpl.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KLpdPrinterImpl::KLpdPrinterImpl(TQObject *parent, const char *name)
 : KPrinterImpl(parent,name)
@@ -35,7 +35,7 @@ KLpdPrinterImpl::~KLpdPrinterImpl()
 
 TQString KLpdPrinterImpl::executable()
 {
-	return KStandardDirs::findExe("lpr");
+	return TDEStandardDirs::findExe("lpr");
 }
 
 bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index fcb79a052..e72733f89 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -32,9 +32,9 @@
 #include <tqmap.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 
 #include <pwd.h>
@@ -185,9 +185,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer)
 
 	// 4) change permissions of spool directory
 	TQCString cmd = "chmod -R o-rwx,g+rwX ";
-	cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd")));
+	cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd")));
 	cmd += "&& chown -R lp.lp ";
-	cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd")));
+	cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd")));
 	if (system(cmd.data()) != 0)
 	{
 		setErrorMsg(i18n("Unable to set correct permissions on spool directory %1 for printer <b>%2</b>.").arg(ent->arg("sd")).arg(ent->m_name));
@@ -209,7 +209,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer)
 			return false;
 		}
 		TQCString cmd = "rm -rf ";
-		cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd")));
+		cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd")));
 		system(cmd.data());
 		delete ent;
 		return true;
@@ -225,7 +225,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state)
 	cmd += " ";
 	cmd += state ? "up" : "down";
 	cmd += " ";
-	cmd += KProcess::quote(printer->printerName());
+	cmd += TDEProcess::quote(printer->printerName());
 	if (proc.open(cmd))
 	{
 		QTextStream	t(&proc);
@@ -273,7 +273,7 @@ void KMLpdManager::listPrinters()
 
 TQString KMLpdManager::programName(int f)
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("LPD");
 	switch (f)
 	{
@@ -549,9 +549,9 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 			return false;
 		// write various driver files using templates
 		TQCString cmd = "cp ";
-		cmd += TQFile::encodeName(KProcess::quote(driverDirectory()+"/master-filter"));
+		cmd += TQFile::encodeName(TDEProcess::quote(driverDirectory()+"/master-filter"));
 		cmd += " ";
-		cmd += TQFile::encodeName(KProcess::quote(spooldir + "/filter"));
+		cmd += TQFile::encodeName(TDEProcess::quote(spooldir + "/filter"));
 		if (system(cmd.data()) == 0 &&
 		    savePrinttoolCfgFile(driverDirectory()+"/general.cfg.in",spooldir,options) &&
 		    savePrinttoolCfgFile(driverDirectory()+"/postscript.cfg.in",spooldir,options) &&
@@ -620,9 +620,9 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry)
 	if (entry->arg("sd").isEmpty())
 		entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name;
 	QString	sd = entry->arg("sd");
-	if (!KStandardDirs::exists(sd))
+	if (!TDEStandardDirs::exists(sd))
 	{
-		if (!KStandardDirs::makeDir(sd,0750))
+		if (!TDEStandardDirs::makeDir(sd,0750))
 			return false;
 		struct passwd	*lp_pw = getpwnam("lp");
 		if (lp_pw && chown(TQFile::encodeName(sd),lp_pw->pw_uid,lp_pw->pw_gid) != 0)
diff --git a/tdeprint/lpd/kmlpduimanager.cpp b/tdeprint/lpd/kmlpduimanager.cpp
index fad3fcd58..173c03b2b 100644
--- a/tdeprint/lpd/kmlpduimanager.cpp
+++ b/tdeprint/lpd/kmlpduimanager.cpp
@@ -27,7 +27,7 @@
 #include "kmpropdriver.h"
 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLpdUiManager::KMLpdUiManager(TQObject *parent, const char *name)
 : KMUiManager(parent,name)
diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp
index 5131b33f3..54f19c405 100644
--- a/tdeprint/lpd/lpdtools.cpp
+++ b/tdeprint/lpd/lpdtools.cpp
@@ -22,7 +22,7 @@
 #include "kmprinter.h"
 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char *pt_pagesize[] = {
 	"ledger", I18N_NOOP("Ledger"),
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index e8ee34fd5..e628a1c41 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmacroexpander.h>
 
 KLpdUnixPrinterImpl::KLpdUnixPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
@@ -47,9 +47,9 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer)
 // look for executable, starting with "lpr"
 TQString KLpdUnixPrinterImpl::executable()
 {
-	QString	exe = KStandardDirs::findExe("lpr");
+	QString	exe = TDEStandardDirs::findExe("lpr");
 	if (exe.isEmpty())
-		exe = KStandardDirs::findExe("lp");
+		exe = TDEStandardDirs::findExe("lp");
 	return exe;
 }
 
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.h b/tdeprint/lpdunix/klpdunixprinterimpl.h
index bbbda4104..c4a1ac671 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.h
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.h
@@ -22,7 +22,7 @@
 
 #include "kprinterimpl.h"
 
-class KProcess;
+class TDEProcess;
 
 class KLpdUnixPrinterImpl : public KPrinterImpl
 {
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index 577575e7f..7a291f6df 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -26,7 +26,7 @@
 #include <tqfileinfo.h>
 #include <tqtextstream.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
@@ -230,7 +230,7 @@ void KMLpdUnixManager::parseEtcPrintcap()
 TQString getEtcPrintersConfName()
 {
 	TQString	printersconf("/etc/printers.conf");
-	if (!TQFile::exists(printersconf) && !KStandardDirs::findExe( "ypcat" ).isEmpty())
+	if (!TQFile::exists(printersconf) && !TDEStandardDirs::findExe( "ypcat" ).isEmpty())
 	{
 		// standard file not found, try NIS
 		printersconf = locateLocal("tmp","printers.conf");
diff --git a/tdeprint/lpdunix/kmlpdunixuimanager.cpp b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
index 686dfecbb..b7f059f1a 100644
--- a/tdeprint/lpdunix/kmlpdunixuimanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
@@ -21,7 +21,7 @@
 #include "kpqtpage.h"
 #include "kprinterpropertydialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLpdUnixUiManager::KMLpdUnixUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp
index f6eb1f8aa..acb0e0c2d 100644
--- a/tdeprint/lpr/apshandler.cpp
+++ b/tdeprint/lpr/apshandler.cpp
@@ -31,7 +31,7 @@
 #include <tqtextstream.h>
 #include <tqvaluestack.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <sys/types.h>
@@ -216,7 +216,7 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
 		return NULL;
 	}
 	TQString	path = sysconfDir() + "/" + prt->printerName();
-	if (!KStandardDirs::makeDir(path, 0755))
+	if (!TDEStandardDirs::makeDir(path, 0755))
 	{
 		manager()->setErrorMsg(i18n("Unable to create directory %1.").arg(path));
 		return NULL;
diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp
index 6c4ecc30c..9a8f9caa2 100644
--- a/tdeprint/lpr/editentrydialog.cpp
+++ b/tdeprint/lpr/editentrydialog.cpp
@@ -25,10 +25,10 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlayout.h>
 #include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const char *name)
@@ -39,7 +39,7 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
 
 	TQLabel	*lab0 = new TQLabel(i18n("Aliases:"), w);
 	m_aliases = new TQLineEdit(w);
-	m_view = new KListView(w);
+	m_view = new TDEListView(w);
 	m_view->addColumn("");
 	m_view->header()->hide();
 	m_type = new TQComboBox(w);
diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp
index 92928a0cc..4dbe5e378 100644
--- a/tdeprint/lpr/klprprinterimpl.cpp
+++ b/tdeprint/lpr/klprprinterimpl.cpp
@@ -28,7 +28,7 @@
 KLprPrinterImpl::KLprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KPrinterImpl(parent,name)
 {
-	m_exepath = KStandardDirs::findExe("lpr");
+	m_exepath = TDEStandardDirs::findExe("lpr");
 }
 
 KLprPrinterImpl::~KLprPrinterImpl()
diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp
index f43a8da2d..fed1dd17d 100644
--- a/tdeprint/lpr/kmconfiglpr.cpp
+++ b/tdeprint/lpr/kmconfiglpr.cpp
@@ -24,8 +24,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 
 KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
 : KMConfigPage(parent, name)
@@ -45,12 +45,12 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
 	l0->addStretch(1);
 }
 
-void KMConfigLpr::loadConfig(KConfig*)
+void KMConfigLpr::loadConfig(TDEConfig*)
 {
 	m_mode->setCurrentItem(LprSettings::self()->mode());
 }
 
-void KMConfigLpr::saveConfig(KConfig *conf)
+void KMConfigLpr::saveConfig(TDEConfig *conf)
 {
 	LprSettings::self()->setMode((LprSettings::Mode)(m_mode->currentItem()));
 
diff --git a/tdeprint/lpr/kmconfiglpr.h b/tdeprint/lpr/kmconfiglpr.h
index 7f3d50857..fa7a0ae26 100644
--- a/tdeprint/lpr/kmconfiglpr.h
+++ b/tdeprint/lpr/kmconfiglpr.h
@@ -29,8 +29,8 @@ class KMConfigLpr : public KMConfigPage
 public:
 	KMConfigLpr(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	TQComboBox	*m_mode;
diff --git a/tdeprint/lpr/kmlprjobmanager.cpp b/tdeprint/lpr/kmlprjobmanager.cpp
index 851663664..0738d17c1 100644
--- a/tdeprint/lpr/kmlprjobmanager.cpp
+++ b/tdeprint/lpr/kmlprjobmanager.cpp
@@ -25,7 +25,7 @@
 #include "lprsettings.h"
 
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLprJobManager::KMLprJobManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMJobManager(parent, name)
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 54f987c58..046f082f7 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -30,13 +30,13 @@
 
 #include <tqfileinfo.h>
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kprinter.h>
 #include <kprocess.h>
-#include <kaction.h>
-#include <kmessagebox.h>
+#include <tdeaction.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 
 #include <stdlib.h>
@@ -137,7 +137,7 @@ void KMLprManager::initHandlers()
 	insertHandler(new LPRngToolHandler(this));
 
 	// now load external handlers
-	TQStringList	l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la");
+	TQStringList	l = TDEGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la");
 	for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
 	{
 		KLibrary	*library = KLibLoader::self()->library(TQFile::encodeName(*it));
@@ -345,7 +345,7 @@ bool KMLprManager::createPrinter(KMPrinter *prt)
 		return false;
 	}
 	sd.append("/").append(prt->printerName());
-	if (!KStandardDirs::makeDir(sd, 0755))
+	if (!TDEStandardDirs::makeDir(sd, 0755))
 	{
 		setErrorMsg(i18n("Unable to create the spool directory %1. Check that you "
 		                 "have the required permissions for that operation.").arg(sd));
@@ -405,7 +405,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt)
 			{
 				// printcap file saved, entry can be deleted now
 				delete entry;
-				status =  (::system(TQFile::encodeName("rm -rf " + KProcess::quote(sd))) == 0);
+				status =  (::system(TQFile::encodeName("rm -rf " + TDEProcess::quote(sd))) == 0);
 				if (!status)
 					setErrorMsg(i18n("Unable to remove spool directory %1. "
 					                 "Check that you have write permissions "
@@ -453,13 +453,13 @@ TQString KMLprManager::printOptions(KPrinter *prt)
 	return TQString::null;
 }
 
-void KMLprManager::createPluginActions(KActionCollection *coll)
+void KMLprManager::createPluginActions(TDEActionCollection *coll)
 {
-	KAction	*act = new KAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
+	TDEAction	*act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
 	act->setGroup("plugin");
 }
 
-void KMLprManager::validatePluginActions(KActionCollection *coll, KMPrinter *prt)
+void KMLprManager::validatePluginActions(TDEActionCollection *coll, KMPrinter *prt)
 {
 	m_currentprinter = prt;
 	// FIXME: disabled until completion
diff --git a/tdeprint/lpr/kmlprmanager.h b/tdeprint/lpr/kmlprmanager.h
index 34d38340f..d26af4d77 100644
--- a/tdeprint/lpr/kmlprmanager.h
+++ b/tdeprint/lpr/kmlprmanager.h
@@ -54,8 +54,8 @@ public:
 	LpcHelper* lpcHelper()	{ return m_lpchelper; }
 	TQString printOptions(KPrinter*);
 
-	void createPluginActions(KActionCollection*);
-	void validatePluginActions(KActionCollection*, KMPrinter*);
+	void createPluginActions(TDEActionCollection*);
+	void validatePluginActions(TDEActionCollection*, KMPrinter*);
 	TQString stateInformation();
 
 protected slots:
diff --git a/tdeprint/lpr/kmlpruimanager.cpp b/tdeprint/lpr/kmlpruimanager.cpp
index 655309e0c..b7d23bb42 100644
--- a/tdeprint/lpr/kmlpruimanager.cpp
+++ b/tdeprint/lpr/kmlpruimanager.cpp
@@ -29,7 +29,7 @@
 #include "kmwbackend.h"
 #include "kmconfiglpr.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMLprUiManager::KMLprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp
index 05d09c40a..b366537e5 100644
--- a/tdeprint/lpr/lpchelper.cpp
+++ b/tdeprint/lpr/lpchelper.cpp
@@ -26,7 +26,7 @@
 #include <tqtextstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <stdlib.h>
 
@@ -51,9 +51,9 @@ LpcHelper::LpcHelper(TQObject *parent, const char *name)
 	// add some specific dirs.
 	TQString	PATH = getenv("PATH");
 	PATH.append(":/usr/sbin:/usr/local/sbin:/sbin:/opt/sbin:/opt/local/sbin");
-	m_exepath = KStandardDirs::findExe("lpc", PATH);
-	m_checkpcpath = KStandardDirs::findExe("checkpc", PATH);
-	m_lprmpath = KStandardDirs::findExe("lprm");
+	m_exepath = TDEStandardDirs::findExe("lpc", PATH);
+	m_checkpcpath = TDEStandardDirs::findExe("checkpc", PATH);
+	m_lprmpath = TDEStandardDirs::findExe("lprm");
 }
 
 LpcHelper::~LpcHelper()
@@ -235,7 +235,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin
 		msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc");
 		return false;
 	}
-	TQString	result = execute(m_exepath + " " + op + " " + KProcess::quote(printer));
+	TQString	result = execute(m_exepath + " " + op + " " + TDEProcess::quote(printer));
 	int	status;
 
 	switch (LprSettings::self()->mode())
@@ -273,7 +273,7 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg)
 		msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lprm");
 		return false;
 	}
-	TQString	result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id()));
+	TQString	result = execute(m_lprmpath + " -P " + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id()));
 	if (result.find("dequeued") != -1)
 		return true;
 	else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1)
@@ -291,7 +291,7 @@ bool LpcHelper::changeJobState(KMJob *job, int state, TQString& msg)
 		msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc");
 		return false;
 	}
-	TQString	result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + KProcess::quote(job->printer()) + " " + TQString::number(job->id()));
+	TQString	result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id()));
 	TQString	answer = lprngAnswer(result, job->printer());
 	if (answer == "no")
 	{
diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp
index 30348f591..1c02cafc7 100644
--- a/tdeprint/lpr/lpqhelper.cpp
+++ b/tdeprint/lpr/lpqhelper.cpp
@@ -29,7 +29,7 @@
 LpqHelper::LpqHelper(TQObject *parent, const char *name)
 : TQObject(parent, name)
 {
-	m_exepath = KStandardDirs::findExe("lpq");
+	m_exepath = TDEStandardDirs::findExe("lpq");
 }
 
 LpqHelper::~LpqHelper()
@@ -83,7 +83,7 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line)
 void LpqHelper::listJobs(TQPtrList<KMJob>& jobs, const TQString& prname, int limit)
 {
 	KPipeProcess	proc;
-	if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + KProcess::quote(prname)))
+	if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + TDEProcess::quote(prname)))
 	{
 		TQTextStream	t(&proc);
 		TQString		line;
diff --git a/tdeprint/lpr/lprhandler.cpp b/tdeprint/lpr/lprhandler.cpp
index fcb838bb9..767b55382 100644
--- a/tdeprint/lpr/lprhandler.cpp
+++ b/tdeprint/lpr/lprhandler.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqvaluestack.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <unistd.h>
 
diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp
index d3e283123..960f5adb8 100644
--- a/tdeprint/lpr/lprngtoolhandler.cpp
+++ b/tdeprint/lpr/lprngtoolhandler.cpp
@@ -28,7 +28,7 @@
 
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/tdeprint/lpr/lprsettings.cpp b/tdeprint/lpr/lprsettings.cpp
index 0c1cec2a9..a539f4160 100644
--- a/tdeprint/lpr/lprsettings.cpp
+++ b/tdeprint/lpr/lprsettings.cpp
@@ -21,7 +21,7 @@
 #include "kmmanager.h"
 #include "kmfactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 
@@ -53,7 +53,7 @@ LprSettings* LprSettings::self()
 void LprSettings::init()
 {
 	// LPR/LPRng mode
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("LPR");
 	TQString	modestr = conf->readEntry("Mode");
 	if (modestr == "LPRng")
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index 49c33822d..826867cd2 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -29,9 +29,9 @@
 #include "util.h"
 #include "foomatic2loader.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <tqfile.h>
@@ -46,10 +46,10 @@ MaticHandler::MaticHandler(KMManager *mgr)
 {
 	TQString	PATH = getenv("PATH");
 	PATH.append(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-	m_exematicpath = KStandardDirs::findExe("lpdomatic", PATH);
-	m_ncpath = KStandardDirs::findExe("nc");
-	m_smbpath = KStandardDirs::findExe("smbclient");
-	m_rlprpath = KStandardDirs::findExe("rlpr");
+	m_exematicpath = TDEStandardDirs::findExe("lpdomatic", PATH);
+	m_ncpath = TDEStandardDirs::findExe("nc");
+	m_smbpath = TDEStandardDirs::findExe("smbclient");
+	m_rlprpath = TDEStandardDirs::findExe("rlpr");
 }
 
 bool MaticHandler::validate(PrintcapEntry *entry)
@@ -225,7 +225,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool)
 	// changing printer name), the template would be also removed
 	TQString	origfilename = maticFile(entry);
 	TQString	filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
-	::system(TQFile::encodeName("cp " + KProcess::quote(origfilename) + " " + KProcess::quote(filename)));
+	::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename)));
 	DrMain	*driver = Foomatic2Loader::loadDriver(filename);
 	if (driver)
 	{
@@ -248,7 +248,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
 
 	TQString	tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-	TQString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
+	TQString	exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
 		manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
@@ -258,11 +258,11 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
 
 	KPipeProcess	in;
 	TQFile		out(tmpFile);
-	TQString cmd = KProcess::quote(exe);
+	TQString cmd = TDEProcess::quote(exe);
 	cmd += " -t lpd -d ";
-	cmd += KProcess::quote(comps[2]);
+	cmd += TDEProcess::quote(comps[2]);
 	cmd += " -p ";
-	cmd += KProcess::quote(comps[1]);
+	cmd += TDEProcess::quote(comps[1]);
 	if (in.open(cmd) && out.open(IO_WriteOnly))
 	{
 		TQTextStream	tin(&in), tout(&out);
@@ -329,7 +329,7 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai
 		inFile.close();
 		tmpFile.close();
 
-		TQString	cmd = "mv " + KProcess::quote(tmpFile.name()) + " " + KProcess::quote(outFile);
+		TQString	cmd = "mv " + TDEProcess::quote(tmpFile.name()) + " " + TDEProcess::quote(outFile);
 		int	status = ::system(TQFile::encodeName(cmd).data());
 		TQFile::remove(tmpFile.name());
 		result = (status != -1 && WEXITSTATUS(status) == 0);
@@ -352,7 +352,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
 		return true;
 
 	TQString	PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-	TQString	exe = KStandardDirs::findExe("foomatic-datafile", PATH);
+	TQString	exe = TDEStandardDirs::findExe("foomatic-datafile", PATH);
 	if (exe.isEmpty())
 	{
 		manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
diff --git a/tdeprint/management/CMakeLists.txt b/tdeprint/management/CMakeLists.txt
index ccaf2a70a..47dcda996 100644
--- a/tdeprint/management/CMakeLists.txt
+++ b/tdeprint/management/CMakeLists.txt
@@ -24,9 +24,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
   ${CMAKE_SOURCE_DIR}/tdeprint
 )
 
diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am
index f0d1acd9f..0de381d9d 100644
--- a/tdeprint/management/Makefile.am
+++ b/tdeprint/management/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
-INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile -I$(top_srcdir) $(all_includes)
 
 lib_LTLIBRARIES = libtdeprint_management.la
 kde_module_LTLIBRARIES = libtdeprint_management_module.la
@@ -26,7 +26,7 @@ libtdeprint_management_la_SOURCES = \
 	pluginaction.cpp kxmlcommanddlg.cpp kxmlcommandselector.cpp kmconfigcommand.cpp \
 	kmconfigfilter.cpp kmconfigfonts.cpp kmconfigjobs.cpp networkscanner.cpp
 libtdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+libtdeprint_management_la_LIBADD = ../libtdeprint.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 libtdeprint_management_la_METASOURCES = AUTO
 
 libtdeprint_management_module_la_SOURCES = tdeprint_management_module.cpp
diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp
index 92ea782e5..5bddffe02 100644
--- a/tdeprint/management/cjanuswidget.cpp
+++ b/tdeprint/management/cjanuswidget.cpp
@@ -22,7 +22,7 @@
 #include <tqwidgetstack.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqlayout.h>
 #include <kseparator.h>
 
@@ -79,7 +79,7 @@ void CJanusWidget::CListBoxItem::paint(TQPainter *p)
 
 //***********************************************************************************
 
-class CJanusWidget::CListBox : public KListBox
+class CJanusWidget::CListBox : public TDEListBox
 {
 public:
 	CListBox(TQWidget *parent = 0, const char *name = 0);
@@ -92,7 +92,7 @@ protected:
 };
 
 CJanusWidget::CListBox::CListBox(TQWidget *parent, const char *name)
-: KListBox(parent,name)
+: TDEListBox(parent,name)
 {
 	verticalScrollBar()->installEventFilter(this);
 }
@@ -105,7 +105,7 @@ bool CJanusWidget::CListBox::eventFilter(TQObject *o, TQEvent *e)
 {
 	if (e->type() == TQEvent::Show || e->type() == TQEvent::Hide)
 		computeWidth();
-	return KListBox::eventFilter(o,e);
+	return TDEListBox::eventFilter(o,e);
 }
 
 void CJanusWidget::CListBox::computeWidth()
diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp
index 106e19e57..466c75853 100644
--- a/tdeprint/management/kaddprinterwizard.cpp
+++ b/tdeprint/management/kaddprinterwizard.cpp
@@ -1,28 +1,28 @@
 #include "kmmanager.h"
-#include <kcmdlineargs.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
 	{ "tdeconfig", I18N_NOOP("Configure TDE Print"), 0 },
 	{ "serverconfig", I18N_NOOP("Configure print server"), 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-	KCmdLineArgs::init(argc, argv, "kaddprinterwizard",
+	TDECmdLineArgs::init(argc, argv, "kaddprinterwizard",
 			I18N_NOOP("Start the add printer wizard"),
 			"0.1");
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::addCmdLineOptions(options);
 	
-	KGlobal::locale()->setMainCatalogue("tdelibs");
+	TDEGlobal::locale()->setMainCatalogue("tdelibs");
 
-	KApplication app;
-	KCmdLineArgs	*args = KCmdLineArgs::parsedArgs();
+	TDEApplication app;
+	TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 	bool	doConfig = args->isSet("tdeconfig");
 	bool	doSrvConfig = args->isSet("serverconfig");
 
diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp
index 8bf4d5a10..984d2c128 100644
--- a/tdeprint/management/kiconselectaction.cpp
+++ b/tdeprint/management/kiconselectaction.cpp
@@ -22,13 +22,13 @@
 #include <tqpopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
-class KIconSelectActionPrivate
+class TDEIconSelectActionPrivate
 {
 public:
-	KIconSelectActionPrivate()
+	TDEIconSelectActionPrivate()
 	{
 		m_menu = 0;
 	}
@@ -36,18 +36,18 @@ public:
 	TQPopupMenu*	m_menu;
 };
 
-KIconSelectAction::KIconSelectAction(const TQString& text, int accel, TQObject* parent, const char* name)
-: KSelectAction(text, accel, parent, name)
+TDEIconSelectAction::TDEIconSelectAction(const TQString& text, int accel, TQObject* parent, const char* name)
+: TDESelectAction(text, accel, parent, name)
 {
-	d = new KIconSelectActionPrivate;
+	d = new TDEIconSelectActionPrivate;
 }
 
-KIconSelectAction::~KIconSelectAction()
+TDEIconSelectAction::~TDEIconSelectAction()
 {
 	delete d;
 }
 
-void KIconSelectAction::updateIcons()
+void TDEIconSelectAction::updateIcons()
 {
 	if (d->m_menu)
 	{
@@ -57,7 +57,7 @@ void KIconSelectAction::updateIcons()
 	}
 }
 
-void KIconSelectAction::createPopupMenu()
+void TDEIconSelectAction::createPopupMenu()
 {
 	if (!d->m_menu)
 	{
@@ -66,25 +66,25 @@ void KIconSelectAction::createPopupMenu()
 	}
 }
 
-void KIconSelectAction::setItems(const TQStringList& lst, const TQStringList& iconlst)
+void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList& iconlst)
 {
-	KSelectAction::setItems(lst);
+	TDESelectAction::setItems(lst);
 	d->m_iconlst = iconlst;
 	updateIcons();
 }
 
-int KIconSelectAction::plug(TQWidget* widget, int index)
+int TDEIconSelectAction::plug(TQWidget* widget, int index)
 {
 	int	value(-1);
 	if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING))
 	{
 		createPopupMenu();
-		value = KSelectAction::plug(widget, index);
+		value = TDESelectAction::plug(widget, index);
 	}
-	else if (widget->inherits("KToolBar"))
+	else if (widget->inherits("TDEToolBar"))
 	{
-		KToolBar* bar = static_cast<KToolBar*>(widget);
-		int id = KAction::getToolButtonID();
+		TDEToolBar* bar = static_cast<TDEToolBar*>(widget);
+		int id = TDEAction::getToolButtonID();
 		// To have a correct layout in the toolbar, a non
 		// empty icon has to be used. Use "unknown" by default.
 		TQString	iconName = (currentItem() != -1 ? d->m_iconlst[currentItem()] : "unknown");
@@ -101,18 +101,18 @@ int KIconSelectAction::plug(TQWidget* widget, int index)
 	return value;
 }
 
-void KIconSelectAction::updateCurrentItem(int id)
+void TDEIconSelectAction::updateCurrentItem(int id)
 {
 	TQWidget*	w = container(id);
-	if (w->inherits("KToolBar"))
-		static_cast<KToolBar*>(w)->getButton(itemId(id))->setIcon(d->m_iconlst[currentItem()]);
+	if (w->inherits("TDEToolBar"))
+		static_cast<TDEToolBar*>(w)->getButton(itemId(id))->setIcon(d->m_iconlst[currentItem()]);
 	else
-		KSelectAction::updateCurrentItem(id);
+		TDESelectAction::updateCurrentItem(id);
 }
 
-void KIconSelectAction::setCurrentItem(int index)
+void TDEIconSelectAction::setCurrentItem(int index)
 {
-	KSelectAction::setCurrentItem(index);
+	TDESelectAction::setCurrentItem(index);
 }
 
 #include "kiconselectaction.moc"
diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h
index 84bef60d2..26e703fbf 100644
--- a/tdeprint/management/kiconselectaction.h
+++ b/tdeprint/management/kiconselectaction.h
@@ -20,16 +20,16 @@
 #ifndef KICONSELECTACTION_H
 #define KICONSELECTACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
-class KIconSelectActionPrivate;
+class TDEIconSelectActionPrivate;
 
-class KIconSelectAction : public KSelectAction
+class TDEIconSelectAction : public TDESelectAction
 {
 	Q_OBJECT
 public:
-	KIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0);
-	virtual ~KIconSelectAction();
+	TDEIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0);
+	virtual ~TDEIconSelectAction();
 
 	virtual int plug(TQWidget* widget, int index = -1);
 
@@ -43,7 +43,7 @@ protected:
 	virtual void updateCurrentItem(int id);
 
 private:
-	KIconSelectActionPrivate*	d;
+	TDEIconSelectActionPrivate*	d;
 };
 
 #endif
diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp
index 32fb7db11..4cf33998f 100644
--- a/tdeprint/management/kmconfigcommand.cpp
+++ b/tdeprint/management/kmconfigcommand.cpp
@@ -24,7 +24,7 @@
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index d26b2082d..50eabe9b1 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -30,9 +30,9 @@
 #include "kmconfigjobs.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name)
 : KDialogBase(IconList,i18n("TDE Print Configuration"),Ok|Cancel,Ok,parent,name,true,true)
@@ -47,7 +47,7 @@ KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name)
 	KMFactory::self()->uiManager()->setupConfigDialog(this);
 
 	// initialize pages
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	TQPtrListIterator<KMConfigPage>	it(m_pages);
 	for (;it.current();++it)
 		it.current()->loadConfig(conf);
@@ -60,10 +60,10 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page)
 {
 	if (page)
 	{
-		TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon(
+		TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon(
 		                                                           page->pagePixmap(),
-		                                                           KIcon::NoGroup,
-                        	                                           KIcon::SizeMedium
+		                                                           TDEIcon::NoGroup,
+                        	                                           TDEIcon::SizeMedium
 		                                                          );
 
 		TQFrame	*frame = addPage(page->pageName(),page->pageHeader(),icon);
@@ -77,7 +77,7 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page)
 void KMConfigDialog::slotOk()
 {
 	// save configuration
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	TQPtrListIterator<KMConfigPage>	it(m_pages);
 	for (;it.current();++it)
 		it.current()->saveConfig(conf);
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 29d5107e0..b7be0a1e6 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -28,10 +28,10 @@
 #include <tqlabel.h>
 #include <tqapplication.h>
 
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kdialog.h>
 
 KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
@@ -43,10 +43,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 
 	TQGroupBox	*box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this);
 
-	m_list1 = new KListBox(box);
-	m_list1->setSelectionMode(KListBox::Extended);
-	m_list2 = new KListBox(box);
-	m_list2->setSelectionMode(KListBox::Extended);
+	m_list1 = new TDEListBox(box);
+	m_list1->setSelectionMode(TDEListBox::Extended);
+	m_list2 = new TDEListBox(box);
+	m_list2->setSelectionMode(TDEListBox::Extended);
 	m_add = new TQToolButton( box );
 	m_add->setIconSet(TQApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" ));
 	m_remove = new TQToolButton( box );
@@ -88,7 +88,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 	m_remove->setEnabled(false);
 }
 
-void KMConfigFilter::loadConfig(KConfig *conf)
+void KMConfigFilter::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("Filter");
 	TQStringList	m_plist = conf->readListEntry("Printers");
@@ -97,7 +97,7 @@ void KMConfigFilter::loadConfig(KConfig *conf)
 	{
 		if (!it.current()->isSpecial() && !it.current()->isVirtual())
 		{
-			KListBox	*lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2);
+			TDEListBox	*lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2);
 			lb->insertItem(SmallIcon(it.current()->pixmap()), it.current()->printerName());
 		}
 	}
@@ -106,7 +106,7 @@ void KMConfigFilter::loadConfig(KConfig *conf)
 	m_locationre->setText(conf->readEntry("LocationRe"));
 }
 
-void KMConfigFilter::saveConfig(KConfig *conf)
+void KMConfigFilter::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("Filter");
 	TQStringList	plist;
@@ -116,7 +116,7 @@ void KMConfigFilter::saveConfig(KConfig *conf)
 	conf->writeEntry("LocationRe", m_locationre->text());
 }
 
-void KMConfigFilter::transfer(KListBox *from, KListBox *to)
+void KMConfigFilter::transfer(TDEListBox *from, TDEListBox *to)
 {
 	for (uint i=0; i<from->count();)
 	{
@@ -143,7 +143,7 @@ void KMConfigFilter::slotRemoveClicked()
 
 void KMConfigFilter::slotSelectionChanged()
 {
-	const KListBox	*lb = static_cast<const KListBox*>(sender());
+	const TDEListBox	*lb = static_cast<const TDEListBox*>(sender());
 	if (!lb)
 		return;
 	TQToolButton	*pb = (lb == m_list1 ? m_add : m_remove);
diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h
index 9571f0d54..8338ebd6f 100644
--- a/tdeprint/management/kmconfigfilter.h
+++ b/tdeprint/management/kmconfigfilter.h
@@ -22,7 +22,7 @@
 
 #include "kmconfigpage.h"
 
-class KListBox;
+class TDEListBox;
 class TQToolButton;
 class TQLineEdit;
 
@@ -32,8 +32,8 @@ class KMConfigFilter : public KMConfigPage
 public:
 	KMConfigFilter(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 protected slots:
 	void slotSelectionChanged();
@@ -41,10 +41,10 @@ protected slots:
 	void slotRemoveClicked();
 
 protected:
-	void transfer(KListBox *from, KListBox *to);
+	void transfer(TDEListBox *from, TDEListBox *to);
 
 private:
-	KListBox	*m_list1, *m_list2;
+	TDEListBox	*m_list1, *m_list2;
 	TQToolButton	*m_add, *m_remove;
 	TQLineEdit	*m_locationre;
 };
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 183d0b621..890a42045 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -28,12 +28,12 @@
 #include <tqsettings.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
-#include <kfile.h>
-#include <klistview.h>
+#include <tdefile.h>
+#include <tdelistview.h>
 #include <kdialog.h>
 
 KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
@@ -47,7 +47,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 	TQGroupBox	*box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this);
 
 	m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box);
-	m_fontpath = new KListView(box2);
+	m_fontpath = new TDEListView(box2);
 	m_fontpath->addColumn("");
 	m_fontpath->header()->setStretchEnabled(true, 0);
 	m_fontpath->header()->hide();
@@ -103,7 +103,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 	m_down->setEnabled(false);
 }
 
-void KMConfigFonts::loadConfig(KConfig *)
+void KMConfigFonts::loadConfig(TDEConfig *)
 {
 	TQSettings	settings;
 	m_embedfonts->setChecked(settings.readBoolEntry("/qt/embedFonts", true));
@@ -113,7 +113,7 @@ void KMConfigFonts::loadConfig(KConfig *)
 		item = new TQListViewItem(m_fontpath, item, *it);
 }
 
-void KMConfigFonts::saveConfig(KConfig *)
+void KMConfigFonts::saveConfig(TDEConfig *)
 {
 	TQSettings	settings;
 	settings.writeEntry("/qt/embedFonts", m_embedfonts->isChecked());
diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h
index a93a26d75..8bd285f38 100644
--- a/tdeprint/management/kmconfigfonts.h
+++ b/tdeprint/management/kmconfigfonts.h
@@ -22,7 +22,7 @@
 
 #include "kmconfigpage.h"
 
-class KListView;
+class TDEListView;
 class KURLRequester;
 class TQPushButton;
 class TQCheckBox;
@@ -33,8 +33,8 @@ class KMConfigFonts : public KMConfigPage
 public:
 	KMConfigFonts(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 protected slots:
 	void slotUp();
@@ -46,7 +46,7 @@ protected slots:
 
 private:
 	TQCheckBox	*m_embedfonts;
-	KListView	*m_fontpath;
+	TDEListView	*m_fontpath;
 	KURLRequester	*m_addpath;
 	TQPushButton	*m_up, *m_down, *m_add, *m_remove;
 };
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index 2298d7485..635667cec 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -26,13 +26,13 @@
 #include <tqwhatsthis.h>
 
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <krun.h>
 #include <kmimemagic.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
 #include <klineedit.h>
 #include <kguiitem.h>
@@ -104,7 +104,7 @@ void KMConfigGeneral::setEnabledPreviewButton(bool b)
     m_preview->setEnabled(!m_testpage->url().isEmpty() && b);
 }
 
-void KMConfigGeneral::loadConfig(KConfig *conf)
+void KMConfigGeneral::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("General");
 	m_timer->setValue(conf->readNumEntry("TimerDelay",5));
@@ -118,7 +118,7 @@ void KMConfigGeneral::loadConfig(KConfig *conf)
 	m_uselast->setChecked(conf->readBoolEntry("UseLast", true));
 }
 
-void KMConfigGeneral::saveConfig(KConfig *conf)
+void KMConfigGeneral::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("General");
 	conf->writeEntry("TimerDelay",m_timer->value());
diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h
index 8fc6fa5ab..b82a91daa 100644
--- a/tdeprint/management/kmconfiggeneral.h
+++ b/tdeprint/management/kmconfiggeneral.h
@@ -32,8 +32,8 @@ class KMConfigGeneral : public KMConfigPage
 public:
 	KMConfigGeneral(TQWidget *parent = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 protected slots:
 	void slotTestPagePreview();
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 1088e1b3a..c31e525be 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -23,8 +23,8 @@
 #include <tqlayout.h>
 
 #include <knuminput.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
@@ -48,13 +48,13 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
 	l1->addWidget(m_limit);
 }
 
-void KMConfigJobs::loadConfig(KConfig *conf)
+void KMConfigJobs::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("Jobs");
 	m_limit->setValue(conf->readNumEntry("Limit", 0));
 }
 
-void KMConfigJobs::saveConfig(KConfig *conf)
+void KMConfigJobs::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("Jobs");
 	conf->writeEntry("Limit", m_limit->value());
diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h
index 34be5b1ef..29818d68a 100644
--- a/tdeprint/management/kmconfigjobs.h
+++ b/tdeprint/management/kmconfigjobs.h
@@ -30,8 +30,8 @@ class KMConfigJobs : public KMConfigPage
 public:
 	KMConfigJobs(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	KIntNumInput	*m_limit;
diff --git a/tdeprint/management/kmconfigpage.cpp b/tdeprint/management/kmconfigpage.cpp
index fb967e05d..6a259a062 100644
--- a/tdeprint/management/kmconfigpage.cpp
+++ b/tdeprint/management/kmconfigpage.cpp
@@ -26,11 +26,11 @@ KMConfigPage::KMConfigPage(TQWidget *parent, const char *name)
 	m_header = "Header";
 }
 
-void KMConfigPage::loadConfig(KConfig*)
+void KMConfigPage::loadConfig(TDEConfig*)
 {
 }
 
-void KMConfigPage::saveConfig(KConfig*)
+void KMConfigPage::saveConfig(TDEConfig*)
 {
 }
 #include "kmconfigpage.moc"
diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h
index 59b93fb3d..f29b8a23e 100644
--- a/tdeprint/management/kmconfigpage.h
+++ b/tdeprint/management/kmconfigpage.h
@@ -24,7 +24,7 @@
 
 #include <tdelibs_export.h>
 
-class KConfig;
+class TDEConfig;
 
 class TDEPRINT_EXPORT KMConfigPage : public TQWidget
 {
@@ -32,8 +32,8 @@ class TDEPRINT_EXPORT KMConfigPage : public TQWidget
 public:
 	KMConfigPage(TQWidget *parent = 0, const char *name = 0);
 
-	virtual void loadConfig(KConfig*);
-	virtual void saveConfig(KConfig*);
+	virtual void loadConfig(TDEConfig*);
+	virtual void saveConfig(TDEConfig*);
 
 	TQString pageName() const 	{ return m_name; }
 	TQString pageHeader() const 	{ return m_header; }
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index 316925d48..2fdcbcb4b 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -24,9 +24,9 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
@@ -59,14 +59,14 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
 	m_program->setEnabled(false);
 }
 
-void KMConfigPreview::loadConfig(KConfig *conf)
+void KMConfigPreview::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("General");
 	m_useext->setChecked(conf->readBoolEntry("ExternalPreview", false));
 	m_program->setURL(conf->readPathEntry("PreviewCommand", "gv"));
 }
 
-void KMConfigPreview::saveConfig(KConfig *conf)
+void KMConfigPreview::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("General");
 	conf->writeEntry("ExternalPreview", m_useext->isChecked());
diff --git a/tdeprint/management/kmconfigpreview.h b/tdeprint/management/kmconfigpreview.h
index a9c826c98..b8b5ab097 100644
--- a/tdeprint/management/kmconfigpreview.h
+++ b/tdeprint/management/kmconfigpreview.h
@@ -30,8 +30,8 @@ class KMConfigPreview : public KMConfigPage
 public:
 	KMConfigPreview(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	TQCheckBox	*m_useext;
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 0e72906d7..6154ebea2 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -24,8 +24,8 @@
 #include <tqprogressdialog.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
@@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name)
 	m_dlg = 0;
 	m_status = true;
 
-	connect(&m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
-	connect(&m_proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)));
-	connect(&m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*)));
+	connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*)));
 }
 
 KMDBCreator::~KMDBCreator()
@@ -91,11 +91,11 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
 	if (exestr.isEmpty())
 		msg = i18n("No executable defined for the creation of the "
 		           "driver database. This operation is not implemented.");
-	else if (KStandardDirs::findExe(exestr).isEmpty())
+	else if (TDEStandardDirs::findExe(exestr).isEmpty())
 		msg = i18n("The executable %1 could not be found in your "
 		           "PATH. Check that this program exists and is "
 			   "accessible in your PATH variable.").arg(exestr);
-	else if (!m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput))
+	else if (!m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput))
 		msg = i18n("Unable to start the creation of the driver "
 		           "database. The execution of %1 failed.").arg(exestr);
 	if (!msg.isEmpty())
@@ -124,7 +124,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
 	return started;
 }
 
-void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len)
+void KMDBCreator::slotReceivedStdout(TDEProcess*, char *buf, int len)
 {
 	// save buffer
 	TQString	str( TQCString(buf, len) );
@@ -151,12 +151,12 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len)
 	}
 }
 
-void KMDBCreator::slotReceivedStderr(KProcess*, char*, int)
+void KMDBCreator::slotReceivedStderr(TDEProcess*, char*, int)
 {
 	// just discard it for the moment
 }
 
-void KMDBCreator::slotProcessExited(KProcess*)
+void KMDBCreator::slotProcessExited(TDEProcess*)
 {
 	// delete the progress dialog
 	if (m_dlg)
diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h
index 319d270c0..4b1983ae6 100644
--- a/tdeprint/management/kmdbcreator.h
+++ b/tdeprint/management/kmdbcreator.h
@@ -40,16 +40,16 @@ public:
 	bool status() const	{ return m_status; }
 
 protected slots:
-	void slotReceivedStdout(KProcess *p, char *bufm, int len);
-	void slotReceivedStderr(KProcess *p, char *bufm, int len);
-	void slotProcessExited(KProcess *p);
+	void slotReceivedStdout(TDEProcess *p, char *bufm, int len);
+	void slotReceivedStderr(TDEProcess *p, char *bufm, int len);
+	void slotProcessExited(TDEProcess *p);
 	void slotCancelled();
 
 signals:
 	void dbCreated();
 
 private:
-	KProcess	m_proc;
+	TDEProcess	m_proc;
 	TQProgressDialog	*m_dlg;
 	bool		m_status;
 	bool		m_firstflag;
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index a7d14fe92..5a172281b 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -28,8 +28,8 @@
 #include <tqtextstream.h>
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
 
 KMDriverDB* KMDriverDB::m_self = 0;
 
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 579cae5df..50297bdca 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -23,21 +23,21 @@
 #include "kmmanager.h"
 #include "driver.h"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tqcheckbox.h>
 #include <kcursor.h>
 #include <tqapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqstrlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kguiitem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
@@ -46,8 +46,8 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 	m_valid = false;
 
 	// build widget
-	m_manu = new KListBox(this);
-	m_model = new KListBox(this);
+	m_manu = new TDEListBox(this);
+	m_model = new TDEListBox(this);
 	m_postscript = new TQCheckBox(i18n("&PostScript printer"),this);
 	m_raw = new TQCheckBox(i18n("&Raw printer (no driver needed)"),this);
 	m_postscript->setCursor(KCursor::handCursor());
@@ -234,7 +234,7 @@ void KMDriverDbWidget::slotOtherClicked()
 		if ( !url.isEmpty() )
 		{
 			TQString filename;
-			if ( KIO::NetAccess::download( url, filename, this ) )
+			if ( TDEIO::NetAccess::download( url, filename, this ) )
 			{
 				DrMain	*driver = KMFactory::self()->manager()->loadFileDriver(filename);
 				if (driver)
@@ -255,7 +255,7 @@ void KMDriverDbWidget::slotOtherClicked()
 				}
 				else
 				{
-					KIO::NetAccess::removeTempFile( filename );
+					TDEIO::NetAccess::removeTempFile( filename );
 					KMessageBox::error(this,"<qt>"+i18n("Wrong driver format.")+"<p>"+KMManager::self()->errorMsg()+"</p></qt>");
 				}
 			}
diff --git a/tdeprint/management/kmdriverdialog.cpp b/tdeprint/management/kmdriverdialog.cpp
index ef37e333c..c43017cc7 100644
--- a/tdeprint/management/kmdriverdialog.cpp
+++ b/tdeprint/management/kmdriverdialog.cpp
@@ -20,8 +20,8 @@
 #include "kmdriverdialog.h"
 #include "driverview.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KMDriverDialog::KMDriverDialog(TQWidget *parent, const char *name)
 : KDialogBase(KDialogBase::Swallow,i18n("Configure"),KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok,parent,name,true,false)
diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp
index 0978c0782..8ab3a7279 100644
--- a/tdeprint/management/kmiconview.cpp
+++ b/tdeprint/management/kmiconview.cpp
@@ -104,7 +104,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 	}
 	if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap))
 	{
-		int	iconstate = (m_state&0x4 ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay);
+		int	iconstate = (m_state&0x4 ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay);
 		if (p)
 			m_pixmap = p->pixmap();
 		m_mode = mode;
@@ -119,9 +119,9 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 }
 
 KMIconView::KMIconView(TQWidget *parent, const char *name)
-: KIconView(parent,name)
+: TDEIconView(parent,name)
 {
-	setMode(KIconView::Select);
+	setMode(TDEIconView::Select);
 	setSelectionMode(TQIconView::Single);
 	setItemsMovable(false);
 	setResizeMode(TQIconView::Adjust);
diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h
index 1fd6fbbda..1c8cb197e 100644
--- a/tdeprint/management/kmiconview.h
+++ b/tdeprint/management/kmiconview.h
@@ -45,7 +45,7 @@ private:
 	bool		m_isclass;
 };
 
-class KMIconView : public KIconView
+class KMIconView : public TDEIconView
 {
 	Q_OBJECT
 public:
diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp
index 9987ccb4c..bae2b6ad6 100644
--- a/tdeprint/management/kminfopage.cpp
+++ b/tdeprint/management/kminfopage.cpp
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 25c037516..0cadf3dba 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -30,10 +30,10 @@
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <tqpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klistbox.h>
-#include <klocale.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -41,7 +41,7 @@
 KMInstancePage::KMInstancePage(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
 {
-	m_view = new KListBox(this);
+	m_view = new TDEListBox(this);
 	m_printer = 0;
 
 	initActions();
diff --git a/tdeprint/management/kminstancepage.h b/tdeprint/management/kminstancepage.h
index 7a3075d73..56b045fe2 100644
--- a/tdeprint/management/kminstancepage.h
+++ b/tdeprint/management/kminstancepage.h
@@ -24,7 +24,7 @@
 #include <tqvaluelist.h>
 #include <tqwidget.h>
 
-class KListBox;
+class TDEListBox;
 class KMPrinter;
 class TQButton;
 
@@ -50,7 +50,7 @@ protected:
 	void addButton(const TQString& text, const TQString& pixmap, const char *receiver);
 
 private:
-	KListBox		*m_view;
+	TDEListBox		*m_view;
 	TQValueList<TQButton*>	m_buttons;
 	KMPrinter		*m_printer;
 };
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 19c46224f..98e9595f9 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -30,21 +30,21 @@
 #include "kmconfigpage.h"
 #include "kprinter.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstatusbar.h>
 #include <tqpopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqtimer.h>
 #include <tqlayout.h>
 #include <stdlib.h>
@@ -52,12 +52,12 @@
 #include <kdialogbase.h>
 #include <tqcheckbox.h>
 #include <kurldrag.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #undef m_manager
 #define	m_manager	KMFactory::self()->jobManager()
 
-class KJobListView : public KListView
+class KJobListView : public TDEListView
 {
 public:
 	KJobListView( TQWidget *parent = 0, const char *name = 0 );
@@ -67,7 +67,7 @@ protected:
 };
 
 KJobListView::KJobListView( TQWidget *parent, const char *name )
-	: KListView( parent, name )
+	: TDEListView( parent, name )
 {
 	setAcceptDrops( true );
 	setDropVisualizer( false );
@@ -78,11 +78,11 @@ bool KJobListView::acceptDrag( TQDropEvent *e ) const
 	if ( KURLDrag::canDecode( e ) )
 		return true;
 	else
-		return KListView::acceptDrag( e );
+		return TDEListView::acceptDrag( e );
 }
 
 KMJobViewer::KMJobViewer(TQWidget *parent, const char *name)
-: KMainWindow(parent,name)
+: TDEMainWindow(parent,name)
 {
 	m_view = 0;
 	m_pop = 0;
@@ -99,7 +99,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name)
 	if (m_standalone)
 	{
 		setCaption(i18n("No Printer"));
-		KConfig *conf = KMFactory::self()->printConfig();
+		TDEConfig *conf = KMFactory::self()->printConfig();
 		TQSize defSize( 550, 250 );
 		conf->setGroup( "Jobs" );
 		resize( conf->readSizeEntry( "Size", &defSize ) );
@@ -111,7 +111,7 @@ KMJobViewer::~KMJobViewer()
 	if (m_standalone)
 	{
 		kdDebug( 500 ) << "Destroying stand-alone job viewer window" << endl;
-		KConfig *conf = KMFactory::self()->printConfig();
+		TDEConfig *conf = KMFactory::self()->printConfig();
 		conf->setGroup( "Jobs" );
 		conf->writeEntry( "Size", size() );
 		emit viewerDestroyed(this);
@@ -259,20 +259,20 @@ void KMJobViewer::init()
 void KMJobViewer::initActions()
 {
 	// job actions
-	KAction	*hact = new KAction(i18n("&Hold"),"stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
-	KAction	*ract = new KAction(i18n("&Resume"),"run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
-	KAction	*dact = new KAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
-	KAction *sact = new KAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
-	KActionMenu *mact = new KActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
+	TDEAction	*hact = new TDEAction(i18n("&Hold"),"stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
+	TDEAction	*ract = new TDEAction(i18n("&Resume"),"run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
+	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
+	TDEAction *sact = new TDEAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
+	TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
 	mact->setDelayed(false);
 	connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
 	connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
 	connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
 	connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu()));
-	KToggleAction	*tact = new KToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed");
+	TDEToggleAction	*tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed");
 	tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted);
 	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool)));
-	KToggleAction	*uact = new KToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs");
+	TDEToggleAction	*uact = new TDEToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs");
 	uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"personal"));
 	connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool)));
 	m_userfield = new TQLineEdit(0);
@@ -298,7 +298,7 @@ void KMJobViewer::initActions()
 	}
 
 	// Filter actions
-	KActionMenu	*fact = new KActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify");
+	TDEActionMenu	*fact = new TDEActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify");
 	fact->setDelayed(false);
 	connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int)));
 	connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
@@ -307,7 +307,7 @@ void KMJobViewer::initActions()
 
 	if (!m_standalone)
 	{
-		KToolBar	*toolbar = toolBar();
+		TDEToolBar	*toolbar = toolBar();
 		hact->plug(toolbar);
 		ract->plug(toolbar);
 		toolbar->insertSeparator();
@@ -327,7 +327,7 @@ void KMJobViewer::initActions()
 		KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
 
 		// refresh action
-		new KAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
+		new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
 
 		// create status bar
 		KStatusBar	*statusbar = statusBar();
@@ -367,13 +367,13 @@ void KMJobViewer::buildPrinterMenu(TQPopupMenu *menu, bool use_all, bool use_spe
 
 void KMJobViewer::slotShowMoveMenu()
 {
-	TQPopupMenu	*menu = static_cast<KActionMenu*>(actionCollection()->action("job_move"))->popupMenu();
+	TQPopupMenu	*menu = static_cast<TDEActionMenu*>(actionCollection()->action("job_move"))->popupMenu();
 	buildPrinterMenu(menu, false, false);
 }
 
 void KMJobViewer::slotShowPrinterMenu()
 {
-	TQPopupMenu	*menu = static_cast<KActionMenu*>(actionCollection()->action("filter_modify"))->popupMenu();
+	TQPopupMenu	*menu = static_cast<TDEActionMenu*>(actionCollection()->action("filter_modify"))->popupMenu();
 	buildPrinterMenu(menu, true, true);
 }
 
@@ -583,7 +583,7 @@ void KMJobViewer::loadPluginActions()
 	if (m_standalone)
 	{
 		// standalone window, insert actions into main menubar
-		KAction	*act = actionCollection()->action("job_restart");
+		TDEAction	*act = actionCollection()->action("job_restart");
 		for (int i=0;i<act->containerCount();i++)
 		{
 			if (menuBar()->findItem(act->itemId(i), &menu))
@@ -594,8 +594,8 @@ void KMJobViewer::loadPluginActions()
 		}
 	}
 
-	TQValueList<KAction*>	acts = m_manager->createPluginActions(actionCollection());
-	for (TQValueListIterator<KAction*> it=acts.begin(); it!=acts.end(); ++it)
+	TQValueList<TDEAction*>	acts = m_manager->createPluginActions(actionCollection());
+	for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it)
 	{
 		// connect the action to this
 		connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int)));
@@ -611,8 +611,8 @@ void KMJobViewer::loadPluginActions()
 
 void KMJobViewer::removePluginActions()
 {
-	TQValueList<KAction*>	acts = actionCollection()->actions("plugin");
-	for (TQValueListIterator<KAction*> it=acts.begin(); it!=acts.end(); ++it)
+	TQValueList<TDEAction*>	acts = actionCollection()->actions("plugin");
+	for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it)
 	{
 		(*it)->unplugAll();
 		delete (*it);
@@ -650,7 +650,7 @@ void KMJobViewer::reload()
 
 	// update the "History" action state
 	actionCollection()->action("view_completed")->setEnabled(m_manager->actions() & KMJob::ShowCompleted);
-	static_cast<KToggleAction*>(actionCollection()->action("view_completed"))->setChecked(false);
+	static_cast<TDEToggleAction*>(actionCollection()->action("view_completed"))->setChecked(false);
 }
 
 void KMJobViewer::closeEvent(TQCloseEvent *e)
@@ -700,7 +700,7 @@ void KMJobViewer::slotConfigure()
 	KMConfigJobs	*w = new KMConfigJobs(&dlg);
 	dlg.setMainWidget(w);
 	dlg.resize(300, 10);
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	w->loadConfig(conf);
 	if (dlg.exec())
 	{
@@ -727,7 +727,7 @@ void KMJobViewer::slotDropped( TQDropEvent *e, TQListViewItem* )
 	for ( KURL::List::ConstIterator it = uris.begin();
 	      it != uris.end(); ++it)
 	{
-		if ( KIO::NetAccess::download( *it, target, 0 ) )
+		if ( TDEIO::NetAccess::download( *it, target, 0 ) )
 			files << target;
 	}
 
diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h
index 1dca024a8..7a4530f3c 100644
--- a/tdeprint/management/kmjobviewer.h
+++ b/tdeprint/management/kmjobviewer.h
@@ -24,13 +24,13 @@
 #warning internal header, do not use except if you are a TDEPrint developer
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "kmprinterpage.h"
 #include "kpreloadobject.h"
 
 class KMJobManager;
 class KMJob;
-class KListView;
+class TDEListView;
 class JobItem;
 class TQPopupMenu;
 class TQListViewItem;
@@ -46,7 +46,7 @@ class TQCheckBox;
  * if you're a TDEPrint developer. The API might change in the
  * future and binary compatibility might be broken.
  */
-class TDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, public KPReloadObject
+class TDEPRINT_EXPORT KMJobViewer : public TDEMainWindow, public KMPrinterPage, public KPReloadObject
 {
 	Q_OBJECT
 public:
@@ -108,7 +108,7 @@ protected:
 	void updateStatusBar();
 
 private:
-	KListView		*m_view;
+	TDEListView		*m_view;
 	TQPtrList<KMJob>		m_jobs;
 	TQPtrList<JobItem>		m_items;
 	TQPopupMenu		*m_pop;
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 4bddf9203..806cc0d9f 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -23,7 +23,7 @@
 
 #include <tqheader.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcursor.h>
 
@@ -78,7 +78,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p)
 	if (p)
 	{
 		int	oldstate = m_state;
-		int	st(p->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay);
+		int	st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay);
 		m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0));
 		update = (oldstate != m_state);
 		QString	name = (p->isVirtual() ? p->instanceName() : p->name());
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index c2bc28b20..4aba92dad 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -36,25 +36,25 @@
 #include "messagewindow.h"
 
 #include <tqdockarea.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tqtimer.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
-#include <kmessagebox.h>
-#include <kaction.h>
-#include <klocale.h>
-#include <kconfig.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdemessagebox.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klibloader.h>
 #include <kdialogbase.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 
 #undef m_manager
@@ -78,7 +78,7 @@ int tdeprint_management_add_printer_wizard( TQWidget* parent )
 		return flag;
 }
 
-KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *coll)
+KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection *coll)
 : TQWidget(parent, name)
 {
 	m_current = 0;
@@ -88,15 +88,15 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co
 	m_printerview = new KMPrinterView(this, "PrinterView");
 	m_printerpages = new KMPages(this, "PrinterPages");
 	m_pop = new TQPopupMenu(this);
-	m_toolbar = new KToolBar(this, "ToolBar");
+	m_toolbar = new TDEToolBar(this, "ToolBar");
 	m_toolbar->setMovingEnabled(false);
 	m_plugin = new PluginComboBox(this, "Plugin");
 	/*
 	m_menubar = new KMenuBar( this );
 	static_cast<KMenuBar*>( m_menubar )->setTopLevelMenu( false );
 	*/
-	m_menubar = new KToolBar( this, "MenuBar", false, false );
-	m_menubar->setIconText( KToolBar::IconTextRight );
+	m_menubar = new TDEToolBar( this, "MenuBar", false, false );
+	m_menubar->setIconText( TDEToolBar::IconTextRight );
 	m_menubar->setMovingEnabled( false );
 
 	// layout
@@ -122,7 +122,7 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co
     if (coll)
 		m_actions = coll;
 	else
-		m_actions = new KActionCollection(this);
+		m_actions = new TDEActionCollection(this);
 	initActions();
 
 	// first update
@@ -145,95 +145,95 @@ void KMMainView::loadParameters()
 
 void KMMainView::restoreSettings()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons));
 	setOrientation(conf->readNumEntry("Orientation", Qt::Vertical));
 	bool 	view = conf->readBoolEntry("ViewToolBar",false);
 	slotToggleToolBar(view);
-	((KToggleAction*)m_actions->action("view_toolbar"))->setChecked(view);
+	((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view);
 	view = conf->readBoolEntry( "ViewMenuBar", true );
 	slotToggleMenuBar( view );
-	static_cast<KToggleAction*>( m_actions->action( "view_menubar" ) )->setChecked( view );
+	static_cast<TDEToggleAction*>( m_actions->action( "view_menubar" ) )->setChecked( view );
 	view = conf->readBoolEntry("ViewPrinterInfos",true);
 	slotShowPrinterInfos(view);
-	((KToggleAction*)m_actions->action("view_printerinfos"))->setChecked(view);
+	((TDEToggleAction*)m_actions->action("view_printerinfos"))->setChecked(view);
 }
 
 void KMMainView::saveSettings()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	conf->writeEntry("ViewType",(int)m_printerview->viewType());
 	conf->writeEntry("Orientation",(int)orientation());
-	conf->writeEntry("ViewToolBar",((KToggleAction*)m_actions->action("view_toolbar"))->isChecked());
-	conf->writeEntry("ViewMenuBar",static_cast<KToggleAction*>( m_actions->action("view_menubar") )->isChecked());
-	conf->writeEntry("ViewPrinterInfos",((KToggleAction*)m_actions->action("view_printerinfos"))->isChecked());
+	conf->writeEntry("ViewToolBar",((TDEToggleAction*)m_actions->action("view_toolbar"))->isChecked());
+	conf->writeEntry("ViewMenuBar",static_cast<TDEToggleAction*>( m_actions->action("view_menubar") )->isChecked());
+	conf->writeEntry("ViewPrinterInfos",((TDEToggleAction*)m_actions->action("view_printerinfos"))->isChecked());
 	conf->sync();
 }
 
 void KMMainView::initActions()
 {
-	KIconSelectAction	*vact = new KIconSelectAction(i18n("&View"),0,m_actions,"view_change");
+	TDEIconSelectAction	*vact = new TDEIconSelectAction(i18n("&View"),0,m_actions,"view_change");
 	TQStringList	iconlst;
 	iconlst << "view_icon" << "view_detailed" << "view_tree";
 	vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst);
 	vact->setCurrentItem(0);
 	connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int)));
 
-	KActionMenu	*stateAct = new KActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change");
+	TDEActionMenu	*stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change");
 	stateAct->setDelayed(false);
-	stateAct->insert(new KAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
-	stateAct->insert(new KAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
+	stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
+	stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
 
-	stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change");
+	stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change");
 	stateAct->setDelayed(false);
-	stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
-	stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
-
-	new KAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove");
-	new KAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
-	new KAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
-	new KAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
-	new KAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
-	new KAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
-	new KAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
-	new KAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
-	new KAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
-
-	KIconSelectAction	*dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
+	stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
+	stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
+
+	new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove");
+	new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
+	new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
+	new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
+	new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
+	new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
+	new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
+	new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
+	new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
+
+	TDEIconSelectAction	*dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
 	iconlst.clear();
 	iconlst << "view_top_bottom" << "view_left_right";
 	dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst);
 	dact->setCurrentItem(0);
 	connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int)));
 
-	new KAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
-	new KAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
-	new KAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
+	new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
+	new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
+	new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
 
-	KToggleAction	*tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
+	TDEToggleAction	*tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
 	tact->setCheckedState(i18n("Hide &Toolbar"));
 	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool)));
-	tact = new KToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" );
+	tact = new TDEToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" );
 	tact->setCheckedState(i18n("Hide Me&nu Toolbar"));
 	connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) );
-	tact = new KToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos");
+	tact = new TDEToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos");
 	tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos"));
 	tact->setChecked(true);
 	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool)));
 
-	tact = new KToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter");
+	tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter");
 	tact->setChecked(KMManager::self()->isFilterEnabled());
 	connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
 
-	new KAction( i18n( "%1 &Handbook" ).arg( "TDEPrint" ), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_help" );
-	new KAction( i18n( "%1 &Web Site" ).arg( "TDEPrint" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_web" );
+	new TDEAction( i18n( "%1 &Handbook" ).arg( "TDEPrint" ), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_help" );
+	new TDEAction( i18n( "%1 &Web Site" ).arg( "TDEPrint" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_web" );
 
-	KActionMenu	*mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
+	TDEActionMenu	*mact = new TDEActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
 	mact->setDelayed(false);
 	connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
-	TQStringList	files = KGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop");
+	TQStringList	files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop");
 	for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
 	{
 		KSimpleConfig	conf(*it);
@@ -412,7 +412,7 @@ void KMMainView::slotPrinterSelected(const TQString& prname)
 
 void KMMainView::setViewType(int ID)
 {
-	((KSelectAction*)m_actions->action("view_change"))->setCurrentItem(ID);
+	((TDESelectAction*)m_actions->action("view_change"))->setCurrentItem(ID);
 	slotChangeView(ID);
 }
 
@@ -468,8 +468,8 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p
 		}
 		if (!printer->isSpecial())
 		{
-			TQValueList<KAction*>	pactions = m_actions->actions("plugin");
-			for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
+			TQValueList<TDEAction*>	pactions = m_actions->actions("plugin");
+			for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
 				(*it)->plug(m_pop);
 			if (pactions.count() > 0)
 				m_pop->insertSeparator();
@@ -617,7 +617,7 @@ void KMMainView::slotSoftDefault()
 void KMMainView::setOrientation(int o)
 {
 	int 	ID = (o == Qt::Horizontal ? 1 : 0);
-	((KSelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID);
+	((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID);
 	slotChangeDirection(ID);
 }
 
@@ -698,9 +698,9 @@ void KMMainView::slotServerConfigure()
 
 void KMMainView::slotServerConfigureAccess()
 {
-	KProcess *proc = new KProcess;
+	TDEProcess *proc = new TDEProcess;
 	*proc << "/usr/bin/system-config-printer-kde";
-	proc->start(KProcess::DontCare);
+	proc->start(TDEProcess::DontCare);
 }
 
 void KMMainView::slotToggleToolBar(bool on)
@@ -757,7 +757,7 @@ void KMMainView::slotShowPrinterInfos(bool on)
 
 void KMMainView::enableToolbar(bool on)
 {
-	KToggleAction	*act = (KToggleAction*)m_actions->action("view_toolbar");
+	TDEToggleAction	*act = (TDEToggleAction*)m_actions->action("view_toolbar");
 	m_toolbar->setEnabled(on);
 	act->setEnabled(on);
 	if (on && act->isChecked())
@@ -766,7 +766,7 @@ void KMMainView::enableToolbar(bool on)
 		m_toolbar->hide();
 }
 
-KAction* KMMainView::action(const char *name)
+TDEAction* KMMainView::action(const char *name)
 {
 	return m_actions->action(name);
 }
@@ -793,23 +793,23 @@ void KMMainView::reload()
 
 void KMMainView::showPrinterInfos(bool on)
 {
-	static_cast<KToggleAction*>(m_actions->action("view_printerinfos"))->setChecked(on);
+	static_cast<TDEToggleAction*>(m_actions->action("view_printerinfos"))->setChecked(on);
 	slotShowPrinterInfos(on);
 }
 
 bool KMMainView::printerInfosShown() const
 {
-	return (static_cast<KToggleAction*>(m_actions->action("view_printerinfos"))->isChecked());
+	return (static_cast<TDEToggleAction*>(m_actions->action("view_printerinfos"))->isChecked());
 }
 
 void KMMainView::loadPluginActions()
 {
 	KMFactory::self()->manager()->createPluginActions(m_actions);
-	TQValueList<KAction*>	pactions = m_actions->actions("plugin");
+	TQValueList<TDEAction*>	pactions = m_actions->actions("plugin");
 	int	index = m_pactionsindex;
 	//TQPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup();
 	TQPopupMenu *menu = m_menubar->getButton( 1 )->popup();
-	for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
+	for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
 	{
 		(*it)->plug(m_toolbar, index++);
 		( *it )->plug( menu );
@@ -818,8 +818,8 @@ void KMMainView::loadPluginActions()
 
 void KMMainView::removePluginActions()
 {
-	TQValueList<KAction*>	pactions = m_actions->actions("plugin");
-	for (TQValueList<KAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
+	TQValueList<TDEAction*>	pactions = m_actions->actions("plugin");
+	for (TQValueList<TDEAction*>::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
 	{
 		(*it)->unplugAll();
 		delete (*it);
diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h
index 7ed53a5c8..132bba062 100644
--- a/tdeprint/management/kmmainview.h
+++ b/tdeprint/management/kmmainview.h
@@ -26,18 +26,18 @@
 
 #include <tqwidget.h>
 #include <tdeprint/kpreloadobject.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class KMManager;
 class KMPrinterView;
 class KMPrinter;
 class KMPages;
-class KActionCollection;
+class TDEActionCollection;
 class TQPopupMenu;
 class TQTimer;
 class TQSplitter;
-class KToolBar;
-class KAction;
+class TDEToolBar;
+class TDEAction;
 class PluginComboBox;
 class TQBoxLayout;
 class MessageWindow;
@@ -54,7 +54,7 @@ class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject
 {
 	Q_OBJECT
 public:
-	KMMainView(TQWidget *parent = 0, const char *name = 0, KActionCollection *coll = 0);
+	KMMainView(TQWidget *parent = 0, const char *name = 0, TDEActionCollection *coll = 0);
 	~KMMainView();
 
 	void setOrientation(int);
@@ -62,7 +62,7 @@ public:
 	void setViewType(int);
 	int viewType() const;
 	void enableToolbar(bool on = true);
-	KAction* action(const char *name);
+	TDEAction* action(const char *name);
 	void showPrinterInfos(bool on);
 	bool printerInfosShown() const;
 
@@ -115,17 +115,17 @@ private:
 	KMPrinterView	*m_printerview;
 	KMPages		*m_printerpages;
 	TQPopupMenu	*m_pop;
-	KActionCollection	*m_actions;
+	TDEActionCollection	*m_actions;
 	KMPrinter	*m_current;
-	KToolBar	*m_toolbar;
+	TDEToolBar	*m_toolbar;
 	PluginComboBox	*m_plugin;
 	int		m_pactionsindex;
 	TQStringList	m_toollist;
 	bool		m_first;
 	TQBoxLayout	*m_boxlayout;
-	class KMainWindowPrivate;
-	KMainWindowPrivate *d;
-	KToolBar *m_menubar;
+	class TDEMainWindowPrivate;
+	TDEMainWindowPrivate *d;
+	TDEToolBar *m_menubar;
 };
 
 TDEPRINT_EXPORT int tdeprint_management_add_printer_wizard( TQWidget* parent );
diff --git a/tdeprint/management/kmpages.cpp b/tdeprint/management/kmpages.cpp
index 4f0f1f4f7..d0c413966 100644
--- a/tdeprint/management/kmpages.cpp
+++ b/tdeprint/management/kmpages.cpp
@@ -23,7 +23,7 @@
 #include "kmpropertypage.h"
 #include "kminstancepage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 
diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp
index 59911ff34..d311f75c3 100644
--- a/tdeprint/management/kmprinterview.cpp
+++ b/tdeprint/management/kmprinterview.cpp
@@ -26,8 +26,8 @@
 
 #include <tqlayout.h>
 #include <tqpopupmenu.h>
-#include <kaction.h>
-#include <klocale.h>
+#include <tdeaction.h>
+#include <tdelocale.h>
 
 KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
 : TQWidgetStack(parent,name), m_type(KMPrinterView::Icons)
diff --git a/tdeprint/management/kmpropbackend.cpp b/tdeprint/management/kmpropbackend.cpp
index 98004d2ed..00aac2b40 100644
--- a/tdeprint/management/kmpropbackend.cpp
+++ b/tdeprint/management/kmpropbackend.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropBackend::KMPropBackend(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp
index 9c7808199..c94838098 100644
--- a/tdeprint/management/kmpropcontainer.cpp
+++ b/tdeprint/management/kmpropcontainer.cpp
@@ -22,7 +22,7 @@
 
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kguiitem.h>
 
diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp
index 55daf0ed5..6f20494fc 100644
--- a/tdeprint/management/kmpropdriver.cpp
+++ b/tdeprint/management/kmpropdriver.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp
index e0526ad5a..c38b399c6 100644
--- a/tdeprint/management/kmpropertypage.cpp
+++ b/tdeprint/management/kmpropertypage.cpp
@@ -57,10 +57,10 @@ void KMPropertyPage::addPropPage(KMPropWidget *w)
 		ctn->setWidget(w);
 		connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool)));
 
-		TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon(
+		TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon(
 		                                                           w->pixmap(),
-		                                                           KIcon::NoGroup,
-		                                                           KIcon::SizeMedium
+		                                                           TDEIcon::NoGroup,
+		                                                           TDEIcon::SizeMedium
  		                                                          );
 		addPage(ctn,w->title(),w->header(),icon);
 	}
diff --git a/tdeprint/management/kmpropgeneral.cpp b/tdeprint/management/kmpropgeneral.cpp
index c55603da9..6b24b0466 100644
--- a/tdeprint/management/kmpropgeneral.cpp
+++ b/tdeprint/management/kmpropgeneral.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropmembers.cpp b/tdeprint/management/kmpropmembers.cpp
index 26671eed8..7fc4155a0 100644
--- a/tdeprint/management/kmpropmembers.cpp
+++ b/tdeprint/management/kmpropmembers.cpp
@@ -23,7 +23,7 @@
 
 #include <tqtextview.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp
index ae8b03cbf..50c1a75e8 100644
--- a/tdeprint/management/kmpropwidget.cpp
+++ b/tdeprint/management/kmpropwidget.cpp
@@ -23,8 +23,8 @@
 #include "kmmanager.h"
 #include "kmtimer.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 KMPropWidget::KMPropWidget(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index 9e3775c14..7c4c0173d 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -34,10 +34,10 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kicondialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kseparator.h>
 
 KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
@@ -88,7 +88,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	TQLabel	*m_extensionlabel = new TQLabel(i18n("Filename e&xtension:"), m_outfile_gb);
 	m_extensionlabel->setBuddy(m_extension);
 
-	m_icon = new KIconButton(dummy);
+	m_icon = new TDEIconButton(dummy);
 	m_icon->setIcon("fileprint");
 	m_icon->setFixedSize(TQSize(48,48));
 
diff --git a/tdeprint/management/kmspecialprinterdlg.h b/tdeprint/management/kmspecialprinterdlg.h
index bc7497a05..3d334c7fd 100644
--- a/tdeprint/management/kmspecialprinterdlg.h
+++ b/tdeprint/management/kmspecialprinterdlg.h
@@ -26,7 +26,7 @@ class KMPrinter;
 class TQLineEdit;
 class TQCheckBox;
 class TQComboBox;
-class KIconButton;
+class TDEIconButton;
 class KXmlCommandSelector;
 
 class KMSpecialPrinterDlg : public KDialogBase
@@ -50,7 +50,7 @@ private:
 	TQComboBox	*m_mimetype;
 	TQCheckBox	*m_usefile;
 	TQStringList	m_mimelist;
-	KIconButton	*m_icon;
+	TDEIconButton	*m_icon;
 	KXmlCommandSelector	*m_command;
 };
 
diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp
index 4a7f611d8..a45a9caa0 100644
--- a/tdeprint/management/kmtimer.cpp
+++ b/tdeprint/management/kmtimer.cpp
@@ -20,7 +20,7 @@
 #include "kmtimer.h"
 #include "kmfactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMTimer* KMTimer::m_self = 0;
 
@@ -86,7 +86,7 @@ void KMTimer::startTimer(int t)
 {
 	if (t == -1)
 	{
-		KConfig	*conf = KMFactory::self()->printConfig();
+		TDEConfig	*conf = KMFactory::self()->printConfig();
 		conf->setGroup("General");
 		t = conf->readNumEntry("TimerDelay", 5) * 1000;
 	}
diff --git a/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp
index cd98a8b07..b2e8fdcd4 100644
--- a/tdeprint/management/kmwbackend.cpp
+++ b/tdeprint/management/kmwbackend.cpp
@@ -28,18 +28,18 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kdialog.h>
 #include <kdebug.h>
 
-class KRadioButton : public TQRadioButton
+class TDERadioButton : public TQRadioButton
 {
 public:
-	KRadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0);
+	TDERadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0);
 };
 
-KRadioButton::KRadioButton(const TQString& txt, TQWidget *parent, const char *name)
+TDERadioButton::TDERadioButton(const TQString& txt, TQWidget *parent, const char *name)
 : TQRadioButton(txt,parent,name)
 {
 	setCursor(KCursor::handCursor());
@@ -158,7 +158,7 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString
 	}
 	else
 	{
-		KRadioButton	*btn = new KRadioButton(txt, this);
+		TDERadioButton	*btn = new TDERadioButton(txt, this);
 		btn->setEnabled(on);
 		if ( !whatsThis.isEmpty() )
 			TQWhatsThis::add( btn, whatsThis );
diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp
index a87388a6f..e04467632 100644
--- a/tdeprint/management/kmwclass.cpp
+++ b/tdeprint/management/kmwclass.cpp
@@ -26,8 +26,8 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
-#include <klistbox.h>
-#include <klocale.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 KMWClass::KMWClass(TQWidget *parent, const char *name)
@@ -37,9 +37,9 @@ KMWClass::KMWClass(TQWidget *parent, const char *name)
 	m_title = i18n("Class Composition");
 	m_nextpage = KMWizard::Name;
 
-	m_list1 = new KListBox(this);
+	m_list1 = new TDEListBox(this);
 	m_list1->setSelectionMode(TQListBox::Extended);
-	m_list2 = new KListBox(this);
+	m_list2 = new TDEListBox(this);
 	m_list2->setSelectionMode(TQListBox::Extended);
 
 	TQToolButton	*add = new TQToolButton(this);
diff --git a/tdeprint/management/kmwclass.h b/tdeprint/management/kmwclass.h
index c9b63befb..a74f20117 100644
--- a/tdeprint/management/kmwclass.h
+++ b/tdeprint/management/kmwclass.h
@@ -22,7 +22,7 @@
 
 #include "kmwizardpage.h"
 
-class KListBox;
+class TDEListBox;
 
 class KMWClass : public KMWizardPage
 {
@@ -40,7 +40,7 @@ protected slots:
 	void slotRemove();
 
 private:
-	KListBox	*m_list1, *m_list2;
+	TDEListBox	*m_list1, *m_list2;
 };
 
 #endif
diff --git a/tdeprint/management/kmwdriver.cpp b/tdeprint/management/kmwdriver.cpp
index 58793c192..9876c0420 100644
--- a/tdeprint/management/kmwdriver.cpp
+++ b/tdeprint/management/kmwdriver.cpp
@@ -24,7 +24,7 @@
 #include "kmdriverdb.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMWDriver::KMWDriver(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp
index 88b9410d5..cc52f1015 100644
--- a/tdeprint/management/kmwdriverselect.cpp
+++ b/tdeprint/management/kmwdriverselect.cpp
@@ -26,9 +26,9 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <kpushbutton.h>
-#include <klistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
@@ -38,7 +38,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name)
 	m_nextpage = KMWizard::DriverTest;
 	m_entries = NULL;
 
-	m_list = new KListBox(this);
+	m_list = new TDEListBox(this);
 	TQLabel	*l1 = new TQLabel(this);
 	l1->setText(i18n("<p>Several drivers have been detected for this model. Select the driver "
 			 "you want to use. You will have the opportunity to test it as well as to "
diff --git a/tdeprint/management/kmwdriverselect.h b/tdeprint/management/kmwdriverselect.h
index 464a78239..9c78008c1 100644
--- a/tdeprint/management/kmwdriverselect.h
+++ b/tdeprint/management/kmwdriverselect.h
@@ -23,7 +23,7 @@
 #include "kmwizardpage.h"
 #include "kmdbentry.h"
 
-class KListBox;
+class TDEListBox;
 class TQPushButton;
 
 class KMWDriverSelect : public KMWizardPage
@@ -40,7 +40,7 @@ protected slots:
 	void slotDriverComment();
 
 private:
-	KListBox	*m_list;
+	TDEListBox	*m_list;
 	KMDBEntryList	*m_entries;
 	TQPushButton	*m_drivercomment;
 };
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index 545d3b94d..73871988a 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -28,11 +28,11 @@
 #include <tqlabel.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
@@ -105,7 +105,7 @@ void KMWDriverTest::initPrinter(KMPrinter *p)
 	{
 		m_driver = KMFactory::self()->manager()->loadFileDriver(drfile);
 		/* remove the temp file if it has been downloaded */
-		KIO::NetAccess::removeTempFile( drfile );
+		TDEIO::NetAccess::removeTempFile( drfile );
 	}
 	else if (p->dbEntry() != NULL)
 		m_driver = KMFactory::self()->manager()->loadDbDriver(p->dbEntry());
@@ -133,7 +133,7 @@ void KMWDriverTest::slotTest()
 {
 	if (!m_printer) return;
 
-	TQString	name = "tmpprinter_"+KApplication::randomString(8);
+	TQString	name = "tmpprinter_"+TDEApplication::randomString(8);
 	// save printer name (can be non empty when modifying a printer)
 	TQString	oldname = m_printer->name();
 
diff --git a/tdeprint/management/kmwend.cpp b/tdeprint/management/kmwend.cpp
index 2881b4ea0..4ad564cf6 100644
--- a/tdeprint/management/kmwend.cpp
+++ b/tdeprint/management/kmwend.cpp
@@ -23,7 +23,7 @@
 #include "util.h"
 
 #include <tqtextview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 
 KMWEnd::KMWEnd(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp
index 1fbaf45ff..58a61e8e4 100644
--- a/tdeprint/management/kmwfile.cpp
+++ b/tdeprint/management/kmwfile.cpp
@@ -25,8 +25,8 @@
 #include <tqlayout.h>
 
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdelocale.h>
+#include <tdefiledialog.h>
 
 KMWFile::KMWFile(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
diff --git a/tdeprint/management/kmwinfopage.cpp b/tdeprint/management/kmwinfopage.cpp
index fd9e92697..175ff7e74 100644
--- a/tdeprint/management/kmwinfopage.cpp
+++ b/tdeprint/management/kmwinfopage.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kactivelabel.h>
 
 KMWInfoPage::KMWInfoPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index 5dc915572..bc894c478 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -26,12 +26,12 @@
 #include <kpushbutton.h>
 #include <tqlabel.h>
 #include <tqwidgetstack.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdguiitem.h>
 
 #include "kmwinfopage.h"
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index 7b56b2deb..424e40100 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -23,13 +23,13 @@
 #include "kmfactory.h"
 #include "kmmanager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqheader.h>
-#include <klistview.h>
-#include <kmessagebox.h>
+#include <tdelistview.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 KMWLocal::KMWLocal(TQWidget *parent, const char *name)
@@ -41,7 +41,7 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
 	m_initialized = false;
 	m_block = false;
 
-	m_ports = new KListView(this);
+	m_ports = new TDEListView(this);
 	m_ports->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
 	m_ports->setLineWidth(1);
 	m_ports->header()->hide();
diff --git a/tdeprint/management/kmwlocal.h b/tdeprint/management/kmwlocal.h
index 681d94e51..e65128747 100644
--- a/tdeprint/management/kmwlocal.h
+++ b/tdeprint/management/kmwlocal.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 class TQLineEdit;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 
 class KMWLocal : public KMWizardPage
@@ -47,7 +47,7 @@ protected:
 	TQListViewItem* lookForItem( const TQString& );
 
 protected:
-	KListView	*m_ports;
+	TDEListView	*m_ports;
 	TQLineEdit	*m_localuri;
 	TQStringList	m_uris;
 	TQListViewItem	*m_parents[4];
diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp
index 352a075c5..3c4794ad1 100644
--- a/tdeprint/management/kmwlpd.cpp
+++ b/tdeprint/management/kmwlpd.cpp
@@ -23,11 +23,11 @@
 #include "kmprinter.h"
 
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <kdebug.h>
 #include <tqlineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kextsock.h>
 
 static bool checkLpdQueue(const char *host, const char *queue);
diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp
index fe567f7bb..e8378371a 100644
--- a/tdeprint/management/kmwname.cpp
+++ b/tdeprint/management/kmwname.cpp
@@ -23,8 +23,8 @@
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqregexp.h>
 
 KMWName::KMWName(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp
index 8490a179c..3cd71aadd 100644
--- a/tdeprint/management/kmwpassword.cpp
+++ b/tdeprint/management/kmwpassword.cpp
@@ -26,7 +26,7 @@
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp
index e76240cf8..836a7fb15 100644
--- a/tdeprint/management/kmwsmb.cpp
+++ b/tdeprint/management/kmwsmb.cpp
@@ -23,7 +23,7 @@
 #include "kmprinter.h"
 #include "util.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
 #include <tqlineedit.h>
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index ca5defde4..a3fb71b3d 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -22,13 +22,13 @@
 #include "kmwizard.h"
 #include "kmprinter.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqheader.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
 
@@ -39,7 +39,7 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name)
 	m_ID = KMWizard::TCP;
 	m_nextpage = KMWizard::Driver;
 
-	m_list = new KListView(this);
+	m_list = new TDEListView(this);
 	m_list->addColumn("");
 	m_list->header()->hide();
 	m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
diff --git a/tdeprint/management/kmwsocket.h b/tdeprint/management/kmwsocket.h
index 687b52fd4..7489d6ec7 100644
--- a/tdeprint/management/kmwsocket.h
+++ b/tdeprint/management/kmwsocket.h
@@ -22,7 +22,7 @@
 
 #include "kmwizardpage.h"
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQLineEdit;
 class NetworkScanner;
@@ -43,7 +43,7 @@ protected slots:
 	void slotScanFinished();
 
 private:
-	KListView	*m_list;
+	TDEListView	*m_list;
 	NetworkScanner *m_scanner;
 	TQLineEdit	*m_printer, *m_port;
 };
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index e667d1fa1..02b0a6b69 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -27,13 +27,13 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <knumvalidator.h>
 
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <kextsock.h>
 #include <kdebug.h>
 
@@ -148,7 +148,7 @@ bool KMWSocketUtil::checkPrinter(const TQString& IPstr, int port, TQString* host
 		if (hostname)
 		{
 			TQString	portname;
-			KExtendedSocket::resolve((KSocketAddress*)(sock.peerAddress()), *hostname, portname);
+			KExtendedSocket::resolve((TDESocketAddress*)(sock.peerAddress()), *hostname, portname);
 		}
 		result = true;
 	}
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index e8e43ba09..9b165e432 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -37,15 +37,15 @@
 #include <tqwhatsthis.h>
 #include <tqapplication.h>
 
-#include <klistview.h>
-#include <klocale.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <kseparator.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdemessagebox.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
 
@@ -84,7 +84,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	m_xmlcmd = 0;
 
 	m_command = new TQLineEdit(this);
-	m_view = new KListView(this);
+	m_view = new TDEListView(this);
 	m_view->addColumn("");
 	m_view->header()->hide();
 	m_view->setSorting(-1);
@@ -137,7 +137,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	TQLabel	*m_editlab2 = new TQLabel(i18n("Ma&ximum value:"), w1);
 	m_editlab1->setBuddy(m_edit1);
 	m_editlab2->setBuddy(m_edit2);
-	m_values = new KListView(w2);
+	m_values = new TDEListView(w2);
 	m_values->addColumn(i18n("Name"));
 	m_values->addColumn(i18n("Description"));
 	m_values->setAllColumnsShowFocus(true);
@@ -841,7 +841,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 
 	m_description = new TQLineEdit(topmain);
 	m_idname = new TQLabel(topmain);
-	m_requirements = new KListView(m_gb2);
+	m_requirements = new TDEListView(m_gb2);
 	m_requirements->addColumn("");
 	m_requirements->header()->hide();
 	m_addreq = new TQToolButton(m_gb2);
@@ -850,8 +850,8 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 	m_removereq->setIconSet(SmallIconSet("editdelete"));
 	TQPushButton	*m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain);
 	m_mimetype = new TQComboBox(dummy);
-	m_availablemime = new KListBox(m_gb1);
-	m_selectedmime = new KListBox(m_gb1);
+	m_availablemime = new TDEListBox(m_gb1);
+	m_selectedmime = new TDEListBox(m_gb1);
 	m_addmime = new TQToolButton(m_gb1);
 	m_addmime->setIconSet(TQApplication::reverseLayout()? SmallIconSet("forward") : SmallIconSet("back"));
 	m_removemime = new TQToolButton(m_gb1);
diff --git a/tdeprint/management/kxmlcommanddlg.h b/tdeprint/management/kxmlcommanddlg.h
index 88e590325..d69c19e62 100644
--- a/tdeprint/management/kxmlcommanddlg.h
+++ b/tdeprint/management/kxmlcommanddlg.h
@@ -25,13 +25,13 @@
 #include <tqstringlist.h>
 #include <kdialogbase.h>
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQLineEdit;
 class TQComboBox;
 class TQWidgetStack;
 class TQToolButton;
-class KListBox;
+class TDEListBox;
 class TQListBoxItem;
 class TQTextEdit;
 class TQCheckBox;
@@ -74,11 +74,11 @@ protected slots:
 	void slotChanged();
 
 private:
-	KListView	*m_view;
+	TDEListView	*m_view;
 	TQLineEdit	*m_name, *m_desc, *m_format, *m_default, *m_command;
 	TQComboBox	*m_type;
 	TQWidget		*m_dummy;
-	KListView	*m_values;
+	TDEListView	*m_values;
 	TQLineEdit	*m_edit1, *m_edit2;
 	TQWidgetStack	*m_stack;
 	TQToolButton	*m_apply, *m_addgrp, *m_addopt, *m_delopt, *m_up, *m_down;
@@ -115,9 +115,9 @@ private:
 	TQLineEdit	*m_description;
 	TQLabel		*m_idname;
 	TQComboBox	*m_mimetype;
-	KListBox	*m_availablemime, *m_selectedmime;
+	TDEListBox	*m_availablemime, *m_selectedmime;
 	TQToolButton	*m_addmime, *m_removemime;
-	KListView	*m_requirements;
+	TDEListView	*m_requirements;
 	TQToolButton	*m_removereq, *m_addreq;
 
 	TQStringList	m_mimelist;
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index 6f2b4485e..08722cf6e 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -30,10 +30,10 @@
 #include <tqtooltip.h>
 #include <tqlineedit.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdemessagebox.h>
+#include <tdefiledialog.h>
 #include <kseparator.h>
 #include <kguiitem.h>
 #include <kactivelabel.h>
@@ -273,7 +273,7 @@ void KXmlCommandSelector::slotXmlCommandToggled( bool on )
 
 void KXmlCommandSelector::slotHelpCommand()
 {
-	KPopupFrame *pop = new KPopupFrame( m_helpbtn );
+	TDEPopupFrame *pop = new TDEPopupFrame( m_helpbtn );
 	KActiveLabel *lab = new KActiveLabel( m_help, pop );
 	lab->resize( lab->sizeHint() );
 	pop->setMainWidget( lab );
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index a49a77877..ee4e7dbc7 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -30,9 +30,9 @@
 #include <tqlineedit.h>
 #include <tqregexp.h>
 #include <tqsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kextendedsocket.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knumvalidator.h>
 #include <kdebug.h>
 #include <unistd.h>
@@ -241,9 +241,9 @@ void NetworkScanner::slotConnectionSuccess()
 {
 	kdDebug() << "Success" << endl;
 #ifdef USE_QSOCKET
-	KSocketAddress *addr = KExtendedSocket::peerAddress( d->socket->socket() );
+	TDESocketAddress *addr = KExtendedSocket::peerAddress( d->socket->socket() );
 #else
-	KSocketAddress *addr = const_cast<KSocketAddress*>( d->socket->peerAddress() );
+	TDESocketAddress *addr = const_cast<TDESocketAddress*>( d->socket->peerAddress() );
 #endif
 	kdDebug() << "Connection success: " << ( addr ? addr->pretty() : TQString( "ERROR" ) ) << endl;
 	kdDebug() << "Socket: " << d->socket->socket() << endl;
diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp
index 0aa3c10a3..377a28217 100644
--- a/tdeprint/management/pluginaction.cpp
+++ b/tdeprint/management/pluginaction.cpp
@@ -21,7 +21,7 @@
 
 // automatically connect to "pluginActionActived(int)" in the receiver.
 PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name)
-: KAction(txt, icon, accel, parent, name), m_id(ID)
+: TDEAction(txt, icon, accel, parent, name), m_id(ID)
 {
 	connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated()));
 }
diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h
index 0bb368ed2..0f87460fd 100644
--- a/tdeprint/management/pluginaction.h
+++ b/tdeprint/management/pluginaction.h
@@ -20,9 +20,9 @@
 #ifndef PLUGINACTION_H
 #define PLUGINACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
-class TDEPRINT_EXPORT PluginAction : public KAction
+class TDEPRINT_EXPORT PluginAction : public TDEAction
 {
 	Q_OBJECT
 
diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp
index fde3a3451..f5977bfb0 100644
--- a/tdeprint/management/smbview.cpp
+++ b/tdeprint/management/smbview.cpp
@@ -20,14 +20,14 @@
 #include "smbview.h"
 
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqheader.h>
 #include <tqapplication.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
 
 #include <tqfile.h>
@@ -38,7 +38,7 @@
 //*********************************************************************************************
 
 SmbView::SmbView(TQWidget *parent, const char *name)
-: KListView(parent,name)
+: TDEListView(parent,name)
 {
 	addColumn(i18n("Printer"));
 	addColumn(i18n("Comment"));
@@ -49,11 +49,11 @@ SmbView::SmbView(TQWidget *parent, const char *name)
 
 	m_state = Idle;
 	m_current = 0;
-	m_proc = new KProcess();
+	m_proc = new TDEProcess();
 	m_proc->setUseShell(true);
 	m_passwdFile = 0;
-	connect(m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*)));
-	connect(m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
+	connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*)));
+	connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
 	connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
 }
 
@@ -91,7 +91,7 @@ void SmbView::startProcess(int state)
 	m_buffer = TQString::null;
 	m_state = state;
 	TQApplication::setOverrideCursor(KCursor::waitCursor());
-	m_proc->start(KProcess::NotifyOnExit,KProcess::Stdout);
+	m_proc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout);
 	emit running(true);
 }
 
@@ -118,12 +118,12 @@ void SmbView::endProcess()
 	m_proc->clearArguments();
 }
 
-void SmbView::slotProcessExited(KProcess*)
+void SmbView::slotProcessExited(TDEProcess*)
 {
 	endProcess();
 }
 
-void SmbView::slotReceivedStdout(KProcess*, char *buf, int len)
+void SmbView::slotReceivedStdout(TDEProcess*, char *buf, int len)
 {
 	m_buffer.append(TQString::fromLocal8Bit(buf,len));
 }
@@ -178,7 +178,7 @@ void SmbView::setOpen(TQListViewItem *item, bool on)
 		{ // opening group
 			m_current = item;
 			*m_proc << "nmblookup"+m_wins_server+"-M ";
-                        *m_proc << KProcess::quote(item->text(0));
+                        *m_proc << TDEProcess::quote(item->text(0));
                         *m_proc << " -S";
                         startProcess(ServerListing);
 		}
@@ -194,14 +194,14 @@ void SmbView::setOpen(TQListViewItem *item, bool on)
 			{
 				*m_proc << "smbclient -N -L ";
 			}
-			*m_proc << KProcess::quote (item->text (0));
+			*m_proc << TDEProcess::quote (item->text (0));
 			*m_proc << " -W ";
-			*m_proc << KProcess::quote (item->parent ()->
+			*m_proc << TDEProcess::quote (item->parent ()->
 							text (0));
 			if (!krb5ccname)
 			{
 				*m_proc << " -A ";
-				*m_proc << KProcess::
+				*m_proc << TDEProcess::
 					quote (m_passwdFile->name ());
 			}
 			startProcess(ShareListing);
diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h
index aea1d920d..51193254e 100644
--- a/tdeprint/management/smbview.h
+++ b/tdeprint/management/smbview.h
@@ -20,12 +20,12 @@
 #ifndef SMBVIEW_H
 #define SMBVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
-class KProcess;
+class TDEProcess;
 class KTempFile;
 
-class SmbView : public KListView
+class SmbView : public TDEListView
 {
 	Q_OBJECT
 public:
@@ -49,15 +49,15 @@ protected:
 	void processShares();
 
 protected slots:
-	void slotReceivedStdout(KProcess*, char*, int);
-	void slotProcessExited(KProcess*);
+	void slotReceivedStdout(TDEProcess*, char*, int);
+	void slotProcessExited(TDEProcess*);
 	void slotSelectionChanged(TQListViewItem*);
 
 private:
 	enum State { GroupListing, ServerListing, ShareListing, Idle };
 	int 		m_state;
 	TQListViewItem	*m_current;
-	KProcess	*m_proc;
+	TDEProcess	*m_proc;
 	TQString	m_buffer;
 	TQString	m_login, m_password;
 	KTempFile	*m_passwdFile;
diff --git a/tdeprint/management/tdeprint_management_module.cpp b/tdeprint/management/tdeprint_management_module.cpp
index d15ef791f..89d315c0f 100644
--- a/tdeprint/management/tdeprint_management_module.cpp
+++ b/tdeprint/management/tdeprint_management_module.cpp
@@ -26,9 +26,9 @@
 #include "kmprinter.h"
 #include "kmmainview.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/tdeprint/marginpreview.cpp b/tdeprint/marginpreview.cpp
index 2a5e21e59..45f70b7f1 100644
--- a/tdeprint/marginpreview.cpp
+++ b/tdeprint/marginpreview.cpp
@@ -19,7 +19,7 @@
 
 #include "marginpreview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqpainter.h>
 #include <kcursor.h>
diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp
index 141cadc56..c483be123 100644
--- a/tdeprint/marginwidget.cpp
+++ b/tdeprint/marginwidget.cpp
@@ -27,8 +27,8 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricUnit)
 : TQWidget(parent, name), m_default(4, 0), m_pagesize( 2 )
@@ -206,7 +206,7 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU
 
 	if ( allowMetricUnit )
 	{
-		int	mode = (KGlobal::locale()->measureSystem() == KLocale::Metric ? 2 : 1);
+		int	mode = (TDEGlobal::locale()->measureSystem() == TDELocale::Metric ? 2 : 1);
 		m_top->setMode(mode);
 		m_bottom->setMode(mode);
 		m_left->setMode(mode);
diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp
index a1b6ddf29..7f642896e 100644
--- a/tdeprint/messagewindow.cpp
+++ b/tdeprint/messagewindow.cpp
@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 #include <tqhbox.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 TQPtrDict<MessageWindow> MessageWindow::m_windows;
diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp
index 9ccfc8074..b2a686f6e 100644
--- a/tdeprint/plugincombobox.cpp
+++ b/tdeprint/plugincombobox.cpp
@@ -24,7 +24,7 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqwhatsthis.h>
 
 PluginComboBox::PluginComboBox(TQWidget *parent, const char *name)
diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp
index 241c53dbf..0839af3d7 100644
--- a/tdeprint/posterpreview.cpp
+++ b/tdeprint/posterpreview.cpp
@@ -25,9 +25,9 @@
 #include <tqtimer.h>
 #include <tqpixmap.h>
 #include <kprinter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 PosterPreview::PosterPreview( TQWidget *parent, const char *name )
 	: TQFrame( parent, name )
@@ -53,9 +53,9 @@ PosterPreview::~PosterPreview()
 
 void PosterPreview::init()
 {
-	m_process = new KProcess;
-	connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( KProcess*, char*, int ) ) );
-	connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotProcessExited( KProcess* ) ) );
+	m_process = new TDEProcess;
+	connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) );
+	connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
 
 	m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0;
 	m_dirty = false;
@@ -93,7 +93,7 @@ void PosterPreview::updatePoster()
 	m_process->clearArguments();
 	*m_process << "poster" << "-F" << "-m" + m_mediasize << "-p" + m_postersize
 		<< "-c" + TQString::number( m_cutmargin ) + "%";
-	if ( !m_process->start( KProcess::NotifyOnExit, KProcess::Stderr ) )
+	if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) )
 	{
 		m_rows = m_cols = 0;
 		m_dirty = false;
@@ -140,11 +140,11 @@ void PosterPreview::drawContents( TQPainter *painter )
 				for ( int j=0; j<m_cols; j++, x+=m_pw )
 				{
 					bool selected = ( m_selectedpages.find( i*m_cols+j+1 ) != m_selectedpages.end() );
-					p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? KGlobalSettings::highlightColor() : white ) );
+					p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? TDEGlobalSettings::highlightColor() : white ) );
 					p->drawRect( x, y, m_pw, m_ph );
 					if ( pw > 0 && ph > 0 )
 						p->fillRect( x+m_mw+px, y+m_mh+py, QMIN( pw, m_pw-2*m_mw-px ), QMIN( ph, m_ph-2*m_mh-py ),
-								( selected ? TQColor(KGlobalSettings::highlightColor().dark( 160 )) : lightGray ) );
+								( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) );
 					p->setPen( Qt::DotLine );
 					p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh );
 					p->setPen( Qt::SolidLine );
@@ -206,12 +206,12 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e )
 	}
 }
 
-void PosterPreview::slotProcessStderr( KProcess*, char *buf, int len )
+void PosterPreview::slotProcessStderr( TDEProcess*, char *buf, int len )
 {
 	m_buffer.append( TQCString( buf, len ) );
 }
 
-void PosterPreview::slotProcessExited( KProcess* )
+void PosterPreview::slotProcessExited( TDEProcess* )
 {
 	if ( m_process->normalExit() && m_process->exitStatus() == 0 )
 		parseBuffer();
diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h
index d0c362a04..d9a23cb59 100644
--- a/tdeprint/posterpreview.h
+++ b/tdeprint/posterpreview.h
@@ -23,7 +23,7 @@
 #include <tqframe.h>
 #include <tqvaluelist.h>
 
-class KProcess;
+class TDEProcess;
 
 class PosterPreview : public TQFrame
 {
@@ -55,15 +55,15 @@ protected:
 	void emitSelectedPages();
 
 protected slots:
-	void slotProcessStderr( KProcess*, char*, int );
-	void slotProcessExited( KProcess* );
+	void slotProcessStderr( TDEProcess*, char*, int );
+	void slotProcessExited( TDEProcess* );
 
 private:
 	int m_rows, m_cols;
 	int m_pw, m_ph; // page size
 	int m_mw, m_mh; // cur margins
 	TQRect m_posterbb; // poster bounding box (without any margin)
-	KProcess *m_process;
+	TDEProcess *m_process;
 	TQString m_buffer;
 	TQString m_postersize, m_mediasize;
 	int m_cutmargin;
diff --git a/tdeprint/ppdloader.cpp b/tdeprint/ppdloader.cpp
index dcf272b0a..b829e2e17 100644
--- a/tdeprint/ppdloader.cpp
+++ b/tdeprint/ppdloader.cpp
@@ -23,7 +23,7 @@
 
 #include <kfilterdev.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <math.h>
 
diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp
index e0161a50a..4fc362350 100644
--- a/tdeprint/printerfilter.cpp
+++ b/tdeprint/printerfilter.cpp
@@ -21,8 +21,8 @@
 #include "kmprinter.h"
 #include "kmfactory.h"
 
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 PrinterFilter::PrinterFilter(TQObject *parent, const char *name)
@@ -38,13 +38,13 @@ PrinterFilter::~PrinterFilter()
 
 void PrinterFilter::update()
 {
-	KConfig	*conf = KMFactory::self()->printConfig();
+	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("Filter");
 	m_locationRe.setPattern(conf->readEntry("LocationRe"));
 	m_printers = conf->readListEntry("Printers");
 	// filter enable state is saved on a per application basis,
 	// so this option is retrieve from the application config file
-	conf = KGlobal::config();
+	conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	m_enabled = conf->readBoolEntry("FilterEnabled", false);
 }
@@ -52,7 +52,7 @@ void PrinterFilter::update()
 void PrinterFilter::setEnabled(bool on)
 {
 	m_enabled = on;
-	KConfig	*conf = KGlobal::config();
+	TDEConfig	*conf = TDEGlobal::config();
 	conf->setGroup("KPrinter Settings");
 	conf->writeEntry("FilterEnabled", m_enabled);
 }
diff --git a/tdeprint/rlpr/kmconfigproxy.cpp b/tdeprint/rlpr/kmconfigproxy.cpp
index 0f8ca3743..d41adcdee 100644
--- a/tdeprint/rlpr/kmconfigproxy.cpp
+++ b/tdeprint/rlpr/kmconfigproxy.cpp
@@ -21,7 +21,7 @@
 #include "kmproxywidget.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMConfigProxy::KMConfigProxy(TQWidget *parent)
 : KMConfigPage(parent,"Proxy")
@@ -36,12 +36,12 @@ KMConfigProxy::KMConfigProxy(TQWidget *parent)
 	lay0->addStretch(1);
 }
 
-void KMConfigProxy::loadConfig(KConfig *conf)
+void KMConfigProxy::loadConfig(TDEConfig *conf)
 {
 	m_widget->loadConfig(conf);
 }
 
-void KMConfigProxy::saveConfig(KConfig *conf)
+void KMConfigProxy::saveConfig(TDEConfig *conf)
 {
 	m_widget->saveConfig(conf);
 }
diff --git a/tdeprint/rlpr/kmconfigproxy.h b/tdeprint/rlpr/kmconfigproxy.h
index 6f3b7ef42..e3f92808c 100644
--- a/tdeprint/rlpr/kmconfigproxy.h
+++ b/tdeprint/rlpr/kmconfigproxy.h
@@ -23,15 +23,15 @@
 #include "kmconfigpage.h"
 
 class KMProxyWidget;
-class KConfig;
+class TDEConfig;
 
 class KMConfigProxy : public KMConfigPage
 {
 public:
 	KMConfigProxy(TQWidget *parent = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	KMProxyWidget	*m_widget;
diff --git a/tdeprint/rlpr/kmproprlpr.cpp b/tdeprint/rlpr/kmproprlpr.cpp
index 62fe97827..08713a784 100644
--- a/tdeprint/rlpr/kmproprlpr.cpp
+++ b/tdeprint/rlpr/kmproprlpr.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name)
 : KMPropWidget(parent,name)
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index e4a761519..870da43c4 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -24,8 +24,8 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqvalidator.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 
 KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
@@ -55,7 +55,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
 	lay0->addWidget(m_proxyport,2,1);
 }
 
-void KMProxyWidget::loadConfig(KConfig *conf)
+void KMProxyWidget::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("RLPR");
 	m_proxyhost->setText(conf->readEntry("ProxyHost",TQString::null));
@@ -63,7 +63,7 @@ void KMProxyWidget::loadConfig(KConfig *conf)
 	m_useproxy->setChecked(!m_proxyhost->text().isEmpty());
 }
 
-void KMProxyWidget::saveConfig(KConfig *conf)
+void KMProxyWidget::saveConfig(TDEConfig *conf)
 {
 	conf->setGroup("RLPR");
 	conf->writeEntry("ProxyHost",(m_useproxy->isChecked() ? m_proxyhost->text() : TQString::null));
diff --git a/tdeprint/rlpr/kmproxywidget.h b/tdeprint/rlpr/kmproxywidget.h
index 0c1a5079b..a698889a9 100644
--- a/tdeprint/rlpr/kmproxywidget.h
+++ b/tdeprint/rlpr/kmproxywidget.h
@@ -22,7 +22,7 @@
 
 #include <tqgroupbox.h>
 
-class KConfig;
+class TDEConfig;
 class TQLineEdit;
 class TQCheckBox;
 
@@ -31,8 +31,8 @@ class KMProxyWidget : public TQGroupBox
 public:
 	KMProxyWidget(TQWidget *parent = 0, const char *name = 0);
 
-	void loadConfig(KConfig*);
-	void saveConfig(KConfig*);
+	void loadConfig(TDEConfig*);
+	void saveConfig(TDEConfig*);
 
 private:
 	TQLineEdit	*m_proxyhost;
diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp
index c6704ed09..7b8ceac2d 100644
--- a/tdeprint/rlpr/kmrlprmanager.cpp
+++ b/tdeprint/rlpr/kmrlprmanager.cpp
@@ -26,7 +26,7 @@
 #include <tqmap.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMRlprManager::KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMManager(parent,name)
diff --git a/tdeprint/rlpr/kmrlpruimanager.cpp b/tdeprint/rlpr/kmrlpruimanager.cpp
index 9bae2cdc4..fa6383962 100644
--- a/tdeprint/rlpr/kmrlpruimanager.cpp
+++ b/tdeprint/rlpr/kmrlpruimanager.cpp
@@ -26,7 +26,7 @@
 #include "kmproprlpr.h"
 #include "kmconfigproxy.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KMRlprUiManager::KMRlprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KMUiManager(parent,name)
diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp
index 15ad88ec2..056cba1f0 100644
--- a/tdeprint/rlpr/kmwrlpr.cpp
+++ b/tdeprint/rlpr/kmwrlpr.cpp
@@ -28,8 +28,8 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqheader.h>
-#include <klistview.h>
-#include <klocale.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 static TQListViewItem* rlpr_findChild(TQListViewItem *c, const TQString& txt)
@@ -50,7 +50,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name)
 	m_title = i18n("Remote LPD Queue Settings");
 	m_nextpage = KMWizard::Name;
 
-	m_view = new KListView(this);
+	m_view = new TDEListView(this);
 	m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
 	m_view->setLineWidth(1);
 	m_view->addColumn(TQString::fromLatin1(""));
diff --git a/tdeprint/rlpr/kmwrlpr.h b/tdeprint/rlpr/kmwrlpr.h
index 7c1aa74f2..dc375303d 100644
--- a/tdeprint/rlpr/kmwrlpr.h
+++ b/tdeprint/rlpr/kmwrlpr.h
@@ -22,7 +22,7 @@
 
 #include "kmwizardpage.h"
 
-class KListView;
+class TDEListView;
 class TQLineEdit;
 class TQListViewItem;
 
@@ -43,7 +43,7 @@ protected:
 	void initialize();
 
 private:
-	KListView	*m_view;
+	TDEListView	*m_view;
 	TQLineEdit	*m_host, *m_queue;
 };
 
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 2833c9598..4ef5ebe1e 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -25,8 +25,8 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 
 KRlprPrinterImpl::KRlprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
 : KPrinterImpl(parent,name)
@@ -47,7 +47,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 	QString	host(rpr->option("host")), queue(rpr->option("queue"));
 	if (!host.isEmpty() && !queue.isEmpty())
 	{
-		QString		exestr = KStandardDirs::findExe("rlpr");
+		QString		exestr = TDEStandardDirs::findExe("rlpr");
 		if (exestr.isEmpty())
 		{
 			printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("rlpr"));
@@ -57,7 +57,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 		cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies());
 
 		// proxy settings
-		KConfig	*conf = KMFactory::self()->printConfig();
+		TDEConfig	*conf = KMFactory::self()->printConfig();
 		conf->setGroup("RLPR");
 		QString	host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null);
 		if (!host.isEmpty())
diff --git a/tdeprint/rlpr/krlprprinterimpl.h b/tdeprint/rlpr/krlprprinterimpl.h
index 7af98df0c..741a1a3c8 100644
--- a/tdeprint/rlpr/krlprprinterimpl.h
+++ b/tdeprint/rlpr/krlprprinterimpl.h
@@ -22,7 +22,7 @@
 
 #include "kprinterimpl.h"
 
-class KProcess;
+class TDEProcess;
 
 class KRlprPrinterImpl : public KPrinterImpl
 {
diff --git a/tdeprint/specials.desktop b/tdeprint/specials.desktop
index f6edcea32..467a26d7e 100644
--- a/tdeprint/specials.desktop
+++ b/tdeprint/specials.desktop
@@ -768,7 +768,7 @@ Extension=
 Require=exec:/tdeprintfax
 
 [Printer 3]
-Command=ps2pdf -sPAPERSIZE=%psl %in %out && kmailservice 'mailto:?attachment=file:%out' && sleep 15 && rm -f %out
+Command=ps2pdf -sPAPERSIZE=%psl %in %out && tdemailservice 'mailto:?attachment=file:%out' && sleep 15 && rm -f %out
 Comment=Attachment for KMail Composer
 Comment[af]=Aanhegsel vir Kpos Saamsteller
 Comment[ar]=مر�قات كاتب KMail
diff --git a/tdeprint/kfilelist.cpp b/tdeprint/tdefilelist.cpp
index 44bd13a87..bf2fb3d12 100644
--- a/tdeprint/kfilelist.cpp
+++ b/tdeprint/tdefilelist.cpp
@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include "kfilelist.h"
+#include "tdefilelist.h"
 
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
@@ -26,12 +26,12 @@
 #include <tqheader.h>
 #include <tqwhatsthis.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurldrag.h>
-#include <kfiledialog.h>
-#include <klocale.h>
+#include <tdefiledialog.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <krun.h>
 #include <kmimetype.h>
 
@@ -97,7 +97,7 @@ KFileList::KFileList(TQWidget *parent, const char *name)
 
 	m_block = false;
 
-	m_files = new KListView(this);
+	m_files = new TDEListView(this);
 	m_files->addColumn(i18n("Name"));
 	m_files->addColumn(i18n("Type"));
 	m_files->addColumn(i18n("Path"));
@@ -193,7 +193,7 @@ void KFileList::addFiles(const KURL::List& files)
 		{
 			KMimeType::Ptr	mime = KMimeType::findByURL( *it, 0, true, false);
 			item = new TQListViewItem(m_files, item, (*it).fileName(), mime->comment(), (*it).url());
-			item->setPixmap(0, mime->pixmap(*it, KIcon::Small));
+			item->setPixmap(0, mime->pixmap(*it, TDEIcon::Small));
 		}
 
 		slotSelectionChanged();
@@ -218,7 +218,7 @@ void KFileList::setFileList(const TQStringList& files)
 		KURL	url = KURL::fromPathOrURL( *it );
 		KMimeType::Ptr	mime = KMimeType::findByURL(url, 0, true, false);
 		item = new TQListViewItem(m_files, item, url.fileName(), mime->comment(), url.url());
-		item->setPixmap(0, mime->pixmap(url, KIcon::Small));
+		item->setPixmap(0, mime->pixmap(url, TDEIcon::Small));
 	}
 	slotSelectionChanged();
 }
@@ -323,4 +323,4 @@ void KFileList::slotDown()
 	}
 }
 
-#include "kfilelist.moc"
+#include "tdefilelist.moc"
diff --git a/tdeprint/kfilelist.h b/tdeprint/tdefilelist.h
index d5ef3ada1..912abd07a 100644
--- a/tdeprint/kfilelist.h
+++ b/tdeprint/tdefilelist.h
@@ -17,14 +17,14 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KFILELIST_H
-#define KFILELIST_H
+#ifndef TDEFILELIST_H
+#define TDEFILELIST_H
 
 #include <tqwidget.h>
 #include <tqptrlist.h>
 #include <kurl.h>
 
-class KListView;
+class TDEListView;
 class TQToolButton;
 class TQListViewItem;
 
@@ -54,7 +54,7 @@ protected:
 	void selection(TQPtrList<TQListViewItem>&);
 
 private:
-	KListView	*m_files;
+	TDEListView	*m_files;
 	TQToolButton	*m_add, *m_remove, *m_open, *m_up, *m_down;
 	bool		m_block;
 };
diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp
index 1b5cc691a..a1985e804 100644
--- a/tdeprint/tdeprintcheck.cpp
+++ b/tdeprint/tdeprintcheck.cpp
@@ -53,7 +53,7 @@ static const char* const config_stddirs[] = {
 	0
 };
 
-bool KdeprintChecker::check(KConfig *conf, const TQString& group)
+bool KdeprintChecker::check(TDEConfig *conf, const TQString& group)
 {
 	if (!group.isEmpty())
 		conf->setGroup(group);
@@ -80,7 +80,7 @@ bool KdeprintChecker::checkURL(const KURL& url)
 	else if (prot == "exec")
 		return checkExec(url);
 	else if (prot == "file" || prot == "dir")
-		return KStandardDirs::exists(url.url());
+		return TDEStandardDirs::exists(url.url());
 	else if (prot == "service")
 		return checkService(url);
 	return false;
@@ -117,7 +117,7 @@ bool KdeprintChecker::checkConfig(const KURL& url)
 bool KdeprintChecker::checkExec(const KURL& url)
 {
 	QString	execname(url.path().mid(1));
-	return !(KStandardDirs::findExe(execname).isEmpty());
+	return !(TDEStandardDirs::findExe(execname).isEmpty());
 }
 
 bool KdeprintChecker::checkService(const KURL& url)
diff --git a/tdeprint/tdeprintcheck.h b/tdeprint/tdeprintcheck.h
index 0bb28cc28..7ffdf8d6c 100644
--- a/tdeprint/tdeprintcheck.h
+++ b/tdeprint/tdeprintcheck.h
@@ -22,13 +22,13 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 class TDEPRINT_EXPORT KdeprintChecker
 {
 public:
-	static bool check(KConfig *conf, const TQString& group = TQString::null);
+	static bool check(TDEConfig *conf, const TQString& group = TQString::null);
 	static bool check(const TQStringList& uris);
 
 private:
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 86c8375cb..9b7b6c955 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -21,19 +21,19 @@
 #include "kprintprocess.h"
 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kio/passdlg.h>
-#include <kio/authinfo.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/authinfo.h>
 #include <tqlabel.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
@@ -124,12 +124,12 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla
 		if ( !url.isLocalFile() )
 		{
 			TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) );
-			command.replace( re, KProcess::quote( tmpFilename ) );
+			command.replace( re, TDEProcess::quote( tmpFilename ) );
 			proc->setOutput( re.cap( 1 ) );
 			proc->setTempOutput( tmpFilename );
 		}
 		else
-			command.replace( re, KProcess::quote( re.cap( 1 ) ) );
+			command.replace( re, TDEProcess::quote( re.cap( 1 ) ) );
 	}
 
 	if ( checkFiles( command, files ) )
@@ -162,7 +162,7 @@ void KDEPrintd::slotPrintError( KPrintProcess *proc, const TQString& msg )
 TQString KDEPrintd::openPassDlg(const TQString& user)
 {
 	TQString	user_(user), pass_, result;
-	if (KIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted)
+	if (TDEIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted)
 		result.append(user_).append(":").append(pass_);
 	return result;
 }
@@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files)
 				i18n("Provide root's Password"),
 				"provideRootsPassword") == KMessageBox::Continue)
 			{
-				cmd = ("tdesu -c " + KProcess::quote(cmd));
+				cmd = ("tdesu -c " + TDEProcess::quote(cmd));
 				break;
 			}
 			else
@@ -252,7 +252,7 @@ void KDEPrintd::processRequest()
 		return;
 
 	Request *req = m_requestsPending.first();
-	KIO::AuthInfo info;
+	TDEIO::AuthInfo info;
 	TQByteArray params, reply;
 	TQCString replyType;
 	TQString authString( "::" );
@@ -264,13 +264,13 @@ void KDEPrintd::processRequest()
 
 	TQDataStream input( params, IO_WriteOnly );
 	input << info << TQString(i18n( "Authentication failed (user name=%1)" ).arg( info.username )) << 0L << (long int) req->seqNbr;
-	if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo,TQString,long int,long int)",
+	if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(TDEIO::AuthInfo,TQString,long int,long int)",
 				params, replyType, reply ) )
 	{
-		if ( replyType == "KIO::AuthInfo" )
+		if ( replyType == "TDEIO::AuthInfo" )
 		{
 			TQDataStream output( reply, IO_ReadOnly );
-			KIO::AuthInfo result;
+			TDEIO::AuthInfo result;
 			int seqNbr;
 			output >> result >> seqNbr;
 
@@ -278,7 +278,7 @@ void KDEPrintd::processRequest()
 				authString = result.username + ":" + result.password + ":" + TQString::number( seqNbr );
 		}
 		else
-			kdWarning( 500 ) << "DCOP returned type error, expected KIO::AuthInfo, received " << replyType << endl;
+			kdWarning( 500 ) << "DCOP returned type error, expected TDEIO::AuthInfo, received " << replyType << endl;
 	}
 	else
 		kdWarning( 500 ) << "Cannot communicate with kded_kpasswdserver" << endl;
@@ -298,7 +298,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons
 {
 	TQByteArray params, reply;
 	TQCString replyType;
-	KIO::AuthInfo info;
+	TDEIO::AuthInfo info;
 
 	info.username = user;
 	info.password = passwd;
@@ -307,7 +307,7 @@ void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, cons
 	TQDataStream input( params, IO_WriteOnly );
 	input << info << ( long int )0;
 
-	if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(KIO::AuthInfo,long int)",
+	if ( !callingDcopClient()->call( "kded", "kpasswdserver", "addAuthInfo(TDEIO::AuthInfo,long int)",
 			params, replyType, reply ) )
 		kdWarning( 500 ) << "Unable to initialize password, cannot communicate with kded_kpasswdserver" << endl;
 }
diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h
index 51cd09877..4ef54b894 100644
--- a/tdeprint/tdeprintd.h
+++ b/tdeprint/tdeprintd.h
@@ -28,7 +28,7 @@
 #include <tqintdict.h>
 
 class KPrintProcess;
-class KProcess;
+class TDEProcess;
 class StatusWindow;
 
 class KDEPrintd : public KDEDModule
diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp
index 443cc89e8..71d4a0680 100644
--- a/tdeprint/tests/drawdemo.cpp
+++ b/tdeprint/tests/drawdemo.cpp
@@ -14,7 +14,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqapplication.h>
 #include <math.h>
 
@@ -245,7 +245,7 @@ void DrawView::resizeEvent( TQResizeEvent * )
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "drawdemo" );
+    TDEApplication app( argc, argv, "drawdemo" );
     DrawView   draw;
     app.setMainWidget( &draw );
     draw.show();
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index 9f92734f4..54d160c73 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -13,8 +13,8 @@
 #include <tqstatusbar.h>
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
-#include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdemenubar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <tqtoolbutton.h>
 #include <tqiconset.h>
@@ -39,7 +39,7 @@
 
 HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
 			TQWidget* parent, const char *name )
-    : KMainWindow( parent, name, WDestructiveClose ),
+    : TDEMainWindow( parent, name, WDestructiveClose ),
       pathCombo( 0 ), selectedURL()
 {
     readHistory();
diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h
index c444b8144..2ff3d3649 100644
--- a/tdeprint/tests/helpwindow.h
+++ b/tdeprint/tests/helpwindow.h
@@ -11,7 +11,7 @@
 #ifndef HELPWINDOW_H
 #define HELPWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqtextbrowser.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
@@ -20,7 +20,7 @@
 class TQComboBox;
 class TQPopupMenu;
 
-class HelpWindow : public KMainWindow
+class HelpWindow : public TDEMainWindow
 {
     Q_OBJECT
 public:
diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp
index a1dc6b5e0..d714bcdf6 100644
--- a/tdeprint/tests/main.cpp
+++ b/tdeprint/tests/main.cpp
@@ -9,7 +9,7 @@
 *****************************************************************************/
 
 #include "helpwindow.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwindowsstyle.h>
 #include <tqstylesheet.h>
 #include <stdlib.h>
@@ -17,7 +17,7 @@
 
 int main( int argc, char ** argv )
 {
-    KApplication a(argc, argv, "helpviewer");
+    TDEApplication a(argc, argv, "helpviewer");
 
     TQString home;
     if (argc > 1)
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index e4bc1e6f2..9afff64ac 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -25,8 +25,8 @@
 #include <tqcheckbox.h>
 #include <tqaccel.h>
 #include <kdemacros.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
@@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
 {
 	m_hasoutput = false;
 
-	connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
-	connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)));
+	connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
+	connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
 
 	TQPushButton	*cleanbtn = new TQPushButton(this, "-c");
 	cleanbtn->setPixmap(DesktopIcon("exec"));
@@ -173,7 +173,7 @@ void EscpWidget::startCommand(const TQString& arg)
 		return;
 	}
 
-	TQString	exestr = KStandardDirs::findExe("escputil");
+	TQString	exestr = TDEStandardDirs::findExe("escputil");
 	if (exestr.isEmpty())
 	{
 		KMessageBox::error(this, i18n("The executable escputil cannot be found in your "
@@ -196,7 +196,7 @@ void EscpWidget::startCommand(const TQString& arg)
 	m_hasoutput = ( arg == "-i" || arg == "-d" );
 	for ( TQValueList<TQCString>::ConstIterator it=m_proc.args().begin(); it!=m_proc.args().end(); ++it )
 		kdDebug() << "ARG: " << *it << endl;
-	if (m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput))
+	if (m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput))
 		setEnabled(false);
 	else
 	{
@@ -206,7 +206,7 @@ void EscpWidget::startCommand(const TQString& arg)
 	}
 }
 
-void EscpWidget::slotProcessExited(KProcess*)
+void EscpWidget::slotProcessExited(TDEProcess*)
 {
 	setEnabled(true);
 	if (!m_proc.normalExit() || m_proc.exitStatus() != 0)
@@ -229,13 +229,13 @@ void EscpWidget::slotProcessExited(KProcess*)
 	m_hasoutput = false;
 }
 
-void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len)
+void EscpWidget::slotReceivedStdout(TDEProcess*, char *buf, int len)
 {
 	TQString	bufstr = TQCString(buf, len);
 	m_outbuffer.append(bufstr);
 }
 
-void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len)
+void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len)
 {
 	TQString	bufstr = TQCString(buf, len);
 	m_errorbuffer.append(bufstr);
diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h
index 7e3ba55e8..4ad284d00 100644
--- a/tdeprint/tools/escputil/escpwidget.h
+++ b/tdeprint/tools/escputil/escpwidget.h
@@ -37,16 +37,16 @@ public:
 	void setPrinterName(const TQString&);
 
 protected slots:
-	void slotReceivedStdout(KProcess*, char*, int);
-	void slotReceivedStderr(KProcess*, char*, int);
-	void slotProcessExited(KProcess*);
+	void slotReceivedStdout(TDEProcess*, char*, int);
+	void slotReceivedStderr(TDEProcess*, char*, int);
+	void slotProcessExited(TDEProcess*);
 	void slotButtonClicked();
 
 protected:
 	void startCommand(const TQString& arg);
 
 private:
-	KProcess	m_proc;
+	TDEProcess	m_proc;
 	KURL		m_deviceURL;
 	TQString		m_errorbuffer, m_outbuffer;
 	TQLabel		*m_printer, *m_device;
diff --git a/tdeprint/util.h b/tdeprint/util.h
index dafcdaa90..75811aee6 100644
--- a/tdeprint/util.h
+++ b/tdeprint/util.h
@@ -23,7 +23,7 @@
 #include "kprinter.h"
 #include <tqstring.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KURL smbToUrl(const TQString& work, const TQString& server, const TQString& printer);
 void urlToSmb(const KURL& url, TQString& work, TQString& server, TQString& printer);
diff --git a/krandr/CMakeLists.txt b/tderandr/CMakeLists.txt
index 4a6d1803d..efcd8519d 100644
--- a/krandr/CMakeLists.txt
+++ b/tderandr/CMakeLists.txt
@@ -28,16 +28,16 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    randr.h lowlevel_randr.h ktimerdialog.h libkrandr.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/libkrandr )
+    randr.h lowlevel_randr.h ktimerdialog.h libtderandr.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libtderandr )
 
 
-##### krandr ####################################
+##### tderandr ####################################
 
-set( target krandr )
+set( target tderandr )
 
 set( ${target}_SRCS
-  randr.cpp lowlevel_randr.c ktimerdialog.cpp libkrandr.cc
+  randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cc
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/krandr/Mainpage.dox b/tderandr/Mainpage.dox
index c173d52aa..c173d52aa 100644
--- a/krandr/Mainpage.dox
+++ b/tderandr/Mainpage.dox
diff --git a/tderandr/Makefile.am b/tderandr/Makefile.am
new file mode 100644
index 000000000..7818014df
--- /dev/null
+++ b/tderandr/Makefile.am
@@ -0,0 +1,19 @@
+
+INCLUDES =  -I$(srcdir)/.. $(all_includes)
+
+# For the future: examine if condensing the tons of *_LDFLAGS variables
+# into $(all_libraries) isn't better
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+
+libtderandrincludedir = $(includedir)/libtderandr
+libtderandrinclude_HEADERS = randr.h lowlevel_randr.h ktimerdialog.h libtderandr.h
+
+lib_LTLIBRARIES = libtderandr.la
+libtderandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cc
+METASOURCES = AUTO
+
+libtderandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
+libtderandr_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR)
+
+DOXYGEN_REFERENCES = tdecore
+include ../admin/Doxyfile.am
diff --git a/krandr/configure.in.in b/tderandr/configure.in.in
index 6feca241b..3dd4a9319 100644
--- a/krandr/configure.in.in
+++ b/tderandr/configure.in.in
@@ -17,5 +17,5 @@ fi
 AC_SUBST(LIB_XRANDR)
 AM_CONDITIONAL(system_has_xrandr, test -n "$RANDR_SUBDIR")
 if test $system_has_xrandr = no; then
-  DO_NOT_COMPILE="$DO_NOT_COMPILE libkrandr"
+  DO_NOT_COMPILE="$DO_NOT_COMPILE libtderandr"
 fi
diff --git a/krandr/ktimerdialog.cpp b/tderandr/ktimerdialog.cpp
index 0be416be7..eba497372 100644
--- a/krandr/ktimerdialog.cpp
+++ b/tderandr/ktimerdialog.cpp
@@ -29,7 +29,7 @@
 #include <twin.h>
 #include <kiconloader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "ktimerdialog.h"
diff --git a/krandr/ktimerdialog.h b/tderandr/ktimerdialog.h
index 965a72393..965a72393 100644
--- a/krandr/ktimerdialog.h
+++ b/tderandr/ktimerdialog.h
diff --git a/krandr/libkrandr.cc b/tderandr/libtderandr.cc
index 923b9f1a0..fe9461715 100644
--- a/krandr/libkrandr.cc
+++ b/tderandr/libtderandr.cc
@@ -1,4 +1,4 @@
-/*  libkrandr.cc     - class KRandr that makes it easy to use XRandr in KDE
+/*  libtderandr.cc     - class KRandr that makes it easy to use XRandr in KDE
     This file is part of KRandr 0.9.5
     Copyright (C) 2010  Timothy Pearson
     LibKRandr's homepage : http://www.trinitydesktop.org
@@ -26,15 +26,15 @@
 #include <tqtimer.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeapplication.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <cmath>
 
-#include "libkrandr.h"
+#include "libtderandr.h"
 
 #include <X11/extensions/dpms.h>
 
diff --git a/krandr/libkrandr.h b/tderandr/libtderandr.h
index 3e00d73f7..0e07ad96e 100644
--- a/krandr/libkrandr.h
+++ b/tderandr/libtderandr.h
@@ -1,4 +1,4 @@
-/*  libkrandr.h     - class KRandr that makes it easy to use XRandr in KDE
+/*  libtderandr.h     - class KRandr that makes it easy to use XRandr in KDE
     This file is part of KRandr 0.9.5
     Copyright (C) 2010  Timothy Pearson
     LibKRandr's homepage : http://www.trinitydesktop.org
@@ -21,8 +21,8 @@
     Send comments and bug fixes to Timothy Pearson <kb9vqf@pearsoncomputing.net>
 
 ***************************************************************************/
-#ifndef _LIBKRANDR_H
-#define _LIBKRANDR_H
+#ifndef _LIBTDERANDR_H
+#define _LIBTDERANDR_H
 
 #include "randr.h"
 #include "lowlevel_randr.h"
@@ -31,7 +31,7 @@
 
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <tdelibs_export.h>
 
@@ -41,16 +41,16 @@
 #define ROTATION_270_DEGREES_STRING "270 degrees"
 
 /**
- * Simple API covering most of the uses of libkrandr.
+ * Simple API covering most of the uses of libtderandr.
  *
  * You can use the members of this class in pure C applications, just by using
  * the same name as the corresponding function member.
  *
- * @short A simple API around the rest of libkrandr.
+ * @short A simple API around the rest of libtderandr.
  * @version 0.9.5 27/04/2010
  * @author Timothy Pearson <kb9vqf@pearsoncomputing.net>
  */
-class KRANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
+class TDERANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
 {
   private:
 
@@ -306,12 +306,12 @@ class KRANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
     bool kRandrHasRandr();
 
     /**
-     * Returns the version number of libkrandr, i.e. "0.9.5" or "1.0 Beta"
+     * Returns the version number of libtderandr, i.e. "0.9.5" or "1.0 Beta"
      */
     static const char *kRandrVersion(void);
 
     /**
-     * Returns the copyright notice that applications using libkrandr should print
+     * Returns the copyright notice that applications using libtderandr should print
      * to the user in an about box or somewhere visible.
      * I.e.
      *
@@ -326,27 +326,27 @@ class KRANDR_EXPORT KRandrSimpleAPI : public RandRDisplay
 extern "C" {
 
 #else
-#define KRANDR_EXPORT
+#define TDERANDR_EXPORT
 #endif
 
-// KRANDR_EXPORT ScreenInfo* read_screen_info(Display *);
-// KRANDR_EXPORT int         set_screen_size (ScreenInfo *screen_info);
-// KRANDR_EXPORT void        output_auto (ScreenInfo *screen_info, OutputInfo *output_info);
-// KRANDR_EXPORT void        output_off(ScreenInfo *screen_info, OutputInfo *output);
-// KRANDR_EXPORT CrtcInfo*   auto_find_crtc (ScreenInfo *screen_info, OutputInfo *output_info);
-// KRANDR_EXPORT XRRModeInfo *find_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id);
-// KRANDR_EXPORT int         mode_height (XRRModeInfo *mode_info, Rotation rotation);
-// KRANDR_EXPORT int         mode_width (XRRModeInfo *mode_info, Rotation rotation);
-// KRANDR_EXPORT int         get_width_by_output_id (ScreenInfo *screen_info, RROutput output_id);
-// KRANDR_EXPORT int         get_height_by_output_id (ScreenInfo *screen_info, RROutput output_id);
-// KRANDR_EXPORT char        *get_output_name (ScreenInfo *screen_info, RROutput id);
-// KRANDR_EXPORT Status      crtc_apply (CrtcInfo *crtc_info);
-// KRANDR_EXPORT Status      crtc_disable (CrtcInfo *crtc);
-// KRANDR_EXPORT int         main_low_apply (ScreenInfo *screen_info);
-// KRANDR_EXPORT bool        kRandrHasRandr();
-
-KRANDR_EXPORT const char  *kRandrVersion(void);
-KRANDR_EXPORT const char  *kRandrCopyright(void);
+// TDERANDR_EXPORT ScreenInfo* read_screen_info(Display *);
+// TDERANDR_EXPORT int         set_screen_size (ScreenInfo *screen_info);
+// TDERANDR_EXPORT void        output_auto (ScreenInfo *screen_info, OutputInfo *output_info);
+// TDERANDR_EXPORT void        output_off(ScreenInfo *screen_info, OutputInfo *output);
+// TDERANDR_EXPORT CrtcInfo*   auto_find_crtc (ScreenInfo *screen_info, OutputInfo *output_info);
+// TDERANDR_EXPORT XRRModeInfo *find_mode_by_xid (ScreenInfo *screen_info, RRMode mode_id);
+// TDERANDR_EXPORT int         mode_height (XRRModeInfo *mode_info, Rotation rotation);
+// TDERANDR_EXPORT int         mode_width (XRRModeInfo *mode_info, Rotation rotation);
+// TDERANDR_EXPORT int         get_width_by_output_id (ScreenInfo *screen_info, RROutput output_id);
+// TDERANDR_EXPORT int         get_height_by_output_id (ScreenInfo *screen_info, RROutput output_id);
+// TDERANDR_EXPORT char        *get_output_name (ScreenInfo *screen_info, RROutput id);
+// TDERANDR_EXPORT Status      crtc_apply (CrtcInfo *crtc_info);
+// TDERANDR_EXPORT Status      crtc_disable (CrtcInfo *crtc);
+// TDERANDR_EXPORT int         main_low_apply (ScreenInfo *screen_info);
+// TDERANDR_EXPORT bool        kRandrHasRandr();
+
+TDERANDR_EXPORT const char  *kRandrVersion(void);
+TDERANDR_EXPORT const char  *kRandrCopyright(void);
 
 #ifdef __cplusplus
 
diff --git a/krandr/lowlevel_randr.c b/tderandr/lowlevel_randr.c
index c7a2edc2a..c7a2edc2a 100644
--- a/krandr/lowlevel_randr.c
+++ b/tderandr/lowlevel_randr.c
diff --git a/krandr/lowlevel_randr.h b/tderandr/lowlevel_randr.h
index b5825e450..b5825e450 100644
--- a/krandr/lowlevel_randr.h
+++ b/tderandr/lowlevel_randr.h
diff --git a/krandr/randr.cpp b/tderandr/randr.cpp
index f1b1aae21..59fd0e8ae 100644
--- a/krandr/randr.cpp
+++ b/tderandr/randr.cpp
@@ -22,9 +22,9 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
 #include <kipc.h>
@@ -254,7 +254,7 @@ KDE_EXPORT bool RandRScreen::confirm()
 	// FIXME remember to put the dialog on the right screen
 
 	KTimerDialog acceptDialog ( 15000, KTimerDialog::CountDown,
-                KApplication::kApplication()->mainWidget(),
+                TDEApplication::kApplication()->mainWidget(),
 											"mainKTimerDialog",
 											true,
 											i18n("Confirm Display Setting Change"),
@@ -649,7 +649,7 @@ KDE_EXPORT bool RandRScreen::proposeSize(int newSize)
 	return false;
 }
 
-KDE_EXPORT void RandRScreen::load(KConfig& config)
+KDE_EXPORT void RandRScreen::load(TDEConfig& config)
 {
 	config.setGroup(TQString("Screen%1").arg(m_screen));
 
@@ -659,7 +659,7 @@ KDE_EXPORT void RandRScreen::load(KConfig& config)
 	proposeRotation(rotationDegreeToIndex(config.readNumEntry("rotation", 0)) + (config.readBoolEntry("reflectX") ? ReflectX : 0) + (config.readBoolEntry("reflectY") ? ReflectY : 0));
 }
 
-KDE_EXPORT void RandRScreen::save(KConfig& config) const
+KDE_EXPORT void RandRScreen::save(TDEConfig& config) const
 {
 	config.setGroup(TQString("Screen%1").arg(m_screen));
 	config.writeEntry("width", currentPixelWidth());
@@ -782,7 +782,7 @@ KDE_EXPORT RandRScreen* RandRDisplay::currentScreen()
 	return m_currentScreen;
 }
 
-KDE_EXPORT bool RandRDisplay::loadDisplay(KConfig& config, bool loadScreens)
+KDE_EXPORT bool RandRDisplay::loadDisplay(TDEConfig& config, bool loadScreens)
 {
 	if (loadScreens)
 		for (RandRScreen* s = m_screens.first(); s; s = m_screens.next())
@@ -791,19 +791,19 @@ KDE_EXPORT bool RandRDisplay::loadDisplay(KConfig& config, bool loadScreens)
 	return applyOnStartup(config);
 }
 
-KDE_EXPORT bool RandRDisplay::applyOnStartup(KConfig& config)
+KDE_EXPORT bool RandRDisplay::applyOnStartup(TDEConfig& config)
 {
 	config.setGroup("Display");
 	return config.readBoolEntry("ApplyOnStartup", false);
 }
 
-KDE_EXPORT bool RandRDisplay::syncTrayApp(KConfig& config)
+KDE_EXPORT bool RandRDisplay::syncTrayApp(TDEConfig& config)
 {
 	config.setGroup("Display");
 	return config.readBoolEntry("SyncTrayApp", false);
 }
 
-KDE_EXPORT void RandRDisplay::saveDisplay(KConfig& config, bool applyOnStartup, bool syncTrayApp)
+KDE_EXPORT void RandRDisplay::saveDisplay(TDEConfig& config, bool applyOnStartup, bool syncTrayApp)
 {
 	Q_ASSERT(!config.isReadOnly());
 
@@ -846,7 +846,7 @@ KDE_EXPORT bool RandRScreen::showTestConfigurationDialog()
 	// FIXME remember to put the dialog on the right screen
 
 	KTimerDialog acceptDialog ( 15000, KTimerDialog::CountDown,
-                KApplication::kApplication()->mainWidget(),
+                TDEApplication::kApplication()->mainWidget(),
 											"mainKTimerDialog",
 											true,
 											i18n("Confirm Display Settings"),
diff --git a/krandr/randr.h b/tderandr/randr.h
index b4c830f02..9683f6b9b 100644
--- a/krandr/randr.h
+++ b/tderandr/randr.h
@@ -23,13 +23,13 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 
-#include <kcmodule.h>
-#include <kconfig.h>
+#include <tdecmodule.h>
+#include <tdeconfig.h>
 
 class KTimerDialog;
 class RandRScreenPrivate;
 
-class KRANDR_EXPORT HotPlugRule {
+class TDERANDR_EXPORT HotPlugRule {
 	public:
 		enum states {
 			AnyState		= 0,
@@ -49,7 +49,7 @@ class KRANDR_EXPORT HotPlugRule {
 
 typedef TQValueList< HotPlugRule > HotPlugRulesList;
 
-class KRANDR_EXPORT SingleScreenData {
+class TDERANDR_EXPORT SingleScreenData {
 	public:
 		SingleScreenData();
 		virtual ~SingleScreenData();
@@ -211,8 +211,8 @@ public:
 	/**
 	 * Configuration functions.
 	 */
-	void		load(KConfig& config);
-	void		save(KConfig& config) const;
+	void		load(TDEConfig& config);
+	void		save(TDEConfig& config) const;
 
 private:
 	RandRScreenPrivate*	d;
@@ -271,15 +271,15 @@ public:
 	/**
 	 * Loads saved settings.
 	 *
-	 * @param config the KConfig object to load from
+	 * @param config the TDEConfig object to load from
 	 * @param loadScreens whether to call RandRScreen::load() for each screen
 	 * @retuns true if the settings should be applied on KDE startup.
 	 */
-	bool	loadDisplay(KConfig& config, bool loadScreens = true);
-	void	saveDisplay(KConfig& config, bool applyOnStartup, bool syncTrayApp);
+	bool	loadDisplay(TDEConfig& config, bool loadScreens = true);
+	void	saveDisplay(TDEConfig& config, bool applyOnStartup, bool syncTrayApp);
 
-	static bool		applyOnStartup(KConfig& config);
-	static bool		syncTrayApp(KConfig& config);
+	static bool		applyOnStartup(TDEConfig& config);
+	static bool		syncTrayApp(TDEConfig& config);
 
 	void	applyProposed(bool confirm = true);
 
diff --git a/kresources/CMakeLists.txt b/tderesources/CMakeLists.txt
index f6932baaa..bb4e957e0 100644
--- a/kresources/CMakeLists.txt
+++ b/tderesources/CMakeLists.txt
@@ -17,9 +17,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${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
 )
 
 link_directories(
@@ -33,20 +33,20 @@ install( FILES
     resource.h configwidget.h factory.h manageriface.h
     managerimpl.h manager.h selectdialog.h configdialog.h
     configpage.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kresources )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tderesources )
 
 
 ##### other data ################################
 
-install( FILES kresources_plugin.desktop kresources_manager.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+install( FILES tderesources_plugin.desktop tderesources_manager.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
-# FIXME what is xdg_apps_DATA = kresources.desktop
-install( FILES kresources.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+# FIXME what is xdg_apps_DATA = tderesources.desktop
+install( FILES tderesources.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kresources ################################
+##### tderesources ################################
 
-set( target kresources )
+set( target tderesources )
 
 set( ${target}_SRCS
   resource.cpp factory.cpp managerimpl.cpp configwidget.cpp
@@ -57,22 +57,22 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
 
 
-##### kcm_kresources ############################
+##### kcm_tderesources ############################
 
-set( target kcm_kresources )
+set( target kcm_tderesources )
 
 set( ${target}_SRCS
-  kcmkresources.cpp
+  kcmtderesources.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kresources-shared
+  LINK tderesources-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tderesources/Makefile.am b/tderesources/Makefile.am
new file mode 100644
index 000000000..fb7040ef5
--- /dev/null
+++ b/tderesources/Makefile.am
@@ -0,0 +1,49 @@
+INCLUDES = $(all_includes)
+
+METASOURCES = AUTO
+
+lib_LTLIBRARIES = libtderesources.la
+
+libtderesources_la_SOURCES = resource.cpp \
+  factory.cpp \
+  manageriface.skel \
+  manageriface.stub \
+  managerimpl.cpp \
+  configwidget.cpp \
+  configdialog.cpp \
+  selectdialog.cpp \
+  configpage.cpp
+
+libtderesources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+libtderesources_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+
+kresincludedir = $(includedir)/tderesources
+kresinclude_HEADERS = resource.h \
+  configwidget.h \
+  factory.h \
+  manageriface.h \
+  managerimpl.h \
+  manager.h \
+  selectdialog.h \
+  configdialog.h \
+  configpage.h
+
+kde_module_LTLIBRARIES = kcm_tderesources.la
+
+kcm_tderesources_la_SOURCES = kcmtderesources.cpp
+kcm_tderesources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+kcm_tderesources_la_LIBADD = libtderesources.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+
+
+check_PROGRAMS = testresources
+
+testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testresources_LDADD   = libtderesources.la
+testresources_SOURCES = testresources.cpp
+
+xdg_apps_DATA = tderesources.desktop
+
+servicetypedir = $(kde_servicetypesdir)
+servicetype_DATA = tderesources_plugin.desktop tderesources_manager.desktop
+
+include ../admin/Doxyfile.am
diff --git a/kresources/README.design b/tderesources/README.design
index b2163c8b7..d1fa62b91 100644
--- a/kresources/README.design
+++ b/tderesources/README.design
@@ -1,11 +1,11 @@
-kresources
+tderesources
 README.design
 
 KDE RESOURCES
 -------------
 The KDE Resource framework can be used to manage resources of 
 different types, organized in families. The Resource framework is 
-currently used for addressbook resources in tdelibs/kabc and for 
+currently used for addressbook resources in tdelibs/tdeabc and for 
 calendar resources in libkcal.
 A resource family represents stores of information of a certain kind
 (appointments, contacts). A resource type class represents a way in 
@@ -41,7 +41,7 @@ Both Exchange-based calendar resources are objects of the same
 type, but with different settings. These resources are persistent,
 and they are managed by the ResourceManager for the calendar
 resource family. The list of resources, and the settings for
-each resource, are stored by the resource manager using KConfig,
+each resource, are stored by the resource manager using TDEConfig,
 in $HOME/.trinity/share/config/<family>.
 
 The resource manager is a singleton object for every resource family. 
@@ -112,7 +112,7 @@ with libkcal:
 The "exchange" calendar resource is compiled in a separate 
 library, dynamically loaded by the resource manager if 
 resources of this type are used. This resource is in
-tdepim/kresources/exchange:
+tdepim/tderesources/exchange:
 - resourceexchange.{h,cpp}
   Defines the exchange resource
 - resourceexchangeconfig.{h,cpp}
diff --git a/kresources/TODO b/tderesources/TODO
index 5034327a7..5034327a7 100644
--- a/kresources/TODO
+++ b/tderesources/TODO
diff --git a/kresources/configdialog.cpp b/tderesources/configdialog.cpp
index bbebc47a3..4eb528835 100644
--- a/kresources/configdialog.cpp
+++ b/tderesources/configdialog.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -21,9 +21,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
@@ -36,7 +36,7 @@
 using namespace KRES;
 
 ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
-    /*const TQString& type,*/ Resource* resource, /*KConfig *config, */const char *name )
+    /*const TQString& type,*/ Resource* resource, /*TDEConfig *config, */const char *name )
   : KDialogBase( parent, name, true, i18n( "Resource Configuration" ),
     Ok|Cancel, Ok, false )/*, mConfig( config )*/, mResource( resource )
 {
diff --git a/kresources/configdialog.h b/tderesources/configdialog.h
index 9e7809bb1..94f5ab107 100644
--- a/kresources/configdialog.h
+++ b/tderesources/configdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_CONFIGDIALOG_H
-#define KRESOURCES_CONFIGDIALOG_H
+#ifndef TDERESOURCES_CONFIGDIALOG_H
+#define TDERESOURCES_CONFIGDIALOG_H
 
 #include <kdialogbase.h>
 
@@ -32,7 +32,7 @@ namespace KRES {
   class Resource;
   class ConfigWidget;
 
-class KRESOURCES_EXPORT ConfigDialog : public KDialogBase
+class TDERESOURCES_EXPORT ConfigDialog : public KDialogBase
 {
     Q_OBJECT
   public:
diff --git a/kresources/configpage.cpp b/tderesources/configpage.cpp
index a3db58de6..8378707e6 100644
--- a/kresources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -25,15 +25,15 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kbuttonbox.h>
 #include <ktrader.h>
 #include <kinputdialog.h>
@@ -45,7 +45,7 @@
 
 namespace KRES {
 
-ResourcePageInfo::ResourcePageInfo() : KShared() {
+ResourcePageInfo::ResourcePageInfo() : TDEShared() {
   mManager = 0L;
   mConfig = 0L;
 }
@@ -113,7 +113,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
   mFamilyCombo = new KComboBox( false, groupBox );
   groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 );
 
-  mListView = new KListView( groupBox );
+  mListView = new TDEListView( groupBox );
   mListView->setAllColumnsShowFocus( true );
   mListView->setFullWidth( true );
   mListView->addColumn( i18n( "Name" ) );
@@ -145,7 +145,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
 
   mLastItem = 0;
 
-  mConfig = new KConfig( "kcmkresourcesrc" );
+  mConfig = new TDEConfig( "kcmtderesourcesrc" );
   mConfig->setGroup( "General" );
 
   load();
@@ -153,7 +153,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
 
 ConfigPage::~ConfigPage()
 {
-  TQValueList<KSharedPtr<ResourcePageInfo> >::Iterator it;
+  TQValueList<TDESharedPtr<ResourcePageInfo> >::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) {
     (*it)->mManager->removeObserver( this );
   }
@@ -174,17 +174,17 @@ void ConfigPage::load()
 
   // KDE-3.3 compatibility code: get families from the plugins
   TQStringList compatFamilyNames;
-  const KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin" );
-  KTrader::OfferList::ConstIterator it = plugins.begin();
-  KTrader::OfferList::ConstIterator end = plugins.end();
+  const TDETrader::OfferList plugins = TDETrader::self()->query( "KResources/Plugin" );
+  TDETrader::OfferList::ConstIterator it = plugins.begin();
+  TDETrader::OfferList::ConstIterator end = plugins.end();
   for ( ; it != end; ++it ) {
     const TQString family = (*it)->property( "X-TDE-ResourceFamily" ).toString();
     if ( compatFamilyNames.find( family ) == compatFamilyNames.end() )
         compatFamilyNames.append( family );
   }
 
-  const KTrader::OfferList managers = KTrader::self()->query( "KResources/Manager" );
-  KTrader::OfferList::ConstIterator m_it;
+  const TDETrader::OfferList managers = TDETrader::self()->query( "KResources/Manager" );
+  TDETrader::OfferList::ConstIterator m_it;
   for( m_it = managers.begin(); m_it != managers.end(); ++m_it ) {
     TQString displayName = (*m_it)->property( "Name" ).toString();
     familyDisplayNames.append( displayName );
@@ -223,10 +223,10 @@ void ConfigPage::loadManager( const TQString& family )
 
       ResourcePageInfo *info = new ResourcePageInfo;
       info->mManager = mCurrentManager;
-      info->mConfig = new KConfig( KRES::ManagerImpl::defaultConfigFile( family ) );
+      info->mConfig = new TDEConfig( KRES::ManagerImpl::defaultConfigFile( family ) );
       info->mManager->readConfig( info->mConfig );
 
-      mInfoMap.append( KSharedPtr<ResourcePageInfo>(info) );
+      mInfoMap.append( TDESharedPtr<ResourcePageInfo>(info) );
   }
 }
 
@@ -234,7 +234,7 @@ void ConfigPage::save()
 {
   saveResourceSettings();
 
-  TQValueList<KSharedPtr<ResourcePageInfo> >::Iterator it;
+  TQValueList<TDESharedPtr<ResourcePageInfo> >::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it )
     (*it)->mManager->writeConfig( (*it)->mConfig );
 
diff --git a/kresources/configpage.h b/tderesources/configpage.h
index ec1fb3799..789735d5e 100644
--- a/kresources/configpage.h
+++ b/tderesources/configpage.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -20,8 +20,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KRESOURCES_CONFIGPAGE_H
-#define KRESOURCES_CONFIGPAGE_H
+#ifndef TDERESOURCES_CONFIGPAGE_H
+#define TDERESOURCES_CONFIGPAGE_H
 
 #include <ksharedptr.h>
 #include <tqstringlist.h>
@@ -30,26 +30,26 @@
 #include "manager.h"
 
 class KComboBox;
-class KListView;
+class TDEListView;
 
 class TQListViewItem;
 class TQPushButton;
 
 namespace KRES {
 
-class KRESOURCES_EXPORT ResourcePageInfo : public KShared
+class TDERESOURCES_EXPORT ResourcePageInfo : public TDEShared
 {
   public:
     ResourcePageInfo();
     ~ResourcePageInfo();
     Manager<Resource> *mManager;
-    KConfig *mConfig;
+    TDEConfig *mConfig;
 };
 
 class Resource;
 class ConfigViewItem;
 
-class KRESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Resource>
+class TDERESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Resource>
 {
   Q_OBJECT
 
@@ -89,14 +89,14 @@ class KRESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Res
     void saveResourceSettings();
 
     Manager<Resource>* mCurrentManager;
-    KConfig* mCurrentConfig;
-    KConfig* mConfig;
+    TDEConfig* mCurrentConfig;
+    TDEConfig* mConfig;
     TQString mFamily;
     TQStringList mFamilyMap;
-    TQValueList<KSharedPtr<ResourcePageInfo> > mInfoMap;
+    TQValueList<TDESharedPtr<ResourcePageInfo> > mInfoMap;
 
     KComboBox* mFamilyCombo;
-    KListView* mListView;
+    TDEListView* mListView;
     TQPushButton* mAddButton;
     TQPushButton* mRemoveButton;
     TQPushButton* mEditButton;
diff --git a/kresources/configwidget.cpp b/tderesources/configwidget.cpp
index 5d6f0f6b1..7f203842c 100644
--- a/kresources/configwidget.cpp
+++ b/tderesources/configwidget.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
diff --git a/kresources/configwidget.h b/tderesources/configwidget.h
index 3a2fe3f55..a9d20aa8b 100644
--- a/kresources/configwidget.h
+++ b/tderesources/configwidget.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
 
@@ -19,18 +19,18 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_CONFIGWIDGET_H
-#define KRESOURCES_CONFIGWIDGET_H
+#ifndef TDERESOURCES_CONFIGWIDGET_H
+#define TDERESOURCES_CONFIGWIDGET_H
 
 #include "resource.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqwidget.h>
 
 namespace KRES {
 
-class KRESOURCES_EXPORT ConfigWidget : public TQWidget
+class TDERESOURCES_EXPORT ConfigWidget : public TQWidget
 {
     Q_OBJECT
   public:
diff --git a/kresources/factory.cpp b/tderesources/factory.cpp
index fa3ee6eaf..eea2d3673 100644
--- a/kresources/factory.cpp
+++ b/tderesources/factory.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -22,7 +22,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
@@ -58,9 +58,9 @@ Factory *Factory::self( const TQString& resourceFamily )
 Factory::Factory( const TQString& resourceFamily ) :
   mResourceFamily( resourceFamily )
 {
-  KTrader::OfferList plugins = KTrader::self()->query( "KResources/Plugin", TQString( "[X-TDE-ResourceFamily] == '%1'" )
+  TDETrader::OfferList plugins = TDETrader::self()->query( "KResources/Plugin", TQString( "[X-TDE-ResourceFamily] == '%1'" )
                                                 .arg( resourceFamily ) );
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     TQVariant type = (*it)->property( "X-TDE-ResourceType" );
     if ( !type.toString().isEmpty() )
@@ -125,7 +125,7 @@ TQString Factory::typeDescription( const TQString &type ) const
   return ptr->comment();
 }
 
-Resource *Factory::resource( const TQString& type, const KConfig *config )
+Resource *Factory::resource( const TQString& type, const TDEConfig *config )
 {
   kdDebug(5650) << "Factory::resource( " << type << ", config )" << endl;
 
diff --git a/kresources/factory.h b/tderesources/factory.h
index 925ff2e82..4ac5b63d8 100644
--- a/kresources/factory.h
+++ b/tderesources/factory.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -21,13 +21,13 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_FACTORY_H
-#define KRESOURCES_FACTORY_H
+#ifndef TDERESOURCES_FACTORY_H
+#define TDERESOURCES_FACTORY_H
 
 #include <tqdict.h>
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <ktrader.h>
 
@@ -45,21 +45,21 @@ namespace KRES {
  * Example:
  *
  * \code
- * KABC::Factory *factory = KABC::Factory::self( "contact" );
+ * TDEABC::Factory *factory = TDEABC::Factory::self( "contact" );
  *
  * // to allow a transparent configuration of resources, we have
- * // to use a kconfig object.
- * KConfig config( "tst" );
+ * // to use a tdeconfig object.
+ * TDEConfig config( "tst" );
  * config.writePathEntry( "FileName", "/home/foobar/test.vcf" );// resource dependend
  * config.writeEntry( "FileFormat", "vcard" );                  // resource dependend
  *
- * KABC::Resource *res = factory->resource( "file", &config );
+ * TDEABC::Resource *res = factory->resource( "file", &config );
  *
  * // do something with resource
  *
  * \endcode
  */
-class KRESOURCES_EXPORT Factory
+class TDERESOURCES_EXPORT Factory
 {
   public:
 
@@ -87,7 +87,7 @@ class KRESOURCES_EXPORT Factory
      * @param config The config object where the resource get it settings from,
      *               or 0 if a resource with default values should be created.
      */
-    Resource *resource( const TQString& type, const KConfig *config );
+    Resource *resource( const TQString& type, const TDEConfig *config );
 
     /**
      * Returns a list of all available resource types.
diff --git a/kresources/kcmkresources.cpp b/tderesources/kcmtderesources.cpp
index f517b5eac..c3d5ae09e 100644
--- a/kresources/kcmkresources.cpp
+++ b/tderesources/kcmtderesources.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
@@ -21,29 +21,29 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configpage.h"
 
-#include "kcmkresources.h"
+#include "kcmtderesources.h"
 
 typedef KGenericFactory<KCMKResources, TQWidget> ResourcesFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kresources, ResourcesFactory( "kcmkresources" ) )
+K_EXPORT_COMPONENT_FACTORY( kcm_tderesources, ResourcesFactory( "kcmtderesources" ) )
 
 KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQStringList& )
-  : KCModule( ResourcesFactory::instance(), parent, name )
+  : TDECModule( ResourcesFactory::instance(), parent, name )
 {
   TQVBoxLayout *layout = new TQVBoxLayout( this );
   mConfigPage = new KRES::ConfigPage( this );
   layout->addWidget( mConfigPage );
   connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
   setButtons( Help | Apply );
-  KAboutData *about =
-   new KAboutData( I18N_NOOP( "kcmkresources" ),
+  TDEAboutData *about =
+   new TDEAboutData( I18N_NOOP( "kcmtderesources" ),
                    I18N_NOOP( "TDE Resources configuration module" ),
-                   0, 0, KAboutData::License_GPL,
+                   0, 0, TDEAboutData::License_GPL,
                    I18N_NOOP( "(c) 2003 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
@@ -65,4 +65,4 @@ void KCMKResources::defaults()
   mConfigPage->defaults();
 }
 
-#include "kcmkresources.moc"
+#include "kcmtderesources.moc"
diff --git a/kresources/kcmkresources.h b/tderesources/kcmtderesources.h
index 97a3183e0..08bf7ca4d 100644
--- a/kresources/kcmkresources.h
+++ b/tderesources/kcmtderesources.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
@@ -19,12 +19,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_KCMKRESOURCES_H
-#define KRESOURCES_KCMKRESOURCES_H
+#ifndef TDERESOURCES_KCMTDERESOURCES_H
+#define TDERESOURCES_KCMTDERESOURCES_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 
-class KRESOURCES_EXPORT KCMKResources : public KCModule
+class TDERESOURCES_EXPORT KCMKResources : public TDECModule
 {
   Q_OBJECT
 
diff --git a/kresources/manager.h b/tderesources/manager.h
index ab1562716..676f3bf4a 100644
--- a/kresources/manager.h
+++ b/tderesources/manager.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -21,15 +21,15 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_MANAGER_H
-#define KRESOURCES_MANAGER_H
+#ifndef TDERESOURCES_MANAGER_H
+#define TDERESOURCES_MANAGER_H
 
 #include <tqdict.h>
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <kresources/factory.h>
-#include <kresources/managerimpl.h>
+#include <tderesources/factory.h>
+#include <tderesources/managerimpl.h>
 
 namespace KRES {
 
@@ -227,7 +227,7 @@ class Manager : private ManagerNotifier
       Recreate Resource objects from configuration file. If cfg is 0, read
       standard configuration file determined by family name.
     */
-    void readConfig( KConfig *cfg = 0 )
+    void readConfig( TDEConfig *cfg = 0 )
     {
       mImpl->readConfig( cfg );
     }
@@ -236,7 +236,7 @@ class Manager : private ManagerNotifier
       Write configuration of Resource objects to configuration file. If cfg is
       0, write to standard configuration file determined by family name.
     */
-    void writeConfig( KConfig *cfg = 0 )
+    void writeConfig( TDEConfig *cfg = 0 )
     {
       mImpl->writeConfig( cfg );
     }
diff --git a/kresources/manageriface.h b/tderesources/manageriface.h
index 8f82ea4b7..1c788a605 100644
--- a/kresources/manageriface.h
+++ b/tderesources/manageriface.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
@@ -26,7 +26,7 @@
 
 namespace KRES {
 
-class KRESOURCES_EXPORT ManagerIface : virtual public DCOPObject
+class TDERESOURCES_EXPORT ManagerIface : virtual public DCOPObject
 {
   K_DCOP
 
diff --git a/kresources/managerimpl.cpp b/tderesources/managerimpl.cpp
index b5d9ec32f..288a40223 100644
--- a/kresources/managerimpl.cpp
+++ b/tderesources/managerimpl.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
     
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -23,10 +23,10 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "resource.h"
@@ -45,7 +45,7 @@ ManagerImpl::ManagerImpl( ManagerNotifier *notifier, const TQString &family )
 {
   kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl;
 
-  mId = KApplication::randomString( 8 );
+  mId = TDEApplication::randomString( 8 );
 
   // Register with DCOP
   if ( !kapp->dcopClient()->isRegistered() ) {
@@ -88,13 +88,13 @@ void ManagerImpl::createStandardConfig()
 {
   if ( !mStdConfig ) {
     TQString file = defaultConfigFile( mFamily );
-    mStdConfig = new KConfig( file );
+    mStdConfig = new TDEConfig( file );
   }
   
   mConfig = mStdConfig;
 }
 
-void ManagerImpl::readConfig( KConfig *cfg )
+void ManagerImpl::readConfig( TDEConfig *cfg )
 {
   kdDebug(5650) << "ManagerImpl::readConfig()" << endl;
 
@@ -123,7 +123,7 @@ void ManagerImpl::readConfig( KConfig *cfg )
   mConfigRead = true;
 }
 
-void ManagerImpl::writeConfig( KConfig *cfg )
+void ManagerImpl::writeConfig( TDEConfig *cfg )
 {
   kdDebug(5650) << "ManagerImpl::writeConfig()" << endl;
 
@@ -444,5 +444,5 @@ Resource *ManagerImpl::getResource( const TQString &identifier )
 
 TQString ManagerImpl::defaultConfigFile( const TQString &family )
 {
-  return TQString( "kresources/%1/stdrc" ).arg( family );
+  return TQString( "tderesources/%1/stdrc" ).arg( family );
 }
diff --git a/kresources/managerimpl.h b/tderesources/managerimpl.h
index e86ea3d9d..80b70d59d 100644
--- a/kresources/managerimpl.h
+++ b/tderesources/managerimpl.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -20,17 +20,17 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KRESOURCES_MANAGERIMPL_H
-#define KRESOURCES_MANAGERIMPL_H
+#ifndef TDERESOURCES_MANAGERIMPL_H
+#define TDERESOURCES_MANAGERIMPL_H
 
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqdict.h>
 
 #include "manageriface.h"
-#include <kresources/resource.h>
+#include <tderesources/resource.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KRES {
 
@@ -43,14 +43,14 @@ class ManagerNotifier;
 
   Do not use this class directly. Use ResourceManager instead
 */
-class KRESOURCES_EXPORT ManagerImpl : virtual public ManagerIface
+class TDERESOURCES_EXPORT ManagerImpl : virtual public ManagerIface
 {
   public:
     ManagerImpl( ManagerNotifier *, const TQString &family );
     ~ManagerImpl();
 
-    void readConfig( KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( TDEConfig * );
+    void writeConfig( TDEConfig * );
 
     void add( Resource *resource );
     void remove( Resource *resource );
@@ -90,8 +90,8 @@ class KRESOURCES_EXPORT ManagerImpl : virtual public ManagerIface
 
     ManagerNotifier *mNotifier;
     TQString mFamily;
-    KConfig *mConfig;
-    KConfig *mStdConfig;
+    TDEConfig *mConfig;
+    TDEConfig *mStdConfig;
     Resource *mStandard;
     Factory *mFactory;
     Resource::List mResources;
diff --git a/kresources/resource.cpp b/tderesources/resource.cpp
index b9cdd95c4..e6fc4ebbd 100644
--- a/kresources/resource.cpp
+++ b/tderesources/resource.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -22,9 +22,9 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 #include "resource.h"
 
 using namespace KRES;
@@ -44,7 +44,7 @@ class Resource::ResourcePrivate
     bool mIsOpen;
 };
 
-Resource::Resource( const KConfig* config )
+Resource::Resource( const TDEConfig* config )
   : TQObject( 0, "" ), d( new ResourcePrivate )
 {
   d->mOpenCount = 0;
@@ -61,7 +61,7 @@ Resource::Resource( const KConfig* config )
     d->mName = i18n("resource");
     d->mReadOnly = false;
     d->mActive = true;
-    d->mIdentifier = KApplication::randomString( 10 );
+    d->mIdentifier = TDEApplication::randomString( 10 );
   }
 }
 
@@ -71,7 +71,7 @@ Resource::~Resource()
   d = 0;
 }
 
-void Resource::writeConfig( KConfig* config )
+void Resource::writeConfig( TDEConfig* config )
 {
   kdDebug(5650) << "Resource::writeConfig()" << endl;
 
diff --git a/kresources/resource.h b/tderesources/resource.h
index f5587ed09..b7e4eeedc 100644
--- a/kresources/resource.h
+++ b/tderesources/resource.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources
+    This file is part of libtderesources
 
     Copyright (c) 2001-2003 Cornelius Schumacher <schumacher@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -19,8 +19,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KRESOURCES_RESOURCE_H
-#define KRESOURCES_RESOURCE_H
+#ifndef TDERESOURCES_RESOURCE_H
+#define TDERESOURCES_RESOURCE_H
 
 #include <tqmutex.h>
 #include <tqvaluelist.h>
@@ -28,7 +28,7 @@
 
 #include <klibloader.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KRES {
 
@@ -66,15 +66,15 @@ class ConfigWidget;
  
   <B>resourceexample.h</B>:
 \code
-#include <kconfig.h>
-#include <kresources/resource.h>
+#include <tdeconfig.h>
+#include <tderesources/resource.h>
 
 class ResourceExample : public KRES::Resource
 {
   public:
-    ResourceExample( const KConfig * );
+    ResourceExample( const TDEConfig * );
     ~ResourceExample();
-    void writeConfig( KConfig *config );
+    void writeConfig( TDEConfig *config );
 
   private:
     TQString mLocation;
@@ -84,11 +84,11 @@ class ResourceExample : public KRES::Resource
 
   <B>resourceexample.cpp</B>:
 \code
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "resourceexample.h"
 
-ResourceExample::ResourceExample( const KConfig *config )
+ResourceExample::ResourceExample( const TDEConfig *config )
     : Resource( config )
 {
   if ( config ) {
@@ -100,7 +100,7 @@ ResourceExample::ResourceExample( const KConfig *config )
   }
 }
 
-void ResourceExample::writeConfig( KConfig *config )
+void ResourceExample::writeConfig( TDEConfig *config )
 {
   KRES::Resource::writeConfig( config );
   config->writePathEntry( "Location", mLocation );
@@ -113,7 +113,7 @@ extern "C"
     return new ResourceExampleConfig( parent, "Configure Example Resource" );
   }
 
-  KRES::Resource *resource( const KConfig *config ) {
+  KRES::Resource *resource( const TDEConfig *config ) {
     return new ResourceExample( config );
   }
 }
@@ -122,7 +122,7 @@ extern "C"
   <B>resourceexampleconfig.h</B>:
 \code
 #include <klineedit.h>
-#include <kresources/resourceconfigwidget.h>
+#include <tderesources/resourceconfigwidget.h>
 
 #include "resourceexample.h"
 
@@ -146,7 +146,7 @@ class ResourceExampleConfig : public KRES::ResourceConfigWidget
 \code
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <kresources/resourceconfigwidget.h>
+#include <tderesources/resourceconfigwidget.h>
 #include "resourceexample.h"
 #include "resourceexampleconfig.h"
 
@@ -208,7 +208,7 @@ kde_module_LTLIBRARIES = resourceexample.la
 
 resourceexample_la_SOURCES = resourceexample.cpp resourceexampleconfig.cpp
 resourceexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-resourceexample_la_LIBADD = -lkresources
+resourceexample_la_LIBADD = -ltderesources
 
 servicedir = $(kde_datadir)/resources/example
 service_DATA = resourceexample.desktop
@@ -237,7 +237,7 @@ service_DATA = resourceexample.desktop
   - Different application ususally share the same set of Resources.
 
   The Resource base class provides the management functionality. Classes
-  inheriting from Resource automatically appear in the general kresources
+  inheriting from Resource automatically appear in the general tderesources
   kcontrol module.
 
   Concrete functionality of Resources is specified per family by a subclass of
@@ -252,7 +252,7 @@ service_DATA = resourceexample.desktop
   data. Subclasses of ResourceCalendar would implement this API for local files,
   remote files, specific calendar servers etc.
 */
-class KRESOURCES_EXPORT Resource : public TQObject
+class TDERESOURCES_EXPORT Resource : public TQObject
 {
     friend class Factory;
     friend class ManagerImpl;
@@ -266,7 +266,7 @@ class KRESOURCES_EXPORT Resource : public TQObject
      * @param config Configuration to read persistence information from.
      *               If config is 0, create object using default settings.
      */
-    Resource( const KConfig *config );
+    Resource( const TDEConfig *config );
 
     /**
      * Destructor.
@@ -279,7 +279,7 @@ class KRESOURCES_EXPORT Resource : public TQObject
      * or Terrible Things(TM) will happen.
      * @param config Configuration to write persistence information to.
      */
-    virtual void writeConfig( KConfig *config );
+    virtual void writeConfig( TDEConfig *config );
 
     /**
      * Open this resource, if it not already open. Increase the open
@@ -381,10 +381,10 @@ class KRESOURCES_EXPORT Resource : public TQObject
     ResourcePrivate *d;
 };
 
-class KRESOURCES_EXPORT PluginFactoryBase : public KLibFactory
+class TDERESOURCES_EXPORT PluginFactoryBase : public KLibFactory
 {
   public:
-    virtual Resource *resource( const KConfig *config ) = 0;
+    virtual Resource *resource( const TDEConfig *config ) = 0;
 
     virtual ConfigWidget *configWidget( TQWidget *parent ) = 0;
 
@@ -404,7 +404,7 @@ template<class TR,class TC>
 class PluginFactory : public PluginFactoryBase
 {
   public:
-    Resource *resource( const KConfig *config )
+    Resource *resource( const TDEConfig *config )
     {
       return new TR( config );
     }
diff --git a/kresources/selectdialog.cpp b/tderesources/selectdialog.cpp
index 3eb8ad332..c8009ae47 100644
--- a/kresources/selectdialog.cpp
+++ b/tderesources/selectdialog.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -22,9 +22,9 @@
 */
 
 #include <kbuttonbox.h>
-#include <klistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqgroupbox.h>
 #include <tqlayout.h>
@@ -48,7 +48,7 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent,
   TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal,  this );
   groupBox->setTitle( i18n( "Resources" ) );
 
-  mResourceId = new KListBox( groupBox );
+  mResourceId = new TDEListBox( groupBox );
 
   mainLayout->addWidget( groupBox );
 
diff --git a/kresources/selectdialog.h b/tderesources/selectdialog.h
index 26905e47b..b275a4d84 100644
--- a/kresources/selectdialog.h
+++ b/tderesources/selectdialog.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkresources.
+    This file is part of libtderesources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
@@ -21,8 +21,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KRESOURCES_SELECTDIALOG_H
-#define KRESOURCES_SELECTDIALOG_H
+#ifndef TDERESOURCES_SELECTDIALOG_H
+#define TDERESOURCES_SELECTDIALOG_H
 
 #include <tqobject.h>
 #include <tqptrlist.h>
@@ -30,7 +30,7 @@
 
 #include <kdialog.h>
 
-class KListBox;
+class TDEListBox;
 
 namespace KRES {
 
@@ -43,9 +43,9 @@ class Resource;
  *
  * \code
  *
- * TQPtrList<Resource> list = ... // can be retrived from KRES::Manager (e.g. KABC::AddressBook)
+ * TQPtrList<Resource> list = ... // can be retrived from KRES::Manager (e.g. TDEABC::AddressBook)
  *
- * KABC::Resource *res = KABC::SelectDialog::getResource( list, parentWdg );
+ * TDEABC::Resource *res = TDEABC::SelectDialog::getResource( list, parentWdg );
  * if ( !res ) {
  *   // no resource selected
  * } else {
@@ -53,7 +53,7 @@ class Resource;
  * }
  * \endcode
  */
-class KRESOURCES_EXPORT SelectDialog : KDialog
+class TDERESOURCES_EXPORT SelectDialog : KDialog
 {
   public:
     /**
@@ -77,7 +77,7 @@ class KRESOURCES_EXPORT SelectDialog : KDialog
     static Resource *getResource( TQPtrList<Resource> list, TQWidget *parent = 0 );
 
   private:
-    KListBox *mResourceId;
+    TDEListBox *mResourceId;
 
     TQMap<int, Resource*> mResourceMap;
 };
diff --git a/kresources/kresources.desktop b/tderesources/tderesources.desktop
index 5bc2cf768..245981de7 100644
--- a/kresources/kresources.desktop
+++ b/tderesources/tderesources.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Exec=kcmshell kresources
+Exec=tdecmshell tderesources
 Icon=about_kde
 Type=Application
 Terminal=false
 
 X-TDE-ModuleType=Library
-X-TDE-Library=kresources
-X-TDE-FactoryName=kresources
+X-TDE-Library=tderesources
+X-TDE-FactoryName=tderesources
 X-TDE-HasReadOnlyMode=false
 
 Name=TDE Resources
diff --git a/kresources/kresources_manager.desktop b/tderesources/tderesources_manager.desktop
index 35a0d1b5d..35a0d1b5d 100644
--- a/kresources/kresources_manager.desktop
+++ b/tderesources/tderesources_manager.desktop
diff --git a/kresources/kresources_plugin.desktop b/tderesources/tderesources_plugin.desktop
index 56cfe5bad..56cfe5bad 100644
--- a/kresources/kresources_plugin.desktop
+++ b/tderesources/tderesources_plugin.desktop
diff --git a/kresources/testresources.cpp b/tderesources/testresources.cpp
index 257f58ca1..7644315d4 100644
--- a/kresources/testresources.cpp
+++ b/tderesources/testresources.cpp
@@ -1,7 +1,7 @@
 #include <kdebug.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 
 #include "resource.h"
 #include "manager.h"
@@ -29,10 +29,10 @@ class TestSubResource : public TestResource
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "testresources", "Kresource Test", "0" );
-  KCmdLineArgs::init( argc, argv, &aboutData );
+  TDEAboutData aboutData( "testresources", "Kresource Test", "0" );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   Manager<TestResource> manager( "test" );
   
diff --git a/krsync/CMakeLists.txt b/tdersync/CMakeLists.txt
index 365429946..1ccc3220a 100644
--- a/krsync/CMakeLists.txt
+++ b/tdersync/CMakeLists.txt
@@ -18,8 +18,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
   ${CMAKE_SOURCE_DIR}/tdefx
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -30,21 +30,21 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    krsync.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/libkrsync )
+    tdersync.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/libtdersync )
 
 
-##### krsync ####################################
+##### tdersync ####################################
 
-set( target krsync )
+set( target tdersync )
 
 set( ${target}_SRCS
-  krsync.cpp rsyncconfigdialog.cpp
+  tdersync.cpp rsyncconfigdialog.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.1
-  LINK tdeui-shared kio-shared
+  LINK tdeui-shared tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/krsync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 5a983efb1..675044140 100644
--- a/krsync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -71,27 +71,27 @@
 #include <tqbuttongroup.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 
 #include <twin.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
-#include <kmessagebox.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kprogressbox.h>
 #include <kpassdlg.h>
-#include <klistview.h>
-#include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdelistview.h>
+#include <tdeapplication.h>
+#include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconviewsearchline.h>
 #include <kstaticdeleter.h>
 #include <kgenericfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include "rsyncconfigdialog.h"
 
diff --git a/krsync/rsyncconfigdialog.h b/tdersync/rsyncconfigdialog.h
index 3da9e6f79..2ce05b8db 100644
--- a/krsync/rsyncconfigdialog.h
+++ b/tdersync/rsyncconfigdialog.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
 #include <kdialogbase.h>
 
diff --git a/krsync/krsync.cpp b/tdersync/tdersync.cpp
index a9bf295a2..d940fd7a3 100644
--- a/krsync/krsync.cpp
+++ b/tdersync/tdersync.cpp
@@ -50,10 +50,10 @@
 #include <util.h>
 #endif
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
-#include "krsync.h"
+#include "tdersync.h"
 #include "rsyncconfigdialog.h"
 
 #define myDebug(x) kdDebug(7127) << __LINE__ << ": " x
@@ -428,7 +428,7 @@ KDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncfla
 /**
 writes one chunk of data to stdin of child process
 */
-KDE_EXPORT void KRsync::writeChild(const char *buf, KIO::fileoffset_t len) {
+KDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) {
     if (outBufPos >= 0 && outBuf) {
 #if 0
         TQString debug;
@@ -445,7 +445,7 @@ KDE_EXPORT void KRsync::writeChild(const char *buf, KIO::fileoffset_t len) {
 /**
 manages initial communication setup including password queries
 */
-KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) {
+KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len) {
     TQString buf;
     buf.setLatin1(buffer,len);
     int pos;
@@ -560,7 +560,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, KIO::fileoffset_t
 /**
 manages initial communication setup including password queries
 */
-KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath) {
+KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath) {
     TQString buf;
     buf.setLatin1(buffer,len);
     int pos;
@@ -775,7 +775,7 @@ KDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){
 
 KDE_EXPORT void KRsync::saveSettings()
 {
-  KConfig cfg ("rsyncrc", false, false);
+  TDEConfig cfg ("rsyncrc", false, false);
   cfg.setGroup ("General");
   cfg.writeEntry("LocalFolders", cfgfolderlist, CONFIGURATION_FILE_SEPARATOR);
   cfg.writeEntry("AutoSyncOnLogout", cfgautosync_onlogout_list, CONFIGURATION_FILE_SEPARATOR);
@@ -787,7 +787,7 @@ KDE_EXPORT void KRsync::loadSettings()
   if (m_bSettingsLoaded)
     return;
 
-  KConfig cfg ("rsyncrc", false, false);
+  TDEConfig cfg ("rsyncrc", false, false);
   cfg.setGroup ("General");
 
   cfgfolderlist = cfg.readListEntry("LocalFolders", CONFIGURATION_FILE_SEPARATOR);
@@ -1068,4 +1068,4 @@ KDE_EXPORT void KRsync::slotSync()
 	emit transferDone();
 }
 
-#include "krsync.moc"
+#include "tdersync.moc"
diff --git a/krsync/krsync.h b/tdersync/tdersync.h
index 6bca00827..b57c350a4 100644
--- a/krsync/krsync.h
+++ b/tdersync/tdersync.h
@@ -24,11 +24,11 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeparts/plugin.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 #include <tqfile.h>
 #include <tqtimer.h>
@@ -49,30 +49,30 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 
 #include <twin.h>
 #include <kurl.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
-#include <kmessagebox.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kprogressbox.h>
 #include <kpassdlg.h>
-#include <klistview.h>
-#include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdelistview.h>
+#include <tdeapplication.h>
+#include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <kiconviewsearchline.h>
 #include <kstaticdeleter.h>
 #include <kgenericfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
-class KActionMenu;
+class TDEActionMenu;
 class KonqDirPart;
 class KLineEdit;
 class RsyncConfigDialog;
@@ -103,17 +103,17 @@ public:
   int addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval);
   TQString findSyncMethodByName(TQString folderurl);
   /** manages initial communication setup including password queries */
-  int establishConnectionRsync(char *buffer, KIO::fileoffset_t len);
+  int establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len);
   /** manages initial communication setup including password queries */
-  int establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath);
+  int establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath);
   /** creates the unidirectional sync subprocess */
   bool syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath);
   /** creates the bidirectional sync subprocess */
   bool syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath);
   /** writes one chunk of data to stdin of child process */
-  void writeChild(const char *buf, KIO::fileoffset_t len);
+  void writeChild(const char *buf, TDEIO::fileoffset_t len);
   /** AuthInfo object used for logging in */
-  KIO::AuthInfo connectionAuth;
+  TDEIO::AuthInfo connectionAuth;
   /**
    Clean up connection
   */
@@ -158,9 +158,9 @@ private:
   /** buffer for data to be written */
   const char *outBuf;
   /** current write position in buffer */
-  KIO::fileoffset_t outBufPos;
+  TDEIO::fileoffset_t outBufPos;
   /** length of buffer */
-  KIO::fileoffset_t outBufLen;
+  TDEIO::fileoffset_t outBufLen;
   /** use su if true else use ssh */
   //bool local;
   /**  // FIXME: just a workaround for konq deficiencies */
diff --git a/kspell2/CMakeLists.txt b/tdespell2/CMakeLists.txt
index a6acda11f..01b910862 100644
--- a/kspell2/CMakeLists.txt
+++ b/tdespell2/CMakeLists.txt
@@ -20,9 +20,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kutils
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 link_directories(
@@ -35,17 +35,17 @@ link_directories(
 install( FILES
     settings.h filter.h dictionary.h broker.h
     backgroundchecker.h defaultdictionary.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kspell2 )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdespell2 )
 
 
 ##### other data ################################
 
-install( FILES kspellclient.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+install( FILES tdespellclient.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-#### kspell2base ################################
+#### tdespell2base ################################
 
-set( target kspell2base )
+set( target tdespell2base )
 
 set( ${target}_SRCS
   settings.cpp broker.cpp client.cpp filter.cpp
diff --git a/tdespell2/Makefile.am b/tdespell2/Makefile.am
new file mode 100644
index 000000000..00ee8a81d
--- /dev/null
+++ b/tdespell2/Makefile.am
@@ -0,0 +1,24 @@
+SUBDIRS = . ui tests plugins
+METASOURCES = AUTO
+
+noinst_LTLIBRARIES = libtdespell2base.la
+
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
+
+tdespell2baseincludedir = $(includedir)/tdespell2
+
+tdespell2baseinclude_HEADERS = settings.h filter.h \
+	dictionary.h broker.h \
+	backgroundchecker.h defaultdictionary.h 
+
+libtdespell2base_la_SOURCES = settings.cpp broker.cpp \
+	client.cpp filter.cpp backgroundchecker.cpp \
+	backgroundthread.cpp backgroundengine.cpp \
+	defaultdictionary.cpp 
+
+libtdespell2base_la_LDFLAGS = -no-undefined $(all_libraries)
+
+servicetype_DATA = tdespellclient.desktop
+servicetypedir = $(kde_servicetypesdir)
+
+include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kspell2/README b/tdespell2/README
index 6dfbc1601..53d6f4e27 100644
--- a/kspell2/README
+++ b/tdespell2/README
@@ -9,7 +9,7 @@ Dictionaries are abstracted in the KSpell::Dictionary object which
 encapsulates all spell-checking functionality.
 
 You'll notice that the Broker is being created via the 
-Broker::Ptr Broker::openBroker( KSharedConfig *config =0 );
+Broker::Ptr Broker::openBroker( TDESharedConfig *config =0 );
 call. The Broker is a shared object and the reason for this construct
 is very simple:
 - most application would need to have a few Broker objects (one for
@@ -43,8 +43,8 @@ synchronous so once you pass a word to check you don't have to wait
 for any signals - you get corrections right back.
 Sample usage of KSpell 2 looks like follows:
 
-#include <kspell_broker.h>
-#include <kspell_dictionary.h>
+#include <tdespell_broker.h>
+#include <tdespell_dictionary.h>
 using namespace KSpell;
 
 
diff --git a/kspell2/backgroundchecker.cpp b/tdespell2/backgroundchecker.cpp
index 799edf120..799edf120 100644
--- a/kspell2/backgroundchecker.cpp
+++ b/tdespell2/backgroundchecker.cpp
diff --git a/kspell2/backgroundchecker.h b/tdespell2/backgroundchecker.h
index 9346b0c89..9346b0c89 100644
--- a/kspell2/backgroundchecker.h
+++ b/tdespell2/backgroundchecker.h
diff --git a/kspell2/backgroundengine.cpp b/tdespell2/backgroundengine.cpp
index 9eafe1b2e..9eafe1b2e 100644
--- a/kspell2/backgroundengine.cpp
+++ b/tdespell2/backgroundengine.cpp
diff --git a/kspell2/backgroundengine.h b/tdespell2/backgroundengine.h
index d5bee8ca5..d5bee8ca5 100644
--- a/kspell2/backgroundengine.h
+++ b/tdespell2/backgroundengine.h
diff --git a/kspell2/backgroundthread.cpp b/tdespell2/backgroundthread.cpp
index 0f3471537..0f3471537 100644
--- a/kspell2/backgroundthread.cpp
+++ b/tdespell2/backgroundthread.cpp
diff --git a/kspell2/backgroundthread.h b/tdespell2/backgroundthread.h
index 12c631c2b..12c631c2b 100644
--- a/kspell2/backgroundthread.h
+++ b/tdespell2/backgroundthread.h
diff --git a/kspell2/broker.cpp b/tdespell2/broker.cpp
index 6d17c403f..ef8c07dac 100644
--- a/kspell2/broker.cpp
+++ b/tdespell2/broker.cpp
@@ -25,19 +25,19 @@
 #include "defaultdictionary.h"
 #include "dictionary.h"
 
-#include <kparts/plugin.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/componentfactory.h>
 
 #include <kplugininfo.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kdebug.h>
 
 #include <tqptrdict.h>
 #include <tqmap.h>
 
-#define DEFAULT_CONFIG_FILE   "kspellrc"
+#define DEFAULT_CONFIG_FILE   "tdespellrc"
 
 namespace KSpell2
 {
@@ -56,11 +56,11 @@ public:
 
 TQPtrDict<Broker> *Broker::s_brokers = 0;
 
-Broker *Broker::openBroker( KSharedConfig *config )
+Broker *Broker::openBroker( TDESharedConfig *config )
 {
-    KSharedConfig::Ptr preventDeletion;
+    TDESharedConfig::Ptr preventDeletion;
     if ( !config ) {
-        preventDeletion = KSharedConfig::openConfig( DEFAULT_CONFIG_FILE );
+        preventDeletion = TDESharedConfig::openConfig( DEFAULT_CONFIG_FILE );
     } else
         preventDeletion = config;
 
@@ -74,9 +74,9 @@ Broker *Broker::openBroker( KSharedConfig *config )
     return broker;
 }
 
-Broker::Broker( KSharedConfig *config )
+Broker::Broker( TDESharedConfig *config )
 {
-    KSharedConfig::Ptr preventDeletion( config );
+    TDESharedConfig::Ptr preventDeletion( config );
     Q_UNUSED( preventDeletion );
 
     if ( !s_brokers )
@@ -174,7 +174,7 @@ Settings* Broker::settings() const
 void Broker::loadPlugins()
 {
     d->plugins = KPluginInfo::fromServices(
-        KTrader::self()->query( "KSpell/Client" ) );
+        TDETrader::self()->query( "KSpell/Client" ) );
 
     for ( KPluginInfo::List::Iterator itr = d->plugins.begin();
           itr != d->plugins.end(); ++itr ) {
diff --git a/kspell2/broker.h b/tdespell2/broker.h
index 2539fbbec..f96361a58 100644
--- a/kspell2/broker.h
+++ b/tdespell2/broker.h
@@ -28,7 +28,7 @@
 #include <tqstringlist.h>
 #include <tqstring.h>
 
-class KSharedConfig;
+class TDESharedConfig;
 template <typename T>
 class TQPtrDict;
 
@@ -46,11 +46,11 @@ namespace KSpell2
      * of the KSpell2 architecture.
      */
     class KDE_EXPORT Broker : public TQObject,
-                   public KShared
+                   public TDEShared
     {
         Q_OBJECT
     public:
-        typedef KSharedPtr<Broker> Ptr;
+        typedef TDESharedPtr<Broker> Ptr;
         /**
          * Constructs the broker.
          *
@@ -63,9 +63,9 @@ namespace KSpell2
          * @param config is the name of config file which
          *        broker should use to read default language
          *        and default client values. If no value will
-         *        be passed Broker will use global kspellrc file.
+         *        be passed Broker will use global tdespellrc file.
          */
-        static Broker *openBroker( KSharedConfig *config = 0 );
+        static Broker *openBroker( TDESharedConfig *config = 0 );
 
     public:
         ~Broker();
@@ -122,7 +122,7 @@ namespace KSpell2
         friend class Settings;
         void changed();
     private:
-        Broker( KSharedConfig *config );
+        Broker( TDESharedConfig *config );
         void loadPlugins();
         void loadPlugin( const TQString& );
     private:
diff --git a/kspell2/client.cpp b/tdespell2/client.cpp
index ae470a77e..ae470a77e 100644
--- a/kspell2/client.cpp
+++ b/tdespell2/client.cpp
diff --git a/kspell2/client.h b/tdespell2/client.h
index 5bc5a2bb9..5bc5a2bb9 100644
--- a/kspell2/client.h
+++ b/tdespell2/client.h
diff --git a/kspell2/defaultdictionary.cpp b/tdespell2/defaultdictionary.cpp
index 39b80e7cf..39b80e7cf 100644
--- a/kspell2/defaultdictionary.cpp
+++ b/tdespell2/defaultdictionary.cpp
diff --git a/kspell2/defaultdictionary.h b/tdespell2/defaultdictionary.h
index 287bb7c21..287bb7c21 100644
--- a/kspell2/defaultdictionary.h
+++ b/tdespell2/defaultdictionary.h
diff --git a/kspell2/dictionary.h b/tdespell2/dictionary.h
index 31567ece9..31567ece9 100644
--- a/kspell2/dictionary.h
+++ b/tdespell2/dictionary.h
diff --git a/kspell2/filter.cpp b/tdespell2/filter.cpp
index 1604bcae1..1604bcae1 100644
--- a/kspell2/filter.cpp
+++ b/tdespell2/filter.cpp
diff --git a/kspell2/filter.h b/tdespell2/filter.h
index c89ce6fc7..c89ce6fc7 100644
--- a/kspell2/filter.h
+++ b/tdespell2/filter.h
diff --git a/kspell2/plugins/CMakeLists.txt b/tdespell2/plugins/CMakeLists.txt
index 062d033d2..062d033d2 100644
--- a/kspell2/plugins/CMakeLists.txt
+++ b/tdespell2/plugins/CMakeLists.txt
diff --git a/kspell2/plugins/Makefile.am b/tdespell2/plugins/Makefile.am
index ffd383c87..ffd383c87 100644
--- a/kspell2/plugins/Makefile.am
+++ b/tdespell2/plugins/Makefile.am
diff --git a/kspell2/plugins/aspell/CMakeLists.txt b/tdespell2/plugins/aspell/CMakeLists.txt
index 6d1e1ac9b..9ae66d01b 100644
--- a/kspell2/plugins/aspell/CMakeLists.txt
+++ b/tdespell2/plugins/aspell/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kspell2
+  ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
   ${ASPELL_INCLUDE_DIRS}
 )
@@ -26,19 +26,19 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kspell_aspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdespell_aspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kspell_aspell ##############################
+#### tdespell_aspell ##############################
 
-set( target kspell_aspell )
+set( target tdespell_aspell )
 
 set( ${target}_SRCS
-  kspell_aspellclient.cpp kspell_aspelldict.cpp
+  tdespell_aspellclient.cpp tdespell_aspelldict.cpp
 )
 
 tde_add_kpart( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kspell2-shared ${ASPELL_LIBRARIES}
+  LINK tdespell2-shared ${ASPELL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdespell2/plugins/aspell/Makefile.am b/tdespell2/plugins/aspell/Makefile.am
new file mode 100644
index 000000000..4d40583f1
--- /dev/null
+++ b/tdespell2/plugins/aspell/Makefile.am
@@ -0,0 +1,17 @@
+METASOURCES = AUTO
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdespell2 -I$(top_srcdir) $(all_includes)
+
+# For the future: examine if condensing the tons of *_LDFLAGS variables
+# into $(all_libraries) isn't better
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+
+kde_module_LTLIBRARIES = tdespell_aspell.la
+
+tdespell_aspell_la_SOURCES = tdespell_aspellclient.cpp tdespell_aspelldict.cpp
+
+tdespell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+tdespell_aspell_la_LIBADD = ../../ui/libtdespell2.la -laspell $(LIB_QT) $(LIB_TDECORE)
+
+service_DATA = tdespell_aspell.desktop
+servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/aspell/kspell_aspell.desktop b/tdespell2/plugins/aspell/tdespell_aspell.desktop
index 3b66458de..af78175f0 100644
--- a/kspell2/plugins/aspell/kspell_aspell.desktop
+++ b/tdespell2/plugins/aspell/tdespell_aspell.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KSpell/Client
-X-TDE-Library=kspell_aspell
+X-TDE-Library=tdespell_aspell
 X-TDE-PluginInfo-Author=Zack Rusin
 X-TDE-PluginInfo-Email=zack@kde.org
-X-TDE-PluginInfo-Name=kspell_aspell
+X-TDE-PluginInfo-Name=tdespell_aspell
 X-TDE-PluginInfo-Version=0.0.1
 X-TDE-PluginInfo-Website=http://www.kde.org
 X-TDE-PluginInfo-Category=Clients
diff --git a/kspell2/plugins/aspell/kspell_aspellclient.cpp b/tdespell2/plugins/aspell/tdespell_aspellclient.cpp
index 3577dd795..a9dcf4241 100644
--- a/kspell2/plugins/aspell/kspell_aspellclient.cpp
+++ b/tdespell2/plugins/aspell/tdespell_aspellclient.cpp
@@ -1,5 +1,5 @@
 /*
- * kspell_aspellclient.cpp
+ * tdespell_aspellclient.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_aspellclient.h"
+#include "tdespell_aspellclient.h"
 
-#include "kspell_aspelldict.h"
+#include "tdespell_aspelldict.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<ASpellClient> ASpellClientFactory;
-K_EXPORT_COMPONENT_FACTORY( kspell_aspell, ASpellClientFactory( "kspell_aspell" )  )
+K_EXPORT_COMPONENT_FACTORY( tdespell_aspell, ASpellClientFactory( "tdespell_aspell" )  )
 
 using namespace KSpell2;
 
@@ -63,4 +63,4 @@ TQStringList ASpellClient::languages() const
     return langs;
 }
 
-#include "kspell_aspellclient.moc"
+#include "tdespell_aspellclient.moc"
diff --git a/kspell2/plugins/aspell/kspell_aspellclient.h b/tdespell2/plugins/aspell/tdespell_aspellclient.h
index f2439989c..6da78f000 100644
--- a/kspell2/plugins/aspell/kspell_aspellclient.h
+++ b/tdespell2/plugins/aspell/tdespell_aspellclient.h
@@ -1,5 +1,5 @@
 /*
- * kspell_aspellclient.h
+ * tdespell_aspellclient.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/aspell/kspell_aspelldict.cpp b/tdespell2/plugins/aspell/tdespell_aspelldict.cpp
index 6687f2106..c88508c6f 100644
--- a/kspell2/plugins/aspell/kspell_aspelldict.cpp
+++ b/tdespell2/plugins/aspell/tdespell_aspelldict.cpp
@@ -1,5 +1,5 @@
 /**
- * kspell_aspelldict.cpp
+ * tdespell_aspelldict.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_aspelldict.h"
+#include "tdespell_aspelldict.h"
 
 #include <kdebug.h>
 
diff --git a/kspell2/plugins/aspell/kspell_aspelldict.h b/tdespell2/plugins/aspell/tdespell_aspelldict.h
index 2ff51c056..6b6174a1c 100644
--- a/kspell2/plugins/aspell/kspell_aspelldict.h
+++ b/tdespell2/plugins/aspell/tdespell_aspelldict.h
@@ -1,5 +1,5 @@
 /**
- * kspell_aspelldict.h
+ * tdespell_aspelldict.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/configure.in.bot b/tdespell2/plugins/configure.in.bot
index e47c874e0..e47c874e0 100644
--- a/kspell2/plugins/configure.in.bot
+++ b/tdespell2/plugins/configure.in.bot
diff --git a/kspell2/plugins/configure.in.in b/tdespell2/plugins/configure.in.in
index 8aaf6de2c..8aaf6de2c 100644
--- a/kspell2/plugins/configure.in.in
+++ b/tdespell2/plugins/configure.in.in
diff --git a/kspell2/plugins/hspell/CMakeLists.txt b/tdespell2/plugins/hspell/CMakeLists.txt
index 188e92c84..960b54ff4 100644
--- a/kspell2/plugins/hspell/CMakeLists.txt
+++ b/tdespell2/plugins/hspell/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kspell2
+  ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
   ${HSPELL_INCLUDE_DIRS}
 )
@@ -26,24 +26,24 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kspell_hspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdespell_hspell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kspell_hspell ##############################
+#### tdespell_hspell ##############################
 
 ### FIXME Not checked because hspell was removed from gentoo few years ago.
 ### FIXME The maintainer recommend to use aspell with hebrew dictionary.
 ### FIXME Maybe support for hspell will be removed too?
 ### FIXME http://bugs.gentoo.org/show_bug.cgi?id=177546
 
-set( target kspell_hspell )
+set( target tdespell_hspell )
 
 set( ${target}_SRCS
-  kspell_hspellclient.cpp kspell_hspelldict.cpp
+  tdespell_hspellclient.cpp tdespell_hspelldict.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kspell2-shared ${HSPELL_LIBRARIES}
+  LINK tdespell2-shared ${HSPELL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdespell2/plugins/hspell/Makefile.am b/tdespell2/plugins/hspell/Makefile.am
new file mode 100644
index 000000000..fb4a193f9
--- /dev/null
+++ b/tdespell2/plugins/hspell/Makefile.am
@@ -0,0 +1,17 @@
+METASOURCES = AUTO
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdespell2 -I$(top_srcdir) $(all_includes)
+
+# For the future: examine if condensing the tons of *_LDFLAGS variables
+# into $(all_libraries) isn't better
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+
+kde_module_LTLIBRARIES = tdespell_hspell.la
+
+tdespell_hspell_la_SOURCES = tdespell_hspellclient.cpp tdespell_hspelldict.cpp
+
+tdespell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+tdespell_hspell_la_LIBADD = ../../ui/libtdespell2.la -lhspell -lz $(LIB_QT) $(LIB_TDECORE)
+
+service_DATA = tdespell_hspell.desktop
+servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/hspell/kspell_hspell.desktop b/tdespell2/plugins/hspell/tdespell_hspell.desktop
index 0194c9ffb..dbeaac73f 100644
--- a/kspell2/plugins/hspell/kspell_hspell.desktop
+++ b/tdespell2/plugins/hspell/tdespell_hspell.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KSpell/Client
-X-TDE-Library=kspell_hspell
+X-TDE-Library=tdespell_hspell
 X-TDE-PluginInfo-Author=Mashrab Kuvatov
 X-TDE-PluginInfo-Email=kmashrab@uni-bremen.de
-X-TDE-PluginInfo-Name=kspell_hspell
+X-TDE-PluginInfo-Name=tdespell_hspell
 X-TDE-PluginInfo-Version=0.0.1
 X-TDE-PluginInfo-Website=http://www.kde.org
 X-TDE-PluginInfo-Category=Clients
diff --git a/kspell2/plugins/hspell/kspell_hspellclient.cpp b/tdespell2/plugins/hspell/tdespell_hspellclient.cpp
index 716300c20..331b0a9cb 100644
--- a/kspell2/plugins/hspell/kspell_hspellclient.cpp
+++ b/tdespell2/plugins/hspell/tdespell_hspellclient.cpp
@@ -1,5 +1,5 @@
 /**
- * kspell_hspellclient.cpp
+ * tdespell_hspellclient.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  * Copyright (C)  2005  Mashrab Kuvatov <kmashrab@uni-bremen.de>
@@ -19,15 +19,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_hspellclient.h"
+#include "tdespell_hspellclient.h"
 
-#include "kspell_hspelldict.h"
+#include "tdespell_hspelldict.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<HSpellClient> HSpellClientFactory;
-K_EXPORT_COMPONENT_FACTORY( kspell_hspell, HSpellClientFactory( "kspell_hspell" )  )
+K_EXPORT_COMPONENT_FACTORY( tdespell_hspell, HSpellClientFactory( "tdespell_hspell" )  )
 
 using namespace KSpell2;
 
@@ -54,4 +54,4 @@ TQStringList HSpellClient::languages() const
     return langs;
 }
 
-#include "kspell_hspellclient.moc"
+#include "tdespell_hspellclient.moc"
diff --git a/kspell2/plugins/hspell/kspell_hspellclient.h b/tdespell2/plugins/hspell/tdespell_hspellclient.h
index a26aca227..993cfe907 100644
--- a/kspell2/plugins/hspell/kspell_hspellclient.h
+++ b/tdespell2/plugins/hspell/tdespell_hspellclient.h
@@ -1,5 +1,5 @@
 /**
- * kspell_hspellclient.h
+ * tdespell_hspellclient.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  * Copyright (C)  2005  Mashrab Kuvatov <kmashrab@uni-bremen.de>
diff --git a/kspell2/plugins/hspell/kspell_hspelldict.cpp b/tdespell2/plugins/hspell/tdespell_hspelldict.cpp
index 04f055e86..fa2efaccb 100644
--- a/kspell2/plugins/hspell/kspell_hspelldict.cpp
+++ b/tdespell2/plugins/hspell/tdespell_hspelldict.cpp
@@ -1,5 +1,5 @@
 /**
- * kspell_hspelldict.cpp
+ * tdespell_hspelldict.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  * Copyright (C)  2005  Mashrab Kuvatov <kmashrab@uni-bremen.de>
@@ -20,7 +20,7 @@
  * 02110-1301  USA
  */
 
-#include "kspell_hspelldict.h"
+#include "tdespell_hspelldict.h"
 #include <kdebug.h>
 
 #include <tqtextcodec.h>
diff --git a/kspell2/plugins/hspell/kspell_hspelldict.h b/tdespell2/plugins/hspell/tdespell_hspelldict.h
index ff0302e4b..7b18003be 100644
--- a/kspell2/plugins/hspell/kspell_hspelldict.h
+++ b/tdespell2/plugins/hspell/tdespell_hspelldict.h
@@ -1,5 +1,5 @@
 /**
- * kspell_hspelldict.h
+ * tdespell_hspelldict.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  * Copyright (C)  2005  Mashrab Kuvatov <kmashrab@uni-bremen.de>
diff --git a/kspell2/plugins/ispell/CMakeLists.txt b/tdespell2/plugins/ispell/CMakeLists.txt
index f3179ed8a..c8e5a4ec6 100644
--- a/kspell2/plugins/ispell/CMakeLists.txt
+++ b/tdespell2/plugins/ispell/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kspell2
+  ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
 )
 
@@ -24,21 +24,21 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kspell_ispell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdespell_ispell.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-#### kspell_ispell ##############################
+#### tdespell_ispell ##############################
 
-set( target kspell_ispell )
+set( target tdespell_ispell )
 
 set( ${target}_SRCS
-  kspell_ispellclient.cpp kspell_ispelldict.cpp
+  tdespell_ispellclient.cpp tdespell_ispelldict.cpp
   correct.cpp good.cpp hash.cpp lookup.cpp makedent.cpp
   tgood.cpp ispell_checker.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kspell2-shared
+  LINK tdespell2-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdespell2/plugins/ispell/Makefile.am b/tdespell2/plugins/ispell/Makefile.am
new file mode 100644
index 000000000..15dffda28
--- /dev/null
+++ b/tdespell2/plugins/ispell/Makefile.am
@@ -0,0 +1,24 @@
+METASOURCES = AUTO
+
+AM_CPPFLAGS = -I$(top_srcdir)/tdespell2 -I$(top_srcdir) $(all_includes)
+
+# For the future: examine if condensing the tons of *_LDFLAGS variables
+# into $(all_libraries) isn't better
+AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
+
+kde_module_LTLIBRARIES = tdespell_ispell.la
+
+tdespell_ispell_la_SOURCES = tdespell_ispellclient.cpp tdespell_ispelldict.cpp \
+	correct.cpp		\
+	good.cpp		\
+	hash.cpp		\
+	lookup.cpp		\
+	makedent.cpp		\
+	tgood.cpp		\
+	ispell_checker.cpp
+
+tdespell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
+tdespell_ispell_la_LIBADD = ../../ui/libtdespell2.la  $(LIB_QT) $(LIB_TDECORE)
+
+service_DATA = tdespell_ispell.desktop
+servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/ispell/correct.cpp b/tdespell2/plugins/ispell/correct.cpp
index 65e98fa6d..65e98fa6d 100644
--- a/kspell2/plugins/ispell/correct.cpp
+++ b/tdespell2/plugins/ispell/correct.cpp
diff --git a/kspell2/plugins/ispell/good.cpp b/tdespell2/plugins/ispell/good.cpp
index 351106d99..351106d99 100644
--- a/kspell2/plugins/ispell/good.cpp
+++ b/tdespell2/plugins/ispell/good.cpp
diff --git a/kspell2/plugins/ispell/hash.cpp b/tdespell2/plugins/ispell/hash.cpp
index 03bd880bb..03bd880bb 100644
--- a/kspell2/plugins/ispell/hash.cpp
+++ b/tdespell2/plugins/ispell/hash.cpp
diff --git a/kspell2/plugins/ispell/ispell.h b/tdespell2/plugins/ispell/ispell.h
index 587defc07..587defc07 100644
--- a/kspell2/plugins/ispell/ispell.h
+++ b/tdespell2/plugins/ispell/ispell.h
diff --git a/kspell2/plugins/ispell/ispell_checker.cpp b/tdespell2/plugins/ispell/ispell_checker.cpp
index fba7d3479..c07d9a55f 100644
--- a/kspell2/plugins/ispell/ispell_checker.cpp
+++ b/tdespell2/plugins/ispell/ispell_checker.cpp
@@ -1,5 +1,5 @@
 /* vim: set sw=8: -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* kspell2 - adopted from Enchant
+/* tdespell2 - adopted from Enchant
  * Copyright (C) 2003 Dom Lachowicz
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/ispell_checker.h b/tdespell2/plugins/ispell/ispell_checker.h
index 08783922a..84faa34f9 100644
--- a/kspell2/plugins/ispell/ispell_checker.h
+++ b/tdespell2/plugins/ispell/ispell_checker.h
@@ -1,5 +1,5 @@
 /* vim: set sw=8: -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* kspell2 - adopted from Enchant
+/* tdespell2 - adopted from Enchant
  * Copyright (C) 2003 Dom Lachowicz
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/ispell_def.h b/tdespell2/plugins/ispell/ispell_def.h
index b3d149c43..b3d149c43 100644
--- a/kspell2/plugins/ispell/ispell_def.h
+++ b/tdespell2/plugins/ispell/ispell_def.h
diff --git a/kspell2/plugins/ispell/lookup.cpp b/tdespell2/plugins/ispell/lookup.cpp
index 6030f49d0..b815ebd98 100644
--- a/kspell2/plugins/ispell/lookup.cpp
+++ b/tdespell2/plugins/ispell/lookup.cpp
@@ -1,5 +1,5 @@
 /* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* kspell2 - adopted from enchant
+/* tdespell2 - adopted from enchant
  * Copyright (C) 2003 Dom Lachowicz
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/makedent.cpp b/tdespell2/plugins/ispell/makedent.cpp
index 9c168dc17..9c168dc17 100644
--- a/kspell2/plugins/ispell/makedent.cpp
+++ b/tdespell2/plugins/ispell/makedent.cpp
diff --git a/kspell2/plugins/ispell/msgs.h b/tdespell2/plugins/ispell/msgs.h
index e3f30220c..e3f30220c 100644
--- a/kspell2/plugins/ispell/msgs.h
+++ b/tdespell2/plugins/ispell/msgs.h
diff --git a/kspell2/plugins/ispell/sp_spell.h b/tdespell2/plugins/ispell/sp_spell.h
index 9e1d7b903..9e1d7b903 100644
--- a/kspell2/plugins/ispell/sp_spell.h
+++ b/tdespell2/plugins/ispell/sp_spell.h
diff --git a/kspell2/plugins/ispell/kspell_ispell.desktop b/tdespell2/plugins/ispell/tdespell_ispell.desktop
index 8ce0cc05b..4b1aebcb7 100644
--- a/kspell2/plugins/ispell/kspell_ispell.desktop
+++ b/tdespell2/plugins/ispell/tdespell_ispell.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KSpell/Client
-X-TDE-Library=kspell_ispell
+X-TDE-Library=tdespell_ispell
 X-TDE-PluginInfo-Author=Zack Rusin
 X-TDE-PluginInfo-Email=zack@kde.org
-X-TDE-PluginInfo-Name=kspell_ispell
+X-TDE-PluginInfo-Name=tdespell_ispell
 X-TDE-PluginInfo-Version=0.0.1
 X-TDE-PluginInfo-Website=http://www.kde.org
 X-TDE-PluginInfo-Category=Clients
diff --git a/kspell2/plugins/ispell/kspell_ispellclient.cpp b/tdespell2/plugins/ispell/tdespell_ispellclient.cpp
index 3b2fda4e0..1f2e9c8ba 100644
--- a/kspell2/plugins/ispell/kspell_ispellclient.cpp
+++ b/tdespell2/plugins/ispell/tdespell_ispellclient.cpp
@@ -1,5 +1,5 @@
 /*
- * kspell_aspellclient.cpp
+ * tdespell_aspellclient.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
@@ -18,16 +18,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_ispellclient.h"
+#include "tdespell_ispellclient.h"
 
-#include "kspell_ispelldict.h"
+#include "tdespell_ispelldict.h"
 #include "ispell_checker.h"
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<ISpellClient> ISpellClientFactory;
-K_EXPORT_COMPONENT_FACTORY( kspell_ispell, ISpellClientFactory( "kspell_ispell" )  )
+K_EXPORT_COMPONENT_FACTORY( tdespell_ispell, ISpellClientFactory( "tdespell_ispell" )  )
 
 using namespace KSpell2;
 
@@ -51,4 +51,4 @@ TQStringList ISpellClient::languages() const
     return ISpellChecker::allDics();
 }
 
-#include "kspell_ispellclient.moc"
+#include "tdespell_ispellclient.moc"
diff --git a/kspell2/plugins/ispell/kspell_ispellclient.h b/tdespell2/plugins/ispell/tdespell_ispellclient.h
index 6a67bb1a6..06cbe0bab 100644
--- a/kspell2/plugins/ispell/kspell_ispellclient.h
+++ b/tdespell2/plugins/ispell/tdespell_ispellclient.h
@@ -1,5 +1,5 @@
 /*
- * kspell_ispellclient.h
+ * tdespell_ispellclient.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/kspell_ispelldict.cpp b/tdespell2/plugins/ispell/tdespell_ispelldict.cpp
index 35c1e9276..089fabc9d 100644
--- a/kspell2/plugins/ispell/kspell_ispelldict.cpp
+++ b/tdespell2/plugins/ispell/tdespell_ispelldict.cpp
@@ -1,5 +1,5 @@
 /**
- * kspell_aspelldict.cpp
+ * tdespell_aspelldict.cpp
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
-#include "kspell_ispelldict.h"
+#include "tdespell_ispelldict.h"
 
 #include <kdebug.h>
 
diff --git a/kspell2/plugins/ispell/kspell_ispelldict.h b/tdespell2/plugins/ispell/tdespell_ispelldict.h
index 2ca9e7d93..7513d094c 100644
--- a/kspell2/plugins/ispell/kspell_ispelldict.h
+++ b/tdespell2/plugins/ispell/tdespell_ispelldict.h
@@ -1,5 +1,5 @@
 /**
- * kspell_ispelldict.h
+ * tdespell_ispelldict.h
  *
  * Copyright (C)  2003  Zack Rusin <zack@kde.org>
  *
diff --git a/kspell2/plugins/ispell/tgood.cpp b/tdespell2/plugins/ispell/tgood.cpp
index 06fbc99ef..06fbc99ef 100644
--- a/kspell2/plugins/ispell/tgood.cpp
+++ b/tdespell2/plugins/ispell/tgood.cpp
diff --git a/kspell2/settings.cpp b/tdespell2/settings.cpp
index 664ae24e0..a23fb062f 100644
--- a/kspell2/settings.cpp
+++ b/tdespell2/settings.cpp
@@ -23,9 +23,9 @@
 
 #include "broker.h"
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqmap.h>
@@ -37,7 +37,7 @@ class Settings::Private
 {
 public:
     Broker*  broker; //can't be a Ptr since we don't want to hold a ref on it
-    KSharedConfig::Ptr config;
+    TDESharedConfig::Ptr config;
     bool     modified;
 
     TQString defaultLanguage;
@@ -50,7 +50,7 @@ public:
     TQMap<TQString, bool> ignore;
 };
 
-Settings::Settings( Broker *broker, KSharedConfig *config )
+Settings::Settings( Broker *broker, TDESharedConfig *config )
 {
     d = new Private;
     d->broker = broker;
@@ -67,7 +67,7 @@ Settings::~Settings()
     delete d; d = 0;
 }
 
-KSharedConfig *Settings::sharedConfig() const
+TDESharedConfig *Settings::sharedConfig() const
 {
     return d->config;
 }
@@ -180,7 +180,7 @@ bool Settings::ignore( const TQString& word )
 
 void Settings::readIgnoreList()
 {
-    KConfigGroup conf( d->config, "Spelling" );
+    TDEConfigGroup conf( d->config, "Spelling" );
     TQString ignoreEntry = TQString( "ignore_%1" ).arg( d->defaultLanguage );
     TQStringList ignores = conf.readListEntry( ignoreEntry );
     setQuietIgnoreList( ignores );
@@ -189,7 +189,7 @@ void Settings::readIgnoreList()
 void Settings::save()
 {
     if ( d->modified ) {
-        KConfigGroup conf( d->config, "Spelling" );
+        TDEConfigGroup conf( d->config, "Spelling" );
         conf.writeEntry( "defaultClient", d->defaultClient );
         conf.writeEntry( "defaultLanguage", d->defaultLanguage );
         conf.writeEntry( "checkUppercase", d->checkUppercase );
@@ -203,11 +203,11 @@ void Settings::save()
 
 void Settings::loadConfig()
 {
-    KConfigGroup conf( d->config, "Spelling" );
+    TDEConfigGroup conf( d->config, "Spelling" );
     d->defaultClient = conf.readEntry( "defaultClient",
                                         TQString::null );
     d->defaultLanguage = conf.readEntry(
-        "defaultLanguage", KGlobal::locale()->language() );
+        "defaultLanguage", TDEGlobal::locale()->language() );
 
     //same defaults are in the default filter (filter.cpp)
     d->checkUppercase = conf.readBoolEntry(
diff --git a/kspell2/settings.h b/tdespell2/settings.h
index 2346f0772..ebf3ad46d 100644
--- a/kspell2/settings.h
+++ b/tdespell2/settings.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tdelibs_export.h>
 
-class KSharedConfig;
+class TDESharedConfig;
 
 namespace KSpell2
 {
@@ -59,7 +59,7 @@ namespace KSpell2
 
         void save();
 
-        KSharedConfig *sharedConfig() const;
+        TDESharedConfig *sharedConfig() const;
 
     private:
         void loadConfig();
@@ -68,7 +68,7 @@ namespace KSpell2
 
     private:
         friend class Broker;
-        Settings( Broker *broker, KSharedConfig *config );
+        Settings( Broker *broker, TDESharedConfig *config );
     private:
         class Private;
         Private *d;
diff --git a/kspell2/kspellclient.desktop b/tdespell2/tdespellclient.desktop
index a637e7a0f..a637e7a0f 100644
--- a/kspell2/kspellclient.desktop
+++ b/tdespell2/tdespellclient.desktop
diff --git a/tdespell2/tests/Makefile.am b/tdespell2/tests/Makefile.am
new file mode 100644
index 000000000..682ad272a
--- /dev/null
+++ b/tdespell2/tests/Makefile.am
@@ -0,0 +1,24 @@
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
+METASOURCES = AUTO
+
+
+check_PROGRAMS = test test_filter backgroundtest \
+	test_dialog test_highlighter test_configdialog
+
+test_SOURCES = test.cpp
+test_LDADD = ../ui/libtdespell2.la $(LIB_TDECORE)
+
+test_filter_SOURCES = test_filter.cpp
+test_filter_LDADD = ../ui/libtdespell2.la $(LIB_TDECORE)
+
+backgroundtest_SOURCES = backgroundtest.cpp
+backgroundtest_LDADD = ../ui/libtdespell2.la $(LIB_TDECORE)
+
+test_dialog_SOURCES = test_dialog.cpp
+test_dialog_LDADD = ../ui/libtdespell2.la $(LIB_TDECORE)
+
+test_highlighter_SOURCES = test_highlighter.cpp
+test_highlighter_LDADD = ../ui/libtdespell2_noinst.la ../libtdespell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../tdeutils/libtdeutils.la
+
+test_configdialog_SOURCES = test_configdialog.cpp
+test_configdialog_LDADD = ../ui/libtdespell2_noinst.la ../libtdespell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../tdeutils/libtdeutils.la
diff --git a/kspell2/tests/backgroundtest.cpp b/tdespell2/tests/backgroundtest.cpp
index 8050115ad..92c7e7792 100644
--- a/kspell2/tests/backgroundtest.cpp
+++ b/tdespell2/tests/backgroundtest.cpp
@@ -24,14 +24,14 @@
 #include "broker.h"
 using namespace KSpell2;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 const char *text = "Rationale \
 ========= \
  \
 This code is intended to provide an implementation of the W3C's XPath \
-specification for KHTML. XPath isn't particularly useful on its own, however\
+specification for TDEHTML. XPath isn't particularly useful on its own, however\
 it is an essential building block for the implementation of other standards \
 like XSLT and XQuery. XPath is supported to a greater or lesser extent by both\
 IE and Mozilla so it is likely to become increasingly important over the next\
@@ -45,7 +45,7 @@ licenses including Mozilla's, libxml2, Xerces and probably others, so it is \
 reasonable to ask why there should be another one. \
  \
 It would certainly be possible to integrate one of these implementations into\
-KHTML, but it would actually be quite a lot of work. I looked at all of the\
+TDEHTML, but it would actually be quite a lot of work. I looked at all of the\
 implementations mentioned with a view to using this approach before I decided\
 to start from scratch.\
  \
@@ -62,7 +62,7 @@ Xerces XPath (C++ version)\
  \
 The Xerces code seemed pretty clean and was reasonably understandable, however\
 it doesn't seem to be used very much which greatly reduces the utility. As\
-with the mozilla code, porting it to use KHTML's DOM would take a fair bit of \
+with the mozilla code, porting it to use TDEHTML's DOM would take a fair bit of \
 work. The main issue here being that Xerces is based around pointers to Nodes\
 rather than implicitly shared Node objects.\
  \
@@ -72,7 +72,7 @@ libxml2 \
 This is the most obvious library to reuse as it is currently used to generate\
 the KDE documentation, and is also a very complete and fast\
 implementation. The down side of using this code is that it would either need\
-a new DOM implementation in KHTML (which used the libxml2 structures), a \
+a new DOM implementation in TDEHTML (which used the libxml2 structures), a \
 wrapper library that made on of the DOM trees support the API of the other, or\
 binding layer that parsed the XML twice and somehow maintained a mapping\
 between the two DOM trees. Unfortunately the documentation of this library is\
@@ -83,19 +83,19 @@ for. They are well documented and have a well structured API. Unfortunately\
 using this library still requires some mechanism to integrate the two\
 underlying DOM implementations.\
  \
-KHTML XPath\
+TDEHTML XPath\
 ----------- \
  \
 There are some advantages to the XPath implementation Zack and I are working\
 on, namely: \
  \
-- Ease of integration with the rest of kjs/khtml.\
+- Ease of integration with the rest of kjs/tdehtml.\
 - Use of dom2 traversal (which will also be available to use directly).\
 - C++ rather than C and a wrapper (reducing the overheads).\
 - The code is clean and uses familiar types and idioms. \
  \
 We intend the code to be build on top of the DOM api rather than tying it\
-directly to the Qt or KHTML XML implementations. This will allow us to take\
+directly to the Qt or TDEHTML XML implementations. This will allow us to take\
 advantage of any improvements that might be made to the underlying parser\
 etc. The DOM2 traversal APIs provide a set of classes that map almost directly \
 to the XPath location steps, since we need to implement these facilities\
@@ -105,10 +105,10 @@ seems sensible.\
 Building \
 ========\
  \
-This code needs to live in a subdir off the khtml directory in tdelibs. The\
+This code needs to live in a subdir off the tdehtml directory in tdelibs. The\
 subdir should be called 'xpath'. The easiest way to regenerate the makefiles\
 is to go to the root of the tdelibs tree and run: \
-  create_makefiles khtml/xpath\
+  create_makefiles tdehtml/xpath\
  \
 This code is intended to compile, but not to work.\
  \
@@ -159,7 +159,7 @@ void BackgroundTest::slotMisspelling( const TQString& word, int start )
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     BackgroundTest test;
 
diff --git a/kspell2/tests/backgroundtest.h b/tdespell2/tests/backgroundtest.h
index 2f08e9ce0..2f08e9ce0 100644
--- a/kspell2/tests/backgroundtest.h
+++ b/tdespell2/tests/backgroundtest.h
diff --git a/kspell2/tests/test.cpp b/tdespell2/tests/test.cpp
index e9b72a794..b68dbee42 100644
--- a/kspell2/tests/test.cpp
+++ b/tdespell2/tests/test.cpp
@@ -21,7 +21,7 @@
 #include "broker.h"
 #include "dictionary.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqdatetime.h>
@@ -30,7 +30,7 @@ using namespace KSpell2;
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     Broker::Ptr broker = Broker::openBroker();
 
diff --git a/kspell2/tests/test_config.cpp b/tdespell2/tests/test_config.cpp
index 4ef3f588e..c3c5ec740 100644
--- a/kspell2/tests/test_config.cpp
+++ b/tdespell2/tests/test_config.cpp
@@ -20,13 +20,13 @@
  */
 #include "configdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     SettingsDialog *dialog = new SettingsDialog( 0 );
 
diff --git a/kspell2/tests/test_configdialog.cpp b/tdespell2/tests/test_configdialog.cpp
index e90d01d7c..4e3b560e9 100644
--- a/kspell2/tests/test_configdialog.cpp
+++ b/tdespell2/tests/test_configdialog.cpp
@@ -21,13 +21,13 @@
 #include "configdialog.h"
 #include "broker.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     Broker::Ptr broker = Broker::openBroker();
     ConfigDialog *dialog = new ConfigDialog( broker, 0 );
diff --git a/kspell2/tests/test_dialog.cpp b/tdespell2/tests/test_dialog.cpp
index bc5d808a8..d6441bde6 100644
--- a/kspell2/tests/test_dialog.cpp
+++ b/tdespell2/tests/test_dialog.cpp
@@ -25,7 +25,7 @@
 #include "dictionary.h"
 #include "filter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 using namespace KSpell2;
 
@@ -54,7 +54,7 @@ void TestDialog::doneChecking( const TQString& buf )
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     TestDialog test;
     test.check( "This is a sample buffer. Whih this thingg will "
diff --git a/kspell2/tests/test_dialog.h b/tdespell2/tests/test_dialog.h
index e8a6cf970..e8a6cf970 100644
--- a/kspell2/tests/test_dialog.h
+++ b/tdespell2/tests/test_dialog.h
diff --git a/kspell2/tests/test_filter.cpp b/tdespell2/tests/test_filter.cpp
index eafaf622f..a1fcb670c 100644
--- a/kspell2/tests/test_filter.cpp
+++ b/tdespell2/tests/test_filter.cpp
@@ -21,14 +21,14 @@
 #include "filter.h"
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 using namespace KSpell2;
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "Filter");
+    TDEApplication app(argc, argv, "Filter");
 
     TQString buffer = TQString( "This is     a sample buffer.      Please test me." );
 
diff --git a/kspell2/tests/test_highlighter.cpp b/tdespell2/tests/test_highlighter.cpp
index ce5c64501..3f7c253e4 100644
--- a/kspell2/tests/test_highlighter.cpp
+++ b/tdespell2/tests/test_highlighter.cpp
@@ -22,14 +22,14 @@
 #include "dictionary.h"
 #include "filter.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqtextedit.h>
 
 int main( int argc, char** argv )
 {
-    KApplication app(argc, argv, "KSpell2Test");
+    TDEApplication app(argc, argv, "KSpell2Test");
 
     TQTextEdit *test = new TQTextEdit();
     KSpell2::Highlighter *hl = new KSpell2::Highlighter( test );
diff --git a/kspell2/threadevents.h b/tdespell2/threadevents.h
index 87a516148..87a516148 100644
--- a/kspell2/threadevents.h
+++ b/tdespell2/threadevents.h
diff --git a/kspell2/ui/CMakeLists.txt b/tdespell2/ui/CMakeLists.txt
index a83774ddd..8d0521c76 100644
--- a/kspell2/ui/CMakeLists.txt
+++ b/tdespell2/ui/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kspell2
+  ${CMAKE_SOURCE_DIR}/tdespell2
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
 )
@@ -32,16 +32,16 @@ link_directories(
 
 install( FILES
     dialog.h highlighter.h configdialog.h configwidget.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kspell2 )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdespell2 )
 
 
-#### kspell2 (static) ###########################
+#### tdespell2 (static) ###########################
 
-set( target kspell2 )
+set( target tdespell2 )
 
 set( ${target}_SRCS
    configwidget.cpp highlighter.cpp configdialog.cpp
-   kspell2ui.ui configui.ui
+   tdespell2ui.ui configui.ui
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
@@ -49,19 +49,19 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
 )
 
 
-#### kspell2 ####################################
+#### tdespell2 ####################################
 
-set( target kspell2 )
+set( target tdespell2 )
 
 set( ${target}_SRCS
   configwidget.cpp highlighter.cpp configdialog.cpp
-  kspell2ui.ui configui.ui
+  tdespell2ui.ui configui.ui
   dialog.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kspell2base-static kutils-shared
+  LINK tdespell2base-static tdeutils-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am
new file mode 100644
index 000000000..1a2596801
--- /dev/null
+++ b/tdespell2/ui/Makefile.am
@@ -0,0 +1,21 @@
+METASOURCES = AUTO
+
+lib_LTLIBRARIES = libtdespell2.la
+# Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
+noinst_LTLIBRARIES = libtdespell2_noinst.la
+
+KDE_CXXFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT
+INCLUDES = -I$(top_srcdir)/tdespell2 $(all_includes)
+
+tdespell2includedir = $(includedir)/tdespell2
+tdespell2include_HEADERS = dialog.h highlighter.h configdialog.h \
+	configwidget.h
+
+libtdespell2_noinst_la_SOURCES = tdespell2ui.ui configwidget.cpp \
+	highlighter.cpp configui.ui configdialog.cpp
+
+dialog.lo: tdespell2ui.h
+
+libtdespell2_la_SOURCES = dialog.cpp
+libtdespell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+libtdespell2_la_LIBADD = libtdespell2_noinst.la ../libtdespell2base.la ../../tdeutils/libtdeutils.la  $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE)
diff --git a/kspell2/ui/configdialog.cpp b/tdespell2/ui/configdialog.cpp
index 56e39ca2b..288d62a29 100644
--- a/kspell2/ui/configdialog.cpp
+++ b/tdespell2/ui/configdialog.cpp
@@ -21,7 +21,7 @@
 #include "configdialog.h"
 #include "configwidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvbox.h>
 
diff --git a/kspell2/ui/configdialog.h b/tdespell2/ui/configdialog.h
index ead508d34..ead508d34 100644
--- a/kspell2/ui/configdialog.h
+++ b/tdespell2/ui/configdialog.h
diff --git a/kspell2/ui/configui.ui b/tdespell2/ui/configui.ui
index d6f6e596b..d6f6e596b 100644
--- a/kspell2/ui/configui.ui
+++ b/tdespell2/ui/configui.ui
diff --git a/kspell2/ui/configwidget.cpp b/tdespell2/ui/configwidget.cpp
index 6d98955ae..2317f7307 100644
--- a/kspell2/ui/configwidget.cpp
+++ b/tdespell2/ui/configwidget.cpp
@@ -26,7 +26,7 @@
 
 #include <keditlistbox.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/kspell2/ui/configwidget.h b/tdespell2/ui/configwidget.h
index e3fd1542b..e3fd1542b 100644
--- a/kspell2/ui/configwidget.h
+++ b/tdespell2/ui/configwidget.h
diff --git a/kspell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp
index e8444bec6..0c45f3cd1 100644
--- a/kspell2/ui/dialog.cpp
+++ b/tdespell2/ui/dialog.cpp
@@ -19,7 +19,7 @@
  * 02110-1301  USA
  */
 #include "dialog.h"
-#include "kspell2ui.h"
+#include "tdespell2ui.h"
 
 #include "backgroundchecker.h"
 #include "broker.h"
@@ -27,8 +27,8 @@
 #include "dictionary.h"
 #include "settings.h"
 
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqlistview.h>
diff --git a/kspell2/ui/dialog.h b/tdespell2/ui/dialog.h
index 1da714c7c..1da714c7c 100644
--- a/kspell2/ui/dialog.h
+++ b/tdespell2/ui/dialog.h
diff --git a/kspell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp
index 2d185462d..32970f9e4 100644
--- a/kspell2/ui/highlighter.cpp
+++ b/tdespell2/ui/highlighter.cpp
@@ -24,7 +24,7 @@
 #include "dictionary.h"
 #include "settings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqtextedit.h>
@@ -51,7 +51,7 @@ Highlighter::Highlighter( TQTextEdit *textEdit,
     d = new Private;
     d->filter = filter;
     if ( !configFile.isEmpty() )
-        d->broker = Broker::openBroker( KSharedConfig::openConfig( configFile ) );
+        d->broker = Broker::openBroker( TDESharedConfig::openConfig( configFile ) );
     else
         d->broker = Broker::openBroker();
 
diff --git a/kspell2/ui/highlighter.h b/tdespell2/ui/highlighter.h
index 2309c3a64..2309c3a64 100644
--- a/kspell2/ui/highlighter.h
+++ b/tdespell2/ui/highlighter.h
diff --git a/kspell2/ui/kspell2ui.ui b/tdespell2/ui/tdespell2ui.ui
index e221c69ba..e221c69ba 100644
--- a/kspell2/ui/kspell2ui.ui
+++ b/tdespell2/ui/tdespell2ui.ui
diff --git a/tdesu/Makefile.am b/tdesu/Makefile.am
index 926f3df5d..beec69d29 100644
--- a/tdesu/Makefile.am
+++ b/tdesu/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for libtdesu
 
-INCLUDES = -I$(top_srcdir)/kio/ $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio/ $(all_includes)
 
 lib_LTLIBRARIES = libtdesu.la
 libtdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp tdesu_pty.cpp
diff --git a/tdesu/client.cpp b/tdesu/client.cpp
index cbdc640e6..91e922250 100644
--- a/tdesu/client.cpp
+++ b/tdesu/client.cpp
@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kde_file.h>
 
 #include "client.h"
@@ -389,7 +389,7 @@ static TQString findDaemon()
 {
     TQString daemon = locate("bin", "tdesud");
     if (daemon.isEmpty()) // if not in TDEDIRS, rely on PATH
-	daemon = KStandardDirs::findExe("tdesud");
+	daemon = TDEStandardDirs::findExe("tdesud");
 
     if (daemon.isEmpty())
     {
diff --git a/tdesu/kcookie.cpp b/tdesu/kcookie.cpp
index 99b34ec4e..f5a2d547c 100644
--- a/tdesu/kcookie.cpp
+++ b/tdesu/kcookie.cpp
@@ -100,7 +100,7 @@ void KCookie::getXCookie()
     if (!memcmp(disp.data(), "localhost:", 10))
        disp.remove(0, 9);
 
-    TQString cmd = "xauth list "+KProcess::quote(disp);
+    TQString cmd = "xauth list "+TDEProcess::quote(disp);
     blockSigChild(); // pclose uses waitpid()
     if (!(f = popen(TQFile::encodeName(cmd), "r"))) 
     {
@@ -163,7 +163,7 @@ void KCookie::getICECookie()
         if (strncmp((*it).data(), m_dcopTransport.data(), m_dcopTransport.length()) != 0)
             continue;
         m_DCOPSrv = *it;
-	TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(KProcess::quote(m_DCOPSrv));
+	TQCString cmd = DCOPClient::iceauthPath()+" list netid="+TQFile::encodeName(TDEProcess::quote(m_DCOPSrv));
 	blockSigChild();
 	if (!(f = popen(cmd, "r")))
 	{
diff --git a/tdesu/process.cpp b/tdesu/process.cpp
index 692c01553..28e3bb110 100644
--- a/tdesu/process.cpp
+++ b/tdesu/process.cpp
@@ -48,7 +48,7 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
@@ -74,7 +74,7 @@ int PtyProcess::waitMS(int fd,int ms)
 */
 bool PtyProcess::checkPid(pid_t pid)
 {
-	KConfig* config = KGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 	config->setGroup("super-user-command");
 	TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
 	//sudo does not accept signals from user so we except it
@@ -375,7 +375,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
         path = command;
     else 
     {
-        TQString file = KStandardDirs::findExe(command);
+        TQString file = TDEStandardDirs::findExe(command);
         if (file.isEmpty()) 
         {
             kdError(900) << k_lineinfo << command << " not found\n"; 
diff --git a/tdesu/ssh.cpp b/tdesu/ssh.cpp
index f45b38e7e..c23ca459b 100644
--- a/tdesu/ssh.cpp
+++ b/tdesu/ssh.cpp
@@ -32,7 +32,7 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "ssh.h"
diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp
index f5b435b40..4cd5864de 100644
--- a/tdesu/stub.cpp
+++ b/tdesu/stub.cpp
@@ -20,7 +20,7 @@
 #include <tqcstring.h>
 #include <kdatastream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 
diff --git a/tdesu/su.cpp b/tdesu/su.cpp
index c4e75772e..e29288ab9 100644
--- a/tdesu/su.cpp
+++ b/tdesu/su.cpp
@@ -33,9 +33,9 @@
 #include <tqcstring.h>
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "su.h"
@@ -55,7 +55,7 @@ SuProcess::SuProcess(const TQCString &user, const TQCString &command)
     m_User = user;
     m_Command = command;
 
-    KConfig* config = KGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup("super-user-command");
     superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND);
     if ( superUserCommand != "sudo" && superUserCommand != "su" ) {
@@ -128,8 +128,8 @@ int SuProcess::exec(const char *password, int check)
  
     if (::access(command, X_OK) != 0)
     {
-      ///        command = TQFile::encodeName(KGlobal::dirs()->findExe("su"));
-        command = TQFile::encodeName( KGlobal::dirs()->findExe(superUserCommand.ascii()) );
+      ///        command = TQFile::encodeName(TDEGlobal::dirs()->findExe("su"));
+        command = TQFile::encodeName( TDEGlobal::dirs()->findExe(superUserCommand.ascii()) );
         if (command.isEmpty())
             return check ? SuNotFound : -1;
     }
diff --git a/tdesu/tdesu_pty.cpp b/tdesu/tdesu_pty.cpp
index d3392ec5e..207c0a3e2 100644
--- a/tdesu/tdesu_pty.cpp
+++ b/tdesu/tdesu_pty.cpp
@@ -214,7 +214,7 @@ int PTY::grantpt()
 	return 0;
 
     // Use konsole_grantpty:
-    if (KStandardDirs::findExe("konsole_grantpty").isEmpty())
+    if (TDEStandardDirs::findExe("konsole_grantpty").isEmpty())
     {
 	kdError(900) << k_lineinfo << "konsole_grantpty not found.\n";
 	return -1;
diff --git a/tdeui/AUTHORS b/tdeui/AUTHORS
index 9e7ce9592..812999b79 100644
--- a/tdeui/AUTHORS
+++ b/tdeui/AUTHORS
@@ -2,15 +2,15 @@ Dawit Alemayehu <adawit@earthlink.net>
 KLineEdit, KComboBox
 
 Espen Sand <espen@kde.org>:
-KDialogBase, KAboutDialog (based on work by Mirko), KHelpMenu, KTextBrowser
+KDialogBase, TDEAboutDialog (based on work by Mirko), KHelpMenu, KTextBrowser
 and various adjustments here and there.
 
 Daniel M. Duley <mosfet@kde.org>
-Maintainer of KPixmapEffect, KStyle, KThemeStyle, and KThemeBase - as well as 
+Maintainer of KPixmapEffect, TDEStyle, KThemeStyle, and KThemeBase - as well as 
 general misc coding here and there. 
 
 Matthias Kalle Dalheimer <kalle@kde.org>:
-classes KApplication, KConfig, KTextStream, KColorSet, 
+classes TDEApplication, TDEConfig, KTextStream, KColorSet, 
 automake, autoconf, maintenance
 
 Richard Moore <moorer@cs.man.ac.uk>:
@@ -23,21 +23,21 @@ Steffen Hansen <stefh@dit.ou.dk>:
 KURL class
 
 Torben Weis <weis@stud.uni-frankfurt.de>
-DnD stuff, KSocket and KServerSocket classes, KPixmap
+DnD stuff, TDESocket and TDEServerSocket classes, KPixmap
 
 Alexander Sanda <alex@darkstar.ping.at>
 Read and write numerical config entries, KPanner, KTabControl,
-KPopupMenu, KMessageBox, KEdit widgets. 
+TDEPopupMenu, KMessageBox, KEdit widgets. 
 
 Martin Jones <mjones@powerup.com.au>
-Bugfixes in KPixmap and KURL, KColorDialog, KSelector
+Bugfixes in KPixmap and KURL, KColorDialog, TDESelector
 KColorButton
 
 Keith Brown <kbrown@pdq.net>
 KTreeList class
 
 Bernd Johannes Wuebben <wuebben@math.cornell.edu>
-KFontDialog class
+TDEFontDialog class
 
 Tim D. Gilman <tdgilman@best.com>
 KDatePicker, KDateTable class
@@ -46,10 +46,10 @@ Nicolas Hadacek <hadacek@kde.org>
 Key configuration classes, bug fixes
 
 Christoph Neerfeld <Christoph.Neerfeld@mail.bonn.netsurf.de>
-KIconLoader class
+TDEIconLoader class
 
 Sven Radej <sven.radej@iname.com>
-KLineEdit, KCombo, KToolbar, KStatusBar
+KLineEdit, KCombo, TDEToolbar, KStatusBar
 
 Rainer Bawidamann <Rainer.Bawidamann@wohnheim.uni-ulm.de>
 Rubberbanding in KTreeList
@@ -61,11 +61,11 @@ Michael Wiedmann <mw@miwie.in-berlin.de>
 KRestrictedLine, KIntegerLine
 
 Matthias Ettrich <ettrich@kde.org> 
-KWMModuleApplication, tearing/docking of ktoolbar and kmenubar, heavy
+KWMModuleApplication, tearing/docking of tdetoolbar and kmenubar, heavy
 modifications to kbutton
 
 Stephan Kulow <coolo@kde.org>
-first versions of KTopLevelWidget and KToolBar, heavy modifications to
+first versions of KTopLevelWidget and TDEToolBar, heavy modifications to
 automake and autoconf
 
 Joerg Habenicht <j.habenicht@europemail.com>
@@ -93,5 +93,5 @@ Falk Brettschneider <gigafalk@yahoo.com>
 contributes for the Dockwidget class set
 
 Holger Freyther <freyther@yahoo.com>
-KDialogBase, KGuiItem, KStdGuiItem, KAction,
+KDialogBase, KGuiItem, KStdGuiItem, TDEAction,
 added KMessageBox::questionYesNoCancel( )
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index 9ff7efc91..8cff8df1c 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}
 )
 
@@ -40,10 +40,10 @@ link_directories(
 
 install( FILES
     kprogressbox.h kprogress.h kcolordlg.h
-    kcolordialog.h kselect.h
-    kdatepik.h kdatepicker.h kdatetbl.h kfontdialog.h kpopupmenu.h
-    kfontrequester.h ktabctl.h kstatusbar.h
-    kmainwindow.h kmainwindowiface.h ktoolbar.h kmenubar.h
+    kcolordialog.h tdeselect.h
+    kdatepik.h kdatepicker.h kdatetbl.h tdefontdialog.h tdepopupmenu.h
+    tdefontrequester.h ktabctl.h kstatusbar.h
+    tdemainwindow.h tdemainwindowiface.h tdetoolbar.h tdemenubar.h
     knuminput.h kseparator.h klineedit.h
     krestrictedline.h kcolorbutton.h kcolorbtn.h
     ksystemtray.h kdockwindow.h kbuttonbox.h
@@ -53,30 +53,30 @@ install( FILES
     klineeditdlg.h kinputdialog.h kactivelabel.h
     kcharselect.h kcolordrag.h qxembed.h
     knumvalidator.h kdialog.h kdialogbase.h
-    kjanuswidget.h kaboutdialog.h
-    kauthicon.h kmessagebox.h ksharedpixmap.h
-    kdualcolorbtn.h kdualcolorbutton.h ktoolbarbutton.h
-    ktoolbarradiogroup.h ktextbrowser.h
-    kaction.h kactioncollection.h kactionclasses.h khelpmenu.h kswitchlanguagedialog.h
-    kcmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h
-    kactionshortcutlist.h kstdaction.h kcombobox.h
-    kiconview.h klistview.h klistbox.h kbugreport.h kpassdlg.h
+    kjanuswidget.h tdeaboutdialog.h
+    kauthicon.h tdemessagebox.h ksharedpixmap.h
+    kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h
+    tdetoolbarradiogroup.h ktextbrowser.h
+    tdeaction.h tdeactioncollection.h tdeactionclasses.h khelpmenu.h kswitchlanguagedialog.h
+    tdecmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h
+    tdeactionshortcutlist.h kstdaction.h kcombobox.h
+    kiconview.h tdelistview.h tdelistbox.h kbugreport.h kpassdlg.h
     kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h
     kpixmapio.h kwordwrap.h
     kedittoolbar.h kdockwidget.h kanimwidget.h
-    krootpixmap.h kaboutkde.h kaboutapplication.h
+    krootpixmap.h tdeabouttde.h tdeaboutapplication.h
     kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h
-    kpanelextension.h kcompletionbox.h ksqueezedtextlabel.h
-    kcommand.h twindowlistmenu.h kfontcombo.h kaccelgen.h ktip.h
+    kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h
+    kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h
     kdatewidget.h karrowbutton.h kguiitem.h kstdguiitem.h
     kstringvalidator.h twindowinfo.h
     ktextedit.h kpassivepopup.h
     kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h
-    kspell.h ksconfig.h kspelldlg.h ksyntaxhighlighter.h
-    ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h
-    kactionselector.h klanguagebutton.h klistviewsearchline.h
+    tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h
+    ktabbar.h ktabwidget.h ksplashscreen.h tdeconfigdialog.h
+    tdeactionselector.h klanguagebutton.h tdelistviewsearchline.h
     kpixmapregionselectorwidget.h kpixmapregionselectordialog.h
-    kiconviewsearchline.h ktoolbarlabelaction.h kshortcutdialog.h
+    kiconviewsearchline.h tdetoolbarlabelaction.h tdeshortcutdialog.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
@@ -101,48 +101,48 @@ set( target tdeui )
 
 set( ${target}_SRCS
   qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp
-  kpopupmenu.cpp ktoolbar.cpp kaction.cpp kstdaction.cpp
-  kactioncollection.cpp kactionclasses.cpp
-  kurllabel.cpp kmenubar.cpp kinputdialog.cpp
-  knuminput.cpp klineedit.cpp klistview.cpp kprogress.cpp
-  kprogressbox.cpp kcolordialog.cpp kselect.cpp kdatepicker.cpp
-  kdatetbl.cpp kfontrequester.cpp kfontdialog.cpp ktabctl.cpp
-  kstatusbar.cpp kmainwindow.cpp
+  tdepopupmenu.cpp tdetoolbar.cpp tdeaction.cpp kstdaction.cpp
+  tdeactioncollection.cpp tdeactionclasses.cpp
+  kurllabel.cpp tdemenubar.cpp kinputdialog.cpp
+  knuminput.cpp klineedit.cpp tdelistview.cpp kprogress.cpp
+  kprogressbox.cpp kcolordialog.cpp tdeselect.cpp kdatepicker.cpp
+  kdatetbl.cpp tdefontrequester.cpp tdefontdialog.cpp ktabctl.cpp
+  kstatusbar.cpp tdemainwindow.cpp
   keditlistbox.cpp kscrollview.cpp
   kseparator.cpp krestrictedline.cpp
   kcolorbutton.cpp ksystemtray.cpp
   kbuttonbox.cpp keditcl1.cpp keditcl2.cpp kled.cpp
-  kshortcutdialog_simple.ui kshortcutdialog_advanced.ui
-  kshortcutdialog.cpp kkeybutton.cpp kkeydialog.cpp
+  tdeshortcutdialog_simple.ui tdeshortcutdialog_advanced.ui
+  tdeshortcutdialog.cpp kkeybutton.cpp kkeydialog.cpp
   kruler.cpp kcursor.cpp klineeditdlg.cpp
   kcharselect.cpp kcolordrag.cpp
   knumvalidator.cpp kdialog.cpp kdialogbase.cpp
-  kjanuswidget.cpp kaboutdialog.cpp
-  kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp
-  ktoolbarradiogroup.cpp ktoolbarbutton.cpp
+  kjanuswidget.cpp tdeaboutdialog.cpp
+  kauthicon.cpp tdemessagebox.cpp kdualcolorbutton.cpp
+  tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp
   ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp
   kcmenumngr.cpp kpanelmenu.cpp
-  kiconview.cpp klistbox.cpp kwordwrap.cpp kbugreport.cpp
+  kiconview.cpp tdelistbox.cpp kwordwrap.cpp kbugreport.cpp
   kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp
   kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp
   kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp
-  kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp
-  kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
+  kanimwidget.cpp krootpixmap.cpp tdeabouttde.cpp
+  tdeaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
   kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp
-  kcompletionbox.cpp ksqueezedtextlabel.cpp kcmodule.cpp
-  kcommand.cpp twindowlistmenu.cpp kfontcombo.cpp ktip.cpp
-  kdatewidget.cpp karrowbutton.cpp kmainwindowiface.cpp
-  kmainwindowiface.skel kguiitem.cpp kstdguiitem.cpp
+  tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp
+  kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp
+  kdatewidget.cpp karrowbutton.cpp tdemainwindowiface.cpp
+  tdemainwindowiface.skel kguiitem.cpp kstdguiitem.cpp
   kstringvalidator.cpp kactivelabel.cpp
   twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp
-  ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp
-  ksconfig.cpp kspelldlg.cpp
-  kspell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
-  ksplashscreen.cpp kspellui.ui kconfigdialog.cpp
-  kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp
+  tdetoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp
+  ksconfig.cpp tdespelldlg.cpp
+  tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
+  ksplashscreen.cpp tdespellui.ui tdeconfigdialog.cpp
+  tdeactionselector.cpp klanguagebutton.cpp tdelistviewsearchline.cpp
   kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp
   kwhatsthismanager.cpp kiconviewsearchline.cpp
-  ktoolbarlabelaction.cpp
+  tdetoolbarlabelaction.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
@@ -154,9 +154,9 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-##### libkspell #################################
+##### libtdespell #################################
 
-set( target kspell )
+set( target tdespell )
 
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
 
diff --git a/tdeui/MAINTAINERS b/tdeui/MAINTAINERS
index f666536cb..2caa911a2 100644
--- a/tdeui/MAINTAINERS
+++ b/tdeui/MAINTAINERS
@@ -5,10 +5,10 @@ that class.
 When adding yourself as a maintainer, don't be afraid to reorder the files to a
 more logical grouping.
 
-kaboutapplication.cpp
-kaboutdialog.cpp
-kaboutkde.cpp
-kaction.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
+tdeaboutapplication.cpp
+tdeaboutdialog.cpp
+tdeabouttde.cpp
+tdeaction.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
 kanimwidget.cpp		Waldo Bastian <bastian@kde.org>
 karrowbutton.cpp	Frerich Raabe <raabe@kde.org>
 kauthicon.cpp
@@ -16,14 +16,14 @@ kbugreport.cpp
 kbuttonbox.cpp
 kcharselect.cpp
 kcmenumngr.cpp
-kcmodule.cpp
+tdecmodule.cpp
 kcolorbutton.cpp
 kcolorcombo.cpp
 kcolordialog.cpp	Waldo Bastian <bastian@kde.org>
 kcolordrag.cpp
 kcombobox.cpp   	Dawit Alemayehu <adawit@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
 kcommand.cpp		Werner Trobin <trobin@kde.org>
-kcompletionbox.cpp	Carsten Pfeiffer <pfeiffer@kde.org>
+tdecompletionbox.cpp	Carsten Pfeiffer <pfeiffer@kde.org>
 kcursor.cpp		Carsten Pfeiffer <pfeiffer@kde.org>
 kdatepicker.cpp
 kdatetbl.cpp
@@ -39,8 +39,8 @@ keditcl1.cpp		Waldo Bastian <bastian@kde.org>
 keditcl2.cpp		Waldo Bastian <bastian@kde.org>
 keditlistbox.cpp
 kedittoolbar.cpp
-kfontcombo.cpp
-kfontdialog.cpp
+tdefontcombo.cpp
+tdefontdialog.cpp
 kguiitem.cpp		Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
 khelpmenu.cpp
 kiconview.cpp
@@ -50,12 +50,12 @@ kkeydialog.cpp		Ellis Whitehead <ellis@kde.org>
 kled.cpp
 klineedit.cpp   	Dawit Alemayehu <adawit@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
 klineeditdlg.cpp
-klistbox.cpp
-klistview.cpp
-kmainwindow.cpp
-kmainwindowiface.cpp
-kmenubar.cpp
-kmessagebox.cpp		Waldo Bastian <bastian@kde.org>
+tdelistbox.cpp
+tdelistview.cpp
+tdemainwindow.cpp
+tdemainwindowiface.cpp
+tdemenubar.cpp
+tdemessagebox.cpp		Waldo Bastian <bastian@kde.org>
 knuminput.cpp           Dirk Mueller <mueller@kde.org>
 knumvalidator.cpp
 kpanelapplet.cpp
@@ -64,16 +64,16 @@ kpanelextension.cpp
 kpanelmenu.cpp
 kpassdlg.cpp		Waldo Bastian <bastian@kde.org>
 kpixmapio.cpp
-kpopupmenu.cpp		Holger Freyther <freyther@kde.org>
+tdepopupmenu.cpp		Holger Freyther <freyther@kde.org>
 kprogress.cpp
 kpushbutton.cpp		Carsten Pfeiffer <pfeiffer@kde.org>, Martijn Klingens <klingens@kde.org>
 krestrictedline.cpp
 krootpixmap.cpp
 kruler.cpp
-kselect.cpp
+tdeselect.cpp
 kseparator.cpp		Waldo Bastian <bastian@kde.org>
 ksharedpixmap.cpp
-kshortcutdialog.cpp	Ellis Whitehead <ellis@kde.org>
+tdeshortcutdialog.cpp	Ellis Whitehead <ellis@kde.org>
 ksqueezedtextlabel.cpp
 kstatusbar.cpp
 kstdaction.cpp
@@ -84,9 +84,9 @@ ktabctl.cpp
 ktextbrowser.cpp
 ktimewidget             Hans Petter Bieker <bieker@kde.org>
 ktip.cpp
-ktoolbar.cpp		Waldo Bastian <bastian@kde.org>
-ktoolbarbutton.cpp	Waldo Bastian <bastian@kde.org>
-ktoolbarradiogroup.cpp
+tdetoolbar.cpp		Waldo Bastian <bastian@kde.org>
+tdetoolbarbutton.cpp	Waldo Bastian <bastian@kde.org>
+tdetoolbarradiogroup.cpp
 kurllabel.cpp
 twindowlistmenu.cpp
 kwizard.cpp
diff --git a/tdeui/Mainpage.dox b/tdeui/Mainpage.dox
index 778c962f1..cf656363e 100644
--- a/tdeui/Mainpage.dox
+++ b/tdeui/Mainpage.dox
@@ -13,7 +13,7 @@
 * certainly link to libtdeui.
 *
 * Most applications with single or multiple toplevel widgets
-* should use the KMainWindow class in this library, which
+* should use the TDEMainWindow class in this library, which
 * automatically provides features like session management and simplified
 * toolbar/menubar/statusbar creation.
 *
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index 821e2e682..eac8cde0e 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -26,21 +26,21 @@ INCLUDES= -I/usr/include/freetype2/ -I$(top_srcdir)/tdefx -I$(top_srcdir)/interf
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 
-lib_LTLIBRARIES = libtdeui.la libkspell.la
+lib_LTLIBRARIES = libtdeui.la libtdespell.la
 libtdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
 libtdeui_la_LIBADD = ../tdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/tdefx/libtdefx.la $(LIB_XEXT)
 
-libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
-libkspell_la_SOURCES = dummy.cpp
+libtdespell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
+libtdespell_la_SOURCES = dummy.cpp
 
 picsdir = $(kde_datadir)/tdeui/pics
 pics_DATA = aboutkde.png ktip-bulb.png ktip-background.png
 
 include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
-		kcolordialog.h kselect.h \
-		kdatepik.h kdatepicker.h kdatetbl.h kfontdialog.h kpopupmenu.h \
-		kfontrequester.h ktabctl.h kstatusbar.h \
-		kmainwindow.h kmainwindowiface.h ktoolbar.h kmenubar.h \
+		kcolordialog.h tdeselect.h \
+		kdatepik.h kdatepicker.h kdatetbl.h tdefontdialog.h tdepopupmenu.h \
+		tdefontrequester.h ktabctl.h kstatusbar.h \
+		tdemainwindow.h tdemainwindowiface.h tdetoolbar.h tdemenubar.h \
 		knuminput.h kseparator.h klineedit.h \
 		krestrictedline.h kcolorbutton.h kcolorbtn.h \
 		ksystemtray.h kdockwindow.h kbuttonbox.h \
@@ -50,30 +50,30 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		klineeditdlg.h kinputdialog.h kactivelabel.h \
 		kcharselect.h kcolordrag.h qxembed.h \
 		knumvalidator.h kdialog.h kdialogbase.h \
-		kjanuswidget.h kaboutdialog.h \
-		kauthicon.h kmessagebox.h ksharedpixmap.h \
-		kdualcolorbtn.h kdualcolorbutton.h ktoolbarbutton.h \
-		ktoolbarradiogroup.h ktextbrowser.h \
-		kaction.h kactioncollection.h kactionclasses.h khelpmenu.h kswitchlanguagedialog.h \
-		kcmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h \
-		kactionshortcutlist.h kstdaction.h kcombobox.h \
-		kiconview.h klistview.h klistbox.h kbugreport.h kpassdlg.h \
+		kjanuswidget.h tdeaboutdialog.h \
+		kauthicon.h tdemessagebox.h ksharedpixmap.h \
+		kdualcolorbtn.h kdualcolorbutton.h tdetoolbarbutton.h \
+		tdetoolbarradiogroup.h ktextbrowser.h \
+		tdeaction.h tdeactioncollection.h tdeactionclasses.h khelpmenu.h kswitchlanguagedialog.h \
+		tdecmodule.h kcmenumngr.h kpanelmenu.h kpanelappmenu.h \
+		tdeactionshortcutlist.h kstdaction.h kcombobox.h \
+		kiconview.h tdelistview.h tdelistbox.h kbugreport.h kpassdlg.h \
 		kxmlguiclient.h kxmlgui.h kxmlguibuilder.h kxmlguifactory.h \
 		kpixmapio.h kwordwrap.h \
 		kedittoolbar.h kdockwidget.h kanimwidget.h \
-		krootpixmap.h kaboutkde.h kaboutapplication.h \
+		krootpixmap.h tdeabouttde.h tdeaboutapplication.h \
 		kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h \
-		kpanelextension.h kcompletionbox.h ksqueezedtextlabel.h \
-		kcommand.h twindowlistmenu.h kfontcombo.h kaccelgen.h ktip.h \
+		kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h \
+		kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h \
 		kdatewidget.h karrowbutton.h kguiitem.h kstdguiitem.h \
 		kstringvalidator.h twindowinfo.h \
 		ktextedit.h kpassivepopup.h \
 		kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h \
-		kspell.h ksconfig.h kspelldlg.h ksyntaxhighlighter.h \
-		ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h \
-		kactionselector.h klanguagebutton.h klistviewsearchline.h \
+		tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h \
+		ktabbar.h ktabwidget.h ksplashscreen.h tdeconfigdialog.h \
+		tdeactionselector.h klanguagebutton.h tdelistviewsearchline.h \
 		kpixmapregionselectorwidget.h kpixmapregionselectordialog.h \
-		kiconviewsearchline.h ktoolbarlabelaction.h kshortcutdialog.h
+		kiconviewsearchline.h tdetoolbarlabelaction.h tdeshortcutdialog.h
 
 # the order of the sources isn't randomly (at least not completely).
 # the order is predictated by the use of X11 header files
@@ -82,50 +82,50 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 # in ksharedpixmap.cpp
 libtdeui_la_SOURCES = \
 		qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp \
-		kpopupmenu.cpp ktoolbar.cpp kaction.cpp kstdaction.cpp \
-		kactioncollection.cpp kactionclasses.cpp \
-		kurllabel.cpp kmenubar.cpp kinputdialog.cpp \
-		knuminput.cpp klineedit.cpp klistview.cpp kprogress.cpp \
-		kprogressbox.cpp kcolordialog.cpp kselect.cpp kdatepicker.cpp \
-		kdatetbl.cpp kfontrequester.cpp kfontdialog.cpp ktabctl.cpp \
-		kstatusbar.cpp kmainwindow.cpp \
+		tdepopupmenu.cpp tdetoolbar.cpp tdeaction.cpp kstdaction.cpp \
+		tdeactioncollection.cpp tdeactionclasses.cpp \
+		kurllabel.cpp tdemenubar.cpp kinputdialog.cpp \
+		knuminput.cpp klineedit.cpp tdelistview.cpp kprogress.cpp \
+		kprogressbox.cpp kcolordialog.cpp tdeselect.cpp kdatepicker.cpp \
+		kdatetbl.cpp tdefontrequester.cpp tdefontdialog.cpp ktabctl.cpp \
+		kstatusbar.cpp tdemainwindow.cpp \
 		keditlistbox.cpp kscrollview.cpp \
 		kseparator.cpp krestrictedline.cpp  \
 		kcolorbutton.cpp ksystemtray.cpp \
 		kbuttonbox.cpp keditcl1.cpp keditcl2.cpp kled.cpp \
-		kshortcutdialog_simple.ui kshortcutdialog_advanced.ui \
-		kshortcutdialog.cpp kkeybutton.cpp kkeydialog.cpp \
+		tdeshortcutdialog_simple.ui tdeshortcutdialog_advanced.ui \
+		tdeshortcutdialog.cpp kkeybutton.cpp kkeydialog.cpp \
 		kruler.cpp kcursor.cpp klineeditdlg.cpp  \
 		kcharselect.cpp kcolordrag.cpp  \
 		knumvalidator.cpp kdialog.cpp kdialogbase.cpp \
-		kjanuswidget.cpp kaboutdialog.cpp \
-		kauthicon.cpp kmessagebox.cpp kdualcolorbutton.cpp \
-		ktoolbarradiogroup.cpp ktoolbarbutton.cpp \
+		kjanuswidget.cpp tdeaboutdialog.cpp \
+		kauthicon.cpp tdemessagebox.cpp kdualcolorbutton.cpp \
+		tdetoolbarradiogroup.cpp tdetoolbarbutton.cpp \
 		ktextbrowser.cpp khelpmenu.cpp kswitchlanguagedialog.cpp \
 		kcmenumngr.cpp kpanelmenu.cpp \
-		kiconview.cpp klistbox.cpp kwordwrap.cpp kbugreport.cpp \
+		kiconview.cpp tdelistbox.cpp kwordwrap.cpp kbugreport.cpp \
 		kcombobox.cpp kpassdlg.cpp kxmlguiclient.cpp kxmlguifactory.cpp \
 		kxmlguifactory_p.cpp kxmlguibuilder.cpp kedittoolbar.cpp \
 		kpanelappmenu.cpp kdockwidget.cpp kdockwidget_private.cpp \
-		kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp \
-		kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
+		kanimwidget.cpp krootpixmap.cpp tdeabouttde.cpp \
+		tdeaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
 		kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp \
-		kcompletionbox.cpp ksqueezedtextlabel.cpp kcmodule.cpp \
-		kcommand.cpp twindowlistmenu.cpp kfontcombo.cpp ktip.cpp \
-		kdatewidget.cpp karrowbutton.cpp kmainwindowiface.cpp \
-                kmainwindowiface.skel kguiitem.cpp kstdguiitem.cpp \
+		tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp \
+		kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp \
+		kdatewidget.cpp karrowbutton.cpp tdemainwindowiface.cpp \
+                tdemainwindowiface.skel kguiitem.cpp kstdguiitem.cpp \
 		kstringvalidator.cpp kactivelabel.cpp \
 		twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp \
-		ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \
-		ksconfig.cpp kspelldlg.cpp \
-		kspell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
-		ksplashscreen.cpp kspellui.ui kconfigdialog.cpp \
-		kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp \
+		tdetoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \
+		ksconfig.cpp tdespelldlg.cpp \
+		tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
+		ksplashscreen.cpp tdespellui.ui tdeconfigdialog.cpp \
+		tdeactionselector.cpp klanguagebutton.cpp tdelistviewsearchline.cpp \
 		kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp \
 		kwhatsthismanager.cpp kiconviewsearchline.cpp \
-		ktoolbarlabelaction.cpp
+		tdetoolbarlabelaction.cpp
 
-noinst_HEADERS = kdockwidget_private.h kdockwidget_p.h klistviewlineedit.h \
+noinst_HEADERS = kdockwidget_private.h kdockwidget_p.h tdelistviewlineedit.h \
 		kdialogbase_priv.h kaboutdialog_private.h kcursor_private.h \
 		kdepackages.h kxmlguifactory_p.h \
 		kstdaction_p.h kwhatsthismanager_p.h
@@ -166,6 +166,6 @@ dummy.cpp:
 	echo "}" >> dummy.cpp
 	echo "#endif" >> dummy.cpp
 
-DOXYGEN_REFERENCES = tdecore tdefx dcop kio kutils
+DOXYGEN_REFERENCES = tdecore tdefx dcop kio tdeutils
 DOXYGEN_SET_INTERNAL_DOCS = YES
 include ../admin/Doxyfile.am
diff --git a/tdeui/README.kspell b/tdeui/README.tdespell
index 9ae1afe84..e5262f057 100644
--- a/tdeui/README.kspell
+++ b/tdeui/README.tdespell
@@ -2,7 +2,7 @@ KSpell, by David Sweet
 ----------------------
 KSpell provides an interface to ASpell and International ISpell 3.1.  You
 should use it like a UI widget to provide spellchecking in your application. 
-See kspell.h and http://www.chaos.umd.edu/~dsweet/KDE/KSpell for
+See tdespell.h and http://www.chaos.umd.edu/~dsweet/KDE/KSpell for
 documentation.
 
 Settings
@@ -12,6 +12,6 @@ not only as a widget allowing the user to set KSpell preferences, but also
 as a data abstraction class allowing you to get and set the preferences from
 within your program.  You can pass an instance of KSpellConfig to KSpell
 and the spellchecker will run with the appropriate preference settings.  The
-preferences, when saved (see kspelldlg.h) are saved globally.  If needed,
+preferences, when saved (see tdespelldlg.h) are saved globally.  If needed,
 you can read them with KSpellDlg and set and use application-specific
 spellchecking settings.
diff --git a/tdeui/TODO.kspell b/tdeui/TODO.tdespell
index 99c9df408..99c9df408 100644
--- a/tdeui/TODO.kspell
+++ b/tdeui/TODO.tdespell
diff --git a/tdeui/TODO.xmlgui b/tdeui/TODO.xmlgui
index 3c3d4f8a4..0c0753685 100644
--- a/tdeui/TODO.xmlgui
+++ b/tdeui/TODO.xmlgui
@@ -4,15 +4,15 @@ When removing an xmlgui-client involves destroying toolbars, we need to save the
 whole set of toolbar positions of the mainwindow, into the xmlgui-client.
 
 Data structure:
-struct KToolBarPos {
+struct TDEToolBarPos {
    short int index;
    short int offset;
    bool newLine;
 };
-typedef QValueVector<KToolBarPos> KToolBarPosList;
+typedef QValueVector<TDEToolBarPos> TDEToolBarPosList;
 
 API:
-KToolBarPosList KMainWindow::toolBarPositionList() const;
+TDEToolBarPosList TDEMainWindow::toolBarPositionList() const;
 
 The remaining problem is to know when to call it:
 * when we know in advance that we'll be able to remove toolbars?
@@ -74,7 +74,7 @@ which would forward the action() and domElement() calls - because a client
 can be in only one factory at a time.
 
 This custom builder needs to know about action plugging too, we don't really want
-to call KAction::plug here. So this would be 'virtualized' (new virtual, in a new
+to call TDEAction::plug here. So this would be 'virtualized' (new virtual, in a new
 interface to keep BC, that by default calls plug, but does something else in
 kedittoolbar's builder).
 
diff --git a/tdeui/kaboutdialog_private.h b/tdeui/kaboutdialog_private.h
index 6eb4cc312..12d3e18a6 100644
--- a/tdeui/kaboutdialog_private.h
+++ b/tdeui/kaboutdialog_private.h
@@ -29,7 +29,7 @@ class TQTabWidget;
 class TQVBoxLayout;
 
 /**
- * Used internally by KAboutContainerBase
+ * Used internally by TDEAboutContainerBase
  * @internal
  */
 class KImageTrackLabel : public TQLabel
@@ -58,15 +58,15 @@ class KImageTrackLabel : public TQLabel
     virtual void mouseMoveEvent ( TQMouseEvent *e );
 };
 
-class KAboutContainer;
+class TDEAboutContainer;
 
-class KAboutContainerBasePrivate;
+class TDEAboutContainerBasePrivate;
 
 /**
- * Used internally by KAboutDialog
+ * Used internally by TDEAboutDialog
  * @internal
  */
-class KAboutContainerBase : public TQWidget
+class TDEAboutContainerBase : public TQWidget
 {
   Q_OBJECT
 
@@ -86,7 +86,7 @@ class KAboutContainerBase : public TQWidget
     };
 
   public:
-    KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 );
+    TDEAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 );
     virtual void show( void );
     virtual TQSize sizeHint( void ) const;
 
@@ -103,14 +103,14 @@ class KAboutContainerBase : public TQWidget
 			 bool richText=false, int numLines=10 );
     TQFrame *addLicensePage( const TQString &title, const TQString &text,
 			 int numLines=10 );
-    KAboutContainer *addContainerPage( const TQString &title,
+    TDEAboutContainer *addContainerPage( const TQString &title,
       int childAlignment = AlignCenter, int innerAlignment = AlignCenter );
-    KAboutContainer *addScrolledContainerPage( const TQString &title,
+    TDEAboutContainer *addScrolledContainerPage( const TQString &title,
       int childAlignment = AlignCenter, int innerAlignment = AlignCenter );
 
     TQFrame *addEmptyPage( const TQString &title );
 
-    KAboutContainer *addContainer( int childAlignment, int innerAlignment );
+    TDEAboutContainer *addContainer( int childAlignment, int innerAlignment );
 
   public slots:
     virtual void slotMouseTrack( int mode, const TQMouseEvent *e );
@@ -136,7 +136,7 @@ class KAboutContainerBase : public TQWidget
     TQTabWidget *mPageTab;
     TQFrame  *mPlainSpace;
 
-    KAboutContainerBasePrivate* const d;
+    TDEAboutContainerBasePrivate* const d;
 };
 
 
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp
index 72e72b677..0e5abc5ad 100644
--- a/tdeui/kactivelabel.cpp
+++ b/tdeui/kactivelabel.cpp
@@ -19,7 +19,7 @@
 
 #include "kactivelabel.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <tqsimplerichtext.h>
@@ -51,7 +51,7 @@ void KActiveLabel::init()
            this, TQT_SLOT(openLink(const TQString &)));
    if (kapp)
    {
-      connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()),
+      connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
               this, TQT_SLOT(paletteChanged()));
    }
 }
diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp
index 899ba7bd3..664117ce3 100644
--- a/tdeui/kanimwidget.cpp
+++ b/tdeui/kanimwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqimage.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
@@ -47,7 +47,7 @@ KAnimWidget::KAnimWidget( const TQString& icons, int size, TQWidget *parent,
 {
   connect( &d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimerUpdate()));
 
-  if (parent && parent->inherits( "KToolBar" ))
+  if (parent && parent->inherits( "TDEToolBar" ))
     connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(updateIcons()));
 
   d->loadingCompleted = false;
@@ -182,12 +182,12 @@ void KAnimWidget::updateIcons()
   if (!d->initDone)
      return;
 
-  if (parent()->inherits( "KToolBar" ))
-    d->size = ((KToolBar*)parent())->iconSize();
+  if (parent()->inherits( "TDEToolBar" ))
+    d->size = ((TDEToolBar*)parent())->iconSize();
   if (!d->size)
-     d->size = KGlobal::iconLoader()->currentSize(KIcon::MainToolbar);
+     d->size = TDEGlobal::iconLoader()->currentSize(TDEIcon::MainToolbar);
 
-  TQString path = KGlobal::iconLoader()->iconPath(d->icon_name, -d->size);
+  TQString path = TDEGlobal::iconLoader()->iconPath(d->icon_name, -d->size);
   TQImage img(path);
   
   if (img.isNull())
diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h
index 74f663463..77abf837a 100644
--- a/tdeui/kanimwidget.h
+++ b/tdeui/kanimwidget.h
@@ -68,7 +68,7 @@ public:
    * @param icons  The icons name (e.g., "kde") to use for the animation
    * @param size   The size to load
    *               You don't have to set it if the parent is a
-   *               KToolBar; in this case it will use the toolbar's
+   *               TDEToolBar; in this case it will use the toolbar's
    *               size.
    * @param parent The standard parent
    * @param name   The standard internal name
@@ -102,7 +102,7 @@ public:
 
   /**
    * Sets the name of the animated icons to load.  This will use the
-   * KIconLoader::loadAnimated method for the actual loading.
+   * TDEIconLoader::loadAnimated method for the actual loading.
    *
    * @param icons The name of the icons to use for the animation
    */
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index df25c69eb..c490c8aab 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -30,7 +30,7 @@ class KArrowButtonPrivate;
  * Draws a button which shows an arrow pointing into a certain direction. The
  * arrow's alignment on the button depends on the direction it's pointing to,
  * e.g. a left arrow is aligned at the left border, a upwards arrow at the top
- * border. This class honors the currently configured KStyle when drawing
+ * border. This class honors the currently configured TDEStyle when drawing
  * the arrow.
  *
  * @author Frerich Raabe
diff --git a/tdeui/kauthicon.cpp b/tdeui/kauthicon.cpp
index d4c18a114..d45217d9b 100644
--- a/tdeui/kauthicon.cpp
+++ b/tdeui/kauthicon.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kauthicon.h"
 
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index c3cf0b518..3e49e112c 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -26,13 +26,13 @@
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
@@ -50,7 +50,7 @@
 #include "kdepackages.h"
 #include <kcombobox.h>
 #include <config.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqtextstream.h>
 #include <tqfile.h>
 
@@ -65,7 +65,7 @@ public:
     KURL url;
 };
 
-KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutData )
+KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *aboutData )
   : KDialogBase( Plain,
                  i18n("Submit Bug Report"),
                  Ok | Cancel,
@@ -79,11 +79,11 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
   d = new KBugReportPrivate;
 
   // Use supplied aboutdata, otherwise the one from the active instance
-  // otherwise the KGlobal one. _activeInstance should neved be 0L in theory.
+  // otherwise the TDEGlobal one. _activeInstance should neved be 0L in theory.
   m_aboutData = aboutData
     ? aboutData
-    : ( KGlobal::_activeInstance ? KGlobal::_activeInstance->aboutData()
-                                 : KGlobal::instance()->aboutData() );
+    : ( TDEGlobal::_activeInstance ? TDEGlobal::_activeInstance->aboutData()
+                                 : TDEGlobal::instance()->aboutData() );
   m_process = 0;
   TQWidget * parent = plainPage();
   d->submitBugButton = 0;
@@ -318,12 +318,12 @@ void KBugReport::appChanged(int i)
 void KBugReport::slotConfigureEmail()
 {
   if (m_process) return;
-  m_process = new KProcess;
-  *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
-  connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom()));
+  m_process = new TDEProcess;
+  *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;
@@ -338,7 +338,7 @@ void KBugReport::slotSetFrom()
   m_configureEmail->setEnabled(true);
 
   // ### KDE4: why oh why is KEmailSettings in kio?
-  KConfig emailConf( TQString::fromLatin1("emaildefaults") );
+  TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
 
   // find out the default profile
   emailConf.setGroup( TQString::fromLatin1("Defaults") );
@@ -460,9 +460,9 @@ TQString KBugReport::text() const
      bodyText += line;
   }
 
-  if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) {
+  if (severity == TQString::fromLatin1("i18n") && TDEGlobal::locale()->language() != TDELocale::defaultLanguage()) {
       // Case 1 : i18n bug
-      TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language());
+      TQString package = TQString::fromLatin1("i18n_%1").arg(TDEGlobal::locale()->language());
       package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-"));
       return TQString::fromLatin1("Package: %1").arg(package) +
           TQString::fromLatin1("\n"
@@ -489,20 +489,20 @@ 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 = TDEStandardDirs::findExe( TQString::fromLatin1("tdesendbugmail") );
 
   KTempFile outputfile;
   outputfile.close();
 
   TQString subject = m_subject->text();
   command += " --subject ";
-  command += KProcess::quote(subject);
+  command += TDEProcess::quote(subject);
   command += " --recipient ";
-  command += KProcess::quote(recipient);
+  command += TDEProcess::quote(recipient);
   command += " > ";
-  command += KProcess::quote(outputfile.name());
+  command += TDEProcess::quote(outputfile.name());
 
   fflush(stdin);
   fflush(stderr);
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index cff575dad..aec61d668 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -24,8 +24,8 @@
 class TQMultiLineEdit;
 class TQLineEdit;
 class TQHButtonGroup;
-class KProcess;
-class KAboutData;
+class TDEProcess;
+class TDEAboutData;
 class KBugReportPrivate;
 
 /**
@@ -33,9 +33,9 @@ class KBugReportPrivate;
  *
  * All the information needed by the dialog box
  * (program name, version, bug-report address, etc.)
- * comes from the KAboutData class.
- * Make sure you create an instance of KAboutData and pass it
- * to KCmdLineArgs.
+ * comes from the TDEAboutData class.
+ * Make sure you create an instance of TDEAboutData and pass it
+ * to TDECmdLineArgs.
  *
  * @author David Faure <faure@kde.org>
  */
@@ -49,7 +49,7 @@ public:
    * since KHelpMenu takes care of the menu item
    * for "Report Bug..." and of creating a KBugReport dialog.
    */
-  KBugReport( TQWidget * parent = 0L, bool modal=true, const KAboutData *aboutData = 0L );
+  KBugReport( TQWidget * parent = 0L, bool modal=true, const TDEAboutData *aboutData = 0L );
   /**
    * Destructor
    */
@@ -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();
   /**
@@ -100,8 +100,8 @@ protected:
    */
   bool sendBugReport();
 
-  KProcess * m_process;
-  const KAboutData * m_aboutData;
+  TDEProcess * m_process;
+  const TDEAboutData * m_aboutData;
 
   TQMultiLineEdit * m_lineedit;
   TQLineEdit * m_subject;
diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp
index 6351c512d..faa26e95e 100644
--- a/tdeui/kbuttonbox.cpp
+++ b/tdeui/kbuttonbox.cpp
@@ -50,7 +50,7 @@
  */
 
 #include "kbuttonbox.moc"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kguiitem.h>
 #include <kpushbutton.h>
 #include <tqptrlist.h>
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index ace147496..5561e5883 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -36,11 +36,11 @@
 #include <tqtooltip.h>
 #include <tqvalidator.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KCharSelect::KCharSelectPrivate
 {
diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp
index 640b9c7ac..60e250575 100644
--- a/tdeui/kcmenumngr.cpp
+++ b/tdeui/kcmenumngr.cpp
@@ -21,9 +21,9 @@
 #include <tqwidget.h>
 #include <tqpopupmenu.h>
 #include "kcmenumngr.h"
-#include "kglobal.h"
-#include "kconfig.h"
-#include "kshortcut.h"
+#include "tdeglobal.h"
+#include "tdeconfig.h"
+#include "tdeshortcut.h"
 
 #undef KeyPress
 #undef None
@@ -35,8 +35,8 @@ KContextMenuManager* KContextMenuManager::manager = 0;
 KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name )
     : TQObject( parent, name)
 {
-    KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ;
-    menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt();
+    TDEConfigGroupSaver saver ( TDEGlobal::config(), TQString::fromLatin1("Shortcuts") ) ;
+    menuKey = TDEShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt();
     saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ;
     showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true );
 }
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index ceded0f58..5a42406a0 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -25,8 +25,8 @@
 #include <tqapplication.h>
 #include <tqclipboard.h>
 #include <tqstyle.h>
-#include <kglobalsettings.h>
-#include <kstdaccel.h>
+#include <tdeglobalsettings.h>
+#include <tdestdaccel.h>
 #include "kcolordialog.h"
 #include "kcolorbutton.h"
 #include "kcolordrag.h"
@@ -153,11 +153,11 @@ void KColorButton::keyPressEvent( TQKeyEvent *e )
 {
   KKey key( e );
 
-  if ( KStdAccel::copy().contains( key ) ) {
+  if ( TDEStdAccel::copy().contains( key ) ) {
     TQMimeSource* mime = new KColorDrag( color() );
     TQApplication::clipboard()->setData( mime, TQClipboard::Clipboard );
   }
-  else if ( KStdAccel::paste().contains( key ) ) {
+  else if ( TDEStdAccel::paste().contains( key ) ) {
     TQColor color;
     KColorDrag::decode( TQApplication::clipboard()->data( TQClipboard::Clipboard ), color );
     setColor( color );
@@ -175,7 +175,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e)
 void KColorButton::mouseMoveEvent( TQMouseEvent *e)
 {
   if( (e->state() & Qt::LeftButton) &&
-    (e->pos()-mPos).manhattanLength() > KGlobalSettings::dndEventDelay() )
+    (e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() )
   {
     // Drag color object
     KColorDrag *dg = new KColorDrag( color(), this);
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index a7dd90ac7..87d5de32a 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -44,14 +44,14 @@
 #include <tqpushbutton.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kpalette.h>
 #include <kimageeffect.h>
diff --git a/tdeui/kcolorcombo.h b/tdeui/kcolorcombo.h
index 07127a3f9..bade8efcb 100644
--- a/tdeui/kcolorcombo.h
+++ b/tdeui/kcolorcombo.h
@@ -28,7 +28,7 @@
 
 #include <tqcombobox.h>
 #include <kcolordialog.h>
-#include "kselect.h"
+#include "tdeselect.h"
 
 
 class KColorComboInternal;
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index ec3930fa3..458fb50a8 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -45,15 +45,15 @@
 #include <tqspinbox.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kpalette.h>
 #include <kimageeffect.h>
@@ -260,7 +260,7 @@ void KHSSelector::drawPalette( TQPixmap *pixmap )
 //-----------------------------------------------------------------------------
 
 KValueSelector::KValueSelector( TQWidget *parent, const char *name )
-	: KSelector( Qt::Vertical, parent, name ), _hue(0), _sat(0)
+	: TDESelector( Qt::Vertical, parent, name ), _hue(0), _sat(0)
 {
 	setRange( 0, 255 );
 	pixmap.setOptimization( TQPixmap::BestOptim );
@@ -268,7 +268,7 @@ KValueSelector::KValueSelector( TQWidget *parent, const char *name )
 
 KValueSelector::KValueSelector(Orientation o, TQWidget *parent, const char *name
  )
-	: KSelector( o, parent, name), _hue(0), _sat(0)
+	: TDESelector( o, parent, name), _hue(0), _sat(0)
 {
 	setRange( 0, 255 );
 	pixmap.setOptimization( TQPixmap::BestOptim );
@@ -429,7 +429,7 @@ void KColorCells::mouseMoveEvent( TQMouseEvent *e )
     if( !(e->state() & Qt::LeftButton)) return;
 
     if(inMouse) {
-        int delay = KGlobalSettings::dndEventDelay();
+        int delay = TDEGlobalSettings::dndEventDelay();
         if(e->x() > mPos.x()+delay || e->x() < mPos.x()-delay ||
            e->y() > mPos.y()+delay || e->y() < mPos.y()-delay){
             // Drag color object
@@ -590,7 +590,7 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols)
   sv->setFixedSize(minSize);
   layout->addWidget(sv);
 
-  mNamedColorList = new KListBox( this, "namedColorList", 0 );
+  mNamedColorList = new TDEListBox( this, "namedColorList", 0 );
   mNamedColorList->setFixedSize(minSize);
   mNamedColorList->hide();
   layout->addWidget(mNamedColorList);
@@ -645,7 +645,7 @@ KPaletteTable::readNamedColor( void )
     return; // Strings already present
   }
 
-  KGlobal::locale()->insertCatalogue("tdelibs_colors");
+  TDEGlobal::locale()->insertCatalogue("tdelibs_colors");
 
   //
   // Code somewhat inspired by KPalette.
@@ -1254,7 +1254,7 @@ void KColorDialog::slotDefaultColorClicked()
 void
 KColorDialog::readSettings()
 {
-  KConfigGroup group( KGlobal::config(), "Colors" );
+  TDEConfigGroup group( TDEGlobal::config(), "Colors" );
 
   TQString palette = group.readEntry("CurrentPalette");
   d->table->setPalette(palette);
@@ -1263,7 +1263,7 @@ KColorDialog::readSettings()
 void
 KColorDialog::slotWriteSettings()
 {
-  KConfigGroup group( KGlobal::config(), "Colors" );
+  TDEConfigGroup group( TDEGlobal::config(), "Colors" );
 
   TQString palette = d->table->palette();
   if (!group.hasDefault("CurrentPalette") &&
@@ -1597,7 +1597,7 @@ void KHSSelector::virtual_hook( int id, void* data )
 { KXYSelector::virtual_hook( id, data ); }
 
 void KValueSelector::virtual_hook( int id, void* data )
-{ KSelector::virtual_hook( id, data ); }
+{ TDESelector::virtual_hook( id, data ); }
 
 void KPaletteTable::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
diff --git a/tdeui/kcolordialog.h b/tdeui/kcolordialog.h
index 20c9f799d..e580ad582 100644
--- a/tdeui/kcolordialog.h
+++ b/tdeui/kcolordialog.h
@@ -35,11 +35,11 @@
 #include <tqpixmap.h>
 #include <tqgridview.h>
 
-#include "kselect.h"
+#include "tdeselect.h"
 
 class TQComboBox;
 class TQLineEdit;
-class KListBox;
+class TDEListBox;
 class KPalette;
 class KColorCells;
 
@@ -99,7 +99,7 @@ class KValueSelectorPrivate;
  * @see KHSSelector, KColorDialog
  * @author Martin Jones (mjones@kde.org)
  */
-class TDEUI_EXPORT KValueSelector : public KSelector
+class TDEUI_EXPORT KValueSelector : public TDESelector
 {
   Q_OBJECT
 
@@ -132,7 +132,7 @@ protected:
   virtual void resizeEvent( TQResizeEvent * );
 
   /**
-   * Reimplemented from KSelector. The drawing is
+   * Reimplemented from TDESelector. The drawing is
    * buffered in a pixmap here. As real drawing
    * routine, drawPalette() is used.
    */
@@ -229,7 +229,7 @@ protected:
   TQComboBox *combo;
   KColorCells *cells;
   TQScrollView *sv;
-  KListBox *mNamedColorList;
+  TDEListBox *mNamedColorList;
   KPalette *mPalette;
   int mMinWidth;
   int mCols;
diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index 198a1e200..cfef5fd5b 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -25,16 +25,16 @@
 #include <tqpopupmenu.h>
 #include <tqapplication.h>
 
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 #include <kcursor.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kpixmapprovider.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
@@ -111,13 +111,13 @@ void KComboBox::setAutoCompletion( bool autocomplete )
     {
         if ( autocomplete )
         {
-            d->klineEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
-            setCompletionMode( KGlobalSettings::CompletionAuto );
+            d->klineEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
+            setCompletionMode( TDEGlobalSettings::CompletionAuto );
         }
         else
         {
-            d->klineEdit->setCompletionMode( KGlobalSettings::completionMode() );
-            setCompletionMode( KGlobalSettings::completionMode() );
+            d->klineEdit->setCompletionMode( TDEGlobalSettings::completionMode() );
+            setCompletionMode( TDEGlobalSettings::completionMode() );
         }
     }
 }
@@ -169,7 +169,7 @@ void KComboBox::makeCompletion( const TQString& text )
     }
 }
 
-void KComboBox::rotateText( KCompletionBase::KeyBindingType type )
+void KComboBox::rotateText( TDECompletionBase::KeyBindingType type )
 {
     if ( d->klineEdit )
         d->klineEdit->rotateText( type );
@@ -226,7 +226,7 @@ void KComboBox::setCompletedItems( const TQStringList& items )
         d->klineEdit->setCompletedItems( items );
 }
 
-KCompletionBox * KComboBox::completionBox( bool create )
+TDECompletionBox * KComboBox::completionBox( bool create )
 {
     if ( d->klineEdit )
         return d->klineEdit->completionBox( create );
@@ -271,7 +271,7 @@ void KComboBox::setLineEdit( TQLineEdit *edit )
     if ( d->klineEdit )
     {
         // someone calling KComboBox::setEditable( false ) destroys our
-        // lineedit without us noticing. And KCompletionBase::delegate would
+        // lineedit without us noticing. And TDECompletionBase::delegate would
         // be a dangling pointer then, so prevent that. Note: only do this
         // when it is a KLineEdit!
         connect( edit, TQT_SIGNAL( destroyed() ), TQT_SLOT( lineEditDeleted() ));
@@ -286,12 +286,12 @@ void KComboBox::setLineEdit( TQLineEdit *edit )
                  TQT_SIGNAL( substringCompletion( const TQString& )) );
 
         connect( d->klineEdit,
-                 TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType )),
-                 TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType )) );
+                 TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )),
+                 TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) );
 
         connect( d->klineEdit,
-                 TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion )),
-                 TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion)));
+                 TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )),
+                 TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion)));
 
         connect( d->klineEdit,
                  TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )),
@@ -333,7 +333,7 @@ void KComboBox::lineEditDeleted()
     // yes, we need those ugly casts due to the multiple inheritance
     // sender() is guaranteed to be a KLineEdit (see the connect() to the
     // destroyed() signal
-    const KCompletionBase *base = static_cast<const KCompletionBase*>( static_cast<const KLineEdit*>( sender() ));
+    const TDECompletionBase *base = static_cast<const TDECompletionBase*>( static_cast<const KLineEdit*>( sender() ));
 
     // is it our delegate, that is destroyed?
     if ( base == delegate() )
@@ -378,7 +378,7 @@ void KHistoryCombo::init( bool useCompletion )
     setMaxCount( 50 );
 
     if ( useCompletion )
-        completionObject()->setOrder( KCompletion::Weighted );
+        completionObject()->setOrder( TDECompletion::Weighted );
 
     setInsertionPolicy( NoInsertion );
     myIterateIndex = -1;
@@ -421,10 +421,10 @@ void KHistoryCombo::setHistoryItems( TQStringList items,
 
     if ( setCompletionList && useCompletion() ) {
         // we don't have any weighting information here ;(
-        KCompletion *comp = completionObject();
-        comp->setOrder( KCompletion::Insertion );
+        TDECompletion *comp = completionObject();
+        comp->setOrder( TDECompletion::Insertion );
         comp->setItems( items );
-        comp->setOrder( KCompletion::Weighted );
+        comp->setOrder( TDECompletion::Weighted );
     }
 
     clearEdit();
@@ -489,7 +489,7 @@ void KHistoryCombo::addToHistory( const TQString& item )
 
     // now add the item
     if ( myPixProvider )
-        insertItem( myPixProvider->pixmapFor(item, KIcon::SizeSmall), item, 0);
+        insertItem( myPixProvider->pixmapFor(item, TDEIcon::SizeSmall), item, 0);
     else
         insertItem( item, 0 );
 
@@ -616,12 +616,12 @@ void KHistoryCombo::keyPressEvent( TQKeyEvent *e )
     KKey event_key( e );
 
     // going up in the history, rotating when reaching TQListBox::count()
-    if ( KStdAccel::rotateUp().contains(event_key) )
+    if ( TDEStdAccel::rotateUp().contains(event_key) )
         rotateUp();
 
     // going down in the history, no rotation possible. Last item will be
     // the text that was in the lineedit before Up was called.
-    else if ( KStdAccel::rotateDown().contains(event_key) )
+    else if ( TDEStdAccel::rotateDown().contains(event_key) )
         rotateDown();
     else
         KComboBox::keyPressEvent( e );
@@ -679,7 +679,7 @@ void KHistoryCombo::insertItems( const TQStringList& items )
         const TQString item = *it;
         if ( !item.isEmpty() ) { // only insert non-empty items
             if ( myPixProvider )
-                insertItem( myPixProvider->pixmapFor(item, KIcon::SizeSmall),
+                insertItem( myPixProvider->pixmapFor(item, TDEIcon::SizeSmall),
                             item );
             else
                 insertItem( item );
@@ -718,7 +718,7 @@ bool KHistoryCombo::isHistoryEditorEnabled() const
 }
 
 void KComboBox::virtual_hook( int id, void* data )
-{ KCompletionBase::virtual_hook( id, data ); }
+{ TDECompletionBase::virtual_hook( id, data ); }
 
 void KHistoryCombo::virtual_hook( int id, void* data )
 { KComboBox::virtual_hook( id, data ); }
@@ -745,12 +745,12 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget
     clearSearch->setTextLabel(i18n("Clear Search"), true);
     clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
     TQLabel* slbl = new TQLabel(i18n("&Search:"), searchbox);
-    KListViewSearchLine* listViewSearch = new KListViewSearchLine(searchbox);
+    TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchbox);
     slbl->setBuddy(listViewSearch);
     connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
 
     // Add ListView
-    m_pListView = new KListView( box );
+    m_pListView = new TDEListView( box );
     listViewSearch->setListView(m_pListView);
     m_pListView->setAllColumnsShowFocus(true);
     m_pListView->header()->hide();
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index de3b07aab..e0c2e2704 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -32,13 +32,13 @@
 
 #include <kcompletion.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQListBoxItem;
 class TQPopupMenu;
 class TQLineEdit;
 
-class KCompletionBox;
+class TDECompletionBox;
 class KURL;
 
 /**
@@ -64,7 +64,7 @@ class KURL;
  *
  * KCombobox by default creates a completion object when you invoke the
  * completionObject( bool ) member function for the first time or
- * explicitly use setCompletionObject( KCompletion*, bool ) to assign your
+ * explicitly use setCompletionObject( TDECompletion*, bool ) to assign your
  * own completion object.  Additionally, to make this widget more functional,
  * KComboBox will by default handle text rotation and completion events
  * internally whenever a completion object is created through either one of the
@@ -74,11 +74,11 @@ class KURL;
  *
  * Beware: The completion object can be deleted on you, especially if a call
  * such as setEditable(false) is made.  Store the pointer at your own risk,
- * and consider using TQGuardedPtr<KCompletion>.
+ * and consider using TQGuardedPtr<TDECompletion>.
  *
  * The default key-bindings for completion and rotation is determined from the
- * global settings in KStdAccel. These values, however, can be overridden
- * locally by invoking KCompletionBase::setKeyBinding(). The values can
+ * global settings in TDEStdAccel. These values, however, can be overridden
+ * locally by invoking TDECompletionBase::setKeyBinding(). The values can
  * easily be reverted back to the default setting, by simply calling
  * useGlobalSettings(). An alternate method would be to default individual
  * key-bindings by usning setKeyBinding() with the default second argument.
@@ -93,8 +93,8 @@ class KURL;
  * words do not do the following:
  *
  * \code
- * KComboBox* combo = new KCompletionBox(true, this, "mywidget");
- * KCompletion* comp = combo->completionObject();
+ * KComboBox* combo = new TDECompletionBox(true, this, "mywidget");
+ * TDECompletion* comp = combo->completionObject();
  * combo->setEditable( false );
  * comp->clear(); // CRASH: completion object does not exist anymore.
  * \endcode
@@ -112,7 +112,7 @@ class KURL;
  *
  * \code
  * KComboBox *combo = new KComboBox( true, this, "mywidget" );
- * KCompletion *comp = combo->completionObject();
+ * TDECompletion *comp = combo->completionObject();
  * // Connect to the return pressed signal - optional
  * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
  *
@@ -141,14 +141,14 @@ class KURL;
  * // Tell the widget not to handle completion and rotation
  * combo->setHandleSignals( false );
  * // Set your own completion key for manual completions.
- * combo->setKeyBinding( KCompletionBase::TextCompletion, Qt::End );
+ * combo->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End );
  * // Hide the context (popup) menu
  * combo->setContextMenuEnabled( false );
  * \endcode
  *
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class TDEUI_EXPORT KComboBox : public TQComboBox, public KCompletionBase
+class TDEUI_EXPORT KComboBox : public TQComboBox, public TDECompletionBase
 {
   Q_OBJECT
   TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
@@ -251,7 +251,7 @@ public:
     * @return @p true when completion mode is automatic.
     */
     bool autoCompletion() const {
-        return completionMode() == KGlobalSettings::CompletionAuto;
+        return completionMode() == TDEGlobalSettings::CompletionAuto;
     }
 
     /**
@@ -331,14 +331,14 @@ public:
 
     /**
      * @returns the completion-box, that is used in completion mode
-     * KGlobalSettings::CompletionPopup and KGlobalSettings::CompletionPopupAuto.
+     * TDEGlobalSettings::CompletionPopup and TDEGlobalSettings::CompletionPopupAuto.
      * This method will create a completion-box by calling
      * KLineEdit::completionBox, if none is there, yet.
      *
      * @param create Set this to false if you don't want the box to be created
      *               i.e. to test if it is available.
      */
-    KCompletionBox * completionBox( bool create = true );
+    TDECompletionBox * completionBox( bool create = true );
 
     /**
      * Re-implemented for internal reasons.  API remains unaffected.
@@ -373,7 +373,7 @@ signals:
     * The argument is the current text being edited.
     *
     * Note that this signal is @em not available when the widget is non-editable
-    * or the completion mode is set to @p KGlobalSettings::CompletionNone.
+    * or the completion mode is set to @p TDEGlobalSettings::CompletionNone.
     */
     void completion( const TQString& );
 
@@ -393,13 +393,13 @@ signals:
     * Note that this signal is @em NOT emitted if the completion
     * mode is set to CompletionNone.
     */
-    void textRotation( KCompletionBase::KeyBindingType );
+    void textRotation( TDECompletionBase::KeyBindingType );
 
     /**
      * Emitted whenever the completion mode is changed by the user
      * through the context menu.
      */
-    void completionModeChanged( KGlobalSettings::Completion );
+    void completionModeChanged( TDEGlobalSettings::Completion );
 
     /**
      * Emitted before the context menu is displayed.
@@ -431,7 +431,7 @@ public slots:
     *
     * @param type The key-binding invoked.
     */
-    void rotateText( KCompletionBase::KeyBindingType type );
+    void rotateText( TDECompletionBase::KeyBindingType type );
 
     /**
      * Sets the completed text in the line-edit appropriately.
@@ -599,7 +599,7 @@ public:
      * You won't have the benefit of weighted completion though, so normally
      * you should do something like
      * \code
-     * KConfig *config = kapp->config();
+     * TDEConfig *config = kapp->config();
      * TQStringList list;
      *
      * // load the history and completion list after creating the history combo
@@ -618,17 +618,17 @@ public:
      * config->writeEntry( "History list", list );
      * \endcode
      *
-     * Be sure to use different names for saving with KConfig if you have more
+     * Be sure to use different names for saving with TDEConfig if you have more
      * than one KHistoryCombo.
      *
      * Note: When @p setCompletionList is true, the items are inserted into the
-     * KCompletion object with mode KCompletion::Insertion and the mode is set
-     * to KCompletion::Weighted afterwards.
+     * TDECompletion object with mode TDECompletion::Insertion and the mode is set
+     * to TDECompletion::Weighted afterwards.
      *
      * @see historyItems
      * @see KComboBox::completionObject
-     * @see KCompletion::setItems
-     * @see KCompletion::items
+     * @see TDECompletion::setItems
+     * @see TDECompletion::items
      */
     void setHistoryItems( TQStringList items, bool setCompletionList );
 
@@ -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.
@@ -815,7 +815,7 @@ protected:
     virtual void virtual_hook( int id, void* data );
 
 private:
-    KListView *m_pListView;
+    TDEListView *m_pListView;
 
     class KHistoryComboEditorPrivate;
     KHistoryComboEditorPrivate* const d;
diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp
index 2c76b21cd..994d1262e 100644
--- a/tdeui/kcommand.cpp
+++ b/tdeui/kcommand.cpp
@@ -19,12 +19,12 @@
 */
 
 #include "kcommand.h"
-#include <kaction.h>
-#include <kstdaccel.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
 
 KCommand::~KCommand()
 {
@@ -77,22 +77,22 @@ KCommandHistory::KCommandHistory() :
     clear();
 }
 
-KCommandHistory::KCommandHistory(KActionCollection * actionCollection, bool withMenus) :
+KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool withMenus) :
     m_undoLimit(50), m_redoLimit(30), m_first(false)
 {
     d=new KCommandHistoryPrivate();
     if (withMenus)
     {
-        KToolBarPopupAction * undo = new KToolBarPopupAction( i18n("&Undo"), "undo",
-                                          KStdAccel::shortcut(KStdAccel::Undo), this, TQT_SLOT( undo() ),
+        TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "undo",
+                                          TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQT_SLOT( undo() ),
                                           actionCollection, KStdAction::stdName( KStdAction::Undo ) );
         connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) );
         connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) );
         m_undo = undo;
         m_undoPopup = undo->popupMenu();
 
-        KToolBarPopupAction * redo = new KToolBarPopupAction( i18n("&Redo"), "redo",
-                                          KStdAccel::shortcut(KStdAccel::Redo), this, TQT_SLOT( redo() ),
+        TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "redo",
+                                          TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQT_SLOT( redo() ),
                                           actionCollection, KStdAction::stdName( KStdAction::Redo ) );
         connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) );
         connect( redo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) );
diff --git a/tdeui/kcommand.h b/tdeui/kcommand.h
index f802f8d64..e27e5178b 100644
--- a/tdeui/kcommand.h
+++ b/tdeui/kcommand.h
@@ -26,8 +26,8 @@
 #include <tqobject.h>
 #include <tdelibs_export.h>
 
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class TQPopupMenu;
 
 /**
@@ -171,7 +171,7 @@ public:
      * into a toolbar.
      * @param actionCollection the parent collection
      */
-    KCommandHistory(KActionCollection *actionCollection, bool withMenus = true);
+    KCommandHistory(TDEActionCollection *actionCollection, bool withMenus = true);
 
     /**
      * Destructs the command history object.
@@ -222,12 +222,12 @@ public:
 public slots:
     /**
      * Undoes the last action.
-     * Call this if you don't use the builtin KActions.
+     * Call this if you don't use the builtin TDEActions.
      */
     virtual void undo();
     /**
      * Redoes the last undone action.
-     * Call this if you don't use the builtin KActions.
+     * Call this if you don't use the builtin TDEActions.
      */
     virtual void redo();
     /**
@@ -275,7 +275,7 @@ private:
     void clipCommands();  // ensures that the limits are kept
 
     TQPtrList<KCommand> m_commands;
-    KAction *m_undo, *m_redo;
+    TDEAction *m_undo, *m_redo;
     TQPopupMenu *m_undoPopup, *m_redoPopup;
     int m_undoLimit, m_redoLimit;
     bool m_first;  // attention: it's the first command in the list!
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index 1458f88dc..17f523d86 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -30,8 +30,8 @@
 #include <tqtimer.h>
 #include <tqwidget.h>
 
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <tqscrollview.h>
 
 #include "kcursor_private.h"
@@ -46,8 +46,8 @@ TQCursor KCursor::handCursor()
 
         if (!hand_cursor)
         {
-                KConfig *config = KGlobal::config();
-                KConfigGroupSaver saver( config, "General" );
+                TDEConfig *config = TDEGlobal::config();
+                TDEConfigGroupSaver saver( config, "General" );
 
 #ifndef Q_WS_WIN // this mask doesn't work too well on win32
                 if ( config->readEntry("handCursorStyle", "Windows") == "Windows" )
@@ -369,8 +369,8 @@ KCursorPrivate::KCursorPrivate()
 {
     hideCursorDelay = 5000; // 5s default value
 
-    KConfig *kc = KGlobal::config();
-    KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") );
     enabled = kc->readBoolEntry(
 		  TQString::fromLatin1("Autohiding cursor enabled"), true );
 }
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index ded20474a..99f1ce4af 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -32,12 +32,12 @@
 #include <tqtimer.h>
 
 #include "kdatepicker.h"
-#include <kglobal.h>
-#include <kapplication.h>
+#include <tdeglobal.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <klineedit.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
@@ -65,7 +65,7 @@ public:
 void KDatePicker::fillWeeksCombo(const TQDate &date)
 {
   // every year can have a different number of weeks
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
 
   // it could be that we had 53,1..52 and now 1..53 which is the same number but different
   // so always fill with new values
@@ -150,9 +150,9 @@ void KDatePicker::init( const TQDate &dt )
   line = new KLineEdit(this);
   val = new KDateValidator(this);
   table = new KDateTable(this);
-  fontsize = KGlobalSettings::generalFont().pointSize();
+  fontsize = TDEGlobalSettings::generalFont().pointSize();
   if (fontsize == -1)
-     fontsize = TQFontInfo(KGlobalSettings::generalFont()).pointSize();
+     fontsize = TQFontInfo(TDEGlobalSettings::generalFont()).pointSize();
 
   fontsize++; // Make a little bigger
 
@@ -247,9 +247,9 @@ KDatePicker::dateChangedSlot(TQDate date)
 {
     kdDebug(298) << "KDatePicker::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl;
 
-    const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+    const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
 
-    line->setText(KGlobal::locale()->formatDate(date, true));
+    line->setText(TDEGlobal::locale()->formatDate(date, true));
     selectMonth->setText(calendar->monthName(date, false));
     fillWeeksCombo(date);
 
@@ -301,7 +301,7 @@ void
 KDatePicker::monthForwardClicked()
 {
     TQDate temp;
-    temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), 1 );
+    temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), 1 );
 
     setDate( temp );
 }
@@ -310,7 +310,7 @@ void
 KDatePicker::monthBackwardClicked()
 {
     TQDate temp;
-    temp = KGlobal::locale()->calendar()->addMonths( table->getDate(), -1 );
+    temp = TDEGlobal::locale()->calendar()->addMonths( table->getDate(), -1 );
 
     setDate( temp );
 }
@@ -319,7 +319,7 @@ void
 KDatePicker::yearForwardClicked()
 {
     TQDate temp;
-    temp = KGlobal::locale()->calendar()->addYears( table->getDate(), 1 );
+    temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), 1 );
 
     setDate( temp );
 }
@@ -328,7 +328,7 @@ void
 KDatePicker::yearBackwardClicked()
 {
     TQDate temp;
-    temp = KGlobal::locale()->calendar()->addYears( table->getDate(), -1 );
+    temp = TDEGlobal::locale()->calendar()->addYears( table->getDate(), -1 );
 
     setDate( temp );
 }
@@ -338,7 +338,7 @@ void KDatePicker::selectWeekClicked() {}  // ### in 3.2 obsolete; kept for binar
 void
 KDatePicker::weekSelected(int week)
 {
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
 
   TQDate date = table->getDate();
   int year = calendar->year(date);
@@ -355,7 +355,7 @@ void
 KDatePicker::selectMonthClicked()
 {
   // every year can have different month names (in some calendar systems)
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
   TQDate date = table->getDate();
   int i, month, months = calendar->monthsInYear(date);
 
@@ -379,7 +379,7 @@ KDatePicker::selectMonthClicked()
 void
 KDatePicker::selectYearClicked()
 {
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
 
   if (selectYear->state() == TQButton::Off)
   {
@@ -387,7 +387,7 @@ KDatePicker::selectYearClicked()
   }
 
   int year;
-  KPopupFrame* popup = new KPopupFrame(this);
+  TDEPopupFrame* popup = new TDEPopupFrame(this);
   KDateInternalYearSelector* picker = new KDateInternalYearSelector(popup);
   // -----
   picker->resize(picker->sizeHint());
@@ -499,8 +499,8 @@ KDatePicker::setFontSize(int s)
 
   for (int i = 1; ; ++i)
     {
-      TQString str = KGlobal::locale()->calendar()->monthName(i,
-         KGlobal::locale()->calendar()->year(table->getDate()), false);
+      TQString str = TDEGlobal::locale()->calendar()->monthName(i,
+         TDEGlobal::locale()->calendar()->year(table->getDate()), false);
       if (str.isNull()) break;
       r=metrics.boundingRect(str);
       maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width()));
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 9387a6322..56edf9a5c 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -32,20 +32,20 @@
 // When a date is selected by the user, it emits a signal:
 //      dateSelected(TQDate)
 
-#include <kconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <kapplication.h>
-#include <kaccel.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeapplication.h>
+#include <tdeaccel.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <kcalendarsystem.h>
-#include <kshortcut.h>
-#include <kstdaccel.h>
+#include <tdeshortcut.h>
+#include <tdestdaccel.h>
 #include "kdatepicker.h"
 #include "kdatetbl.h"
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 #include <tqdatetime.h>
 #include <tqguardedptr.h>
 #include <tqstring.h>
@@ -99,7 +99,7 @@ KDateValidator::validate(TQString& text, int&) const
 TQValidator::State
 KDateValidator::date(const TQString& text, TQDate& d) const
 {
-  TQDate tmp = KGlobal::locale()->readDate(text);
+  TQDate tmp = TDEGlobal::locale()->readDate(text);
   if (!tmp.isNull())
     {
       d = tmp;
@@ -129,7 +129,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags
   setNumCols(7); // 7 days a week
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
-  viewport()->setEraseColor(KGlobalSettings::baseColor());
+  viewport()->setEraseColor(TDEGlobalSettings::baseColor());
   setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
 
   initAccels();
@@ -145,7 +145,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f)
   setNumCols(7); // 7 days a week
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
-  viewport()->setEraseColor(KGlobalSettings::baseColor());
+  viewport()->setEraseColor(TDEGlobalSettings::baseColor());
   setDate(TQDate::currentDate()); // this initializes firstday, numdays, numDaysPrevMonth
   initAccels();
 }
@@ -157,20 +157,20 @@ KDateTable::~KDateTable()
 
 void KDateTable::initAccels()
 {
-  KAccel* accel = new KAccel(this, "date table accel");
-  accel->insert(KStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth()));
-  accel->insert(KStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth()));
-  accel->insert(KStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth()));
-  accel->insert(KStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth()));
-  accel->insert(KStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek()));
-  accel->insert(KStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek()));
+  TDEAccel* accel = new TDEAccel(this, "date table accel");
+  accel->insert(TDEStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth()));
+  accel->insert(TDEStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth()));
+  accel->insert(TDEStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth()));
+  accel->insert(TDEStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth()));
+  accel->insert(TDEStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek()));
+  accel->insert(TDEStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek()));
   accel->readSettings();
 }
 
 int KDateTable::posFromDate( const TQDate &dt )
 {
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
-  const int firstWeekDay = KGlobal::locale()->weekStartDay();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
+  const int firstWeekDay = TDEGlobal::locale()->weekStartDay();
   int pos = calendar->day( dt );
   int offset = (firstday - firstWeekDay + 7) % 7;
   // make sure at least one day of the previous month is visible.
@@ -182,10 +182,10 @@ int KDateTable::posFromDate( const TQDate &dt )
 TQDate KDateTable::dateFromPos( int pos )
 {
   TQDate pCellDate;
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
   calendar->setYMD(pCellDate, calendar->year(date), calendar->month(date), 1);
 
-  int firstWeekDay = KGlobal::locale()->weekStartDay();
+  int firstWeekDay = TDEGlobal::locale()->weekStartDay();
   int offset = (firstday - firstWeekDay + 7) % 7;
   // make sure at least one day of the previous month is visible.
   // adjust this <1 if more days should be forced visible:
@@ -211,14 +211,14 @@ KDateTable::paintEmptyArea(TQPainter *paint, int, int, int, int)
 void
 KDateTable::paintCell(TQPainter *painter, int row, int col)
 {
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
 
   TQRect rect;
   TQString text;
   TQPen pen;
   int w=cellWidth();
   int h=cellHeight();
-  TQFont font=KGlobalSettings::generalFont();
+  TQFont font=TDEGlobalSettings::generalFont();
   // -----
 
   if(row == 0)
@@ -226,7 +226,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
       font.setBold(true);
       painter->setFont(font);
       bool normalday = true;
-      int firstWeekDay = KGlobal::locale()->weekStartDay();
+      int firstWeekDay = TDEGlobal::locale()->weekStartDay();
       int daynum = ( col+firstWeekDay < 8 ) ? col+firstWeekDay :
                                               col+firstWeekDay-7;
       if ( daynum == calendar->weekDayOfPray() ||
@@ -234,8 +234,8 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
           normalday=false;
 
 			TQBrush brushInvertTitle(colorGroup().base());
-			TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) );
-			TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) );
+			TQColor titleColor(isEnabled()?( TDEGlobalSettings::activeTitleColor() ):( TDEGlobalSettings::inactiveTitleColor() ) );
+			TQColor textColor(isEnabled()?( TDEGlobalSettings::activeTextColor() ):( TDEGlobalSettings::inactiveTextColor() ) );
       if (!normalday)
         {
           painter->setPen(textColor);
@@ -298,7 +298,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
         }
 
       pen=painter->pen();
-      int firstWeekDay=KGlobal::locale()->weekStartDay();
+      int firstWeekDay=TDEGlobal::locale()->weekStartDay();
       int offset=firstday-firstWeekDay;
       if(offset<1)
         offset+=7;
@@ -339,13 +339,13 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
 
 void KDateTable::nextMonth()
 {
-    const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+    const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
   setDate(calendar->addMonths( date, 1 ));
 }
 
 void KDateTable::previousMonth()
 {
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
   setDate(calendar->addMonths( date, -1 ));
 }
 
@@ -433,7 +433,7 @@ KDateTable::setFontSize(int size)
   maxCell.setHeight(0);
   for(count=0; count<7; ++count)
     {
-      rect=metrics.boundingRect(KGlobal::locale()->calendar()
+      rect=metrics.boundingRect(TDEGlobal::locale()->calendar()
                                 ->weekDayName(count+1, true));
       maxCell.setWidth(QMAX(maxCell.width(), rect.width()));
       maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
@@ -499,8 +499,8 @@ KDateTable::contentsMousePressEvent(TQMouseEvent *e)
 
   if (  e->button() == Qt::RightButton && d->popupMenuEnabled )
   {
-        KPopupMenu *menu = new KPopupMenu();
-        menu->insertTitle( KGlobal::locale()->formatDate(clickedDate) );
+        TDEPopupMenu *menu = new TDEPopupMenu();
+        menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) );
         emit aboutToShowContextMenu( menu, clickedDate );
         menu->popup(e->globalPos());
   }
@@ -524,7 +524,7 @@ KDateTable::setDate(const TQDate& date_)
       emit(dateChanged(date));
       changed=true;
     }
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
 
   calendar->setYMD(temp, calendar->year(date), calendar->month(date), 1);
   //temp.setYMD(date.year(), date.month(), 1);
@@ -614,7 +614,7 @@ KDateInternalWeekSelector::KDateInternalWeekSelector
 {
   TQFont font;
   // -----
-  font=KGlobalSettings::generalFont();
+  font=TDEGlobalSettings::generalFont();
   setFont(font);
   setFrameStyle(TQFrame::NoFrame);
   setValidator(val);
@@ -686,7 +686,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
   // -----
   activeCol = -1;
   activeRow = -1;
-  font=KGlobalSettings::generalFont();
+  font=TDEGlobalSettings::generalFont();
   setFont(font);
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
@@ -694,17 +694,17 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
   setNumCols(3);
   d = new KDateInternalMonthPrivate(date.year(), date.month(), date.day());
   // For monthsInYear != 12
-  setNumRows( (KGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3);
+  setNumRows( (TDEGlobal::locale()->calendar()->monthsInYear(date) + 2) / 3);
   // enable to find drawing failures:
   // setTableFlags(Tbl_clipCellPainting);
-  viewport()->setEraseColor(KGlobalSettings::baseColor()); // for consistency with the datepicker
+  viewport()->setEraseColor(TDEGlobalSettings::baseColor()); // for consistency with the datepicker
   // ----- find the preferred size
   //       (this is slow, possibly, but unfortunately it is needed here):
   TQFontMetrics metrics(font);
   for(int i = 1; ; ++i)
     {
-      TQString str = KGlobal::locale()->calendar()->monthName(i,
-         KGlobal::locale()->calendar()->year(date), false);
+      TQString str = TDEGlobal::locale()->calendar()->monthName(i,
+         TDEGlobal::locale()->calendar()->year(date), false);
       if (str.isNull()) break;
       rect=metrics.boundingRect(str);
       if(max.width()<rect.width()) max.setWidth(rect.width());
@@ -728,7 +728,7 @@ KDateInternalMonthPicker::getResult() const
 void
 KDateInternalMonthPicker::setupPainter(TQPainter *p)
 {
-  p->setPen(KGlobalSettings::textColor());
+  p->setPen(TDEGlobalSettings::textColor());
 }
 
 void
@@ -745,8 +745,8 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col)
   TQString text;
   // ----- find the number of the cell:
   index=3*row+col+1;
-  text=KGlobal::locale()->calendar()->monthName(index,
-    KGlobal::locale()->calendar()->year(TQDate(d->year, d->month,
+  text=TDEGlobal::locale()->calendar()->monthName(index,
+    TDEGlobal::locale()->calendar()->year(TQDate(d->year, d->month,
     d->day)), false);
   painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
   if ( activeCol == col && activeRow == row )
@@ -855,7 +855,7 @@ KDateInternalYearSelector::KDateInternalYearSelector
 {
   TQFont font;
   // -----
-  font=KGlobalSettings::generalFont();
+  font=TDEGlobalSettings::generalFont();
   setFont(font);
   setFrameStyle(TQFrame::NoFrame);
   // we have to respect the limits of TQDate here, I fear:
@@ -879,7 +879,7 @@ KDateInternalYearSelector::yearEnteredSlot()
       return;
     }
   //date.setYMD(year, 1, 1);
-  KGlobal::locale()->calendar()->setYMD(date, year, 1, 1);
+  TDEGlobal::locale()->calendar()->setYMD(date, year, 1, 1);
   if(!date.isValid())
     {
       KNotifyClient::beep();
@@ -905,31 +905,31 @@ KDateInternalYearSelector::setYear(int year)
   setText(temp);
 }
 
-class KPopupFrame::KPopupFramePrivate
+class TDEPopupFrame::TDEPopupFramePrivate
 {
     public:
-        KPopupFramePrivate() : exec(false) {}
+        TDEPopupFramePrivate() : exec(false) {}
 
         bool exec;
 };
 
-KPopupFrame::KPopupFrame(TQWidget* parent, const char*  name)
+TDEPopupFrame::TDEPopupFrame(TQWidget* parent, const char*  name)
   : TQFrame(parent, name, (WFlags)WType_Popup),
     result(0), // rejected
     main(0),
-    d(new KPopupFramePrivate)
+    d(new TDEPopupFramePrivate)
 {
   setFrameStyle(TQFrame::Box|TQFrame::Raised);
   setMidLineWidth(2);
 }
 
-KPopupFrame::~KPopupFrame()
+TDEPopupFrame::~TDEPopupFrame()
 {
     delete d;
 }
 
 void
-KPopupFrame::keyPressEvent(TQKeyEvent* e)
+TDEPopupFrame::keyPressEvent(TQKeyEvent* e)
 {
   if(e->key()==Key_Escape)
     {
@@ -940,7 +940,7 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e)
 }
 
 void
-KPopupFrame::close(int r)
+TDEPopupFrame::close(int r)
 {
   result=r;
   d->exec = false;
@@ -948,7 +948,7 @@ KPopupFrame::close(int r)
 }
 
 void
-KPopupFrame::hide()
+TDEPopupFrame::hide()
 {
     TQFrame::hide();
     if (d->exec)
@@ -959,7 +959,7 @@ KPopupFrame::hide()
 }
 
 void
-KPopupFrame::setMainWidget(TQWidget* m)
+TDEPopupFrame::setMainWidget(TQWidget* m)
 {
   main=m;
   if(main)
@@ -969,7 +969,7 @@ KPopupFrame::setMainWidget(TQWidget* m)
 }
 
 void
-KPopupFrame::resizeEvent(TQResizeEvent*)
+TDEPopupFrame::resizeEvent(TQResizeEvent*)
 {
   if(main)
     {
@@ -979,10 +979,10 @@ KPopupFrame::resizeEvent(TQResizeEvent*)
 }
 
 void
-KPopupFrame::popup(const TQPoint &pos)
+TDEPopupFrame::popup(const TQPoint &pos)
 {
   // Make sure the whole popup is visible.
-  TQRect d = KGlobalSettings::desktopGeometry(pos);
+  TQRect d = TDEGlobalSettings::desktopGeometry(pos);
 
   int x = pos.x();
   int y = pos.y();
@@ -1003,7 +1003,7 @@ KPopupFrame::popup(const TQPoint &pos)
 }
 
 int
-KPopupFrame::exec(TQPoint pos)
+TDEPopupFrame::exec(TQPoint pos)
 {
   popup(pos);
   repaint();
@@ -1017,12 +1017,12 @@ KPopupFrame::exec(TQPoint pos)
 }
 
 int
-KPopupFrame::exec(int x, int y)
+TDEPopupFrame::exec(int x, int y)
 {
   return exec(TQPoint(x, y));
 }
 
-void KPopupFrame::virtual_hook( int, void* )
+void TDEPopupFrame::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KDateTable::virtual_hook( int, void* )
diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h
index 5e9adbd15..649dae73c 100644
--- a/tdeui/kdatetbl.h
+++ b/tdeui/kdatetbl.h
@@ -30,7 +30,7 @@
 
 #include <tdelibs_export.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 /** Week selection widget.
 * @internal
@@ -163,7 +163,7 @@ private:
  * @author Tim Gilman, Mirko Boehm
  * @version $Id$
  */
-class TDEUI_EXPORT KPopupFrame : public TQFrame
+class TDEUI_EXPORT TDEPopupFrame : public TQFrame
 {
   Q_OBJECT
 protected:
@@ -194,11 +194,11 @@ public:
   /**
    * The contructor. Creates a dialog without buttons.
    */
-  KPopupFrame(TQWidget* parent=0, const char*  name=0);
+  TDEPopupFrame(TQWidget* parent=0, const char*  name=0);
   /**
    * The destructor.
    */
-  ~KPopupFrame();
+  ~TDEPopupFrame();
   /**
    * Set the main widget. You cannot set the main widget from the constructor,
    * since it must be a child of the frame itselfes.
@@ -231,8 +231,8 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KPopupFramePrivate;
-  KPopupFramePrivate *d;
+  class TDEPopupFramePrivate;
+  TDEPopupFramePrivate *d;
 };
 
 /**
@@ -425,7 +425,7 @@ signals:
      *
      * @since 3.2
      */
-    void aboutToShowContextMenu( KPopupMenu * menu, const TQDate &date);
+    void aboutToShowContextMenu( TDEPopupMenu * menu, const TQDate &date);
 
 private slots:
   void nextMonth();
diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp
index ba46a599b..e9185a9c1 100644
--- a/tdeui/kdatewidget.cpp
+++ b/tdeui/kdatewidget.cpp
@@ -23,8 +23,8 @@
 #include <tqlineedit.h>
 
 #include "knuminput.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 #include "kcalendarsystem.h"
 //#include "kdatepicker.h"
 #include "kdialog.h"
@@ -72,7 +72,7 @@ KDateWidget::KDateWidget( TQDate date, TQWidget *parent,
 void KDateWidget::init()
 {
   d = new KDateWidgetPrivate;
-  KLocale *locale = KGlobal::locale();
+  TDELocale *locale = TDEGlobal::locale();
   TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
   layout->setAutoAdd(true);
   d->m_day = new KDateWidgetSpinBox(1, 1, this);
@@ -96,7 +96,7 @@ void KDateWidget::init()
 void KDateWidget::init(const TQDate& date)
 {
   d = new KDateWidgetPrivate;
-  KLocale *locale = KGlobal::locale();
+  TDELocale *locale = TDEGlobal::locale();
   TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
   layout->setAutoAdd(true);
   d->m_day = new KDateWidgetSpinBox(1, 1, this);
@@ -125,7 +125,7 @@ KDateWidget::~KDateWidget()
 // ### HPB change TQDate to const TQDate & in KDE 4.0
 void KDateWidget::setDate( TQDate date )
 {
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
 
   d->m_day->blockSignals(true);
   d->m_month->blockSignals(true);
@@ -151,7 +151,7 @@ TQDate KDateWidget::date() const
 
 void KDateWidget::slotDateChanged( )
 {
-  const KCalendarSystem * calendar = KGlobal::locale()->calendar();
+  const KCalendarSystem * calendar = TDEGlobal::locale()->calendar();
 
   TQDate date;
   int y,m,day;
diff --git a/tdeui/kdcopactionproxy.cpp b/tdeui/kdcopactionproxy.cpp
index 2b20e8bd3..028c90883 100644
--- a/tdeui/kdcopactionproxy.cpp
+++ b/tdeui/kdcopactionproxy.cpp
@@ -20,8 +20,8 @@
 #include "kdcopactionproxy.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
-#include <kaction.h>
+#include <tdeapplication.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kdcoppropertyproxy.h>
 
@@ -37,13 +37,13 @@ public:
   {
   }
 
-  KActionCollection *m_actionCollection;
+  TDEActionCollection *m_actionCollection;
   DCOPObject *m_parent;
   TQCString m_prefix;
   int m_pos;
 };
 
-KDCOPActionProxy::KDCOPActionProxy( KActionCollection *actionCollection, DCOPObject *parent )
+KDCOPActionProxy::KDCOPActionProxy( TDEActionCollection *actionCollection, DCOPObject *parent )
 {
   init( actionCollection, parent );
 }
@@ -53,7 +53,7 @@ KDCOPActionProxy::KDCOPActionProxy( DCOPObject *parent )
   init( 0, parent );
 }
 
-void KDCOPActionProxy::init( KActionCollection *collection, DCOPObject *parent )
+void KDCOPActionProxy::init( TDEActionCollection *collection, DCOPObject *parent )
 {
   d = new KDCOPActionProxyPrivate;
   d->m_actionCollection = collection;
@@ -67,15 +67,15 @@ KDCOPActionProxy::~KDCOPActionProxy()
   delete d;
 }
 
-TQValueList<KAction *>KDCOPActionProxy::actions() const
+TQValueList<TDEAction *>KDCOPActionProxy::actions() const
 {
   if ( !d->m_actionCollection )
-    return TQValueList<KAction *>();
+    return TQValueList<TDEAction *>();
 
   return d->m_actionCollection->actions();
 }
 
-KAction *KDCOPActionProxy::action( const char *name ) const
+TDEAction *KDCOPActionProxy::action( const char *name ) const
 {
   if ( !d->m_actionCollection )
     return 0;
@@ -96,9 +96,9 @@ TQMap<TQCString,DCOPRef> KDCOPActionProxy::actionMap( const TQCString &appId ) c
   if ( id.isEmpty() )
     id = kapp->dcopClient()->appId();
 
-  TQValueList<KAction *> lst = actions();
-  TQValueList<KAction *>::ConstIterator it = lst.begin();
-  TQValueList<KAction *>::ConstIterator end = lst.end();
+  TQValueList<TDEAction *> lst = actions();
+  TQValueList<TDEAction *>::ConstIterator it = lst.begin();
+  TQValueList<TDEAction *>::ConstIterator end = lst.end();
   for (; it != end; ++it )
     res.insert( (*it)->name(), DCOPRef( id, actionObjectId( (*it)->name() ) ) );
 
@@ -111,7 +111,7 @@ bool KDCOPActionProxy::process( const TQCString &obj, const TQCString &fun, cons
   if ( obj.left( d->m_pos ) != d->m_prefix )
     return false;
 
-  KAction *act = action( obj.mid( d->m_pos ) );
+  TDEAction *act = action( obj.mid( d->m_pos ) );
   if ( !act )
     return false;
 
@@ -119,7 +119,7 @@ bool KDCOPActionProxy::process( const TQCString &obj, const TQCString &fun, cons
 }
 
 bool KDCOPActionProxy::processAction( const TQCString &, const TQCString &fun, const TQByteArray &data,
-                                      TQCString &replyType, TQByteArray &replyData, KAction *action )
+                                      TQCString &replyType, TQByteArray &replyData, TDEAction *action )
 {
   if ( fun == "activate()" )
   {
diff --git a/tdeui/kdcopactionproxy.h b/tdeui/kdcopactionproxy.h
index 429264899..0bb80fec1 100644
--- a/tdeui/kdcopactionproxy.h
+++ b/tdeui/kdcopactionproxy.h
@@ -23,15 +23,15 @@
 #include <dcopref.h>
 #include <tdelibs_export.h>
 
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
 
 /**
  * @short A proxy class publishing a DCOP interface for actions.
  *
- * The KDCOPActionProxy class provides an easy way to publish a collection of KAction objects
+ * The KDCOPActionProxy class provides an easy way to publish a collection of TDEAction objects
  * through DCOP. For the DCOP client the exported actions behave like full-fledged DCOP objects,
- * providing full access to the KAction object functionality in the server.
+ * providing full access to the TDEAction object functionality in the server.
  *
  * This class can generate DCOP object ids for given action objects, which it automatically
  * processes, as being a DCOPObjectProxy .
@@ -41,13 +41,13 @@ class TDEUI_EXPORT KDCOPActionProxy : public DCOPObjectProxy
 public:
   /**
    * Constructs a dcop action proxy, being able to export the actions of the provided
-   * KActionCollection through DCOP, using the parent DCOPObject's object id to
+   * TDEActionCollection through DCOP, using the parent DCOPObject's object id to
    * generate unique object ids for the actions.
    */
-  KDCOPActionProxy( KActionCollection *actionCollection, DCOPObject *parent );
+  KDCOPActionProxy( TDEActionCollection *actionCollection, DCOPObject *parent );
   /**
    * Use this constructor if do not want to provide the exportable actions through a
-   * KActionCollection . You have to reimplement the virtual actions() and
+   * TDEActionCollection . You have to reimplement the virtual actions() and
    * action() methods if you use this constructor.
    */
   KDCOPActionProxy( DCOPObject *parent );
@@ -58,14 +58,14 @@ public:
 
   /**
    * Returns a list of exportable actions. The default implementation returns a list of actions
-   * provided by a KActionCollection, if the first constructor has been used.
+   * provided by a TDEActionCollection, if the first constructor has been used.
    */
-  virtual TQValueList<KAction *> actions() const;
+  virtual TQValueList<TDEAction *> actions() const;
   /**
    * Returns an action object with the given name. The default implementation queries the action object
-   * from the KActionCollection, if the first constructor has been used.
+   * from the TDEActionCollection, if the first constructor has been used.
    */
-  virtual KAction *action( const char *name ) const;
+  virtual TDEAction *action( const char *name ) const;
 
   /**
    * Use this method to retrieve a DCOP object id for an action with the given name.
@@ -98,9 +98,9 @@ public:
    * action object.
    */
   virtual bool processAction( const TQCString &obj, const TQCString &fun, const TQByteArray &data,
-                              TQCString &replyType, TQByteArray &replyData, KAction *action );
+                              TQCString &replyType, TQByteArray &replyData, TDEAction *action );
 private:
-  void init( KActionCollection *collection, DCOPObject *parent );
+  void init( TDEActionCollection *collection, DCOPObject *parent );
 
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index 92907a4bc..e4bc551aa 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",
@@ -341,7 +341,7 @@ const char * const packages[] = {
 "kcontrol/kcmknotify",
 "kcontrol/kcmkonq",
 "kcontrol/kcmkonqhtml",
-"kcontrol/kcmkresources",
+"kcontrol/kcmtderesources",
 "kcontrol/kcmksplash",
 "kcontrol/kcmkurifilt",
 "kcontrol/kcmkvaio",
@@ -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",
@@ -408,12 +408,12 @@ const char * const packages[] = {
 "tdeaddons/kate-filetemplates",
 "tdeaddons/kate-insertcommand",
 "tdeaddons/kate-xmltools",
-"tdeaddons/khtmlsettings-plugin",
+"tdeaddons/tdehtmlsettings-plugin",
 "tdeaddons/useragent-plugin",
 "kdebugdialog",
 "tdelibs",
 "tdelibs/kbugreport",
-"tdelibs/kcertpart",
+"tdelibs/tdecertpart",
 "tdelibs/tdecore",
 "tdelibs/kded",
 "tdelibs/tdeinit",
@@ -421,16 +421,16 @@ const char * const packages[] = {
 "tdelibs/tdeui",
 "tdelibs/kedittoolbar",
 "tdelibs/kimgio",
-"tdelibs/klauncher",
+"tdelibs/tdelauncher",
 "tdelibs/klocale",
-"tdelibs/kmdi",
+"tdelibs/tdemdi",
 "tdelibs/knetwork",
 "tdelibs/knewstuff",
 "tdelibs/knotify",
-"tdelibs/kspell",
+"tdelibs/tdespell",
 "tdelibs/kstyle",
-"tdelibs/ksycoca",
-"tdelibs/kwallet",
+"tdelibs/tdesycoca",
+"tdelibs/tdewallet",
 "tdelibs/qt",
 "kdelirc",
 "kdelirc/irkick",
@@ -439,7 +439,7 @@ const char * const packages[] = {
 "kdepasswd",
 "tdepimlibs",
 "tdepimlibs/gpgme++",
-"tdepimlibs/kabc",
+"tdepimlibs/tdeabc",
 "tdepimlibs/kblog",
 "tdepimlibs/kcal",
 "tdepimlibs/kldap",
@@ -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",
@@ -654,44 +654,44 @@ 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",
 "kipiplugins",
@@ -782,8 +782,8 @@ const char * const packages[] = {
 "kmenuedit",
 "kmerlin",
 "kmessedwords",
-"kmid",
-"kmidi",
+"tdemid",
+"tdemidi",
 "kmilo",
 "kmilo/Asus",
 "kmilo/Dell i8k",
@@ -859,17 +859,17 @@ const char * const packages[] = {
 "konqueror/fsview",
 "konqueror/imagerotation",
 "konqueror/kcookiejar",
-"konqueror/khtml adblock",
-"konqueror/khtml ecma",
-"konqueror/khtml event",
-"konqueror/khtml forms",
-"konqueror/khtml image part",
-"konqueror/khtml parsing",
-"konqueror/khtml part",
-"konqueror/khtml printing",
-"konqueror/khtml renderer",
-"konqueror/khtml xml",
-"konqueror/khtml",
+"konqueror/tdehtml adblock",
+"konqueror/tdehtml ecma",
+"konqueror/tdehtml event",
+"konqueror/tdehtml forms",
+"konqueror/tdehtml image part",
+"konqueror/tdehtml parsing",
+"konqueror/tdehtml part",
+"konqueror/tdehtml printing",
+"konqueror/tdehtml renderer",
+"konqueror/tdehtml xml",
+"konqueror/tdehtml",
 "konqueror/kimgalleryplugin",
 "konqueror/kjava",
 "konqueror/kjs",
@@ -1005,9 +1005,9 @@ const char * const packages[] = {
 "kpresenter/usability",
 "kqf",
 "kquick",
-"krandr",
-"krandr/control center",
-"krandr/krandrtray",
+"tderandr",
+"tderandr/control center",
+"tderandr/tderandrtray",
 "krdc",
 "kreatecd",
 "krec",
@@ -1016,22 +1016,22 @@ const char * const packages[] = {
 "krec/wave_export",
 "krecord",
 "kregexpeditor",
-"kresources",
-"kresources/SLOX",
-"kresources/birthdays",
-"kresources/blogging",
-"kresources/bugzilla",
-"kresources/egroupware",
-"kresources/exchange",
-"kresources/featureplan",
-"kresources/framework",
-"kresources/groupdav",
-"kresources/groupwise",
-"kresources/imap",
-"kresources/ldap",
-"kresources/local",
-"kresources/newexchange",
-"kresources/remote",
+"tderesources",
+"tderesources/SLOX",
+"tderesources/birthdays",
+"tderesources/blogging",
+"tderesources/bugzilla",
+"tderesources/egroupware",
+"tderesources/exchange",
+"tderesources/featureplan",
+"tderesources/framework",
+"tderesources/groupdav",
+"tderesources/groupwise",
+"tderesources/imap",
+"tderesources/ldap",
+"tderesources/local",
+"tderesources/newexchange",
+"tderesources/remote",
 "kreversi",
 "krfb",
 "krichtexteditor",
@@ -1051,12 +1051,12 @@ const char * const packages[] = {
 "ksame",
 "ksayit",
 "kscd",
-"kscreensaver",
-"kscreensaver/kcheckpass",
-"kscreensaver/kpartsaver",
-"kscreensaver/ktux",
-"kscreensaver/kxsrun",
-"kscreensaver/screensavers",
+"tdescreensaver",
+"tdescreensaver/kcheckpass",
+"tdescreensaver/tdepartsaver",
+"tdescreensaver/ktux",
+"tdescreensaver/kxsrun",
+"tdescreensaver/screensavers",
 "kshisen",
 "ksim",
 "ksirc",
@@ -1145,7 +1145,7 @@ const char * const packages[] = {
 "kvim",
 "kvim/Vim KPart",
 "kvoctrain",
-"kwalletmanager",
+"tdewalletmanager",
 "kweather",
 "kwebget",
 "kwifimanager",
@@ -1271,7 +1271,7 @@ const char * const packages[] = {
 "systemsettings/joystick",
 "systemsettings/kcm_useraccount",
 "systemsettings/kcmkded",
-"systemsettings/kcmkdnssd",
+"systemsettings/kcmtdednssd",
 "systemsettings/kcmknotify",
 "systemsettings/kcmlaunch",
 "systemsettings/tdm",
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp
index c6302a3cc..d0e7a84cf 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -19,7 +19,7 @@
 
 #include "kdetrayproxy.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <netwm.h>
 #include <X11/Xlib.h>
@@ -182,11 +182,11 @@ void KDETrayProxy::withdrawWindow( Window w )
 #include "kdetrayproxy.moc"
 
 #if 0
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 int main( int argc, char* argv[] )
     {
-    KCmdLineArgs::init( argc, argv, "a", "b", "c", "d" );
-    KApplication app( false ); // no styles
+    TDECmdLineArgs::init( argc, argv, "a", "b", "c", "d" );
+    TDEApplication app( false ); // no styles
     app.disableSessionManagement();
     KDETrayProxy proxy;
     return app.exec();
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.h b/tdeui/kdetrayproxy/kdetrayproxy.h
index 640ae322b..9331aad5c 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.h
+++ b/tdeui/kdetrayproxy/kdetrayproxy.h
@@ -40,7 +40,7 @@ class KDETrayProxy
         void dockWindow( Window w, Window owner );
         void withdrawWindow( Window w );
         static Atom makeSelectionAtom();
-        KSelectionWatcher selection;
+        TDESelectionWatcher selection;
         KWinModule module;
         TQValueList< Window > pending_windows;
         TQValueList< Window > tray_windows;
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index 868eb3b44..86f7f7476 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -18,15 +18,15 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kconfig.h>
-#include <kapplication.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kwhatsthismanager_p.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqobjectlist.h>
@@ -178,7 +178,7 @@ void KDialog::resizeLayout( TQLayoutItem *lay, int margin, int spacing )
 static TQRect screenRect( TQWidget *w, int screen )
 {
   TQDesktopWidget *desktop = TQApplication::desktop();
-  KConfig gc("kdeglobals", false, false);
+  TDEConfig gc("kdeglobals", false, false);
   gc.setGroup("Windows");
   if (desktop->isVirtualDesktop() &&
       gc.readBoolEntry("XineramaEnabled", true) &&
@@ -342,8 +342,8 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent)
 	seperatorbox->setMargin(0);
 
 	TQWidget* ticon = new TQWidget( frame );
-	KIconLoader * ldr = KGlobal::iconLoader();
-	TQPixmap trinityPixmap = ldr->loadIcon("kmenu", KIcon::Panel, KIcon::SizeLarge, KIcon::DefaultState, 0L, true);
+	TDEIconLoader * ldr = TDEGlobal::iconLoader();
+	TQPixmap trinityPixmap = ldr->loadIcon("kmenu", TDEIcon::Panel, TDEIcon::SizeLarge, TDEIcon::DefaultState, 0L, true);
 
 	// Manually draw the alpha portions of the icon onto the widget background color...
 	TQRgb backgroundRgb = ticon->paletteBackgroundColor().rgb();
@@ -431,7 +431,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent)
 
 	// Center the dialog
 	TQSize sh = sizeHint();
-	TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
+	TQRect rect = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
 	move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2);
 
 	show();
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 1fb00aa6d..890f79179 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -33,12 +33,12 @@
 #include <tqtimer.h>
 #include <tqfocusdata.h>
 
-#include <kapplication.h>
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kseparator.h>
 #include <kurllabel.h>
 #include <kdebug.h>
@@ -656,7 +656,7 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton,
     }
   }
 
-  setButtonStyle( KGlobalSettings::buttonLayout() );
+  setButtonStyle( TDEGlobalSettings::buttonLayout() );
 }
 
 
@@ -1740,11 +1740,11 @@ void KDialogBase::showTile( bool state )
 
 TQSize KDialogBase::configDialogSize( const TQString& groupName ) const
 {
-   return configDialogSize( *KGlobal::config(), groupName );
+   return configDialogSize( *TDEGlobal::config(), groupName );
 }
 
 
-TQSize KDialogBase::configDialogSize( KConfig& config,
+TQSize KDialogBase::configDialogSize( TDEConfig& config,
 				      const TQString& groupName ) const
 {
    int w, h;
@@ -1754,7 +1754,7 @@ TQSize KDialogBase::configDialogSize( KConfig& config,
    w = sizeHint().width();
    h = sizeHint().height();
 
-   KConfigGroupSaver cs(&config, groupName);
+   TDEConfigGroupSaver cs(&config, groupName);
    w = config.readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w );
    h = config.readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h );
 
@@ -1764,17 +1764,17 @@ TQSize KDialogBase::configDialogSize( KConfig& config,
 
 void KDialogBase::saveDialogSize( const TQString& groupName, bool global )
 {
-   saveDialogSize( *KGlobal::config(), groupName, global );
+   saveDialogSize( *TDEGlobal::config(), groupName, global );
 }
 
 
-void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName,
+void KDialogBase::saveDialogSize( TDEConfig& config, const TQString& groupName,
 				      bool global ) const
 {
    int scnum = TQApplication::desktop()->screenNumber(parentWidget());
    TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 
-   KConfigGroupSaver cs(&config, groupName);
+   TDEConfigGroupSaver cs(&config, groupName);
    TQSize sizeToSave = size();
 
    config.writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()),
diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h
index c47a6a2e9..1bc910fd6 100644
--- a/tdeui/kdialogbase.h
+++ b/tdeui/kdialogbase.h
@@ -831,7 +831,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
     * If no size is saved for one dimension of the screen, sizeHint() is returned.
     *
     * @param groupName Name of the group to read from. The old group
-    *                  of KGlobal::config is preserved.
+    *                  of TDEGlobal::config is preserved.
     */
    TQSize configDialogSize( const TQString& groupName ) const;
 
@@ -839,12 +839,12 @@ class TDEUI_EXPORT KDialogBase : public KDialog
     * read the dialogs size from the configuration according to the screen size.
     * If no size is saved for one dimension of the screen, sizeHint() is returned.
     *
-    * @param config The KConfig object to read from
+    * @param config The TDEConfig object to read from
     * @param groupName Name of the group to read from. The old group
-    *                  of KGlobal::config is preserved.
+    *                  of TDEGlobal::config is preserved.
     * @since 3.2
     */
-   TQSize configDialogSize( KConfig& config, const TQString& groupName ) const;
+   TQSize configDialogSize( TDEConfig& config, const TQString& groupName ) const;
 
    /**
     * save the dialogs size dependant on the screen dimension either to the
@@ -860,14 +860,14 @@ class TDEUI_EXPORT KDialogBase : public KDialog
    /**
     * save the dialogs size dependant on the screen dimension.
     *
-    * @param config The KConfig object to write to.
+    * @param config The TDEConfig object to write to.
     * @param groupName The group to which the dialogs size is saved. See
     * configDialogSize to read the size.
     * @param global Set to true if the entry should go to the global config.
     *        Default is false.
     * @since 3.2
     */
-   void saveDialogSize( KConfig& config, const TQString& groupName,
+   void saveDialogSize( TDEConfig& config, const TQString& groupName,
 			     bool global=false ) const;
 
     /**
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index 95ceb33dd..bf99c6801 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -33,14 +33,14 @@
 #include <tqstyle.h>
 
 #ifndef NO_KDE2
-#include <kconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
 #include <twin.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
@@ -91,7 +91,7 @@ static const char* const not_close_xpm[]={
 "#####"};
 
 /**
- * A special kind of KMainWindow that is able to have dockwidget child widgets.
+ * A special kind of TDEMainWindow that is able to have dockwidget child widgets.
  *
  * The main widget should be a dockwidget where other dockwidgets can be docked to
  * the left, right, top, bottom or to the middle.
@@ -100,7 +100,7 @@ static const char* const not_close_xpm[]={
  * @author Max Judin.
 */
 KDockMainWindow::KDockMainWindow( TQWidget* parent, const char *name, WFlags f)
-:KMainWindow( parent, name, f )
+:TDEMainWindow( parent, name, f )
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new KDockManager( this, new_name.latin1() );
@@ -126,7 +126,7 @@ void KDockMainWindow::setView( TQWidget *view )
   }
 
 #ifndef NO_KDE2
-  KMainWindow::setCentralWidget(view);
+  TDEMainWindow::setCentralWidget(view);
 #else
   TQMainWindow::setCentralWidget(view);
 #endif
@@ -165,12 +165,12 @@ void KDockMainWindow::readDockConfig(TQDomElement &base)
 }
 
 #ifndef NO_KDE2
-void KDockMainWindow::writeDockConfig( KConfig* c, TQString group )
+void KDockMainWindow::writeDockConfig( TDEConfig* c, TQString group )
 {
   dockManager->writeConfig( c, group );
 }
 
-void KDockMainWindow::readDockConfig( KConfig* c, TQString group )
+void KDockMainWindow::readDockConfig( TDEConfig* c, TQString group )
 {
   dockManager->readConfig( c, group );
 }
@@ -420,12 +420,12 @@ void KDockWidgetHeader::setDragEnabled(bool b)
 }
 
 #ifndef NO_KDE2
-void KDockWidgetHeader::saveConfig( KConfig* c )
+void KDockWidgetHeader::saveConfig( TDEConfig* c )
 {
   c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
 }
 
-void KDockWidgetHeader::loadConfig( KConfig* c )
+void KDockWidgetHeader::loadConfig( TDEConfig* c )
 {
   setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
 }
@@ -1635,7 +1635,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name )
   d->mainDockWidget=0;
 
 #ifndef NO_KDE2
-  d->splitterOpaqueResize = KGlobalSettings::opaqueResize();
+  d->splitterOpaqueResize = TDEGlobalSettings::opaqueResize();
 #else
   d->splitterOpaqueResize = false;
 #endif
@@ -1653,7 +1653,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name )
   menuData->setAutoDelete( true );
 
 #ifndef NO_KDE2
-  menu = new KPopupMenu();
+  menu = new TDEPopupMenu();
 #else
   menu = new TQPopupMenu();
 #endif
@@ -2528,10 +2528,10 @@ void KDockManager::setReadDockConfigMode(int mode)
 }
 
 #ifndef NO_KDE2
-void KDockManager::writeConfig( KConfig* c, TQString group )
+void KDockManager::writeConfig( TDEConfig* c, TQString group )
 {
   //debug("BEGIN Write Config");
-  if ( !c ) c = KGlobal::config();
+  if ( !c ) c = TDEGlobal::config();
   if ( group.isEmpty() ) group = "dock_setting_default";
 
   c->setGroup( group );
@@ -2670,9 +2670,9 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
   //debug("END Write Config");
 }
 #include <tqmessagebox.h>
-void KDockManager::readConfig( KConfig* c, TQString group )
+void KDockManager::readConfig( TDEConfig* c, TQString group )
 {
-  if ( !c ) c = KGlobal::config();
+  if ( !c ) c = TDEGlobal::config();
   if ( group.isEmpty() ) group = "dock_setting_default";
 
   c->setGroup( group );
@@ -3134,12 +3134,12 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
 }
 
 #ifndef NO_KDE2
-void KDockArea::writeDockConfig( KConfig* c, TQString group )
+void KDockArea::writeDockConfig( TDEConfig* c, TQString group )
 {
   dockManager->writeConfig( c, group );
 }
 
-void KDockArea::readDockConfig( KConfig* c, TQString group )
+void KDockArea::readDockConfig( TDEConfig* c, TQString group )
 {
   dockManager->readConfig( c, group );
 }
@@ -3261,8 +3261,8 @@ void KDockContainer::removeWidget (KDockWidget *dw){
 void KDockContainer::undockWidget (KDockWidget *){;}
 void KDockContainer::setToolTip(KDockWidget *, TQString &){;}
 void KDockContainer::setPixmap(KDockWidget*,const TQPixmap&){;}
-void KDockContainer::load (KConfig*, const TQString&){;}
-void KDockContainer::save (KConfig*, const TQString&){;}
+void KDockContainer::load (TDEConfig*, const TQString&){;}
+void KDockContainer::save (TDEConfig*, const TQString&){;}
 void KDockContainer::load (TQDomElement&){;}
 void KDockContainer::save (TQDomElement&){;}
 void KDockContainer::prepareSave(TQStringList &names)
@@ -3320,10 +3320,10 @@ void KDockManager::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KDockMainWindow::virtual_hook( int id, void* data )
-{ KMainWindow::virtual_hook( id, data ); }
+{ TDEMainWindow::virtual_hook( id, data ); }
 
 void KDockArea::virtual_hook( int, void* )
-{ /*KMainWindow::virtual_hook( id, data );*/ }
+{ /*TDEMainWindow::virtual_hook( id, data );*/ }
 
 
 #ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index 4f54e5f13..df06ed8f1 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -36,7 +36,7 @@
    - KDockTabGroup                 - minor helper class
    - KDockWidget                   - IMPORTANT CLASS: the one and only dockwidget class
    - KDockManager                  - helper class
-   - KDockMainWindow               - IMPORTANT CLASS: a special KMainWindow that can have dockwidgets
+   - KDockMainWindow               - IMPORTANT CLASS: a special TDEMainWindow that can have dockwidgets
    - KDockArea                     - like KDockMainWindow but inherits just QWidget
 
    IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition!
@@ -55,13 +55,13 @@
 #include <tqtabwidget.h>
 
 #ifndef NO_KDE2
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <netwm_def.h>
 #else
 
 #include <tqmainwindow.h>
 #include "exportdockclass.h"
-#include "dummykmainwindow.h"
+#include "dummytdemainwindow.h"
 #endif
 
 class KDockSplitter;
@@ -80,8 +80,8 @@ class TQHBoxLayout;
 class TQPixmap;
 
 #ifndef NO_KDE2
-class KToolBar;
-class KConfig;
+class TDEToolBar;
+class TDEConfig;
 #else
 class TQToolBar;
 #endif
@@ -128,12 +128,12 @@ public:
   /**
    * Provides saving the current configuration. Must be overridden by an inheriting class.
    */
-  virtual void saveConfig( KConfig* ){}
+  virtual void saveConfig( TDEConfig* ){}
 
   /**
    * Provides loading the current configuration.  Must be overridden by an inheriting class
    */
-  virtual void loadConfig( KConfig* ){}
+  virtual void loadConfig( TDEConfig* ){}
 #endif
 
 protected:
@@ -291,14 +291,14 @@ public:
    *
    * @param c the configuration safe
    */
-  virtual void saveConfig( KConfig* c);
+  virtual void saveConfig( TDEConfig* c);
 
   /**
    * Loads the current button state from a KDE config container object.
    *
    * @param c the configuration safe
    */
-  virtual void loadConfig( KConfig* c);
+  virtual void loadConfig( TDEConfig* c);
 #endif
 
    /*@since 3.2
@@ -906,7 +906,7 @@ private:
  * that can be called within a KDockMainWindow or a KDockWidget .
  *
  * An important feature is the ability to read or save the current state of all things concerning to
- * dockwidgets to KConfig .
+ * dockwidgets to TDEConfig .
  *
  * The dockmanager is also often used when a certain dockwidget or a child of such dockwidget must be found.
  *
@@ -954,9 +954,9 @@ public:
    * last but not least some necessary things for recovering the dockmainwindow state.
    *
    * @param c the KDE configuration saver
-   * @param group the name of the section in KConfig
+   * @param group the name of the section in TDEConfig
    */
-  void writeConfig( KConfig* c = 0L, TQString group = TQString::null );
+  void writeConfig( TDEConfig* c = 0L, TQString group = TQString::null );
 
   /**
    * Like writeConfig but reads the whole stuff in.
@@ -972,9 +972,9 @@ public:
    * to work, each widget must have a unique name.
    *
    * @param c the KDE configuration saver
-   * @param group the name of the section in KConfig
+   * @param group the name of the section in TDEConfig
    */
-  void readConfig ( KConfig* c = 0L, TQString group = TQString::null );
+  void readConfig ( TDEConfig* c = 0L, TQString group = TQString::null );
 #endif
 
   /// @since 3.1
@@ -1033,7 +1033,7 @@ public:
   KDockWidget* getDockWidgetFromName( const TQString& dockName );
 
   /**
-   * Enables opaque resizing. Opaque resizing defaults to KGlobalSettings::opaqueResize().
+   * Enables opaque resizing. Opaque resizing defaults to TDEGlobalSettings::opaqueResize().
    * Call this method before you create any dock widgets!
    */
   void setSplitterOpaqueResize(bool b=true);
@@ -1269,7 +1269,7 @@ private:
 };
 
 /**
- * A special kind of KMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
+ * A special kind of TDEMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
  *
  * The main widget should be a KDockWidget where other KDockWidget can be docked to
  * the left, right, top, bottom or to the middle.
@@ -1311,7 +1311,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class TDEUI_EXPORT KDockMainWindow : public KMainWindow
+class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -1390,20 +1390,20 @@ public:
 
 #ifndef NO_KDE2
   /**
-   * It writes the current dock state in the given section of KConfig.
+   * It writes the current dock state in the given section of TDEConfig.
    *
    * @param c     KDE class for saving configurations
    * @param group name of section to write to
    */
-  void writeDockConfig( KConfig* c = 0L, TQString group = TQString::null );
+  void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString::null );
 
   /**
-   * It reads the current dock state from the given section of KConfig.
+   * It reads the current dock state from the given section of TDEConfig.
    *
    * @param c     KDE class for saving configurations
    * @param group name of section to read from
    */
-  void readDockConfig ( KConfig* c = 0L, TQString group = TQString::null );
+  void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString::null );
 #endif
 
   /**
@@ -1509,8 +1509,8 @@ public:
   void readDockConfig(TQDomElement &base);
 
 #ifndef NO_KDE2
-  void writeDockConfig( KConfig* c = 0L, TQString group = TQString::null );
-  void readDockConfig ( KConfig* c = 0L, TQString group = TQString::null );
+  void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString::null );
+  void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString::null );
 #endif
 
 
diff --git a/tdeui/kdockwidget_p.h b/tdeui/kdockwidget_p.h
index 9ee9e8e73..471c4d9b2 100644
--- a/tdeui/kdockwidget_p.h
+++ b/tdeui/kdockwidget_p.h
@@ -50,9 +50,9 @@ public:
   virtual void showWidget(KDockWidget *);
   virtual void removeWidget(KDockWidget*);
   virtual void undockWidget(KDockWidget*);
-  virtual void save(KConfig *cfg,const TQString& group_or_prefix);
+  virtual void save(TDEConfig *cfg,const TQString& group_or_prefix);
   virtual void save(TQDomElement& dockElement);
-  virtual void load(KConfig *cfg,const TQString& group_or_prefix);
+  virtual void load(TDEConfig *cfg,const TQString& group_or_prefix);
   virtual void load(TQDomElement& dockElement);
   virtual void setToolTip (KDockWidget *, TQString &);
   virtual void  setPixmap(KDockWidget*,const TQPixmap&);
diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h
index e97a5affd..a72532e3d 100644
--- a/tdeui/kdockwidget_private.h
+++ b/tdeui/kdockwidget_private.h
@@ -241,7 +241,7 @@ private:
 
 /**
  * A mini-button usually placed in the dockpanel.
- * @internal (but used by kmdi/dockcontainer.cpp)
+ * @internal (but used by tdemdi/dockcontainer.cpp)
  *
  * @author Max Judin.
 */
diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp
index f6d49a97e..532e4aaaa 100644
--- a/tdeui/kdualcolorbutton.cpp
+++ b/tdeui/kdualcolorbutton.cpp
@@ -21,7 +21,7 @@
 #include "kcolordrag.h"
 #include "dcolorarrow.xbm"
 #include "dcolorreset.xpm"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqpainter.h>
 #include <tqbitmap.h>
 #include <tqdrawutil.h>
@@ -224,7 +224,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
 void KDualColorButton::mouseMoveEvent(TQMouseEvent *ev)
 {
     if(!miniCtlFlag){
-        int delay = KGlobalSettings::dndEventDelay();
+        int delay = TDEGlobalSettings::dndEventDelay();
         if(ev->x() >= mPos.x()+delay || ev->x() <= mPos.x()-delay ||
            ev->y() >= mPos.y()+delay || ev->y() <= mPos.y()-delay) {
             KColorDrag *d = new KColorDrag( curColor == Foreground ?
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index 5b4c21883..a550a7af1 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -24,14 +24,14 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kcmenumngr.h>
-#include <kfontdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kstdaccel.h>
+#include <tdefontdialog.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdestdaccel.h>
 #include <kurldrag.h>
 
 #include "keditcl.h"
@@ -466,48 +466,48 @@ void KEdit::keyPressEvent ( TQKeyEvent *e)
 
   killing = false;
 
-  if ( KStdAccel::copy().contains( key ) )
+  if ( TDEStdAccel::copy().contains( key ) )
     copy();
   else if ( isReadOnly() )
     TQMultiLineEdit::keyPressEvent( e );
   // If this is an unmodified printable key, send it directly to TQMultiLineEdit.
   else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && TQString(e->text()).unicode()->isPrint() )
     TQMultiLineEdit::keyPressEvent( e );
-  else if ( KStdAccel::paste().contains( key ) ) {
+  else if ( TDEStdAccel::paste().contains( key ) ) {
     paste();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::cut().contains( key ) ) {
+  else if ( TDEStdAccel::cut().contains( key ) ) {
     cut();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::undo().contains( key ) ) {
+  else if ( TDEStdAccel::undo().contains( key ) ) {
     undo();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::redo().contains( key ) ) {
+  else if ( TDEStdAccel::redo().contains( key ) ) {
     redo();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::deleteWordBack().contains( key ) ) {
+  else if ( TDEStdAccel::deleteWordBack().contains( key ) ) {
     moveCursor(MoveWordBackward, true);
     if (hasSelectedText())
       del();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::deleteWordForward().contains( key ) ) {
+  else if ( TDEStdAccel::deleteWordForward().contains( key ) ) {
     moveCursor(MoveWordForward, true);
     if (hasSelectedText())
       del();
     setModified(true);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::backwardWord().contains( key ) ) {
+  else if ( TDEStdAccel::backwardWord().contains( key ) ) {
     CursorAction action = MoveWordBackward;
     int para, index;
     getCursorPosition( &para, & index );
@@ -516,7 +516,7 @@ void KEdit::keyPressEvent ( TQKeyEvent *e)
     moveCursor(action, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::forwardWord().contains( key ) ) {
+  else if ( TDEStdAccel::forwardWord().contains( key ) ) {
     CursorAction action = MoveWordForward;
     int para, index;
     getCursorPosition( &para, & index );
@@ -525,27 +525,27 @@ void KEdit::keyPressEvent ( TQKeyEvent *e)
     moveCursor( action, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::next().contains( key ) ) {
+  else if ( TDEStdAccel::next().contains( key ) ) {
     moveCursor( MovePgDown, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::prior().contains( key ) ) {
+  else if ( TDEStdAccel::prior().contains( key ) ) {
     moveCursor( MovePgUp, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::home().contains( key ) ) {
+  else if ( TDEStdAccel::home().contains( key ) ) {
     moveCursor( MoveHome, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::end().contains( key ) ) {
+  else if ( TDEStdAccel::end().contains( key ) ) {
     moveCursor( MoveEnd, false );
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::beginningOfLine().contains( key ) ) {
+  else if ( TDEStdAccel::beginningOfLine().contains( key ) ) {
     moveCursor( MoveLineStart, false);
     slotCursorPositionChanged();
   }
-  else if ( KStdAccel::endOfLine().contains( key ) ) {
+  else if ( TDEStdAccel::endOfLine().contains( key ) ) {
     moveCursor( MoveLineEnd, false);
     slotCursorPositionChanged();
   }
@@ -567,7 +567,7 @@ void KEdit::installRBPopup(TQPopupMenu *p) {
 void KEdit::selectFont(){
 
   TQFont font = this->font();
-  KFontDialog::getFont(font);
+  TDEFontDialog::getFont(font);
   this->setFont(font);
 
 }
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index 4bbc12c30..4749a471f 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -31,12 +31,12 @@
 #include <tqhbox.h>
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
@@ -1023,9 +1023,9 @@ void KEdit::misspelling (const TQString &word, const TQStringList &, unsigned in
 
   /*
   if (cursorPoint().y()>height()/2)
-    kspell->moveDlg (10, height()/2-kspell->heightDlg()-15);
+    tdespell->moveDlg (10, height()/2-tdespell->heightDlg()-15);
   else
-    kspell->moveDlg (10, height()/2 + 15);
+    tdespell->moveDlg (10, height()/2 + 15);
   */
 
 }
diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp
index 040e77c70..6f22b091a 100644
--- a/tdeui/keditlistbox.cpp
+++ b/tdeui/keditlistbox.cpp
@@ -30,8 +30,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 
 #include "keditlistbox.h"
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 418fb755d..639b22926 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -31,17 +31,17 @@
 #include <tqapplication.h>
 #include <tqtextstream.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kxmlguifactory.h>
 #include <kseparator.h>
-#include <kconfig.h>
-#include <klistview.h>
+#include <tdeconfig.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kprocio.h>
@@ -78,7 +78,7 @@ public:
   TQDomDocument m_document;
   XmlType      m_type;
   bool         m_isModified;
-  KActionCollection* m_actionCollection;
+  TDEActionCollection* m_actionCollection;
 
   ToolbarList  m_barList;
 };
@@ -88,7 +88,7 @@ typedef TQValueList<XmlData> XmlDataList;
 class ToolbarItem : public TQListViewItem
 {
 public:
-  ToolbarItem(KListView *parent, const TQString& tag = TQString::null, const TQString& name = TQString::null, const TQString& statusText = TQString::null)
+  ToolbarItem(TDEListView *parent, const TQString& tag = TQString::null, const TQString& name = TQString::null, const TQString& statusText = TQString::null)
     : TQListViewItem(parent),
       m_tag(tag),
       m_name(name),
@@ -96,7 +96,7 @@ public:
   {
   }
 
-  ToolbarItem(KListView *parent, TQListViewItem *item, const TQString &tag = TQString::null, const TQString& name = TQString::null, const TQString& statusText = TQString::null)
+  ToolbarItem(TDEListView *parent, TQListViewItem *item, const TQString &tag = TQString::null, const TQString& name = TQString::null, const TQString& statusText = TQString::null)
     : TQListViewItem(parent, item),
       m_tag(tag),
       m_name(name),
@@ -175,11 +175,11 @@ public:
   }
 };
 
-class ToolbarListView : public KListView
+class ToolbarListView : public TDEListView
 {
 public:
   ToolbarListView(TQWidget *parent=0, const char *name=0)
-    : KListView(parent, name)
+    : TDEListView(parent, name)
   {
   }
 protected:
@@ -214,7 +214,7 @@ public:
      * In a KParts application we let create a KXMLGUIClient create a dummy one,
      * but it probably isn't used.
      */
-  KEditToolbarWidgetPrivate(KInstance *instance, KActionCollection* collection)
+  KEditToolbarWidgetPrivate(TDEInstance *instance, TDEActionCollection* collection)
       : m_collection( collection )
   {
     m_instance = instance;
@@ -254,8 +254,8 @@ public:
    */
   ToolbarList findToolbars(TQDomNode n)
   {
-    static const TQString &tagToolbar = KGlobal::staticQString( "ToolBar" );
-    static const TQString &attrNoEdit = KGlobal::staticQString( "noEdit" );
+    static const TQString &tagToolbar = TDEGlobal::staticQString( "ToolBar" );
+    static const TQString &attrNoEdit = TDEGlobal::staticQString( "noEdit" );
     ToolbarList list;
 
     for( ; !n.isNull(); n = n.nextSibling() )
@@ -278,9 +278,9 @@ public:
    */
   TQString toolbarName( const XmlData& xmlData, const TQDomElement& it ) const
   {
-      static const TQString &tagText = KGlobal::staticQString( "text" );
-      static const TQString &tagText2 = KGlobal::staticQString( "Text" );
-      static const TQString &attrName = KGlobal::staticQString( "name" );
+      static const TQString &tagText = TDEGlobal::staticQString( "text" );
+      static const TQString &tagText2 = TDEGlobal::staticQString( "Text" );
+      static const TQString &attrName = TDEGlobal::staticQString( "name" );
 
       TQString name;
       TQCString txt( it.namedItem( tagText ).toElement().text().utf8() );
@@ -292,7 +292,7 @@ public:
           name = i18n( txt );
 
       // the name of the toolbar might depend on whether or not
-      // it is in kparts
+      // it is in tdeparts
       if ( ( xmlData.m_type == XmlData::Shell ) ||
            ( xmlData.m_type == XmlData::Part ) )
       {
@@ -306,7 +306,7 @@ public:
    */
   TQDomElement findElementForToolbarItem( const ToolbarItem* item ) const
   {
-    static const TQString &attrName    = KGlobal::staticQString( "name" );
+    static const TQString &attrName    = TDEGlobal::staticQString( "name" );
     for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling())
     {
       TQDomElement elem = n.toElement();
@@ -337,9 +337,9 @@ public:
   }
 #endif
 
-  //TQValueList<KAction*> m_actionList;
-  KActionCollection* m_collection;
-  KInstance         *m_instance;
+  //TQValueList<TDEAction*> m_actionList;
+  TDEActionCollection* m_collection;
+  TDEInstance         *m_instance;
 
   XmlData*     m_currentXmlData;
   TQDomElement m_currentToolbarElem;
@@ -368,14 +368,14 @@ public:
 
     // Save parameters for recreating widget after resetting toolbar
     bool m_global;
-    KActionCollection* m_collection;
+    TDEActionCollection* m_collection;
     TQString m_file;
     KXMLGUIFactory* m_factory;
 };
 
 const char *KEditToolbar::s_defaultToolbar = 0L;
 
-KEditToolbar::KEditToolbar(KActionCollection *collection, const TQString& file,
+KEditToolbar::KEditToolbar(TDEActionCollection *collection, const TQString& file,
                            bool global, TQWidget* parent, const char* name)
   : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name),
     m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), collection, file, global, this))
@@ -386,7 +386,7 @@ KEditToolbar::KEditToolbar(KActionCollection *collection, const TQString& file,
     d->m_file = file;
 }
 
-KEditToolbar::KEditToolbar(const TQString& defaultToolbar, KActionCollection *collection,
+KEditToolbar::KEditToolbar(const TQString& defaultToolbar, TDEActionCollection *collection,
                            const TQString& file, bool global,
                            TQWidget* parent, const char* name)
   : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name),
@@ -466,7 +466,7 @@ void KEditToolbar::slotDefault()
 
             if (TQDir::isRelativePath(file))
             {
-                const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
+                const TDEInstance *instance = client->instance() ? client->instance() : TDEGlobal::instance();
                 file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file);
             }
             else
@@ -488,7 +488,7 @@ void KEditToolbar::slotDefault()
         int slash = d->m_file.findRev('/')+1;
         if (slash)
             d->m_file = d->m_file.mid(slash);
-        TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file);
+        TQString xml_file = locateLocal("data", TQString::fromLatin1( TDEGlobal::instance()->instanceName() + '/' ) + d->m_file);
 
         if ( TQFile::exists( xml_file ) )
             if ( !TQFile::remove( xml_file ) )
@@ -537,7 +537,7 @@ void KEditToolbar::setDefaultToolbar(const char *toolbarName)
     s_defaultToolbar = toolbarName;
 }
 
-KEditToolbarWidget::KEditToolbarWidget(KActionCollection *collection,
+KEditToolbarWidget::KEditToolbarWidget(TDEActionCollection *collection,
                                        const TQString& file,
                                        bool global, TQWidget *parent)
   : TQWidget(parent),
@@ -551,7 +551,7 @@ KEditToolbarWidget::KEditToolbarWidget(KActionCollection *collection,
 }
 
 KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar,
-                                       KActionCollection *collection,
+                                       TDEActionCollection *collection,
                                        const TQString& file, bool global,
                                        TQWidget *parent)
   : TQWidget(parent),
@@ -594,7 +594,7 @@ KEditToolbarWidget::~KEditToolbarWidget()
     delete d;
 }
 
-void KEditToolbarWidget::initNonKPart(KActionCollection *collection,
+void KEditToolbarWidget::initNonKPart(TDEActionCollection *collection,
                                       const TQString& file, bool global)
 {
   //d->m_actionList = collection->actions();
@@ -767,10 +767,10 @@ void KEditToolbarWidget::setupLayout()
           this,           TQT_SLOT(slotToolbarSelected(const TQString&)));
 
 //  TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this);
-//  new_toolbar->setPixmap(BarIcon("filenew", KIcon::SizeSmall));
+//  new_toolbar->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall));
 //  new_toolbar->setEnabled(false); // disabled until implemented
 //  TQPushButton *del_toolbar = new TQPushButton(i18n("&Delete"), this);
-//  del_toolbar->setPixmap(BarIcon("editdelete", KIcon::SizeSmall));
+//  del_toolbar->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall));
 //  del_toolbar->setEnabled(false); // disabled until implemented
 
   // our list of inactive actions
@@ -805,10 +805,10 @@ void KEditToolbarWidget::setupLayout()
   m_activeList->setSorting(-1);
   active_label->setBuddy(m_activeList);
 
-  connect(m_inactiveList, TQT_SIGNAL(dropped(KListView*,TQDropEvent*,TQListViewItem*)),
-          this,              TQT_SLOT(slotDropped(KListView*,TQDropEvent*,TQListViewItem*)));
-  connect(m_activeList, TQT_SIGNAL(dropped(KListView*,TQDropEvent*,TQListViewItem*)),
-          this,            TQT_SLOT(slotDropped(KListView*,TQDropEvent*,TQListViewItem*)));
+  connect(m_inactiveList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)),
+          this,              TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*)));
+  connect(m_activeList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)),
+          this,            TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*)));
   connect(m_activeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
           this,         TQT_SLOT(slotActiveSelected(TQListViewItem *)));
   connect(m_activeList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int  )),
@@ -816,7 +816,7 @@ void KEditToolbarWidget::setupLayout()
 
   // "change icon" button
   d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this );
-  TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
+  TQString kdialogExe = TDEStandardDirs::findExe(TQString::fromLatin1("kdialog"));
   d->m_hasKDialog = !kdialogExe.isEmpty();
   d->m_changeIcon->setEnabled( d->m_hasKDialog );
 
@@ -903,7 +903,7 @@ void KEditToolbarWidget::setupLayout()
 
 void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar)
 {
-  static const TQString &attrName = KGlobal::staticQString( "name" );
+  static const TQString &attrName = TDEGlobal::staticQString( "name" );
   // just in case, we clear our combo
   m_toolbarCombo->clear();
 
@@ -942,11 +942,11 @@ void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar)
 
 void KEditToolbarWidget::loadActionList(TQDomElement& elem)
 {
-  static const TQString &tagSeparator = KGlobal::staticQString( "Separator" );
-  static const TQString &tagMerge     = KGlobal::staticQString( "Merge" );
-  static const TQString &tagActionList= KGlobal::staticQString( "ActionList" );
-  static const TQString &attrName     = KGlobal::staticQString( "name" );
-  static const TQString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" );
+  static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" );
+  static const TQString &tagMerge     = TDEGlobal::staticQString( "Merge" );
+  static const TQString &tagActionList= TDEGlobal::staticQString( "ActionList" );
+  static const TQString &attrName     = TDEGlobal::staticQString( "name" );
+  static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" );
 
   int     sep_num = 0;
   TQString sep_name("separator_%1");
@@ -960,13 +960,13 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
   m_downAction->setEnabled(false);
 
   // We'll use this action collection
-  KActionCollection* actionCollection = d->m_currentXmlData->m_actionCollection;
+  TDEActionCollection* actionCollection = d->m_currentXmlData->m_actionCollection;
 
   // store the names of our active actions
   TQMap<TQString, bool> active_list;
 
   // see if our current action is in this toolbar
-  KIconLoader *loader = KGlobal::instance()->iconLoader();
+  TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
   TQDomNode n = elem.lastChild();
   for( ; !n.isNull(); n = n.previousSibling() )
   {
@@ -1008,7 +1008,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
     // putting any action into any client...
     for (unsigned int i = 0;  i < actionCollection->count(); i++)
     {
-      KAction *action = actionCollection->action( i );
+      TDEAction *action = actionCollection->action( i );
 
       // do we have a match?
       if (it.attribute( attrName ) == action->name())
@@ -1018,9 +1018,9 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
         act->setText(1, action->plainText());
         if (action->hasIcon())
           if (!action->icon().isEmpty())
-            act->setPixmap(0, loader->loadIcon(action->icon(), KIcon::Toolbar, 16, KIcon::DefaultState, 0, true) );
+            act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) );
           else // Has iconset
-            act->setPixmap(0, action->iconSet(KIcon::Toolbar).pixmap());
+            act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap());
 
         active_list.insert(action->name(), true);
         break;
@@ -1031,7 +1031,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
   // go through the rest of the collection
   for (int i = actionCollection->count() - 1; i > -1; --i)
   {
-    KAction *action = actionCollection->action( i );
+    TDEAction *action = actionCollection->action( i );
 
     // skip our active ones
     if (active_list.contains(action->name()))
@@ -1041,9 +1041,9 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
     act->setText(1, action->plainText());
     if (action->hasIcon())
       if (!action->icon().isEmpty())
-        act->setPixmap(0, loader->loadIcon(action->icon(), KIcon::Toolbar, 16, KIcon::DefaultState, 0, true) );
+        act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) );
       else // Has iconset
-        act->setPixmap(0, action->iconSet(KIcon::Toolbar).pixmap());
+        act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap());
   }
 
   // finally, add default separators to the inactive list
@@ -1053,7 +1053,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
   act->setText(1, SEPARATORSTRING);
 }
 
-KActionCollection *KEditToolbarWidget::actionCollection() const
+TDEActionCollection *KEditToolbarWidget::actionCollection() const
 {
   return d->m_collection;
 }
@@ -1108,7 +1108,7 @@ void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item)
   ToolbarItem* toolitem = static_cast<ToolbarItem *>(item);
   m_removeAction->setEnabled( item );
 
-  static const TQString &tagAction = KGlobal::staticQString( "Action" );
+  static const TQString &tagAction = TDEGlobal::staticQString( "Action" );
   d->m_changeIcon->setEnabled( item &&
                                d->m_hasKDialog &&
                                toolitem->internalTag() == tagAction );
@@ -1135,7 +1135,7 @@ void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item)
   }
 }
 
-void KEditToolbarWidget::slotDropped(KListView *list, TQDropEvent *e, TQListViewItem *after)
+void KEditToolbarWidget::slotDropped(TDEListView *list, TQDropEvent *e, TQListViewItem *after)
 {
   ToolbarItem *item = new ToolbarItem(m_inactiveList); // needs parent, use inactiveList temporarily
   if(!ToolbarItemDrag::decode(e, *item)) {
@@ -1191,11 +1191,11 @@ void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before,
   if (!item)
     return;
 
-  static const TQString &tagAction    = KGlobal::staticQString( "Action" );
-  static const TQString &tagSeparator = KGlobal::staticQString( "Separator" );
-  static const TQString &attrName     = KGlobal::staticQString( "name" );
-  static const TQString &attrLineSeparator = KGlobal::staticQString( "lineSeparator" );
-  static const TQString &attrNoMerge  = KGlobal::staticQString( "noMerge" );
+  static const TQString &tagAction    = TDEGlobal::staticQString( "Action" );
+  static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" );
+  static const TQString &attrName     = TDEGlobal::staticQString( "name" );
+  static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" );
+  static const TQString &attrNoMerge  = TDEGlobal::staticQString( "noMerge" );
 
   TQDomElement new_item;
   // let's handle the separator specially
@@ -1238,7 +1238,7 @@ void KEditToolbarWidget::removeActive(ToolbarItem *item)
   if (!item)
     return;
 
-  static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" );
+  static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" );
 
   // we're modified, so let this change
   emit enableOk(true);
@@ -1306,7 +1306,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before )
     d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (ToolbarItem*)before ));
 
   // and set this container as a noMerge
-  static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" );
+  static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" );
   d->m_currentToolbarElem.setAttribute( attrNoMerge, "1");
 
   // update the local doc
@@ -1330,7 +1330,7 @@ void KEditToolbarWidget::slotDownButton()
 
 void KEditToolbarWidget::updateLocal(TQDomElement& elem)
 {
-  static const TQString &attrName = KGlobal::staticQString( "name" );
+  static const TQString &attrName = TDEGlobal::staticQString( "name" );
 
   XmlDataList::Iterator xit = d->m_xmlFiles.begin();
   for ( ; xit != d->m_xmlFiles.end(); ++xit)
@@ -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 TDEIconChooser 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!
@@ -1382,14 +1382,14 @@ void KEditToolbarWidget::slotChangeIcon()
         return;
   
   d->m_kdialogProcess = new KProcIO;
-  TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
+  TQString kdialogExe = TDEStandardDirs::findExe(TQString::fromLatin1("kdialog"));
   (*d->m_kdialogProcess) << kdialogExe;
   (*d->m_kdialogProcess) << "--embed";
   (*d->m_kdialogProcess) << TQString::number( (ulong)topLevelWidget()->winId() );
   (*d->m_kdialogProcess) << "--geticon";
   (*d->m_kdialogProcess) << "Toolbar";
   (*d->m_kdialogProcess) << "Actions";
-  if ( !d->m_kdialogProcess->start( KProcess::NotifyOnExit ) ) {
+  if ( !d->m_kdialogProcess->start( TDEProcess::NotifyOnExit ) ) {
     kdError(240) << "Can't run " << kdialogExe << endl;
     delete d->m_kdialogProcess;
     d->m_kdialogProcess = 0;
@@ -1399,11 +1399,11 @@ void KEditToolbarWidget::slotChangeIcon()
   m_activeList->setEnabled( false ); // don't change the current item
   m_toolbarCombo->setEnabled( false ); // don't change the current toolbar
 
-  connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( KProcess* ) ),
-           this, TQT_SLOT( slotProcessExited( KProcess* ) ) );
+  connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( TDEProcess* ) ),
+           this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
 }
 
-void KEditToolbarWidget::slotProcessExited( KProcess* )
+void KEditToolbarWidget::slotProcessExited( TDEProcess* )
 {
   m_activeList->setEnabled( true );
   m_toolbarCombo->setEnabled( true );
diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h
index 60a15d5de..829cdd347 100644
--- a/tdeui/kedittoolbar.h
+++ b/tdeui/kedittoolbar.h
@@ -23,11 +23,11 @@
 #include <kxmlguiclient.h>
 #include <kdialogbase.h>
 
-class KProcess;
-class KActionCollection;
+class TDEProcess;
+class TDEActionCollection;
 class TQComboBox;
 class TQToolButton;
-class KListView;
+class TDEListView;
 class TQListViewItem;
 
 class KEditToolbarWidget;
@@ -61,12 +61,12 @@ namespace
  * That code snippet also takes care of redrawing the menu and
  * toolbars if you have made any changes.
  *
- * If you are using KMainWindow's settings methods (either save/apply manually
+ * If you are using TDEMainWindow's settings methods (either save/apply manually
  * or autoSaveSettings), you should write something like:
  * \code
  * void MyClass::slotConfigureToolbars()
  * {
- *   saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+ *   saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
  *   KEditToolbar dlg(actionCollection());
  *   connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
  *   dlg.exec();
@@ -76,7 +76,7 @@ namespace
  * {
  *    ...if you use any action list, use plugActionList on each here...
  *    createGUI();
- *    applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+ *    applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
  * }
  * \endcode
  *
@@ -91,7 +91,7 @@ namespace
  * An example would be:
  *
  * \code
- * saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+ * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
  * KEditToolbar dlg(factory());
  * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
  * dlg.exec();
@@ -100,7 +100,7 @@ namespace
  * {
  *    ...if you use any action list, use plugActionList on each here...
  *    // Do NOT call createGUI()!
- *    applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+ *    applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
  * }
  * \endcode
  *
@@ -123,7 +123,7 @@ public:
    * relative) of your application's UI resource file.  If it is
    * left blank, then the resource file: share/apps/appname/appnameui.rc
    * is used.  This is the same resource file that is used by the
-   * default createGUI() function in KMainWindow so you're usually
+   * default createGUI() function in TDEMainWindow so you're usually
    * pretty safe in leaving it blank.
    *
    * The third parameter, global(), controls whether or not the
@@ -141,7 +141,7 @@ public:
    * @param parent The parent of the dialog.
    * @param name An internal name.
    */
-  KEditToolbar(KActionCollection *collection,
+  KEditToolbar(TDEActionCollection *collection,
                const TQString& xmlfile = TQString::null, bool global = true,
 			   TQWidget* parent = 0, const char* name = 0);
 
@@ -157,7 +157,7 @@ public:
    * @param name An internal name.
    * @since 3.2
    */
-  KEditToolbar(const TQString& defaultToolbar, KActionCollection *collection,
+  KEditToolbar(const TQString& defaultToolbar, TDEActionCollection *collection,
                const TQString& xmlfile = TQString::null, bool global = true,
                TQWidget* parent = 0, const char* name = 0);
   /**
@@ -179,9 +179,9 @@ public:
    * @param parent The usual parent for the dialog.
    * @param name An internal name.
    *
-   * Some people seem tempted to use this also in non-KParts apps, using KMainWindow::guiFactory().
+   * Some people seem tempted to use this also in non-KParts apps, using TDEMainWindow::guiFactory().
    * This works, but only _if_ setting conserveMemory to false when calling
-   * KMainWindow::createGUI()! If not, use the other KEditToolbar constructor.
+   * TDEMainWindow::createGUI()! If not, use the other KEditToolbar constructor.
    */
   KEditToolbar(KXMLGUIFactory* factory, TQWidget* parent = 0, const char* name = 0);
 
@@ -281,7 +281,7 @@ public:
    * relative) of your application's UI resource file.  If it is
    * left blank, then the resource file: share/apps/appname/appnameui.rc
    * is used.  This is the same resource file that is used by the
-   * default createGUI function in KMainWindow so you're usually
+   * default createGUI function in TDEMainWindow so you're usually
    * pretty safe in leaving it blank.
    *
    * The third parameter, global, controls whether or not the
@@ -300,7 +300,7 @@ public:
    *               be parsed
    * @param parent This widget's parent
    */
-  KEditToolbarWidget(KActionCollection *collection,
+  KEditToolbarWidget(TDEActionCollection *collection,
                      const TQString& xmlfile = TQString::null,
                      bool global = true, TQWidget *parent = 0L);
 
@@ -316,7 +316,7 @@ public:
    * @since 3.2
    */
   KEditToolbarWidget(const TQString& defaultToolbar,
-                     KActionCollection *collection,
+                     TDEActionCollection *collection,
                      const TQString& file = TQString::null,
                      bool global = true,
                      TQWidget *parent = 0L);
@@ -366,7 +366,7 @@ public:
   /**
    * @internal Reimplemented for internal purposes.
    */
-  virtual KActionCollection *actionCollection() const;
+  virtual TDEActionCollection *actionCollection() const;
 
   /**
    * Save any changes the user made.  The file will be in the user's
@@ -396,7 +396,7 @@ protected slots:
   void slotInactiveSelected(TQListViewItem *item);
   void slotActiveSelected(TQListViewItem *item);
 
-  void slotDropped(KListView *list, TQDropEvent *e, TQListViewItem *after);
+  void slotDropped(TDEListView *list, TQDropEvent *e, TQListViewItem *after);
 
   void slotInsertButton();
   void slotRemoveButton();
@@ -406,7 +406,7 @@ protected slots:
   void slotChangeIcon();
 
 private slots:
-  void slotProcessExited( KProcess* );
+  void slotProcessExited( TDEProcess* );
 
 protected: // KDE4: make private
   void setupLayout();
@@ -414,7 +414,7 @@ protected: // KDE4: make private
   void insertActive(ToolbarItem *item, TQListViewItem *before, bool prepend = false);
   void removeActive(ToolbarItem *item);
   void moveActive(ToolbarItem *item, TQListViewItem *before);
-  void initNonKPart(KActionCollection *collection, const TQString& file, bool global);
+  void initNonKPart(TDEActionCollection *collection, const TQString& file, bool global);
   void initKPart(KXMLGUIFactory* factory);
   void loadToolbarCombo(const TQString& defaultToolbar = TQString::null);
   void loadActionList(TQDomElement& elem);
diff --git a/tdeui/kguiitem.cpp b/tdeui/kguiitem.cpp
index 7b73c7401..dd30e1fe8 100644
--- a/tdeui/kguiitem.cpp
+++ b/tdeui/kguiitem.cpp
@@ -149,7 +149,7 @@ TQString KGuiItem::plainText() const
     return stripped;
 }
 
-TQIconSet KGuiItem::iconSet( KIcon::Group group, int size, KInstance* instance ) const
+TQIconSet KGuiItem::iconSet( TDEIcon::Group group, int size, TDEInstance* instance ) const
 {
     if( d->m_hasIcon )
     {
diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h
index 586998d48..538275f3d 100644
--- a/tdeui/kguiitem.h
+++ b/tdeui/kguiitem.h
@@ -27,7 +27,7 @@
 #include <tqpixmap.h>
 #include <tqvaluelist.h>
 #include <kicontheme.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 /**
  * @short An abstract class for GUI data such as ToolTip and Icon.
@@ -61,10 +61,10 @@ public:
     TQString text() const;
     TQString plainText() const;
 #ifndef KDE_NO_COMPAT
-    TQIconSet iconSet( KIcon::Group, int size = 0, KInstance* instance = KGlobal::instance()) const;
-    TQIconSet iconSet() const { return iconSet( KIcon::Small ); }
+    TQIconSet iconSet( TDEIcon::Group, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const;
+    TQIconSet iconSet() const { return iconSet( TDEIcon::Small ); }
 #else
-    TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, KInstance* instance = KGlobal::instance()) const;
+    TQIconSet iconSet( TDEIcon::Group=TDEIcon::Small, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const;
 #endif
 
     TQString iconName() const;
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 071db1248..08755b860 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -27,19 +27,19 @@
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
 
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
-#include <kaboutkde.h>
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeabouttde.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
 #include <kbugreport.h>
 #include <kdialogbase.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 
@@ -59,7 +59,7 @@ public:
         delete mSwitchApplicationLanguage;
     }
 
-    const KAboutData *mAboutData;
+    const TDEAboutData *mAboutData;
     KSwitchLanguageDialog *mSwitchApplicationLanguage;
 };
 
@@ -74,8 +74,8 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TQString &aboutAppText,
   d->mAboutData = 0;
 }
 
-KHelpMenu::KHelpMenu( TQWidget *parent, const KAboutData *aboutData,
-		      bool showWhatsThis, KActionCollection *actions )
+KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
+		      bool showWhatsThis, TDEActionCollection *actions )
   : TQObject(parent), mMenu(0), mAboutApp(0), mAboutKDE(0), mBugReport(0),
     d(new KHelpMenuPrivate)
 {
@@ -109,7 +109,7 @@ KHelpMenu::~KHelpMenu()
 }
 
 
-KPopupMenu* KHelpMenu::menu()
+TDEPopupMenu* KHelpMenu::menu()
 {
   if( !mMenu )
   {
@@ -118,23 +118,23 @@ KPopupMenu* KHelpMenu::menu()
     // I use hardcoded menu id's here. Reason is to stay backward
     // compatible.
     //
-    const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
+    const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : TDEGlobal::instance()->aboutData();
     TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
 
-    mMenu = new KPopupMenu();
+    mMenu = new TDEPopupMenu();
     connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed()));
 
     bool need_separator = false;
-    if (kapp->authorizeKAction("help_contents"))
+    if (kapp->authorizeTDEAction("help_contents"))
     {
-      mMenu->insertItem( BarIcon( "contents", KIcon::SizeSmall),
+      mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall),
                      TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents );
       mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) );
-      mMenu->setAccel( KStdAccel::shortcut(KStdAccel::Help), menuHelpContents );
+      mMenu->setAccel( TDEStdAccel::shortcut(TDEStdAccel::Help), menuHelpContents );
       need_separator = true;
     }
 
-    if( mShowWhatsThis && kapp->authorizeKAction("help_whats_this") )
+    if( mShowWhatsThis && kapp->authorizeTDEAction("help_whats_this") )
     {
       TQToolButton* wtb = TQWhatsThis::whatsThisButton(0);
       mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis);
@@ -144,7 +144,7 @@ KPopupMenu* KHelpMenu::menu()
       need_separator = true;
     }
 
-    if (kapp->authorizeKAction("help_report_bug") && aboutData && !aboutData->bugAddress().isEmpty() )
+    if (kapp->authorizeTDEAction("help_report_bug") && aboutData && !aboutData->bugAddress().isEmpty() )
     {
       if (need_separator)
         mMenu->insertSeparator();
@@ -153,7 +153,7 @@ KPopupMenu* KHelpMenu::menu()
       need_separator = true;
     }
 
-    if (kapp->authorizeKAction("switch_application_language"))
+    if (kapp->authorizeTDEAction("switch_application_language"))
     {
       if (need_separator)
         mMenu->insertSeparator();
@@ -165,14 +165,14 @@ KPopupMenu* KHelpMenu::menu()
     if (need_separator)
       mMenu->insertSeparator();
 
-    if (kapp->authorizeKAction("help_about_app"))
+    if (kapp->authorizeTDEAction("help_about_app"))
     {
       mMenu->insertItem( kapp->miniIcon(),
         TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp );
       mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) );
     }
     
-    if (kapp->authorizeKAction("help_about_kde"))
+    if (kapp->authorizeTDEAction("help_about_kde"))
     {
       mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &Trinity" ), menuAboutKDE );
       mMenu->connectItem( menuAboutKDE, this, TQT_SLOT( aboutKDE() ) );
@@ -196,7 +196,7 @@ void KHelpMenu::aboutApplication()
   {
     if( !mAboutApp )
     {
-      mAboutApp = new KAboutApplication( d->mAboutData, mParent, "about", false );
+      mAboutApp = new TDEAboutApplication( d->mAboutData, mParent, "about", false );
       connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
     }
     mAboutApp->show();
@@ -238,7 +238,7 @@ void KHelpMenu::aboutKDE()
 {
   if( !mAboutKDE )
   {
-    mAboutKDE = new KAboutKDE( mParent, "aboutkde", false );
+    mAboutKDE = new TDEAboutKDE( mParent, "aboutkde", false );
     connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
   }
   mAboutKDE->show();
diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h
index e58569bf6..25e118b5b 100644
--- a/tdeui/khelpmenu.h
+++ b/tdeui/khelpmenu.h
@@ -27,12 +27,12 @@
 
 #include <tdelibs_export.h>
 
-class KActionCollection;
-class KPopupMenu;
+class TDEActionCollection;
+class TDEPopupMenu;
 class TQWidget;
 
-class KAboutData;
-class KAboutKDE;
+class TDEAboutData;
+class TDEAboutKDE;
 class KBugReport;
 class KDialogBase;
 class KHelpMenuPrivate;
@@ -44,10 +44,10 @@ class KHelpMenuPrivate;
  * This class provides the standard %KDE help menu with the default "about"
  * dialog boxes and help entry.
  *
- * This class is used in KMainWindow so
+ * This class is used in TDEMainWindow so
  * normally you don't need to use this class yourself. However, if you
  * need the help menu or any of its dialog boxes in your code that is
- * not subclassed from KMainWindow you should use this class.
+ * not subclassed from TDEMainWindow you should use this class.
  *
  * The usage is simple:
  *
@@ -64,7 +64,7 @@ class KHelpMenuPrivate;
  * \endcode
  *
  * IMPORTANT:
- * The first time you use KHelpMenu::menu(), a KPopupMenu object is
+ * The first time you use KHelpMenu::menu(), a TDEPopupMenu object is
  * allocated. Only one object is created by the class so if you call
  * KHelpMenu::menu() twice or more, the same pointer is returned. The class
  * will destroy the popupmenu in the destructor so do not delete this
@@ -115,7 +115,7 @@ class KHelpMenuPrivate;
  * void MyClass::myFunc()
  * {
  *   KHelpMenu *helpMenu = new KHelpMenu( this );
- *   KPopupMenu *help = mHelpMenu->menu();
+ *   TDEPopupMenu *help = mHelpMenu->menu();
  *   help->connectItem( KHelpMenu::menuAboutApp, this, TQT_SLOT(myDialogSlot()) );
  * }
  *
@@ -171,12 +171,12 @@ class TDEUI_EXPORT KHelpMenu : public TQObject
      * @param aboutData User and app data used in the About app dialog
      * @param showWhatsThis Decides whether a "Whats this" entry will be
      *        added to the dialog.
-     * @param actions KActionCollection that is used instead of the
+     * @param actions TDEActionCollection that is used instead of the
      *        standard actions.
      *
      */
-    KHelpMenu( TQWidget *parent, const KAboutData *aboutData,
-	       bool showWhatsThis=true, KActionCollection *actions = 0 );
+    KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
+	       bool showWhatsThis=true, TDEActionCollection *actions = 0 );
 
     /**
      * Destructor
@@ -192,7 +192,7 @@ class TDEUI_EXPORT KHelpMenu : public TQObject
      * Note: This method will only create one instance of the menu. If
      * you call this method twice or more the same pointer is returned
      */
-    KPopupMenu *menu();
+    TDEPopupMenu *menu();
 
   public slots:
     /**
@@ -261,9 +261,9 @@ class TDEUI_EXPORT KHelpMenu : public TQObject
     void showAboutApplication();
 
   private:
-    KPopupMenu   *mMenu;
+    TDEPopupMenu   *mMenu;
     KDialogBase  *mAboutApp;
-    KAboutKDE    *mAboutKDE;
+    TDEAboutKDE    *mAboutKDE;
     KBugReport   *mBugReport;
 
     TQString      mAboutAppText;
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index a26519729..7273cbe13 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -25,28 +25,28 @@
 
 #include "kiconview.h"
 #include "kwordwrap.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeapplication.h>
 #include <kipc.h> 
 
 #include <kcursor.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 
-class KIconView::KIconViewPrivate
+class TDEIconView::TDEIconViewPrivate
 {
 public:
-    KIconViewPrivate() {
-        mode = KIconView::Execute;
+    TDEIconViewPrivate() {
+        mode = TDEIconView::Execute;
         fm = 0L;
         doAutoSelect = true;
         textHeight = 0;
         dragHoldItem = 0L;
     }
-    KIconView::Mode mode;
+    TDEIconView::Mode mode;
     bool doAutoSelect;
     TQFontMetrics *fm;
     TQPixmapCache maskCache;
@@ -56,16 +56,16 @@ public:
     TQTimer doubleClickIgnoreTimer;
 };
 
-KIconView::KIconView( TQWidget *parent, const char *name, WFlags f )
+TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f )
     : TQIconView( parent, name, f )
 {
-    d = new KIconViewPrivate;
+    d = new TDEIconViewPrivate;
 
     connect( this, TQT_SIGNAL( onViewport() ),
              this, TQT_SLOT( slotOnViewport() ) );
     connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
              this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) );
-    slotSettingsChanged( KApplication::SETTINGS_MOUSE );
+    slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
     if ( kapp ) { // maybe null when used inside designer
         connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
         kapp->addKipcEventMask( KIPC::SettingsChanged );
@@ -80,24 +80,24 @@ KIconView::KIconView( TQWidget *parent, const char *name, WFlags f )
     connect( &d->dragHoldTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragHoldTimeout()) );
 }
 
-KIconView::~KIconView()
+TDEIconView::~TDEIconView()
 {
     delete d->fm;
     delete d;
 }
 
 
-void KIconView::setMode( KIconView::Mode mode )
+void TDEIconView::setMode( TDEIconView::Mode mode )
 {
     d->mode = mode;
 }
 
-KIconView::Mode KIconView::mode() const
+TDEIconView::Mode TDEIconView::mode() const
 {
     return d->mode;
 }
 
-void KIconView::slotOnItem( TQIconViewItem *item )
+void TDEIconView::slotOnItem( TQIconViewItem *item )
 {
     if ( item ) {
         if ( m_bUseSingle ) {
@@ -112,7 +112,7 @@ void KIconView::slotOnItem( TQIconViewItem *item )
     }
 }
 
-void KIconView::slotOnViewport()
+void TDEIconView::slotOnViewport()
 {
     if ( m_bUseSingle && m_bChangeCursorOverItem )
         viewport()->unsetCursor();
@@ -121,12 +121,12 @@ void KIconView::slotOnViewport()
     m_pCurrentItem = 0L;
 }
 
-void KIconView::slotSettingsChanged(int category)
+void TDEIconView::slotSettingsChanged(int category)
 {
-    if ( category != KApplication::SETTINGS_MOUSE )
+    if ( category != TDEApplication::SETTINGS_MOUSE )
       return;
-    m_bUseSingle = KGlobalSettings::singleClick();
-    //kdDebug() << "KIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl;
+    m_bUseSingle = TDEGlobalSettings::singleClick();
+    //kdDebug() << "TDEIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl;
 
     disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
 						  const TQPoint & ) ),
@@ -150,14 +150,14 @@ void KIconView::slotSettingsChanged(int category)
 // 					  const TQPoint & ) ) );
     }
 
-    m_bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon();
-    m_autoSelectDelay = m_bUseSingle ? KGlobalSettings::autoSelectDelay() : -1;
+    m_bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon();
+    m_autoSelectDelay = m_bUseSingle ? TDEGlobalSettings::autoSelectDelay() : -1;
 
     if( !m_bUseSingle || !m_bChangeCursorOverItem )
         viewport()->unsetCursor();
 }
 
-void KIconView::slotAutoSelect()
+void TDEIconView::slotAutoSelect()
 {
   // check that the item still exists
   if( index( m_pCurrentItem ) == -1 || !d->doAutoSelect )
@@ -167,7 +167,7 @@ void KIconView::slotAutoSelect()
   if( !hasFocus() )
     setFocus();
 
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
   TQIconViewItem* previousItem = currentItem();
   setCurrentItem( m_pCurrentItem );
 
@@ -232,18 +232,18 @@ void KIconView::slotAutoSelect()
       setSelected( m_pCurrentItem, true );
   }
   else
-    kdDebug() << "KIconView: That's not supposed to happen!!!!" << endl;
+    kdDebug() << "TDEIconView: That's not supposed to happen!!!!" << endl;
 }
 
-void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos )
+void TDEIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos )
 {
   if ( d->mode != Execute )
   {
-    // kdDebug() << "KIconView::emitExecute : not in execute mode !" << endl;
+    // kdDebug() << "TDEIconView::emitExecute : not in execute mode !" << endl;
     return;
   }
 
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
 
   m_pAutoSelect->stop();
 
@@ -256,7 +256,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos )
   }
 }
 
-void KIconView::updateDragHoldItem( TQDropEvent *e )
+void TDEIconView::updateDragHoldItem( TQDropEvent *e )
 {
   TQIconViewItem *item = findItem( e->pos() );
 
@@ -274,21 +274,21 @@ void KIconView::updateDragHoldItem( TQDropEvent *e )
   }
 }
 
-void KIconView::focusOutEvent( TQFocusEvent *fe )
+void TDEIconView::focusOutEvent( TQFocusEvent *fe )
 {
   m_pAutoSelect->stop();
 
   TQIconView::focusOutEvent( fe );
 }
 
-void KIconView::leaveEvent( TQEvent *e )
+void TDEIconView::leaveEvent( TQEvent *e )
 {
   m_pAutoSelect->stop();
 
   TQIconView::leaveEvent( e );
 }
 
-void KIconView::contentsMousePressEvent( TQMouseEvent *e )
+void TDEIconView::contentsMousePressEvent( TQMouseEvent *e )
 {
   if( (selectionMode() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) ) {
     bool block = signalsBlocked();
@@ -303,7 +303,7 @@ void KIconView::contentsMousePressEvent( TQMouseEvent *e )
   d->doAutoSelect = false;
 }
 
-void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
+void TDEIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
 {
   TQIconView::contentsMouseDoubleClickEvent( e );
 
@@ -318,9 +318,9 @@ void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
   d->doubleClickIgnoreTimer.start(0, true);
 }
 
-void KIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const TQPoint &pos )
+void TDEIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const TQPoint &pos )
 {
-  //kdDebug() << " KIconView::slotMouseButtonClicked() item=" << item << endl;
+  //kdDebug() << " TDEIconView::slotMouseButtonClicked() item=" << item << endl;
   if( d->doubleClickIgnoreTimer.isActive() )
     return; // Ignore double click
     
@@ -328,19 +328,19 @@ void KIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const TQP
     emitExecute( item, pos );
 }
 
-void KIconView::contentsMouseReleaseEvent( TQMouseEvent *e )
+void TDEIconView::contentsMouseReleaseEvent( TQMouseEvent *e )
 {
     d->doAutoSelect = true;
     TQIconView::contentsMouseReleaseEvent( e );
 }
 
-void KIconView::contentsDragEnterEvent( TQDragEnterEvent *e )
+void TDEIconView::contentsDragEnterEvent( TQDragEnterEvent *e )
 {
     updateDragHoldItem( e );
     TQIconView::contentsDragEnterEvent( e );
 }
 
-void KIconView::contentsDragLeaveEvent( TQDragLeaveEvent *e )
+void TDEIconView::contentsDragLeaveEvent( TQDragLeaveEvent *e )
 {
     d->dragHoldTimer.stop();
     d->dragHoldItem = 0L;
@@ -348,19 +348,19 @@ void KIconView::contentsDragLeaveEvent( TQDragLeaveEvent *e )
 }
 
 
-void KIconView::contentsDragMoveEvent( TQDragMoveEvent *e )
+void TDEIconView::contentsDragMoveEvent( TQDragMoveEvent *e )
 {
     updateDragHoldItem( e );
     TQIconView::contentsDragMoveEvent( e );
 }
 
-void KIconView::contentsDropEvent( TQDropEvent* e )
+void TDEIconView::contentsDropEvent( TQDropEvent* e )
 {
     d->dragHoldTimer.stop();
     TQIconView::contentsDropEvent( e );
 }
 
-void KIconView::slotDragHoldTimeout()
+void TDEIconView::slotDragHoldTimeout()
 {
     TQIconViewItem *tmp = d->dragHoldItem;
     d->dragHoldItem = 0L;
@@ -368,7 +368,7 @@ void KIconView::slotDragHoldTimeout()
     emit held( tmp );
 }
 
-void KIconView::takeItem( TQIconViewItem * item )
+void TDEIconView::takeItem( TQIconViewItem * item )
 {
     if ( item == d->dragHoldItem )
     {
@@ -379,13 +379,13 @@ void KIconView::takeItem( TQIconViewItem * item )
     TQIconView::takeItem( item );
 }
 
-void KIconView::cancelPendingHeldSignal()
+void TDEIconView::cancelPendingHeldSignal()
 {
     d->dragHoldTimer.stop();
     d->dragHoldItem = 0L;
 }
 
-void KIconView::wheelEvent( TQWheelEvent *e )
+void TDEIconView::wheelEvent( TQWheelEvent *e )
 {
     if (horizontalScrollBar() && (arrangement() == TQIconView::TopToBottom)) {
         TQWheelEvent ce(e->pos(), e->delta(), e->state(), Qt::Horizontal);
@@ -398,14 +398,14 @@ void KIconView::wheelEvent( TQWheelEvent *e )
     TQIconView::wheelEvent(e);
 }
 
-void KIconView::setFont( const TQFont &font )
+void TDEIconView::setFont( const TQFont &font )
 {
     delete d->fm;
     d->fm = 0L;
     TQIconView::setFont( font );
 }
 
-TQFontMetrics *KIconView::itemFontMetrics() const
+TQFontMetrics *TDEIconView::itemFontMetrics() const
 {
     if (!d->fm) {
         // TQIconView creates one too, but we can't access it
@@ -414,7 +414,7 @@ TQFontMetrics *KIconView::itemFontMetrics() const
     return d->fm;
 }
 
-TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const
+TQPixmap TDEIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const
 {
     TQPixmap m;
     if ( d->maskCache.find( TQString::number( pix->serialNumber() ), m ) )
@@ -424,12 +424,12 @@ TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) cons
     return m;
 }
 
-int KIconView::iconTextHeight() const
+int TDEIconView::iconTextHeight() const
 {
     return d->textHeight > 0 ? d->textHeight : ( wordWrapIconText() ? 99 : 1 );
 }
 
-void KIconView::setIconTextHeight( int n )
+void TDEIconView::setIconTextHeight( int n )
 {
     int oldHeight = iconTextHeight();
     if ( n > 1 )
@@ -447,27 +447,27 @@ void KIconView::setIconTextHeight( int n )
 
 /////////////
 
-struct KIconViewItem::KIconViewItemPrivate
+struct TDEIconViewItem::TDEIconViewItemPrivate
 {
     TQSize m_pixmapSize;
 };
 
-void KIconViewItem::init()
+void TDEIconViewItem::init()
 {
     m_wordWrap = 0L;
     d = 0L;
     calcRect();
 }
 
-KIconViewItem::~KIconViewItem()
+TDEIconViewItem::~TDEIconViewItem()
 {
     delete m_wordWrap;
     delete d;
 }
 
-void KIconViewItem::calcRect( const TQString& text_ )
+void TDEIconViewItem::calcRect( const TQString& text_ )
 {
-    bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect();
+    bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect();
 
     Q_ASSERT( iconView() );
     if ( !iconView() )
@@ -475,14 +475,14 @@ void KIconViewItem::calcRect( const TQString& text_ )
     delete m_wordWrap;
     m_wordWrap = 0L;
 #ifndef NDEBUG // be faster for the end-user, such a bug will have been fixed before hand :)
-    if ( !iconView()->inherits("KIconView") )
+    if ( !iconView()->inherits("TDEIconView") )
     {
-        kdWarning() << "KIconViewItem used in a " << iconView()->className() << " !!" << endl;
+        kdWarning() << "TDEIconViewItem used in a " << iconView()->className() << " !!" << endl;
         return;
     }
 #endif
-    //kdDebug() << "KIconViewItem::calcRect - " << text() << endl;
-    KIconView *view = static_cast<KIconView *>(iconView());
+    //kdDebug() << "TDEIconViewItem::calcRect - " << text() << endl;
+    TDEIconView *view = static_cast<TDEIconView *>(iconView());
     TQRect itemIconRect = pixmapRect();
     TQRect itemTextRect = textRect();
     TQRect itemRect = rect();
@@ -532,7 +532,7 @@ void KIconViewItem::calcRect( const TQString& text_ )
     t = text_.isEmpty() ? text() : text_;
     
     // Max text height
-    int nbLines = static_cast<KIconView*>( iconView() )->iconTextHeight();
+    int nbLines = static_cast<TDEIconView*>( iconView() )->iconTextHeight();
     int height = nbLines > 0 ? fm->height() * nbLines : 0xFFFFFFFF;
     
     // Should not be higher than pixmap if text is alongside icons
@@ -629,16 +629,16 @@ void KIconViewItem::calcRect( const TQString& text_ )
 
 }
 
-void KIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg )
+void TDEIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg )
 {
     TQIconView* view = iconView();
     Q_ASSERT( view );
     if ( !view )
         return;
 #ifndef NDEBUG // be faster for the end-user, such a bug will have been fixed before hand :)
-    if ( !view->inherits("KIconView") )
+    if ( !view->inherits("TDEIconView") )
     {
-        kdWarning() << "KIconViewItem used in a " << view->className() << " !!" << endl;
+        kdWarning() << "TDEIconViewItem used in a " << view->className() << " !!" << endl;
         return;
     }
 #endif
@@ -651,14 +651,14 @@ void KIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg )
     p->restore();
 }
 
-KWordWrap * KIconViewItem::wordWrap()
+KWordWrap * TDEIconViewItem::wordWrap()
 {
     return m_wordWrap;
 }
 
-void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg )
+void TDEIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg )
 {
-    KIconView *kview = static_cast<KIconView *>(iconView());
+    TDEIconView *kview = static_cast<TDEIconView *>(iconView());
 
 #ifndef QT_NO_PICTURE
     if ( picture() ) {
@@ -702,9 +702,9 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg )
     }
 }
 
-void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg )
+void TDEIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg )
 {
-    bool drawRoundedRect = KGlobalSettings::iconUseRoundedRect();
+    bool drawRoundedRect = TDEGlobalSettings::iconUseRoundedRect();
     int textX;
     if (drawRoundedRect == true)
       textX = textRect( false ).x() + 4;
@@ -732,20 +732,20 @@ void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg )
     m_wordWrap->drawText( p, textX, textY, align | KWordWrap::Truncate );
 }
 
-TQSize KIconViewItem::pixmapSize() const
+TQSize TDEIconViewItem::pixmapSize() const
 {
     return d ? d->m_pixmapSize : TQSize( 0, 0 );
 }
 
-void KIconViewItem::setPixmapSize( const TQSize& size )
+void TDEIconViewItem::setPixmapSize( const TQSize& size )
 {
     if ( !d )
-        d = new KIconViewItemPrivate;
+        d = new TDEIconViewItemPrivate;
 
     d->m_pixmapSize = size;
 }
 
-void KIconView::virtual_hook( int, void* )
+void TDEIconView::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 #include "kiconview.moc"
diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h
index 5b1149f7b..8c0cd5a24 100644
--- a/tdeui/kiconview.h
+++ b/tdeui/kiconview.h
@@ -33,26 +33,26 @@
  * There is a new signal executed(). It gets connected to either
  * TQIconView::clicked() or TQIconView::doubleClicked() depending on the KDE
  * wide Single Click/Double Click settings. It is strongly recommended that
- * you use this signal instead of the above mentioned. This way you don´t
+ * you use this signal instead of the above mentioned. This way you don�t
  * need to care about the current settings.
  * If you want to get informed when the user selects something connect to the
  * TQIconView::selectionChanged() signal.
  *
  **/
-class TDEUI_EXPORT KIconView : public TQIconView
+class TDEUI_EXPORT TDEIconView : public TQIconView
 {
-  friend class KIconViewItem;
+  friend class TDEIconViewItem;
   Q_OBJECT
   TQ_ENUMS( Mode )
   TQ_PROPERTY( Mode mode READ mode WRITE setMode )
 
 public:
-  KIconView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+  TDEIconView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 
-  ~KIconView();
+  ~TDEIconView();
 
   /**
-   * KIconView has two different operating modes. Execute mode is depending
+   * TDEIconView has two different operating modes. Execute mode is depending
    * on the configuration of single-click or double-click where the signal
    * executed() will be emitted upon click/double-click.
    * In Select mode, this signal will not be emitted.
@@ -180,7 +180,7 @@ protected:
   /**
    * This method allows to handle correctly cases where a subclass
    * needs the held() signal to not be triggered without calling
-   * a KIconView::contentsDrag*Event() method (which have side effects
+   * a TDEIconView::contentsDrag*Event() method (which have side effects
    * because they forward to TQIconView).
    */
   void cancelPendingHeldSignal();
@@ -191,11 +191,11 @@ private slots:
 
 private:
   /**
-   * @internal. For use by KIconViewItem.
+   * @internal. For use by TDEIconViewItem.
    */
   TQFontMetrics *itemFontMetrics() const;
   /**
-   * @internal. For use by KIconViewItem.
+   * @internal. For use by TDEIconViewItem.
    */
   TQPixmap selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const;
 
@@ -210,40 +210,40 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KIconViewPrivate;
-  KIconViewPrivate *d;
+  class TDEIconViewPrivate;
+  TDEIconViewPrivate *d;
 };
 
 class KWordWrap;
 /**
  * @short A variant of TQIconViewItem that wraps words better.
  *
- * KIconViewItem exists to improve the word-wrap functionality of QIconViewItem
- * Use KIconViewItem instead of TQIconViewItem for any iconview item you might have :)
+ * TDEIconViewItem exists to improve the word-wrap functionality of QIconViewItem
+ * Use TDEIconViewItem instead of TQIconViewItem for any iconview item you might have :)
  *
  * @author David Faure <david@mandrakesoft.com>
  */
-class TDEUI_EXPORT KIconViewItem : public TQIconViewItem
+class TDEUI_EXPORT TDEIconViewItem : public TQIconViewItem
 {
 public:
     // Need to redefine all the constructors - I want Java !
-    KIconViewItem( TQIconView *parent )
+    TDEIconViewItem( TQIconView *parent )
         : TQIconViewItem( parent ) { init(); } // We need to call it because the parent ctor won't call our reimplementation :(((
-    KIconViewItem( TQIconView *parent, TQIconViewItem *after )
+    TDEIconViewItem( TQIconView *parent, TQIconViewItem *after )
         : TQIconViewItem( parent, after ) { init(); }
-    KIconViewItem( TQIconView *parent, const TQString &text )
+    TDEIconViewItem( TQIconView *parent, const TQString &text )
         : TQIconViewItem( parent, text ) { init(); }
-    KIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text )
+    TDEIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text )
         : TQIconViewItem( parent, after, text ) { init(); }
-    KIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon )
+    TDEIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon )
         : TQIconViewItem( parent, text, icon ) { init(); }
-    KIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon )
+    TDEIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon )
         : TQIconViewItem( parent, after, text, icon ) { init(); }
-    KIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture )
+    TDEIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture )
         : TQIconViewItem( parent, text, picture ) { init(); }
-    KIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture )
+    TDEIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture )
         : TQIconViewItem( parent, after, text, picture ) { init(); }
-    virtual ~KIconViewItem();
+    virtual ~TDEIconViewItem();
 
    /**
     * Using this function, you can specify a custom size for the pixmap. The
@@ -274,8 +274,8 @@ protected:
 
 private:
     KWordWrap* m_wordWrap;
-    struct KIconViewItemPrivate;
-    KIconViewItemPrivate *d;
+    struct TDEIconViewItemPrivate;
+    TDEIconViewItemPrivate *d;
 };
 
 #endif
diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp
index aa97dc923..7082fc910 100644
--- a/tdeui/kiconviewsearchline.cpp
+++ b/tdeui/kiconviewsearchline.cpp
@@ -20,14 +20,14 @@
 /**
  * \todo
  *     Maybe we should have a common interface for SearchLines, this file
- * is so close (it's actually based on) klistviewsearchline! Only few methods
+ * is so close (it's actually based on) tdelistviewsearchline! Only few methods
  * would be reimplemented.
  */
 
 #include "kiconviewsearchline.h"
 
 #include <tqiconview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtimer.h>
 #include <kdebug.h>
 
@@ -35,10 +35,10 @@
 
 typedef TQValueList <TQIconViewItem *> QIconViewItemList;
 
-class KIconViewSearchLine::KIconViewSearchLinePrivate
+class TDEIconViewSearchLine::TDEIconViewSearchLinePrivate
 {
 public:
-  KIconViewSearchLinePrivate() :
+  TDEIconViewSearchLinePrivate() :
     iconView( 0 ),
     caseSensitive( DEFAULT_CASESENSITIVE ),
     activeSearch( false ),
@@ -54,7 +54,7 @@ public:
 /******************************************************************************
  * Public Methods                                                             *
  *****************************************************************************/
-KIconViewSearchLine::KIconViewSearchLine( TQWidget *parent,
+TDEIconViewSearchLine::TDEIconViewSearchLine( TQWidget *parent,
 					  TQIconView *iconView,
 					  const char *name ) :
   KLineEdit( parent, name )
@@ -63,25 +63,25 @@ KIconViewSearchLine::KIconViewSearchLine( TQWidget *parent,
   init( iconView );
 }
 
-KIconViewSearchLine::KIconViewSearchLine( TQWidget *parent, const char *name ) :
+TDEIconViewSearchLine::TDEIconViewSearchLine( TQWidget *parent, const char *name ) :
   KLineEdit( parent, name )
 {
   d = NULL;
   init( NULL );
 }
 
-KIconViewSearchLine::~KIconViewSearchLine()
+TDEIconViewSearchLine::~TDEIconViewSearchLine()
 {
   clear(); // empty hiddenItems, returning items back to iconView
   delete d;
 }
 
-bool KIconViewSearchLine::caseSensitive() const
+bool TDEIconViewSearchLine::caseSensitive() const
 {
   return d->caseSensitive;
 }
 
-TQIconView *KIconViewSearchLine::iconView() const
+TQIconView *TDEIconViewSearchLine::iconView() const
 {
   return d->iconView;
 }
@@ -89,7 +89,7 @@ TQIconView *KIconViewSearchLine::iconView() const
 /******************************************************************************
  * Public Slots                                                               *
  *****************************************************************************/
-void KIconViewSearchLine::updateSearch( const TQString &s )
+void TDEIconViewSearchLine::updateSearch( const TQString &s )
 {
 	long original_count;
 	int original_hiddenListChanged;
@@ -125,7 +125,7 @@ void KIconViewSearchLine::updateSearch( const TQString &s )
 	d->iconView->ensureItemVisible( currentItem );
 }
 
-void KIconViewSearchLine::clear()
+void TDEIconViewSearchLine::clear()
 {
 	// Clear hidden list, give items back to TQIconView, if it still exists
 	TQIconViewItem *item = NULL;
@@ -142,16 +142,16 @@ void KIconViewSearchLine::clear()
 	KLineEdit::clear();
 }
 
-void KIconViewSearchLine::iconDeleted(const TQString &filename) {
+void TDEIconViewSearchLine::iconDeleted(const TQString &filename) {
 	// Do nothing...
 }
 
-void KIconViewSearchLine::setCaseSensitive( bool cs )
+void TDEIconViewSearchLine::setCaseSensitive( bool cs )
 {
   d->caseSensitive = cs;
 }
 
-void KIconViewSearchLine::setIconView( TQIconView *iv )
+void TDEIconViewSearchLine::setIconView( TQIconView *iv )
 {
   if ( d->iconView != NULL )
     disconnect( d->iconView, TQT_SIGNAL( destroyed() ),
@@ -172,7 +172,7 @@ void KIconViewSearchLine::setIconView( TQIconView *iv )
 /******************************************************************************
  * Protected Methods                                                          *
  *****************************************************************************/
-bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item,
+bool TDEIconViewSearchLine::itemMatches( const TQIconViewItem *item,
 				       const TQString &s ) const
 {
   if ( s.isEmpty() )
@@ -185,10 +185,10 @@ bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item,
   return ( itemtext.find( s, 0, caseSensitive() ) >= 0 );
 }
 
-void KIconViewSearchLine::init( TQIconView *iconView )
+void TDEIconViewSearchLine::init( TQIconView *iconView )
 {
   delete d;
-  d = new KIconViewSearchLinePrivate;
+  d = new TDEIconViewSearchLinePrivate;
 
   d->iconView = iconView;
 
@@ -205,7 +205,7 @@ void KIconViewSearchLine::init( TQIconView *iconView )
     setEnabled( false );
 }
 
-void KIconViewSearchLine::hideItem( TQIconViewItem *item )
+void TDEIconViewSearchLine::hideItem( TQIconViewItem *item )
 {
   if ( ( item == NULL ) || ( d->iconView == NULL ) )
     return;
@@ -213,7 +213,7 @@ void KIconViewSearchLine::hideItem( TQIconViewItem *item )
   item->setVisible(false);
 }
 
-void KIconViewSearchLine::showItem( TQIconViewItem *item )
+void TDEIconViewSearchLine::showItem( TQIconViewItem *item )
 {
   if ( d->iconView == NULL )
     {
@@ -229,14 +229,14 @@ void KIconViewSearchLine::showItem( TQIconViewItem *item )
 /******************************************************************************
  * Protected Slots                                                            *
  *****************************************************************************/
-void KIconViewSearchLine::queueSearch( const TQString &s )
+void TDEIconViewSearchLine::queueSearch( const TQString &s )
 {
   d->queuedSearches++;
   d->search = s;
   TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) );
 }
 
-void KIconViewSearchLine::activateSearch()
+void TDEIconViewSearchLine::activateSearch()
 {
   d->queuedSearches--;
 
@@ -253,7 +253,7 @@ void KIconViewSearchLine::activateSearch()
 /******************************************************************************
  * Private Slots                                                              *
  *****************************************************************************/
-void KIconViewSearchLine::iconViewDeleted()
+void TDEIconViewSearchLine::iconViewDeleted()
 {
   d->iconView = NULL;
   setEnabled( false );
diff --git a/tdeui/kiconviewsearchline.h b/tdeui/kiconviewsearchline.h
index cb28d04cd..cef09b3ea 100644
--- a/tdeui/kiconviewsearchline.h
+++ b/tdeui/kiconviewsearchline.h
@@ -35,33 +35,33 @@ class TQIconViewItem;
  *
  * @since 3.3
  */
-class TDEUI_EXPORT KIconViewSearchLine : public KLineEdit
+class TDEUI_EXPORT TDEIconViewSearchLine : public KLineEdit
 {
   Q_OBJECT
 
 public:
 
   /**
-   * Constructs a KIconViewSearchLine with \a iconView being the TQIconView to
+   * Constructs a TDEIconViewSearchLine with \a iconView being the TQIconView to
    * be filtered.
    *
    * If \a iconView is null then the widget will be disabled until a iconview
    * is set with setIconView().
    */
-  KIconViewSearchLine( TQWidget *parent = 0,
+  TDEIconViewSearchLine( TQWidget *parent = 0,
 		       TQIconView *iconView = 0,
 		       const char *name = 0 );
 
   /**
-   * Constructs a KIconViewSearchLine without any TQIconView to filter. The
+   * Constructs a TDEIconViewSearchLine without any TQIconView to filter. The
    * TQIconView object has to be set later with setIconView().
    */
-  KIconViewSearchLine( TQWidget *parent, const char *name );
+  TDEIconViewSearchLine( TQWidget *parent, const char *name );
 
   /**
-   * Destroys the KIconViewSearchLine.
+   * Destroys the TDEIconViewSearchLine.
    */
-  virtual ~KIconViewSearchLine();
+  virtual ~TDEIconViewSearchLine();
 
   /**
    * Returns true if the search is case sensitive.  This defaults to false.
@@ -175,8 +175,8 @@ private slots:
 
 
 private:
-  class KIconViewSearchLinePrivate;
-  KIconViewSearchLinePrivate *d;
+  class TDEIconViewSearchLinePrivate;
+  TDEIconViewSearchLinePrivate *d;
 };
 
 
diff --git a/tdeui/kinputdialog.cpp b/tdeui/kinputdialog.cpp
index 61b30cce1..a5a338422 100644
--- a/tdeui/kinputdialog.cpp
+++ b/tdeui/kinputdialog.cpp
@@ -29,7 +29,7 @@
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kcombobox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <ktextedit.h>
 
 #include "kinputdialog.h"
@@ -44,7 +44,7 @@ class KInputDialogPrivate
     KIntSpinBox *m_intSpinBox;
     KDoubleSpinBox *m_doubleSpinBox;
     KComboBox *m_comboBox;
-    KListBox *m_listBox;
+    TDEListBox *m_listBox;
     KTextEdit *m_textEdit;
 };
 
@@ -187,7 +187,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     slotUpdateButtons( d->m_comboBox->currentText() );
     d->m_comboBox->setFocus();
   } else {
-    d->m_listBox = new KListBox( frame );
+    d->m_listBox = new TDEListBox( frame );
     d->m_listBox->insertStringList( list );
     d->m_listBox->setSelected( current, true );
     d->m_listBox->ensureCurrentVisible();
@@ -217,7 +217,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
   d->m_label = new TQLabel( label, frame );
   layout->addWidget( d->m_label );
 
-  d->m_listBox = new KListBox( frame );
+  d->m_listBox = new TDEListBox( frame );
   d->m_listBox->insertStringList( list );
   layout->addWidget( d->m_listBox );
 
@@ -456,7 +456,7 @@ KComboBox *KInputDialog::comboBox() const
   return d->m_comboBox;
 }
 
-KListBox *KInputDialog::listBox() const
+TDEListBox *KInputDialog::listBox() const
 {
   return d->m_listBox;
 }
diff --git a/tdeui/kinputdialog.h b/tdeui/kinputdialog.h
index f7326460d..7a039ac45 100644
--- a/tdeui/kinputdialog.h
+++ b/tdeui/kinputdialog.h
@@ -79,7 +79,7 @@ class TDEUI_EXPORT KInputDialog : public KDialogBase
     KIntSpinBox *intSpinBox() const;
     KDoubleSpinBox *doubleSpinBox() const;
     KComboBox *comboBox() const;
-    KListBox *listBox() const;
+    TDEListBox *listBox() const;
     KTextEdit *textEdit() const;
 
   private slots:
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index 4c291eda4..c3a8838e9 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -33,15 +33,15 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h> // Access to some static members
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kseparator.h>
 #include <kdebug.h>
 #include "kjanuswidget.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include "kpushbutton.h"
 #include "kguiitem.h"
 
@@ -110,7 +110,7 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
       d->mListFrame = new TQWidget( d->mSplitter );
       TQVBoxLayout *dummy = new TQVBoxLayout( d->mListFrame, 0, KDialog::spacingHint() );
       dummy->setAutoAdd( true );
-      mTreeList = new KListView( d->mListFrame );
+      mTreeList = new TDEListView( d->mListFrame );
       mTreeList->addColumn( TQString::null );
       mTreeList->header()->hide();
       mTreeList->setRootIsDecorated(true);
@@ -197,7 +197,7 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
   }
 
   if ( kapp )
-    connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged()));
+    connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged()));
   mValid = true;
 
   setSwallowedWidget(0); // Set default size if 'mFace' is Swallow.
@@ -703,7 +703,7 @@ void KJanusWidget::slotFontChanged()
 {
   if( mTitleLabel )
   {
-    mTitleLabel->setFont( KGlobalSettings::generalFont() );
+    mTitleLabel->setFont( TDEGlobalSettings::generalFont() );
     TQFont titleFont( mTitleLabel->font() );
     titleFont.setBold( true );
     mTitleLabel->setFont( titleFont );
@@ -939,7 +939,7 @@ bool KJanusWidget::eventFilter( TQObject *o, TQEvent *e )
 
 KJanusWidget::IconListBox::IconListBox( TQWidget *parent, const char *name,
 					WFlags f )
-  :KListBox( parent, name, f ), mShowAll(false), mHeightValid(false),
+  :TDEListBox( parent, name, f ), mShowAll(false), mHeightValid(false),
    mWidthValid(false),
    mOldItem(0) 
 {
@@ -1008,7 +1008,7 @@ void KJanusWidget::IconListBox::setShowAll( bool showAll )
 
 void KJanusWidget::IconListBox::leaveEvent( TQEvent *ev )
 {
-  KListBox::leaveEvent( ev ); 
+  TDEListBox::leaveEvent( ev ); 
 
   if ( mOldItem && !mOldItem->isSelected() )
   {
@@ -1020,7 +1020,7 @@ void KJanusWidget::IconListBox::leaveEvent( TQEvent *ev )
 // hack because qt does not support Q_OBJECT in nested classes
 void KJanusWidget::IconListBox::slotOnItem(TQListBoxItem *qitem)
 {
-  KListBox::slotOnItem( qitem );
+  TDEListBox::slotOnItem( qitem );
 
   if ( qitem == mOldItem )
   {
diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h
index 8cc0c667c..604765029 100644
--- a/tdeui/kjanuswidget.h
+++ b/tdeui/kjanuswidget.h
@@ -24,11 +24,11 @@
 #include <tqpixmap.h>
 #include <tqsplitter.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
 
-class KListView;
+class TDEListView;
 
 class TQGrid;
 class TQHBox;
@@ -69,7 +69,7 @@ class TDEUI_EXPORT KJanusWidget : public TQWidget
   Q_OBJECT
 
   private:
-    class IconListBox : public KListBox
+    class IconListBox : public TDEListBox
     {
       friend class KJanusWidget;
 
@@ -586,7 +586,7 @@ class TDEUI_EXPORT KJanusWidget : public TQWidget
     TQStringList *mTitleList;
 
     int          mFace;
-    KListView    *mTreeList;
+    TDEListView    *mTreeList;
     IconListBox  *mIconList;
     TQWidgetStack *mPageStack;
     TQLabel       *mTitleLabel;
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index 6626a9a46..9b530b751 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -19,15 +19,15 @@
 */
 
 #include "kkeybutton.h"
-#include "kshortcutdialog.h"
+#include "tdeshortcutdialog.h"
 
 #include <tqcursor.h>
 #include <tqdrawutil.h>
 #include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
@@ -72,7 +72,7 @@ KKeyButton::KKeyButton(TQWidget *parent, const char *name)
 	setFocusPolicy( TQ_StrongFocus );
 	m_bEditing = false;
 	connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureShortcut()) );
-	setShortcut( KShortcut(), true );
+	setShortcut( TDEShortcut(), true );
 }
 
 KKeyButton::~KKeyButton ()
@@ -80,7 +80,7 @@ KKeyButton::~KKeyButton ()
 	delete d;
 }
 
-void KKeyButton::setShortcut( const KShortcut& cut, bool bQtShortcut )
+void KKeyButton::setShortcut( const TDEShortcut& cut, bool bQtShortcut )
 {
 	d->bQtShortcut = bQtShortcut;
 	m_cut = cut;
@@ -90,7 +90,7 @@ void KKeyButton::setShortcut( const KShortcut& cut, bool bQtShortcut )
 }
 
 // deprecated //
-void KKeyButton::setShortcut( const KShortcut& cut )
+void KKeyButton::setShortcut( const TDEShortcut& cut )
 {
 	setShortcut( cut, false );
 }
@@ -103,13 +103,13 @@ void KKeyButton::setText( const TQString& text )
 
 void KKeyButton::captureShortcut()
 {
-	KShortcut cut;
+	TDEShortcut cut;
 
 	m_bEditing = true;
 	repaint();
 
         {
-	KShortcutDialog dlg( m_cut, d->bQtShortcut, this );
+	TDEShortcutDialog dlg( m_cut, d->bQtShortcut, this );
 	if( dlg.exec() == KDialog::Accepted )
                 cut = dlg.shortcut();
         } // emit the signal after the dialog is destroyed, otherwise it still has grab
diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h
index 34f5f1ac9..889319884 100644
--- a/tdeui/kkeybutton.h
+++ b/tdeui/kkeybutton.h
@@ -21,7 +21,7 @@
 #define _KKEYBUTTON_H_
 
 #include <tqpushbutton.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 /**
  * @short A push button that looks like a keyboard key.
@@ -52,10 +52,10 @@ class TDEUI_EXPORT KKeyButton: public TQPushButton
 	virtual ~KKeyButton();
 
 	/** @deprecated Use setShortcut( cut, false ) instead */
-	void setShortcut( const KShortcut& cut ) KDE_DEPRECATED;
+	void setShortcut( const TDEShortcut& cut ) KDE_DEPRECATED;
 	/// @since 3.1
-	void setShortcut( const KShortcut& cut, bool bQtShortcut );
-	const KShortcut& shortcut() const
+	void setShortcut( const TDEShortcut& cut, bool bQtShortcut );
+	const TDEShortcut& shortcut() const
 		{ return m_cut; }
 
 	/**
@@ -64,7 +64,7 @@ class TDEUI_EXPORT KKeyButton: public TQPushButton
 	void setText( const TQString& text );
 
  signals:
-	void capturedShortcut( const KShortcut& );
+	void capturedShortcut( const TDEShortcut& );
 
  public slots:
 	/**
@@ -74,7 +74,7 @@ class TDEUI_EXPORT KKeyButton: public TQPushButton
 	void captureShortcut();
 
  protected:
-	KShortcut m_cut;
+	TDEShortcut m_cut;
 	bool m_bEditing;
 
 	/**
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index 0518d870c..35fe0e45f 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -35,23 +35,23 @@
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaccel.h>
-#include <kaction.h>
-#include <kaccelaction.h>
-#include <kactionshortcutlist.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdeaccelaction.h>
+#include <tdeactionshortcutlist.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kglobalaccel.h>
 #include <kiconloader.h>
-#include <klistviewsearchline.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdelistviewsearchline.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 #include <kxmlguifactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
 
 #ifdef Q_WS_X11
@@ -77,32 +77,32 @@ const int XKeyRelease = KeyRelease;
 // KKeyChooserItem
 //---------------------------------------------------------------------
 
-class KKeyChooserItem : public KListViewItem
+class KKeyChooserItem : public TDEListViewItem
 {
  public:
-	KKeyChooserItem( KListView* parent, TQListViewItem* after, KShortcutList* pList, uint iAction );
-	KKeyChooserItem( TQListViewItem* parent, TQListViewItem* after, KShortcutList* pList, uint iAction );
+	KKeyChooserItem( TDEListView* parent, TQListViewItem* after, TDEShortcutList* pList, uint iAction );
+	KKeyChooserItem( TQListViewItem* parent, TQListViewItem* after, TDEShortcutList* pList, uint iAction );
 
 	TQString actionName() const;
-	const KShortcut& shortcut() const;
+	const TDEShortcut& shortcut() const;
 	bool isConfigurable() const
 		{ return m_pList->isConfigurable( m_iAction ); }
-	const KShortcut& shortcutDefault() const
+	const TDEShortcut& shortcutDefault() const
 		{ return m_pList->shortcutDefault( m_iAction ); }
         TQString whatsThis() const
         { return m_pList->whatsThis( m_iAction ); }
 
-	void setShortcut( const KShortcut& cut );
+	void setShortcut( const TDEShortcut& cut );
 	void commitChanges();
 
 	virtual TQString text( int iCol ) const;
 	virtual int compare( TQListViewItem*, int iCol, bool bAscending ) const;
 
  protected:
-	KShortcutList* m_pList;
+	TDEShortcutList* m_pList;
 	uint m_iAction;
 	bool m_bModified;
-	KShortcut m_cut;
+	TDEShortcut m_cut;
 };
 
 // WhatsThis on KKeyChooserItems
@@ -126,16 +126,16 @@ private:
 class KKeyChooserPrivate
 {
  public:
-	TQValueList<KShortcutList*> rgpLists;
-	TQValueList<KShortcutList*> rgpListsAllocated;
+	TQValueList<TDEShortcutList*> rgpLists;
+	TQValueList<TDEShortcutList*> rgpListsAllocated;
 
-	KListView *pList;
+	TDEListView *pList;
 	TQLabel *lInfo;
 	KKeyButton *pbtnShortcut;
 	TQGroupBox *fCArea;
 	TQButtonGroup *kbGroup;
 
-	TQMap<TQString, KShortcut> mapGlobals;
+	TQMap<TQString, TDEShortcut> mapGlobals;
 
 	// If this is set, then shortcuts require a modifier:
 	//  so 'A' would not be valid, whereas 'Ctrl+A' would be.
@@ -157,35 +157,35 @@ KKeyChooser::KKeyChooser( TQWidget* parent, ActionType type, bool bAllowLetterSh
 	initGUI( type, bAllowLetterShortcuts );
 }
 
-KKeyChooser::KKeyChooser( KActionCollection* coll, TQWidget* parent, bool bAllowLetterShortcuts )
+KKeyChooser::KKeyChooser( TDEActionCollection* coll, TQWidget* parent, bool bAllowLetterShortcuts )
 : TQWidget( parent )
 {
 	initGUI( Application, bAllowLetterShortcuts );
 	insert( coll );
 }
 
-KKeyChooser::KKeyChooser( KAccel* pAccel, TQWidget* parent, bool bAllowLetterShortcuts )
+KKeyChooser::KKeyChooser( TDEAccel* pAccel, TQWidget* parent, bool bAllowLetterShortcuts )
 : TQWidget( parent )
 {
 	initGUI( Application, bAllowLetterShortcuts );
 	insert( pAccel );
 }
 
-KKeyChooser::KKeyChooser( KGlobalAccel* pAccel, TQWidget* parent )
+KKeyChooser::KKeyChooser( TDEGlobalAccel* pAccel, TQWidget* parent )
 : TQWidget( parent )
 {
 	initGUI( ApplicationGlobal, false );
 	insert( pAccel );
 }
 
-KKeyChooser::KKeyChooser( KShortcutList* pList, TQWidget* parent, ActionType type, bool bAllowLetterShortcuts )
+KKeyChooser::KKeyChooser( TDEShortcutList* pList, TQWidget* parent, ActionType type, bool bAllowLetterShortcuts )
 : TQWidget( parent )
 {
 	initGUI( type, bAllowLetterShortcuts );
 	insert( pList );
 }
 
-KKeyChooser::KKeyChooser( KAccel* actions, TQWidget* parent,
+KKeyChooser::KKeyChooser( TDEAccel* actions, TQWidget* parent,
 			bool bCheckAgainstStdKeys,
 			bool bAllowLetterShortcuts,
 			bool bAllowWinKey )
@@ -201,7 +201,7 @@ KKeyChooser::KKeyChooser( KAccel* actions, TQWidget* parent,
 	insert( actions );
 }
 
-KKeyChooser::KKeyChooser( KGlobalAccel* actions, TQWidget* parent,
+KKeyChooser::KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent,
 			bool bCheckAgainstStdKeys,
 			bool bAllowLetterShortcuts,
 			bool /*bAllowWinKey*/ )
@@ -224,46 +224,46 @@ static KStaticDeleter< TQValueList< KKeyChooser* > > allChoosersDeleter;
 KKeyChooser::~KKeyChooser()
 {
         allChoosers->remove( this );
-	// Delete allocated KShortcutLists
+	// Delete allocated TDEShortcutLists
 	for( uint i = 0; i < d->rgpListsAllocated.count(); i++ )
 		delete d->rgpListsAllocated[i];
 	delete d;
 }
 
-bool KKeyChooser::insert( KActionCollection *pColl)
+bool KKeyChooser::insert( TDEActionCollection *pColl)
 {
     return insert(pColl, TQString::null);
 }
 
-bool KKeyChooser::insert( KActionCollection* pColl, const TQString &title )
+bool KKeyChooser::insert( TDEActionCollection* pColl, const TQString &title )
 {
     TQString str = title;
     if ( title.isEmpty() && pColl->instance()
         && pColl->instance()->aboutData() )
         str = pColl->instance()->aboutData()->programName();
 
-	KShortcutList* pList = new KActionShortcutList( pColl );
+	TDEShortcutList* pList = new TDEActionShortcutList( pColl );
 	d->rgpListsAllocated.append( pList );
 	d->rgpLists.append( pList );
 	buildListView(d->rgpLists.count() - 1, str);
 	return true;
 }
 
-bool KKeyChooser::insert( KAccel* pAccel )
+bool KKeyChooser::insert( TDEAccel* pAccel )
 {
-	KShortcutList* pList = new KAccelShortcutList( pAccel );
+	TDEShortcutList* pList = new TDEAccelShortcutList( pAccel );
 	d->rgpListsAllocated.append( pList );
 	return insert( pList );
 }
 
-bool KKeyChooser::insert( KGlobalAccel* pAccel )
+bool KKeyChooser::insert( TDEGlobalAccel* pAccel )
 {
-	KShortcutList* pList = new KAccelShortcutList( pAccel );
+	TDEShortcutList* pList = new TDEAccelShortcutList( pAccel );
 	d->rgpListsAllocated.append( pList );
 	return insert( pList );
 }
 
-bool KKeyChooser::insert( KShortcutList* pList )
+bool KKeyChooser::insert( TDEShortcutList* pList )
 {
 	d->rgpLists.append( pList );
 	buildListView( d->rgpLists.count() - 1, TQString::null );
@@ -296,7 +296,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   m_type = type;
   d->bAllowLetterShortcuts = bAllowLetterShortcuts;
 
-  d->bPreferFourModifierKeys = KGlobalAccel::useFourModifierKeys();
+  d->bPreferFourModifierKeys = TDEGlobalAccel::useFourModifierKeys();
 
   //
   // TOP LAYOUT MANAGER
@@ -323,7 +323,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   searchLayout->addWidget(clearSearch);
   TQLabel* slbl = new TQLabel(i18n("&Search:"), this);
   searchLayout->addWidget(slbl);
-  KListViewSearchLine* listViewSearch = new KListViewSearchLine(this);
+  TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(this);
   searchLayout->addWidget(listViewSearch);
   slbl->setBuddy(listViewSearch);
   connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
@@ -343,7 +343,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   topLayout->addLayout( TQT_TQLAYOUT(stackLayout), 10 );
   stackLayout->setRowStretch( 1, 10 ); // Only list will stretch
 
-  d->pList = new KListView( this );
+  d->pList = new TDEListView( this );
   listViewSearch->setListView(d->pList); // Plug into search line
   TQValueList<int> columns;
   columns.append(0);
@@ -422,7 +422,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
 
   d->pbtnShortcut = new KKeyButton(d->fCArea, "key");
   d->pbtnShortcut->setEnabled( false );
-  connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), TQT_SLOT(capturedShortcut(const KShortcut&)) );
+  connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(capturedShortcut(const TDEShortcut&)) );
   grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 );
 
   wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, "
@@ -460,15 +460,15 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
 // Add all shortcuts to the list
 void KKeyChooser::buildListView( uint iList, const TQString &title )
 {
-	KShortcutList* pList = d->rgpLists[iList];
-	KActionShortcutList *pAList = dynamic_cast<KActionShortcutList*>(pList);
+	TDEShortcutList* pList = d->rgpLists[iList];
+	TDEActionShortcutList *pAList = dynamic_cast<TDEActionShortcutList*>(pList);
 
         if( m_type == Global || m_type == ApplicationGlobal )
 	    d->pList->setSorting( -1 );
-	KListViewItem *pProgramItem, *pGroupItem = 0, *pParentItem, *pItem;
+	TDEListViewItem *pProgramItem, *pGroupItem = 0, *pParentItem, *pItem;
 
 	TQString str = (title.isEmpty() ? i18n("Shortcuts") : title);
-	pParentItem = pProgramItem = pItem = new KListViewItem( d->pList, str );
+	pParentItem = pProgramItem = pItem = new TDEListViewItem( d->pList, str );
 	pParentItem->setExpandable( true );
 	pParentItem->setOpen( true );
 	pParentItem->setSelectable( false );
@@ -477,7 +477,7 @@ void KKeyChooser::buildListView( uint iList, const TQString &title )
 		TQString sName = pList->name(iAction);
 		kdDebug(125) << "Key: " << sName << endl;
 		if( sName.startsWith( "Program:" ) ) {
-			pItem = new KListViewItem( d->pList, pProgramItem, pList->label(iAction) );
+			pItem = new TDEListViewItem( d->pList, pProgramItem, pList->label(iAction) );
 			pItem->setSelectable( false );
 			pItem->setExpandable( true );
 			pItem->setOpen( true );
@@ -485,7 +485,7 @@ void KKeyChooser::buildListView( uint iList, const TQString &title )
 				delete pProgramItem;
 			pProgramItem = pParentItem = pItem;
 		} else if( sName.startsWith( "Group:" ) ) {
-			pItem = new KListViewItem( pProgramItem, pParentItem, pList->label(iAction) );
+			pItem = new TDEListViewItem( pProgramItem, pParentItem, pList->label(iAction) );
 			pItem->setSelectable( false );
 			pItem->setExpandable( true );
 			pItem->setOpen( true );
@@ -520,11 +520,11 @@ void KKeyChooser::updateButtons()
 		m_prbDef->setEnabled( false );
 		m_prbCustom->setEnabled( false );
 		d->pbtnShortcut->setEnabled( false );
-		d->pbtnShortcut->setShortcut( KShortcut(), false );
+		d->pbtnShortcut->setShortcut( TDEShortcut(), false );
 	} else {
 		bool bConfigurable = pItem->isConfigurable();
 		bool bQtShortcut = (m_type == Application || m_type == Standard);
-		const KShortcut& cutDef = pItem->shortcutDefault();
+		const TDEShortcut& cutDef = pItem->shortcutDefault();
 
 		// Set key strings
 		TQString keyStrCfg = pItem->shortcut().toString();
@@ -558,7 +558,7 @@ void KKeyChooser::slotNoKey()
 	KKeyChooserItem* pItem = dynamic_cast<KKeyChooserItem*>( d->pList->currentItem() );
 	if( pItem ) {
 		//kdDebug(125) << "no Key" << d->pList->currentItem()->text(0) << endl;
-		pItem->setShortcut( KShortcut() );
+		pItem->setShortcut( TDEShortcut() );
 		updateButtons();
 		emit keyChange();
 	}
@@ -585,17 +585,17 @@ void KKeyChooser::readGlobalKeys()
         readGlobalKeys( d->mapGlobals );
 }
 
-void KKeyChooser::readGlobalKeys( TQMap< TQString, KShortcut >& map )
+void KKeyChooser::readGlobalKeys( TQMap< TQString, TDEShortcut >& map )
 {
-	TQMap<TQString, TQString> mapEntry = KGlobal::config()->entryMap( "Global Shortcuts" );
+	TQMap<TQString, TQString> mapEntry = TDEGlobal::config()->entryMap( "Global Shortcuts" );
 	TQMap<TQString, TQString>::Iterator it( mapEntry.begin() );
 	for( uint i = 0; it != mapEntry.end(); ++it, i++ )
-		map[it.key()] = KShortcut(*it);
+		map[it.key()] = TDEShortcut(*it);
 }
 
 void KKeyChooser::slotSettingsChanged( int category )
 {
-    if( category == KApplication::SETTINGS_SHORTCUTS )
+    if( category == TDEApplication::SETTINGS_SHORTCUTS )
         readGlobalKeys(); // reread
 }
 
@@ -649,7 +649,7 @@ void KKeyChooser::setPreferFourModifierKeys( bool bPreferFourModifierKeys )
 	d->bPreferFourModifierKeys = bPreferFourModifierKeys;
 }
 
-void KKeyChooser::capturedShortcut( const KShortcut& cut )
+void KKeyChooser::capturedShortcut( const TDEShortcut& cut )
 {
 	if( cut.isNull() )
 		slotNoKey();
@@ -665,7 +665,7 @@ void KKeyChooser::listSync()
 
 	if( d->pColl ) {
 		// TODO: This is very inefficient.  Come up with something better.
-		KAccelActions aa;
+		TDEAccelActions aa;
 		d->pColl->createKeyMap( aa );
 		d->actionsNew.updateShortcuts( aa );
 	} else if( d->pActionsOrig ) {
@@ -675,12 +675,12 @@ void KKeyChooser::listSync()
 	}*/
 }
 
-void KKeyChooser::syncToConfig( const TQString& sConfigGroup, KConfigBase* pConfig, bool bClearUnset )
+void KKeyChooser::syncToConfig( const TQString& sConfigGroup, TDEConfigBase* pConfig, bool bClearUnset )
 {
 	kdDebug(125) << "KKeyChooser::syncToConfig( \"" << sConfigGroup << "\", " << pConfig << " ) start" << endl;
 	if( !pConfig )
-		pConfig = KGlobal::config();
-	KConfigGroupSaver cgs( pConfig, sConfigGroup );
+		pConfig = TDEGlobal::config();
+	TDEConfigGroupSaver cgs( pConfig, sConfigGroup );
 
 	TQListViewItemIterator it( d->pList );
 	for( ; it.current(); ++it ) {
@@ -699,7 +699,7 @@ void KKeyChooser::syncToConfig( const TQString& sConfigGroup, KConfigBase* pConf
 	kdDebug(125) << "KKeyChooser::syncToConfig() done" << endl;
 }
 
-void KKeyChooser::setShortcut( const KShortcut& cut )
+void KKeyChooser::setShortcut( const TDEShortcut& cut )
 {
 	kdDebug(125) << "KKeyChooser::setShortcut( " << cut.toString() << " )" << endl;
 	KKeyChooserItem* pItem = dynamic_cast<KKeyChooserItem*>(d->pList->currentItem());
@@ -732,7 +732,7 @@ void KKeyChooser::setShortcut( const KShortcut& cut )
 
 // Returns iSeq index if cut2 has a sequence of equal or higher priority to a sequence in cut.
 // else -1
-static int keyConflict( const KShortcut& cut, const KShortcut& cut2 )
+static int keyConflict( const TDEShortcut& cut, const TDEShortcut& cut2 )
 {
 	for( uint iSeq = 0; iSeq < cut.count(); iSeq++ ) {
 		for( uint iSeq2 = 0; iSeq2 < cut2.count(); iSeq2++ ) {
@@ -744,13 +744,13 @@ static int keyConflict( const KShortcut& cut, const KShortcut& cut2 )
 }
 
 // Removes the sequences in cut2 from cut1
-static void removeFromShortcut(  KShortcut & cut1, const KShortcut &cut2)
+static void removeFromShortcut(  TDEShortcut & cut1, const TDEShortcut &cut2)
 {
 	for( uint iSeq2 = 0; iSeq2 < cut2.count(); iSeq2++ )
 		cut1.remove(cut2.seq(iSeq2));
 }
 
-bool KKeyChooser::isKeyPresent( const KShortcut& cut, bool bWarnUser )
+bool KKeyChooser::isKeyPresent( const TDEShortcut& cut, bool bWarnUser )
 {
 	KKeyChooserItem* pItem = dynamic_cast<KKeyChooserItem*>(d->pList->currentItem());
 
@@ -796,12 +796,12 @@ bool KKeyChooser::isKeyPresent( const KShortcut& cut, bool bWarnUser )
 }
 
 // KDE4 remove
-bool KKeyChooser::isKeyPresentLocally( const KShortcut& cut, KKeyChooserItem* ignoreItem, const TQString& warnText )
+bool KKeyChooser::isKeyPresentLocally( const TDEShortcut& cut, KKeyChooserItem* ignoreItem, const TQString& warnText )
 {
     return isKeyPresentLocally( cut, ignoreItem, !warnText.isNull());
 }
 
-bool KKeyChooser::isKeyPresentLocally( const KShortcut& cut, KKeyChooserItem* ignoreItem, bool bWarnUser )
+bool KKeyChooser::isKeyPresentLocally( const TDEShortcut& cut, KKeyChooserItem* ignoreItem, bool bWarnUser )
 {
     if ( cut.toString().isEmpty())
         return false;
@@ -816,7 +816,7 @@ bool KKeyChooser::isKeyPresentLocally( const KShortcut& cut, KKeyChooserItem* ig
                                         if( !promptForReassign( cut.seq(iSeq), pItem2->text(0), Application, this ))
 				                return true;
                                         // else remove the shortcut from it
-                                        KShortcut cut2 = pItem2->shortcut();
+                                        TDEShortcut cut2 = pItem2->shortcut();
                                         removeFromShortcut(cut2, cut);
                                         pItem2->setShortcut(cut2);
                                         updateButtons();
@@ -828,35 +828,35 @@ bool KKeyChooser::isKeyPresentLocally( const KShortcut& cut, KKeyChooserItem* ig
         return false;
 }
 
-bool KKeyChooser::checkStandardShortcutsConflict( const KShortcut& cut, bool bWarnUser, TQWidget* parent )
+bool KKeyChooser::checkStandardShortcutsConflict( const TDEShortcut& cut, bool bWarnUser, TQWidget* parent )
 {
     // For each key sequence in the shortcut,
     for( uint i = 0; i < cut.count(); i++ ) {
 	const KKeySequence& seq = cut.seq(i);
-	KStdAccel::StdAccel id = KStdAccel::findStdAccel( seq );
-	if( id != KStdAccel::AccelNone
-	    && keyConflict( cut, KStdAccel::shortcut( id ) ) > -1 ) {
+	TDEStdAccel::StdAccel id = TDEStdAccel::findStdAccel( seq );
+	if( id != TDEStdAccel::AccelNone
+	    && keyConflict( cut, TDEStdAccel::shortcut( id ) ) > -1 ) {
 		if( bWarnUser ) {
-			if( !promptForReassign( seq, KStdAccel::label(id), Standard, parent ))
+			if( !promptForReassign( seq, TDEStdAccel::label(id), Standard, parent ))
                                 return true;
-                        removeStandardShortcut( KStdAccel::label(id), dynamic_cast< KKeyChooser* > ( parent ), KStdAccel::shortcut( id ), cut);
+                        removeStandardShortcut( TDEStdAccel::label(id), dynamic_cast< KKeyChooser* > ( parent ), TDEStdAccel::shortcut( id ), cut);
                 }
 	}
     }
     return false;
 }
 
-bool KKeyChooser::checkGlobalShortcutsConflict( const KShortcut& cut, bool bWarnUser, TQWidget* parent )
+bool KKeyChooser::checkGlobalShortcutsConflict( const TDEShortcut& cut, bool bWarnUser, TQWidget* parent )
 {
-    TQMap< TQString, KShortcut > map;
+    TQMap< TQString, TDEShortcut > map;
     readGlobalKeys( map );
     return checkGlobalShortcutsConflict( cut, bWarnUser, parent, map, TQString::null );
 }
 
-bool KKeyChooser::checkGlobalShortcutsConflict( const KShortcut& cut, bool bWarnUser, TQWidget* parent,
-    const TQMap< TQString, KShortcut >& map, const TQString& ignoreAction )
+bool KKeyChooser::checkGlobalShortcutsConflict( const TDEShortcut& cut, bool bWarnUser, TQWidget* parent,
+    const TQMap< TQString, TDEShortcut >& map, const TQString& ignoreAction )
 {
-    TQMap<TQString, KShortcut>::ConstIterator it;
+    TQMap<TQString, TDEShortcut>::ConstIterator it;
     for( it = map.begin(); it != map.end(); ++it ) {
 	    int iSeq = keyConflict( cut, (*it) );
 	    if( iSeq > -1 ) {
@@ -872,7 +872,7 @@ bool KKeyChooser::checkGlobalShortcutsConflict( const KShortcut& cut, bool bWarn
     return false;
 }
 
-void KKeyChooser::removeStandardShortcut( const TQString& name, KKeyChooser* chooser, const KShortcut &origCut, const KShortcut &cut )
+void KKeyChooser::removeStandardShortcut( const TQString& name, KKeyChooser* chooser, const TDEShortcut &origCut, const TDEShortcut &cut )
 {
     bool was_in_choosers = false;
     if( allChoosers != NULL ) {
@@ -885,8 +885,8 @@ void KKeyChooser::removeStandardShortcut( const TQString& name, KKeyChooser* cho
         }
     }
     if( !was_in_choosers ) { // not edited, needs to be changed in config file
-        KStdAccel::ShortcutList std_list;
-        KShortcut newCut = origCut;
+        TDEStdAccel::ShortcutList std_list;
+        TDEShortcut newCut = origCut;
         removeFromShortcut(newCut, cut);
         int index = std_list.index( name );
         if ( index >= 0 ) {
@@ -896,7 +896,7 @@ void KKeyChooser::removeStandardShortcut( const TQString& name, KKeyChooser* cho
     }
 }
 
-void KKeyChooser::removeGlobalShortcut( const TQString& name, KKeyChooser* chooser, const KShortcut &origCut, const KShortcut &cut )
+void KKeyChooser::removeGlobalShortcut( const TQString& name, KKeyChooser* chooser, const TDEShortcut &origCut, const TDEShortcut &cut )
 {
     bool was_in_choosers = false;
     if( allChoosers != NULL ) {
@@ -909,21 +909,21 @@ void KKeyChooser::removeGlobalShortcut( const TQString& name, KKeyChooser* choos
         }
     }
     if( !was_in_choosers ) { // not edited, needs to be changed in config file
-        KAccelActions actions;
-        KShortcut newCut = origCut;
+        TDEAccelActions actions;
+        TDEShortcut newCut = origCut;
         removeFromShortcut(newCut, cut);
         actions.insert( name, "", "", newCut, newCut);
 	actions.writeActions( "Global Shortcuts", 0, true, true );
     }
 }
 
-bool KKeyChooser::removeShortcut( const TQString& name, const KShortcut &cut )
+bool KKeyChooser::removeShortcut( const TQString& name, const TDEShortcut &cut )
 {
 	for( TQListViewItemIterator it( d->pList ); it.current(); ++it ) {
 		KKeyChooserItem* pItem2 = dynamic_cast<KKeyChooserItem*>(it.current());
                     if( pItem2 && pItem2->actionName() == name ) {
                         // remove the shortcut from it
-                        KShortcut cut2 = pItem2->shortcut();
+                        TDEShortcut cut2 = pItem2->shortcut();
                         removeFromShortcut(cut2, cut);
                         pItem2->setShortcut(cut2);
                         updateButtons();
@@ -978,8 +978,8 @@ bool KKeyChooser::promptForReassign( const KKeySequence& cut, const TQString& sA
 }
 
 //---------------------------------------------------
-KKeyChooserItem::KKeyChooserItem( KListView* parent, TQListViewItem* after, KShortcutList* pList, uint iAction )
-:	KListViewItem( parent, after )
+KKeyChooserItem::KKeyChooserItem( TDEListView* parent, TQListViewItem* after, TDEShortcutList* pList, uint iAction )
+:	TDEListViewItem( parent, after )
 {
 	m_pList = pList;
 	m_iAction = iAction;
@@ -987,8 +987,8 @@ KKeyChooserItem::KKeyChooserItem( KListView* parent, TQListViewItem* after, KSho
 	m_cut = m_pList->shortcut(m_iAction);
 }
 
-KKeyChooserItem::KKeyChooserItem( TQListViewItem* parent, TQListViewItem* after, KShortcutList* pList, uint iAction )
-:	KListViewItem( parent, after )
+KKeyChooserItem::KKeyChooserItem( TQListViewItem* parent, TQListViewItem* after, TDEShortcutList* pList, uint iAction )
+:	TDEListViewItem( parent, after )
 {
 	m_pList = pList;
 	m_iAction = iAction;
@@ -1001,12 +1001,12 @@ TQString KKeyChooserItem::actionName() const
 	return m_pList->name(m_iAction);
 }
 
-const KShortcut& KKeyChooserItem::shortcut() const
+const TDEShortcut& KKeyChooserItem::shortcut() const
 {
 	return m_cut;
 }
 
-void KKeyChooserItem::setShortcut( const KShortcut& cut )
+void KKeyChooserItem::setShortcut( const TDEShortcut& cut )
 {
 	m_cut = cut;
 	m_bModified = (m_cut != m_pList->shortcut(m_iAction));
@@ -1094,7 +1094,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts
 	setMainWidget( m_pKeyChooser );
 	connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) );
 
-	KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" );
+	TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" );
 	TQSize sz = size();
 	resize( group.readSizeEntry( "Dialog Size", &sz ) );
 }
@@ -1106,23 +1106,23 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char
 	setMainWidget( m_pKeyChooser );
 	connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) );
 
-	KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" );
+	TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" );
 	TQSize sz = size();
 	resize( group.readSizeEntry( "Dialog Size", &sz ) );
 }
 
 KKeyDialog::~KKeyDialog()
 {
-	KConfigGroup group( KGlobal::config(), "KKeyDialog Settings" );
+	TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" );
 	group.writeEntry( "Dialog Size", size(), true, true );
 }
 
-bool KKeyDialog::insert( KActionCollection* pColl )
+bool KKeyDialog::insert( TDEActionCollection* pColl )
 {
 	return m_pKeyChooser->insert( pColl );
 }
 
-bool KKeyDialog::insert(KActionCollection *pColl, const TQString &title)
+bool KKeyDialog::insert(TDEActionCollection *pColl, const TQString &title)
 {
     return m_pKeyChooser->insert(pColl, title);
 }
@@ -1144,22 +1144,22 @@ void KKeyDialog::commitChanges()
 	m_pKeyChooser->commitChanges();
 }
 
-int KKeyDialog::configure( KActionCollection* coll, TQWidget* parent, bool bSaveSettings )
+int KKeyDialog::configure( TDEActionCollection* coll, TQWidget* parent, bool bSaveSettings )
 {
 	return configure( coll, true, parent, bSaveSettings);
 }
 
-int KKeyDialog::configure( KAccel* keys, TQWidget* parent, bool bSaveSettings )
+int KKeyDialog::configure( TDEAccel* keys, TQWidget* parent, bool bSaveSettings )
 {
 	return configure( keys, true, parent, bSaveSettings);
 }
 
-int KKeyDialog::configure( KGlobalAccel* keys, TQWidget* parent, bool bSaveSettings )
+int KKeyDialog::configure( TDEGlobalAccel* keys, TQWidget* parent, bool bSaveSettings )
 {
 	return configure( keys, true, parent, bSaveSettings);
 }
 
-int KKeyDialog::configure( KAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings )
+int KKeyDialog::configure( TDEAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings )
 {
 	KKeyDialog dlg( bAllowLetterShortcuts, parent );
 	dlg.m_pKeyChooser->insert( keys );
@@ -1169,7 +1169,7 @@ int KKeyDialog::configure( KAccel* keys, bool bAllowLetterShortcuts, TQWidget *p
 	return b;
 }
 
-int KKeyDialog::configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings )
+int KKeyDialog::configure( TDEGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings )
 {
 	KKeyDialog dlg( KKeyChooser::ApplicationGlobal, bAllowLetterShortcuts, parent );
 	dlg.m_pKeyChooser->insert( keys );
@@ -1179,18 +1179,18 @@ int KKeyDialog::configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWid
 	return b;
 }
 
-int KKeyDialog::configure( KActionCollection* coll, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings )
+int KKeyDialog::configure( TDEActionCollection* coll, bool bAllowLetterShortcuts, TQWidget *parent, bool bSaveSettings )
 {
-	kdDebug(125) << "KKeyDialog::configureKeys( KActionCollection*, " << bSaveSettings << " )" << endl;
+	kdDebug(125) << "KKeyDialog::configureKeys( TDEActionCollection*, " << bSaveSettings << " )" << endl;
 	KKeyDialog dlg( bAllowLetterShortcuts, parent );
 	dlg.m_pKeyChooser->insert( coll );
 	return dlg.configure( bSaveSettings );
 }
 
-/*int KKeyDialog::configure( KActionPtrList* coll, const TQString& file, TQWidget *parent, bool bSaveSettings )
+/*int KKeyDialog::configure( TDEActionPtrList* coll, const TQString& file, TQWidget *parent, bool bSaveSettings )
 {
-	kdDebug(125) << "KKeyDialog::configureKeys( KActionCollection*, " << file << ", " << bSaveSettings << " )" << endl;
-	KAccelActions actions;
+	kdDebug(125) << "KKeyDialog::configureKeys( TDEActionCollection*, " << file << ", " << bSaveSettings << " )" << endl;
+	TDEAccelActions actions;
 	coll->createKeyMap( actions );
 
 	int retcode = configure( actions, file, parent, bSaveSettings );
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index 4df3e2ecd..af395682e 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -23,7 +23,7 @@
 
 #include <tqdict.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQButtonGroup;
 class TQCheckBox;
@@ -31,21 +31,21 @@ class TQGroupBox;
 class TQLabel;
 class TQLineEdit;
 class TQRadioButton;
-class KAccel;
-class KAccelActions;
-class KActionCollection;
-class KConfigBase;
-class KGlobalAccel;
+class TDEAccel;
+class TDEAccelActions;
+class TDEActionCollection;
+class TDEConfigBase;
+class TDEGlobalAccel;
 class KKeySequence;
-class KShortcut;
-class KShortcutList;
+class TDEShortcut;
+class TDEShortcutList;
 class KKeyChooserItem;
 
 /**
- * @short Widget for configuration of KAccel and KGlobalAccel.
+ * @short Widget for configuration of TDEAccel and TDEGlobalAccel.
  *
- * Configure dictionaries of key/action associations for KAccel and
- * KGlobalAccel.
+ * Configure dictionaries of key/action associations for TDEAccel and
+ * TDEGlobalAccel.
  *
  * The class takes care of all aspects of configuration, including
  * handling key conflicts internally. Connect to the allDefault()
@@ -73,15 +73,15 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
 	/**
 	 * \overload
 	 * @param parent parent widget
-	 * @param coll the KActionCollection to configure
+	 * @param coll the TDEActionCollection to configure
 	 * @param bAllowLetterShortcuts Set to false if unmodified alphanumeric
      *  keys ('A', '1', etc.) are not permissible shortcuts.
      */
-	KKeyChooser( KActionCollection* coll, TQWidget* parent, bool bAllowLetterShortcuts = true );
+	KKeyChooser( TDEActionCollection* coll, TQWidget* parent, bool bAllowLetterShortcuts = true );
 
-    KKeyChooser( KAccel* actions, TQWidget* parent, bool bAllowLetterShortcuts = true );
-	KKeyChooser( KGlobalAccel* actions, TQWidget* parent );
-	KKeyChooser( KShortcutList*, TQWidget* parent, ActionType type = Application, bool bAllowLetterShortcuts = true );
+    KKeyChooser( TDEAccel* actions, TQWidget* parent, bool bAllowLetterShortcuts = true );
+	KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent );
+	KKeyChooser( TDEShortcutList*, TQWidget* parent, ActionType type = Application, bool bAllowLetterShortcuts = true );
 
 	virtual ~KKeyChooser();
 
@@ -89,16 +89,16 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
 	 * Insert an action collection, i.e. add all its actions to the ones
 	 * already associated with the KKeyChooser object.
 	 */
-	bool insert( KActionCollection* ); // #### KDE4 : remove me
+	bool insert( TDEActionCollection* ); // #### KDE4 : remove me
     /**
 	 * Insert an action collection, i.e. add all its actions to the ones
 	 * already associated with the KKeyChooser object.
 	 * @param title subtree title of this collection of shortcut.
 	 * @since 3.1
 	 */
-    bool insert( KActionCollection *, const TQString &title);
+    bool insert( TDEActionCollection *, const TQString &title);
 
-	void syncToConfig( const TQString& sConfigGroup, KConfigBase* pConfig, bool bClearUnset );
+	void syncToConfig( const TQString& sConfigGroup, TDEConfigBase* pConfig, bool bClearUnset );
 
 	/**
 	 * This function writes any shortcut changes back to the original
@@ -108,7 +108,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
 
 	/**
 	 * This commits and then saves the actions to disk.
-	 * Any KActionCollection objects with the xmlFile() value set
+	 * Any TDEActionCollection objects with the xmlFile() value set
 	 * will be written to an XML file.  All other will be written
 	 * to the application's rc file.
 	 */
@@ -127,7 +127,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
          *
          * @since 3.2
          */
-        static bool checkGlobalShortcutsConflict( const KShortcut& cut, bool warnUser, TQWidget* parent );
+        static bool checkGlobalShortcutsConflict( const TDEShortcut& cut, bool warnUser, TQWidget* parent );
 
         /**
          * Checks whether the given shortcut conflicts with standard keyboard shortcuts.
@@ -142,7 +142,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
          *
          * @since 3.2
          */
-        static bool checkStandardShortcutsConflict( const KShortcut& cut, bool warnUser, TQWidget* parent );
+        static bool checkStandardShortcutsConflict( const TDEShortcut& cut, bool warnUser, TQWidget* parent );
 
  signals:
 	/**
@@ -168,9 +168,9 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
 	enum { NoKey = 1, DefaultKey, CustomKey };
 
 	void initGUI( ActionType type, bool bAllowLetterShortcuts );
-	bool insert( KAccel* );
-	bool insert( KGlobalAccel* );
-	bool insert( KShortcutList* );
+	bool insert( TDEAccel* );
+	bool insert( TDEGlobalAccel* );
+	bool insert( TDEShortcutList* );
 	/// @since 3.1
 	void buildListView( uint iList, const TQString &title = TQString::null );
 
@@ -178,9 +178,9 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
 
 	void updateButtons();
 	void fontChange( const TQFont& _font );
-	void setShortcut( const KShortcut& cut );
-	bool isKeyPresent( const KShortcut& cut, bool warnuser = true );
-        bool isKeyPresentLocally( const KShortcut& cut, KKeyChooserItem* ignoreItem, const TQString& warnText );
+	void setShortcut( const TDEShortcut& cut );
+	bool isKeyPresent( const TDEShortcut& cut, bool warnuser = true );
+        bool isKeyPresentLocally( const TDEShortcut& cut, KKeyChooserItem* ignoreItem, const TQString& warnText );
 	void _warning( const KKeySequence& seq, TQString sAction, TQString sTitle );
 
  protected slots:
@@ -188,7 +188,7 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
 	void slotDefaultKey();
 	void slotCustomKey();
 	void slotListItemSelected( TQListViewItem *item );
-	void capturedShortcut( const KShortcut& cut );
+	void capturedShortcut( const TDEShortcut& cut );
         void slotSettingsChanged( int );
         void slotListItemDoubleClicked ( TQListViewItem * ipoQListViewItem, const TQPoint & ipoQPoint, int c );
 
@@ -205,19 +205,19 @@ class TDEUI_EXPORT KKeyChooser : public TQWidget
 	TQRadioButton* m_prbCustom;
 
  private:
-        bool isKeyPresentLocally( const KShortcut& cut, KKeyChooserItem* ignoreItem, bool bWarnUser );
+        bool isKeyPresentLocally( const TDEShortcut& cut, KKeyChooserItem* ignoreItem, bool bWarnUser );
         static bool promptForReassign( const KKeySequence& cut, const TQString& sAction, ActionType action, TQWidget* parent );
         // Remove the key sequences contained in cut from the standard shortcut @p name
         // which currently has @p origCut as shortcut.
-        static void removeStandardShortcut( const TQString& name, KKeyChooser* chooser, const KShortcut &origCut, const KShortcut &cut );
+        static void removeStandardShortcut( const TQString& name, KKeyChooser* chooser, const TDEShortcut &origCut, const TDEShortcut &cut );
         // Remove the key sequences contained in cut from the global shortcut @p name
         // which currently has @p origCut as shortcut.
-        static void removeGlobalShortcut( const TQString& name, KKeyChooser* chooser, const KShortcut &origCut, const KShortcut &cut );
-        static void readGlobalKeys( TQMap< TQString, KShortcut >& map );
-        static bool checkGlobalShortcutsConflict( const KShortcut& cut, bool bWarnUser, TQWidget* parent,
-            const TQMap< TQString, KShortcut >& map, const TQString& ignoreAction );
+        static void removeGlobalShortcut( const TQString& name, KKeyChooser* chooser, const TDEShortcut &origCut, const TDEShortcut &cut );
+        static void readGlobalKeys( TQMap< TQString, TDEShortcut >& map );
+        static bool checkGlobalShortcutsConflict( const TDEShortcut& cut, bool bWarnUser, TQWidget* parent,
+            const TQMap< TQString, TDEShortcut >& map, const TQString& ignoreAction );
         // Remove the key sequences contained in cut from this item
-        bool removeShortcut( const TQString& name, const KShortcut &cut );
+        bool removeShortcut( const TQString& name, const TDEShortcut &cut );
 
 private slots:
         void captureCurrentItem();
@@ -227,14 +227,14 @@ private slots:
 	/**
 	 * @obsolete
 	 */
-	KKeyChooser( KAccel* actions, TQWidget* parent,
+	KKeyChooser( TDEAccel* actions, TQWidget* parent,
 			bool bCheckAgainstStdKeys,
 			bool bAllowLetterShortcuts,
 			bool bAllowWinKey = false );
 	/**
 	 * @obsolete
 	 */
-	KKeyChooser( KGlobalAccel* actions, TQWidget* parent,
+	KKeyChooser( TDEGlobalAccel* actions, TQWidget* parent,
 			bool bCheckAgainstStdKeys,
 			bool bAllowLetterShortcuts,
 			bool bAllowWinKey = false );
@@ -256,14 +256,14 @@ private slots:
 typedef KKeyChooser KKeyChooser;
 
 /**
- * @short Dialog for configuration of KActionCollection, KAccel, and KGlobalAccel.
+ * @short Dialog for configuration of TDEActionCollection, TDEAccel, and TDEGlobalAccel.
  *
  * The KKeyDialog class is used for configuring dictionaries of key/action
- * associations for KActionCollection, KAccel, and KGlobalAccel. It uses the KKeyChooser widget
+ * associations for TDEActionCollection, TDEAccel, and TDEGlobalAccel. It uses the KKeyChooser widget
  * and offers buttons to set all keys to defaults and invoke on-line help.
  *
  * Several static methods are supplied which provide the most convenient interface
- * to the dialog. The most common and most encouraged use is with KActionCollection.
+ * to the dialog. The most common and most encouraged use is with TDEActionCollection.
  *
  * \code
  * KKeyDialog::configure( actionCollection() );
@@ -296,7 +296,7 @@ public:
 	 * Simply call insert with the action collections of each one in turn.
 	 * @return true :)
 	 */
-	bool insert( KActionCollection* ); // #### KDE4: remove me
+	bool insert( TDEActionCollection* ); // #### KDE4: remove me
 
         /**
          * Insert an action collection, i.e. add all its actions to the ones
@@ -306,11 +306,11 @@ public:
 	 * Simply call insert with the action collections of each one in turn.
          *
          * @param title the title associated with the collection (if null, the
-         * KAboutData::progName() of the collection's instance is used)
+         * TDEAboutData::progName() of the collection's instance is used)
          * @return true :)
 	 * @since 3.1
 	 */
-        bool insert(KActionCollection *, const TQString &title);
+        bool insert(TDEActionCollection *, const TQString &title);
 
 	/**
 	 * Run the dialog and call commitChanges() if @p bSaveSettings
@@ -332,64 +332,64 @@ public:
 	 * the *uirc file which they were intially read from.
 	 * @return Accept if the dialog was closed with OK, Reject otherwise.
 	 */
-	static int configure( KActionCollection* coll, TQWidget* parent = 0, bool bSaveSettings = true );
+	static int configure( TDEActionCollection* coll, TQWidget* parent = 0, bool bSaveSettings = true );
 
 	/**
 	 * This is an overloaded member function, provided for convenience.
 	 * It behaves essentially like the above function, except that settings
-	 * are saved to a *.rc file using KConfig.
+	 * are saved to a *.rc file using TDEConfig.
 	 */
-	static int configure( KAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true );
+	static int configure( TDEAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true );
 
 	/**
 	 * This is an overloaded member function, provided for convenience.
 	 * It behaves essentially like the above function.
 	 */
-	static int configure( KGlobalAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true );
+	static int configure( TDEGlobalAccel* keys, TQWidget* parent = 0, bool bSaveSettings = true );
 
 
 	/**
 	 * This is an overloaded member function, provided for convenience.
 	 * It behaves essentially like the above function.
 	 *
-	 * @param coll the KActionCollection to configure
+	 * @param coll the TDEActionCollection to configure
 	 * @param bAllowLetterShortcuts Set to false if unmodified alphanumeric
 	 *  keys ('A', '1', etc.) are not permissible shortcuts.
 	 * @param parent the parent widget to attach to
 	 * @param bSaveSettings if true, the settings will also be saved back to
 	 * the *uirc file which they were intially read from.
 	 */
-	static int configure( KActionCollection* coll, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true
+	static int configure( TDEActionCollection* coll, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true
 
 	/**
 	 * This is an overloaded member function, provided for convenience.
 	 * It behaves essentially like the above function.
 	 **/
-	static int configure( KAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true
+	static int configure( TDEAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true
 
 	/**
 	 * This is an overloaded member function, provided for convenience.
 	 * It behaves essentially like the above function.
 	 **/
-	static int configure( KGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true
+	static int configure( TDEGlobalAccel* keys, bool bAllowLetterShortcuts, TQWidget* parent = 0, bool bSaveSettings = true ); // BCI: merge with bAllowLetterShortcuts = true
 
 	/**
 	 * @deprecated Obsolete.
 	 * Please use KKeyDialog::configure instead
 	 */
-	static KDE_DEPRECATED int configureKeys( KAccel* keys, bool save_settings = true, TQWidget* parent = 0 )
+	static KDE_DEPRECATED int configureKeys( TDEAccel* keys, bool save_settings = true, TQWidget* parent = 0 )
 		{ return configure( keys, parent, save_settings ); }
 	/**
 	 * @deprecated Obsolete.
 	 * Please use KKeyDialog::configure instead
 	 */
-	static KDE_DEPRECATED int configureKeys( KGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 )
+	static KDE_DEPRECATED int configureKeys( TDEGlobalAccel* keys, bool save_settings = true, TQWidget* parent = 0 )
 		{ return configure( keys, parent, save_settings ); }
 	/**
 	 * @deprecated Obsolete.
 	 * Please use KKeyDialog::configure instead
 	 */
-	static KDE_DEPRECATED int configureKeys( KActionCollection* coll, const TQString& /*xmlfile*/,
+	static KDE_DEPRECATED int configureKeys( TDEActionCollection* coll, const TQString& /*xmlfile*/,
 		bool save_settings = true, TQWidget* parent = 0 )
 		{ return configure( coll, parent, save_settings ); }
 
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index dc245cd6f..6b29ac0ca 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -30,7 +30,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <tqcolor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include "kled.h"
 
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index bc667aaf0..588746ec1 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -29,18 +29,18 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 #include <kcursor.h>
-#include <klocale.h>
-#include <kstdaccel.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdestdaccel.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "klineedit.h"
 #include "klineedit.moc"
@@ -62,7 +62,7 @@ public:
 
         if ( !initialized )
         {
-            KConfigGroup config( KGlobal::config(), "General" );
+            TDEConfigGroup config( TDEGlobal::config(), "General" );
             backspacePerformsCompletion = config.readBoolEntry( "Backspace performs completion", false );
 
             initialized = true;
@@ -93,7 +93,7 @@ public:
     int squeezedStart;
     BackgroundMode bgMode;
     TQString squeezedText;
-    KCompletionBox *completionBox;
+    TDECompletionBox *completionBox;
 
     TQString clickMessage;
     bool drawClickMsg:1;
@@ -132,10 +132,10 @@ void KLineEdit::init()
     KCursor::setAutoHideCursor( this, true, true );
     installEventFilter( this );
 
-    KGlobalSettings::Completion mode = completionMode();
-    d->autoSuggest = (mode == KGlobalSettings::CompletionMan ||
-                      mode == KGlobalSettings::CompletionPopupAuto ||
-                      mode == KGlobalSettings::CompletionAuto);
+    TDEGlobalSettings::Completion mode = completionMode();
+    d->autoSuggest = (mode == TDEGlobalSettings::CompletionMan ||
+                      mode == TDEGlobalSettings::CompletionPopupAuto ||
+                      mode == TDEGlobalSettings::CompletionAuto);
     connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotRestoreSelectionColors()));
 
     TQPalette p = palette();
@@ -147,31 +147,31 @@ void KLineEdit::init()
     d->drawClickMsg = false;
 }
 
-void KLineEdit::setCompletionMode( KGlobalSettings::Completion mode )
+void KLineEdit::setCompletionMode( TDEGlobalSettings::Completion mode )
 {
-    KGlobalSettings::Completion oldMode = completionMode();
+    TDEGlobalSettings::Completion oldMode = completionMode();
 
-    if ( oldMode != mode && (oldMode == KGlobalSettings::CompletionPopup ||
-         oldMode == KGlobalSettings::CompletionPopupAuto ) &&
+    if ( oldMode != mode && (oldMode == TDEGlobalSettings::CompletionPopup ||
+         oldMode == TDEGlobalSettings::CompletionPopupAuto ) &&
          d->completionBox && d->completionBox->isVisible() )
       d->completionBox->hide();
 
     // If the widgets echo mode is not Normal, no completion
     // feature will be enabled even if one is requested.
     if ( echoMode() != TQLineEdit::Normal )
-        mode = KGlobalSettings::CompletionNone; // Override the request.
+        mode = TDEGlobalSettings::CompletionNone; // Override the request.
 
     if ( kapp && !kapp->authorize("lineedit_text_completion") )
-        mode = KGlobalSettings::CompletionNone;
+        mode = TDEGlobalSettings::CompletionNone;
 
-    if ( mode == KGlobalSettings::CompletionPopupAuto ||
-         mode == KGlobalSettings::CompletionAuto ||
-         mode == KGlobalSettings::CompletionMan )
+    if ( mode == TDEGlobalSettings::CompletionPopupAuto ||
+         mode == TDEGlobalSettings::CompletionAuto ||
+         mode == TDEGlobalSettings::CompletionMan )
         d->autoSuggest = true;
     else
         d->autoSuggest = false;
 
-    KCompletionBase::setCompletionMode( mode );
+    TDECompletionBase::setCompletionMode( mode );
 }
 
 void KLineEdit::setCompletedText( const TQString& t, bool marked )
@@ -194,24 +194,24 @@ void KLineEdit::setCompletedText( const TQString& t, bool marked )
 
 void KLineEdit::setCompletedText( const TQString& text )
 {
-    KGlobalSettings::Completion mode = completionMode();
-    bool marked = ( mode == KGlobalSettings::CompletionAuto ||
-                    mode == KGlobalSettings::CompletionMan ||
-                    mode == KGlobalSettings::CompletionPopup ||
-                    mode == KGlobalSettings::CompletionPopupAuto );
+    TDEGlobalSettings::Completion mode = completionMode();
+    bool marked = ( mode == TDEGlobalSettings::CompletionAuto ||
+                    mode == TDEGlobalSettings::CompletionMan ||
+                    mode == TDEGlobalSettings::CompletionPopup ||
+                    mode == TDEGlobalSettings::CompletionPopupAuto );
     setCompletedText( text, marked );
 }
 
-void KLineEdit::rotateText( KCompletionBase::KeyBindingType type )
+void KLineEdit::rotateText( TDECompletionBase::KeyBindingType type )
 {
-    KCompletion* comp = compObj();
+    TDECompletion* comp = compObj();
     if ( comp &&
-       (type == KCompletionBase::PrevCompletionMatch ||
-        type == KCompletionBase::NextCompletionMatch ) )
+       (type == TDECompletionBase::PrevCompletionMatch ||
+        type == TDECompletionBase::NextCompletionMatch ) )
     {
        TQString input;
 
-       if (type == KCompletionBase::PrevCompletionMatch)
+       if (type == TDECompletionBase::PrevCompletionMatch)
           comp->previousMatch();
        else
           comp->nextMatch();
@@ -225,16 +225,16 @@ void KLineEdit::rotateText( KCompletionBase::KeyBindingType type )
 
 void KLineEdit::makeCompletion( const TQString& text )
 {
-    KCompletion *comp = compObj();
-    KGlobalSettings::Completion mode = completionMode();
+    TDECompletion *comp = compObj();
+    TDEGlobalSettings::Completion mode = completionMode();
 
-    if ( !comp || mode == KGlobalSettings::CompletionNone )
+    if ( !comp || mode == TDEGlobalSettings::CompletionNone )
         return;  // No completion object...
 
     TQString match = comp->makeCompletion( text );
 
-    if ( mode == KGlobalSettings::CompletionPopup ||
-         mode == KGlobalSettings::CompletionPopupAuto )
+    if ( mode == TDEGlobalSettings::CompletionPopup ||
+         mode == TDEGlobalSettings::CompletionPopupAuto )
     {
         if ( match.isNull() )
         {
@@ -254,7 +254,7 @@ void KLineEdit::makeCompletion( const TQString& text )
         if ( match.isNull() || match == text )
             return;
 
-        if ( mode != KGlobalSettings::CompletionShell )
+        if ( mode != TDEGlobalSettings::CompletionShell )
             setUserSelection(false);
 
         if ( d->autoSuggest )
@@ -441,17 +441,17 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
 {
     KKey key( e );
 
-    if ( KStdAccel::copy().contains( key ) )
+    if ( TDEStdAccel::copy().contains( key ) )
     {
         copy();
         return;
     }
-    else if ( KStdAccel::paste().contains( key ) )
+    else if ( TDEStdAccel::paste().contains( key ) )
     {
         paste();
         return;
     }
-    else if ( KStdAccel::pasteSelection().contains( key ) )
+    else if ( TDEStdAccel::pasteSelection().contains( key ) )
     {
         TQString text = TQApplication::clipboard()->text( TQClipboard::Selection);
         insert( text );
@@ -459,22 +459,22 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         return;
     }
 
-    else if ( KStdAccel::cut().contains( key ) )
+    else if ( TDEStdAccel::cut().contains( key ) )
     {
         cut();
         return;
     }
-    else if ( KStdAccel::undo().contains( key ) )
+    else if ( TDEStdAccel::undo().contains( key ) )
     {
         undo();
         return;
     }
-    else if ( KStdAccel::redo().contains( key ) )
+    else if ( TDEStdAccel::redo().contains( key ) )
     {
         redo();
         return;
     }
-    else if ( KStdAccel::deleteWordBack().contains( key ) )
+    else if ( TDEStdAccel::deleteWordBack().contains( key ) )
     {
         cursorWordBackward(true);
         if ( hasSelectedText() )
@@ -483,7 +483,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         e->accept();
         return;
     }
-    else if ( KStdAccel::deleteWordForward().contains( key ) )
+    else if ( TDEStdAccel::deleteWordForward().contains( key ) )
     {
         // Workaround for QT bug where
         cursorWordForward(true);
@@ -493,25 +493,25 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         e->accept();
         return;
     }
-    else if ( KStdAccel::backwardWord().contains( key ) )
+    else if ( TDEStdAccel::backwardWord().contains( key ) )
     {
       cursorWordBackward(false);
       e->accept();
       return;
     }
-    else if ( KStdAccel::forwardWord().contains( key ) )
+    else if ( TDEStdAccel::forwardWord().contains( key ) )
     {
       cursorWordForward(false);
       e->accept();
       return;
     }
-    else if ( KStdAccel::beginningOfLine().contains( key ) )
+    else if ( TDEStdAccel::beginningOfLine().contains( key ) )
     {
       home(false);
       e->accept();
       return;
     }
-    else if ( KStdAccel::endOfLine().contains( key ) )
+    else if ( TDEStdAccel::endOfLine().contains( key ) )
     {
       end(false);
       e->accept();
@@ -522,17 +522,17 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
     // Filter key-events if EchoMode is normal and
     // completion mode is not set to CompletionNone
     if ( echoMode() == TQLineEdit::Normal &&
-         completionMode() != KGlobalSettings::CompletionNone )
+         completionMode() != TDEGlobalSettings::CompletionNone )
     {
         KeyBindingMap keys = getKeyBindings();
-        KGlobalSettings::Completion mode = completionMode();
+        TDEGlobalSettings::Completion mode = completionMode();
         bool noModifier = (e->state() == Qt::NoButton ||
                            e->state() == TQt::ShiftButton ||
                            e->state() == TQt::Keypad);
 
-        if ( (mode == KGlobalSettings::CompletionAuto ||
-              mode == KGlobalSettings::CompletionPopupAuto ||
-              mode == KGlobalSettings::CompletionMan) && noModifier )
+        if ( (mode == TDEGlobalSettings::CompletionAuto ||
+              mode == TDEGlobalSettings::CompletionPopupAuto ||
+              mode == TDEGlobalSettings::CompletionMan) && noModifier )
         {
             if ( !d->userSelection && hasSelectedText() &&
                  ( e->key() == Key_Right || e->key() == Key_Left ) &&
@@ -571,8 +571,8 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
 
         }
 
-        if ( (mode == KGlobalSettings::CompletionAuto ||
-              mode == KGlobalSettings::CompletionMan) && noModifier )
+        if ( (mode == TDEGlobalSettings::CompletionAuto ||
+              mode == TDEGlobalSettings::CompletionMan) && noModifier )
         {
             TQString keycode = e->text();
             if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() ||
@@ -639,8 +639,8 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
 
         }
 
-        else if (( mode == KGlobalSettings::CompletionPopup ||
-                   mode == KGlobalSettings::CompletionPopupAuto ) &&
+        else if (( mode == TDEGlobalSettings::CompletionPopup ||
+                   mode == TDEGlobalSettings::CompletionPopupAuto ) &&
                    noModifier && !e->text().isEmpty() )
         {
             TQString old_txt = text();
@@ -709,7 +709,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
                 }
 
                 if ( (e->key() == Key_Backspace || e->key() == Key_Delete ) &&
-                    mode == KGlobalSettings::CompletionPopupAuto )
+                    mode == TDEGlobalSettings::CompletionPopupAuto )
                   d->autoSuggest=true;
 
                 e->accept();
@@ -720,12 +720,12 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             return;
         }
 
-        else if ( mode == KGlobalSettings::CompletionShell )
+        else if ( mode == TDEGlobalSettings::CompletionShell )
         {
             // Handles completion.
-            KShortcut cut;
+            TDEShortcut cut;
             if ( keys[TextCompletion].isNull() )
-                cut = KStdAccel::shortcut(KStdAccel::TextCompletion);
+                cut = TDEStdAccel::shortcut(TDEStdAccel::TextCompletion);
             else
                 cut = keys[TextCompletion];
 
@@ -749,36 +749,36 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         }
 
         // handle rotation
-        if ( mode != KGlobalSettings::CompletionNone )
+        if ( mode != TDEGlobalSettings::CompletionNone )
         {
             // Handles previous match
-            KShortcut cut;
+            TDEShortcut cut;
             if ( keys[PrevCompletionMatch].isNull() )
-                cut = KStdAccel::shortcut(KStdAccel::PrevCompletion);
+                cut = TDEStdAccel::shortcut(TDEStdAccel::PrevCompletion);
             else
                 cut = keys[PrevCompletionMatch];
 
             if ( cut.contains( key ) )
             {
                 if ( emitSignals() )
-                    emit textRotation( KCompletionBase::PrevCompletionMatch );
+                    emit textRotation( TDECompletionBase::PrevCompletionMatch );
                 if ( handleSignals() )
-                    rotateText( KCompletionBase::PrevCompletionMatch );
+                    rotateText( TDECompletionBase::PrevCompletionMatch );
                 return;
             }
 
             // Handles next match
             if ( keys[NextCompletionMatch].isNull() )
-                cut = KStdAccel::shortcut(KStdAccel::NextCompletion);
+                cut = TDEStdAccel::shortcut(TDEStdAccel::NextCompletion);
             else
                 cut = keys[NextCompletionMatch];
 
             if ( cut.contains( key ) )
             {
                 if ( emitSignals() )
-                    emit textRotation( KCompletionBase::NextCompletionMatch );
+                    emit textRotation( TDECompletionBase::NextCompletionMatch );
                 if ( handleSignals() )
-                    rotateText( KCompletionBase::NextCompletionMatch );
+                    rotateText( TDECompletionBase::NextCompletionMatch );
                 return;
             }
         }
@@ -786,9 +786,9 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         // substring completion
         if ( compObj() )
         {
-            KShortcut cut;
+            TDEShortcut cut;
             if ( keys[SubstringCompletion].isNull() )
-                cut = KStdAccel::shortcut(KStdAccel::SubstringCompletion);
+                cut = TDEStdAccel::shortcut(TDEStdAccel::SubstringCompletion);
             else
                 cut = keys[SubstringCompletion];
 
@@ -893,22 +893,22 @@ TQPopupMenu *KLineEdit::createPopupMenu()
         subMenu->insertItem( i18n("Short Automatic"), ShortAutoCompletion );
         subMenu->insertItem( i18n("Dropdown List && Automatic"), PopupAutoCompletion );
 
-        subMenu->setAccel( KStdAccel::completion(), ShellCompletion );
+        subMenu->setAccel( TDEStdAccel::completion(), ShellCompletion );
 
-        KGlobalSettings::Completion mode = completionMode();
+        TDEGlobalSettings::Completion mode = completionMode();
         subMenu->setItemChecked( NoCompletion,
-                                 mode == KGlobalSettings::CompletionNone );
+                                 mode == TDEGlobalSettings::CompletionNone );
         subMenu->setItemChecked( ShellCompletion,
-                                 mode == KGlobalSettings::CompletionShell );
+                                 mode == TDEGlobalSettings::CompletionShell );
         subMenu->setItemChecked( PopupCompletion,
-                                 mode == KGlobalSettings::CompletionPopup );
+                                 mode == TDEGlobalSettings::CompletionPopup );
         subMenu->setItemChecked( AutoCompletion,
-                                 mode == KGlobalSettings::CompletionAuto );
+                                 mode == TDEGlobalSettings::CompletionAuto );
         subMenu->setItemChecked( ShortAutoCompletion,
-                                 mode == KGlobalSettings::CompletionMan );
+                                 mode == TDEGlobalSettings::CompletionMan );
         subMenu->setItemChecked( PopupAutoCompletion,
-                                 mode == KGlobalSettings::CompletionPopupAuto );
-        if ( mode != KGlobalSettings::completionMode() )
+                                 mode == TDEGlobalSettings::CompletionPopupAuto );
+        if ( mode != TDEGlobalSettings::completionMode() )
         {
             subMenu->insertSeparator();
             subMenu->insertItem( i18n("Default"), Default );
@@ -925,30 +925,30 @@ TQPopupMenu *KLineEdit::createPopupMenu()
 
 void KLineEdit::completionMenuActivated( int id )
 {
-    KGlobalSettings::Completion oldMode = completionMode();
+    TDEGlobalSettings::Completion oldMode = completionMode();
 
     switch ( id )
     {
         case Default:
-           setCompletionMode( KGlobalSettings::completionMode() );
+           setCompletionMode( TDEGlobalSettings::completionMode() );
            break;
         case NoCompletion:
-           setCompletionMode( KGlobalSettings::CompletionNone );
+           setCompletionMode( TDEGlobalSettings::CompletionNone );
            break;
         case AutoCompletion:
-            setCompletionMode( KGlobalSettings::CompletionAuto );
+            setCompletionMode( TDEGlobalSettings::CompletionAuto );
             break;
         case ShortAutoCompletion:
-            setCompletionMode( KGlobalSettings::CompletionMan );
+            setCompletionMode( TDEGlobalSettings::CompletionMan );
             break;
         case ShellCompletion:
-            setCompletionMode( KGlobalSettings::CompletionShell );
+            setCompletionMode( TDEGlobalSettings::CompletionShell );
             break;
         case PopupCompletion:
-            setCompletionMode( KGlobalSettings::CompletionPopup );
+            setCompletionMode( TDEGlobalSettings::CompletionPopup );
             break;
         case PopupAutoCompletion:
-            setCompletionMode( KGlobalSettings::CompletionPopupAuto );
+            setCompletionMode( TDEGlobalSettings::CompletionPopupAuto );
             break;
         default:
             return;
@@ -956,8 +956,8 @@ void KLineEdit::completionMenuActivated( int id )
 
     if ( oldMode != completionMode() )
     {
-        if ( (oldMode == KGlobalSettings::CompletionPopup ||
-              oldMode == KGlobalSettings::CompletionPopupAuto ) &&
+        if ( (oldMode == TDEGlobalSettings::CompletionPopup ||
+              oldMode == TDEGlobalSettings::CompletionPopupAuto ) &&
               d->completionBox && d->completionBox->isVisible() )
             d->completionBox->hide();
         emit completionModeChanged( completionMode() );
@@ -1080,7 +1080,7 @@ void KLineEdit::setURL( const KURL& url )
     setText( url.prettyURL() );
 }
 
-void KLineEdit::setCompletionBox( KCompletionBox *box )
+void KLineEdit::setCompletionBox( TDECompletionBox *box )
 {
     if ( d->completionBox )
         return;
@@ -1101,7 +1101,7 @@ void KLineEdit::setCompletionBox( KCompletionBox *box )
 
 void KLineEdit::userCancelled(const TQString & cancelText)
 {
-    if ( completionMode() != KGlobalSettings::CompletionPopupAuto )
+    if ( completionMode() != TDEGlobalSettings::CompletionPopupAuto )
     {
       // TODO: this sets modified==false. But maybe it was true before...
       setText(cancelText);
@@ -1124,13 +1124,13 @@ void KLineEdit::userCancelled(const TQString & cancelText)
 
 bool KLineEdit::overrideAccel (const TQKeyEvent* e)
 {
-    KShortcut scKey;
+    TDEShortcut scKey;
 
     KKey key( e );
     KeyBindingMap keys = getKeyBindings();
 
     if (keys[TextCompletion].isNull())
-        scKey = KStdAccel::shortcut(KStdAccel::TextCompletion);
+        scKey = TDEStdAccel::shortcut(TDEStdAccel::TextCompletion);
     else
         scKey = keys[TextCompletion];
 
@@ -1138,7 +1138,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e)
         return true;
 
     if (keys[NextCompletionMatch].isNull())
-        scKey = KStdAccel::shortcut(KStdAccel::NextCompletion);
+        scKey = TDEStdAccel::shortcut(TDEStdAccel::NextCompletion);
     else
         scKey = keys[NextCompletionMatch];
 
@@ -1146,7 +1146,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e)
         return true;
 
     if (keys[PrevCompletionMatch].isNull())
-        scKey = KStdAccel::shortcut(KStdAccel::PrevCompletion);
+        scKey = TDEStdAccel::shortcut(TDEStdAccel::PrevCompletion);
     else
         scKey = keys[PrevCompletionMatch];
 
@@ -1154,27 +1154,27 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e)
         return true;
 
     // Override all the text manupilation accelerators...
-    if ( KStdAccel::copy().contains( key ) )
+    if ( TDEStdAccel::copy().contains( key ) )
         return true;
-    else if ( KStdAccel::paste().contains( key ) )
+    else if ( TDEStdAccel::paste().contains( key ) )
         return true;
-    else if ( KStdAccel::cut().contains( key ) )
+    else if ( TDEStdAccel::cut().contains( key ) )
         return true;
-    else if ( KStdAccel::undo().contains( key ) )
+    else if ( TDEStdAccel::undo().contains( key ) )
         return true;
-    else if ( KStdAccel::redo().contains( key ) )
+    else if ( TDEStdAccel::redo().contains( key ) )
         return true;
-    else if (KStdAccel::deleteWordBack().contains( key ))
+    else if (TDEStdAccel::deleteWordBack().contains( key ))
         return true;
-    else if (KStdAccel::deleteWordForward().contains( key ))
+    else if (TDEStdAccel::deleteWordForward().contains( key ))
         return true;
-    else if (KStdAccel::forwardWord().contains( key ))
+    else if (TDEStdAccel::forwardWord().contains( key ))
         return true;
-    else if (KStdAccel::backwardWord().contains( key ))
+    else if (TDEStdAccel::backwardWord().contains( key ))
         return true;
-    else if (KStdAccel::beginningOfLine().contains( key ))
+    else if (TDEStdAccel::beginningOfLine().contains( key ))
         return true;
-    else if (KStdAccel::endOfLine().contains( key ))
+    else if (TDEStdAccel::endOfLine().contains( key ))
         return true;
 
     if (d->completionBox && d->completionBox->isVisible ())
@@ -1259,19 +1259,19 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest )
     }
 }
 
-KCompletionBox * KLineEdit::completionBox( bool create )
+TDECompletionBox * KLineEdit::completionBox( bool create )
 {
     if ( create && !d->completionBox ) {
-        setCompletionBox( new KCompletionBox( this, "completion box" ) );
+        setCompletionBox( new TDECompletionBox( this, "completion box" ) );
         d->completionBox->setFont(font());
     }
 
     return d->completionBox;
 }
 
-void KLineEdit::setCompletionObject( KCompletion* comp, bool hsig )
+void KLineEdit::setCompletionObject( TDECompletion* comp, bool hsig )
 {
-    KCompletion *oldComp = compObj();
+    TDECompletion *oldComp = compObj();
     if ( oldComp && handleSignals() )
         disconnect( oldComp, TQT_SIGNAL( matches( const TQStringList& )),
                     this, TQT_SLOT( setCompletedItems( const TQStringList& )));
@@ -1280,7 +1280,7 @@ void KLineEdit::setCompletionObject( KCompletion* comp, bool hsig )
       connect( comp, TQT_SIGNAL( matches( const TQStringList& )),
                this, TQT_SLOT( setCompletedItems( const TQStringList& )));
 
-    KCompletionBase::setCompletionObject( comp, hsig );
+    TDECompletionBase::setCompletionObject( comp, hsig );
 }
 
 // TQWidget::create() turns off mouse-Tracking which would break auto-hiding
@@ -1379,4 +1379,4 @@ TQString KLineEdit::clickMessage() const
 
 
 void KLineEdit::virtual_hook( int id, void* data )
-{ KCompletionBase::virtual_hook( id, data ); }
+{ TDECompletionBase::virtual_hook( id, data ); }
diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h
index fc1f4ba4a..82179fa05 100644
--- a/tdeui/klineedit.h
+++ b/tdeui/klineedit.h
@@ -35,7 +35,7 @@
 
 class TQPopupMenu;
 
-class KCompletionBox;
+class TDECompletionBox;
 class KURL;
 
 /**
@@ -63,7 +63,7 @@ class KURL;
  *
  * This widget by default creates a completion object when you invoke
  * the completionObject( bool ) member function for the first time or
- * use setCompletionObject( KCompletion*, bool ) to assign your own
+ * use setCompletionObject( TDECompletion*, bool ) to assign your own
  * completion object.  Additionally, to make this widget more functional,
  * KLineEdit will by default handle the text rotation and completion
  * events internally when a completion object is created through either one
@@ -72,7 +72,7 @@ class KURL;
  * the above functions to false.
  *
  * The default key-bindings for completion and rotation is determined
- * from the global settings in KStdAccel. These values, however, can
+ * from the global settings in TDEStdAccel. These values, however, can
  * be overridden locally by invoking @p setKeyBinding(). You can easily
  * revert these settings back to the default by simply calling
  * @p useGlobalSettings(). An alternate method would be to default
@@ -80,9 +80,9 @@ class KURL;
  * second argument.
  *
  * If @p EchoMode for this widget is set to something other than @p TQLineEdit::Normal,
- * the completion mode will always be defaulted to KGlobalSettings::CompletionNone.
+ * the completion mode will always be defaulted to TDEGlobalSettings::CompletionNone.
  * This is done purposefully to guard against protected entries such as passwords being
- * cached in KCompletion's list. Hence, if the @p EchoMode is not TQLineEdit::Normal, the
+ * cached in TDECompletion's list. Hence, if the @p EchoMode is not TQLineEdit::Normal, the
  * completion mode is automatically disabled.
  *
  * A read-only KLineEdit will have the same background color as a
@@ -97,7 +97,7 @@ class KURL;
  *
  * \code
  * KLineEdit *edit = new KLineEdit( this, "mywidget" );
- * KCompletion *comp = edit->completionObject();
+ * TDECompletion *comp = edit->completionObject();
  * // Connect to the return pressed signal - optional
  * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
  * \endcode
@@ -127,7 +127,7 @@ class KURL;
  * edit->setHandleSignals( false );
  *
  * // Set your own key-bindings for a text completion mode.
- * edit->setKeyBinding( KCompletionBase::TextCompletion, Qt::End );
+ * edit->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End );
  *
  * // Hide the context (popup) menu
  * edit->setContextMenuEnabled( false );
@@ -142,7 +142,7 @@ class KURL;
  * @author Dawit Alemayehu <adawit@kde.org>
  */
 
-class TDEUI_EXPORT KLineEdit : public TQLineEdit, public KCompletionBase
+class TDEUI_EXPORT KLineEdit : public TQLineEdit, public TDECompletionBase
 {
     friend class KComboBox;
 
@@ -197,14 +197,14 @@ public:
     void cursorAtEnd() { end( false ); }
 
     /**
-     * Re-implemented from KCompletionBase for internal reasons.
+     * Re-implemented from TDECompletionBase for internal reasons.
      *
      * This function is re-implemented in order to make sure that
      * the EchoMode is acceptable before we set the completion mode.
      *
-     * See KCompletionBase::setCompletionMode
+     * See TDECompletionBase::setCompletionMode
      */
-    virtual void setCompletionMode( KGlobalSettings::Completion mode );
+    virtual void setCompletionMode( TDEGlobalSettings::Completion mode );
 
    /**
     * Enables/disables the popup (context) menu.
@@ -269,18 +269,18 @@ public:
 
     /**
      * @returns the completion-box, that is used in completion mode
-     * KGlobalSettings::CompletionPopup.
+     * TDEGlobalSettings::CompletionPopup.
      * This method will create a completion-box if none is there, yet.
      *
      * @param create Set this to false if you don't want the box to be created
      *               i.e. to test if it is available.
      */
-    KCompletionBox * completionBox( bool create = true );
+    TDECompletionBox * completionBox( bool create = true );
 
     /**
      * Reimplemented for internal reasons, the API is not affected.
      */
-    virtual void setCompletionObject( KCompletion *, bool hsig = true );
+    virtual void setCompletionObject( TDECompletion *, bool hsig = true );
 
     /**
      * Reimplemented for internal reasons, the API is not affected.
@@ -320,13 +320,13 @@ public:
 
     /**
      * Set the completion-box to be used in completion mode
-     * KGlobalSettings::CompletionPopup.
+     * TDEGlobalSettings::CompletionPopup.
      * This will do nothing if a completion-box already exists.
      *
-     * @param box The KCompletionBox to set
+     * @param box The TDECompletionBox to set
      * @since 3.4
     */
-    void setCompletionBox( KCompletionBox *box );
+    void setCompletionBox( TDECompletionBox *box );
 
     /**
      * This makes the line edit display a grayed-out hinting text as long as
@@ -382,16 +382,16 @@ signals:
      * @p setKeyBinding for details.
      *
      * Note that this signal is @em not emitted if the completion
-     * mode is set to @p KGlobalSettings::CompletionNone or
+     * mode is set to @p TDEGlobalSettings::CompletionNone or
      * @p echoMode() is @em not  normal.
      */
-    void textRotation( KCompletionBase::KeyBindingType );
+    void textRotation( TDECompletionBase::KeyBindingType );
 
     /**
      * Emitted when the user changed the completion mode by using the
      * popupmenu.
      */
-    void completionModeChanged( KGlobalSettings::Completion );
+    void completionModeChanged( TDEGlobalSettings::Completion );
 
     /**
      * Emitted before the context menu is displayed.
@@ -424,10 +424,10 @@ public slots:
      *
      * @param type The key-binding invoked.
      */
-    void rotateText( KCompletionBase::KeyBindingType type );
+    void rotateText( TDECompletionBase::KeyBindingType type );
 
     /**
-     * See KCompletionBase::setCompletedText.
+     * See TDECompletionBase::setCompletedText.
      */
     virtual void setCompletedText( const TQString& );
 
diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp
index 9551fc1f6..8fc0a9a4f 100644
--- a/tdeui/klineeditdlg.cpp
+++ b/tdeui/klineeditdlg.cpp
@@ -27,8 +27,8 @@
 #include <tqfiledialog.h>
 
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
 
diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp
index 238eeee7a..40f87da29 100644
--- a/tdeui/knuminput.cpp
+++ b/tdeui/knuminput.cpp
@@ -44,8 +44,8 @@
 #include <tqspinbox.h>
 #include <tqstyle.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kdialog.h"
@@ -1129,7 +1129,7 @@ void KDoubleSpinBox::setLineStep( double step ) {
 
 TQString KDoubleSpinBox::mapValueToText( int value ) {
   if ( acceptLocalizedNumbers() )
-    return KGlobal::locale()
+    return TDEGlobal::locale()
       ->formatNumber( d->mapToDouble( value ), d->mPrecision );
   else
     return TQString().setNum( d->mapToDouble( value ), 'f', d->mPrecision );
@@ -1138,7 +1138,7 @@ TQString KDoubleSpinBox::mapValueToText( int value ) {
 int KDoubleSpinBox::mapTextToValue( bool * ok ) {
   double value;
   if ( acceptLocalizedNumbers() )
-    value = KGlobal::locale()->readNumber( cleanText(), ok );
+    value = TDEGlobal::locale()->readNumber( cleanText(), ok );
   else
     value = cleanText().toDouble( ok );
   if ( !*ok ) return 0;
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index 9b7121e79..4716d8051 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -863,7 +863,7 @@ public:
   bool acceptLocalizedNumbers() const;
 
   /** Sets whether to use and accept localized numbers as returned by
-      KLocale::formatNumber() */
+      TDELocale::formatNumber() */
   virtual void setAcceptLocalizedNumbers( bool accept );
 
   /** Sets a new range for the spin box values. Note that @p lower, @p
diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp
index fdc51022c..6cf486ad1 100644
--- a/tdeui/knumvalidator.cpp
+++ b/tdeui/knumvalidator.cpp
@@ -26,8 +26,8 @@
 #include <tqstring.h>
 
 #include "knumvalidator.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 ///////////////////////////////////////////////////////////////
@@ -214,13 +214,13 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const
       ok = false;
     else
       return TQValidator::Acceptable;
-  else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case
+  else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==TDEGlobal::locale()->decimalSymbol())) // another special case
     return TQValidator::Acceptable;
   else if (newStr.length())
   {
     val = newStr.toDouble(&ok);
     if(!ok && d->acceptLocalizedNumbers)
-       val= KGlobal::locale()->readNumber(newStr,&ok);
+       val= TDEGlobal::locale()->readNumber(newStr,&ok);
   }
   else {
     val = 0;
@@ -326,7 +326,7 @@ void KDoubleValidator::setAcceptLocalizedNumbers( bool accept ) {
 TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const {
   TQString s = input;
   if ( acceptLocalizedNumbers() ) {
-    KLocale * l = KGlobal::locale();
+    TDELocale * l = TDEGlobal::locale();
     // ok, we have to re-format the number to have:
     // 1. decimalSymbol == '.'
     // 2. negativeSign  == '-'
diff --git a/tdeui/knumvalidator.h b/tdeui/knumvalidator.h
index 8fa2ea76e..5c7b31484 100644
--- a/tdeui/knumvalidator.h
+++ b/tdeui/knumvalidator.h
@@ -147,7 +147,7 @@ class TDEUI_EXPORT KFloatValidator : public TQValidator {
     virtual double top () const;
     /**
      * Sets the validator to be locale aware if @p is true. In this case, the
-     * character KLocale::decimalSymbol() from the global locale is recognized
+     * character TDELocale::decimalSymbol() from the global locale is recognized
      * as decimal separator.
      */
     void setAcceptLocalizedNumbers(bool b);
@@ -169,8 +169,8 @@ class TDEUI_EXPORT KFloatValidator : public TQValidator {
 
    KDoubleValidator extends TQDoubleValidator to be
    locale-aware. That means that - subject to not being disabled -
-   KLocale::decimalSymbol(), KLocale::thousandsSeparator()
-   and KLocale::positiveSign() and KLocale::negativeSign()
+   TDELocale::decimalSymbol(), TDELocale::thousandsSeparator()
+   and TDELocale::positiveSign() and TDELocale::negativeSign()
    are respected.
 
    @author Marc Mutz <mutz@kde.org>
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index 7ca2999f1..f88cb5a8a 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -25,8 +25,8 @@ 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 <tdeapplication.h>
+#include <tdeconfig.h>
 
 class KPanelApplet::KPanelAppletPrivate
 {
@@ -37,7 +37,7 @@ public:
       {}
 
   const TQPopupMenu* customMenu;
-  KSharedConfig::Ptr sharedConfig;
+  TDESharedConfig::Ptr sharedConfig;
   TQPtrList<TQObject> watchedForFocus;
   bool hasFocus;
 };
@@ -60,7 +60,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type,
   }
   setBackgroundOrigin( AncestorOrigin );
 
-  d->sharedConfig = KSharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable());
+  d->sharedConfig = TDESharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable());
   _config = d->sharedConfig;
 }
 
@@ -188,7 +188,7 @@ bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e)
     return TQFrame::eventFilter(o, e);
 }
 
-KSharedConfig::Ptr KPanelApplet::sharedConfig() const
+TDESharedConfig::Ptr KPanelApplet::sharedConfig() const
 {
     return d->sharedConfig;
 }
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index 11af50f43..a8729e331 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -25,9 +25,9 @@ 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 KConfig;
+class TDEConfig;
 class TQPopupMenu;
 
 /**
@@ -55,7 +55,7 @@ class TQPopupMenu;
  *
  * \b X-TDE-UniqueApplet \n
  *
- * Similar to KApplication and KUniqueApplication there are
+ * Similar to TDEApplication and KUniqueApplication there are
  * two types of panel applets. Use unique applets when it makes no
  * sence to run more than one instance of a applet in the panel. A
  * good example for unique applets is the taskbar applet.  Use normal
@@ -80,7 +80,7 @@ class TQPopupMenu;
  * {
  *     KPanelApplet* init(TQWidget *parent, const TQString& configFile)
  *     {
- *         KGlobal::locale()->insertCatalogue("exampleapplet");
+ *         TDEGlobal::locale()->insertCatalogue("exampleapplet");
  *         return new ExampleApplet(configFile, KPanelApplet::Normal,
  *                       KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
  *                       parent, "exampleapplet");
@@ -176,7 +176,7 @@ public:
     virtual int heightForWidth(int width) const { return width; }
 
     /**
-     * Always use this KConfig object to save/load your applet's configuration.
+     * Always use this TDEConfig object to save/load your applet's configuration.
      *
      * For unique applets this config object will write to a config file called
      * \<appletname\>rc in the user's local %KDE directory.
@@ -184,8 +184,8 @@ public:
      * For normal applets this config object will write to a instance specific config file
      * called \<appletname\>\<instanceid\>rc in the user's local %KDE directory.
      **/
-    KConfig* config() const { return _config; }
-    KSharedConfig::Ptr sharedConfig() const;
+    TDEConfig* config() const { return _config; }
+    TDESharedConfig::Ptr sharedConfig() const;
 
     /**
      * @return Type indicating the applet's type.
@@ -384,7 +384,7 @@ private:
     Type         _type;
     Position     _position;
     Alignment    _alignment;
-    KConfig*     _config;
+    TDEConfig*     _config;
     int          _actions;
 protected:
     virtual void virtual_hook( int id, void* data );
diff --git a/tdeui/kpanelappmenu.cpp b/tdeui/kpanelappmenu.cpp
index 4cc77b5fe..247d844de 100644
--- a/tdeui/kpanelappmenu.cpp
+++ b/tdeui/kpanelappmenu.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kpanelappmenu.h"
 #include <tqstringlist.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 static int panelmenu_get_seq_id()
diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp
index 47ddd7d95..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"
@@ -55,7 +55,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type,
 {
     d = new KPanelExtensionPrivate;
     setFrameStyle(NoFrame);
-    _config = new KConfig(configFile);
+    _config = new TDEConfig(configFile);
 }
 
 KPanelExtension::~KPanelExtension()
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index fec6bd2ee..f97e85482 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdelibs_export.h>
 
 class TQPopupMenu;
-class KConfig;
+class TDEConfig;
 class KPanelExtensionPrivate;
 
 /**
@@ -56,7 +56,7 @@ class KPanelExtensionPrivate;
  *
  * \b X-TDE-UniqueExtension \n
  *
- * Similar to KApplication and KUniqueApplication there are
+ * Similar to TDEApplication and KUniqueApplication there are
  * two types of panel extensions. Use unique extensions when it makes no
  * sence to run more than one instance of an extension in the panel. A
  * good example for unique extensions is the taskbar extension.  Use normal
@@ -80,7 +80,7 @@ class KPanelExtensionPrivate;
  * {
  *     KPanelExtension* init(TQWidget *parent, const TQString& configFile)
  *     {
- *         KGlobal::locale()->insertCatalogue("exampleextension");
+ *         TDEGlobal::locale()->insertCatalogue("exampleextension");
  *         return new ExampleExtension(configFile, KPanelExtension::Normal,
  *                       KPanelExtension::About | KPanelExtension::Help | KPanelExtension::Preferences,
  *                       parent, "exampleextension");
@@ -139,7 +139,7 @@ public:
     virtual TQSize sizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; }
 
     /**
-     * Always use this KConfig object to save/load your extensions configuration.
+     * Always use this TDEConfig object to save/load your extensions configuration.
      *
      * For unique extensions this config object will write to a config file called
      * \<extensionname\>rc in the users local KDE directory.
@@ -147,7 +147,7 @@ public:
      * For normal extensions this config object will write to a instance specific config file
      * called \<extensionname\>\<instanceid\>rc in the users local KDE directory.
      **/
-    KConfig* config() const { return _config; }
+    TDEConfig* config() const { return _config; }
 
     /**
      * @return Type indicating the extensions type.
@@ -334,7 +334,7 @@ private:
     Type         		_type;
     Position     		_position;
     Alignment    		_alignment;
-    KConfig*     		_config;
+    TDEConfig*     		_config;
     int          		_actions;
 protected:
     virtual void virtual_hook( int id, void* data );
diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp
index ed13502a4..287208b66 100644
--- a/tdeui/kpanelmenu.cpp
+++ b/tdeui/kpanelmenu.cpp
@@ -22,13 +22,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 
 #include "kpanelmenu.h"
 #include "kpanelmenu.moc"
-//#include "kaccelmanager.h"
+//#include "tdeaccelmanager.h"
 
 
 class KPanelMenuPrivate
@@ -41,13 +41,13 @@ public:
 };
 
 KPanelMenu::KPanelMenu(const TQString &startDir, TQWidget *parent, const char *name)
-  : KPopupMenu(parent, name)
+  : TDEPopupMenu(parent, name)
 {
     init(startDir);
 }
 
 KPanelMenu::KPanelMenu(TQWidget *parent, const char *name)
-  : KPopupMenu(parent, name)
+  : TDEPopupMenu(parent, name)
 {
     init();
 }
@@ -63,11 +63,11 @@ void KPanelMenu::init(const TQString& path)
     connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
 
     // setup cache timer
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("menus");
     d->clearDelay = config->readNumEntry("MenuCacheTime", 60000); // 1 minute
 
-    //KAcceleratorManager::manage(this);
+    //TDEAcceleratorManager::manage(this);
     setKeyboardShortcutsEnabled(true);
 }
 
@@ -154,5 +154,5 @@ void KPanelMenu::internalInitialize()
 }
 
 void KPanelMenu::virtual_hook( int id, void* data )
-{ KPopupMenu::virtual_hook( id, data ); }
+{ TDEPopupMenu::virtual_hook( id, data ); }
 
diff --git a/tdeui/kpanelmenu.h b/tdeui/kpanelmenu.h
index 2e28010fb..03b700b82 100644
--- a/tdeui/kpanelmenu.h
+++ b/tdeui/kpanelmenu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __KPANELMENU_H__
 
 #include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kgenericfactory.h>
 
 class KPanelMenuPrivate;
@@ -50,7 +50,7 @@ class KPanelMenuPrivate;
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
-class TDEUI_EXPORT KPanelMenu : public KPopupMenu
+class TDEUI_EXPORT KPanelMenu : public TDEPopupMenu
 {
     Q_OBJECT
 
diff --git a/tdeui/kpartgui.dtd b/tdeui/kpartgui.dtd
index a3cbb8121..4b36929e2 100644
--- a/tdeui/kpartgui.dtd
+++ b/tdeui/kpartgui.dtd
@@ -83,17 +83,17 @@
 <!-- Defines both Standard and app-specific actions. An action can appear in a menu, a toolbar or in a
      menubar.
      Attributes:
-     - name of the action: this is matched with the KAction name.
+     - name of the action: this is matched with the TDEAction name.
      - group: this is used to control the placement of the action when merging 
               e.g. a part, it matches the name of a DefineGroup in the mainwindow's rc file.
      - append: this is used to control the placement of the action during the
                merging with ui_standards.rc. This is mapped to MergeLocal tags there.
                Note that this feature is currently only available for the mainwindow, not for parts/plugins.
      - text, whatsThis, toolTip, shortText, shortcut, icon: all those are mapped
-       to KAction properties.
+       to TDEAction properties.
  -->
 <!ELEMENT Action EMPTY>
-<!-- We defined only a few standard KAction properties here. Theoritically we can have
+<!-- We defined only a few standard TDEAction properties here. Theoritically we can have
      any property here -->
 <!ATTLIST Action
   name CDATA #REQUIRED
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index 489e14d8f..64904c581 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -34,14 +34,14 @@
 #include <tqptrdict.h>
 #include <tqtimer.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kaboutdialog.h>
-#include <kconfig.h>
+#include <tdemessagebox.h>
+#include <tdeaboutdialog.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 
@@ -110,8 +110,8 @@ KPasswordEdit::KPasswordEdit(TQWidget *parent, const char *name)
 {
     init();
 
-    KConfig* const cfg = KGlobal::config();
-    KConfigGroupSaver saver(cfg, "Passwords");
+    TDEConfig* const cfg = TDEGlobal::config();
+    TDEConfigGroupSaver saver(cfg, "Passwords");
 
     const TQString val = cfg->readEntry("EchoMode", "OneStar");
     if (val == "ThreeStars")
@@ -338,8 +338,8 @@ void KPasswordDialog::init()
 {
     m_Row = 0;
 
-    KConfig* const cfg = KGlobal::config();
-    const KConfigGroupSaver saver(cfg, "Passwords");
+    TDEConfig* const cfg = TDEGlobal::config();
+    const TDEConfigGroupSaver saver(cfg, "Passwords");
     bool def = ( qstrcmp( tqAppName(), "tdesu" ) == 0 ? defKeep : false );
     if (m_Keep && cfg->readBoolEntry("Keep", def))
 	++m_Keep;
@@ -351,7 +351,7 @@ void KPasswordDialog::init()
 
     // Row 1: pixmap + prompt
     TQLabel *lbl;
-    const TQPixmap pix( KGlobal::iconLoader()->loadIcon( d->iconName, KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true));
+    const TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( d->iconName, TDEIcon::NoGroup, TDEIcon::SizeHuge, 0, 0, true));
     if (!pix.isNull()) {
 	lbl = new TQLabel(m_pMain);
 	lbl->setPixmap(pix);
diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp
index 1e86bc57f..ba3459b45 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>
@@ -22,7 +22,7 @@
 #include <kdialog.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "config.h"
 #ifdef Q_WS_X11
@@ -300,7 +300,7 @@ void KPassivePopup::moveNear( TQRect target )
     int w = width();
     int h = height();
 
-    TQRect r = KGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2));
+    TQRect r = TDEGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2));
 
     if( d->popupStyle == Balloon )
     {
@@ -359,7 +359,7 @@ void KPassivePopup::updateMask()
 {
     // get screen-geometry for screen our anchor is on
     // (geometry can differ from screen to screen!
-    TQRect deskRect = KGlobalSettings::desktopGeometry(d->anchor);
+    TQRect deskRect = TDEGlobalSettings::desktopGeometry(d->anchor);
 
     int xh = 70, xl = 40;
     if( width() < 80 )
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index aafb7f3c2..02054aad3 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -18,8 +18,8 @@
 #include <tqcolor.h>
 #include <tqglobal.h>
 
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <sys/types.h>
@@ -87,7 +87,7 @@ KPixmapIO::KPixmapIO()
 
 #ifdef HAVE_MITSHM
     setShmPolicy(ShmDontKeep);
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     if (!config->readBoolEntry("UseMitShm", true))
 	return;
 
diff --git a/tdeui/kpixmapregionselectordialog.cpp b/tdeui/kpixmapregionselectordialog.cpp
index c394af0f3..8228cd2f1 100644
--- a/tdeui/kpixmapregionselectordialog.cpp
+++ b/tdeui/kpixmapregionselectordialog.cpp
@@ -21,7 +21,7 @@
 #include <kdialogbase.h>
 #include <tqdialog.h>
 #include <tqdesktopwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent,
diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp
index 615b50a23..21ac875db 100644
--- a/tdeui/kpixmapregionselectorwidget.cpp
+++ b/tdeui/kpixmapregionselectorwidget.cpp
@@ -30,9 +30,9 @@
 #include <tqlayout.h>
 #include <kimageeffect.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <stdlib.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
@@ -135,17 +135,17 @@ void KPixmapRegionSelectorWidget::updatePixmap()
 }
 
 
-KPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
+TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
 {
-   KPopupMenu *popup=new KPopupMenu(this, "PixmapRegionSelectorPopup");
+   TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
    popup->insertTitle(i18n("Image Operations"));
    
-   KAction *action = new KAction(i18n("&Rotate Clockwise"), "rotate_cw",
+   TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "rotate_cw",
                                 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
                                 TQT_TQOBJECT(popup), "rotateclockwise");
    action->plug(popup);
 
-   action = new KAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
+   action = new TDEAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
                                 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
                                 TQT_TQOBJECT(popup), "rotatecounterclockwise");
    action->plug(popup);
@@ -215,7 +215,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
 
       if ( mev->button() == Qt::RightButton )
       {
-         KPopupMenu *popup = createPopupMenu( );
+         TDEPopupMenu *popup = createPopupMenu( );
          popup->exec( mev->globalPos() );
          delete popup;
          return TRUE;
diff --git a/tdeui/kpixmapregionselectorwidget.h b/tdeui/kpixmapregionselectorwidget.h
index 344580ff4..0277a0d10 100644
--- a/tdeui/kpixmapregionselectorwidget.h
+++ b/tdeui/kpixmapregionselectorwidget.h
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <kimageeffect.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 #include <tdelibs_export.h>
 
@@ -135,9 +135,9 @@ public slots:
 
 protected:
    /**
-    * Creates a KPopupMenu with the menu that appears when clicking with the right button on the label
+    * Creates a TDEPopupMenu with the menu that appears when clicking with the right button on the label
     */
-   virtual KPopupMenu *createPopupMenu();
+   virtual TDEPopupMenu *createPopupMenu();
 
 private:
    bool eventFilter(TQObject *obj, TQEvent *ev);
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 9b72dcf2c..8fb050a11 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -34,8 +34,8 @@
 
 #include "kprogress.h"
 
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <twin.h>
 
 KProgress::KProgress(TQWidget *parent, const char *name, WFlags f)
diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp
index 4638f78fb..2472207f4 100644
--- a/tdeui/kprogressbox.cpp
+++ b/tdeui/kprogressbox.cpp
@@ -37,8 +37,8 @@
 #include "ktextedit.h"
 #include "kprogressbox.h"
 
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <twin.h>
 
 struct KProgressBoxDialog::KProgressBoxDialogPrivate
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index 07127cdc8..6f994dbe3 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -25,11 +25,11 @@
 
 #include "config.h"
 
-#include <kglobalsettings.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 #include <kipc.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 class KPushButton::KPushButtonPrivate
 {
@@ -114,7 +114,7 @@ void KPushButton::init( const KGuiItem &item )
 
 void KPushButton::readSettings()
 {
-    s_useIcons = KGlobalSettings::showIconsOnPushButtons();
+    s_useIcons = TDEGlobalSettings::showIconsOnPushButtons();
 }
 
 void KPushButton::setGuiItem( const KGuiItem& item )
@@ -195,7 +195,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e )
 
     if ( (e->state() & Qt::LeftButton) &&
          (e->pos() - startPos).manhattanLength() >
-         KGlobalSettings::dndEventDelay() )
+         TDEGlobalSettings::dndEventDelay() )
     {
         startDrag();
         setDown( false );
diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h
index 2beed9e52..ee7bb3b52 100644
--- a/tdeui/kpushbutton.h
+++ b/tdeui/kpushbutton.h
@@ -102,7 +102,7 @@ public:
 
     /**
      * Sets the Icon Set for this button. It also takes into account hte
-     * KGlobalSettings::showIconsOnPushButtons() setting.
+     * TDEGlobalSettings::showIconsOnPushButtons() setting.
      */
     void setIconSet( const TQIconSet &iconSet );
 
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 3530b5d45..6be62d157 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -14,7 +14,7 @@
 #include <tqrect.h>
 #include <tqimage.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <kpixmapio.h>
 #include <twinmodule.h>
@@ -61,7 +61,7 @@ void KRootPixmap::init()
     m_Fade = 0;
     m_BlurRadius = 0;
     m_BlurSigma = 0;
-    m_pPixmap = new KSharedPixmap; //ordinary KPixmap on win32
+    m_pPixmap = new TDESharedPixmap; //ordinary KPixmap on win32
     m_pTimer = new TQTimer( this );
     m_bInit = false;
     m_bActive = false;
@@ -238,7 +238,7 @@ void KRootPixmap::repaint(bool force)
 	m_Desk = currentDesktop();
     }
 
-    // KSharedPixmap will correctly generate a tile for us.
+    // TDESharedPixmap will correctly generate a tile for us.
     m_pPixmap->loadFromShared(pixmapName(m_Desk), m_Rect);
 #else
 	m_Desk = currentDesktop();
@@ -308,7 +308,7 @@ void KRootPixmap::slotDone(bool success)
 	updateBackground( m_pPixmap );
 }
 
-void KRootPixmap::updateBackground( KSharedPixmap *spm )
+void KRootPixmap::updateBackground( TDESharedPixmap *spm )
 {
     TQPixmap pm = *spm;
 
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 776863c46..bc5518221 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -20,7 +20,7 @@
 class TQRect;
 class TQWidget;
 class TQTimer;
-class KSharedPixmap;
+class TDESharedPixmap;
 class KRootPixmapData;
 
 /**
@@ -37,7 +37,7 @@ class KRootPixmapData;
  * Instead of using the default behavior, you can ask KRootPixmap
  * to emit a backgroundUpdated(const TQPixmap &) signal whenever
  * the background needs updating by using setCustomPainting(bool).
- * Alternatively by reimplementing updateBackground(KSharedPixmap*)
+ * Alternatively by reimplementing updateBackground(TDESharedPixmap*)
  * you can take complete control of the behavior.
  *
  * @author Geert Jansen <jansen@kde.org>
@@ -179,7 +179,7 @@ public slots:
     void setCustomPainting( bool enable ) { m_bCustomPaint = enable; }
 
     /**
-     * Asks KDesktop to export the desktop background as a KSharedPixmap.
+     * Asks KDesktop to export the desktop background as a TDESharedPixmap.
      * This method uses DCOP to call KBackgroundIface/setExport(int).
      */
     void enableExports();
@@ -209,7 +209,7 @@ protected:
      * applies the fade effect, then sets the target's background, or emits
      * backgroundUpdated(const TQPixmap &) depending on the painting mode.
      */
-    virtual void updateBackground( KSharedPixmap * );
+    virtual void updateBackground( TDESharedPixmap * );
 
 private slots:
     void slotBackgroundChanged(int);
@@ -229,7 +229,7 @@ private:
     TQRect m_Rect;
     TQWidget *m_pWidget;
     TQTimer *m_pTimer;
-    KSharedPixmap *m_pPixmap;
+    TDESharedPixmap *m_pPixmap;
     KRootPixmapData *d;
 
     void init();
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index 5ca0c2b85..a9958dea9 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -25,14 +25,14 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
-#include <kglobal.h>
+#include <tdefiledialog.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
@@ -80,7 +80,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name,
   , clientcombo(0)
 {
   d = new KSpellConfigPrivate;
-  kc = KGlobal::config();
+  kc = TDEGlobal::config();
 
   if( !_ksc )
   {
@@ -181,7 +181,7 @@ KSpellConfig::dictFromList() const
 bool
 KSpellConfig::readGlobalSettings()
 {
-  KConfigGroupSaver cs( kc,"KSpell" );
+  TDEConfigGroupSaver cs( kc,"KSpell" );
 
   setNoRootAffix   ( kc->readNumEntry("KSpell_NoRootAffix", 0) );
   setRunTogether   ( kc->readNumEntry("KSpell_RunTogether", 0) );
@@ -196,7 +196,7 @@ KSpellConfig::readGlobalSettings()
 bool
 KSpellConfig::writeGlobalSettings ()
 {
-  KConfigGroupSaver cs( kc,"KSpell" );
+  TDEConfigGroupSaver cs( kc,"KSpell" );
 
   kc->writeEntry ("KSpell_NoRootAffix",(int) noRootAffix(), true, true);
   kc->writeEntry ("KSpell_RunTogether", (int) runTogether(), true, true);
@@ -277,12 +277,12 @@ KSpellConfig::interpret( TQString &fname, TQString &lname,
   // but since aspell 0.6 also 3-character ISO-codes can be used
   if ( (dname.length() == 2) || (dname.length() == 3) ) {
     lname = dname;
-    hname = KGlobal::locale()->twoAlphaToLanguageName( lname );
+    hname = TDEGlobal::locale()->twoAlphaToLanguageName( lname );
   }
   else if ( (dname.length() == 5) && (dname[2] == '_') ) {
     lname = dname.left(2);
-    hname = KGlobal::locale()->twoAlphaToLanguageName(lname);
-    TQString country = KGlobal::locale()->twoAlphaToCountryName( dname.right(2) );
+    hname = TDEGlobal::locale()->twoAlphaToLanguageName(lname);
+    TQString country = TDEGlobal::locale()->twoAlphaToCountryName( dname.right(2) );
     if ( extension.isEmpty() )
       extension = country;
     else
@@ -363,9 +363,9 @@ KSpellConfig::interpret( TQString &fname, TQString &lname,
   }
 
   //We have explicitly chosen English as the default here.
-  if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") &&
+  if ( ( TDEGlobal::locale()->language() == TQString::fromLatin1("C") &&
          lname==TQString::fromLatin1("en") ) ||
-       KGlobal::locale()->language() == lname )
+       TDEGlobal::locale()->language() == lname )
     return true;
 
   return false;
@@ -965,7 +965,7 @@ void KSpellConfig::activateHelp( void )
 
 void KSpellConfig::sHelp( void )
 {
-  kapp->invokeHelp("configuration", "kspell");
+  kapp->invokeHelp("configuration", "tdespell");
 }
 
 /*
diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h
index b9cabe220..b0ca46fd9 100644
--- a/tdeui/ksconfig.h
+++ b/tdeui/ksconfig.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 class TQComboBox;
 class TQLabel;
 
-class KConfig;
+class TDEConfig;
 class KSpellConfigPrivate;
 
 /**
@@ -238,7 +238,7 @@ class TDEUI_EXPORT KSpellConfig : public TQWidget
 
   protected slots:
     /**
-     * Invokes the help documentation for kspell
+     * Invokes the help documentation for tdespell
      */ 
     void sHelp();
     //void sBrowseDict();
@@ -264,7 +264,7 @@ class TDEUI_EXPORT KSpellConfig : public TQWidget
     TQString qspdict;		// -p [dict]
     TQStringList ignorelist;
     enum {rdictlist=3, rencoding=4, rhelp=6};
-    KConfig *kc;
+    TDEConfig *kc;
     int iclient;            // defaults to ispell, may be aspell, too
 
     TQCheckBox *cb1, *cb2;
diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp
index 1d37d03d3..40cbb8ee4 100644
--- a/tdeui/kscrollview.cpp
+++ b/tdeui/kscrollview.cpp
@@ -24,8 +24,8 @@
 
 #include "kscrollview.h"
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 
 struct KScrollView::KScrollViewPrivate {
     KScrollViewPrivate() : dx(0), dy(0), ddx(0), ddy(0), rdx(0), rdy(0), scrolling(false) {}
@@ -54,7 +54,7 @@ KScrollView::~KScrollView()
 
 void KScrollView::scrollBy(int dx, int dy)
 {
-    KConfigGroup cfg( KGlobal::config(), "KDE" );
+    TDEConfigGroup cfg( TDEGlobal::config(), "KDE" );
     if( !cfg.readBoolEntry( "SmoothScrolling", true )) {
         TQScrollView::scrollBy( dx, dy );
         return;
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 9e860f3cf..c5a4879d8 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -20,7 +20,7 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kseparator.moc"
 
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index 6789e0a64..33eca17e4 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -22,7 +22,7 @@
 
 #ifdef Q_WS_X11
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krootprop.h>
 #include <ksharedpixmap.h>
 #include <kdebug.h>
@@ -49,10 +49,10 @@
 #undef FocusOut
 
 /**
- * KSharedPixmap
+ * TDESharedPixmap
  */
 
-class KSharedPixmapPrivate
+class TDESharedPixmapPrivate
 {
 public:
   Atom pixmap;
@@ -61,21 +61,21 @@ public:
   TQRect rect;
 };
 
-KSharedPixmap::KSharedPixmap()
+TDESharedPixmap::TDESharedPixmap()
     : TQWidget(0L, "shpixmap comm window")
 {
-    d = new KSharedPixmapPrivate;
+    d = new TDESharedPixmapPrivate;
     init();
 }
 
 
-KSharedPixmap::~KSharedPixmap()
+TDESharedPixmap::~TDESharedPixmap()
 {
     delete d;
 }
 
 
-void KSharedPixmap::init()
+void TDESharedPixmap::init()
 {
     d->pixmap = XInternAtom(tqt_xdisplay(), "PIXMAP", false);
     TQCString atom;
@@ -85,7 +85,7 @@ void KSharedPixmap::init()
 }
 
 
-bool KSharedPixmap::isAvailable(const TQString & name) const
+bool TDESharedPixmap::isAvailable(const TQString & name) const
 {
     TQString str = TQString("KDESHPIXMAP:%1").arg(name);
     Atom sel = XInternAtom(tqt_xdisplay(), str.latin1(), true);
@@ -95,7 +95,7 @@ bool KSharedPixmap::isAvailable(const TQString & name) const
 }
 
 
-bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
+bool TDESharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
 {
     d->rect = rect;
     if (d->selection != None)
@@ -120,7 +120,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
 }
 
 
-bool KSharedPixmap::x11Event(XEvent *event)
+bool TDESharedPixmap::x11Event(XEvent *event)
 {
     if (event->type != SelectionNotify)
 	return false;
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index 3295b38d1..7873be6e5 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -11,8 +11,8 @@
  * version 2 of the License, or (at your option) any later version.
  */
 
-#ifndef __KSharedPixmap_h_Included__
-#define __KSharedPixmap_h_Included__
+#ifndef __TDESharedPixmap_h_Included__
+#define __TDESharedPixmap_h_Included__
 
 #include <kpixmap.h>
 
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <tqwidget.h>
 
-class KSharedPixmapPrivate;
+class TDESharedPixmapPrivate;
 
 /**
  * Shared pixmap client.
@@ -35,7 +35,7 @@ class KSharedPixmapPrivate;
  * by a global id string, and can be accessed by all X clients.
  *
  * This class is a client class to shared pixmaps in KDE. You can use it
- * to copy (a part of) a shared pixmap into. KSharedPixmap inherits KPixmap
+ * to copy (a part of) a shared pixmap into. TDESharedPixmap inherits KPixmap
  * for that purpose.
  *
  * The server part of shared pixmaps is not implemented here. 
@@ -44,7 +44,7 @@ class KSharedPixmapPrivate;
  *
  * An example: copy from a shared pixmap:
  * \code
- *   KSharedPixmap *pm = new KSharedPixmap;
+ *   TDESharedPixmap *pm = new TDESharedPixmap;
  *   connect(pm, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
  *   pm->loadFromShared("My Pixmap");
  * \endcode
@@ -53,7 +53,7 @@ class KSharedPixmapPrivate;
  * @version $Id$
  *
  */
-class TDEUI_EXPORT KSharedPixmap: 
+class TDEUI_EXPORT TDESharedPixmap: 
     public TQWidget,
     public KPixmap
 {
@@ -65,12 +65,12 @@ public:
     /**
      * Construct an empty pixmap.
      */
-    KSharedPixmap();
+    TDESharedPixmap();
 
     /**
      * Destroys the pixmap.
      */
-    ~KSharedPixmap();
+    ~TDESharedPixmap();
 
     /**
      * Load from a shared pixmap reference. The signal done() is emitted
@@ -80,7 +80,7 @@ public:
      * @param rect If you pass a nonzero rectangle, a tile is generated which 
      * is able to fill up the specified rectangle completely. This is solely 
      * for optimization: in some cases the tile will be much smaller than the 
-     * original pixmap. It reflects KSharedPixmap's original use: sharing
+     * original pixmap. It reflects TDESharedPixmap's original use: sharing
      * of the desktop background to achieve pseudo transparency.
      * @return True if the shared pixmap exists and loading has started
      * successfully, false otherwise.
@@ -110,11 +110,11 @@ private:
     bool copy(const TQString & id, const TQRect & rect);
     void init();
 
-    KSharedPixmapPrivate *d;
+    TDESharedPixmapPrivate *d;
 };
 #else // WIN32, Qt Embedded
 // Let's simply assume KPixmap will do for now. Yes, I know that's broken.
-#define KSharedPixmap KPixmap
+#define TDESharedPixmap KPixmap
 #endif
 
 #endif
diff --git a/tdeui/ksplashscreen.cpp b/tdeui/ksplashscreen.cpp
index 6d605dcd7..82234bd94 100644
--- a/tdeui/ksplashscreen.cpp
+++ b/tdeui/ksplashscreen.cpp
@@ -17,9 +17,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include <tqpixmap.h>
 
@@ -27,7 +27,7 @@
 
 KSplashScreen::KSplashScreen(const TQPixmap &pixmap, WFlags f): TQSplashScreen(pixmap, f)
 {
-	TQRect desk = KGlobalSettings::splashScreenDesktopGeometry();
+	TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry();
 	resize(pixmap.width(), pixmap.height());
   setGeometry( ( desk.width() / 2 ) - ( width() / 2 ) + desk.left(),
       ( desk.height() / 2 ) - ( height() / 2 ) + desk.top(),
diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp
index b70c8ae9c..daa22f46b 100644
--- a/tdeui/kstatusbar.cpp
+++ b/tdeui/kstatusbar.cpp
@@ -20,8 +20,8 @@
 
 #include <kdebug.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
 
 
 KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id,
@@ -63,7 +63,7 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name )
 {
   // make the size grip stuff configurable
   // ...but off by default (sven)
-  KConfig *config = KGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   TQString group(config->group());
   config->setGroup(TQString::fromLatin1("StatusBar style"));
   bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false);
diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h
index a1b89d0a7..2c7574a79 100644
--- a/tdeui/kstatusbar.h
+++ b/tdeui/kstatusbar.h
@@ -64,14 +64,14 @@ signals:
  *
  *  You can insert text labels or custom widgets. Their geometry is managed
  *  internally. KStatusBar resizes itself, but positioning is left to
- *  KMainWindow (or to you, if you don't use KMainWindow ).
+ *  TDEMainWindow (or to you, if you don't use TDEMainWindow ).
  *
  *  A special type of item is a message which is a temporary text-message
  *  displayed on top of other items in full-width. Messages are visible for
  *  specified time, or until you call the slot TQStatusBar::clear(). See
  *  TQStatusBar::message for details.
  *
- *  It is useful to connect the KActionCollection signals to the
+ *  It is useful to connect the TDEActionCollection signals to the
  *  TQStatusBar::message slots.
  *
  *  KStatusBar inherits TQStatusBar, you can freely use all QStatusBar
@@ -82,7 +82,7 @@ signals:
  *
  *  @author Mark Donohoe (donohoe@kde.org) Maintained by Sven Radej <radej@kde.org>
 
- *  @see KActionCollection
+ *  @see TDEActionCollection
  */
 class TDEUI_EXPORT KStatusBar : public TQStatusBar
 {
@@ -97,7 +97,7 @@ public:
   enum BarStatus{ Toggle, Show, Hide };
 
   /**
-   *  Constructs a status bar. @p parent is usually KMainWindow.
+   *  Constructs a status bar. @p parent is usually TDEMainWindow.
    */
   KStatusBar( TQWidget* parent = 0L, const char* name = 0L );
 
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index e1adac16a..652534601 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -21,15 +21,15 @@
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kstdaccel.h>
-#include <kmainwindow.h>
+#include <tdelocale.h>
+#include <tdestdaccel.h>
+#include <tdemainwindow.h>
 #include "kstdaction_p.h"
 
 namespace KStdAction
@@ -40,9 +40,9 @@ TQStringList stdNames()
     return internal_stdNames();
 }
 
-KAction* create( StdAction id, const char *name, const TQObject *recvr, const char *slot, KActionCollection* parent )
+TDEAction* create( StdAction id, const char *name, const TQObject *recvr, const char *slot, TDEActionCollection* parent )
 {
-	KAction* pAction = 0;
+	TDEAction* pAction = 0;
 	const KStdActionInfo* pInfo = infoPtr( id );
 	kdDebug(125) << "KStdAction::create( " << id << "=" << (pInfo ? pInfo->psName : (const char*)0) << ", " << parent << ", " << name << " )" << endl; // ellis
 	if( pInfo ) {
@@ -64,13 +64,13 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
 		 case Preferences:
 		 case HelpContents:
 			{
-			const KAboutData *aboutData = KGlobal::instance()->aboutData();
+			const TDEAboutData *aboutData = TDEGlobal::instance()->aboutData();
 			/* TODO KDE4
-			const KAboutData *aboutData;
+			const TDEAboutData *aboutData;
 			if ( parent )
 			    aboutData = parent->instance()->aboutData();
 			else
-			    aboutData = KGlobal::instance()->aboutData();
+			    aboutData = TDEGlobal::instance()->aboutData();
 			*/
 			TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(tqApp->name());
 			sLabel = i18n(pInfo->psLabel).arg(appName);
@@ -86,10 +86,10 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
 			if (id == LastPage) iconName = "start";
 		}
 
-		KShortcut cut = KStdAccel::shortcut(pInfo->idAccel);
+		TDEShortcut cut = TDEStdAccel::shortcut(pInfo->idAccel);
 		switch( id ) {
 		 case OpenRecent:
-			pAction = new KRecentFilesAction( sLabel, pInfo->psIconName, cut,
+			pAction = new TDERecentFilesAction( sLabel, pInfo->psIconName, cut,
 					recvr, slot,
 					parent, (name) ? name : pInfo->psName );
 			break;
@@ -97,8 +97,8 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
 		 case ShowToolbar:
 		 case ShowStatusbar:
 		 {
-			KToggleAction *ret;
-			ret = new KToggleAction( sLabel, pInfo->psIconName, cut,
+			TDEToggleAction *ret;
+			ret = new TDEToggleAction( sLabel, pInfo->psIconName, cut,
 					recvr, slot,
 					parent, (name) ? name : pInfo->psName );
 			ret->setChecked( true );
@@ -107,8 +107,8 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
 		 }
 		 case FullScreen:
 		 {
-			KToggleFullScreenAction *ret;
-			ret = new KToggleFullScreenAction( cut, recvr, slot,
+			TDEToggleFullScreenAction *ret;
+			ret = new TDEToggleFullScreenAction( cut, recvr, slot,
 					parent, NULL, (name) ? name : pInfo->psName );
 			ret->setChecked( false );
 			pAction = ret;
@@ -116,15 +116,15 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
 		 }
          case PasteText:
          {
-            KPasteTextAction *ret;
-            ret = new KPasteTextAction(sLabel, iconName, cut,
+            TDEPasteTextAction *ret;
+            ret = new TDEPasteTextAction(sLabel, iconName, cut,
 					recvr, slot,
 					parent, (name) ? name : pInfo->psName );
             pAction = ret;
             break;
          }
 		 default:
-			pAction = new KAction( sLabel, iconName, cut,
+			pAction = new TDEAction( sLabel, iconName, cut,
 					recvr, slot,
 					parent, (name) ? name : pInfo->psName );
 			break;
@@ -139,103 +139,103 @@ const char* name( StdAction id )
 	return (pInfo) ? pInfo->psName : 0;
 }
 
-KAction *openNew( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *openNew( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( New, name, recvr, slot, parent ); }
-KAction *open( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *open( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Open, name, recvr, slot, parent ); }
-KRecentFilesAction *openRecent( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
-	{ return (KRecentFilesAction*) KStdAction::create( OpenRecent, name, recvr, slot, parent ); }
-KAction *save( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDERecentFilesAction *openRecent( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
+	{ return (TDERecentFilesAction*) KStdAction::create( OpenRecent, name, recvr, slot, parent ); }
+TDEAction *save( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Save, name, recvr, slot, parent ); }
-KAction *saveAs( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *saveAs( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( SaveAs, name, recvr, slot, parent ); }
-KAction *revert( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *revert( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Revert, name, recvr, slot, parent ); }
-KAction *print( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *print( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Print, name, recvr, slot, parent ); }
-KAction *printPreview( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *printPreview( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( PrintPreview, name, recvr, slot, parent ); }
-KAction *close( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *close( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Close, name, recvr, slot, parent ); }
-KAction *mail( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *mail( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Mail, name, recvr, slot, parent ); }
-KAction *quit( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *quit( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Quit, name, recvr, slot, parent ); }
-KAction *undo( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *undo( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Undo, name, recvr, slot, parent ); }
-KAction *redo( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *redo( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Redo, name, recvr, slot, parent ); }
-KAction *cut( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *cut( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Cut, name, recvr, slot, parent ); }
-KAction *copy( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *copy( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Copy, name, recvr, slot, parent ); }
-KAction *paste( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *paste( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Paste, name, recvr, slot, parent ); }
-KAction *pasteText( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *pasteText( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( PasteText, name, recvr, slot, parent ); }
-KAction *clear( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *clear( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Clear, name, recvr, slot, parent ); }
-KAction *selectAll( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *selectAll( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( SelectAll, name, recvr, slot, parent ); }
-KAction *deselect( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *deselect( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Deselect, name, recvr, slot, parent ); }
-KAction *find( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *find( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Find, name, recvr, slot, parent ); }
-KAction *findNext( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *findNext( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( FindNext, name, recvr, slot, parent ); }
-KAction *findPrev( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *findPrev( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( FindPrev, name, recvr, slot, parent ); }
-KAction *replace( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *replace( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Replace, name, recvr, slot, parent ); }
-KAction *actualSize( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *actualSize( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( ActualSize, name, recvr, slot, parent ); }
-KAction *fitToPage( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *fitToPage( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( FitToPage, name, recvr, slot, parent ); }
-KAction *fitToWidth( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *fitToWidth( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( FitToWidth, name, recvr, slot, parent ); }
-KAction *fitToHeight( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *fitToHeight( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( FitToHeight, name, recvr, slot, parent ); }
-KAction *zoomIn( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *zoomIn( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( ZoomIn, name, recvr, slot, parent ); }
-KAction *zoomOut( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *zoomOut( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( ZoomOut, name, recvr, slot, parent ); }
-KAction *zoom( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *zoom( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Zoom, name, recvr, slot, parent ); }
-KAction *redisplay( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *redisplay( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Redisplay, name, recvr, slot, parent ); }
-KAction *up( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *up( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Up, name, recvr, slot, parent ); }
-KAction *back( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *back( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Back, name, recvr, slot, parent ); }
-KAction *forward( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *forward( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Forward, name, recvr, slot, parent ); }
-KAction *home( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *home( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Home, name, recvr, slot, parent ); }
-KAction *prior( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *prior( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Prior, name, recvr, slot, parent ); }
-KAction *next( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *next( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Next, name, recvr, slot, parent ); }
-KAction *goTo( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *goTo( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Goto, name, recvr, slot, parent ); }
-KAction *gotoPage( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *gotoPage( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( GotoPage, name, recvr, slot, parent ); }
-KAction *gotoLine( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *gotoLine( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( GotoLine, name, recvr, slot, parent ); }
-KAction *firstPage( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *firstPage( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( FirstPage, name, recvr, slot, parent ); }
-KAction *lastPage( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *lastPage( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( LastPage, name, recvr, slot, parent ); }
-KAction *addBookmark( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *addBookmark( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( AddBookmark, name, recvr, slot, parent ); }
-KAction *editBookmarks( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *editBookmarks( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( EditBookmarks, name, recvr, slot, parent ); }
-KAction *spelling( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *spelling( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Spelling, name, recvr, slot, parent ); }
 
-KToggleAction *showMenubar( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *_name )
+TDEToggleAction *showMenubar( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *_name )
 {
-    KToggleAction *ret;
-    ret = new KToggleAction(i18n("Show &Menubar"), "showmenu", KStdAccel::shortcut(KStdAccel::ShowMenubar), recvr, slot,
+    TDEToggleAction *ret;
+    ret = new TDEToggleAction(i18n("Show &Menubar"), "showmenu", TDEStdAccel::shortcut(TDEStdAccel::ShowMenubar), recvr, slot,
                             parent, _name ? _name : name(ShowMenubar));
     ret->setWhatsThis( i18n( "Show Menubar<p>"
                              "Shows the menubar again after it has been hidden" ) );
@@ -248,10 +248,10 @@ KToggleAction *showMenubar( const TQObject *recvr, const char *slot, KActionColl
 }
 
 // obsolete
-KToggleAction *showToolbar( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *_name )
+TDEToggleAction *showToolbar( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *_name )
 {
-    KToggleAction *ret;
-    ret = new KToggleAction(i18n("Show &Toolbar"), 0, recvr, slot, parent,
+    TDEToggleAction *ret;
+    ret = new TDEToggleAction(i18n("Show &Toolbar"), 0, recvr, slot, parent,
                             _name ? _name : name(ShowToolbar));
     ret->setChecked(true);
     return ret;
@@ -259,19 +259,19 @@ KToggleAction *showToolbar( const TQObject *recvr, const char *slot, KActionColl
 }
 
 // obsolete
-KToggleToolBarAction *showToolbar( const char* toolBarName, KActionCollection* parent, const char *_name )
+TDEToggleToolBarAction *showToolbar( const char* toolBarName, TDEActionCollection* parent, const char *_name )
 {
-    KToggleToolBarAction *ret;
-    ret = new KToggleToolBarAction(toolBarName, i18n("Show &Toolbar"), parent,
+    TDEToggleToolBarAction *ret;
+    ret = new TDEToggleToolBarAction(toolBarName, i18n("Show &Toolbar"), parent,
                             _name ? _name : name(ShowToolbar));
     return ret;
 }
 
-KToggleAction *showStatusbar( const TQObject *recvr, const char *slot,
-                                         KActionCollection* parent, const char *_name )
+TDEToggleAction *showStatusbar( const TQObject *recvr, const char *slot,
+                                         TDEActionCollection* parent, const char *_name )
 {
-    KToggleAction *ret;
-    ret = new KToggleAction(i18n("Show St&atusbar"), 0, recvr, slot, parent,
+    TDEToggleAction *ret;
+    ret = new TDEToggleAction(i18n("Show St&atusbar"), 0, recvr, slot, parent,
                             _name ? _name : name(ShowStatusbar));
     ret->setWhatsThis( i18n( "Show Statusbar<p>"
                              "Shows the statusbar, which is the bar at the bottom of the window used for status information." ) );
@@ -284,40 +284,40 @@ KToggleAction *showStatusbar( const TQObject *recvr, const char *slot,
     return ret;
 }
 
-KToggleFullScreenAction *fullScreen( const TQObject *recvr, const char *slot, KActionCollection* parent,
+TDEToggleFullScreenAction *fullScreen( const TQObject *recvr, const char *slot, TDEActionCollection* parent,
     TQWidget* window, const char *name )
 {
-    KToggleFullScreenAction *ret;
-    ret = static_cast< KToggleFullScreenAction* >( KStdAction::create( FullScreen, name, recvr, slot, parent ));
+    TDEToggleFullScreenAction *ret;
+    ret = static_cast< TDEToggleFullScreenAction* >( KStdAction::create( FullScreen, name, recvr, slot, parent ));
     ret->setWindow( window );
     return ret;
 }
 
-KAction *saveOptions( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *saveOptions( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( SaveOptions, name, recvr, slot, parent ); }
-KAction *keyBindings( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *keyBindings( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( KeyBindings, name, recvr, slot, parent ); }
-KAction *preferences( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *preferences( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Preferences, name, recvr, slot, parent ); }
-KAction *configureToolbars( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *configureToolbars( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( ConfigureToolbars, name, recvr, slot, parent ); }
-KAction *configureNotifications( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *configureNotifications( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( ConfigureNotifications, name, recvr, slot, parent ); }
-KAction *help( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *help( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( Help, name, recvr, slot, parent ); }
-KAction *helpContents( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *helpContents( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( HelpContents, name, recvr, slot, parent ); }
-KAction *whatsThis( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *whatsThis( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( WhatsThis, name, recvr, slot, parent ); }
-KAction *tipOfDay( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *tipOfDay( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( TipofDay, name, recvr, slot, parent ); }
-KAction *reportBug( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *reportBug( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( ReportBug, name, recvr, slot, parent ); }
-KAction *switchApplicationLanguage( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *switchApplicationLanguage( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( SwitchApplicationLanguage, name, recvr, slot, parent ); }
-KAction *aboutApp( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *aboutApp( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( AboutApp, name, recvr, slot, parent ); }
-KAction *aboutKDE( const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name )
+TDEAction *aboutKDE( const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name )
 	{ return KStdAction::create( AboutKDE, name, recvr, slot, parent ); }
 
 }
diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h
index 7fa18968d..31b80618c 100644
--- a/tdeui/kstdaction.h
+++ b/tdeui/kstdaction.h
@@ -21,12 +21,12 @@
 
 class TQObject;
 class TQWidget;
-class KAction;
-class KActionCollection;
-class KRecentFilesAction;
-class KToggleAction;
-class KToggleToolBarAction;
-class KToggleFullScreenAction;
+class TDEAction;
+class TDEActionCollection;
+class TDERecentFilesAction;
+class TDEToggleAction;
+class TDEToggleToolBarAction;
+class TDEToggleFullScreenAction;
 
 #include <tqstringlist.h>
 
@@ -40,8 +40,8 @@ class KToggleFullScreenAction;
  * conform to the KDE UI Style Guide
  * @see http://developer.kde.org/documentation/standards/kde/style/basics/index.html .
  *
- * All of the documentation for KAction holds for KStdAction
- * also.  When in doubt on how things work, check the KAction
+ * All of the documentation for TDEAction holds for KStdAction
+ * also.  When in doubt on how things work, check the TDEAction
  * documention first.
  *
  * <b>Simple Example:</b>\n
@@ -50,15 +50,15 @@ class KToggleFullScreenAction;
  * for regular actions.  For example, if you previously had:
  *
  * \code
- * KAction *newAct = new KAction(i18n("&New"), TQIconSet(BarIcon("filenew")),
- *                               KStdAccel::shortcut(KStdAccel::New), this,
+ * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("filenew")),
+ *                               TDEStdAccel::shortcut(TDEStdAccel::New), this,
  *                               TQT_SLOT(fileNew()), actionCollection());
  * \endcode
  *
  * You could drop that and replace it with:
  *
  * \code
- * KAction *newAct = KStdAction::openNew(this, TQT_SLOT(fileNew()),
+ * TDEAction *newAct = KStdAction::openNew(this, TQT_SLOT(fileNew()),
  *                                       actionCollection());
  * \endcode
  *
@@ -97,7 +97,7 @@ class KToggleFullScreenAction;
  * could do it the hard way:
  *
  * \code
- * KAction *cut = actionCollection()->action(KStdAction::stdName(KStdAction::Cut));
+ * TDEAction *cut = actionCollection()->action(KStdAction::stdName(KStdAction::Cut));
  * \endcode
  *
  * Another non-standard usage concerns instantiating the action in the
@@ -165,22 +165,22 @@ namespace KStdAction
 	 * Creates an action corresponding to the
 	 * KStdAction::StdAction enum.
 	 */
-	TDEUI_EXPORT KAction* create( StdAction id, const char *name,
+	TDEUI_EXPORT TDEAction* create( StdAction id, const char *name,
 		const TQObject *recvr, const char *slot,
-		KActionCollection* parent );
+		TDEActionCollection* parent );
 
-	inline KAction* create( StdAction id,
+	inline TDEAction* create( StdAction id,
 		const TQObject *recvr, const char *slot,
-		KActionCollection* parent )
+		TDEActionCollection* parent )
 		{ return KStdAction::create( id, 0, recvr, slot, parent ); }
 
 	/**
 	* @obsolete. Creates an action corresponding to the
 	* KStdAction::StdAction enum.
 	*/
-	inline KAction *action(StdAction act_enum,
+	inline TDEAction *action(StdAction act_enum,
 		const TQObject *recvr, const char *slot,
-		KActionCollection *parent, const char *name = 0L )
+		TDEActionCollection *parent, const char *name = 0L )
 		{ return KStdAction::create( act_enum, name, recvr, slot, parent ); }
 
 	/**
@@ -192,7 +192,7 @@ namespace KStdAction
 	inline const char* stdName(StdAction act_enum) { return name( act_enum ); }
 
        /**
-         * Returns a list of all standard names. Used by KAccelManager
+         * Returns a list of all standard names. Used by TDEAccelManager
          * to give those heigher weight.
 	 * @since 3.1
         */
@@ -201,12 +201,12 @@ namespace KStdAction
 	/**
 	 * Create a new document or window.
 	 */
-	TDEUI_EXPORT KAction *openNew(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *openNew(const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Open an existing file.
 	 */
-	TDEUI_EXPORT KAction *open(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *open(const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Open a recently used document. The signature of the slot being called
@@ -217,87 +217,87 @@ namespace KStdAction
 	 * @param parent parent widget
 	 * @param name name of widget
 	 */
-	TDEUI_EXPORT KRecentFilesAction *openRecent(const TQObject *recvr, const char *slot, KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDERecentFilesAction *openRecent(const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	 * Save the current document.
 	 */
-	TDEUI_EXPORT KAction *save(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *save(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Save the current document under a different name.
 	*/
-	TDEUI_EXPORT KAction *saveAs(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *saveAs(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Revert the current document to the last saved version
 	* (essentially will undo all changes).
 	*/
-	TDEUI_EXPORT KAction *revert(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *revert(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Close the current document.
 	*/
-	TDEUI_EXPORT KAction *close(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *close(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Print the current document.
 	*/
-	TDEUI_EXPORT KAction *print(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *print(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Show a print preview of the current document.
 	*/
-	TDEUI_EXPORT KAction *printPreview(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *printPreview(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Mail this document.
 	*/
-	TDEUI_EXPORT KAction *mail(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *mail(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Quit the program.
 	*/
-	TDEUI_EXPORT KAction *quit(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *quit(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Undo the last operation.
 	*/
-	TDEUI_EXPORT KAction *undo(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *undo(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Redo the last operation.
 	*/
-	TDEUI_EXPORT KAction *redo(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *redo(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Cut selected area and store it in the clipboard.
 	*/
-	TDEUI_EXPORT KAction *cut(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *cut(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Copy the selected area into the clipboard.
 	*/
-	TDEUI_EXPORT KAction *copy(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *copy(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Paste the contents of clipboard at the current mouse or cursor
 	* position.
 	*/
-	TDEUI_EXPORT KAction *paste(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *paste(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Paste the contents of clipboard at the current mouse or cursor
@@ -305,228 +305,228 @@ namespace KStdAction
 	* menu if Klipper is running.
 	* @since 3.2
 	*/
-	TDEUI_EXPORT KAction *pasteText(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *pasteText(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Clear the content of the focus widget
 	* @since 3.2
 	*/
-	TDEUI_EXPORT KAction *clear(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *clear(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Select all elements in the current document.
 	*/
-	TDEUI_EXPORT KAction *selectAll(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *selectAll(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Deselect any selected elements in the current document.
 	*/
-	TDEUI_EXPORT KAction *deselect(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *deselect(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Initiate a 'find' request in the current document.
 	*/
-	TDEUI_EXPORT KAction *find(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *find(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find the next instance of a stored 'find'.
 	*/
-	TDEUI_EXPORT KAction *findNext(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *findNext(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find a previous instance of a stored 'find'.
 	*/
-	TDEUI_EXPORT KAction *findPrev(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *findPrev(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Find and replace matches.
 	*/
-	TDEUI_EXPORT KAction *replace(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *replace(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* View the document at its actual size.
 	*/
-	TDEUI_EXPORT KAction *actualSize(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *actualSize(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the size of the current window.
 	*/
-	TDEUI_EXPORT KAction *fitToPage(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *fitToPage(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the width of the current window.
 	*/
-	TDEUI_EXPORT KAction *fitToWidth(const TQObject *recvr, const char *slot,
-		KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *fitToWidth(const TQObject *recvr, const char *slot,
+		TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Fit the document view to the height of the current window.
 	*/
-	TDEUI_EXPORT KAction *fitToHeight(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *fitToHeight(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Zoom in.
 	*/
-	TDEUI_EXPORT KAction *zoomIn(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *zoomIn(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Zoom out.
 	*/
-	TDEUI_EXPORT KAction *zoomOut(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *zoomOut(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Popup a zoom dialog.
 	*/
-	TDEUI_EXPORT KAction *zoom(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *zoom(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Redisplay or redraw the document.
 	*/
-	TDEUI_EXPORT KAction *redisplay(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *redisplay(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move up (web style menu).
 	*/
-	TDEUI_EXPORT KAction *up(const TQObject *recvr, const char *slot,
-			KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *up(const TQObject *recvr, const char *slot,
+			TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move back (web style menu).
 	*/
-	TDEUI_EXPORT KAction *back(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *back(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Move forward (web style menu).
 	*/
-	TDEUI_EXPORT KAction *forward(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *forward(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to the "Home" position or document.
 	*/
-	TDEUI_EXPORT KAction *home(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *home(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Scroll up one page.
 	*/
-	TDEUI_EXPORT KAction *prior(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *prior(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Scroll down one page.
 	*/
-	TDEUI_EXPORT KAction *next(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *next(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to somewhere in general.
 	*/
-	TDEUI_EXPORT KAction *goTo(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *goTo(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 
 	/**
 	* Go to a specific page (dialog).
 	*/
-	TDEUI_EXPORT KAction *gotoPage(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *gotoPage(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Go to a specific line (dialog).
 	*/
-	TDEUI_EXPORT KAction *gotoLine(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *gotoLine(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Jump to the first page.
 	*/
-	TDEUI_EXPORT KAction *firstPage(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *firstPage(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Jump to the last page.
 	*/
-	TDEUI_EXPORT KAction *lastPage(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *lastPage(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Add the current page to the bookmarks tree.
 	*/
-	TDEUI_EXPORT KAction *addBookmark(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *addBookmark(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Edit the application bookmarks.
 	*/
-	TDEUI_EXPORT KAction *editBookmarks(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *editBookmarks(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Pop up the spell checker.
 	*/
-	TDEUI_EXPORT KAction *spelling(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *spelling(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 
 	/**
 	* Show/Hide the menubar.
 	*/
-	TDEUI_EXPORT KToggleAction *showMenubar(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEToggleAction *showMenubar(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* @obsolete. toolbar actions are created automatically now in the
 	* Settings menu. Don't use this anymore.
-	* See: KMainWindow::createStandardStatusBarAction()
+	* See: TDEMainWindow::createStandardStatusBarAction()
 	* Show/Hide the primary toolbar.
 	* @since 3.1
 	*/
-	TDEUI_EXPORT KToggleAction *showToolbar(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
+	TDEUI_EXPORT TDEToggleAction *showToolbar(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
 	/**
 	* @obsolete. toolbar actions are created automatically now in the
 	* Settings menu. Don't use this anymore.
-	* See: KMainWindow::setStandardToolBarMenuEnabled(bool);
+	* See: TDEMainWindow::setStandardToolBarMenuEnabled(bool);
 	* Show/Hide the primary toolbar.
 	*/
-	TDEUI_EXPORT KToggleToolBarAction *showToolbar(const char* toolBarName,
-					KActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
+	TDEUI_EXPORT TDEToggleToolBarAction *showToolbar(const char* toolBarName,
+					TDEActionCollection* parent, const char *name = 0 ) KDE_DEPRECATED;
 
 	/**
 	* Show/Hide the statusbar.
 	*/
-	TDEUI_EXPORT KToggleAction *showStatusbar(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEToggleAction *showStatusbar(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Switch to/from full screen mode
 	* @since 3.2
 	*/
-	TDEUI_EXPORT KToggleFullScreenAction *fullScreen(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, TQWidget* window, const char *name = 0 );
+	TDEUI_EXPORT TDEToggleFullScreenAction *fullScreen(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, TQWidget* window, const char *name = 0 );
 
 	/**
 	* Display the save options dialog.
 	*/
-	TDEUI_EXPORT KAction *saveOptions(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *saveOptions(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the configure key bindings dialog.
@@ -534,81 +534,81 @@ namespace KStdAction
 	*  Note that you might be able to use the pre-built KXMLGUIFactory's fuction:
 	*  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
         */
-	TDEUI_EXPORT KAction *keyBindings(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *keyBindings(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the preferences/options dialog.
 	*/
-	TDEUI_EXPORT KAction *preferences(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *preferences(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* The Customize Toolbar dialog.
 	*/
-	TDEUI_EXPORT KAction *configureToolbars(const TQObject *recvr,
+	TDEUI_EXPORT TDEAction *configureToolbars(const TQObject *recvr,
 					const char *slot,
-					KActionCollection* parent,
+					TDEActionCollection* parent,
 					const char *name = 0 );
 
 	/**
 	* The Configure Notifications dialog.
 	* @since 3.1
 	*/
-	TDEUI_EXPORT KAction *configureNotifications(const TQObject *recvr,
+	TDEUI_EXPORT TDEAction *configureNotifications(const TQObject *recvr,
 					const char *slot,
-					KActionCollection *parent,
+					TDEActionCollection *parent,
 					const char *name = 0);
 
 	/**
 	* Display the help.
 	*/
-	TDEUI_EXPORT KAction *help(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *help(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the help contents.
 	*/
-	TDEUI_EXPORT KAction *helpContents(const TQObject *recvr, const char *slot,
-					KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *helpContents(const TQObject *recvr, const char *slot,
+					TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Trigger the What's This cursor.
 	*/
-	TDEUI_EXPORT KAction *whatsThis(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *whatsThis(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display "Tip of the Day"
 	* @since 3.1
 	*/
-	TDEUI_EXPORT KAction *tipOfDay(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *tipOfDay(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Open up the Report Bug dialog.
 	*/
-	TDEUI_EXPORT KAction *reportBug(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *reportBug(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the application's About box.
 	*/
-	TDEUI_EXPORT KAction *aboutApp(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *aboutApp(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display the About KDE dialog.
 	*/
-	TDEUI_EXPORT KAction *aboutKDE(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *aboutKDE(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 
 	/**
 	* Display "Switch application language" dialog.
 	* @since 3.5.8
 	*/
-	TDEUI_EXPORT KAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
-				KActionCollection* parent, const char *name = 0 );
+	TDEUI_EXPORT TDEAction *switchApplicationLanguage(const TQObject *recvr, const char *slot,
+				TDEActionCollection* parent, const char *name = 0 );
 }
 
 #endif // KSTDACTION_H
diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h
index f7e649fa8..4a8fee92e 100644
--- a/tdeui/kstdaction_p.h
+++ b/tdeui/kstdaction_p.h
@@ -19,8 +19,8 @@
 #ifndef _KSTDACTION_PRIVATE_H_
 #define _KSTDACTION_PRIVATE_H_
 
-#include <klocale.h>
-#include <kstdaccel.h>
+#include <tdelocale.h>
+#include <tdestdaccel.h>
 
 namespace KStdAction
 {
@@ -28,7 +28,7 @@ namespace KStdAction
 struct KStdActionInfo
 {
 	StdAction id;
-	KStdAccel::StdAccel idAccel;
+	TDEStdAccel::StdAccel idAccel;
 	const char* psName;
 	const char* psLabel;
 	const char* psWhatsThis;
@@ -37,82 +37,82 @@ struct KStdActionInfo
 
 static const KStdActionInfo g_rgActionInfo[] =
 {
-	{ New,           KStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "filenew" },
-	{ Open,          KStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "fileopen" },
-	{ OpenRecent,    KStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "fileopen" },
-	{ Save,          KStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "filesave" },
-	{ SaveAs,        KStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" },
-	{ Revert,        KStdAccel::AccelNone, "file_revert", I18N_NOOP("Re&vert"), 0, "revert" },
-	{ Close,         KStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "fileclose" },
-	{ Print,         KStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "fileprint" },
-	{ PrintPreview,  KStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "filequickprint" },
-	{ Mail,          KStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" },
-	{ Quit,          KStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" },
-
-	{ Undo,          KStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "undo" },
-	{ Redo,          KStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "redo" },
-	{ Cut,           KStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "editcut" },
-	{ Copy,          KStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "editcopy" },
-	{ Paste,         KStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" },
-	{ PasteText,     KStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" },
-	{ Clear,         KStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" },
-	{ SelectAll,     KStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 },
-	{ Deselect,      KStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 },
-	{ Find,          KStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "find" },
-	{ FindNext,      KStdAccel::FindNext, "edit_find_next", I18N_NOOP("Find &Next"), 0, "next" },
+	{ New,           TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "filenew" },
+	{ Open,          TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "fileopen" },
+	{ OpenRecent,    TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "fileopen" },
+	{ Save,          TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "filesave" },
+	{ SaveAs,        TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" },
+	{ Revert,        TDEStdAccel::AccelNone, "file_revert", I18N_NOOP("Re&vert"), 0, "revert" },
+	{ Close,         TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "fileclose" },
+	{ Print,         TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "fileprint" },
+	{ PrintPreview,  TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "filequickprint" },
+	{ Mail,          TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" },
+	{ Quit,          TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" },
+
+	{ Undo,          TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "undo" },
+	{ Redo,          TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "redo" },
+	{ Cut,           TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "editcut" },
+	{ Copy,          TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "editcopy" },
+	{ Paste,         TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" },
+	{ PasteText,     TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" },
+	{ Clear,         TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" },
+	{ SelectAll,     TDEStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 },
+	{ Deselect,      TDEStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 },
+	{ Find,          TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "find" },
+	{ FindNext,      TDEStdAccel::FindNext, "edit_find_next", I18N_NOOP("Find &Next"), 0, "next" },
 	// FIXME: rename edit_find_last to edit_find_prev for KDE 4
-	{ FindPrev,      KStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "previous" },
-	{ Replace,       KStdAccel::Replace, "edit_replace", I18N_NOOP("&Replace..."), 0, 0 },
-
-	{ ActualSize,    KStdAccel::AccelNone, "view_actual_size", I18N_NOOP("&Actual Size"), 0, "viewmag1" },
-	{ FitToPage,     KStdAccel::AccelNone, "view_fit_to_page", I18N_NOOP("&Fit to Page"), 0, "view_fit_window" },
-	{ FitToWidth,    KStdAccel::AccelNone, "view_fit_to_width", I18N_NOOP("Fit to Page &Width"), 0, "view_fit_width" },
-	{ FitToHeight,   KStdAccel::AccelNone, "view_fit_to_height", I18N_NOOP("Fit to Page &Height"), 0, "view_fit_height" },
-	{ ZoomIn,        KStdAccel::ZoomIn, "view_zoom_in", I18N_NOOP("Zoom &In"), 0, "viewmag+" },
-	{ ZoomOut,       KStdAccel::ZoomOut, "view_zoom_out", I18N_NOOP("Zoom &Out"), 0, "viewmag-" },
-	{ Zoom,          KStdAccel::AccelNone, "view_zoom", I18N_NOOP("&Zoom..."), 0, "viewmag" },
-        // KDE4: give Redisplay the shortcut KStdAccel::AccelReload
-	{ Redisplay,     KStdAccel::AccelNone, "view_redisplay", I18N_NOOP("&Redisplay"), 0, "reload" },
-
-	{ Up,            KStdAccel::Up, "go_up", I18N_NOOP("&Up"), 0, "up" },
+	{ FindPrev,      TDEStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "previous" },
+	{ Replace,       TDEStdAccel::Replace, "edit_replace", I18N_NOOP("&Replace..."), 0, 0 },
+
+	{ ActualSize,    TDEStdAccel::AccelNone, "view_actual_size", I18N_NOOP("&Actual Size"), 0, "viewmag1" },
+	{ FitToPage,     TDEStdAccel::AccelNone, "view_fit_to_page", I18N_NOOP("&Fit to Page"), 0, "view_fit_window" },
+	{ FitToWidth,    TDEStdAccel::AccelNone, "view_fit_to_width", I18N_NOOP("Fit to Page &Width"), 0, "view_fit_width" },
+	{ FitToHeight,   TDEStdAccel::AccelNone, "view_fit_to_height", I18N_NOOP("Fit to Page &Height"), 0, "view_fit_height" },
+	{ ZoomIn,        TDEStdAccel::ZoomIn, "view_zoom_in", I18N_NOOP("Zoom &In"), 0, "viewmag+" },
+	{ ZoomOut,       TDEStdAccel::ZoomOut, "view_zoom_out", I18N_NOOP("Zoom &Out"), 0, "viewmag-" },
+	{ Zoom,          TDEStdAccel::AccelNone, "view_zoom", I18N_NOOP("&Zoom..."), 0, "viewmag" },
+        // KDE4: give Redisplay the shortcut TDEStdAccel::AccelReload
+	{ Redisplay,     TDEStdAccel::AccelNone, "view_redisplay", I18N_NOOP("&Redisplay"), 0, "reload" },
+
+	{ Up,            TDEStdAccel::Up, "go_up", I18N_NOOP("&Up"), 0, "up" },
 	// The following three have special i18n() needs for sLabel
-	{ Back,          KStdAccel::Back, "go_back", 0, 0, "back" },
-	{ Forward,       KStdAccel::Forward, "go_forward", 0, 0, "forward" },
-	{ Home,          KStdAccel::Home, "go_home", 0, 0, "gohome" },
-	{ Prior,         KStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "back" },
-	{ Next,          KStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "forward" },
-	{ Goto,          KStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 },
-	{ GotoPage,      KStdAccel::AccelNone, "go_goto_page", I18N_NOOP("&Go to Page..."), 0, "goto" },
-	{ GotoLine,      KStdAccel::GotoLine, "go_goto_line", I18N_NOOP("&Go to Line..."), 0, 0 },
-	{ FirstPage,     KStdAccel::Home, "go_first", I18N_NOOP("&First Page"), 0, "start" },
-	{ LastPage,      KStdAccel::End, "go_last", I18N_NOOP("&Last Page"), 0, "finish" },
-
-	{ AddBookmark,   KStdAccel::AddBookmark, "bookmark_add", I18N_NOOP("&Add Bookmark"), 0, "bookmark_add" },
-	{ EditBookmarks, KStdAccel::AccelNone, "bookmark_edit", I18N_NOOP("&Edit Bookmarks"), 0, "bookmark" },
-
-	{ Spelling,      KStdAccel::AccelNone, "tools_spelling", I18N_NOOP("&Spelling..."), 0, "spellcheck" },
-
-	{ ShowMenubar,   KStdAccel::ShowMenubar, "options_show_menubar", I18N_NOOP("Show &Menubar"), 0, "showmenu" },
-	{ ShowToolbar,   KStdAccel::AccelNone, "options_show_toolbar", I18N_NOOP("Show &Toolbar"), 0, 0 },
-	{ ShowStatusbar, KStdAccel::AccelNone, "options_show_statusbar", I18N_NOOP("Show St&atusbar"), 0, 0 },
-	{ FullScreen,    KStdAccel::FullScreen, "fullscreen", I18N_NOOP("F&ull Screen Mode"), 0, "window_fullscreen" },
-	{ SaveOptions,   KStdAccel::AccelNone, "options_save_options", I18N_NOOP("&Save Settings"), 0, 0 },
-	{ KeyBindings,   KStdAccel::AccelNone, "options_configure_keybinding", I18N_NOOP("Configure S&hortcuts..."), 0,"configure_shortcuts" },
-	{ Preferences,   KStdAccel::AccelNone, "options_configure", I18N_NOOP("&Configure %1..."), 0, "configure" },
-	{ ConfigureToolbars, KStdAccel::AccelNone, "options_configure_toolbars", I18N_NOOP("Configure Tool&bars..."), 0,"configure_toolbars" },
-	{ ConfigureNotifications, KStdAccel::AccelNone, "options_configure_notifications", I18N_NOOP("Configure &Notifications..."), 0, "knotify" },
+	{ Back,          TDEStdAccel::Back, "go_back", 0, 0, "back" },
+	{ Forward,       TDEStdAccel::Forward, "go_forward", 0, 0, "forward" },
+	{ Home,          TDEStdAccel::Home, "go_home", 0, 0, "gohome" },
+	{ Prior,         TDEStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "back" },
+	{ Next,          TDEStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "forward" },
+	{ Goto,          TDEStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 },
+	{ GotoPage,      TDEStdAccel::AccelNone, "go_goto_page", I18N_NOOP("&Go to Page..."), 0, "goto" },
+	{ GotoLine,      TDEStdAccel::GotoLine, "go_goto_line", I18N_NOOP("&Go to Line..."), 0, 0 },
+	{ FirstPage,     TDEStdAccel::Home, "go_first", I18N_NOOP("&First Page"), 0, "start" },
+	{ LastPage,      TDEStdAccel::End, "go_last", I18N_NOOP("&Last Page"), 0, "finish" },
+
+	{ AddBookmark,   TDEStdAccel::AddBookmark, "bookmark_add", I18N_NOOP("&Add Bookmark"), 0, "bookmark_add" },
+	{ EditBookmarks, TDEStdAccel::AccelNone, "bookmark_edit", I18N_NOOP("&Edit Bookmarks"), 0, "bookmark" },
+
+	{ Spelling,      TDEStdAccel::AccelNone, "tools_spelling", I18N_NOOP("&Spelling..."), 0, "spellcheck" },
+
+	{ ShowMenubar,   TDEStdAccel::ShowMenubar, "options_show_menubar", I18N_NOOP("Show &Menubar"), 0, "showmenu" },
+	{ ShowToolbar,   TDEStdAccel::AccelNone, "options_show_toolbar", I18N_NOOP("Show &Toolbar"), 0, 0 },
+	{ ShowStatusbar, TDEStdAccel::AccelNone, "options_show_statusbar", I18N_NOOP("Show St&atusbar"), 0, 0 },
+	{ FullScreen,    TDEStdAccel::FullScreen, "fullscreen", I18N_NOOP("F&ull Screen Mode"), 0, "window_fullscreen" },
+	{ SaveOptions,   TDEStdAccel::AccelNone, "options_save_options", I18N_NOOP("&Save Settings"), 0, 0 },
+	{ KeyBindings,   TDEStdAccel::AccelNone, "options_configure_keybinding", I18N_NOOP("Configure S&hortcuts..."), 0,"configure_shortcuts" },
+	{ Preferences,   TDEStdAccel::AccelNone, "options_configure", I18N_NOOP("&Configure %1..."), 0, "configure" },
+	{ ConfigureToolbars, TDEStdAccel::AccelNone, "options_configure_toolbars", I18N_NOOP("Configure Tool&bars..."), 0,"configure_toolbars" },
+	{ ConfigureNotifications, TDEStdAccel::AccelNone, "options_configure_notifications", I18N_NOOP("Configure &Notifications..."), 0, "knotify" },
 
 	// the idea here is that Contents is used in menus, and Help in dialogs, so both share the same
 	// shortcut
-	{ Help,          KStdAccel::Help, "help", 0, 0, "help" },
-	{ HelpContents,  KStdAccel::Help, "help_contents", I18N_NOOP("%1 &Handbook"), 0, "contents" },
-	{ WhatsThis,     KStdAccel::WhatsThis, "help_whats_this", I18N_NOOP("What's &This?"), 0, "contexthelp" },
-	{ TipofDay,      KStdAccel::AccelNone, "help_show_tip", I18N_NOOP("Tip of the &Day"), 0, "idea" },
-	{ ReportBug,     KStdAccel::AccelNone, "help_report_bug", I18N_NOOP("&Report Bug/Request Enhancement..."), 0, 0 },
-	{ SwitchApplicationLanguage,     KStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, 0 },
-	{ AboutApp,      KStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
-	{ AboutKDE,      KStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },
-	{ ActionNone, KStdAccel::AccelNone, 0, 0, 0, 0 }
+	{ Help,          TDEStdAccel::Help, "help", 0, 0, "help" },
+	{ HelpContents,  TDEStdAccel::Help, "help_contents", I18N_NOOP("%1 &Handbook"), 0, "contents" },
+	{ WhatsThis,     TDEStdAccel::WhatsThis, "help_whats_this", I18N_NOOP("What's &This?"), 0, "contexthelp" },
+	{ TipofDay,      TDEStdAccel::AccelNone, "help_show_tip", I18N_NOOP("Tip of the &Day"), 0, "idea" },
+	{ ReportBug,     TDEStdAccel::AccelNone, "help_report_bug", I18N_NOOP("&Report Bug/Request Enhancement..."), 0, 0 },
+	{ SwitchApplicationLanguage,     TDEStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, 0 },
+	{ AboutApp,      TDEStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
+	{ AboutKDE,      TDEStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },
+	{ ActionNone, TDEStdAccel::AccelNone, 0, 0, 0, 0 }
 };
 
 inline const KStdActionInfo* infoPtr( StdAction id )
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index 2367804a8..80bf54bce 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -19,8 +19,8 @@
 #include "kstdguiitem.h"
 
 #include <kguiitem.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 
 KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
 {
diff --git a/tdeui/kstdguiitem.h b/tdeui/kstdguiitem.h
index 3014737ab..0a59d5969 100644
--- a/tdeui/kstdguiitem.h
+++ b/tdeui/kstdguiitem.h
@@ -86,7 +86,7 @@ public:
     static KGuiItem overwrite();
     /**
      * Returns a KGuiItem suiting for cases where code or functionality
-     * runs under root privileges. Used in conjunction with KConfig Modules.
+     * runs under root privileges. Used in conjunction with TDEConfig Modules.
      */
     static KGuiItem adminMode();
 
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index fa43dcaf2..c82ffb83d 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -27,9 +27,9 @@
 #include <tqmap.h>
 
 #include <klanguagebutton.h>
-#include <kconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 
@@ -114,7 +114,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog(
     
     if (defaultLanguages.count() == 0)
     {
-        d->addLanguageButton(KGlobal::locale()->defaultLanguage(), true);
+        d->addLanguageButton(TDEGlobal::locale()->defaultLanguage(), true);
     }
     
     TQHBoxLayout *addButtonHorizontalLayout = new TQHBoxLayout();
@@ -185,7 +185,7 @@ void KSwitchLanguageDialog::languageOnButtonChanged(const TQString & languageCod
         {
             //update all buttons which have matching id
             //might update buttons which were not changed, but well...
-            languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode));
+            languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode));
         }
     }
 }
@@ -207,12 +207,12 @@ void KSwitchLanguageDialog::slotOk()
         first = false;
     }
     
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     
     if (d->applicationLanguageList().join(":") != languageString)
     {
         //list is different from defaults or saved languages list
-        KConfigGroup group(config, "Locale");
+        TDEConfigGroup group(config, "Locale");
     
         group.writeEntry("Language", languageString);
         config->sync();
@@ -241,7 +241,7 @@ KSwitchLanguageDialogPrivate::KSwitchLanguageDialogPrivate(
 
 void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *button)
 {
-    KLocale *locale = KGlobal::locale();
+    TDELocale *locale = TDEGlobal::locale();
     TQStringList allLanguages = locale->allLanguagesTwoAlpha();
     for ( TQStringList::ConstIterator it = allLanguages.begin(); it != allLanguages.end(); ++it )
     {
@@ -258,12 +258,12 @@ void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *but
 
 TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList()
 {
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     TQStringList languagesList;
     
     if (config->hasGroup("Locale"))
     {
-        KConfigGroupSaver saver(config, "Locale");
+        TDEConfigGroupSaver saver(config, "Locale");
         
         if (config->hasKey("Language"))
         {
@@ -272,7 +272,7 @@ TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList()
     }
     if (languagesList.empty())
     {
-        languagesList = KGlobal::locale()->languageList();
+        languagesList = TDEGlobal::locale()->languageList();
     }
     return languagesList;
 }
@@ -283,7 +283,7 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo
     
     KLanguageButton *languageButton = new KLanguageButton(page);
     
-    languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode));
+    languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode));
     
     fillApplicationLanguages(languageButton);
     
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index e118fcd74..f7627621c 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -26,12 +26,12 @@
 #include <tqsyntaxhighlighter.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kspell.h>
-#include <kapplication.h>
+#include <tdeglobal.h>
+#include <tdespell.h>
+#include <tdeapplication.h>
 
 #include "ksyntaxhighlighter.h"
 
@@ -234,7 +234,7 @@ TQStringList KSpellingHighlighter::personalWords()
     l.append( "KMail" );
     l.append( "KOrganizer" );
     l.append( "KAddressBook" );
-    l.append( "KHTML" );
+    l.append( "TDEHTML" );
     l.append( "KIO" );
     l.append( "KJS" );
     l.append( "Konqueror" );
@@ -290,8 +290,8 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit,
     d->checksDone = 0;
     d->completeRehighlightRequired = false;
 
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver cs( config, "KSpell" );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs( config, "KSpell" );
     d->disablePercentage = config->readNumEntry( "KSpell_AsYouTypeDisablePercentage", 42 );
     d->disablePercentage = QMIN( d->disablePercentage, 101 );
     d->disableWordCount = config->readNumEntry( "KSpell_AsYouTypeDisableWordCount", 100 );
@@ -335,7 +335,7 @@ KDictSpellingHighlighter::~KDictSpellingHighlighter()
 void KDictSpellingHighlighter::slotSpellReady( KSpell *spell )
 {
     kdDebug(0) << "KDictSpellingHighlighter::slotSpellReady( " << spell << " )" << endl;
-    KConfigGroup cg( KGlobal::config(),"KSpell" );
+    TDEConfigGroup cg( TDEGlobal::config(),"KSpell" );
     if ( cg.readEntry("KSpell_DoSpellChecking") != "0" )
     {
       if ( d->globalConfig ) {
@@ -371,7 +371,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word )
     // This debug is expensive, only enable it locally
     //kdDebug(0) << "KDictSpellingHighlighter::isMisspelled( \"" << word << "\" )" << endl;
     // Normally isMisspelled would look up a dictionary and return
-    // true or false, but kspell is asynchronous and slow so things
+    // true or false, but tdespell is asynchronous and slow so things
     // get tricky...
     // For auto detection ignore signature and reply prefix
     if ( !d->autoReady )
@@ -539,8 +539,8 @@ void KDictSpellingHighlighter::slotLocalSpellConfigChanged()
 
 TQString KDictSpellingHighlighter::spellKey()
 {
-    KConfig *config = KGlobal::config();
-    KConfigGroupSaver cs( config, "KSpell" );
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver cs( config, "KSpell" );
     config->reparseConfiguration();
     TQString key;
     key += TQString::number( config->readNumEntry( "KSpell_NoRootAffix", 0 ));
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 1ae786d67..5004d4bf1 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -19,14 +19,14 @@
 */
 
 #include "config.h"
-#include "kaction.h"
-#include "kmessagebox.h"
-#include "kshortcut.h"
+#include "tdeaction.h"
+#include "tdemessagebox.h"
+#include "tdeshortcut.h"
 #include "ksystemtray.h"
-#include "kpopupmenu.h"
-#include "kapplication.h"
-#include "klocale.h"
-#include "kaboutdata.h"
+#include "tdepopupmenu.h"
+#include "tdeapplication.h"
+#include "tdelocale.h"
+#include "tdeaboutdata.h"
 
 #ifdef Q_WS_X11
 #include <twin.h>
@@ -36,7 +36,7 @@
 
 #include <kimageeffect.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqapplication.h>
 #include <tqbitmap.h>
@@ -54,7 +54,7 @@ public:
         delete actionCollection;
     }
 
-    KActionCollection* actionCollection;
+    TDEActionCollection* actionCollection;
     bool on_all_desktops; // valid only when the parent widget was hidden
 };
 
@@ -66,7 +66,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
 #endif
 
     d = new KSystemTrayPrivate;
-    d->actionCollection = new KActionCollection(this);
+    d->actionCollection = new TDEActionCollection(this);
 
 #ifdef Q_WS_X11
     KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): tqt_xrootwin() );
@@ -74,14 +74,14 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
     setBackgroundMode(X11ParentRelative);
     setBackgroundOrigin(WindowOrigin);
     hasQuit = 0;
-    menu = new KPopupMenu( this );
+    menu = new TDEPopupMenu( this );
     menu->insertTitle( kapp->miniIcon(), kapp->caption() );
     move( -1000, -1000 );
     KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection);
 
     if (parentWidget())
     {
-        new KAction(i18n("Minimize"), KShortcut(),
+        new TDEAction(i18n("Minimize"), TDEShortcut(),
                     TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ),
                     d->actionCollection, "minimizeRestore");
 #ifdef Q_WS_X11
@@ -95,7 +95,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
     {
         d->on_all_desktops = false;
     }
-    setCaption( KGlobal::instance()->aboutData()->programName());
+    setCaption( TDEGlobal::instance()->aboutData()->programName());
     setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter );
 
     // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications
@@ -112,7 +112,7 @@ void KSystemTray::showEvent( TQShowEvent * )
 {
     if ( !hasQuit ) {
 	menu->insertSeparator();
-        KAction* action = d->actionCollection->action("minimizeRestore");
+        TDEAction* action = d->actionCollection->action("minimizeRestore");
 
         if (action)
         {
@@ -136,7 +136,7 @@ void KSystemTray::enterEvent( TQEvent* e )
     TQLabel::enterEvent( e );
 }
 
-KPopupMenu* KSystemTray::contextMenu() const
+TDEPopupMenu* KSystemTray::contextMenu() const
 {
     return menu;
 }
@@ -155,7 +155,7 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e )
 	// fall through
     case Qt::RightButton:
 	if ( parentWidget() ) {
-            KAction* action = d->actionCollection->action("minimizeRestore");
+            TDEAction* action = d->actionCollection->action("minimizeRestore");
 	    if ( parentWidget()->isVisible() )
 		action->setText( i18n("&Minimize") );
 	    else
@@ -175,7 +175,7 @@ void KSystemTray::mouseReleaseEvent( TQMouseEvent * )
 }
 
 
-void KSystemTray::contextMenuAboutToShow( KPopupMenu* )
+void KSystemTray::contextMenuAboutToShow( TDEPopupMenu* )
 {
 }
 
@@ -307,22 +307,22 @@ void KSystemTray::minimizeRestore( bool restore )
 #endif
 }
 
-KActionCollection* KSystemTray::actionCollection()
+TDEActionCollection* KSystemTray::actionCollection()
 {
     return d->actionCollection;
 }
 
-TQPixmap KSystemTray::loadIcon( const TQString &icon, KInstance *instance )
+TQPixmap KSystemTray::loadIcon( const TQString &icon, TDEInstance *instance )
 {
-    KConfig *appCfg = kapp->config();
-    KConfigGroupSaver configSaver(appCfg, "System Tray");
+    TDEConfig *appCfg = kapp->config();
+    TDEConfigGroupSaver configSaver(appCfg, "System Tray");
     int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
-    return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
+    return instance->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth );
 }
 
-TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance )
+TQPixmap KSystemTray::loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance )
 {
-    return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
+    return instance->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth );
 }
 
 void KSystemTray::setPixmap( const TQPixmap& p )
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index 79d73d3e3..f7e81c9b1 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -18,11 +18,11 @@
 #ifndef KSYSTEMTRAY_H
 #define KSYSTEMTRAY_H
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlabel.h>
 
-class KActionCollection;
-class KPopupMenu;
+class TDEActionCollection;
+class TDEPopupMenu;
 class KSystemTrayPrivate;
 
 /**
@@ -89,14 +89,14 @@ public:
        Access to the context menu. This makes it easy to add new items
        to it.
      */
-    KPopupMenu* contextMenu() const;
+    TDEPopupMenu* contextMenu() const;
 
     /**
        Easy access to the actions in the context menu
        Currently includes KStdAction::Quit and minimizeRestore
        @since 3.1
     */
-    KActionCollection* actionCollection();
+    TDEActionCollection* actionCollection();
 
     /**
      * Changes the tray's icon.
@@ -105,7 +105,7 @@ public:
 
     /**
      * Changes the tray's text description (which can be seen e.g. in the systray
-     * configuration dialog). The default value is KAboutData::programName().
+     * configuration dialog). The default value is TDEAboutData::programName().
      */
     virtual void setCaption( const TQString& title );
 
@@ -117,7 +117,7 @@ public:
      *
      * @since 3.2
      */
-    static TQPixmap loadIcon( const TQString &icon, KInstance *instance=KGlobal::instance() );
+    static TQPixmap loadIcon( const TQString &icon, TDEInstance *instance=TDEGlobal::instance() );
 
     /**
      * Loads an icon @p icon using the icon loader class of the given instance @p instance.
@@ -128,7 +128,7 @@ public:
      *
      * @since 3.5.12
      */
-    static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, KInstance *instance=KGlobal::instance() );
+    static TQPixmap loadSizedIcon( const TQString &icon, int iconWidth, TDEInstance *instance=TDEGlobal::instance() );
 
 signals:
     /**
@@ -183,7 +183,7 @@ protected:
        Makes it easy to adjust some menu items right before the
        context menu becomes visible.
      */
-    virtual void contextMenuAboutToShow( KPopupMenu* menu );
+    virtual void contextMenuAboutToShow( TDEPopupMenu* menu );
 
     /**
        Reimplemented for internal reasons.
@@ -202,7 +202,7 @@ private slots:
 private:
     void activateOrHide();
     void minimizeRestore( bool restore );
-    KPopupMenu* menu;
+    TDEPopupMenu* menu;
     // minimizeRestoreId is no longer needed. remove in KDE 4.0
     int minimizeRestoreId;
     uint hasQuit :1;
diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp
index a2d20a505..911162f14 100644
--- a/tdeui/ktabbar.cpp
+++ b/tdeui/ktabbar.cpp
@@ -26,9 +26,9 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ktabbar.h"
 #include "ktabwidget.h"
@@ -123,7 +123,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
           mDragSwitchTab = 0;
         }
 
-        int delay = KGlobalSettings::dndEventDelay();
+        int delay = TDEGlobalSettings::dndEventDelay();
         TQPoint newPos = e->pos();
         if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay ||
             newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay )
@@ -136,7 +136,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
     }
     else if ( e->state() == Qt::MidButton ) {
         if (mReorderStartTab==-1) {
-            int delay = KGlobalSettings::dndEventDelay();
+            int delay = TDEGlobalSettings::dndEventDelay();
             TQPoint newPos = e->pos();
             if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay ||
                 newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay )
@@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
                 }
 
                 mHoverCloseButton = new TQPushButton( this );
-                mHoverCloseButton->setIconSet( KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) );
+                mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) );
                 mHoverCloseButton->setGeometry( rect );
                 TQToolTip::add(mHoverCloseButton,i18n("Close this tab"));
                 mHoverCloseButton->setFlat(true);
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index a87a677d6..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>
 
@@ -42,9 +42,9 @@ public:
 
     KTabWidgetPrivate() {
         m_automaticResizeTabs = false;
-        KConfigGroupSaver groupsaver(KGlobal::config(), "General");
-        m_maxLength = KGlobal::config()->readNumEntry("MaximumTabLength", 30);
-        m_minLength = KGlobal::config()->readNumEntry("MinimumTabLength", 3);
+        TDEConfigGroupSaver groupsaver(TDEGlobal::config(), "General");
+        m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30);
+        m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3);
         m_CurrentMaxLength = m_minLength;
     }
 };
@@ -414,7 +414,7 @@ void KTabWidget::moveTab( int from, int to )
     blockSignals(true);
     removePage( w );
 
-    // Work-around kmdi brain damage which calls showPage() in insertTab()
+    // Work-around tdemdi brain damage which calls showPage() in insertTab()
     TQTab * t = new TQTab();
     t->setText(tablabel);
     TQTabWidget::insertTab( w, t, to );
diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp
index 6b3685a81..a4b716db7 100644
--- a/tdeui/ktextbrowser.cpp
+++ b/tdeui/ktextbrowser.cpp
@@ -19,8 +19,8 @@
 
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
-#include <kglobalsettings.h>
+#include <tdeapplication.h>
+#include <tdeglobalsettings.h>
 #include <ktextbrowser.h>
 #include <kcursor.h>
 #include <kurl.h>
@@ -112,7 +112,7 @@ void KTextBrowser::viewportMouseMoveEvent( TQMouseEvent* e)
 
 void KTextBrowser::contentsWheelEvent( TQWheelEvent *e )
 {
-    if ( KGlobalSettings::wheelMouseZooms() )
+    if ( TDEGlobalSettings::wheelMouseZooms() )
         TQTextBrowser::contentsWheelEvent( e );
     else // thanks, we don't want to zoom, so skip QTextEdit's impl.
         TQScrollView::contentsWheelEvent( e );
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index bc077ddb2..445540099 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -24,12 +24,12 @@
 #include <tqpopupmenu.h>
 
 #include <ksyntaxhighlighter.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
-#include <kstdaccel.h>
+#include <tdeglobalsettings.h>
+#include <tdestdaccel.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KTextEdit::KTextEditPrivate
 {
@@ -75,44 +75,44 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
 {
     KKey key( e );
 
-    if ( KStdAccel::copy().contains( key ) ) {
+    if ( TDEStdAccel::copy().contains( key ) ) {
         copy();
         e->accept();
         return;
     }
-    else if ( KStdAccel::paste().contains( key ) ) {
+    else if ( TDEStdAccel::paste().contains( key ) ) {
         paste();
         e->accept();
         return;
     }
-    else if ( KStdAccel::cut().contains( key ) ) {
+    else if ( TDEStdAccel::cut().contains( key ) ) {
         cut();
         e->accept();
         return;
     }
-    else if ( KStdAccel::undo().contains( key ) ) {
+    else if ( TDEStdAccel::undo().contains( key ) ) {
         undo();
         e->accept();
         return;
     }
-    else if ( KStdAccel::redo().contains( key ) ) {
+    else if ( TDEStdAccel::redo().contains( key ) ) {
         redo();
         e->accept();
         return;
     }
-    else if ( KStdAccel::deleteWordBack().contains( key ) )
+    else if ( TDEStdAccel::deleteWordBack().contains( key ) )
     {
         deleteWordBack();
         e->accept();
         return;
     }
-    else if ( KStdAccel::deleteWordForward().contains( key ) )
+    else if ( TDEStdAccel::deleteWordForward().contains( key ) )
     {
         deleteWordForward();
         e->accept();
         return;
     }
-    else if ( KStdAccel::backwardWord().contains( key ) )
+    else if ( TDEStdAccel::backwardWord().contains( key ) )
     {
       CursorAction action = MoveWordBackward;
       int para, index;
@@ -123,7 +123,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
       e->accept();
       return;
     }
-    else if ( KStdAccel::forwardWord().contains( key ) )
+    else if ( TDEStdAccel::forwardWord().contains( key ) )
     {
       CursorAction action = MoveWordForward;
       int para, index;
@@ -134,43 +134,43 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
       e->accept();
       return;
     }
-    else if ( KStdAccel::next().contains( key ) )
+    else if ( TDEStdAccel::next().contains( key ) )
     {
       moveCursor( MovePgDown, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::prior().contains( key ) )
+    else if ( TDEStdAccel::prior().contains( key ) )
     {
       moveCursor( MovePgUp, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::home().contains( key ) )
+    else if ( TDEStdAccel::home().contains( key ) )
     {
       moveCursor( MoveHome, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::end().contains( key ) )
+    else if ( TDEStdAccel::end().contains( key ) )
     {
       moveCursor( MoveEnd, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::beginningOfLine().contains( key ) )
+    else if ( TDEStdAccel::beginningOfLine().contains( key ) )
     {
       moveCursor( MoveLineStart, false );
       e->accept();
       return;
     }
-    else if ( KStdAccel::endOfLine().contains( key ) )
+    else if ( TDEStdAccel::endOfLine().contains( key ) )
     {
       moveCursor(MoveLineEnd, false);
       e->accept();
       return;
     }
-    else if ( KStdAccel::pasteSelection().contains( key ) )
+    else if ( TDEStdAccel::pasteSelection().contains( key ) )
     {
         TQString text = TQApplication::clipboard()->text( TQClipboard::Selection);
         if ( !text.isEmpty() )
@@ -252,7 +252,7 @@ TQPopupMenu *KTextEdit::createPopupMenu()
 
 void KTextEdit::contentsWheelEvent( TQWheelEvent *e )
 {
-    if ( KGlobalSettings::wheelMouseZooms() )
+    if ( TDEGlobalSettings::wheelMouseZooms() )
         TQTextEdit::contentsWheelEvent( e );
     else // thanks, we don't want to zoom, so skip QTextEdit's impl.
         TQScrollView::contentsWheelEvent( e );
diff --git a/tdeui/ktimezonewidget.cpp b/tdeui/ktimezonewidget.cpp
index a9a73a4f5..f6488847f 100644
--- a/tdeui/ktimezonewidget.cpp
+++ b/tdeui/ktimezonewidget.cpp
@@ -19,9 +19,9 @@
 
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kfile.h>
-#include <klistview.h>
-#include <klocale.h>
+#include <tdefile.h>
+#include <tdelistview.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktimezones.h>
 #include <ktimezonewidget.h>
@@ -34,7 +34,7 @@
 #define COLUMN_ZONE 3
 
 KTimezoneWidget::KTimezoneWidget(TQWidget *parent, const char *name, KTimezones *db) :
-    KListView(parent, name),
+    TDEListView(parent, name),
     d(0)
 {
     // If the user did not provide a timezone database, we'll use the system default.
@@ -115,7 +115,7 @@ void KTimezoneWidget::setSelected(const TQString &zone, bool selected)
     {
         if (listItem->text(COLUMN_ZONE) == zone)
         {
-            KListView::setSelected(listItem, selected);
+            TDEListView::setSelected(listItem, selected);
 
             // Ensure the selected item is visible as appropriate.
             listItem = selectedItem();
diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h
index 8e42e3a6a..70d63521e 100644
--- a/tdeui/ktimezonewidget.h
+++ b/tdeui/ktimezonewidget.h
@@ -21,7 +21,7 @@
 #define KTIMEZONEWIDGET_H
 
 #include <tdelibs_export.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 
 class KTimezone;
@@ -49,7 +49,7 @@ class KTimezoneWidgetPrivate;
  * \code
  *
  *  m_timezones =  new KTimezoneWidget(this, "Timezones", vcalendarTimezones);
- *  m_timezones->setSelectionModeExt(KListView::Multi);
+ *  m_timezones->setSelectionModeExt(TDEListView::Multi);
  *  ...
  * \endcode
  *
@@ -57,7 +57,7 @@ class KTimezoneWidgetPrivate;
  * @since 3.5
  */
 class TDEUI_EXPORT KTimezoneWidget :
-    public KListView
+    public TDEListView
 {
     Q_OBJECT
 
@@ -98,7 +98,7 @@ public:
      * transformed via an i18n lookup, so the caller should previously have
      * set the timezone catalogue:
      * \code
-     * KGlobal::locale()->insertCatalogue("timezones");
+     * TDEGlobal::locale()->insertCatalogue("timezones");
      * \endcode
      *
      * @return formatted timezone name.
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 3be1d57e6..b3e7d832b 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -33,20 +33,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtextstream.h>
 #include <tqimage.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <ktextbrowser.h>
 #include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #ifdef Q_WS_X11
 #include <twin.h>
@@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile)
 {
     TQString tipFile = _tipFile;
     if (tipFile.isEmpty())
-	tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips";
+	tipFile = TQString::fromLatin1(TDEGlobal::instance()->aboutData()->appName()) + "/tips";
 
     loadTips(tipFile);
 
@@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles )
 {
    if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) )
    {
-       addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips");
+       addTips(TQString::fromLatin1(TDEGlobal::instance()->aboutData()->appName()) + "/tips");
    }
    else
    {
@@ -180,7 +180,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     TQImage img;
     int h,s,v;
 
-    mBlendedColor = KGlobalSettings::activeTitleColor();
+    mBlendedColor = TDEGlobalSettings::activeTitleColor();
     mBlendedColor.hsv(&h,&s,&v);
     mBlendedColor.setHsv(h, int(s*(71/76.0)), int(v*(67/93.0)));
 
@@ -188,17 +188,17 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     {
 	img = TQImage(locate("data", "kdewizard/pics/wizard_small.png"));
 	// colorize and check to figure the correct color
-	KIconEffect::colorize(img, mBlendedColor, 1.0);
+	TDEIconEffect::colorize(img, mBlendedColor, 1.0);
 	QRgb colPixel( img.pixel(0,0) );
 
 	mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel));
     }
 
-    mBaseColor = KGlobalSettings::alternateBackgroundColor();
+    mBaseColor = TDEGlobalSettings::alternateBackgroundColor();
     mBaseColor.hsv(&h,&s,&v);
     mBaseColor.setHsv(h, int(s*(10/6.0)), int(v*(93/99.0)));
 
-    mTextColor = KGlobalSettings::textColor();
+    mTextColor = TDEGlobalSettings::textColor();
 
 
     mDatabase = db;
@@ -206,8 +206,8 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     setCaption(i18n("Tip of the Day"));
 #ifdef Q_WS_X11
     KWin::setIcons( winId(),
-                    KGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 32 ),
-                    KGlobal::iconLoader()->loadIcon( "idea", KIcon::NoGroup, 16 ) );
+                    TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 32 ),
+                    TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 16 ) );
 #endif
     TQVBoxLayout *vbox = new TQVBoxLayout(this, marginHint(), spacingHint());
 
@@ -222,7 +222,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 	TQLabel *titlePane = new TQLabel(this);
 	titlePane->setBackgroundPixmap(locate("data", "tdeui/pics/ktip-background.png"));
 	titlePane->setText(i18n("Did you know...?\n"));
-	titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold));
+	titlePane->setFont(TQFont(TDEGlobalSettings::generalFont().family(), 20, TQFont::Bold));
 	titlePane->setAlignment(TQLabel::AlignCenter);
 	pl->addWidget(titlePane, 100);
     }
@@ -244,7 +244,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 
     mTipText->setWrapPolicy( TQTextEdit::AtWordOrDocumentBoundary );
     mTipText->mimeSourceFactory()->addFilePath(
-	KGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/");
+	TDEGlobal::dirs()->findResourceDir("data", "kdewizard/pics")+"kdewizard/pics/");
     mTipText->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain);
     mTipText->setHScrollBarMode(TQScrollView::AlwaysOff);
     mTipText->setLinkUnderline(false);
@@ -258,7 +258,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     pal.setColor( TQPalette::Inactive, TQColorGroup::Link, mBlendedColor );
     mTipText->setPalette(pal);
 
-    TQStringList icons = KGlobal::dirs()->resourceDirs("icon");
+    TQStringList icons = TDEGlobal::dirs()->resourceDirs("icon");
     TQStringList::Iterator it;
     for (it = icons.begin(); it != icons.end(); ++it)
         mTipText->mimeSourceFactory()->addFilePath(*it);
@@ -273,7 +273,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 	resize(550, 230);
         TQSize sh = size();
 
-        TQRect rect = KGlobalSettings::splashScreenDesktopGeometry();
+        TQRect rect = TDEGlobalSettings::splashScreenDesktopGeometry();
 
         move(rect.x() + (rect.width() - sh.width())/2,
 	rect.y() + (rect.height() - sh.height())/2);
@@ -301,7 +301,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     ok->setDefault(true);
     hbox2->addWidget(ok);
 
-    KConfigGroup config(kapp->config(), "TipOfDay");
+    TDEConfigGroup config(kapp->config(), "TipOfDay");
     mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true));
 
     connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip()));
@@ -332,7 +332,7 @@ void KTipDialog::showTip(TQWidget *parent, const TQString &tipFile, bool force)
 
 void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bool force)
 {
-    KConfigGroup configGroup(kapp->config(), "TipOfDay");
+    TDEConfigGroup configGroup(kapp->config(), "TipOfDay");
 
     const bool runOnStart = configGroup.readBoolEntry("RunOnStart", true);
 
@@ -374,7 +374,7 @@ static TQString fixTip(TQString tip)
     if (iconRegExp.search(tip)>-1) {
       TQString iconName = iconRegExp.cap(1);
       if (!iconName.isEmpty())
-         if (KGlobal::dirs()->findResource("icon", iconName).isEmpty())
+         if (TDEGlobal::dirs()->findResource("icon", iconName).isEmpty())
            tip.replace("crystalsvg","hicolor");
     }
 
@@ -418,7 +418,7 @@ static TQString fixTip(TQString tip)
 
   void KTipDialog::setShowOnStart(bool on)
   {
-      KConfigGroup config(kapp->config(), "TipOfDay");
+      TDEConfigGroup config(kapp->config(), "TipOfDay");
       config.writeEntry("RunOnStart", on);
       config.sync();
   }
diff --git a/tdeui/ktip.h b/tdeui/ktip.h
index d18efd27e..a506902bf 100644
--- a/tdeui/ktip.h
+++ b/tdeui/ktip.h
@@ -131,7 +131,7 @@ public:
      *
      * @param parent Parent widget of TipDialog.
      * @param tipFile The name of the tip file. It has be relative to the "data"
-     *                resource of KStandardDirs
+     *                resource of TDEStandardDirs
      * @param force If true, the dialog is show, even when the users
      *              disabled it.
      */
@@ -144,7 +144,7 @@ public:
      *
      * @param parent Parent widget of TipDialog.
      * @param tipFiles A List of tip files. Each has be relative to the "data"
-     *                resource of KStandardDirs
+     *                resource of TDEStandardDirs
      * @param force If true, the dialog is show, even when the users
      *              disabled it.
      */
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index 71f90abd9..749b4f5b5 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -27,7 +27,7 @@
 #include <tqapplication.h>
 
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "kurllabel.h"
 
@@ -36,7 +36,7 @@ class KURLLabel::Private
 public:
   Private (const TQString& url, KURLLabel* label)
     : URL (url),
-      LinkColor (KGlobalSettings::linkColor()),
+      LinkColor (TDEGlobalSettings::linkColor()),
       HighlightedLinkColor (Qt::red),
       Tip(url),
       Cursor (0L),
@@ -358,7 +358,7 @@ bool KURLLabel::event (TQEvent *e)
     p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
     p.setColor(TQColorGroup::Foreground, palette().active().foreground());
     setPalette(p);
-    d->LinkColor = KGlobalSettings::linkColor();
+    d->LinkColor = TDEGlobalSettings::linkColor();
     setLinkColor(d->LinkColor);
     return true;
   }
diff --git a/tdeui/kwhatsthismanager.cpp b/tdeui/kwhatsthismanager.cpp
index 2f4d1750f..46643f6f0 100644
--- a/tdeui/kwhatsthismanager.cpp
+++ b/tdeui/kwhatsthismanager.cpp
@@ -21,8 +21,8 @@
 #include <tqvariant.h>
 #include <kdebug.h>
 #include <tqtextedit.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 
 KWhatsThisManager *KWhatsThisManager::s_instance = 0;
 
diff --git a/tdeui/kwhatsthismanager_p.h b/tdeui/kwhatsthismanager_p.h
index cce1c8ea5..084c83641 100644
--- a/tdeui/kwhatsthismanager_p.h
+++ b/tdeui/kwhatsthismanager_p.h
@@ -30,7 +30,7 @@ class TQStyleSheet;
 class TQTextEdit;
 
 /**
- * This class is used automatically by KMainWindow and KDialog to attach a
+ * This class is used automatically by TDEMainWindow and KDialog to attach a
  * What's This templates to all new widgets. If you don't use either of those
  * classes and want this functionality, call KWhatsThisManager::init () before
  * creating any widgets.
diff --git a/tdeui/kwizard.cpp b/tdeui/kwizard.cpp
index 21462faad..b8fa1e88a 100644
--- a/tdeui/kwizard.cpp
+++ b/tdeui/kwizard.cpp
@@ -22,8 +22,8 @@
 #include <tqpushbutton.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kstdguiitem.h>
 
 #include "kwizard.h"
@@ -31,7 +31,7 @@
 KWizard::KWizard( TQWidget *parent, const char *name, bool modal, WFlags f )
             : TQWizard( parent, name, modal, f )
 {
-  bool useIcons = KGlobalSettings::showIconsOnPushButtons();
+  bool useIcons = TDEGlobalSettings::showIconsOnPushButtons();
 
   if ( useIcons )
   {
diff --git a/tdeui/kxmlgui.xsd b/tdeui/kxmlgui.xsd
index c0979cb72..dc2fad341 100644
--- a/tdeui/kxmlgui.xsd
+++ b/tdeui/kxmlgui.xsd
@@ -148,7 +148,7 @@
                     Defines both Standard and app-specific actions. An action can appear
                     in a menu, a toolbar or in a menubar.  
                     Attributes: 
-                    - name of the action: this is matched with the KAction name.
+                    - name of the action: this is matched with the TDEAction name.
                     - group: this is used to control the placement of the action when
                     merging e.g. a part, it matches the name of a DefineGroup in the
                     mainwindow's rc file.
@@ -157,7 +157,7 @@
                     there.  Note that this feature is currently only available for the
                     mainwindow, not for parts/plugins.  
                     - text, whatsThis, toolTip, shortText, shortcut, icon: all those are
-                    mapped to KAction properties.
+                    mapped to TDEAction properties.
                     
                     
                 </xsd:documentation>
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index c31242ff1..ff4083779 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -18,16 +18,16 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "kxmlguibuilder.h"
-#include "kmenubar.h"
-#include "kpopupmenu.h"
-#include "ktoolbar.h"
+#include "tdemenubar.h"
+#include "tdepopupmenu.h"
+#include "tdetoolbar.h"
 #include "kstatusbar.h"
-#include "kmainwindow.h"
-#include "kaction.h"
-#include "kglobalsettings.h"
-#include <klocale.h>
+#include "tdemainwindow.h"
+#include "tdeaction.h"
+#include "tdeglobalsettings.h"
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tqobjectlist.h>
@@ -61,7 +61,7 @@ public:
 
     TQString attrIcon;
 
-    KInstance *m_instance;
+    TDEInstance *m_instance;
     KXMLGUIClient *m_client;
 };
 
@@ -116,9 +116,9 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
   id = -1;
   if ( element.tagName().lower() == d->tagMainWindow )
   {
-    KMainWindow *mainwindow = 0;
-    if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) )
-      mainwindow = static_cast<KMainWindow *>(d->m_widget);
+    TDEMainWindow *mainwindow = 0;
+    if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
+      mainwindow = static_cast<TDEMainWindow *>(d->m_widget);
 
     return mainwindow;
   }
@@ -127,8 +127,8 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
   {
     KMenuBar *bar;
 
-    if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) )
-      bar = static_cast<KMainWindow *>(d->m_widget)->menuBar();
+    if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
+      bar = static_cast<TDEMainWindow *>(d->m_widget)->menuBar();
     else
       bar = new KMenuBar( d->m_widget );
 
@@ -139,21 +139,21 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
   if ( element.tagName().lower() == d->tagMenu )
   {
     // Look up to see if we are inside a mainwindow. If yes, then
-    // use it as parent widget (to get kaction to plug itself into the
+    // use it as parent widget (to get tdeaction to plug itself into the
     // mainwindow). Don't use a popupmenu as parent widget, otherwise
     // the popup won't be hidden if it is used as a standalone menu as well.
     // And we don't want to set the parent for a standalone popupmenu,
     // otherwise its shortcuts appear.
     TQWidget* p = parent;
-    while ( p && !::tqqt_cast<KMainWindow *>( p ) )
+    while ( p && !::tqqt_cast<TDEMainWindow *>( p ) )
         p = p->parentWidget();
 
     TQCString name = element.attribute( d->attrName ).utf8();
 
-    if (!kapp->authorizeKAction(name))
+    if (!kapp->authorizeTDEAction(name))
        return 0;
 
-    KPopupMenu *popup = new KPopupMenu( p, name);
+    TDEPopupMenu *popup = new TDEPopupMenu( p, name);
 
     TQString i18nText;
     TQDomElement textElem = element.namedItem( d->attrText1 ).toElement();
@@ -174,9 +174,9 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
 
     if ( !icon.isEmpty() )
     {
-      KInstance *instance = d->m_instance;
+      TDEInstance *instance = d->m_instance;
       if ( !instance )
-        instance = KGlobal::instance();
+        instance = TDEGlobal::instance();
 
       pix = SmallIconSet( icon, 16, instance );
     }
@@ -205,13 +205,13 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
 
     TQCString name = element.attribute( d->attrName ).utf8();
 
-    KToolBar *bar = static_cast<KToolBar*>(TQT_TQWIDGET(d->m_widget->child( name, "KToolBar" )));
+    TDEToolBar *bar = static_cast<TDEToolBar*>(TQT_TQWIDGET(d->m_widget->child( name, "TDEToolBar" )));
     if( !bar )
     {
-       bar = new KToolBar( d->m_widget, name, honor, false );
+       bar = new TDEToolBar( d->m_widget, name, honor, false );
     }
 
-    if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) )
+    if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
     {
         if ( d->m_client && !d->m_client->xmlFile().isEmpty() )
             bar->setXMLGUIClient( d->m_client );
@@ -224,9 +224,9 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
 
   if ( element.tagName().lower() == d->tagStatusBar )
   {
-      if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) )
+      if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
     {
-      KMainWindow *mainWin = static_cast<KMainWindow *>(d->m_widget);
+      TDEMainWindow *mainWin = static_cast<TDEMainWindow *>(d->m_widget);
       mainWin->statusBar()->show();
       return mainWin->statusBar();
     }
@@ -253,9 +253,9 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD
 
     delete container;
   }
-  else if ( ::tqqt_cast<KToolBar *>( container ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( container ) )
   {
-    KToolBar *tb = static_cast<KToolBar *>( container );
+    TDEToolBar *tb = static_cast<TDEToolBar *>( container );
 
     tb->saveState( element );
     delete tb;
@@ -271,7 +271,7 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD
   }
   else if ( ::tqqt_cast<KStatusBar *>( container ) )
   {
-    if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) )
+    if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
         container->hide();
     else
       delete static_cast<KStatusBar *>(container);
@@ -319,9 +319,9 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
     }
     else if ( ::tqqt_cast<TQMenuBar *>( parent ) )
        return static_cast<TQMenuBar *>(parent)->insertSeparator( index );
-    else if ( ::tqqt_cast<KToolBar *>( parent ) )
+    else if ( ::tqqt_cast<TDEToolBar *>( parent ) )
     {
-      KToolBar *bar = static_cast<KToolBar *>( parent );
+      TDEToolBar *bar = static_cast<TDEToolBar *>( parent );
 
       bool isLineSep = true;
 
@@ -339,7 +339,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
         }
       }
 
-      int id = KAction::getToolButtonID();
+      int id = TDEAction::getToolButtonID();
 
       if ( isLineSep )
           bar->insertLineSeparator( index, id );
@@ -351,12 +351,12 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
   }
   else if ( element.tagName().lower() == d->tagTearOffHandle )
   {
-    if ( ::tqqt_cast<TQPopupMenu *>( parent )  && KGlobalSettings::insertTearOffHandle())
+    if ( ::tqqt_cast<TQPopupMenu *>( parent )  && TDEGlobalSettings::insertTearOffHandle())
       return static_cast<TQPopupMenu *>(parent)->insertTearOffHandle( -1, index );
   }
   else if ( element.tagName().lower() == d->tagMenuTitle )
   {
-    if ( ::tqqt_cast<KPopupMenu *>( parent ) )
+    if ( ::tqqt_cast<TDEPopupMenu *>( parent ) )
     {
       TQString i18nText;
       TQCString text = element.text().utf8();
@@ -371,17 +371,17 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
 
       if ( !icon.isEmpty() )
       {
-        KInstance *instance = d->m_instance;
+        TDEInstance *instance = d->m_instance;
         if ( !instance )
-          instance = KGlobal::instance();
+          instance = TDEGlobal::instance();
 
         pix = SmallIcon( icon, instance );
       }
 
       if ( !icon.isEmpty() )
-        return static_cast<KPopupMenu *>(parent)->insertTitle( pix, i18nText, -1, index );
+        return static_cast<TDEPopupMenu *>(parent)->insertTitle( pix, i18nText, -1, index );
       else
-        return static_cast<KPopupMenu *>(parent)->insertTitle( i18nText, -1, index );
+        return static_cast<TDEPopupMenu *>(parent)->insertTitle( i18nText, -1, index );
     }
   }
   return 0;
@@ -393,8 +393,8 @@ void KXMLGUIBuilder::removeCustomElement( TQWidget *parent, int id )
     static_cast<TQPopupMenu *>(parent)->removeItem( id );
   else if ( ::tqqt_cast<TQMenuBar *>( parent ) )
     static_cast<TQMenuBar *>(parent)->removeItem( id );
-  else if ( ::tqqt_cast<KToolBar *>( parent ) )
-    static_cast<KToolBar *>(parent)->removeItemDelayed( id );
+  else if ( ::tqqt_cast<TDEToolBar *>( parent ) )
+    static_cast<TDEToolBar *>(parent)->removeItemDelayed( id );
 }
 
 KXMLGUIClient *KXMLGUIBuilder::builderClient() const
@@ -409,30 +409,30 @@ void KXMLGUIBuilder::setBuilderClient( KXMLGUIClient *client )
       setBuilderInstance( client->instance() );
 }
 
-KInstance *KXMLGUIBuilder::builderInstance() const
+TDEInstance *KXMLGUIBuilder::builderInstance() const
 {
   return d->m_instance;
 }
 
-void KXMLGUIBuilder::setBuilderInstance( KInstance *instance )
+void KXMLGUIBuilder::setBuilderInstance( TDEInstance *instance )
 {
   d->m_instance = instance;
 }
 
 void KXMLGUIBuilder::finalizeGUI( KXMLGUIClient * )
 {
-    if ( !d->m_widget || !::tqqt_cast<KMainWindow *>( d->m_widget ) )
+    if ( !d->m_widget || !::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
         return;
 #if 0
-    KToolBar *toolbar = 0;
-    QListIterator<KToolBar> it( ( (KMainWindow*)d->m_widget )->toolBarIterator() );
+    TDEToolBar *toolbar = 0;
+    QListIterator<TDEToolBar> it( ( (TDEMainWindow*)d->m_widget )->toolBarIterator() );
     while ( ( toolbar = it.current() ) ) {
         kdDebug() << "KXMLGUIBuilder::finalizeGUI toolbar=" << (void*)toolbar << endl;
         ++it;
         toolbar->positionYourself();
     }
 #else
-    static_cast<KMainWindow *>(d->m_widget)->finalizeGUI( false );
+    static_cast<TDEMainWindow *>(d->m_widget)->finalizeGUI( false );
 #endif
 }
 
diff --git a/tdeui/kxmlguibuilder.h b/tdeui/kxmlguibuilder.h
index f32c30243..885bb1058 100644
--- a/tdeui/kxmlguibuilder.h
+++ b/tdeui/kxmlguibuilder.h
@@ -27,13 +27,13 @@
 
 class KXMLGUIBuilderPrivate;
 class TQWidget;
-class KInstance;
+class TDEInstance;
 class KXMLGUIClient;
 
 /**
  * Abstract interface for a "GUI builder", used by the GUIFactory
- * This interface is implemented by KMainWindow for the case where
- * the toplevel widget is a KMainWindow. Other implementations may appear
+ * This interface is implemented by TDEMainWindow for the case where
+ * the toplevel widget is a TDEMainWindow. Other implementations may appear
  * in the future (dialogs for instance)
  */
 class TDEUI_EXPORT KXMLGUIBuilder
@@ -48,9 +48,9 @@ class TDEUI_EXPORT KXMLGUIBuilder
   /* @internal */
   void setBuilderClient( KXMLGUIClient *client );
   /* @internal */
-  KInstance *builderInstance() const;
+  TDEInstance *builderInstance() const;
   /* @internal */
-  void setBuilderInstance( KInstance *instance );
+  void setBuilderInstance( TDEInstance *instance );
   /* @internal */
   TQWidget *widget();
 
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index ff463e45f..de015b5a4 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -31,8 +31,8 @@
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
 
 #include <assert.h>
 
@@ -41,7 +41,7 @@ class KXMLGUIClientPrivate
 public:
   KXMLGUIClientPrivate()
   {
-    m_instance = KGlobal::instance();
+    m_instance = TDEGlobal::instance();
     m_parent = 0L;
     m_builder = 0L;
     m_actionCollection = 0;
@@ -50,10 +50,10 @@ public:
   {
   }
 
-  KInstance *m_instance;
+  TDEInstance *m_instance;
 
   TQDomDocument m_doc;
-  KActionCollection *m_actionCollection;
+  TDEActionCollection *m_actionCollection;
   TQDomDocument m_buildDocument;
   TQGuardedPtr<KXMLGUIFactory> m_factory;
   KXMLGUIClient *m_parent;
@@ -90,9 +90,9 @@ KXMLGUIClient::~KXMLGUIClient()
   delete d;
 }
 
-KAction *KXMLGUIClient::action( const char *name ) const
+TDEAction *KXMLGUIClient::action( const char *name ) const
 {
-  KAction* act = actionCollection()->action( name );
+  TDEAction* act = actionCollection()->action( name );
   if ( !act ) {
     TQPtrListIterator<KXMLGUIClient> childIt( d->m_children );
     for (; childIt.current(); ++childIt ) {
@@ -104,23 +104,23 @@ KAction *KXMLGUIClient::action( const char *name ) const
   return act;
 }
 
-KActionCollection *KXMLGUIClient::actionCollection() const
+TDEActionCollection *KXMLGUIClient::actionCollection() const
 {
   if ( !d->m_actionCollection )
   {
-    d->m_actionCollection = new KActionCollection(
-      "KXMLGUIClient-KActionCollection", this );
+    d->m_actionCollection = new TDEActionCollection(
+      "KXMLGUIClient-TDEActionCollection", this );
   }
   return d->m_actionCollection;
 }
 
-KAction *KXMLGUIClient::action( const TQDomElement &element ) const
+TDEAction *KXMLGUIClient::action( const TQDomElement &element ) const
 {
-  static const TQString &attrName = KGlobal::staticQString( "name" );
+  static const TQString &attrName = TDEGlobal::staticQString( "name" );
   return actionCollection()->action( element.attribute( attrName ).latin1() );
 }
 
-KInstance *KXMLGUIClient::instance() const
+TDEInstance *KXMLGUIClient::instance() const
 {
   return d->m_instance;
 }
@@ -154,7 +154,7 @@ void KXMLGUIClient::reloadXML()
         setXMLFile( file );
 }
 
-void KXMLGUIClient::setInstance( KInstance *instance )
+void KXMLGUIClient::setInstance( TDEInstance *instance )
 {
   d->m_instance = instance;
   actionCollection()->setInstance( instance );
@@ -248,19 +248,19 @@ void KXMLGUIClient::setDOMDocument( const TQDomDocument &document, bool merge )
   setXMLGUIBuildDocument( TQDomDocument() );
 }
 
-bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, KActionCollection *actionCollection )
+bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, TDEActionCollection *actionCollection )
 {
-  static const TQString &tagAction = KGlobal::staticQString( "Action" );
-  static const TQString &tagMerge = KGlobal::staticQString( "Merge" );
-  static const TQString &tagSeparator = KGlobal::staticQString( "Separator" );
-  static const TQString &attrName = KGlobal::staticQString( "name" );
-  static const TQString &attrAppend = KGlobal::staticQString( "append" );
-  static const TQString &attrWeakSeparator = KGlobal::staticQString( "weakSeparator" );
-  static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" );
-  static const TQString &tagText = KGlobal::staticQString( "text" );
-  static const TQString &attrAlreadyVisited = KGlobal::staticQString( "alreadyVisited" );
-  static const TQString &attrNoMerge = KGlobal::staticQString( "noMerge" );
-  static const TQString &attrOne = KGlobal::staticQString( "1" );
+  static const TQString &tagAction = TDEGlobal::staticQString( "Action" );
+  static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" );
+  static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" );
+  static const TQString &attrName = TDEGlobal::staticQString( "name" );
+  static const TQString &attrAppend = TDEGlobal::staticQString( "append" );
+  static const TQString &attrWeakSeparator = TDEGlobal::staticQString( "weakSeparator" );
+  static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" );
+  static const TQString &tagText = TDEGlobal::staticQString( "text" );
+  static const TQString &attrAlreadyVisited = TDEGlobal::staticQString( "alreadyVisited" );
+  static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" );
+  static const TQString &attrOne = TDEGlobal::staticQString( "1" );
 
   // there is a possibility that we don't want to merge in the
   // additive.. rather, we might want to *replace* the base with the
@@ -292,7 +292,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
     {
       TQCString name =  e.attribute( attrName ).utf8(); // WABA
       if ( !actionCollection->action( name.data() ) ||
-           (kapp && !kapp->authorizeKAction(name)))
+           (kapp && !kapp->authorizeTDEAction(name)))
       {
         // remove this child as we aren't using it
         base.removeChild( e );
@@ -501,9 +501,9 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive,
 
 TQDomElement KXMLGUIClient::findMatchingElement( const TQDomElement &base, const TQDomElement &additive )
 {
-  static const TQString &tagAction = KGlobal::staticQString( "Action" );
-  static const TQString &tagMergeLocal = KGlobal::staticQString( "MergeLocal" );
-  static const TQString &attrName = KGlobal::staticQString( "name" );
+  static const TQString &tagAction = TDEGlobal::staticQString( "Action" );
+  static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" );
+  static const TQString &attrName = TDEGlobal::staticQString( "name" );
 
   TQDomNode n = additive.firstChild();
   while ( !n.isNull() )
@@ -602,7 +602,7 @@ KXMLGUIBuilder *KXMLGUIClient::clientBuilder() const
   return d->m_builder;
 }
 
-void KXMLGUIClient::plugActionList( const TQString &name, const TQPtrList<KAction> &actionList )
+void KXMLGUIClient::plugActionList( const TQString &name, const TQPtrList<TDEAction> &actionList )
 {
   if ( !d->m_factory )
     return;
@@ -908,7 +908,7 @@ void KXMLGUIClient::stateChanged(const TQString &newstate, KXMLGUIClient::Revers
   for ( TQStringList::Iterator it = stateChange.actionsToEnable.begin();
         it != stateChange.actionsToEnable.end(); ++it ) {
 
-    KAction *action = actionCollection()->action((*it).latin1());
+    TDEAction *action = actionCollection()->action((*it).latin1());
     if (action) action->setEnabled(setTrue);
   }
 
@@ -917,7 +917,7 @@ void KXMLGUIClient::stateChanged(const TQString &newstate, KXMLGUIClient::Revers
   for ( TQStringList::Iterator it = stateChange.actionsToDisable.begin();
         it != stateChange.actionsToDisable.end(); ++it ) {
 
-    KAction *action = actionCollection()->action((*it).latin1());
+    TDEAction *action = actionCollection()->action((*it).latin1());
     if (action) action->setEnabled(setFalse);
   }
 
diff --git a/tdeui/kxmlguiclient.h b/tdeui/kxmlguiclient.h
index c05a1afd8..9fa3951a7 100644
--- a/tdeui/kxmlguiclient.h
+++ b/tdeui/kxmlguiclient.h
@@ -27,9 +27,9 @@
 #include <tdelibs_export.h>
 
 class TQWidget;
-class KAction;
-class KActionCollection;
-class KInstance;
+class TDEAction;
+class TDEActionCollection;
+class TDEInstance;
 class KXMLGUIClientPrivate;
 class KXMLGUIFactory;
 class KXMLGUIBuilder;
@@ -74,30 +74,30 @@ public:
    * This method is provided for convenience, as it uses actionCollection()
    * to get the action object.
    */
-  KAction* action( const char* name ) const;
+  TDEAction* action( const char* name ) const;
 
   /**
    * Retrieves an action for a given TQDomElement. The default
    * implementation uses the "name" attribute to query the action
    * object via the other action() method.
    */
-  virtual KAction *action( const TQDomElement &element ) const;
+  virtual TDEAction *action( const TQDomElement &element ) const;
 
   /**
    * Retrieves the entire action collection for the GUI client. If
    * you subclass KXMLGUIClient you should call
-   * KActionCollection::setWidget( TQWidget* ) with this object, or
-   * you will encounter subtle bugs with KAction keyboard shortcuts.
-   * This is not necessary if your KXMLGUIClient is a KMainWindow.
+   * TDEActionCollection::setWidget( TQWidget* ) with this object, or
+   * you will encounter subtle bugs with TDEAction keyboard shortcuts.
+   * This is not necessary if your KXMLGUIClient is a TDEMainWindow.
    *
-   * @see KActionCollection::setWidget( TQWidget* )
+   * @see TDEActionCollection::setWidget( TQWidget* )
    */
-  virtual KActionCollection* actionCollection() const;
+  virtual TDEActionCollection* actionCollection() const;
 
   /**
-   * @return The instance ( KInstance ) for this GUI client.
+   * @return The instance ( TDEInstance ) for this GUI client.
    */
-  virtual KInstance *instance() const;
+  virtual TDEInstance *instance() const;
 
   /**
    * @return The parsed XML in a TQDomDocument, set by
@@ -218,7 +218,7 @@ public:
    * This tag will get expanded to a list of actions.  In the example
    * above ( a file manager with a dynamic file menu ), you would call
    * \code
-   * TQPtrList<KAction> file_actions;
+   * TQPtrList<TDEAction> file_actions;
    * for( ... )
    *   if( ... )
    *     file_actions.append( cool_action );
@@ -234,7 +234,7 @@ public:
    *       plugActionList() would leave the previous actions in the
    *       menu too..
    */
-  void plugActionList( const TQString &name, const TQPtrList<KAction> &actionList );
+  void plugActionList( const TQString &name, const TQPtrList<TDEAction> &actionList );
 
   /**
    * The complement of plugActionList() ...
@@ -271,12 +271,12 @@ protected:
   //bool addSuperClient( KXMLGUIClient * );
 
   /**
-   * Sets the instance ( KInstance) for this part.
+   * Sets the instance ( TDEInstance) for this part.
    *
    * Call this first in the inherited class constructor.
    * (At least before setXMLFile().)
    */
-  virtual void setInstance( KInstance *instance );
+  virtual void setInstance( TDEInstance *instance );
 
   /**
    * Sets the name of the rc file containing the XML for the part.
@@ -342,7 +342,7 @@ private:
   };
 
   bool mergeXML( TQDomElement &base, const TQDomElement &additive,
-                 KActionCollection *actionCollection );
+                 TDEActionCollection *actionCollection );
 
   TQDomElement findMatchingElement( const TQDomElement &base,
                                    const TQDomElement &additive );
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 7aa427937..87015bfd5 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -32,11 +32,11 @@
 #include <tqdatetime.h>
 #include <tqvariant.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kglobal.h>
-#include <kshortcut.h>
+#include <tdeglobal.h>
+#include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kkeydialog.h>
 
@@ -51,9 +51,9 @@ class KXMLGUIFactoryPrivate : public BuildState
 public:
     KXMLGUIFactoryPrivate()
     {
-        static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" );
-        static const TQString &actionList = KGlobal::staticQString( "actionlist" );
-        static const TQString &name = KGlobal::staticQString( "name" );
+        static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" );
+        static const TQString &actionList = TDEGlobal::staticQString( "actionlist" );
+        static const TQString &name = TDEGlobal::staticQString( "name" );
 
         m_rootNode = new ContainerNode( 0L, TQString::null, 0L );
         m_defaultMergingName = defaultMergingName;
@@ -96,14 +96,14 @@ public:
     BuildStateStack m_stateStack;
 };
 
-TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const KInstance *instance )
+TQString KXMLGUIFactory::readConfigFile( const TQString &filename, const TDEInstance *instance )
 {
     return readConfigFile( filename, false, instance );
 }
 
-TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const KInstance *_instance )
+TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_null, const TDEInstance *_instance )
 {
-    const KInstance *instance = _instance ? _instance : KGlobal::instance();
+    const TDEInstance *instance = _instance ? _instance : TDEGlobal::instance();
     TQString xml_file;
 
     if (!TQDir::isRelativePath(filename))
@@ -140,9 +140,9 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
 }
 
 bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc,
-                                     const TQString& filename, const KInstance *_instance )
+                                     const TQString& filename, const TDEInstance *_instance )
 {
-    const KInstance *instance = _instance ? _instance : KGlobal::instance();
+    const TDEInstance *instance = _instance ? _instance : TDEGlobal::instance();
     TQString xml_file(filename);
 
     if (TQDir::isRelativePath(xml_file))
@@ -224,7 +224,7 @@ KXMLGUIFactory::~KXMLGUIFactory()
 void KXMLGUIFactory::addClient( KXMLGUIClient *client )
 {
     kdDebug(1002) << "KXMLGUIFactory::addClient( " << client << " )" << endl; // ellis
-    static const TQString &actionPropElementName = KGlobal::staticQString( "ActionProperties" );
+    static const TQString &actionPropElementName = TDEGlobal::staticQString( "ActionProperties" );
 
     if ( client->factory() ) {
         if ( client->factory() == this )
@@ -368,7 +368,7 @@ void KXMLGUIFactory::removeClient( KXMLGUIClient *client )
     // reset some variables
     d->BuildState::reset();
 
-    // This will destruct the KAccel object built around the given widget.
+    // This will destruct the TDEAccel object built around the given widget.
     client->prepareXMLUnplug( d->builder->widget() );
 
     d->popState();
@@ -468,7 +468,7 @@ TQPtrList<TQWidget> KXMLGUIFactory::findRecursive( KXMLGUI::ContainerNode *node,
 }
 
 void KXMLGUIFactory::plugActionList( KXMLGUIClient *client, const TQString &name,
-                                     const TQPtrList<KAction> &actionList )
+                                     const TQPtrList<TDEAction> &actionList )
 {
     d->pushState();
     d->guiClient = client;
@@ -497,7 +497,7 @@ void KXMLGUIFactory::unplugActionList( KXMLGUIClient *client, const TQString &na
 
 void KXMLGUIFactory::applyActionProperties( const TQDomElement &actionPropElement )
 {
-    static const TQString &tagAction = KGlobal::staticQString( "action" );
+    static const TQString &tagAction = TDEGlobal::staticQString( "action" );
 
     for (TQDomNode n = actionPropElement.firstChild();
          !n.isNull(); n = n.nextSibling() )
@@ -506,7 +506,7 @@ void KXMLGUIFactory::applyActionProperties( const TQDomElement &actionPropElemen
         if ( e.tagName().lower() != tagAction )
             continue;
 
-        KAction *action = d->guiClient->action( e );
+        TDEAction *action = d->guiClient->action( e );
         if ( !action )
             continue;
 
@@ -514,7 +514,7 @@ void KXMLGUIFactory::applyActionProperties( const TQDomElement &actionPropElemen
     }
 }
 
-void KXMLGUIFactory::configureAction( KAction *action, const TQDomNamedNodeMap &attributes )
+void KXMLGUIFactory::configureAction( TDEAction *action, const TQDomNamedNodeMap &attributes )
 {
     for ( uint i = 0; i < attributes.length(); i++ )
     {
@@ -526,9 +526,9 @@ void KXMLGUIFactory::configureAction( KAction *action, const TQDomNamedNodeMap &
     }
 }
 
-void KXMLGUIFactory::configureAction( KAction *action, const TQDomAttr &attribute )
+void KXMLGUIFactory::configureAction( TDEAction *action, const TQDomAttr &attribute )
 {
-    static const TQString &attrShortcut = KGlobal::staticQString( "shortcut" );
+    static const TQString &attrShortcut = TDEGlobal::staticQString( "shortcut" );
 
     TQString attrName = attribute.name();
     // If the attribute is a deprecated "accel", change to "shortcut".
@@ -588,8 +588,8 @@ TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc )
 
 TQDomElement KXMLGUIFactory::findActionByName( TQDomElement& elem, const TQString& sName, bool create )
 {
-        static const TQString& attrName = KGlobal::staticQString( "name" );
-	static const TQString& tagAction = KGlobal::staticQString( "Action" );
+        static const TQString& attrName = TDEGlobal::staticQString( "name" );
+	static const TQString& tagAction = TDEGlobal::staticQString( "Action" );
 	for( TQDomNode it = elem.firstChild(); !it.isNull(); it = it.nextSibling() ) {
 		TQDomElement e = it.toElement();
 		if( e.attribute( attrName ) == sName )
diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h
index 9b4733790..2f225b5ba 100644
--- a/tdeui/kxmlguifactory.h
+++ b/tdeui/kxmlguifactory.h
@@ -28,11 +28,11 @@
 
 #include <tdelibs_export.h>
 
-class KAction;
+class TDEAction;
 class KXMLGUIFactoryPrivate;
 class KXMLGUIClient;
 class KXMLGUIBuilder;
-class KInstance;
+class TDEInstance;
 
 namespace KXMLGUI
 {
@@ -52,7 +52,7 @@ class BuildHelper;
  * and merging the GUI from an unlimited number of clients.
  *
  * Each client provides XML through a TQDomDocument and actions through a
- * KActionCollection . The XML document contains the rules for how to merge the
+ * TDEActionCollection . The XML document contains the rules for how to merge the
  * GUI.
  *
  * KXMLGUIFactory processes the DOM tree provided by a client and plugs in the client's actions,
@@ -79,10 +79,10 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject
   ~KXMLGUIFactory();
 
   // XXX move to somewhere else? (Simon)
-  static TQString readConfigFile( const TQString &filename, bool never_null, const KInstance *instance = 0 );
-  static TQString readConfigFile( const TQString &filename, const KInstance *instance = 0 );
+  static TQString readConfigFile( const TQString &filename, bool never_null, const TDEInstance *instance = 0 );
+  static TQString readConfigFile( const TQString &filename, const TDEInstance *instance = 0 );
   static bool saveConfigFile( const TQDomDocument& doc, const TQString& filename,
-                              const KInstance *instance = 0 );
+                              const TDEInstance *instance = 0 );
 
   static TQString documentToXML( const TQDomDocument& doc );
   static TQString elementToXML( const TQDomElement& elem );
@@ -124,7 +124,7 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject
    */
   void removeClient( KXMLGUIClient *client );
 
-  void plugActionList( KXMLGUIClient *client, const TQString &name, const TQPtrList<KAction> &actionList );
+  void plugActionList( KXMLGUIClient *client, const TQString &name, const TQPtrList<TDEAction> &actionList );
   void unplugActionList( KXMLGUIClient *client, const TQString &name );
 
   /**
@@ -206,8 +206,8 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject
   TQPtrList<TQWidget> findRecursive( KXMLGUI::ContainerNode *node, const TQString &tagName );
 
   void applyActionProperties( const TQDomElement &element );
-  void configureAction( KAction *action, const TQDomNamedNodeMap &attributes );
-  void configureAction( KAction *action, const TQDomAttr &attribute );
+  void configureAction( TDEAction *action, const TQDomNamedNodeMap &attributes );
+  void configureAction( TDEAction *action, const TQDomAttr &attribute );
 
 protected:
   virtual void virtual_hook( int id, void* data );
diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp
index 279753277..699f9579d 100644
--- a/tdeui/kxmlguifactory_p.cpp
+++ b/tdeui/kxmlguifactory_p.cpp
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <assert.h>
@@ -220,7 +220,7 @@ void ContainerNode::plugActionList( BuildState &state )
 
 void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt )
 {
-    static const TQString &tagActionList = KGlobal::staticQString( "actionlist" );
+    static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" );
 
     MergingIndex mergingIdx = *mergingIdxIt;
 
@@ -262,7 +262,7 @@ void ContainerNode::unplugActionList( BuildState &state )
 
 void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt )
 {
-    static const TQString &tagActionList = KGlobal::staticQString( "actionlist" );
+    static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" );
 
     MergingIndex mergingIdx = *mergingIdxIt;
 
@@ -365,7 +365,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s
 TQDomElement ContainerNode::findElementForChild( const TQDomElement &baseElement,
                                                 ContainerNode *childNode )
 {
-    static const TQString &attrName = KGlobal::staticQString( "name" );
+    static const TQString &attrName = TDEGlobal::staticQString( "name" );
 
     // ### slow
     for ( TQDomNode n = baseElement.firstChild(); !n.isNull();
@@ -388,7 +388,7 @@ void ContainerNode::unplugActions( BuildState &state )
     ContainerClientListIt clientIt( clients );
 
     /*
-        Disabled because it means in KToolBar::saveState isHidden is always true then,
+        Disabled because it means in TDEToolBar::saveState isHidden is always true then,
         which is clearly wrong.
 
     if ( clients.count() == 1 && clientIt.current()->client == client &&
@@ -412,7 +412,7 @@ void ContainerNode::unplugActions( BuildState &state )
 
 void ContainerNode::unplugClient( ContainerClient *client )
 {
-    static const TQString &tagActionList = KGlobal::staticQString( "actionlist" );
+    static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" );
 
     assert( builder );
 
@@ -497,7 +497,7 @@ int ContainerNode::calcMergingIndex( const TQString &mergingName,
 
 int BuildHelper::calcMergingIndex( const TQDomElement &element, MergingIndexList::Iterator &it, TQString &group )
 {
-    static const TQString &attrGroup = KGlobal::staticQString( "group" );
+    static const TQString &attrGroup = TDEGlobal::staticQString( "group" );
 
     bool haveGroup = false;
     group = element.attribute( attrGroup );
@@ -521,7 +521,7 @@ BuildHelper::BuildHelper( BuildState &state, ContainerNode *node )
     : containerClient( 0 ), ignoreDefaultMergingIndex( false ), m_state( state ),
       parentNode( node )
 {
-    static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" );
+    static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" );
 
     // create a list of supported container and custom tags
     customTags = m_state.builderCustomTags;
@@ -556,12 +556,12 @@ void BuildHelper::build( const TQDomElement &element )
 void BuildHelper::processElement( const TQDomElement &e )
 {
     // some often used QStrings
-    static const TQString &tagAction = KGlobal::staticQString( "action" );
-    static const TQString &tagMerge = KGlobal::staticQString( "merge" );
-    static const TQString &tagState = KGlobal::staticQString( "state" );
-    static const TQString &tagDefineGroup = KGlobal::staticQString( "definegroup" );
-    static const TQString &tagActionList = KGlobal::staticQString( "actionlist" );
-    static const TQString &attrName = KGlobal::staticQString( "name" );
+    static const TQString &tagAction = TDEGlobal::staticQString( "action" );
+    static const TQString &tagMerge = TDEGlobal::staticQString( "merge" );
+    static const TQString &tagState = TDEGlobal::staticQString( "state" );
+    static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" );
+    static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" );
+    static const TQString &attrName = TDEGlobal::staticQString( "name" );
 
     TQString tag( e.tagName().lower() );
     TQString currName( e.attribute( attrName ) );
@@ -606,7 +606,7 @@ bool BuildHelper::processActionElement( const TQDomElement &e, int idx )
     assert( m_state.guiClient );
 
     // look up the action and plug it in
-    KAction *action = m_state.guiClient->action( e );
+    TDEAction *action = m_state.guiClient->action( e );
 
     //kdDebug() << "BuildHelper::processActionElement " << e.attribute( "name" ) << " -> " << action << " (in " << m_state.guiClient->actionCollection() << ")" << endl;
     if ( !action )
@@ -670,10 +670,10 @@ void BuildHelper::processStateElement( const TQDomElement &element )
 
 void BuildHelper::processMergeElement( const TQString &tag, const TQString &name, const TQDomElement &e )
 {
-    static const TQString &tagDefineGroup = KGlobal::staticQString( "definegroup" );
-    static const TQString &tagActionList = KGlobal::staticQString( "actionlist" );
-    static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" );
-    static const TQString &attrGroup = KGlobal::staticQString( "group" );
+    static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" );
+    static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" );
+    static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" );
+    static const TQString &attrGroup = TDEGlobal::staticQString( "group" );
 
     TQString mergingName( name );
     if ( mergingName.isEmpty() )
@@ -734,7 +734,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name
 void BuildHelper::processContainerElement( const TQDomElement &e, const TQString &tag,
                                            const TQString &name )
 {
-    static const TQString &defaultMergingName = KGlobal::staticQString( "<default>" );
+    static const TQString &defaultMergingName = TDEGlobal::staticQString( "<default>" );
 
     ContainerNode *containerNode = parentNode->findContainer( name, tag,
                                                               &containerList,
@@ -805,7 +805,7 @@ TQWidget *BuildHelper::createContainer( TQWidget *parent, int index,
         }
     }
 
-    KInstance *oldInstance = m_state.builder->builderInstance();
+    TDEInstance *oldInstance = m_state.builder->builderInstance();
     KXMLGUIClient *oldClient = m_state.builder->builderClient();
 
     m_state.builder->setBuilderClient( m_state.guiClient );
diff --git a/tdeui/kxmlguifactory_p.h b/tdeui/kxmlguifactory_p.h
index dc263b677..e0ad02ac9 100644
--- a/tdeui/kxmlguifactory_p.h
+++ b/tdeui/kxmlguifactory_p.h
@@ -24,7 +24,7 @@
 #include <tqdom.h>
 #include <tqvaluestack.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TQWidget;
 class KXMLGUIClient;
@@ -36,21 +36,21 @@ namespace KXMLGUI
 
 struct BuildState;
 
-class TDEUI_EXPORT ActionList : public TQPtrList<KAction>
+class TDEUI_EXPORT ActionList : public TQPtrList<TDEAction>
 {
 public:
     ActionList() {}
-    ActionList( const TQPtrList<KAction> &rhs )
-        : TQPtrList<KAction>( rhs )
+    ActionList( const TQPtrList<TDEAction> &rhs )
+        : TQPtrList<TDEAction>( rhs )
     {}
-    ActionList &operator=( const TQPtrList<KAction> &rhs )
-    { TQPtrList<KAction>::operator=( rhs ); return *this; }
+    ActionList &operator=( const TQPtrList<TDEAction> &rhs )
+    { TQPtrList<TDEAction>::operator=( rhs ); return *this; }
 
     void plug( TQWidget *container, int index ) const;
     void unplug( TQWidget *container ) const;
 };
 
-typedef TQPtrListIterator<KAction> ActionListIt;
+typedef TQPtrListIterator<TDEAction> ActionListIt;
 typedef TQMap< TQString, ActionList > ActionListMap;
 
 /*
diff --git a/tdeui/kaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp
index 8d5828960..ef9efb181 100644
--- a/tdeui/kaboutapplication.cpp
+++ b/tdeui/tdeaboutapplication.cpp
@@ -23,35 +23,35 @@
 // I (espen) prefer that header files are included alphabetically
 
 #include <tqlabel.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kaboutdialog_private.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 #include <kactivelabel.h>
 #include "ktextedit.h"
 
-KAboutApplication::KAboutApplication( TQWidget *parent, const char *name,
+TDEAboutApplication::TDEAboutApplication( TQWidget *parent, const char *name,
               bool modal )
-  :KAboutDialog( AbtTabbed|AbtProduct,
+  :TDEAboutDialog( AbtTabbed|AbtProduct,
                  kapp ? kapp->caption() : TQString::null,
                  Close, Close,
      parent, name, modal )
 {
-  buildDialog(KGlobal::instance()->aboutData());
+  buildDialog(TDEGlobal::instance()->aboutData());
 }
 
-KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *parent,
+TDEAboutApplication::TDEAboutApplication( const TDEAboutData *aboutData, TQWidget *parent,
                                       const char *name, bool modal )
-  :KAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close,
+  :TDEAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close,
      parent, name, modal )
 {
   buildDialog(aboutData);
 }
 
-void KAboutApplication::buildDialog( const KAboutData *aboutData )
+void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData )
 {
   if( !aboutData )
   {
@@ -61,11 +61,11 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
 
     //i18n "??" is displayed as (pseudo-)version when no data is known about the application
     setProduct( kapp ? kapp->caption() : TQString::null, i18n("??"), TQString::null, TQString::null );
-    KAboutContainer *appPage = addContainerPage( i18n("&About"));
+    TDEAboutContainer *appPage = addContainerPage( i18n("&About"));
 
     TQString appPageText =
       i18n("No information available.\n"
-     "The supplied KAboutData object does not exist.");
+     "The supplied TDEAboutData object does not exist.");
     TQLabel *appPageLabel = new TQLabel( "\n\n\n\n"+appPageText+"\n\n\n\n", 0 );
     appPage->addWidget( appPageLabel );
     return;
@@ -85,7 +85,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
   if (!aboutData->copyrightStatement().isEmpty())
     appPageText += "\n" + aboutData->copyrightStatement()+"\n";
 
-  KAboutContainer *appPage = addContainerPage( i18n("&About"));
+  TDEAboutContainer *appPage = addContainerPage( i18n("&About"));
 
   TQLabel *appPageLabel = new TQLabel( appPageText, 0 );
   appPage->addWidget( appPageLabel );
@@ -105,7 +105,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
   {
     TQString authorPageTitle = authorCount == 1 ?
       i18n("A&uthor") : i18n("A&uthors");
-    KAboutContainer *authorPage = addScrolledContainerPage( authorPageTitle );
+    TDEAboutContainer *authorPage = addScrolledContainerPage( authorPageTitle );
 
     if (!aboutData->customAuthorTextEnabled() || !aboutData->customAuthorRichText().isEmpty ())
     {
@@ -133,7 +133,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
       authorPage->addWidget( activeLabel );
     }
 
-    TQValueList<KAboutPerson>::ConstIterator it;
+    TQValueList<TDEAboutPerson>::ConstIterator it;
     for (it = aboutData->authors().begin();
    it != aboutData->authors().end(); ++it)
     {
@@ -145,9 +145,9 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
   int creditsCount = aboutData->credits().count();
   if (creditsCount)
   {
-    KAboutContainer *creditsPage =
+    TDEAboutContainer *creditsPage =
       addScrolledContainerPage( i18n("&Thanks To") );
-    TQValueList<KAboutPerson>::ConstIterator it;
+    TQValueList<TDEAboutPerson>::ConstIterator it;
     for (it = aboutData->credits().begin();
    it != aboutData->credits().end(); ++it)
     {
@@ -156,13 +156,13 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
     }
   }
 
-  const TQValueList<KAboutTranslator> translatorList = aboutData->translators();
+  const TQValueList<TDEAboutTranslator> translatorList = aboutData->translators();
 
   if(translatorList.count() > 0)
   {
       TQString text = "<qt>";
 
-      TQValueList<KAboutTranslator>::ConstIterator it;
+      TQValueList<TDEAboutTranslator>::ConstIterator it;
       for(it = translatorList.begin(); it != translatorList.end(); ++it)
       {
    text += TQString("<p>%1<br>&nbsp;&nbsp;&nbsp;"
@@ -172,7 +172,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
      .arg((*it).emailAddress());
       }
 
-      text += KAboutData::aboutTranslationTeam() + "</qt>";
+      text += TDEAboutData::aboutTranslationTeam() + "</qt>";
       addTextPage( i18n("T&ranslation"), text, true);
   }
 
diff --git a/tdeui/kaboutapplication.h b/tdeui/tdeaboutapplication.h
index 58145aa45..19fa0fe61 100644
--- a/tdeui/kaboutapplication.h
+++ b/tdeui/tdeaboutapplication.h
@@ -23,25 +23,25 @@
 #ifndef _KABOUT_APPLICATION_H_
 #define _KABOUT_APPLICATION_H_
 
-#include <kaboutdata.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdata.h>
+#include <tdeaboutdialog.h>
 
 /**
  * @short Standard "About Application" dialog box.
  * 
  * This class provides the standard "About Application" dialog box
  * that is used by KHelpMenu. It uses the information of the global
- * KAboutData that is specified at the start of your program in
+ * TDEAboutData that is specified at the start of your program in
  * main(). Normally you should not use this class directly but rather
  * the KHelpMenu class or even better just subclass your toplevel
- * window from KMainWindow. If you do the latter, the help menu and
+ * window from TDEMainWindow. If you do the latter, the help menu and
  * thereby this dialog box is available through the
- * KMainWindow::helpMenu() function.
+ * TDEMainWindow::helpMenu() function.
  *
  * @author Waldo Bastian (bastian@kde.org) and Espen Sand (espen@kde.org)
  */
 
-class TDEUI_EXPORT KAboutApplication : public KAboutDialog
+class TDEUI_EXPORT TDEAboutApplication : public TDEAboutDialog
 {
   public:
     /**
@@ -57,16 +57,16 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
      *        made visible using TQWidget::show(). Otherwise it will be
      *        modal and must be made visible using TQWidget::exec().
      */
-    KAboutApplication( TQWidget *parent=0, const char *name=0, bool modal=true );
+    TDEAboutApplication( TQWidget *parent=0, const char *name=0, bool modal=true );
 
     /**
      * Constructor. Mostly does the same stuff as the previous constructor, except
-     * that it can take a custom KAboutData object instead of the one specified
+     * that it can take a custom TDEAboutData object instead of the one specified
      * in your main() function. This is especially useful for applications
      * which are implemented as (dynamically loaded) libraries, e.g. panel
      * applets.
      *
-     * @param aboutData A pointer to a KAboutData object which data
+     * @param aboutData A pointer to a TDEAboutData object which data
      *        will be used for filling the dialog.
      * @param parent The parent of the dialog box. You should use the
      *        toplevel window so that the dialog becomes centered.
@@ -76,17 +76,17 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
      *        made visible using TQWidget::show(). Otherwise it will be
      *        modal and must be made visible using TQWidget::exec().
      */
-    KAboutApplication( const KAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
+    TDEAboutApplication( const TDEAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
 
 /*
  FIXME: The two constructors should be replaced with the following  after the lib freeze:
 
-    KAboutApplication( const KAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
+    TDEAboutApplication( const TDEAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
 
  This will make buildDialog() obsolete as well (Frerich).
 */
   protected:
-    void buildDialog( const KAboutData *aboutData );
+    void buildDialog( const TDEAboutData *aboutData );
 };
 
 
diff --git a/tdeui/kaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
index 3ed785891..895247161 100644
--- a/tdeui/kaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -31,18 +31,18 @@
 #include <tqtabwidget.h>
 #include <tqtabbar.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <ktextbrowser.h>
 #include <kurllabel.h>
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 #include <kaboutdialog_private.h>
 #include <kdebug.h>
 
 //MOC_SKIP_BEGIN
-template class TQPtrList<KAboutContributor>;
+template class TQPtrList<TDEAboutContributor>;
 //MOC_SKIP_END
 
 #define WORKTEXT_IDENTATION 16
@@ -50,14 +50,14 @@ template class TQPtrList<KAboutContributor>;
 
 // ##############################################################
 // MOC OUTPUT FILES:
-#include "kaboutdialog.moc"
+#include "tdeaboutdialog.moc"
 #include "kaboutdialog_private.moc"
 // ##############################################################
 
-class KAboutTabWidget : public TQTabWidget
+class TDEAboutTabWidget : public TQTabWidget
 {
 public:
-    KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
+    TDEAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
     TQSize sizeHint() const {
 	return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) );
     }
@@ -66,7 +66,7 @@ public:
 
 
 
-KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname,
+TDEAboutContributor::TDEAboutContributor( TQWidget *_parent, const char *wname,
 			              const TQString &_name,const TQString &_email,
 			              const TQString &_url, const TQString &_work,
 			              bool showHeader, bool showFrame,
@@ -113,7 +113,7 @@ KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname,
 }
 
 
-void KAboutContributor::setName( const TQString &_text, const TQString &_header,
+void TDEAboutContributor::setName( const TQString &_text, const TQString &_header,
 				 bool _update )
 {
   mLabel[0]->setText(_header);
@@ -122,7 +122,7 @@ void KAboutContributor::setName( const TQString &_text, const TQString &_header,
 }
 
 
-void KAboutContributor::setEmail( const TQString &_text, const TQString &_header,
+void TDEAboutContributor::setEmail( const TQString &_text, const TQString &_header,
 				  bool _update )
 {
   mLabel[1]->setText(_header);
@@ -133,7 +133,7 @@ void KAboutContributor::setEmail( const TQString &_text, const TQString &_header
 }
 
 
-void KAboutContributor::setURL( const TQString &_text, const TQString &_header,
+void TDEAboutContributor::setURL( const TQString &_text, const TQString &_header,
 				bool _update )
 {
   mLabel[2]->setText(_header);
@@ -144,7 +144,7 @@ void KAboutContributor::setURL( const TQString &_text, const TQString &_header,
 }
 
 
-void KAboutContributor::setWork( const TQString &_text, const TQString &_header,
+void TDEAboutContributor::setWork( const TQString &_text, const TQString &_header,
 				 bool _update )
 {
   mLabel[3]->setText(_header);
@@ -153,32 +153,32 @@ void KAboutContributor::setWork( const TQString &_text, const TQString &_header,
 }
 
 
-TQString KAboutContributor::getName( void ) const
+TQString TDEAboutContributor::getName( void ) const
 {
   return mText[0]->text();
 }
 
 
-TQString KAboutContributor::getEmail( void ) const
+TQString TDEAboutContributor::getEmail( void ) const
 {
   return mText[1]->text();
 }
 
 
-TQString KAboutContributor::getURL( void ) const
+TQString TDEAboutContributor::getURL( void ) const
 {
   return mText[2]->text();
 }
 
 
-TQString KAboutContributor::getWork( void ) const
+TQString TDEAboutContributor::getWork( void ) const
 {
   return mText[3]->text();
 }
 
 
 
-void KAboutContributor::updateLayout( void )
+void TDEAboutContributor::updateLayout( void )
 {
   delete layout();
 
@@ -260,7 +260,7 @@ void KAboutContributor::updateLayout( void )
 }
 
 
-void KAboutContributor::fontChange( const TQFont &/*oldFont*/ )
+void TDEAboutContributor::fontChange( const TQFont &/*oldFont*/ )
 {
   if( mShowBold )
   {
@@ -272,28 +272,28 @@ void KAboutContributor::fontChange( const TQFont &/*oldFont*/ )
 }
 
 
-TQSize KAboutContributor::sizeHint( void ) const
+TQSize TDEAboutContributor::sizeHint( void ) const
 {
   return minimumSizeHint();
 }
 
 
-void KAboutContributor::urlClickedSlot( const TQString &u )
+void TDEAboutContributor::urlClickedSlot( const TQString &u )
 {
   emit openURL(u);
 }
 
 
-void KAboutContributor::emailClickedSlot( const TQString &e )
+void TDEAboutContributor::emailClickedSlot( const TQString &e )
 {
   emit sendEmail( mText[0]->text(), e ) ;
 }
 
 
 //
-// Internal widget for the KAboutDialog class.
+// Internal widget for the TDEAboutDialog class.
 //
-KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent,
+TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent,
 					  char *_name )
   : TQWidget( _parent, _name ),
     mImageLabel(0), mTitleLabel(0), mIconLabel(0),mVersionLabel(0),
@@ -369,7 +369,7 @@ KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent,
 
   if( layoutType & AbtTabbed )
   {
-    mPageTab = new KAboutTabWidget( this );
+    mPageTab = new TDEAboutTabWidget( this );
     if( !mPageTab ) { return; }
     hbox->addWidget( mPageTab, 10 );
   }
@@ -422,21 +422,21 @@ KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent,
 }
 
 
-void KAboutContainerBase::show( void )
+void TDEAboutContainerBase::show( void )
 {
     TQWidget::show();
 }
 
-TQSize KAboutContainerBase::sizeHint( void ) const
+TQSize TDEAboutContainerBase::sizeHint( void ) const
 {
     return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
 }
 
-void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
+void TDEAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
 {
   if( mTitleLabel )
   {
-    TQFont f( KGlobalSettings::generalFont() );
+    TQFont f( TDEGlobalSettings::generalFont() );
     f.setBold( true );
     int fs = f.pointSize();
     if (fs == -1)
@@ -447,7 +447,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
 
   if( mVersionLabel )
   {
-    TQFont f( KGlobalSettings::generalFont() );
+    TQFont f( TDEGlobalSettings::generalFont() );
     f.setBold( true );
     mVersionLabel->setFont(f);
     mAuthorLabel->setFont(f);
@@ -457,7 +457,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
   update();
 }
 
-TQFrame *KAboutContainerBase::addTextPage( const TQString &title,
+TQFrame *TDEAboutContainerBase::addTextPage( const TQString &title,
 					  const TQString &text,
 					  bool richText, int numLines )
 {
@@ -492,7 +492,7 @@ TQFrame *KAboutContainerBase::addTextPage( const TQString &title,
   return page;
 }
 
-TQFrame *KAboutContainerBase::addLicensePage( const TQString &title,
+TQFrame *TDEAboutContainerBase::addLicensePage( const TQString &title,
 					  const TQString &text, int numLines)
 {
   TQFrame* const page = addEmptyPage( title );
@@ -502,7 +502,7 @@ TQFrame *KAboutContainerBase::addLicensePage( const TQString &title,
   TQVBoxLayout* const vbox = new TQVBoxLayout( page, KDialog::spacingHint() );
 
   KTextEdit* const textEdit = new KTextEdit( page, "license" );
-  textEdit->setFont( KGlobalSettings::fixedFont() );
+  textEdit->setFont( TDEGlobalSettings::fixedFont() );
   textEdit->setReadOnly( true );
   textEdit->setWordWrap( TQTextEdit::NoWrap );
   textEdit->setText( text );
@@ -512,7 +512,7 @@ TQFrame *KAboutContainerBase::addLicensePage( const TQString &title,
 }
 
 
-KAboutContainer *KAboutContainerBase::addContainerPage( const TQString &title,
+TDEAboutContainer *TDEAboutContainerBase::addContainerPage( const TQString &title,
 							int childAlignment,
 							int innerAlignment )
 {
@@ -522,7 +522,7 @@ KAboutContainer *KAboutContainerBase::addContainerPage( const TQString &title,
     return 0;
   }
 
-  KAboutContainer* const container = new KAboutContainer( mPageTab, "container",
+  TDEAboutContainer* const container = new TDEAboutContainer( mPageTab, "container",
     KDialog::spacingHint(), KDialog::spacingHint(), childAlignment,
 						  innerAlignment );
   mPageTab->addTab( container, title );
@@ -536,7 +536,7 @@ KAboutContainer *KAboutContainerBase::addContainerPage( const TQString &title,
 }
 
 
-KAboutContainer *KAboutContainerBase::addScrolledContainerPage(
+TDEAboutContainer *TDEAboutContainerBase::addScrolledContainerPage(
 				      const TQString &title,
 				      int childAlignment,
 				      int innerAlignment )
@@ -553,7 +553,7 @@ KAboutContainer *KAboutContainerBase::addScrolledContainerPage(
   scrollView->viewport()->setBackgroundMode( PaletteBackground );
   vbox->addWidget( scrollView );
 
-  KAboutContainer* const container = new KAboutContainer( scrollView, "container",
+  TDEAboutContainer* const container = new TDEAboutContainer( scrollView, "container",
     KDialog::spacingHint(), KDialog::spacingHint(), childAlignment,
     innerAlignment );
   scrollView->addChild( container );
@@ -568,7 +568,7 @@ KAboutContainer *KAboutContainerBase::addScrolledContainerPage(
 }
 
 
-TQFrame *KAboutContainerBase::addEmptyPage( const TQString &title )
+TQFrame *TDEAboutContainerBase::addEmptyPage( const TQString &title )
 {
   if( !mPageTab )
   {
@@ -584,10 +584,10 @@ TQFrame *KAboutContainerBase::addEmptyPage( const TQString &title )
 }
 
 
-KAboutContainer *KAboutContainerBase::addContainer( int childAlignment,
+TDEAboutContainer *TDEAboutContainerBase::addContainer( int childAlignment,
 						    int innerAlignment )
 {
-  KAboutContainer* const container = new KAboutContainer( this, "container",
+  TDEAboutContainer* const container = new TDEAboutContainer( this, "container",
     0, KDialog::spacingHint(), childAlignment, innerAlignment );
   mTopLayout->addWidget( container, 0, childAlignment );
 
@@ -601,7 +601,7 @@ KAboutContainer *KAboutContainerBase::addContainer( int childAlignment,
 
 
 
-void KAboutContainerBase::setTitle( const TQString &title )
+void TDEAboutContainerBase::setTitle( const TQString &title )
 {
   if( !mTitleLabel )
   {
@@ -612,7 +612,7 @@ void KAboutContainerBase::setTitle( const TQString &title )
 }
 
 
-void KAboutContainerBase::setImage( const TQString &fileName )
+void TDEAboutContainerBase::setImage( const TQString &fileName )
 {
   if( !mImageLabel )
   {
@@ -631,7 +631,7 @@ void KAboutContainerBase::setImage( const TQString &fileName )
   mImageFrame->layout()->activate();
 }
 
-void KAboutContainerBase::setProgramLogo( const TQString &fileName )
+void TDEAboutContainerBase::setProgramLogo( const TQString &fileName )
 {
   if( fileName.isNull() )
   {
@@ -642,7 +642,7 @@ void KAboutContainerBase::setProgramLogo( const TQString &fileName )
   setProgramLogo( logo );
 }
 
-void KAboutContainerBase::setProgramLogo( const TQPixmap &pixmap )
+void TDEAboutContainerBase::setProgramLogo( const TQPixmap &pixmap )
 {
   if( !mIconLabel )
   {
@@ -655,7 +655,7 @@ void KAboutContainerBase::setProgramLogo( const TQPixmap &pixmap )
   }
 }
 
-void KAboutContainerBase::setImageBackgroundColor( const TQColor &color )
+void TDEAboutContainerBase::setImageBackgroundColor( const TQColor &color )
 {
   if( mImageFrame )
   {
@@ -664,7 +664,7 @@ void KAboutContainerBase::setImageBackgroundColor( const TQColor &color )
 }
 
 
-void KAboutContainerBase::setImageFrame( bool state )
+void TDEAboutContainerBase::setImageFrame( bool state )
 {
   if( mImageFrame )
   {
@@ -682,7 +682,7 @@ void KAboutContainerBase::setImageFrame( bool state )
 }
 
 
-void KAboutContainerBase::setProduct( const TQString &appName,
+void TDEAboutContainerBase::setProduct( const TQString &appName,
 				      const TQString &version,
 				      const TQString &author,
 				      const TQString &year )
@@ -720,18 +720,18 @@ void KAboutContainerBase::setProduct( const TQString &appName,
 }
 
 
-void KAboutContainerBase::slotMouseTrack( int mode, const TQMouseEvent *e )
+void TDEAboutContainerBase::slotMouseTrack( int mode, const TQMouseEvent *e )
 {
   emit mouseTrack( mode, e );
 }
 
 
-void KAboutContainerBase::slotUrlClick( const TQString &url )
+void TDEAboutContainerBase::slotUrlClick( const TQString &url )
 {
   emit urlClick( url );
 }
 
-void KAboutContainerBase::slotMailClick( const TQString &_name,
+void TDEAboutContainerBase::slotMailClick( const TQString &_name,
 					 const TQString &_address )
 {
   emit mailClick( _name, _address );
@@ -739,7 +739,7 @@ void KAboutContainerBase::slotMailClick( const TQString &_name,
 
 
 
-KAboutContainer::KAboutContainer( TQWidget *_parent, const char *_name,
+TDEAboutContainer::TDEAboutContainer( TQWidget *_parent, const char *_name,
 				  int _margin, int _spacing,
 				  int childAlignment, int innerAlignment )
   : TQFrame( _parent, _name ), d(0)
@@ -781,7 +781,7 @@ KAboutContainer::KAboutContainer( TQWidget *_parent, const char *_name,
 }
 
 
-void KAboutContainer::childEvent( TQChildEvent *e )
+void TDEAboutContainer::childEvent( TQChildEvent *e )
 {
   if( !e->inserted() || !e->child()->isWidgetType() )
   {
@@ -806,7 +806,7 @@ void KAboutContainer::childEvent( TQChildEvent *e )
 }
 
 
-TQSize KAboutContainer::sizeHint( void ) const
+TQSize TDEAboutContainer::sizeHint( void ) const
 {
   //
   // The size is computed by adding the sizeHint().height() of all
@@ -864,24 +864,24 @@ TQSize KAboutContainer::sizeHint( void ) const
 }
 
 
-TQSize KAboutContainer::minimumSizeHint( void ) const
+TQSize TDEAboutContainer::minimumSizeHint( void ) const
 {
   return sizeHint();
 }
 
 
-void KAboutContainer::addWidget( TQWidget *widget )
+void TDEAboutContainer::addWidget( TQWidget *widget )
 {
   widget->reparent( this, 0, TQPoint(0,0) );
 }
 
 
-void KAboutContainer::addPerson( const TQString &_name, const TQString &_email,
+void TDEAboutContainer::addPerson( const TQString &_name, const TQString &_email,
 				 const TQString &_url, const TQString &_task,
 				 bool showHeader, bool showFrame,bool showBold)
 {
 
-  KAboutContributor* const cont = new KAboutContributor( this, "pers",
+  TDEAboutContributor* const cont = new TDEAboutContributor( this, "pers",
     _name, _email, _url, _task, showHeader, showFrame, showBold );
   connect( cont, TQT_SIGNAL( openURL(const TQString&)),
 	   this, TQT_SIGNAL( urlClick(const TQString &)));
@@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email,
 }
 
 
-void KAboutContainer::addTitle( const TQString &title, int alignment,
+void TDEAboutContainer::addTitle( const TQString &title, int alignment,
 				bool showFrame, bool showBold )
 {
 
@@ -909,7 +909,7 @@ void KAboutContainer::addTitle( const TQString &title, int alignment,
 }
 
 
-void KAboutContainer::addImage( const TQString &fileName, int alignment )
+void TDEAboutContainer::addImage( const TQString &fileName, int alignment )
 {
   if( fileName.isNull() )
   {
@@ -930,19 +930,19 @@ void KAboutContainer::addImage( const TQString &fileName, int alignment )
 #if 0
 //MOC_SKIP_BEGIN
 
-/** Every person displayed is stored in a KAboutContributor object.
+/** Every person displayed is stored in a TDEAboutContributor object.
  *  Every contributor, the author and/or the maintainer of the application are
  *  stored in objects of this local class. Every single field may be empty.
- *  To add a contributor, create a KAboutContributor object as a child of your
- *  @ref KAboutDialog, set its contents and add it using add addContributor. */
-class KAboutContributor : public QFrame
+ *  To add a contributor, create a TDEAboutContributor object as a child of your
+ *  @ref TDEAboutDialog, set its contents and add it using add addContributor. */
+class TDEAboutContributor : public QFrame
 {
   // ############################################################################
   Q_OBJECT
   // ----------------------------------------------------------------------------
 public:
   /** The Qt constructor. */
-  KAboutContributor(TQWidget* parent=0, const char* name=0);
+  TDEAboutContributor(TQWidget* parent=0, const char* name=0);
   /** Set the name (a literal string). */
   void setName(const TQString&);
   /** Get the name. */
@@ -958,7 +958,7 @@ public:
   /** The tasks the person worked on (a literal string). More than one line is
    *  possible, but very long texts might look ugly. */
   void setWork(const TQString&);
-  /** The size hint. Very important here, since KAboutWidget relies on it for
+  /** The size hint. Very important here, since TDEAboutWidget relies on it for
    *  geometry management. */
   TQSize sizeHint();
   TQSize minimumSizeHint(void);
@@ -997,7 +997,7 @@ signals:
 
 
 
-KAboutContributor::KAboutContributor(TQWidget* parent, const char* n)
+TDEAboutContributor::TDEAboutContributor(TQWidget* parent, const char* n)
   : TQFrame(parent, n),
     name(new TQLabel(this)),
     email(new KURLLabel(this)),
@@ -1006,7 +1006,7 @@ KAboutContributor::KAboutContributor(TQWidget* parent, const char* n)
   // ############################################################
   if(name==0 || email==0)
     { // this will nearly never happen (out of memory in about box?)
-      kdDebug() << "KAboutContributor::KAboutContributor: Out of memory." << endl;
+      kdDebug() << "TDEAboutContributor::TDEAboutContributor: Out of memory." << endl;
       tqApp->quit();
     }
   setFrameStyle(TQFrame::Panel | TQFrame::Raised);
@@ -1019,7 +1019,7 @@ KAboutContributor::KAboutContributor(TQWidget* parent, const char* n)
 }
 
 void
-KAboutContributor::setName(const TQString& n)
+TDEAboutContributor::setName(const TQString& n)
 {
   // ############################################################
   name->setText(n);
@@ -1027,14 +1027,14 @@ KAboutContributor::setName(const TQString& n)
 }
 
 QString
-KAboutContributor::getName()
+TDEAboutContributor::getName()
 {
   // ###########################################################
   return name->text();
   // ###########################################################
 }
 void
-KAboutContributor::setURL(const TQString& u)
+TDEAboutContributor::setURL(const TQString& u)
 {
   // ###########################################################
   url->setText(u);
@@ -1042,7 +1042,7 @@ KAboutContributor::setURL(const TQString& u)
 }
 
 QString
-KAboutContributor::getURL()
+TDEAboutContributor::getURL()
 {
   // ###########################################################
   return url->text();
@@ -1050,7 +1050,7 @@ KAboutContributor::getURL()
 }
 
 void
-KAboutContributor::setEmail(const TQString& e)
+TDEAboutContributor::setEmail(const TQString& e)
 {
   // ###########################################################
   email->setText(e);
@@ -1058,7 +1058,7 @@ KAboutContributor::setEmail(const TQString& e)
 }
 
 QString
-KAboutContributor::getEmail()
+TDEAboutContributor::getEmail()
 {
   // ###########################################################
   return email->text();
@@ -1066,25 +1066,25 @@ KAboutContributor::getEmail()
 }
 
 void
-KAboutContributor::emailClickedSlot(const TQString& e)
+TDEAboutContributor::emailClickedSlot(const TQString& e)
 {
   // ###########################################################
-  kdDebug() << "KAboutContributor::emailClickedSlot: called." << endl;
+  kdDebug() << "TDEAboutContributor::emailClickedSlot: called." << endl;
   emit(sendEmail(name->text(), e));
   // ###########################################################
 }
 
 void
-KAboutContributor::urlClickedSlot(const TQString& u)
+TDEAboutContributor::urlClickedSlot(const TQString& u)
 {
   // ###########################################################
-  kdDebug() << "KAboutContributor::urlClickedSlot: called." << endl;
+  kdDebug() << "TDEAboutContributor::urlClickedSlot: called." << endl;
   emit(openURL(u));
   // ###########################################################
 }
 
 void
-KAboutContributor::setWork(const TQString& w)
+TDEAboutContributor::setWork(const TQString& w)
 {
   // ###########################################################
   work=w;
@@ -1096,7 +1096,7 @@ KAboutContributor::setWork(const TQString& w)
 
 #if 0
 QSize
-KAboutContributor::sizeHint()
+TDEAboutContributor::sizeHint()
 {
   // ############################################################################
   const int FrameWidth=frameWidth();
@@ -1128,13 +1128,13 @@ KAboutContributor::sizeHint()
   // ############################################################################
 }
 
-TQSize KAboutContributor::minimumSizeHint(void)
+TQSize TDEAboutContributor::minimumSizeHint(void)
 {
   return( sizeHint() );
 }
 
 
-void KAboutContributor::show( void )
+void TDEAboutContributor::show( void )
 {
   TQFrame::show();
   setMinimumSize( sizeHint() );
@@ -1143,7 +1143,7 @@ void KAboutContributor::show( void )
 
 
 void
-KAboutContributor::resizeEvent(TQResizeEvent*)
+TDEAboutContributor::resizeEvent(TQResizeEvent*)
 { // the widgets are simply aligned from top to bottom, since the parent is
   // expected to respect the size hint
   // ############################################################################
@@ -1166,7 +1166,7 @@ KAboutContributor::resizeEvent(TQResizeEvent*)
 
 
 void
-KAboutContributor::paintEvent(TQPaintEvent* e)
+TDEAboutContributor::paintEvent(TQPaintEvent* e)
 { // the widgets are simply aligned from top to bottom, since the parent is
   // expected to respect the size hint (the widget is only used locally by now)
   // ############################################################################
@@ -1186,7 +1186,7 @@ KAboutContributor::paintEvent(TQPaintEvent* e)
 
 
 #if 0
-TQSize KAboutContributor::sizeHint( void )
+TQSize TDEAboutContributor::sizeHint( void )
 {
   int s = KDialog::spacingHint();
   int h = fontMetrics().lineSpacing()*3 + 2*s;
@@ -1239,7 +1239,7 @@ TQSize KAboutContributor::sizeHint( void )
 // The widgets are simply aligned from top to bottom, since the parent is
 // expected to respect the size hint
 //
-void KAboutContributor::resizeEvent(TQResizeEvent*)
+void TDEAboutContributor::resizeEvent(TQResizeEvent*)
 {
   int x = frameWidth();
   int s = KDialog::spacingHint();
@@ -1273,7 +1273,7 @@ void KAboutContributor::resizeEvent(TQResizeEvent*)
 
 
 
-void KAboutContributor::paintEvent( TQPaintEvent *e )
+void TDEAboutContributor::paintEvent( TQPaintEvent *e )
 {
   TQFrame::paintEvent(e);
   if(work.isEmpty()) return;
@@ -1305,13 +1305,13 @@ void KAboutContributor::paintEvent( TQPaintEvent *e )
 
 
 
-KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name)
+TDEAboutWidget::TDEAboutWidget(TQWidget *_parent, const char *_name)
   : TQWidget(_parent, _name),
     version(new TQLabel(this)),
     cont(new TQLabel(this)),
     logo(new TQLabel(this)),
-    author(new KAboutContributor(this)),
-    maintainer(new KAboutContributor(this)),
+    author(new TDEAboutContributor(this)),
+    maintainer(new TDEAboutContributor(this)),
     showMaintainer(false),
     d(0)
 {
@@ -1319,7 +1319,7 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name)
   if( !version || !cont || !logo || !author || !maintainer )
   {
     // this will nearly never happen (out of memory in about box?)
-    kdDebug() << "KAboutWidget::KAboutWidget: Out of memory." << endl;
+    kdDebug() << "TDEAboutWidget::TDEAboutWidget: Out of memory." << endl;
     tqApp->quit();
   }
   // -----
@@ -1341,7 +1341,7 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name)
 
 
 void
-KAboutWidget::adjust()
+TDEAboutWidget::adjust()
 {
   // #################################################################
   int cx, cy, tempx;
@@ -1371,8 +1371,8 @@ KAboutWidget::adjust()
     {
       cx=QMAX(cx, cont->sizeHint().width());
       cy+=cont->sizeHint().height()+Grid;
-      TQPtrListIterator<KAboutContributor> _pos(contributors);
-      KAboutContributor* currEntry;
+      TQPtrListIterator<TDEAboutContributor> _pos(contributors);
+      TDEAboutContributor* currEntry;
       while ( (currEntry = _pos.current()) )
 	{
 	  ++_pos;
@@ -1385,25 +1385,25 @@ KAboutWidget::adjust()
 }
 
 void
-KAboutWidget::setLogo(const TQPixmap& i)
+TDEAboutWidget::setLogo(const TQPixmap& i)
 {
   // ############################################################################
   logo->setPixmap(i);
   // ############################################################################
 }
 
-void KAboutWidget::sendEmailSlot(const TQString &_name, const TQString &_email)
+void TDEAboutWidget::sendEmailSlot(const TQString &_name, const TQString &_email)
 {
   emit(sendEmail(_name, _email));
 }
 
-void KAboutWidget::openURLSlot(const TQString& _url)
+void TDEAboutWidget::openURLSlot(const TQString& _url)
 {
   emit(openURL(_url));
 }
 
 void
-KAboutWidget::setAuthor(const TQString &_name, const TQString &_email,
+TDEAboutWidget::setAuthor(const TQString &_name, const TQString &_email,
 			const TQString &_url, const TQString &_w)
 {
   // ############################################################################
@@ -1415,7 +1415,7 @@ KAboutWidget::setAuthor(const TQString &_name, const TQString &_email,
 }
 
 void
-KAboutWidget::setMaintainer(const TQString &_name, const TQString &_email,
+TDEAboutWidget::setMaintainer(const TQString &_name, const TQString &_email,
 			    const TQString &_url, const TQString &_w)
 {
   // ############################################################################
@@ -1428,11 +1428,11 @@ KAboutWidget::setMaintainer(const TQString &_name, const TQString &_email,
 }
 
 void
-KAboutWidget::addContributor(const TQString &_name, const TQString &_email,
+TDEAboutWidget::addContributor(const TQString &_name, const TQString &_email,
 			     const TQString &_url, const TQString &_w)
 {
   // ############################################################################
-  KAboutContributor* const c=new KAboutContributor(this);
+  TDEAboutContributor* const c=new TDEAboutContributor(this);
   // -----
   c->setName(_name);
   c->setEmail(_email);
@@ -1446,7 +1446,7 @@ KAboutWidget::addContributor(const TQString &_name, const TQString &_email,
 }
 
 void
-KAboutWidget::setVersion(const TQString &_name)
+TDEAboutWidget::setVersion(const TQString &_name)
 {
   // ############################################################################
   version->setText(_name);
@@ -1454,7 +1454,7 @@ KAboutWidget::setVersion(const TQString &_name)
 }
 
 void
-KAboutWidget::resizeEvent(TQResizeEvent*)
+TDEAboutWidget::resizeEvent(TQResizeEvent*)
 {
   // ############################################################################
   int _x=0, _y, cx, tempx, tempy;
@@ -1484,8 +1484,8 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
     } else {
       cont->hide();
     }
-  TQPtrListIterator<KAboutContributor> _pos(contributors);
-  KAboutContributor* currEntry;
+  TQPtrListIterator<TDEAboutContributor> _pos(contributors);
+  TDEAboutContributor* currEntry;
   while( (currEntry = _pos.current()) )
     {
       ++_pos;
@@ -1503,15 +1503,15 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
   // ############################################################################
 }
 
-KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal)
+TDEAboutDialog::TDEAboutDialog(TQWidget *_parent, const char *_name, bool modal)
   : KDialogBase(_parent, _name, modal, TQString::null, Ok, Ok ),
-    about(new KAboutWidget(this)), mContainerBase(0), d(0)
+    about(new TDEAboutWidget(this)), mContainerBase(0), d(0)
 {
   // #################################################################
   if(!about)
   {
     // this will nearly never happen (out of memory in about box?)
-    kdDebug() << "KAboutDialog::KAboutDialog: Out of memory." << endl;
+    kdDebug() << "TDEAboutDialog::TDEAboutDialog: Out of memory." << endl;
     tqApp->quit();
   }
   setMainWidget(about);
@@ -1523,7 +1523,7 @@ KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal)
 }
 
 
-KAboutDialog::KAboutDialog( int layoutType, const TQString &_caption,
+TDEAboutDialog::TDEAboutDialog( int layoutType, const TQString &_caption,
 			    int buttonMask, ButtonCode defaultButton,
 			    TQWidget *_parent, const char *_name, bool modal,
 			    bool separator, const TQString &user1,
@@ -1534,7 +1534,7 @@ KAboutDialog::KAboutDialog( int layoutType, const TQString &_caption,
 {
   setPlainCaption( i18n("About %1").arg(_caption) );
 
-  mContainerBase = new KAboutContainerBase( layoutType, this );
+  mContainerBase = new TDEAboutContainerBase( layoutType, this );
   setMainWidget(mContainerBase);
 
   connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)),
@@ -1546,7 +1546,7 @@ KAboutDialog::KAboutDialog( int layoutType, const TQString &_caption,
 }
 
 
-void KAboutDialog::show( void )
+void TDEAboutDialog::show( void )
 {
   adjust();
   if( mContainerBase ) { mContainerBase->show(); }
@@ -1554,7 +1554,7 @@ void KAboutDialog::show( void )
 }
 
 
-void KAboutDialog::show( TQWidget * /*centerParent*/ )
+void TDEAboutDialog::show( TQWidget * /*centerParent*/ )
 {
   adjust();
   if( mContainerBase ) { mContainerBase->show(); }
@@ -1562,7 +1562,7 @@ void KAboutDialog::show( TQWidget * /*centerParent*/ )
 }
 
 
-void KAboutDialog::adjust()
+void TDEAboutDialog::adjust()
 {
   if( !about ) { return; }
   about->adjust();
@@ -1571,14 +1571,14 @@ void KAboutDialog::adjust()
 }
 
 
-void KAboutDialog::setLogo(const TQPixmap& i)
+void TDEAboutDialog::setLogo(const TQPixmap& i)
 {
   if( !about ) { return; }
   about->setLogo(i);
 }
 
 
-void KAboutDialog::setMaintainer(const TQString &_name, const TQString &_email,
+void TDEAboutDialog::setMaintainer(const TQString &_name, const TQString &_email,
 				 const TQString &_url, const TQString &_w)
 {
   // #################################################################
@@ -1587,7 +1587,7 @@ void KAboutDialog::setMaintainer(const TQString &_name, const TQString &_email,
   // #################################################################
 }
 
-void KAboutDialog::setAuthor(const TQString &_name, const TQString &_email,
+void TDEAboutDialog::setAuthor(const TQString &_name, const TQString &_email,
 			     const TQString &_url, const TQString &_work)
 {
   // #################################################################
@@ -1596,7 +1596,7 @@ void KAboutDialog::setAuthor(const TQString &_name, const TQString &_email,
   // #################################################################
 }
 
-void KAboutDialog::addContributor(const TQString &_name, const TQString &_email,
+void TDEAboutDialog::addContributor(const TQString &_name, const TQString &_email,
 				  const TQString &_url, const TQString &_w)
 {
   // #################################################################
@@ -1605,7 +1605,7 @@ void KAboutDialog::addContributor(const TQString &_name, const TQString &_email,
   // #################################################################
 }
 
-void KAboutDialog::setVersion(const TQString &_name)
+void TDEAboutDialog::setVersion(const TQString &_name)
 {
   // #################################################################
   if( !about ) { return; }
@@ -1613,40 +1613,40 @@ void KAboutDialog::setVersion(const TQString &_name)
   // #################################################################
 }
 
-void KAboutDialog::sendEmailSlot(const TQString& /*name*/, const TQString& email)
+void TDEAboutDialog::sendEmailSlot(const TQString& /*name*/, const TQString& email)
 {
   if ( kapp )
       kapp->invokeMailer( email, TQString::null );
   /*
-  kdDebug() << "KAboutDialog::sendEmailSlot: request to send an email to "
+  kdDebug() << "TDEAboutDialog::sendEmailSlot: request to send an email to "
 	<< name << ", " << email << endl;
   emit(sendEmail(name, email));
   */
 }
 
-void KAboutDialog::openURLSlot(const TQString& url)
+void TDEAboutDialog::openURLSlot(const TQString& url)
 {
   if ( kapp )
       kapp->invokeBrowser( url );
-  //kdDebug() << "KAboutDialog::openURLSlot: request to open URL " << url << endl;
+  //kdDebug() << "TDEAboutDialog::openURLSlot: request to open URL " << url << endl;
   //emit(openURL(url));
 }
 
 
-void KAboutDialog::mouseTrackSlot( int /*mode*/, const TQMouseEvent * /*e*/ )
+void TDEAboutDialog::mouseTrackSlot( int /*mode*/, const TQMouseEvent * /*e*/ )
 {
   // By default we do nothing. This method must be reimplemented.
 }
 
 
-TQFrame *KAboutDialog::addTextPage( const TQString &title, const TQString &text,
+TQFrame *TDEAboutDialog::addTextPage( const TQString &title, const TQString &text,
 				   bool richText, int numLines )
 {
   if( !mContainerBase ) { return 0; }
   return mContainerBase->addTextPage( title, text, richText, numLines );
 }
 
-TQFrame *KAboutDialog::addLicensePage( const TQString &title, const TQString &text,
+TQFrame *TDEAboutDialog::addLicensePage( const TQString &title, const TQString &text,
 				   int numLines )
 {
   if( !mContainerBase ) { return 0; }
@@ -1654,7 +1654,7 @@ TQFrame *KAboutDialog::addLicensePage( const TQString &title, const TQString &te
 }
 
 
-KAboutContainer *KAboutDialog::addContainerPage( const TQString &title,
+TDEAboutContainer *TDEAboutDialog::addContainerPage( const TQString &title,
 				  int childAlignment, int innerAlignment )
 {
   if( !mContainerBase ) { return 0; }
@@ -1663,7 +1663,7 @@ KAboutContainer *KAboutDialog::addContainerPage( const TQString &title,
 }
 
 
-KAboutContainer *KAboutDialog::addScrolledContainerPage( const TQString &title,
+TDEAboutContainer *TDEAboutDialog::addScrolledContainerPage( const TQString &title,
 				  int childAlignment, int innerAlignment )
 {
   if( !mContainerBase ) { return 0; }
@@ -1673,14 +1673,14 @@ KAboutContainer *KAboutDialog::addScrolledContainerPage( const TQString &title,
 
 
 
-TQFrame *KAboutDialog::addPage( const TQString &title )
+TQFrame *TDEAboutDialog::addPage( const TQString &title )
 {
   if( !mContainerBase ) { return 0; }
   return mContainerBase->addEmptyPage( title );
 }
 
 
-KAboutContainer *KAboutDialog::addContainer( int childAlignment,
+TDEAboutContainer *TDEAboutDialog::addContainer( int childAlignment,
 					     int innerAlignment )
 {
   if( !mContainerBase ) { return 0; }
@@ -1688,53 +1688,53 @@ KAboutContainer *KAboutDialog::addContainer( int childAlignment,
 }
 
 
-void KAboutDialog::setTitle( const TQString &title )
+void TDEAboutDialog::setTitle( const TQString &title )
 {
   if( !mContainerBase ) { return; }
   mContainerBase->setTitle( title );
 }
 
 
-void KAboutDialog::setImage( const TQString &fileName )
+void TDEAboutDialog::setImage( const TQString &fileName )
 {
   if( !mContainerBase ) { return; }
   mContainerBase->setImage( fileName );
 }
 
 // KDE4: remove
-void KAboutDialog::setIcon( const TQString &fileName )
+void TDEAboutDialog::setIcon( const TQString &fileName )
 {
   if( !mContainerBase ) { return; }
   mContainerBase->setProgramLogo( fileName );
 }
 
-void KAboutDialog::setProgramLogo( const TQString &fileName )
+void TDEAboutDialog::setProgramLogo( const TQString &fileName )
 {
   if( !mContainerBase ) { return; }
   mContainerBase->setProgramLogo( fileName );
 }
 
-void KAboutDialog::setProgramLogo( const TQPixmap &pixmap )
+void TDEAboutDialog::setProgramLogo( const TQPixmap &pixmap )
 {
   if( !mContainerBase ) { return; }
   mContainerBase->setProgramLogo( pixmap );
 }
 
-void KAboutDialog::setImageBackgroundColor( const TQColor &color )
+void TDEAboutDialog::setImageBackgroundColor( const TQColor &color )
 {
   if( !mContainerBase ) { return; }
   mContainerBase->setImageBackgroundColor( color );
 }
 
 
-void KAboutDialog::setImageFrame( bool state )
+void TDEAboutDialog::setImageFrame( bool state )
 {
   if( !mContainerBase ) { return; }
   mContainerBase->setImageFrame( state );
 }
 
 
-void KAboutDialog::setProduct( const TQString &appName, const TQString &version,
+void TDEAboutDialog::setProduct( const TQString &appName, const TQString &version,
 			       const TQString &author, const TQString &year )
 {
   if( !mContainerBase ) { return; }
@@ -1743,16 +1743,16 @@ void KAboutDialog::setProduct( const TQString &appName, const TQString &version,
 
 
 
-void KAboutDialog::imageURL( TQWidget *_parent, const TQString &_caption,
+void TDEAboutDialog::imageURL( TQWidget *_parent, const TQString &_caption,
 			     const TQString &_path, const TQColor &_imageColor,
 			     const TQString &_url )
 {
-  KAboutDialog a( AbtImageOnly, TQString::null, Close, Close, _parent, "image", true );
+  TDEAboutDialog a( AbtImageOnly, TQString::null, Close, Close, _parent, "image", true );
   a.setPlainCaption( _caption );
   a.setImage( _path );
   a.setImageBackgroundColor( _imageColor );
 
-  KAboutContainer* const c = a.addContainer( AlignCenter, AlignCenter );
+  TDEAboutContainer* const c = a.addContainer( AlignCenter, AlignCenter );
   if( c )
   {
     c->addPerson( TQString::null, TQString::null, _url, TQString::null );
@@ -1792,6 +1792,6 @@ void KImageTrackLabel::mouseMoveEvent ( TQMouseEvent *e )
   emit mouseTrack( MouseDoubleClick, e );
 }
 
-void KAboutDialog::virtual_hook( int id, void* data )
+void TDEAboutDialog::virtual_hook( int id, void* data )
 { KDialogBase::virtual_hook( id, data ); }
 
diff --git a/tdeui/kaboutdialog.h b/tdeui/tdeaboutdialog.h
index 6f0d80149..fbb19b98e 100644
--- a/tdeui/kaboutdialog.h
+++ b/tdeui/tdeaboutdialog.h
@@ -38,21 +38,21 @@ class TQLabel;
 class TQVBoxLayout;
 class TQTabWidget;
 class KURLLabel;
-class KAboutContainer;
-class KAboutContainerBase;
+class TDEAboutContainer;
+class TDEAboutContainerBase;
 
-class KAboutWidgetPrivate;
+class TDEAboutWidgetPrivate;
 
-class KAboutContainerPrivate;
+class TDEAboutContainerPrivate;
 /**
- *  KAboutContainer can be used to make a application specific AboutDialog.
+ *  TDEAboutContainer can be used to make a application specific AboutDialog.
  */
-class TDEUI_EXPORT KAboutContainer : public TQFrame
+class TDEUI_EXPORT TDEAboutContainer : public TQFrame
 {
   Q_OBJECT
 
   public:
-    KAboutContainer( TQWidget *parent=0, const char *name=0,
+    TDEAboutContainer( TQWidget *parent=0, const char *name=0,
 		     int margin=0, int spacing=0,
 		     int childAlignment = AlignCenter,
 		     int innerAlignment = AlignCenter );
@@ -80,21 +80,21 @@ class TDEUI_EXPORT KAboutContainer : public TQFrame
   private:
     TQVBoxLayout *mVbox;
     int mAlignment;
-    KAboutContainerPrivate* const d;
+    TDEAboutContainerPrivate* const d;
 };
 
-class KAboutContributorPrivate;
+class TDEAboutContributorPrivate;
 
 /**
- * Used internally by KAboutWidget
+ * Used internally by TDEAboutWidget
  * @internal
  */
-class TDEUI_EXPORT KAboutContributor : public TQFrame
+class TDEUI_EXPORT TDEAboutContributor : public TQFrame
 {
   Q_OBJECT
 
   public:
-    KAboutContributor( TQWidget *parent=0, const char *name=0,
+    TDEAboutContributor( TQWidget *parent=0, const char *name=0,
 		       const TQString &username=TQString::null,
 		       const TQString &email=TQString::null,
 		       const TQString &url=TQString::null,
@@ -137,17 +137,17 @@ class TDEUI_EXPORT KAboutContributor : public TQFrame
     bool mShowHeader;
     bool mShowBold;
 
-    KAboutContributorPrivate* const d;
+    TDEAboutContributorPrivate* const d;
 
 	virtual void setName(const char *_name) { TQFrame::setName(_name); }
 };
 
 /**
- * KAboutWidget is the main widget for KAboutDialog.
+ * TDEAboutWidget is the main widget for TDEAboutDialog.
  *
  * It has a minimum size set.
  */
-class TDEUI_EXPORT KAboutWidget : public TQWidget
+class TDEUI_EXPORT TDEAboutWidget : public TQWidget
 {
   Q_OBJECT
 
@@ -156,7 +156,7 @@ public:
   /**
    * The Qt constructor.
    */
-  KAboutWidget(TQWidget* parent=0, const char* name=0 );
+  TDEAboutWidget(TQWidget* parent=0, const char* name=0 );
 
   /**
    * Adjust the minimum size (after setting the properties of the image and
@@ -229,11 +229,11 @@ protected:
   /**
    * The application developer.
    */
-  KAboutContributor *author;
+  TDEAboutContributor *author;
   /**
    * The application maintainer.
    */
-  KAboutContributor *maintainer;
+  TDEAboutContributor *maintainer;
   /**
    * Show the maintainer?
    */
@@ -241,21 +241,21 @@ protected:
   /**
    * A set of people who contributed to the application.
    */
-  TQPtrList<KAboutContributor> contributors;
+  TQPtrList<TDEAboutContributor> contributors;
   // #########################################################################
   //
 private:
-  KAboutWidgetPrivate* const d;
+  TDEAboutWidgetPrivate* const d;
 };
 
-class KAboutDialogPrivate;
+class TDEAboutDialogPrivate;
 /**
  * A KDialogBase with predefined main widget.
  *
  * As a KDialogBase it uses your application wide settings
  * for KDialogBase
  * objects (base frame tiles, main frame tiles etc).
- * To use it, simply create a KAboutDialog object, set all (or some) of its
+ * To use it, simply create a TDEAboutDialog object, set all (or some) of its
  * properties and show it. Do not derive it to create your own about dialog
  * until you need some cool features that are unsupported and you have
  * contacted me to add them.
@@ -280,7 +280,7 @@ class KAboutDialogPrivate;
  * @author Mirko Boehm (mirko@kde.org) and Espen Sand (espensa@online.no)
  * @see KDialogBase
  */
-class TDEUI_EXPORT KAboutDialog : public KDialogBase
+class TDEUI_EXPORT TDEAboutDialog : public KDialogBase
 {
   Q_OBJECT
 
@@ -311,7 +311,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
      * addContributor(), or setVersion().
      * The dialog will be laid out automatically.
      */
-    KAboutDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
+    TDEAboutDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
 
    /**
     * The extended constructor. (Constructor II).
@@ -338,7 +338,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
     * @param user3 User button3 text.
     *
     */
-    KAboutDialog( int dialogLayout, const TQString &caption, int buttonMask,
+    TDEAboutDialog( int dialogLayout, const TQString &caption, int buttonMask,
 		  ButtonCode defaultButton, TQWidget *parent=0,
 		  const char *name=0, bool modal=false, bool separator = false,
 		  const TQString &user1 = TQString::null,
@@ -394,7 +394,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
    * (Constructor II only)
    * Define the program logo to be shown in the dialog.  Use this to override the
    * default program logo.  For example, use this function if the 
-   * KAboutDialog is for a panel applet and you want to override the
+   * TDEAboutDialog is for a panel applet and you want to override the
    * appletproxy logo with your own pixmap.
    *
    * @param fileName Path to file containing logo data in a format that 
@@ -415,7 +415,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
    * (Constructor II only)
    * Define the program logo to be shown in the dialog.  Use this to override the
    * default program logo. For example, use this function if the 
-   * KAboutDialog is for a panel applet and you want to override the
+   * TDEAboutDialog is for a panel applet and you want to override the
    * appletproxy logo with your own pixmap.
    *
    * @param pixmap The logo pixmap.
@@ -497,7 +497,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
    *        respect to each other.
    * @return The new container.
    */
-  KAboutContainer *addContainerPage( const TQString &title,
+  TDEAboutContainer *addContainerPage( const TQString &title,
     int childAlignment = AlignCenter, int innerAlignment = AlignCenter );
 
   /**
@@ -512,7 +512,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
    *        respect to each other.
    * @return The new container.
    */
-  KAboutContainer *addScrolledContainerPage( const TQString &title,
+  TDEAboutContainer *addScrolledContainerPage( const TQString &title,
     int childAlignment = AlignCenter, int innerAlignment = AlignCenter );
 
   /**
@@ -525,7 +525,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
    *        respect to each other.
    * @return The new container.
    */
-  KAboutContainer *addContainer( int childAlignment, int innerAlignment );
+  TDEAboutContainer *addContainer( int childAlignment, int innerAlignment );
 
   /**
    * (Constructor II only)
@@ -596,12 +596,12 @@ protected:
   /**
    * The main widget (Constructor I)
    */
-  KAboutWidget * about;
+  TDEAboutWidget * about;
 
   /**
    * The main widget (Constructor II)
    */
-  KAboutContainerBase *mContainerBase;
+  TDEAboutContainerBase *mContainerBase;
 
   // -------------------------------------------------------------------------
 protected slots:
@@ -627,7 +627,7 @@ protected slots:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KAboutDialogPrivate* const d;
+  TDEAboutDialogPrivate* const d;
 };
 
 #endif // defined KABOUTDIALOG_H
diff --git a/tdeui/kaboutkde.cpp b/tdeui/tdeabouttde.cpp
index f9ee7b72b..d5f45c85a 100644
--- a/tdeui/kaboutkde.cpp
+++ b/tdeui/tdeabouttde.cpp
@@ -20,14 +20,14 @@
  */
 
 // I (espen) prefer that header files are included alphabetically
-#include <kaboutkde.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeabouttde.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 
-KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
-  :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::fromLatin1("TDE"),
+TDEAboutKDE::TDEAboutKDE( TQWidget *parent, const char *name, bool modal )
+  :TDEAboutDialog( TDEAboutDialog::AbtKDEStandard, TQString::fromLatin1("TDE"),
 		 KDialogBase::Help|KDialogBase::Close, KDialogBase::Close,
 		 parent, name, modal )
 {
diff --git a/tdeui/kaboutkde.h b/tdeui/tdeabouttde.h
index 017d0f220..a75b92904 100644
--- a/tdeui/kaboutkde.h
+++ b/tdeui/tdeabouttde.h
@@ -22,7 +22,7 @@
 #ifndef _KABOUT_KDE_H_
 #define _KABOUT_KDE_H_
 
-#include <kaboutdialog.h>
+#include <tdeaboutdialog.h>
 
 /**
  * @short Standard "About KDE" dialog box,
@@ -30,14 +30,14 @@
  * This class provides the standard "About KDE" dialog box that is used
  * KHelpMenu Normally you should not use this class directly but
  * rather the KHelpMenu class or even better just subclass your
- * toplevel window from KMainWindow. If you do the latter, the help
+ * toplevel window from TDEMainWindow. If you do the latter, the help
  * menu and thereby this dialog box is available through the
- * KMainWindow::helpMenu() function.
+ * TDEMainWindow::helpMenu() function.
  *
  * @author Espen Sand (espen@kde.org)
  */
 
-class TDEUI_EXPORT KAboutKDE : public KAboutDialog
+class TDEUI_EXPORT TDEAboutKDE : public TDEAboutDialog
 {
   public:
     /**
@@ -53,7 +53,7 @@ class TDEUI_EXPORT KAboutKDE : public KAboutDialog
      *        made visible using TQWidget::show(). Otherwise it will be
      *        modal and must be made visible using TQWidget::exec()
      */
-    KAboutKDE( TQWidget *parent=0, const char *name=0, bool modal=true );
+    TDEAboutKDE( TQWidget *parent=0, const char *name=0, bool modal=true );
 };
 
 
diff --git a/tdeui/kaccelgen.h b/tdeui/tdeaccelgen.h
index 222d948ba..d1e761876 100644
--- a/tdeui/kaccelgen.h
+++ b/tdeui/tdeaccelgen.h
@@ -77,7 +77,7 @@
  * + Add more Deref classes so that we can access a wider variety of
  * collections.
  * */
-namespace KAccelGen
+namespace TDEAccelGen
 {
 
 // HELPERS
@@ -274,7 +274,7 @@ generateFromKeys(const TQMap<TQString,Data>& source, TQStringList& target)
 }
 
 
-} // end namespace KAccelGen
+} // end namespace TDEAccelGen
 
 #endif
 
diff --git a/tdeui/kaction.cpp b/tdeui/tdeaction.cpp
index 270c00ec4..6f29ab848 100644
--- a/tdeui/kaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -23,24 +23,24 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kaction.h"
+#include "tdeaction.h"
 
 #include <assert.h>
 
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kaccel.h>
-#include <kaccelbase.h>
-#include <kaccelprivate.h>
-#include <kapplication.h>
+#include <tdeaccel.h>
+#include <tdeaccelbase.h>
+#include <tdeaccelprivate.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
-#include <kmainwindow.h>
-#include <kmenubar.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdemainwindow.h>
+#include <tdemenubar.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include <ft2build.h>
 #include <X11/Xdefs.h>
@@ -54,52 +54,52 @@
 
 /**
 * How it works.
-* KActionCollection is an organizing container for KActions.
-* KActionCollection keeps track of the information necessary to handle
+* TDEActionCollection is an organizing container for TDEActions.
+* TDEActionCollection keeps track of the information necessary to handle
 * configuration and shortcuts.
 *
 * Focus Widget pointer:
 * This is the widget which is the focus for action shortcuts.
-* It is set either by passing a TQWidget* to the KActionCollection constructor
+* It is set either by passing a TQWidget* to the TDEActionCollection constructor
 * or by calling setWidget() if the widget wasn't known when the object was
 * initially constructed (as in KXMLGUIClient and KParts::PartBase)
 *
 * Shortcuts:
 * An action's shortcut will not not be connected unless a focus widget has
-* been specified in KActionCollection.
+* been specified in TDEActionCollection.
 *
 * XML Filename:
 * This is used to save user-modified settings back to the *ui.rc file.
 * It is set by KXMLGUIFactory.
 */
 
-int KAction::getToolButtonID()
+int TDEAction::getToolButtonID()
 {
     static int toolbutton_no = -2;
     return toolbutton_no--;
 }
 
 //---------------------------------------------------------------------
-// KAction::KActionPrivate
+// TDEAction::TDEActionPrivate
 //---------------------------------------------------------------------
 
-class KAction::KActionPrivate : public KGuiItem
+class TDEAction::TDEActionPrivate : public KGuiItem
 {
 public:
-  KActionPrivate() : KGuiItem()
+  TDEActionPrivate() : KGuiItem()
   {
-    m_kaccel = 0;
+    m_tdeaccel = 0;
     m_configurable = true;
   }
 
-  KAccel *m_kaccel;
-  TQValueList<KAccel*> m_kaccelList;
+  TDEAccel *m_tdeaccel;
+  TQValueList<TDEAccel*> m_tdeaccelList;
 
   TQString m_groupText;
   TQString m_group;
 
-  KShortcut m_cut;
-  KShortcut m_cutDefault;
+  TDEShortcut m_cut;
+  TDEShortcut m_cutDefault;
 
   bool m_configurable;
 
@@ -117,39 +117,39 @@ public:
 };
 
 //---------------------------------------------------------------------
-// KAction
+// TDEAction
 //---------------------------------------------------------------------
 
-KAction::KAction( const TQString& text, const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TDEShortcut& cut,
              const TQObject* receiver, const char* slot,
-             KActionCollection* parent, const char* name )
-: TQObject( parent, name ), d(new KActionPrivate)
+             TDEActionCollection* parent, const char* name )
+: TQObject( parent, name ), d(new TDEActionPrivate)
 {
 	initPrivate( text, cut, receiver, slot );
 }
 
-KAction::KAction( const TQString& text, const TQString& sIconName, const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TQString& sIconName, const TDEShortcut& cut,
 	const TQObject* receiver, const char* slot,
-	KActionCollection* parent, const char* name )
-: TQObject( parent, name ), d(new KActionPrivate)
+	TDEActionCollection* parent, const char* name )
+: TQObject( parent, name ), d(new TDEActionPrivate)
 {
 	initPrivate( text, cut, receiver, slot );
 	d->setIconName( sIconName );
 }
 
-KAction::KAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
 	const TQObject* receiver, const char* slot,
-	KActionCollection* parent, const char* name )
-: TQObject( parent, name ), d(new KActionPrivate)
+	TDEActionCollection* parent, const char* name )
+: TQObject( parent, name ), d(new TDEActionPrivate)
 {
 	initPrivate( text, cut, receiver, slot );
 	d->setIconSet( pix );
 }
 
-KAction::KAction( const KGuiItem& item, const KShortcut& cut,
+TDEAction::TDEAction( const KGuiItem& item, const TDEShortcut& cut,
 	const TQObject* receiver, const char* slot,
-	KActionCollection* parent, const char* name )
-: TQObject( parent, name ), d(new KActionPrivate)
+	TDEActionCollection* parent, const char* name )
+: TQObject( parent, name ), d(new TDEActionPrivate)
 {
 	initPrivate( item.text(), cut, receiver, slot );
 	if( item.hasIcon() )
@@ -159,71 +159,71 @@ KAction::KAction( const KGuiItem& item, const KShortcut& cut,
 }
 
 #ifndef KDE_NO_COMPAT // KDE 4: remove
-KAction::KAction( const TQString& text, const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TDEShortcut& cut,
                   TQObject* parent, const char* name )
- : TQObject( parent, name ), d(new KActionPrivate)
+ : TQObject( parent, name ), d(new TDEActionPrivate)
 {
     initPrivate( text, cut, 0, 0 );
 }
 
-KAction::KAction( const TQString& text, const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TDEShortcut& cut,
                   const TQObject* receiver,
                   const char* slot, TQObject* parent, const char* name )
- : TQObject( parent, name ), d(new KActionPrivate)
+ : TQObject( parent, name ), d(new TDEActionPrivate)
 {
     initPrivate( text, cut, receiver, slot );
 }
 
-KAction::KAction( const TQString& text, const TQIconSet& pix,
-                  const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TQIconSet& pix,
+                  const TDEShortcut& cut,
                   TQObject* parent, const char* name )
- : TQObject( parent, name ), d(new KActionPrivate)
+ : TQObject( parent, name ), d(new TDEActionPrivate)
 {
     initPrivate( text, cut, 0, 0 );
     setIconSet( pix );
 }
 
-KAction::KAction( const TQString& text, const TQString& pix,
-                  const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TQString& pix,
+                  const TDEShortcut& cut,
                   TQObject* parent, const char* name )
-: TQObject( parent, name ), d(new KActionPrivate)
+: TQObject( parent, name ), d(new TDEActionPrivate)
 {
     initPrivate( text, cut, 0, 0 );
     d->setIconName( pix );
 }
 
-KAction::KAction( const TQString& text, const TQIconSet& pix,
-                  const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TQIconSet& pix,
+                  const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot, TQObject* parent,
                   const char* name )
- : TQObject( parent, name ), d(new KActionPrivate)
+ : TQObject( parent, name ), d(new TDEActionPrivate)
 {
     initPrivate( text, cut, receiver, slot );
     setIconSet( pix );
 }
 
-KAction::KAction( const TQString& text, const TQString& pix,
-                  const KShortcut& cut,
+TDEAction::TDEAction( const TQString& text, const TQString& pix,
+                  const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot, TQObject* parent,
                   const char* name )
-  : TQObject( parent, name ), d(new KActionPrivate)
+  : TQObject( parent, name ), d(new TDEActionPrivate)
 {
     initPrivate( text, cut, receiver, slot );
     d->setIconName(pix);
 }
 
-KAction::KAction( TQObject* parent, const char* name )
- : TQObject( parent, name ), d(new KActionPrivate)
+TDEAction::TDEAction( TQObject* parent, const char* name )
+ : TQObject( parent, name ), d(new TDEActionPrivate)
 {
-    initPrivate( TQString::null, KShortcut(), 0, 0 );
+    initPrivate( TQString::null, TDEShortcut(), 0, 0 );
 }
 #endif // KDE 4: remove end
 
-KAction::~KAction()
+TDEAction::~TDEAction()
 {
-    kdDebug(129) << "KAction::~KAction( this = \"" << name() << "\" )" << endl; // -- ellis
+    kdDebug(129) << "TDEAction::~TDEAction( this = \"" << name() << "\" )" << endl; // -- ellis
 #ifndef KDE_NO_COMPAT
-     if (d->m_kaccel)
+     if (d->m_tdeaccel)
        unplugAccel();
 #endif
 
@@ -231,9 +231,9 @@ KAction::~KAction()
     if ( m_parentCollection ) {
         m_parentCollection->take( this );
 
-        const TQValueList<KAccel*> & accelList = d->m_kaccelList;
-        TQValueList<KAccel*>::const_iterator itr = accelList.constBegin();
-        const TQValueList<KAccel*>::const_iterator itrEnd = accelList.constEnd();
+        const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
+        TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
+        const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
         const char * const namePtr = name();
         for (; itr != itrEnd; ++itr )
@@ -242,7 +242,7 @@ KAction::~KAction()
     }
 
     // Do not call unplugAll from here, as tempting as it sounds.
-    // KAction is designed around the idea that you need to plug
+    // TDEAction is designed around the idea that you need to plug
     // _and_ to unplug it "manually". Unplugging leads to an important
     // slowdown when e.g. closing the window, in which case we simply
     // want to destroy everything asap, not to remove actions one by one
@@ -251,13 +251,13 @@ KAction::~KAction()
     delete d;
 }
 
-void KAction::initPrivate( const TQString& text, const KShortcut& cut,
+void TDEAction::initPrivate( const TQString& text, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot )
 {
     d->m_cutDefault = cut;
 
-    m_parentCollection = tqt_dynamic_cast<KActionCollection *>( parent() );
-    kdDebug(129) << "KAction::initPrivate(): this = " << this << " name = \"" << name() << "\" cut = " << cut.toStringInternal() << " m_parentCollection = " << m_parentCollection << endl;
+    m_parentCollection = tqt_dynamic_cast<TDEActionCollection *>( parent() );
+    kdDebug(129) << "TDEAction::initPrivate(): this = " << this << " name = \"" << name() << "\" cut = " << cut.toStringInternal() << " m_parentCollection = " << m_parentCollection << endl;
     if ( m_parentCollection )
         m_parentCollection->insert( this );
 
@@ -265,28 +265,28 @@ void KAction::initPrivate( const TQString& text, const KShortcut& cut,
         connect( this, TQT_SIGNAL( activated() ), receiver, slot );
 
     if( !cut.isNull() && !qstrcmp( name(), "unnamed" ) )
-        kdWarning(129) << "KAction::initPrivate(): trying to assign a shortcut (" << cut.toStringInternal() << ") to an unnamed action." << endl;
+        kdWarning(129) << "TDEAction::initPrivate(): trying to assign a shortcut (" << cut.toStringInternal() << ") to an unnamed action." << endl;
     d->setText( text );
     initShortcut( cut );
 }
 
-bool KAction::isPlugged() const
+bool TDEAction::isPlugged() const
 {
-  return (!d->m_containers.empty()) || d->m_kaccel;
+  return (!d->m_containers.empty()) || d->m_tdeaccel;
 }
 
-bool KAction::isPlugged( const TQWidget *container ) const
+bool TDEAction::isPlugged( const TQWidget *container ) const
 {
   return findContainer( container ) > -1;
 }
 
-bool KAction::isPlugged( const TQWidget *container, int id ) const
+bool TDEAction::isPlugged( const TQWidget *container, int id ) const
 {
   int i = findContainer( container );
   return ( i > -1 && itemId( i ) == id );
 }
 
-bool KAction::isPlugged( const TQWidget *container, const TQWidget *_representative ) const
+bool TDEAction::isPlugged( const TQWidget *container, const TQWidget *_representative ) const
 {
   int i = findContainer( container );
   return ( i > -1 && representative( i ) == _representative );
@@ -295,8 +295,8 @@ bool KAction::isPlugged( const TQWidget *container, const TQWidget *_representat
 
 /*
 Three actionCollection conditions:
-	1) Scope is known on creation and KAccel object is created (e.g. KMainWindow)
-	2) Scope is unknown and no KAccel object is available (e.g. KXMLGUIClient)
+	1) Scope is known on creation and TDEAccel object is created (e.g. TDEMainWindow)
+	2) Scope is unknown and no TDEAccel object is available (e.g. KXMLGUIClient)
 		a) addClient() will be called on object
 		b) we just want to add the actions to another KXMLGUIClient object
 
@@ -310,7 +310,7 @@ Undo and Redo should be available in both KoView objects, and
 	calling the undo->setEnabled() should affect both KoViews
 
 When addClient is called, it needs to be able to find the undo and redo actions
-When it calls plug() on them, they need to be inserted into the KAccel object of the appropriate KoView
+When it calls plug() on them, they need to be inserted into the TDEAccel object of the appropriate KoView
 
 In this case, the actionCollection belongs to KoDoc and we need to let it know that its shortcuts
 have the same scope as the KoView actionCollection
@@ -325,9 +325,9 @@ View
 	add document actionCollection as sub-collection
 
 A parentCollection is created
-Scenario 1: parentCollection has a focus widget set (e.g. via KMainWindow)
-	A KAccel object is created in the parentCollection
-	A KAction is created with parent=parentCollection
+Scenario 1: parentCollection has a focus widget set (e.g. via TDEMainWindow)
+	A TDEAccel object is created in the parentCollection
+	A TDEAction is created with parent=parentCollection
 	The shortcut is inserted into this actionCollection
 	Scenario 1a: xml isn't used
 		done
@@ -335,13 +335,13 @@ Scenario 1: parentCollection has a focus widget set (e.g. via KMainWindow)
 		setWidget is called -- ignore
 		shortcuts are set
 Scenario 2: parentCollection has no focus widget (e.g., KParts)
-	A KAction is created with parent=parentCollection
+	A TDEAction is created with parent=parentCollection
 	Scenario 2a: xml isn't used
 		no shortcuts
 	Scenario 2b: KXMLGUIBuilder::addClient() called
 		setWidget is called
-		shortcuts are inserted into current KAccel
-		shortcuts are set in all other KAccels, if the action is present in the other KAccels
+		shortcuts are inserted into current TDEAccel
+		shortcuts are set in all other TDEAccels, if the action is present in the other TDEAccels
 */
 
 /*
@@ -352,95 +352,95 @@ shortcut may be set:
 	- on plugAccel (deprecated)
 
 On Construction: [via initShortcut()]
-	insert into KAccel of m_parentCollection,
-		if kaccel() && isAutoConnectShortcuts() exists
+	insert into TDEAccel of m_parentCollection,
+		if tdeaccel() && isAutoConnectShortcuts() exists
 
 On Plug: [via plug() -> plugShortcut()]
-	insert into KAccel of m_parentCollection, if exists and not already inserted into
+	insert into TDEAccel of m_parentCollection, if exists and not already inserted into
 
 On Read XML: [via setShortcut()]
-	set in all current KAccels
-	insert into KAccel of m_parentCollection, if exists and not already inserted into
+	set in all current TDEAccels
+	insert into TDEAccel of m_parentCollection, if exists and not already inserted into
 */
 
-KAccel* KAction::kaccelCurrent()
+TDEAccel* TDEAction::tdeaccelCurrent()
 {
-  if( m_parentCollection && m_parentCollection->builderKAccel() )
-    return m_parentCollection->builderKAccel();
-  else if( m_parentCollection && m_parentCollection->kaccel() )
-    return m_parentCollection->kaccel();
+  if( m_parentCollection && m_parentCollection->builderTDEAccel() )
+    return m_parentCollection->builderTDEAccel();
+  else if( m_parentCollection && m_parentCollection->tdeaccel() )
+    return m_parentCollection->tdeaccel();
   else
     return 0L;
 }
 
 // Only to be called from initPrivate()
-bool KAction::initShortcut( const KShortcut& cut )
+bool TDEAction::initShortcut( const TDEShortcut& cut )
 {
     d->m_cut = cut;
 
-    // Only insert action into KAccel if it has a valid name,
+    // Only insert action into TDEAccel if it has a valid name,
     if( qstrcmp( name(), "unnamed" ) &&
         m_parentCollection &&
         m_parentCollection->isAutoConnectShortcuts() &&
-        m_parentCollection->kaccel() )
+        m_parentCollection->tdeaccel() )
     {
-        insertKAccel( m_parentCollection->kaccel() );
+        insertTDEAccel( m_parentCollection->tdeaccel() );
         return true;
     }
     return false;
  }
 
 // Only to be called from plug()
-void KAction::plugShortcut()
+void TDEAction::plugShortcut()
 {
-  KAccel* const kaccel = kaccelCurrent();
+  TDEAccel* const tdeaccel = tdeaccelCurrent();
 
-  //kdDebug(129) << "KAction::plugShortcut(): this = " << this << " kaccel() = " << (m_parentCollection ? m_parentCollection->kaccel() : 0) << endl;
-  if( kaccel && qstrcmp( name(), "unnamed" ) ) {
-    // Check if already plugged into current KAccel object
-    const TQValueList<KAccel*> & accelList = d->m_kaccelList;
-    TQValueList<KAccel*>::const_iterator itr = accelList.constBegin();
-    const TQValueList<KAccel*>::const_iterator itrEnd = accelList.constEnd();
+  //kdDebug(129) << "TDEAction::plugShortcut(): this = " << this << " tdeaccel() = " << (m_parentCollection ? m_parentCollection->tdeaccel() : 0) << endl;
+  if( tdeaccel && qstrcmp( name(), "unnamed" ) ) {
+    // Check if already plugged into current TDEAccel object
+    const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
+    TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
+    const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
     for( ; itr != itrEnd; ++itr) {
-      if( (*itr) == kaccel )
+      if( (*itr) == tdeaccel )
         return;
     }
 
-    insertKAccel( kaccel );
+    insertTDEAccel( tdeaccel );
   }
 }
 
-bool KAction::setShortcut( const KShortcut& cut )
+bool TDEAction::setShortcut( const TDEShortcut& cut )
 {
   bool bChanged = (d->m_cut != cut);
   d->m_cut = cut;
 
-  KAccel* const kaccel = kaccelCurrent();
+  TDEAccel* const tdeaccel = tdeaccelCurrent();
   bool bInsertRequired = true;
-  // Apply new shortcut to all existing KAccel objects
+  // Apply new shortcut to all existing TDEAccel objects
 
-  const TQValueList<KAccel*> & accelList = d->m_kaccelList;
-  TQValueList<KAccel*>::const_iterator itr = accelList.constBegin();
-  const TQValueList<KAccel*>::const_iterator itrEnd = accelList.constEnd();
+  const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
+  TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
+  const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
   for( ; itr != itrEnd; ++itr) {
     // Check whether shortcut has already been plugged into
-    //  the current kaccel object.
-    if( (*itr) == kaccel )
+    //  the current tdeaccel object.
+    if( (*itr) == tdeaccel )
       bInsertRequired = false;
     if( bChanged )
-      updateKAccelShortcut( *itr );
+      updateTDEAccelShortcut( *itr );
   }
 
-  // Only insert action into KAccel if it has a valid name,
-  if( kaccel && bInsertRequired && qstrcmp( name(), "unnamed" ) )
-    insertKAccel( kaccel );
+  // Only insert action into TDEAccel if it has a valid name,
+  if( tdeaccel && bInsertRequired && qstrcmp( name(), "unnamed" ) )
+    insertTDEAccel( tdeaccel );
 
   if( bChanged ) {
 #ifndef KDE_NO_COMPAT    // KDE 4: remove
-    if ( d->m_kaccel )
-      d->m_kaccel->setShortcut( name(), cut );
+    if ( d->m_tdeaccel )
+      d->m_tdeaccel->setShortcut( name(), cut );
 #endif    // KDE 4: remove end
       int len = containerCount();
       for( int i = 0; i < len; ++i )
@@ -449,54 +449,54 @@ bool KAction::setShortcut( const KShortcut& cut )
   return true;
 }
 
-bool KAction::updateKAccelShortcut( KAccel* kaccel )
+bool TDEAction::updateTDEAccelShortcut( TDEAccel* tdeaccel )
 {
   // Check if action is permitted
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return false;
 
   bool b = true;
 
-  if ( !kaccel->actions().actionPtr( name() ) ) {
+  if ( !tdeaccel->actions().actionPtr( name() ) ) {
     if(!d->m_cut.isNull() ) {
       kdDebug(129) << "Inserting " << name() << ", " << d->text() << ", " << d->plainText() << endl;
-      b = kaccel->insert( name(), d->plainText(), TQString::null,
+      b = tdeaccel->insert( name(), d->plainText(), TQString::null,
           d->m_cut,
           this, TQT_SLOT(slotActivated()),
           isShortcutConfigurable(), isEnabled() );
     }
   }
   else
-    b = kaccel->setShortcut( name(), d->m_cut );
+    b = tdeaccel->setShortcut( name(), d->m_cut );
 
   return b;
 }
 
-void KAction::insertKAccel( KAccel* kaccel )
+void TDEAction::insertTDEAccel( TDEAccel* tdeaccel )
 {
-  //kdDebug(129) << "KAction::insertKAccel( " << kaccel << " ): this = " << this << endl;
-  if ( !kaccel->actions().actionPtr( name() ) ) {
-    if( updateKAccelShortcut( kaccel ) ) {
-      d->m_kaccelList.append( kaccel );
-      connect( kaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+  //kdDebug(129) << "TDEAction::insertTDEAccel( " << tdeaccel << " ): this = " << this << endl;
+  if ( !tdeaccel->actions().actionPtr( name() ) ) {
+    if( updateTDEAccelShortcut( tdeaccel ) ) {
+      d->m_tdeaccelList.append( tdeaccel );
+      connect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
     }
   }
   else
-    kdWarning(129) << "KAction::insertKAccel( kaccel = " << kaccel << " ): KAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
+    kdWarning(129) << "TDEAction::insertTDEAccel( tdeaccel = " << tdeaccel << " ): TDEAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
 }
 
-void KAction::removeKAccel( KAccel* kaccel )
+void TDEAction::removeTDEAccel( TDEAccel* tdeaccel )
 {
-  //kdDebug(129) << "KAction::removeKAccel( " << i << " ): this = " << this << endl;
-  TQValueList<KAccel*> & accelList = d->m_kaccelList;
-  TQValueList<KAccel*>::iterator itr = accelList.begin();
-  const TQValueList<KAccel*>::iterator itrEnd = accelList.end();
+  //kdDebug(129) << "TDEAction::removeTDEAccel( " << i << " ): this = " << this << endl;
+  TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
+  TQValueList<TDEAccel*>::iterator itr = accelList.begin();
+  const TQValueList<TDEAccel*>::iterator itrEnd = accelList.end();
 
   for( ; itr != itrEnd; ++itr) {
-    if( (*itr) == kaccel ) {
-      kaccel->remove( name() );
+    if( (*itr) == tdeaccel ) {
+      tdeaccel->remove( name() );
       accelList.remove( itr );
-      disconnect( kaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+      disconnect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
       break;
     }
   }
@@ -504,13 +504,13 @@ void KAction::removeKAccel( KAccel* kaccel )
 
 #ifndef KDE_NO_COMPAT
 // KDE 4: remove
-void KAction::setAccel( int keyQt )
+void TDEAction::setAccel( int keyQt )
 {
-  setShortcut( KShortcut(keyQt) );
+  setShortcut( TDEShortcut(keyQt) );
 }
 #endif // KDE 4: remove end
 
-void KAction::updateShortcut( int i )
+void TDEAction::updateShortcut( int i )
 {
   int id = itemId( i );
 
@@ -523,12 +523,12 @@ void KAction::updateShortcut( int i )
     static_cast<TQMenuBar*>(w)->setAccel( d->m_cut.keyCodeQt(), id );
 }
 
-void KAction::updateShortcut( TQPopupMenu* menu, int id )
+void TDEAction::updateShortcut( TQPopupMenu* menu, int id )
 {
-  //kdDebug(129) << "KAction::updateShortcut(): this = " << this << " d->m_kaccelList.count() = " << d->m_kaccelList.count() << endl;
-  // If the action has a KAccel object,
+  //kdDebug(129) << "TDEAction::updateShortcut(): this = " << this << " d->m_tdeaccelList.count() = " << d->m_tdeaccelList.count() << endl;
+  // If the action has a TDEAccel object,
   //  show the string representation of its shortcut.
-  if ( d->m_kaccel || d->m_kaccelList.count() ) {
+  if ( d->m_tdeaccel || d->m_tdeaccelList.count() ) {
     TQString s = menu->text( id );
     int i = s.find( '\t' );
     if ( i >= 0 )
@@ -540,41 +540,41 @@ void KAction::updateShortcut( TQPopupMenu* menu, int id )
   }
   // Otherwise insert the shortcut itself into the popup menu.
   else {
-    // This is a fall-hack in case the KAction is missing a proper parent collection.
+    // This is a fall-hack in case the TDEAction is missing a proper parent collection.
     //  It should be removed eventually. --ellis
     menu->setAccel( d->m_cut.keyCodeQt(), id );
-    kdDebug(129) << "KAction::updateShortcut(): name = \"" << name() << "\", cut = " << d->m_cut.toStringInternal() << "; No KAccel, probably missing a parent collection." << endl;
+    kdDebug(129) << "TDEAction::updateShortcut(): name = \"" << name() << "\", cut = " << d->m_cut.toStringInternal() << "; No TDEAccel, probably missing a parent collection." << endl;
   }
 }
 
-const KShortcut& KAction::shortcut() const
+const TDEShortcut& TDEAction::shortcut() const
 {
   return d->m_cut;
 }
 
-const KShortcut& KAction::shortcutDefault() const
+const TDEShortcut& TDEAction::shortcutDefault() const
 {
   return d->m_cutDefault;
 }
 
-TQString KAction::shortcutText() const
+TQString TDEAction::shortcutText() const
 {
   return d->m_cut.toStringInternal();
 }
 
-void KAction::setShortcutText( const TQString& s )
+void TDEAction::setShortcutText( const TQString& s )
 {
-  setShortcut( KShortcut(s) );
+  setShortcut( TDEShortcut(s) );
 }
 
 #ifndef KDE_NO_COMPAT // Remove in KDE 4
-int KAction::accel() const
+int TDEAction::accel() const
 {
   return d->m_cut.keyCodeQt();
 }
 #endif
 
-void KAction::setGroup( const TQString& grp )
+void TDEAction::setGroup( const TQString& grp )
 {
   d->m_group = grp;
 
@@ -583,27 +583,27 @@ void KAction::setGroup( const TQString& grp )
     updateGroup( i );
 }
 
-void KAction::updateGroup( int )
+void TDEAction::updateGroup( int )
 {
   // DO SOMETHING
 }
 
-TQString KAction::group() const
+TQString TDEAction::group() const
 {
   return d->m_group;
 }
 
-bool KAction::isEnabled() const
+bool TDEAction::isEnabled() const
 {
   return d->isEnabled();
 }
 
-bool KAction::isShortcutConfigurable() const
+bool TDEAction::isShortcutConfigurable() const
 {
   return d->m_configurable;
 }
 
-void KAction::setToolTip( const TQString& tt )
+void TDEAction::setToolTip( const TQString& tt )
 {
   d->setToolTip( tt );
 
@@ -612,39 +612,39 @@ void KAction::setToolTip( const TQString& tt )
     updateToolTip( i );
 }
 
-void KAction::updateToolTip( int i )
+void TDEAction::updateToolTip( int i )
 {
   TQWidget *w = container( i );
 
-  if ( ::tqqt_cast<KToolBar *>( w ) )
-    TQToolTip::add( static_cast<KToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() );
+  if ( ::tqqt_cast<TDEToolBar *>( w ) )
+    TQToolTip::add( static_cast<TDEToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() );
 }
 
-TQString KAction::toolTip() const
+TQString TDEAction::toolTip() const
 {
   return d->toolTip();
 }
 
-int KAction::plug( TQWidget *w, int index )
+int TDEAction::plug( TQWidget *w, int index )
 {
-  //kdDebug(129) << "KAction::plug( " << w << ", " << index << " )" << endl;
+  //kdDebug(129) << "TDEAction::plug( " << w << ", " << index << " )" << endl;
   if (!w ) {
-	kdWarning(129) << "KAction::plug called with 0 argument\n";
+	kdWarning(129) << "TDEAction::plug called with 0 argument\n";
  	return -1;
   }
 
-  // Ellis: print warning if there is a shortcut, but no KAccel available (often due to no widget available in the actioncollection)
+  // Ellis: print warning if there is a shortcut, but no TDEAccel available (often due to no widget available in the actioncollection)
   // David: Well, it doesn't matter much, things still work (e.g. Undo in koffice) via TQAccel.
-  // We should probably re-enable the warning for things that only KAccel can do, though - e.g. WIN key (mapped to Meta).
+  // We should probably re-enable the warning for things that only TDEAccel can do, though - e.g. WIN key (mapped to Meta).
 #if 0 //ndef NDEBUG
-  KAccel* kaccel = kaccelCurrent();
-  if( !d->m_cut.isNull() && !kaccel ) {
-    kdDebug(129) << "KAction::plug(): has no KAccel object; this = " << this << " name = " << name() << " parentCollection = " << m_parentCollection << endl; // ellis
+  TDEAccel* tdeaccel = tdeaccelCurrent();
+  if( !d->m_cut.isNull() && !tdeaccel ) {
+    kdDebug(129) << "TDEAction::plug(): has no TDEAccel object; this = " << this << " name = " << name() << " parentCollection = " << m_parentCollection << endl; // ellis
   }
 #endif
 
   // Check if action is permitted
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
 
   plugShortcut();
@@ -653,17 +653,17 @@ int KAction::plug( TQWidget *w, int index )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( w );
     int id;
-    // Don't insert shortcut into menu if it's already in a KAccel object.
-    int keyQt = (d->m_kaccelList.count() || d->m_kaccel) ? 0 : d->m_cut.keyCodeQt();
+    // Don't insert shortcut into menu if it's already in a TDEAccel object.
+    int keyQt = (d->m_tdeaccelList.count() || d->m_tdeaccel) ? 0 : d->m_cut.keyCodeQt();
 
     if ( d->hasIcon() )
     {
-        KInstance *instance;
+        TDEInstance *instance;
         if ( m_parentCollection )
           instance = m_parentCollection->instance();
         else
-          instance = KGlobal::instance();
-        id = menu->insertItem( d->iconSet( KIcon::Small, 0, instance ), d->text(), this,//dsweet
+          instance = TDEGlobal::instance();
+        id = menu->insertItem( d->iconSet( TDEIcon::Small, 0, instance ), d->text(), this,//dsweet
                                  TQT_SLOT( slotPopupActivated() ), keyQt,
                                  -1, index );
     }
@@ -672,9 +672,9 @@ int KAction::plug( TQWidget *w, int index )
                                TQT_SLOT( slotPopupActivated() ),
                                keyQt, -1, index );
 
-    // If the shortcut is already in a KAccel object, then
+    // If the shortcut is already in a TDEAccel object, then
     //  we need to set the menu item's shortcut text.
-    if ( d->m_kaccelList.count() || d->m_kaccel )
+    if ( d->m_tdeaccelList.count() || d->m_tdeaccel )
         updateShortcut( menu, id );
 
     // call setItemEnabled only if the item really should be disabled,
@@ -693,16 +693,16 @@ int KAction::plug( TQWidget *w, int index )
 
     return d->m_containers.count() - 1;
   }
-  else if ( ::tqqt_cast<KToolBar *>( w ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
   {
-    KToolBar *bar = static_cast<KToolBar *>( w );
+    TDEToolBar *bar = static_cast<TDEToolBar *>( w );
 
     int id_ = getToolButtonID();
-    KInstance *instance;
+    TDEInstance *instance;
     if ( m_parentCollection )
       instance = m_parentCollection->instance();
     else
-      instance = KGlobal::instance();
+      instance = TDEGlobal::instance();
 
     if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly
     {
@@ -720,7 +720,7 @@ int KAction::plug( TQWidget *w, int index )
                            d->isEnabled(), d->plainText(), index, instance );
     }
 
-    KToolBarButton* ktb = bar->getButton(id_);
+    TDEToolBarButton* ktb = bar->getButton(id_);
     ktb->setName( TQCString("toolbutton_")+name() );
 
     if ( !d->whatsThis().isEmpty() )
@@ -742,7 +742,7 @@ int KAction::plug( TQWidget *w, int index )
   return -1;
 }
 
-void KAction::unplug( TQWidget *w )
+void TDEAction::unplug( TQWidget *w )
 {
   int i = findContainer( w );
   if ( i == -1 )
@@ -754,9 +754,9 @@ void KAction::unplug( TQWidget *w )
     TQPopupMenu *menu = static_cast<TQPopupMenu *>( w );
     menu->removeItem( id );
   }
-  else if ( ::tqqt_cast<KToolBar *>( w ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
   {
-    KToolBar *bar = static_cast<KToolBar *>( w );
+    TDEToolBar *bar = static_cast<TDEToolBar *>( w );
     bar->removeItemDelayed( id );
   }
   else if ( ::tqqt_cast<TQMenuBar *>( w ) )
@@ -770,45 +770,45 @@ void KAction::unplug( TQWidget *w )
     m_parentCollection->disconnectHighlight( w, this );
 }
 
-void KAction::plugAccel(KAccel *kacc, bool configurable)
+void TDEAction::plugAccel(TDEAccel *kacc, bool configurable)
 {
-  kdWarning(129) << "KAction::plugAccel(): call to deprecated action." << endl;
+  kdWarning(129) << "TDEAction::plugAccel(): call to deprecated action." << endl;
   kdDebug(129) << kdBacktrace() << endl;
-  //kdDebug(129) << "KAction::plugAccel( kacc = " << kacc << " ): name \"" << name() << "\"" << endl;
-  if ( d->m_kaccel )
+  //kdDebug(129) << "TDEAction::plugAccel( kacc = " << kacc << " ): name \"" << name() << "\"" << endl;
+  if ( d->m_tdeaccel )
     unplugAccel();
 
   // If the parent collection's accel ptr isn't set yet
   //if ( m_parentCollection && !m_parentCollection->accel() )
   //  m_parentCollection->setAccel( kacc );
 
-  // We can only plug this action into the given KAccel object
+  // We can only plug this action into the given TDEAccel object
   //  if it does not already contain an action with the same name.
   if ( !kacc->actions().actionPtr(name()) )
   {
-    d->m_kaccel = kacc;
-    d->m_kaccel->insert(name(), d->plainText(), TQString::null,
-        KShortcut(d->m_cut),
+    d->m_tdeaccel = kacc;
+    d->m_tdeaccel->insert(name(), d->plainText(), TQString::null,
+        TDEShortcut(d->m_cut),
         this, TQT_SLOT(slotActivated()),
         configurable, isEnabled());
-    connect(d->m_kaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()));
-    //connect(d->m_kaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged()));
+    connect(d->m_tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()));
+    //connect(d->m_tdeaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged()));
   }
   else
-    kdWarning(129) << "KAction::plugAccel( kacc = " << kacc << " ): KAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
+    kdWarning(129) << "TDEAction::plugAccel( kacc = " << kacc << " ): TDEAccel object already contains an action name \"" << name() << "\"" << endl; // -- ellis
 }
 
-void KAction::unplugAccel()
+void TDEAction::unplugAccel()
 {
-  //kdDebug(129) << "KAction::unplugAccel() " << this << " " << name() << endl;
-  if ( d->m_kaccel )
+  //kdDebug(129) << "TDEAction::unplugAccel() " << this << " " << name() << endl;
+  if ( d->m_tdeaccel )
   {
-    d->m_kaccel->remove(name());
-    d->m_kaccel = 0;
+    d->m_tdeaccel->remove(name());
+    d->m_tdeaccel = 0;
   }
 }
 
-void KAction::plugMainWindowAccel( TQWidget *w )
+void TDEAction::plugMainWindowAccel( TQWidget *w )
 {
   // Note: topLevelWidget() stops too early, we can't use it.
   TQWidget * tl = w;
@@ -816,28 +816,28 @@ void KAction::plugMainWindowAccel( TQWidget *w )
   while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
     tl = n;
 
-  KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow
+  TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
   if (mw)
     plugAccel( mw->accel() );
   else
-    kdDebug(129) << "KAction::plugMainWindowAccel: Toplevel widget isn't a KMainWindow, can't plug accel. " << tl << endl;
+    kdDebug(129) << "TDEAction::plugMainWindowAccel: Toplevel widget isn't a TDEMainWindow, can't plug accel. " << tl << endl;
 }
 
-void KAction::setEnabled(bool enable)
+void TDEAction::setEnabled(bool enable)
 {
-  //kdDebug(129) << "KAction::setEnabled( " << enable << " ): this = " << this << " d->m_kaccelList.count() = " << d->m_kaccelList.count() << endl;
+  //kdDebug(129) << "TDEAction::setEnabled( " << enable << " ): this = " << this << " d->m_tdeaccelList.count() = " << d->m_tdeaccelList.count() << endl;
   if ( enable == d->isEnabled() )
     return;
 
 #ifndef KDE_NO_COMPAT
   // KDE 4: remove
-  if (d->m_kaccel)
-    d->m_kaccel->setEnabled(name(), enable);
+  if (d->m_tdeaccel)
+    d->m_tdeaccel->setEnabled(name(), enable);
 #endif  // KDE 4: remove end
 
-  const TQValueList<KAccel*> & accelList = d->m_kaccelList;
-  TQValueList<KAccel*>::const_iterator itr = accelList.constBegin();
-  const TQValueList<KAccel*>::const_iterator itrEnd = accelList.constEnd();
+  const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
+  TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
+  const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
   const char * const namePtr = name();
 
@@ -853,7 +853,7 @@ void KAction::setEnabled(bool enable)
   emit enabled( d->isEnabled() );
 }
 
-void KAction::updateEnabled( int i )
+void TDEAction::updateEnabled( int i )
 {
     TQWidget *w = container( i );
 
@@ -861,33 +861,33 @@ void KAction::updateEnabled( int i )
       static_cast<TQPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
     else if ( ::tqqt_cast<TQMenuBar *>( w ) )
       static_cast<TQMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
-    else if ( ::tqqt_cast<KToolBar *>( w ) )
-      static_cast<KToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
+    else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+      static_cast<TDEToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
 }
 
-void KAction::setShortcutConfigurable( bool b )
+void TDEAction::setShortcutConfigurable( bool b )
 {
     d->m_configurable = b;
 }
 
-void KAction::setText( const TQString& text )
+void TDEAction::setText( const TQString& text )
 {
 #ifndef KDE_NO_COMPAT
   // KDE 4: remove
-  if (d->m_kaccel) {
-    KAccelAction* pAction = d->m_kaccel->actions().actionPtr(name());
+  if (d->m_tdeaccel) {
+    TDEAccelAction* pAction = d->m_tdeaccel->actions().actionPtr(name());
     if (pAction)
       pAction->setLabel( text );
   }
 #endif  // KDE 4: remove end
-  const TQValueList<KAccel*> & accelList = d->m_kaccelList;
-  TQValueList<KAccel*>::const_iterator itr = accelList.constBegin();
-  const TQValueList<KAccel*>::const_iterator itrEnd = accelList.constEnd();
+  const TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
+  TQValueList<TDEAccel*>::const_iterator itr = accelList.constBegin();
+  const TQValueList<TDEAccel*>::const_iterator itrEnd = accelList.constEnd();
 
   const char * const namePtr = name();
 
   for( ; itr != itrEnd; ++itr ) {
-    KAccelAction* const pAction = (*itr)->actions().actionPtr(namePtr);
+    TDEAccelAction* const pAction = (*itr)->actions().actionPtr(namePtr);
     if (pAction)
       pAction->setLabel( text );
   }
@@ -899,7 +899,7 @@ void KAction::setText( const TQString& text )
     updateText( i );
 }
 
-void KAction::updateText( int i )
+void TDEAction::updateText( int i )
 {
   TQWidget *w = container( i );
 
@@ -911,25 +911,25 @@ void KAction::updateText( int i )
   }
   else if ( ::tqqt_cast<TQMenuBar *>( w ) )
     static_cast<TQMenuBar*>(w)->changeItem( itemId( i ), d->text() );
-  else if ( ::tqqt_cast<KToolBar *>( w ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
   {
-    TQWidget *button = static_cast<KToolBar *>(w)->getWidget( itemId( i ) );
-    if ( ::tqqt_cast<KToolBarButton *>( button ) )
-      static_cast<KToolBarButton *>(button)->setText( d->plainText() );
+    TQWidget *button = static_cast<TDEToolBar *>(w)->getWidget( itemId( i ) );
+    if ( ::tqqt_cast<TDEToolBarButton *>( button ) )
+      static_cast<TDEToolBarButton *>(button)->setText( d->plainText() );
   }
 }
 
-TQString KAction::text() const
+TQString TDEAction::text() const
 {
   return d->text();
 }
 
-TQString KAction::plainText() const
+TQString TDEAction::plainText() const
 {
   return d->plainText( );
 }
 
-void KAction::setIcon( const TQString &icon )
+void TDEAction::setIcon( const TQString &icon )
 {
   d->setIconName( icon );
 
@@ -939,28 +939,28 @@ void KAction::setIcon( const TQString &icon )
     updateIcon( i );
 }
 
-void KAction::updateIcon( int id )
+void TDEAction::updateIcon( int id )
 {
   TQWidget* w = container( id );
 
   if ( ::tqqt_cast<TQPopupMenu *>( w ) ) {
     int itemId_ = itemId( id );
-    static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() );
+    static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet( TDEIcon::Small ), d->text() );
     if (!d->m_cut.isNull())
       updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ );
   }
   else if ( ::tqqt_cast<TQMenuBar *>( w ) )
-    static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( KIcon::Small ), d->text() );
-  else if ( ::tqqt_cast<KToolBar *>( w ) )
-    static_cast<KToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
+    static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( TDEIcon::Small ), d->text() );
+  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+    static_cast<TDEToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
 }
 
-TQString KAction::icon() const
+TQString TDEAction::icon() const
 {
   return d->iconName( );
 }
 
-void KAction::setIconSet( const TQIconSet &iconset )
+void TDEAction::setIconSet( const TQIconSet &iconset )
 {
   d->setIconSet( iconset );
 
@@ -970,7 +970,7 @@ void KAction::setIconSet( const TQIconSet &iconset )
 }
 
 
-void KAction::updateIconSet( int id )
+void TDEAction::updateIconSet( int id )
 {
   TQWidget *w = container( id );
 
@@ -983,26 +983,26 @@ void KAction::updateIconSet( int id )
   }
   else if ( ::tqqt_cast<TQMenuBar *>( w ) )
     static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() );
-  else if ( ::tqqt_cast<KToolBar *>( w ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
   {
     if ( icon().isEmpty() && d->hasIcon() ) // only if there is no named icon ( scales better )
-      static_cast<KToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() );
+      static_cast<TDEToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() );
     else
-      static_cast<KToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet( KIcon::Small ) );
+      static_cast<TDEToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet( TDEIcon::Small ) );
   }
 }
 
-TQIconSet KAction::iconSet( KIcon::Group group, int size ) const
+TQIconSet TDEAction::iconSet( TDEIcon::Group group, int size ) const
 {
     return d->iconSet( group, size );
 }
 
-bool KAction::hasIcon() const
+bool TDEAction::hasIcon() const
 {
   return d->hasIcon();
 }
 
-void KAction::setWhatsThis( const TQString& text )
+void TDEAction::setWhatsThis( const TQString& text )
 {
   d->setWhatsThis(  text );
 
@@ -1011,7 +1011,7 @@ void KAction::setWhatsThis( const TQString& text )
     updateWhatsThis( i );
 }
 
-void KAction::updateWhatsThis( int i )
+void TDEAction::updateWhatsThis( int i )
 {
   TQPopupMenu* pm = popupMenu( i );
   if ( pm )
@@ -1020,7 +1020,7 @@ void KAction::updateWhatsThis( int i )
     return;
   }
 
-  KToolBar *tb = toolBar( i );
+  TDEToolBar *tb = toolBar( i );
   if ( tb )
   {
     TQWidget *w = tb->getButton( itemId( i ) );
@@ -1030,12 +1030,12 @@ void KAction::updateWhatsThis( int i )
   }
 }
 
-TQString KAction::whatsThis() const
+TQString TDEAction::whatsThis() const
 {
   return d->whatsThis();
 }
 
-TQString KAction::whatsThisWithIcon() const
+TQString TDEAction::whatsThisWithIcon() const
 {
     TQString text = whatsThis();
     if (!d->iconName().isEmpty())
@@ -1043,80 +1043,80 @@ TQString KAction::whatsThisWithIcon() const
     return text;
 }
 
-TQWidget* KAction::container( int index ) const
+TQWidget* TDEAction::container( int index ) const
 {
   assert( index < containerCount() );
   return d->m_containers[ index ].m_container;
 }
 
-KToolBar* KAction::toolBar( int index ) const
+TDEToolBar* TDEAction::toolBar( int index ) const
 {
-    return tqt_dynamic_cast<KToolBar *>( d->m_containers[ index ].m_container );
+    return tqt_dynamic_cast<TDEToolBar *>( d->m_containers[ index ].m_container );
 }
 
-TQPopupMenu* KAction::popupMenu( int index ) const
+TQPopupMenu* TDEAction::popupMenu( int index ) const
 {
     return tqt_dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container );
 }
 
-TQWidget* KAction::representative( int index ) const
+TQWidget* TDEAction::representative( int index ) const
 {
   return d->m_containers[ index ].m_representative;
 }
 
-int KAction::itemId( int index ) const
+int TDEAction::itemId( int index ) const
 {
   return d->m_containers[ index ].m_id;
 }
 
-int KAction::containerCount() const
+int TDEAction::containerCount() const
 {
   return d->m_containers.count();
 }
 
-uint KAction::kaccelCount() const
+uint TDEAction::tdeaccelCount() const
 {
-  return d->m_kaccelList.count();
+  return d->m_tdeaccelList.count();
 }
 
-void KAction::addContainer( TQWidget* c, int id )
+void TDEAction::addContainer( TQWidget* c, int id )
 {
-  KActionPrivate::Container p;
+  TDEActionPrivate::Container p;
   p.m_container = c;
   p.m_id = id;
   d->m_containers.append( p );
 }
 
-void KAction::addContainer( TQWidget* c, TQWidget* w )
+void TDEAction::addContainer( TQWidget* c, TQWidget* w )
 {
-  KActionPrivate::Container p;
+  TDEActionPrivate::Container p;
   p.m_container = c;
   p.m_representative = w;
   d->m_containers.append( p );
 }
 
-void KAction::activate()
+void TDEAction::activate()
 {
-  emit activated( KAction::EmulatedActivation, Qt::NoButton );
+  emit activated( TDEAction::EmulatedActivation, Qt::NoButton );
   slotActivated();
 }
 
-void KAction::slotActivated()
+void TDEAction::slotActivated()
 {
   const TQObject *senderObj = TQT_TQOBJECT_CONST(sender());
   if ( senderObj )
   {
-    if ( ::tqqt_cast<KAccelPrivate *>( senderObj ) )
-        emit activated( KAction::AccelActivation, Qt::NoButton );
+    if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) )
+        emit activated( TDEAction::AccelActivation, Qt::NoButton );
   }
   emit activated();
 }
 
-// This catches signals emitted by KActions inserted into QPopupMenu
+// This catches signals emitted by TDEActions inserted into QPopupMenu
 // We do crude things inside it, because we need to know which
 // TQPopupMenu emitted the signal. We need to be sure that it is
 // only called by QPopupMenus, we plugged us in.
-void KAction::slotPopupActivated()
+void TDEAction::slotPopupActivated()
 {
   if( ::tqqt_cast<TQSignal *>(sender()))
   {
@@ -1127,30 +1127,30 @@ void KAction::slotPopupActivated()
       TQPopupMenu* qpm = tqt_dynamic_cast<TQPopupMenu *>( container(pos) );
       if(qpm)
       {
-        KPopupMenu* kpm = tqt_dynamic_cast<KPopupMenu *>( qpm );
+        TDEPopupMenu* kpm = tqt_dynamic_cast<TDEPopupMenu *>( qpm );
         TQt::ButtonState state;
-        if ( kpm ) // KPopupMenu? Nice, it stores the state.
+        if ( kpm ) // TDEPopupMenu? Nice, it stores the state.
             state = kpm->state();
         else { // just a QPopupMenu? We'll ask for the state now then (small race condition?)
-            kdDebug(129) << "KAction::slotPopupActivated not a KPopupMenu -> using keyboardMouseState()" << endl;
-            state = KApplication::keyboardMouseState();
+            kdDebug(129) << "TDEAction::slotPopupActivated not a TDEPopupMenu -> using keyboardMouseState()" << endl;
+            state = TDEApplication::keyboardMouseState();
         }
-        emit activated( KAction::PopupMenuActivation, state );
+        emit activated( TDEAction::PopupMenuActivation, state );
         slotActivated();
         return;
       }
     }
   }
 
-  kdWarning(129)<<"Don't connect KAction::slotPopupActivated() to anything, expect into QPopupMenus which are in containers. Use slotActivated instead."<<endl;
-  emit activated( KAction::PopupMenuActivation, Qt::NoButton );
+  kdWarning(129)<<"Don't connect TDEAction::slotPopupActivated() to anything, expect into QPopupMenus which are in containers. Use slotActivated instead."<<endl;
+  emit activated( TDEAction::PopupMenuActivation, Qt::NoButton );
   slotActivated();
 }
 
-void KAction::slotButtonClicked( int, TQt::ButtonState state )
+void TDEAction::slotButtonClicked( int, TQt::ButtonState state )
 {
   kdDebug(129) << "slotButtonClicked() state=" << state << endl;
-  emit activated( KAction::ToolBarActivation, state );
+  emit activated( TDEAction::ToolBarActivation, state );
 
   // RightButton isn't really an activation
   if ( ( state & Qt::LeftButton ) || ( state & Qt::MidButton ) )
@@ -1158,21 +1158,21 @@ void KAction::slotButtonClicked( int, TQt::ButtonState state )
 }
 
 
-void KAction::slotDestroyed()
+void TDEAction::slotDestroyed()
 {
-  kdDebug(129) << "KAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl;
+  kdDebug(129) << "TDEAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl;
   const TQObject* const o = TQT_TQOBJECT_CONST(sender());
 
 #ifndef KDE_NO_COMPAT  // KDE 4: remove
-  if ( o == d->m_kaccel )
+  if ( o == d->m_tdeaccel )
   {
-    d->m_kaccel = 0;
+    d->m_tdeaccel = 0;
     return;
   }
 #endif  // KDE 4: remove end
-  TQValueList<KAccel*> & accelList = d->m_kaccelList;
-  TQValueList<KAccel*>::iterator itr = accelList.begin();
-  const TQValueList<KAccel*>::iterator itrEnd = accelList.end();
+  TQValueList<TDEAccel*> & accelList = d->m_tdeaccelList;
+  TQValueList<TDEAccel*>::iterator itr = accelList.begin();
+  const TQValueList<TDEAccel*>::iterator itrEnd = accelList.end();
 
   for( ; itr != itrEnd; ++itr)
   {
@@ -1193,14 +1193,14 @@ void KAction::slotDestroyed()
   } while ( i != -1 );
 }
 
-int KAction::findContainer( const TQWidget* widget ) const
+int TDEAction::findContainer( const TQWidget* widget ) const
 {
   int pos = 0;
 
-  const TQValueList<KActionPrivate::Container> & containers = d->m_containers;
+  const TQValueList<TDEActionPrivate::Container> & containers = d->m_containers;
 
-  TQValueList<KActionPrivate::Container>::ConstIterator it = containers.constBegin();
-  const TQValueList<KActionPrivate::Container>::ConstIterator itEnd = containers.constEnd();
+  TQValueList<TDEActionPrivate::Container>::ConstIterator it = containers.constBegin();
+  const TQValueList<TDEActionPrivate::Container>::ConstIterator itEnd = containers.constEnd();
 
   while( it != itEnd )
   {
@@ -1213,14 +1213,14 @@ int KAction::findContainer( const TQWidget* widget ) const
   return -1;
 }
 
-int KAction::findContainer( const int id ) const
+int TDEAction::findContainer( const int id ) const
 {
   int pos = 0;
 
-  const TQValueList<KActionPrivate::Container> & containers = d->m_containers;
+  const TQValueList<TDEActionPrivate::Container> & containers = d->m_containers;
 
-  TQValueList<KActionPrivate::Container>::ConstIterator it = containers.constBegin();
-  const TQValueList<KActionPrivate::Container>::ConstIterator itEnd = containers.constEnd();
+  TQValueList<TDEActionPrivate::Container>::ConstIterator it = containers.constBegin();
+  const TQValueList<TDEActionPrivate::Container>::ConstIterator itEnd = containers.constEnd();
 
   while( it != itEnd )
   {
@@ -1233,14 +1233,14 @@ int KAction::findContainer( const int id ) const
   return -1;
 }
 
-void KAction::removeContainer( int index )
+void TDEAction::removeContainer( int index )
 {
   int i = 0;
 
-  TQValueList<KActionPrivate::Container> & containers = d->m_containers;
+  TQValueList<TDEActionPrivate::Container> & containers = d->m_containers;
 
-  TQValueList<KActionPrivate::Container>::Iterator it = containers.begin();
-  const TQValueList<KActionPrivate::Container>::Iterator itEnd = containers.end();
+  TQValueList<TDEActionPrivate::Container>::Iterator it = containers.begin();
+  const TQValueList<TDEActionPrivate::Container>::Iterator itEnd = containers.end();
 
   while( it != itEnd )
   {
@@ -1255,34 +1255,34 @@ void KAction::removeContainer( int index )
 }
 
 // FIXME: Remove this (ellis)
-void KAction::slotKeycodeChanged()
+void TDEAction::slotKeycodeChanged()
 {
-  kdDebug(129) << "KAction::slotKeycodeChanged()" << endl; // -- ellis
-  KAccelAction* pAction = d->m_kaccel->actions().actionPtr(name());
+  kdDebug(129) << "TDEAction::slotKeycodeChanged()" << endl; // -- ellis
+  TDEAccelAction* pAction = d->m_tdeaccel->actions().actionPtr(name());
   if( pAction )
     setShortcut(pAction->shortcut());
 }
 
-KActionCollection *KAction::parentCollection() const
+TDEActionCollection *TDEAction::parentCollection() const
 {
     return m_parentCollection;
 }
 
-void KAction::unplugAll()
+void TDEAction::unplugAll()
 {
   while ( containerCount() != 0 )
     unplug( container( 0 ) );
 }
 
-const KGuiItem& KAction::guiItem() const
+const KGuiItem& TDEAction::guiItem() const
 {
     return *d;
 }
 
-void KAction::virtual_hook( int, void* )
+void TDEAction::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 /* vim: et sw=2 ts=2
  */
 
-#include "kaction.moc"
+#include "tdeaction.moc"
diff --git a/tdeui/kaction.h b/tdeui/tdeaction.h
index dca99b4b0..5919c9641 100644
--- a/tdeui/kaction.h
+++ b/tdeui/tdeaction.h
@@ -23,15 +23,15 @@
 */
 //$Id$
 
-#ifndef __kaction_h__
-#define __kaction_h__
+#ifndef __tdeaction_h__
+#define __tdeaction_h__
 
 #include <tqkeysequence.h>
 #include <tqobject.h>
 #include <tqvaluelist.h>
 #include <tqguardedptr.h>
 #include <kguiitem.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstdaction.h>
 #include <kicontheme.h>
 
@@ -41,39 +41,39 @@ class TQComboBox;
 class TQPoint;
 class TQIconSet;
 class TQString;
-class KToolBar;
+class TDEToolBar;
 
-class KAccel;
-class KAccelActions;
-class KConfig;
-class KConfigBase;
+class TDEAccel;
+class TDEAccelActions;
+class TDEConfig;
+class TDEConfigBase;
 class KURL;
-class KInstance;
-class KToolBar;
-class KActionCollection;
-class KPopupMenu;
-class KMainWindow;
+class TDEInstance;
+class TDEToolBar;
+class TDEActionCollection;
+class TDEPopupMenu;
+class TDEMainWindow;
 
 /**
  * @short Class to encapsulate user-driven action or event
  *
- * The KAction class (and derived and super classes) provides a way to
+ * The TDEAction class (and derived and super classes) provides a way to
  * easily encapsulate a "real" user-selected action or event in your
  * program.
  *
  * For instance, a user may want to @p paste the contents of
  * the clipboard or @p scroll @p down a document or @p quit the
  * application.  These are all @p actions -- events that the
- * user causes to happen.  The KAction class allows the developer to
+ * user causes to happen.  The TDEAction class allows the developer to
  * deal with these actions in an easy and intuitive manner.
  *
- * Specifically, the KAction class encapsulated the various attributes
+ * Specifically, the TDEAction class encapsulated the various attributes
  * to an event/action.  For instance, an action might have an icon
  * that goes along with it (a clipboard for a "paste" action or
  * scissors for a "cut" action).  The action might have some text to
  * describe the action.  It will certainly have a method or function
  * that actually @p executes the action!  All these attributes
- * are contained within the KAction object.
+ * are contained within the TDEAction object.
  *
  * The advantage of dealing with Actions is that you can manipulate
  * the Action without regard to the GUI representation of it.  For
@@ -86,7 +86,7 @@ class KMainWindow;
  * similar code - but has to be done twice!
  *
  * With the Action concept, you simply "plug" the Action into whatever
- * GUI element you want.  The KAction class will then take care of
+ * GUI element you want.  The TDEAction class will then take care of
  * correctly defining the menu item (with icons, accelerators, text,
  * etc) or toolbar button.. or whatever.  From then on, if you
  * manipulate the Action at all, the effect will propogate through all
@@ -99,7 +99,7 @@ class KMainWindow;
  * one-to-one relationship between the "real" action and @p all
  * GUI representations of it.
  *
- * KAction emits the activated() signal if the user activated the
+ * TDEAction emits the activated() signal if the user activated the
  * corresponding GUI element ( menu item, toolbar button, etc. )
  *
  * If you are in the situation of wanting to map the activated()
@@ -113,7 +113,7 @@ class KMainWindow;
  *          this, TQT_SLOT( moveWindowToDesktop( int ) ) );
  *
  * for ( uint i = 0; i < numberOfDesktops; ++i ) {
- *     KAction *desktopAction = new KAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... );
+ *     TDEAction *desktopAction = new TDEAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... );
  *     connect( desktopAction, TQT_SIGNAL( activated() ), desktopNumberMapper, TQT_SLOT( map() ) );
  *     desktopNumberMapper->setMapping( desktopAction, i );
  * }
@@ -125,7 +125,7 @@ class KMainWindow;
  *
  * @li Decide which attributes you want to associate with a given
  *     action (icons, text, keyboard shortcut, etc)
- * @li Create the action using KAction (or derived or super class).
+ * @li Create the action using TDEAction (or derived or super class).
  * @li "Plug" the Action into whatever GUI element you want.  Typically,
  *      this will be a menu or toolbar.
  *
@@ -133,8 +133,8 @@ class KMainWindow;
  *
  * Here is an example of enabling a "New [document]" action
  * \code
- * KAction *newAct = new KAction(i18n("&New"), "filenew",
- *                               KStdAccel::shortcut(KStdAccel::New),
+ * TDEAction *newAct = new TDEAction(i18n("&New"), "filenew",
+ *                               TDEStdAccel::shortcut(TDEStdAccel::New),
  *                               this, TQT_SLOT(fileNew()),
  *                               actionCollection(), "new");
  * \endcode
@@ -166,14 +166,14 @@ class KMainWindow;
  * and both the menuitem in File and the toolbar button will instantly
  * be disabled.
  *
- * Do not delete a KAction object without unplugging it from all its
+ * Do not delete a TDEAction object without unplugging it from all its
  * containers. The simplest way to do that is to use the unplugAll()
  * as in the following example:
  * \code
  * newAct->unplugAll();
  * delete newAct;
  * \endcode
- * Normally you will not need to do this as KActionCollection manages
+ * Normally you will not need to do this as TDEActionCollection manages
  * everything for you.
  *
  * Note: if you are using a "standard" action like "new", "paste",
@@ -183,10 +183,10 @@ class KMainWindow;
  *
  * <b>Usage Within the XML Framework:</b>\n
  *
- * If you are using KAction within the context of the XML menu and
+ * If you are using TDEAction within the context of the XML menu and
  * toolbar building framework, then there are a few tiny changes.  The
  * first is that you must insert your new action into an action
- * collection.  The action collection (a KActionCollection) is,
+ * collection.  The action collection (a TDEActionCollection) is,
  * logically enough, a central collection of all of the actions
  * defined in your application.  The XML UI framework code in KXMLGUI
  * classes needs access to this collection in order to build up the
@@ -199,9 +199,9 @@ class KMainWindow;
  *
  * @see KStdAction
  */
-class TDEUI_EXPORT KAction : public TQObject
+class TDEUI_EXPORT TDEAction : public TQObject
 {
-  friend class KActionCollection;
+  friend class TDEActionCollection;
   Q_OBJECT
   TQ_PROPERTY( int containerCount READ containerCount )
   TQ_PROPERTY( TQString plainText READ plainText )
@@ -221,7 +221,7 @@ public:
      * If you do not want or have a keyboard shortcut,
      * set the @p cut param to 0.
      *
-     * This is the most common KAction used when you do not have a
+     * This is the most common TDEAction used when you do not have a
      * corresponding icon (note that it won't appear in the current version
      * of the "Edit ToolBar" dialog, because an action needs an icon to be
      * plugged in a toolbar...).
@@ -233,9 +233,9 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KAction( const TQString& text, const KShortcut& cut,
+    TDEAction( const TQString& text, const TDEShortcut& cut,
              const TQObject* receiver, const char* slot,
-             KActionCollection* parent, const char* name );
+             TDEActionCollection* parent, const char* name );
 
     /**
      * Constructs an action with text, icon, potential keyboard
@@ -245,7 +245,7 @@ public:
      * If you do not want or have a keyboard shortcut, set the
      * @p cut param to 0.
      *
-     * This is the other common KAction used.  Use it when you
+     * This is the other common TDEAction used.  Use it when you
      * @p do have a corresponding icon.
      *
      * @param text The text that will be displayed.
@@ -256,9 +256,9 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+    TDEAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
              const TQObject* receiver, const char* slot,
-             KActionCollection* parent, const char* name );
+             TDEActionCollection* parent, const char* name );
 
     /**
      * Constructs an action with text, icon, potential keyboard
@@ -269,7 +269,7 @@ public:
      * If you do not want or have a keyboard shortcut, set the
      * @p cut param to 0.
      *
-     * This is the other common KAction used.  Use it when you
+     * This is the other common TDEAction used.  Use it when you
      * @p do have a corresponding icon.
      *
      * @param text The text that will be displayed.
@@ -280,9 +280,9 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+    TDEAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
              const TQObject* receiver, const char* slot,
-             KActionCollection* parent, const char* name );
+             TDEActionCollection* parent, const char* name );
 
     /**
      * The same as the above constructor, but with a KGuiItem providing
@@ -295,49 +295,49 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KAction( const KGuiItem& item, const KShortcut& cut,
+    TDEAction( const KGuiItem& item, const TDEShortcut& cut,
              const TQObject* receiver, const char* slot,
-             KActionCollection* parent, const char* name );
+             TDEActionCollection* parent, const char* name );
 
 	/**
 	 * @obsolete
 	 */
-	KAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 );
+	TDEAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 );
 	/**
 	 * @obsolete
 	 */
-	KAction( const TQString& text, const KShortcut& cut,
+	TDEAction( const TQString& text, const TDEShortcut& cut,
 		const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 	/**
 	 * @obsolete
 	 */
-	KAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+	TDEAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
 		TQObject* parent = 0, const char* name = 0 );
 	/**
 	 * @obsolete
 	 */
-	KAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+	TDEAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
 		TQObject* parent = 0, const char* name = 0 );
 	/**
 	 * @obsolete
 	 */
-	KAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+	TDEAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
 		const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 	/**
 	 * @obsolete
 	 */
-	KAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+	TDEAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
 		const TQObject* receiver, const char* slot, TQObject* parent,
 		const char* name = 0 );
 	/**
 	 * @obsolete
 	 */
-	KAction( TQObject* parent = 0, const char* name = 0 );
+	TDEAction( TQObject* parent = 0, const char* name = 0 );
 
     /**
      * Standard destructor
      */
-    virtual ~KAction();
+    virtual ~TDEAction();
 
     /**
      * "Plug" or insert this action into a given widget.
@@ -346,7 +346,7 @@ public:
      * typically be a menu or a toolbar.  From this point on, you will
      * never need to directly manipulate the item in the menu or
      * toolbar.  You do all enabling/disabling/manipulation directly
-     * with your KAction object.
+     * with your TDEAction object.
      *
      * @param widget The GUI element to display this action
      * @param index The position into which the action is plugged. If
@@ -357,14 +357,14 @@ public:
     /**
      * @deprecated.  Shouldn't be used.  No substitute available.
      *
-     * "Plug" or insert this action into a given KAccel.
+     * "Plug" or insert this action into a given TDEAccel.
      *
-     * @param accel The KAccel collection which holds this accel
+     * @param accel The TDEAccel collection which holds this accel
      * @param configurable If the shortcut is configurable via
-     * the KAccel configuration dialog (this is somehow deprecated since
-     * there is now a KAction key configuration dialog).
+     * the TDEAccel configuration dialog (this is somehow deprecated since
+     * there is now a TDEAction key configuration dialog).
      */
-    virtual void plugAccel(KAccel *accel, bool configurable = true) KDE_DEPRECATED;
+    virtual void plugAccel(TDEAccel *accel, bool configurable = true) KDE_DEPRECATED;
 
     /**
      * "Unplug" or remove this action from a given widget.
@@ -382,7 +382,7 @@ public:
 
     /**
      * @deprecated.  Complement method to plugAccel().
-     * Disconnect this action from the KAccel.
+     * Disconnect this action from the TDEAccel.
      */
     virtual void unplugAccel() KDE_DEPRECATED;
 
@@ -414,7 +414,7 @@ public:
     TQWidget* representative( int index ) const;
     int containerCount() const;
     /// @since 3.1
-    uint kaccelCount() const;
+    uint tdeaccelCount() const;
 
     virtual bool hasIcon() const;
 #ifndef KDE_NO_COMPAT
@@ -430,11 +430,11 @@ public:
     /**
      * Get the keyboard shortcut associated with this action.
      */
-    virtual const KShortcut& shortcut() const;
+    virtual const TDEShortcut& shortcut() const;
     /**
      * Get the default shortcut for this action.
      */
-    virtual const KShortcut& shortcutDefault() const;
+    virtual const TDEShortcut& shortcutDefault() const;
 
     // These two methods are for TQ_PROPERTY
     TQString shortcutText() const;
@@ -466,18 +466,18 @@ public:
      * Get the TQIconSet from which the icons used to display this action will
      * be chosen.
      *
-     * In KDE4 set group default to KIcon::Small while removing the other
+     * In KDE4 set group default to TDEIcon::Small while removing the other
      * iconSet() function.
      */
-    virtual TQIconSet iconSet( KIcon::Group group, int size=0 ) const;
+    virtual TQIconSet iconSet( TDEIcon::Group group, int size=0 ) const;
     /**
      * Remove in KDE4
      */
-    TQIconSet iconSet() const { return iconSet( KIcon::Small ); }
+    TQIconSet iconSet() const { return iconSet( TDEIcon::Small ); }
 
     virtual TQString icon() const;
 
-    KActionCollection *parentCollection() const;
+    TDEActionCollection *parentCollection() const;
 
     /**
      * @internal
@@ -503,7 +503,7 @@ public slots:
     /**
      * Sets the keyboard shortcut associated with this action.
      */
-    virtual bool setShortcut( const KShortcut& );
+    virtual bool setShortcut( const TDEShortcut& );
 
     virtual void setGroup( const TQString& );
 
@@ -525,9 +525,9 @@ public slots:
      * For the tooltip to show up on the statusbar you will need to connect
      * a couple of the actionclass signals to the toolbar.
      * The easiest way of doing this is in your main window class, when you create
-     * a statusbar.  See the KActionCollection class for more details.
+     * a statusbar.  See the TDEActionCollection class for more details.
      *
-     * @see KActionCollection
+     * @see TDEActionCollection
      *
      */
     virtual void setToolTip( const TQString& );
@@ -573,7 +573,7 @@ protected slots:
     void slotButtonClicked( int, TQt::ButtonState state ); // KDE4: make virtual
 
 protected:
-    KToolBar* toolBar( int index ) const;
+    TDEToolBar* toolBar( int index ) const;
     TQPopupMenu* popupMenu( int index ) const;
     void removeContainer( int index );
     int findContainer( const TQWidget* widget ) const;
@@ -593,7 +593,7 @@ protected:
     virtual void updateToolTip( int id );
     virtual void updateWhatsThis( int i );
 
-    KActionCollection *m_parentCollection;
+    TDEActionCollection *m_parentCollection;
     TQString whatsThisWithIcon() const;
     /**
      * Return the underlying KGuiItem
@@ -620,19 +620,19 @@ signals:
      *
      * @since 3.4
      */
-    void activated( KAction::ActivationReason reason, TQt::ButtonState state );
+    void activated( TDEAction::ActivationReason reason, TQt::ButtonState state );
     void enabled( bool );
 
 private:
-    void initPrivate( const TQString& text, const KShortcut& cut,
+    void initPrivate( const TQString& text, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot );
-    KAccel* kaccelCurrent();
-    bool initShortcut( const KShortcut& );
+    TDEAccel* tdeaccelCurrent();
+    bool initShortcut( const TDEShortcut& );
     void plugShortcut();
-    bool updateKAccelShortcut( KAccel* kaccel );
-    void insertKAccel( KAccel* );
-    /** @internal To be used exclusively by KActionCollection::removeWidget(). */
-    void removeKAccel( KAccel* );
+    bool updateTDEAccelShortcut( TDEAccel* tdeaccel );
+    void insertTDEAccel( TDEAccel* );
+    /** @internal To be used exclusively by TDEActionCollection::removeWidget(). */
+    void removeTDEAccel( TDEAccel* );
 
 #ifndef KDE_NO_COMPAT
 public:
@@ -666,11 +666,11 @@ public:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KActionPrivate;
-    KActionPrivate* const d;
+    class TDEActionPrivate;
+    TDEActionPrivate* const d;
 };
 
-#include <kactioncollection.h>
-#include <kactionclasses.h>
+#include <tdeactioncollection.h>
+#include <tdeactionclasses.h>
 
 #endif
diff --git a/tdeui/kactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index 9e2241408..4b589f166 100644
--- a/tdeui/kactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -24,7 +24,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kactionclasses.h"
+#include "tdeactionclasses.h"
 
 #include <assert.h>
 #include <ft2build.h>
@@ -41,26 +41,26 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kaccel.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeaccel.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfontcombo.h>
-#include <kfontdialog.h>
-#include <klocale.h>
-#include <kmainwindow.h>
-#include <kmenubar.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdefontcombo.h>
+#include <tdefontdialog.h>
+#include <tdelocale.h>
+#include <tdemainwindow.h>
+#include <tdemenubar.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 
-class KToggleAction::KToggleActionPrivate
+class TDEToggleAction::TDEToggleActionPrivate
 {
 public:
-  KToggleActionPrivate()
+  TDEToggleActionPrivate()
   {
     m_checked = false;
     m_checkedGuiItem = 0;
@@ -71,86 +71,86 @@ public:
   KGuiItem* m_checkedGuiItem;
 };
 
-KToggleAction::KToggleAction( const TQString& text, const KShortcut& cut,
+TDEToggleAction::TDEToggleAction( const TQString& text, const TDEShortcut& cut,
                               TQObject* parent,
                               const char* name )
-    : KAction( text, cut, parent, name )
+    : TDEAction( text, cut, parent, name )
 {
-  d = new KToggleActionPrivate;
+  d = new TDEToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const TQString& text, const KShortcut& cut,
+TDEToggleAction::TDEToggleAction( const TQString& text, const TDEShortcut& cut,
                               const TQObject* receiver, const char* slot,
                               TQObject* parent, const char* name )
-  : KAction( text, cut, receiver, slot, parent, name )
+  : TDEAction( text, cut, receiver, slot, parent, name )
 {
-  d = new KToggleActionPrivate;
+  d = new TDEToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const TQString& text, const TQIconSet& pix,
-                              const KShortcut& cut,
+TDEToggleAction::TDEToggleAction( const TQString& text, const TQIconSet& pix,
+                              const TDEShortcut& cut,
                               TQObject* parent, const char* name )
-  : KAction( text, pix, cut, parent, name )
+  : TDEAction( text, pix, cut, parent, name )
 {
-  d = new KToggleActionPrivate;
+  d = new TDEToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const TQString& text, const TQString& pix,
-                              const KShortcut& cut,
+TDEToggleAction::TDEToggleAction( const TQString& text, const TQString& pix,
+                              const TDEShortcut& cut,
                               TQObject* parent, const char* name )
- : KAction( text, pix, cut, parent, name )
+ : TDEAction( text, pix, cut, parent, name )
 {
-  d = new KToggleActionPrivate;
+  d = new TDEToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const TQString& text, const TQIconSet& pix,
-                              const KShortcut& cut,
+TDEToggleAction::TDEToggleAction( const TQString& text, const TQIconSet& pix,
+                              const TDEShortcut& cut,
                               const TQObject* receiver,
                               const char* slot, TQObject* parent,
                               const char* name )
-  : KAction( text, pix, cut, receiver, slot, parent, name )
+  : TDEAction( text, pix, cut, receiver, slot, parent, name )
 {
-  d = new KToggleActionPrivate;
+  d = new TDEToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const TQString& text, const TQString& pix,
-                              const KShortcut& cut,
+TDEToggleAction::TDEToggleAction( const TQString& text, const TQString& pix,
+                              const TDEShortcut& cut,
                               const TQObject* receiver,
                               const char* slot, TQObject* parent,
                               const char* name )
-  : KAction( text, pix, cut, receiver, slot, parent, name )
+  : TDEAction( text, pix, cut, receiver, slot, parent, name )
 {
-  d = new KToggleActionPrivate;
+  d = new TDEToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( TQObject* parent, const char* name )
-    : KAction( parent, name )
+TDEToggleAction::TDEToggleAction( TQObject* parent, const char* name )
+    : TDEAction( parent, name )
 {
-  d = new KToggleActionPrivate;
+  d = new TDEToggleActionPrivate;
 }
 
-KToggleAction::~KToggleAction()
+TDEToggleAction::~TDEToggleAction()
 {
   delete d->m_checkedGuiItem;
   delete d;
 }
 
-int KToggleAction::plug( TQWidget* widget, int index )
+int TDEToggleAction::plug( TQWidget* widget, int index )
 {
-  if ( !::tqqt_cast<TQPopupMenu *>( widget ) && !::tqqt_cast<KToolBar *>( widget ) )
+  if ( !::tqqt_cast<TQPopupMenu *>( widget ) && !::tqqt_cast<TDEToolBar *>( widget ) )
   {
-    kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl;
+    kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl;
     return -1;
   }
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
 
-  int _index = KAction::plug( widget, index );
+  int _index = TDEAction::plug( widget, index );
   if ( _index == -1 )
     return _index;
 
-  if ( ::tqqt_cast<KToolBar *>( widget ) ) {
-    KToolBar *bar = static_cast<KToolBar *>( widget );
+  if ( ::tqqt_cast<TDEToolBar *>( widget ) ) {
+    TDEToolBar *bar = static_cast<TDEToolBar *>( widget );
 
     bar->setToggle( itemId( _index ), true );
     bar->setButton( itemId( _index ), isChecked() );
@@ -162,11 +162,11 @@ int KToggleAction::plug( TQWidget* widget, int index )
   return _index;
 }
 
-void KToggleAction::setChecked( bool c )
+void TDEToggleAction::setChecked( bool c )
 {
   if ( c == d->m_checked )
     return;
-  //kdDebug(129) << "KToggleAction::setChecked(" << c << ") " << this << " " << name() << endl;
+  //kdDebug(129) << "TDEToggleAction::setChecked(" << c << ") " << this << " " << name() << endl;
 
   d->m_checked = c;
 
@@ -180,9 +180,9 @@ void KToggleAction::setChecked( bool c )
     if ( !list.isEmpty() ) {
       TQObjectListIt it( list );
       for( ; it.current(); ++it ) {
-          if ( ::tqqt_cast<KToggleAction *>( it.current() ) && it.current() != this &&
-            static_cast<KToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) {
-	  KToggleAction *a = static_cast<KToggleAction*>(it.current());
+          if ( ::tqqt_cast<TDEToggleAction *>( it.current() ) && it.current() != this &&
+            static_cast<TDEToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) {
+	  TDEToggleAction *a = static_cast<TDEToggleAction*>(it.current());
 	  if( a->isChecked() ) {
 	    a->setChecked( false );
 	    emit a->toggled( false );
@@ -193,7 +193,7 @@ void KToggleAction::setChecked( bool c )
   }
 }
 
-void KToggleAction::updateChecked( int id )
+void TDEToggleAction::updateChecked( int id )
 {
   TQWidget *w = container( id );
 
@@ -205,7 +205,7 @@ void KToggleAction::updateChecked( int id )
     else {
       const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem();
       if ( d->m_checkedGuiItem->hasIcon() )
-          pm->changeItem( itemId_, gui->iconSet( KIcon::Small ), gui->text() );
+          pm->changeItem( itemId_, gui->iconSet( TDEIcon::Small ), gui->text() );
       else
           pm->changeItem( itemId_, gui->text() );
 
@@ -221,124 +221,124 @@ void KToggleAction::updateChecked( int id )
   }
   else if ( ::tqqt_cast<TQMenuBar *>( w ) ) // not handled in plug...
     static_cast<TQMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked );
-  else if ( ::tqqt_cast<KToolBar *>( w ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
   {
-    TQWidget* r = static_cast<KToolBar*>( w )->getButton( itemId( id ) );
-    if ( r && ::tqqt_cast<KToolBarButton *>( r ) ) {
-      static_cast<KToolBar*>( w )->setButton( itemId( id ), d->m_checked );
+    TQWidget* r = static_cast<TDEToolBar*>( w )->getButton( itemId( id ) );
+    if ( r && ::tqqt_cast<TDEToolBarButton *>( r ) ) {
+      static_cast<TDEToolBar*>( w )->setButton( itemId( id ), d->m_checked );
       if ( d->m_checkedGuiItem && d->m_checkedGuiItem->hasIcon() ) {
         const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem();
-        static_cast<KToolBar*>( w )->setButtonIconSet( itemId( id ), gui->iconSet( KIcon::Toolbar ) );
+        static_cast<TDEToolBar*>( w )->setButtonIconSet( itemId( id ), gui->iconSet( TDEIcon::Toolbar ) );
       }
     }
   }
 }
 
-void KToggleAction::slotActivated()
+void TDEToggleAction::slotActivated()
 {
   setChecked( !isChecked() );
-  KAction::slotActivated();
+  TDEAction::slotActivated();
   emit toggled( isChecked() );
 }
 
-bool KToggleAction::isChecked() const
+bool TDEToggleAction::isChecked() const
 {
   return d->m_checked;
 }
 
-void KToggleAction::setExclusiveGroup( const TQString& name )
+void TDEToggleAction::setExclusiveGroup( const TQString& name )
 {
   d->m_exclusiveGroup = name;
 }
 
-TQString KToggleAction::exclusiveGroup() const
+TQString TDEToggleAction::exclusiveGroup() const
 {
   return d->m_exclusiveGroup;
 }
 
-void KToggleAction::setCheckedState( const KGuiItem& checkedItem )
+void TDEToggleAction::setCheckedState( const KGuiItem& checkedItem )
 {
   delete d->m_checkedGuiItem;
   d->m_checkedGuiItem = new KGuiItem( checkedItem );
 }
 
-TQString KToggleAction::toolTip() const
+TQString TDEToggleAction::toolTip() const
 {
   if ( d->m_checkedGuiItem && d->m_checked )
       return d->m_checkedGuiItem->toolTip();
   else
-      return KAction::toolTip();
+      return TDEAction::toolTip();
 }
 
-KRadioAction::KRadioAction( const TQString& text, const KShortcut& cut,
+TDERadioAction::TDERadioAction( const TQString& text, const TDEShortcut& cut,
                             TQObject* parent, const char* name )
-: KToggleAction( text, cut, parent, name )
+: TDEToggleAction( text, cut, parent, name )
 {
 }
 
-KRadioAction::KRadioAction( const TQString& text, const KShortcut& cut,
+TDERadioAction::TDERadioAction( const TQString& text, const TDEShortcut& cut,
                             const TQObject* receiver, const char* slot,
                             TQObject* parent, const char* name )
-: KToggleAction( text, cut, receiver, slot, parent, name )
+: TDEToggleAction( text, cut, receiver, slot, parent, name )
 {
 }
 
-KRadioAction::KRadioAction( const TQString& text, const TQIconSet& pix,
-                            const KShortcut& cut,
+TDERadioAction::TDERadioAction( const TQString& text, const TQIconSet& pix,
+                            const TDEShortcut& cut,
                             TQObject* parent, const char* name )
-: KToggleAction( text, pix, cut, parent, name )
+: TDEToggleAction( text, pix, cut, parent, name )
 {
 }
 
-KRadioAction::KRadioAction( const TQString& text, const TQString& pix,
-                            const KShortcut& cut,
+TDERadioAction::TDERadioAction( const TQString& text, const TQString& pix,
+                            const TDEShortcut& cut,
                             TQObject* parent, const char* name )
-: KToggleAction( text, pix, cut, parent, name )
+: TDEToggleAction( text, pix, cut, parent, name )
 {
 }
 
-KRadioAction::KRadioAction( const TQString& text, const TQIconSet& pix,
-                            const KShortcut& cut,
+TDERadioAction::TDERadioAction( const TQString& text, const TQIconSet& pix,
+                            const TDEShortcut& cut,
                             const TQObject* receiver, const char* slot,
                             TQObject* parent, const char* name )
-: KToggleAction( text, pix, cut, receiver, slot, parent, name )
+: TDEToggleAction( text, pix, cut, receiver, slot, parent, name )
 {
 }
 
-KRadioAction::KRadioAction( const TQString& text, const TQString& pix,
-                            const KShortcut& cut,
+TDERadioAction::TDERadioAction( const TQString& text, const TQString& pix,
+                            const TDEShortcut& cut,
                             const TQObject* receiver, const char* slot,
                             TQObject* parent, const char* name )
-: KToggleAction( text, pix, cut, receiver, slot, parent, name )
+: TDEToggleAction( text, pix, cut, receiver, slot, parent, name )
 {
 }
 
-KRadioAction::KRadioAction( TQObject* parent, const char* name )
-: KToggleAction( parent, name )
+TDERadioAction::TDERadioAction( TQObject* parent, const char* name )
+: TDEToggleAction( parent, name )
 {
 }
 
-void KRadioAction::slotActivated()
+void TDERadioAction::slotActivated()
 {
   if ( isChecked() )
   {
     const TQObject *senderObj = TQT_TQOBJECT_CONST(sender());
 
-    if ( !senderObj || !::tqqt_cast<const KToolBarButton *>( senderObj ) )
+    if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) )
       return;
 
-    const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true );
+    const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true );
 
     return;
   }
 
-  KToggleAction::slotActivated();
+  TDEToggleAction::slotActivated();
 }
 
-class KSelectAction::KSelectActionPrivate
+class TDESelectAction::TDESelectActionPrivate
 {
 public:
-  KSelectActionPrivate()
+  TDESelectActionPrivate()
   {
     m_edit = false;
     m_menuAccelsEnabled = true;
@@ -373,71 +373,71 @@ public:
   }
 };
 
-KSelectAction::KSelectAction( const TQString& text, const KShortcut& cut,
+TDESelectAction::TDESelectAction( const TQString& text, const TDEShortcut& cut,
                               TQObject* parent, const char* name )
-  : KAction( text, cut, parent, name )
+  : TDEAction( text, cut, parent, name )
 {
-  d = new KSelectActionPrivate;
+  d = new TDESelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const TQString& text, const KShortcut& cut,
+TDESelectAction::TDESelectAction( const TQString& text, const TDEShortcut& cut,
                               const TQObject* receiver, const char* slot,
                               TQObject* parent, const char* name )
-  : KAction( text, cut, receiver, slot, parent, name )
+  : TDEAction( text, cut, receiver, slot, parent, name )
 {
-  d = new KSelectActionPrivate;
+  d = new TDESelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const TQString& text, const TQIconSet& pix,
-                              const KShortcut& cut,
+TDESelectAction::TDESelectAction( const TQString& text, const TQIconSet& pix,
+                              const TDEShortcut& cut,
                               TQObject* parent, const char* name )
-  : KAction( text, pix, cut, parent, name )
+  : TDEAction( text, pix, cut, parent, name )
 {
-  d = new KSelectActionPrivate;
+  d = new TDESelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const TQString& text, const TQString& pix,
-                              const KShortcut& cut,
+TDESelectAction::TDESelectAction( const TQString& text, const TQString& pix,
+                              const TDEShortcut& cut,
                               TQObject* parent, const char* name )
-  : KAction( text, pix, cut, parent, name )
+  : TDEAction( text, pix, cut, parent, name )
 {
-  d = new KSelectActionPrivate;
+  d = new TDESelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const TQString& text, const TQIconSet& pix,
-                              const KShortcut& cut,
+TDESelectAction::TDESelectAction( const TQString& text, const TQIconSet& pix,
+                              const TDEShortcut& cut,
                               const TQObject* receiver,
                               const char* slot, TQObject* parent,
                               const char* name )
-  : KAction( text, pix, cut, receiver, slot, parent, name )
+  : TDEAction( text, pix, cut, receiver, slot, parent, name )
 {
-  d = new KSelectActionPrivate;
+  d = new TDESelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const TQString& text, const TQString& pix,
-                              const KShortcut& cut,
+TDESelectAction::TDESelectAction( const TQString& text, const TQString& pix,
+                              const TDEShortcut& cut,
                               const TQObject* receiver,
                               const char* slot, TQObject* parent,
                               const char* name )
-  : KAction( text, pix, cut, receiver, slot, parent, name )
+  : TDEAction( text, pix, cut, receiver, slot, parent, name )
 {
-  d = new KSelectActionPrivate;
+  d = new TDESelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( TQObject* parent, const char* name )
-  : KAction( parent, name )
+TDESelectAction::TDESelectAction( TQObject* parent, const char* name )
+  : TDEAction( parent, name )
 {
-  d = new KSelectActionPrivate;
+  d = new TDESelectActionPrivate;
 }
 
-KSelectAction::~KSelectAction()
+TDESelectAction::~TDESelectAction()
 {
   assert(d);
   delete d->m_menu;
   delete d; d = 0;
 }
 
-void KSelectAction::setCurrentItem( int id )
+void TDESelectAction::setCurrentItem( int id )
 {
     if ( id >= (int)d->m_list.count() ) {
         Q_ASSERT(id < (int)d->m_list.count());
@@ -459,12 +459,12 @@ void KSelectAction::setCurrentItem( int id )
     for( int i = 0; i < len; ++i )
         updateCurrentItem( i );
 
-    //    emit KAction::activated();
+    //    emit TDEAction::activated();
     //    emit activated( currentItem() );
     //    emit activated( currentText() );
 }
 
-void KSelectAction::setComboWidth( int width )
+void TDESelectAction::setComboWidth( int width )
 {
   if ( width < 0 )
     return;
@@ -478,17 +478,17 @@ void KSelectAction::setComboWidth( int width )
 
 }
 
-void KSelectAction::setMaxComboViewCount( int n )
+void TDESelectAction::setMaxComboViewCount( int n )
 {
   d->m_maxComboViewCount = n;
 }
 
-TQPopupMenu* KSelectAction::popupMenu() const
+TQPopupMenu* TDESelectAction::popupMenu() const
 {
-	kdDebug(129) << "KAction::popupMenu()" << endl; // remove -- ellis
+	kdDebug(129) << "TDEAction::popupMenu()" << endl; // remove -- ellis
   if ( !d->m_menu )
   {
-    d->m_menu = new KPopupMenu(0L, "KSelectAction::popupMenu()");
+    d->m_menu = new TDEPopupMenu(0L, "TDESelectAction::popupMenu()");
     setupMenu();
     if ( d->m_current >= 0 )
       d->m_menu->setItemChecked( d->m_current, true );
@@ -497,7 +497,7 @@ TQPopupMenu* KSelectAction::popupMenu() const
   return d->m_menu;
 }
 
-void KSelectAction::setupMenu() const
+void TDESelectAction::setupMenu() const
 {
     if ( !d->m_menu )
         return;
@@ -513,11 +513,11 @@ void KSelectAction::setupMenu() const
     }
 }
 
-void KSelectAction::changeItem( int index, const TQString& text )
+void TDESelectAction::changeItem( int index, const TQString& text )
 {
   if ( index < 0 || index >= (int)d->m_list.count() )
   {
-    kdWarning() << "KSelectAction::changeItem Index out of scope" << endl;
+    kdWarning() << "TDESelectAction::changeItem Index out of scope" << endl;
     return;
   }
 
@@ -531,15 +531,15 @@ void KSelectAction::changeItem( int index, const TQString& text )
     changeItem( i, index, text );
 }
 
-void KSelectAction::changeItem( int id, int index, const TQString& text)
+void TDESelectAction::changeItem( int id, int index, const TQString& text)
 {
   if ( index < 0 )
         return;
 
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<KToolBar *>( w ) )
+  if ( ::tqqt_cast<TDEToolBar *>( w ) )
   {
-     TQWidget* r = (static_cast<KToolBar*>( w ))->getWidget( itemId( id ) );
+     TQWidget* r = (static_cast<TDEToolBar*>( w ))->getWidget( itemId( id ) );
      if ( ::tqqt_cast<TQComboBox *>( r ) )
      {
         TQComboBox *b = static_cast<TQComboBox*>( r );
@@ -548,7 +548,7 @@ void KSelectAction::changeItem( int id, int index, const TQString& text)
   }
 }
 
-void KSelectAction::setItems( const TQStringList &lst )
+void TDESelectAction::setItems( const TQStringList &lst )
 {
   d->m_list = lst;
   d->m_current = -1;
@@ -563,12 +563,12 @@ void KSelectAction::setItems( const TQStringList &lst )
   setEnabled ( lst.count() > 0 || d->m_edit );
 }
 
-TQStringList KSelectAction::items() const
+TQStringList TDESelectAction::items() const
 {
   return d->m_list;
 }
 
-TQString KSelectAction::currentText() const
+TQString TDESelectAction::currentText() const
 {
   if ( currentItem() < 0 )
     return TQString::null;
@@ -576,19 +576,19 @@ TQString KSelectAction::currentText() const
   return d->m_list[ currentItem() ];
 }
 
-int KSelectAction::currentItem() const
+int TDESelectAction::currentItem() const
 {
   return d->m_current;
 }
 
-void KSelectAction::updateCurrentItem( int id )
+void TDESelectAction::updateCurrentItem( int id )
 {
   if ( d->m_current < 0 )
         return;
 
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<KToolBar *>( w ) ) {
-    TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) );
+  if ( ::tqqt_cast<TDEToolBar *>( w ) ) {
+    TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
     if ( ::tqqt_cast<TQComboBox *>( r ) ) {
       TQComboBox *b = static_cast<TQComboBox*>( r );
       b->setCurrentItem( d->m_current );
@@ -596,16 +596,16 @@ void KSelectAction::updateCurrentItem( int id )
   }
 }
 
-int KSelectAction::comboWidth() const
+int TDESelectAction::comboWidth() const
 {
   return d->m_comboWidth;
 }
 
-void KSelectAction::updateComboWidth( int id )
+void TDESelectAction::updateComboWidth( int id )
 {
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<KToolBar *>( w ) ) {
-    TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) );
+  if ( ::tqqt_cast<TDEToolBar *>( w ) ) {
+    TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
     if ( ::tqqt_cast<TQComboBox *>( r ) ) {
       TQComboBox *cb = static_cast<TQComboBox*>( r );
       cb->setMinimumWidth( d->m_comboWidth );
@@ -614,12 +614,12 @@ void KSelectAction::updateComboWidth( int id )
   }
 }
 
-void KSelectAction::updateItems( int id )
+void TDESelectAction::updateItems( int id )
 {
-  kdDebug(129) << "KAction::updateItems( " << id << ", lst )" << endl; // remove -- ellis
+  kdDebug(129) << "TDEAction::updateItems( " << id << ", lst )" << endl; // remove -- ellis
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<KToolBar *>( w ) ) {
-    TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) );
+  if ( ::tqqt_cast<TDEToolBar *>( w ) ) {
+    TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
     if ( ::tqqt_cast<TQComboBox *>( r ) ) {
       TQComboBox *cb = static_cast<TQComboBox*>( r );
       cb->clear();
@@ -636,11 +636,11 @@ void KSelectAction::updateItems( int id )
    }
 }
 
-int KSelectAction::plug( TQWidget *widget, int index )
+int TDESelectAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  kdDebug(129) << "KSelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
+  kdDebug(129) << "TDESelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( ::tqqt_cast<TQPopupMenu *>( widget) )
   {
     // Create the PopupMenu and store it in m_menu
@@ -665,10 +665,10 @@ int KSelectAction::plug( TQWidget *widget, int index )
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<KToolBar *>( widget ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( widget ) )
   {
-    KToolBar* bar = static_cast<KToolBar*>( widget );
-    int id_ = KAction::getToolButtonID();
+    TDEToolBar* bar = static_cast<TDEToolBar*>( widget );
+    int id_ = TDEAction::getToolButtonID();
     bar->insertCombo( comboItems(), id_, isEditable(),
                       TQT_SIGNAL( activated( const TQString & ) ), this,
                       TQT_SLOT( slotActivated( const TQString & ) ), isEnabled(),
@@ -718,11 +718,11 @@ int KSelectAction::plug( TQWidget *widget, int index )
     return containerCount() - 1;
   }
 
-  kdWarning() << "Can not plug KAction in " << widget->className() << endl;
+  kdWarning() << "Can not plug TDEAction in " << widget->className() << endl;
   return -1;
 }
 
-TQStringList KSelectAction::comboItems() const
+TQStringList TDESelectAction::comboItems() const
 {
   if( d->m_menuAccelsEnabled ) {
     TQStringList lst;
@@ -741,7 +741,7 @@ TQStringList KSelectAction::comboItems() const
     return d->m_list;
 }
 
-void KSelectAction::clear()
+void TDESelectAction::clear()
 {
   if ( d->m_menu )
     d->m_menu->clear();
@@ -751,11 +751,11 @@ void KSelectAction::clear()
     updateClear( i );
 }
 
-void KSelectAction::updateClear( int id )
+void TDESelectAction::updateClear( int id )
 {
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<KToolBar *>( w ) ) {
-    TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) );
+  if ( ::tqqt_cast<TDEToolBar *>( w ) ) {
+    TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
     if ( ::tqqt_cast<TQComboBox *>( r ) ) {
       TQComboBox *b = static_cast<TQComboBox*>( r );
       b->clear();
@@ -763,7 +763,7 @@ void KSelectAction::updateClear( int id )
   }
 }
 
-void KSelectAction::slotActivated( int id )
+void TDESelectAction::slotActivated( int id )
 {
   if ( d->m_current == id )
     return;
@@ -774,7 +774,7 @@ void KSelectAction::slotActivated( int id )
   TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) );
 }
 
-void KSelectAction::slotActivated( const TQString &text )
+void TDESelectAction::slotActivated( const TQString &text )
 {
   if ( isEditable() )
   {
@@ -796,175 +796,175 @@ void KSelectAction::slotActivated( const TQString &text )
   TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) );
 }
 
-void KSelectAction::slotActivated()
+void TDESelectAction::slotActivated()
 {
-  KAction::slotActivated();
-  kdDebug(129) << "KSelectAction::slotActivated currentItem=" << currentItem() << " currentText=" << currentText() << endl;
+  TDEAction::slotActivated();
+  kdDebug(129) << "TDESelectAction::slotActivated currentItem=" << currentItem() << " currentText=" << currentText() << endl;
   emit activated( currentItem() );
   emit activated( currentText() );
 }
 
-void KSelectAction::setEditable( bool edit )
+void TDESelectAction::setEditable( bool edit )
 {
   d->m_edit = edit;
 }
 
-bool KSelectAction::isEditable() const
+bool TDESelectAction::isEditable() const
 {
   return d->m_edit;
 }
 
-void KSelectAction::setRemoveAmpersandsInCombo( bool b )
+void TDESelectAction::setRemoveAmpersandsInCombo( bool b )
 {
   setMenuAccelsEnabled( b );
 }
 
-bool KSelectAction::removeAmpersandsInCombo() const
+bool TDESelectAction::removeAmpersandsInCombo() const
 {
   return menuAccelsEnabled( );
 }
 
-void KSelectAction::setMenuAccelsEnabled( bool b )
+void TDESelectAction::setMenuAccelsEnabled( bool b )
 {
   d->m_menuAccelsEnabled = b;
 }
 
-bool KSelectAction::menuAccelsEnabled() const
+bool TDESelectAction::menuAccelsEnabled() const
 {
   return d->m_menuAccelsEnabled;
 }
 
-class KListAction::KListActionPrivate
+class TDEListAction::TDEListActionPrivate
 {
 public:
-  KListActionPrivate()
+  TDEListActionPrivate()
   {
     m_current = 0;
   }
   int m_current;
 };
 
-KListAction::KListAction( const TQString& text, const KShortcut& cut,
+TDEListAction::TDEListAction( const TQString& text, const TDEShortcut& cut,
                           TQObject* parent, const char* name )
-  : KSelectAction( text, cut, parent, name )
+  : TDESelectAction( text, cut, parent, name )
 {
-  d = new KListActionPrivate;
+  d = new TDEListActionPrivate;
 }
 
-KListAction::KListAction( const TQString& text, const KShortcut& cut,
+TDEListAction::TDEListAction( const TQString& text, const TDEShortcut& cut,
                           const TQObject* receiver, const char* slot,
                           TQObject* parent, const char* name )
-  : KSelectAction( text, cut, parent, name )
+  : TDESelectAction( text, cut, parent, name )
 {
-  d = new KListActionPrivate;
+  d = new TDEListActionPrivate;
   if ( receiver )
     connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
 }
 
-KListAction::KListAction( const TQString& text, const TQIconSet& pix,
-                          const KShortcut& cut,
+TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix,
+                          const TDEShortcut& cut,
                           TQObject* parent, const char* name )
-  : KSelectAction( text, pix, cut, parent, name )
+  : TDESelectAction( text, pix, cut, parent, name )
 {
-  d = new KListActionPrivate;
+  d = new TDEListActionPrivate;
 }
 
-KListAction::KListAction( const TQString& text, const TQString& pix,
-                          const KShortcut& cut,
+TDEListAction::TDEListAction( const TQString& text, const TQString& pix,
+                          const TDEShortcut& cut,
                           TQObject* parent, const char* name )
-  : KSelectAction( text, pix, cut, parent, name )
+  : TDESelectAction( text, pix, cut, parent, name )
 {
-  d = new KListActionPrivate;
+  d = new TDEListActionPrivate;
 }
 
-KListAction::KListAction( const TQString& text, const TQIconSet& pix,
-                          const KShortcut& cut, const TQObject* receiver,
+TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix,
+                          const TDEShortcut& cut, const TQObject* receiver,
                           const char* slot, TQObject* parent,
                           const char* name )
-  : KSelectAction( text, pix, cut, parent, name )
+  : TDESelectAction( text, pix, cut, parent, name )
 {
-  d = new KListActionPrivate;
+  d = new TDEListActionPrivate;
   if ( receiver )
     connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
 }
 
-KListAction::KListAction( const TQString& text, const TQString& pix,
-                          const KShortcut& cut, const TQObject* receiver,
+TDEListAction::TDEListAction( const TQString& text, const TQString& pix,
+                          const TDEShortcut& cut, const TQObject* receiver,
                           const char* slot, TQObject* parent,
                           const char* name )
-  : KSelectAction( text, pix, cut, parent, name )
+  : TDESelectAction( text, pix, cut, parent, name )
 {
-  d = new KListActionPrivate;
+  d = new TDEListActionPrivate;
   if ( receiver )
     connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
 }
 
-KListAction::KListAction( TQObject* parent, const char* name )
-  : KSelectAction( parent, name )
+TDEListAction::TDEListAction( TQObject* parent, const char* name )
+  : TDESelectAction( parent, name )
 {
-  d = new KListActionPrivate;
+  d = new TDEListActionPrivate;
 }
 
-KListAction::~KListAction()
+TDEListAction::~TDEListAction()
 {
   delete d; d = 0;
 }
 
-void KListAction::setCurrentItem( int index )
+void TDEListAction::setCurrentItem( int index )
 {
-  KSelectAction::setCurrentItem( index );
+  TDESelectAction::setCurrentItem( index );
   d->m_current = index;
 
-  //  emit KAction::activated();
+  //  emit TDEAction::activated();
   //  emit activated( currentItem() );
   // emit activated( currentText() );
 }
 
-TQString KListAction::currentText() const
+TQString TDEListAction::currentText() const
 {
-  return KSelectAction::currentText();
+  return TDESelectAction::currentText();
 }
 
-int KListAction::currentItem() const
+int TDEListAction::currentItem() const
 {
   return d->m_current;
 }
 
-class KRecentFilesAction::KRecentFilesActionPrivate
+class TDERecentFilesAction::TDERecentFilesActionPrivate
 {
 public:
-  KRecentFilesActionPrivate()
+  TDERecentFilesActionPrivate()
   {
     m_maxItems = 0;
     m_popup = 0;
   }
   uint m_maxItems;
-  KPopupMenu *m_popup;
+  TDEPopupMenu *m_popup;
   TQMap<TQString, TQString> m_shortNames;
   TQMap<TQString, KURL> m_urls;
 };
 
-KRecentFilesAction::KRecentFilesAction( const TQString& text,
-                                        const KShortcut& cut,
+TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
+                                        const TDEShortcut& cut,
                                         TQObject* parent, const char* name,
                                         uint maxItems )
-  : KListAction( text, cut, parent, name)
+  : TDEListAction( text, cut, parent, name)
 {
-  d = new KRecentFilesActionPrivate;
+  d = new TDERecentFilesActionPrivate;
   d->m_maxItems = maxItems;
 
   init();
 }
 
-KRecentFilesAction::KRecentFilesAction( const TQString& text,
-                                        const KShortcut& cut,
+TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
+                                        const TDEShortcut& cut,
                                         const TQObject* receiver,
                                         const char* slot,
                                         TQObject* parent, const char* name,
                                         uint maxItems )
-  : KListAction( text, cut, parent, name)
+  : TDEListAction( text, cut, parent, name)
 {
-  d = new KRecentFilesActionPrivate;
+  d = new TDERecentFilesActionPrivate;
   d->m_maxItems = maxItems;
 
   init();
@@ -974,42 +974,42 @@ KRecentFilesAction::KRecentFilesAction( const TQString& text,
              receiver, slot );
 }
 
-KRecentFilesAction::KRecentFilesAction( const TQString& text,
+TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
                                         const TQIconSet& pix,
-                                        const KShortcut& cut,
+                                        const TDEShortcut& cut,
                                         TQObject* parent, const char* name,
                                         uint maxItems )
-  : KListAction( text, pix, cut, parent, name)
+  : TDEListAction( text, pix, cut, parent, name)
 {
-  d = new KRecentFilesActionPrivate;
+  d = new TDERecentFilesActionPrivate;
   d->m_maxItems = maxItems;
 
   init();
 }
 
-KRecentFilesAction::KRecentFilesAction( const TQString& text,
+TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
                                         const TQString& pix,
-                                        const KShortcut& cut,
+                                        const TDEShortcut& cut,
                                         TQObject* parent, const char* name,
                                         uint maxItems )
-  : KListAction( text, pix, cut, parent, name)
+  : TDEListAction( text, pix, cut, parent, name)
 {
-  d = new KRecentFilesActionPrivate;
+  d = new TDERecentFilesActionPrivate;
   d->m_maxItems = maxItems;
 
   init();
 }
 
-KRecentFilesAction::KRecentFilesAction( const TQString& text,
+TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
                                         const TQIconSet& pix,
-                                        const KShortcut& cut,
+                                        const TDEShortcut& cut,
                                         const TQObject* receiver,
                                         const char* slot,
                                         TQObject* parent, const char* name,
                                         uint maxItems )
-  : KListAction( text, pix, cut, parent, name)
+  : TDEListAction( text, pix, cut, parent, name)
 {
-  d = new KRecentFilesActionPrivate;
+  d = new TDERecentFilesActionPrivate;
   d->m_maxItems = maxItems;
 
   init();
@@ -1019,16 +1019,16 @@ KRecentFilesAction::KRecentFilesAction( const TQString& text,
              receiver, slot );
 }
 
-KRecentFilesAction::KRecentFilesAction( const TQString& text,
+TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
                                         const TQString& pix,
-                                        const KShortcut& cut,
+                                        const TDEShortcut& cut,
                                         const TQObject* receiver,
                                         const char* slot,
                                         TQObject* parent, const char* name,
                                         uint maxItems )
-  : KListAction( text, pix, cut, parent, name)
+  : TDEListAction( text, pix, cut, parent, name)
 {
-  d = new KRecentFilesActionPrivate;
+  d = new TDERecentFilesActionPrivate;
   d->m_maxItems = maxItems;
 
   init();
@@ -1038,20 +1038,20 @@ KRecentFilesAction::KRecentFilesAction( const TQString& text,
              receiver, slot );
 }
 
-KRecentFilesAction::KRecentFilesAction( TQObject* parent, const char* name,
+TDERecentFilesAction::TDERecentFilesAction( TQObject* parent, const char* name,
                                         uint maxItems )
-  : KListAction( parent, name )
+  : TDEListAction( parent, name )
 {
-  d = new KRecentFilesActionPrivate;
+  d = new TDERecentFilesActionPrivate;
   d->m_maxItems = maxItems;
 
   init();
 }
 
-void KRecentFilesAction::init()
+void TDERecentFilesAction::init()
 {
-  KRecentFilesAction *that = const_cast<KRecentFilesAction*>(this);
-  that->d->m_popup = new KPopupMenu;
+  TDERecentFilesAction *that = const_cast<TDERecentFilesAction*>(this);
+  that->d->m_popup = new TDEPopupMenu;
   connect(d->m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow()));
   connect(d->m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
   connect( this, TQT_SIGNAL( activated( const TQString& ) ),
@@ -1060,20 +1060,20 @@ void KRecentFilesAction::init()
   setMenuAccelsEnabled( false );
 }
 
-KRecentFilesAction::~KRecentFilesAction()
+TDERecentFilesAction::~TDERecentFilesAction()
 {
   delete d->m_popup;
   delete d; d = 0;
 }
 
-uint KRecentFilesAction::maxItems() const
+uint TDERecentFilesAction::maxItems() const
 {
     return d->m_maxItems;
 }
 
-void KRecentFilesAction::setMaxItems( uint maxItems )
+void TDERecentFilesAction::setMaxItems( uint maxItems )
 {
-    TQStringList lst = KSelectAction::items();
+    TQStringList lst = TDESelectAction::items();
     uint oldCount   = lst.count();
 
     // set new maxItems
@@ -1094,17 +1094,17 @@ void KRecentFilesAction::setMaxItems( uint maxItems )
         setItems( lst );
 }
 
-void KRecentFilesAction::addURL( const KURL& url )
+void TDERecentFilesAction::addURL( const KURL& url )
 {
     addURL( url, url.fileName() );
 }
 
-void KRecentFilesAction::addURL( const KURL& url, const TQString& name )
+void TDERecentFilesAction::addURL( const KURL& url, const TQString& name )
 {
-    if ( url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
+    if ( url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", url.path()).startsWith("/"))
        return;
     const TQString file = url.pathOrURL();
-    TQStringList lst = KSelectAction::items();
+    TQStringList lst = TDESelectAction::items();
 
     // remove file if already in list
     const TQStringList::Iterator end = lst.end();
@@ -1137,9 +1137,9 @@ void KRecentFilesAction::addURL( const KURL& url, const TQString& name )
     setItems( lst );
 }
 
-void KRecentFilesAction::removeURL( const KURL& url )
+void TDERecentFilesAction::removeURL( const KURL& url )
 {
-    TQStringList lst = KSelectAction::items();
+    TQStringList lst = TDESelectAction::items();
     TQString     file = url.pathOrURL();
 
     // remove url
@@ -1157,14 +1157,14 @@ void KRecentFilesAction::removeURL( const KURL& url )
     }
 }
 
-void KRecentFilesAction::clearURLList()
+void TDERecentFilesAction::clearURLList()
 {
     clear();
     d->m_shortNames.clear();
     d->m_urls.clear();
 }
 
-void KRecentFilesAction::loadEntries( KConfig* config, TQString groupname)
+void TDERecentFilesAction::loadEntries( TDEConfig* config, TQString groupname)
 {
     TQString     key;
     TQString     value;
@@ -1209,12 +1209,12 @@ void KRecentFilesAction::loadEntries( KConfig* config, TQString groupname)
     config->setGroup( oldGroup );
 }
 
-void KRecentFilesAction::saveEntries( KConfig* config, TQString groupname )
+void TDERecentFilesAction::saveEntries( TDEConfig* config, TQString groupname )
 {
     TQString     key;
     TQString     value;
     TQString     oldGroup;
-    TQStringList lst = KSelectAction::items();
+    TQStringList lst = TDESelectAction::items();
 
     oldGroup = config->group();
 
@@ -1238,7 +1238,7 @@ void KRecentFilesAction::saveEntries( KConfig* config, TQString groupname )
     config->setGroup( oldGroup );
 }
 
-void KRecentFilesAction::itemSelected( const TQString& text )
+void TDERecentFilesAction::itemSelected( const TQString& text )
 {
     //return a copy of the URL since the slot where it is connected might call
     //addURL or removeURL where the d->m_urls.erase( title ) could destroy the
@@ -1246,7 +1246,7 @@ void KRecentFilesAction::itemSelected( const TQString& text )
     emit urlSelected( KURL(d->m_urls[ text ]) );
 }
 
-void KRecentFilesAction::menuItemActivated( int id )
+void TDERecentFilesAction::menuItemActivated( int id )
 {
     TQString text = d->m_popup->text(id);
     //return a copy of the URL since the slot where it is connected might call
@@ -1255,34 +1255,34 @@ void KRecentFilesAction::menuItemActivated( int id )
     emit urlSelected( KURL(d->m_urls[ text ]) );
 }
 
-void KRecentFilesAction::menuAboutToShow()
+void TDERecentFilesAction::menuAboutToShow()
 {
-    KPopupMenu *menu = d->m_popup;
+    TDEPopupMenu *menu = d->m_popup;
     menu->clear();
-    TQStringList list = KSelectAction::items();
+    TQStringList list = TDESelectAction::items();
     for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
     {
        menu->insertItem(*it);
     }
 }
 
-int KRecentFilesAction::plug( TQWidget *widget, int index )
+int TDERecentFilesAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  // This is very related to KActionMenu::plug.
-  // In fact this class could be an interesting base class for KActionMenu
-  if ( ::tqqt_cast<KToolBar *>( widget ) )
+  // This is very related to TDEActionMenu::plug.
+  // In fact this class could be an interesting base class for TDEActionMenu
+  if ( ::tqqt_cast<TDEToolBar *>( widget ) )
   {
-    KToolBar *bar = (KToolBar *)widget;
+    TDEToolBar *bar = (TDEToolBar *)widget;
 
-    int id_ = KAction::getToolButtonID();
+    int id_ = TDEAction::getToolButtonID();
 
-    KInstance * instance;
+    TDEInstance * instance;
     if ( m_parentCollection )
         instance = m_parentCollection->instance();
     else
-        instance = KGlobal::instance();
+        instance = TDEGlobal::instance();
 
     bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
                        TQT_SLOT( slotClicked() ), isEnabled(), plainText(),
@@ -1300,36 +1300,36 @@ int KRecentFilesAction::plug( TQWidget *widget, int index )
     return containerCount() - 1;
   }
 
-  return KListAction::plug( widget, index );
+  return TDEListAction::plug( widget, index );
 }
 
-void KRecentFilesAction::slotClicked()
+void TDERecentFilesAction::slotClicked()
 {
-  KAction::slotActivated();
+  TDEAction::slotActivated();
 }
 
-void KRecentFilesAction::slotActivated(const TQString& text)
+void TDERecentFilesAction::slotActivated(const TQString& text)
 {
-  KListAction::slotActivated(text);
+  TDEListAction::slotActivated(text);
 }
 
 
-void KRecentFilesAction::slotActivated(int id)
+void TDERecentFilesAction::slotActivated(int id)
 {
-  KListAction::slotActivated(id);
+  TDEListAction::slotActivated(id);
 }
 
 
-void KRecentFilesAction::slotActivated()
+void TDERecentFilesAction::slotActivated()
 {
   emit activated( currentItem() );
   emit activated( currentText() );
 }
 
 //KDE4: rename to urls() and return a KURL::List
-TQStringList KRecentFilesAction::items() const
+TQStringList TDERecentFilesAction::items() const
 {
-    TQStringList lst = KSelectAction::items();
+    TQStringList lst = TDESelectAction::items();
     TQStringList result;
 
     for( unsigned int i = 1 ; i <= lst.count() ; i++ )
@@ -1341,130 +1341,130 @@ TQStringList KRecentFilesAction::items() const
 }
 
 //KDE4: remove
-TQStringList KRecentFilesAction::completeItems() const
+TQStringList TDERecentFilesAction::completeItems() const
 {
-    return KSelectAction::items();
+    return TDESelectAction::items();
 }
 
 
-class KFontAction::KFontActionPrivate
+class TDEFontAction::TDEFontActionPrivate
 {
 public:
-  KFontActionPrivate()
+  TDEFontActionPrivate()
   {
   }
   TQStringList m_fonts;
 };
 
-KFontAction::KFontAction( const TQString& text,
-                          const KShortcut& cut, TQObject* parent,
+TDEFontAction::TDEFontAction( const TQString& text,
+                          const TDEShortcut& cut, TQObject* parent,
                           const char* name )
-  : KSelectAction( text, cut, parent, name )
+  : TDESelectAction( text, cut, parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, 0 );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, 0 );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( const TQString& text, const KShortcut& cut,
+TDEFontAction::TDEFontAction( const TQString& text, const TDEShortcut& cut,
                           const TQObject* receiver, const char* slot,
                           TQObject* parent, const char* name )
-    : KSelectAction( text, cut, receiver, slot, parent, name )
+    : TDESelectAction( text, cut, receiver, slot, parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, 0 );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, 0 );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( const TQString& text, const TQIconSet& pix,
-                          const KShortcut& cut,
+TDEFontAction::TDEFontAction( const TQString& text, const TQIconSet& pix,
+                          const TDEShortcut& cut,
                           TQObject* parent, const char* name )
-    : KSelectAction( text, pix, cut, parent, name )
+    : TDESelectAction( text, pix, cut, parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, 0 );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, 0 );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( const TQString& text, const TQString& pix,
-                          const KShortcut& cut,
+TDEFontAction::TDEFontAction( const TQString& text, const TQString& pix,
+                          const TDEShortcut& cut,
                           TQObject* parent, const char* name )
-    : KSelectAction( text, pix, cut, parent, name )
+    : TDESelectAction( text, pix, cut, parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, 0 );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, 0 );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( const TQString& text, const TQIconSet& pix,
-                          const KShortcut& cut,
+TDEFontAction::TDEFontAction( const TQString& text, const TQIconSet& pix,
+                          const TDEShortcut& cut,
                           const TQObject* receiver, const char* slot,
                           TQObject* parent, const char* name )
-    : KSelectAction( text, pix, cut, receiver, slot, parent, name )
+    : TDESelectAction( text, pix, cut, receiver, slot, parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, 0 );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, 0 );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( const TQString& text, const TQString& pix,
-                          const KShortcut& cut,
+TDEFontAction::TDEFontAction( const TQString& text, const TQString& pix,
+                          const TDEShortcut& cut,
                           const TQObject* receiver, const char* slot,
                           TQObject* parent, const char* name )
-    : KSelectAction( text, pix, cut, receiver, slot, parent, name )
+    : TDESelectAction( text, pix, cut, receiver, slot, parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, 0 );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, 0 );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( uint fontListCriteria, const TQString& text,
-                          const KShortcut& cut, TQObject* parent,
+TDEFontAction::TDEFontAction( uint fontListCriteria, const TQString& text,
+                          const TDEShortcut& cut, TQObject* parent,
                           const char* name )
-    : KSelectAction( text, cut, parent, name )
+    : TDESelectAction( text, cut, parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, fontListCriteria );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, fontListCriteria );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( uint fontListCriteria, const TQString& text, const TQString& pix,
-                          const KShortcut& cut,
+TDEFontAction::TDEFontAction( uint fontListCriteria, const TQString& text, const TQString& pix,
+                          const TDEShortcut& cut,
                           TQObject* parent, const char* name )
-    : KSelectAction( text, pix, cut, parent, name )
+    : TDESelectAction( text, pix, cut, parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, fontListCriteria );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, fontListCriteria );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( TQObject* parent, const char* name )
-  : KSelectAction( parent, name )
+TDEFontAction::TDEFontAction( TQObject* parent, const char* name )
+  : TDESelectAction( parent, name )
 {
-    d = new KFontActionPrivate;
-    KFontChooser::getFontList( d->m_fonts, 0 );
-    KSelectAction::setItems( d->m_fonts );
+    d = new TDEFontActionPrivate;
+    TDEFontChooser::getFontList( d->m_fonts, 0 );
+    TDESelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::~KFontAction()
+TDEFontAction::~TDEFontAction()
 {
     delete d;
     d = 0;
 }
 
 /*
- * Maintenance note: Keep in sync with KFontCombo::setCurrentFont()
+ * Maintenance note: Keep in sync with TDEFontCombo::setCurrentFont()
  */
-void KFontAction::setFont( const TQString &family )
+void TDEFontAction::setFont( const TQString &family )
 {
     TQString lowerName = family.lower();
     int i = 0;
@@ -1521,15 +1521,15 @@ void KFontAction::setFont( const TQString &family )
        kdDebug(129) << "Font not found " << family.lower() << endl;
 }
 
-int KFontAction::plug( TQWidget *w, int index )
+int TDEFontAction::plug( TQWidget *w, int index )
 {
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  if ( ::tqqt_cast<KToolBar *>( w ) )
+  if ( ::tqqt_cast<TDEToolBar *>( w ) )
   {
-    KToolBar* bar = static_cast<KToolBar*>( w );
-    int id_ = KAction::getToolButtonID();
-    KFontCombo *cb = new KFontCombo( items(), bar );
+    TDEToolBar* bar = static_cast<TDEToolBar*>( w );
+    int id_ = TDEAction::getToolButtonID();
+    TDEFontCombo *cb = new TDEFontCombo( items(), bar );
     connect( cb, TQT_SIGNAL( activated( const TQString & ) ),
              TQT_SLOT( slotActivated( const TQString & ) ) );
     cb->setEnabled( isEnabled() );
@@ -1544,85 +1544,85 @@ int KFontAction::plug( TQWidget *w, int index )
 
     return containerCount() - 1;
   }
-  else return KSelectAction::plug( w, index );
+  else return TDESelectAction::plug( w, index );
 }
 
-class KFontSizeAction::KFontSizeActionPrivate
+class TDEFontSizeAction::TDEFontSizeActionPrivate
 {
 public:
-  KFontSizeActionPrivate()
+  TDEFontSizeActionPrivate()
   {
   }
 };
 
-KFontSizeAction::KFontSizeAction( const TQString& text,
-                                  const KShortcut& cut,
+TDEFontSizeAction::TDEFontSizeAction( const TQString& text,
+                                  const TDEShortcut& cut,
                                   TQObject* parent, const char* name )
-  : KSelectAction( text, cut, parent, name )
+  : TDESelectAction( text, cut, parent, name )
 {
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const TQString& text,
-                                  const KShortcut& cut,
+TDEFontSizeAction::TDEFontSizeAction( const TQString& text,
+                                  const TDEShortcut& cut,
                                   const TQObject* receiver, const char* slot,
                                   TQObject* parent, const char* name )
-  : KSelectAction( text, cut, receiver, slot, parent, name )
+  : TDESelectAction( text, cut, receiver, slot, parent, name )
 {
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const TQString& text, const TQIconSet& pix,
-                                  const KShortcut& cut,
+TDEFontSizeAction::TDEFontSizeAction( const TQString& text, const TQIconSet& pix,
+                                  const TDEShortcut& cut,
                                   TQObject* parent, const char* name )
-  : KSelectAction( text, pix, cut, parent, name )
+  : TDESelectAction( text, pix, cut, parent, name )
 {
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const TQString& text, const TQString& pix,
-                                  const KShortcut& cut,
+TDEFontSizeAction::TDEFontSizeAction( const TQString& text, const TQString& pix,
+                                  const TDEShortcut& cut,
                                   TQObject* parent, const char* name )
-  : KSelectAction( text, pix, cut, parent, name )
+  : TDESelectAction( text, pix, cut, parent, name )
 {
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const TQString& text, const TQIconSet& pix,
-                                  const KShortcut& cut,
+TDEFontSizeAction::TDEFontSizeAction( const TQString& text, const TQIconSet& pix,
+                                  const TDEShortcut& cut,
                                   const TQObject* receiver,
                                   const char* slot, TQObject* parent,
                                   const char* name )
-    : KSelectAction( text, pix, cut, receiver, slot, parent, name )
+    : TDESelectAction( text, pix, cut, receiver, slot, parent, name )
 {
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const TQString& text, const TQString& pix,
-                                  const KShortcut& cut,
+TDEFontSizeAction::TDEFontSizeAction( const TQString& text, const TQString& pix,
+                                  const TDEShortcut& cut,
                                   const TQObject* receiver,
                                   const char* slot, TQObject* parent,
                                   const char* name )
-  : KSelectAction( text, pix, cut, receiver, slot, parent, name )
+  : TDESelectAction( text, pix, cut, receiver, slot, parent, name )
 {
   init();
 }
 
-KFontSizeAction::KFontSizeAction( TQObject* parent, const char* name )
-  : KSelectAction( parent, name )
+TDEFontSizeAction::TDEFontSizeAction( TQObject* parent, const char* name )
+  : TDESelectAction( parent, name )
 {
   init();
 }
 
-KFontSizeAction::~KFontSizeAction()
+TDEFontSizeAction::~TDEFontSizeAction()
 {
     delete d;
     d = 0;
 }
 
-void KFontSizeAction::init()
+void TDEFontSizeAction::init()
 {
-    d = new KFontSizeActionPrivate;
+    d = new TDEFontSizeActionPrivate;
 
     setEditable( true );
     TQFontDatabase fontDB;
@@ -1634,7 +1634,7 @@ void KFontSizeAction::init()
     setItems( lst );
 }
 
-void KFontSizeAction::setFontSize( int size )
+void TDEFontSizeAction::setFontSize( int size )
 {
     if ( size == fontSize() ) {
         setCurrentItem( items().findIndex( TQString::number( size ) ) );
@@ -1642,7 +1642,7 @@ void KFontSizeAction::setFontSize( int size )
     }
 
     if ( size < 1 ) {
-        kdWarning() << "KFontSizeAction: Size " << size << " is out of range" << endl;
+        kdWarning() << "TDEFontSizeAction: Size " << size << " is out of range" << endl;
         return;
     }
 
@@ -1662,7 +1662,7 @@ void KFontSizeAction::setFontSize( int size )
         TQStringList strLst;
         for (TQValueList<int>::Iterator it = lst.begin() ; it != lst.end() ; ++it)
             strLst.append( TQString::number(*it) );
-        KSelectAction::setItems( strLst );
+        TDESelectAction::setItems( strLst );
         // Find new current item
         index = lst.findIndex( size );
         setCurrentItem( index );
@@ -1671,130 +1671,130 @@ void KFontSizeAction::setFontSize( int size )
         setCurrentItem( index );
 
 
-    //emit KAction::activated();
+    //emit TDEAction::activated();
     //emit activated( index );
     //emit activated( TQString::number( size ) );
     //emit fontSizeChanged( size );
 }
 
-int KFontSizeAction::fontSize() const
+int TDEFontSizeAction::fontSize() const
 {
   return currentText().toInt();
 }
 
-void KFontSizeAction::slotActivated( int index )
+void TDEFontSizeAction::slotActivated( int index )
 {
-  KSelectAction::slotActivated( index );
+  TDESelectAction::slotActivated( index );
 
   emit fontSizeChanged( items()[ index ].toInt() );
 }
 
-void KFontSizeAction::slotActivated( const TQString& size )
+void TDEFontSizeAction::slotActivated( const TQString& size )
 {
   setFontSize( size.toInt() ); // insert sorted first
-  KSelectAction::slotActivated( size );
+  TDESelectAction::slotActivated( size );
   emit fontSizeChanged( size.toInt() );
 }
 
-class KActionMenu::KActionMenuPrivate
+class TDEActionMenu::TDEActionMenuPrivate
 {
 public:
-  KActionMenuPrivate()
+  TDEActionMenuPrivate()
   {
-    m_popup = new KPopupMenu(0L,"KActionMenu::KActionMenuPrivate");
+    m_popup = new TDEPopupMenu(0L,"TDEActionMenu::TDEActionMenuPrivate");
     m_delayed = true;
     m_stickyMenu = true;
   }
-  ~KActionMenuPrivate()
+  ~TDEActionMenuPrivate()
   {
     delete m_popup; m_popup = 0;
   }
-  KPopupMenu *m_popup;
+  TDEPopupMenu *m_popup;
   bool m_delayed;
   bool m_stickyMenu;
 };
 
-KActionMenu::KActionMenu( TQObject* parent, const char* name )
-  : KAction( parent, name )
+TDEActionMenu::TDEActionMenu( TQObject* parent, const char* name )
+  : TDEAction( parent, name )
 {
-  d = new KActionMenuPrivate;
+  d = new TDEActionMenuPrivate;
   setShortcutConfigurable( false );
 }
 
-KActionMenu::KActionMenu( const TQString& text, TQObject* parent,
+TDEActionMenu::TDEActionMenu( const TQString& text, TQObject* parent,
                           const char* name )
-  : KAction( text, 0, parent, name )
+  : TDEAction( text, 0, parent, name )
 {
-  d = new KActionMenuPrivate;
+  d = new TDEActionMenuPrivate;
   setShortcutConfigurable( false );
 }
 
-KActionMenu::KActionMenu( const TQString& text, const TQIconSet& icon,
+TDEActionMenu::TDEActionMenu( const TQString& text, const TQIconSet& icon,
                           TQObject* parent, const char* name )
-  : KAction( text, icon, 0, parent, name )
+  : TDEAction( text, icon, 0, parent, name )
 {
-  d = new KActionMenuPrivate;
+  d = new TDEActionMenuPrivate;
   setShortcutConfigurable( false );
 }
 
-KActionMenu::KActionMenu( const TQString& text, const TQString& icon,
+TDEActionMenu::TDEActionMenu( const TQString& text, const TQString& icon,
                           TQObject* parent, const char* name )
-  : KAction( text, icon, 0, parent, name )
+  : TDEAction( text, icon, 0, parent, name )
 {
-  d = new KActionMenuPrivate;
+  d = new TDEActionMenuPrivate;
   setShortcutConfigurable( false );
 }
 
-KActionMenu::~KActionMenu()
+TDEActionMenu::~TDEActionMenu()
 {
     unplugAll();
-    kdDebug(129) << "KActionMenu::~KActionMenu()" << endl; // ellis
+    kdDebug(129) << "TDEActionMenu::~TDEActionMenu()" << endl; // ellis
     delete d; d = 0;
 }
 
-void KActionMenu::popup( const TQPoint& global )
+void TDEActionMenu::popup( const TQPoint& global )
 {
   popupMenu()->popup( global );
 }
 
-KPopupMenu* KActionMenu::popupMenu() const
+TDEPopupMenu* TDEActionMenu::popupMenu() const
 {
   return d->m_popup;
 }
 
-void KActionMenu::insert( KAction* cmd, int index )
+void TDEActionMenu::insert( TDEAction* cmd, int index )
 {
   if ( cmd )
     cmd->plug( d->m_popup, index );
 }
 
-void KActionMenu::remove( KAction* cmd )
+void TDEActionMenu::remove( TDEAction* cmd )
 {
   if ( cmd )
     cmd->unplug( d->m_popup );
 }
 
-bool KActionMenu::delayed() const {
+bool TDEActionMenu::delayed() const {
     return d->m_delayed;
 }
 
-void KActionMenu::setDelayed(bool _delayed) {
+void TDEActionMenu::setDelayed(bool _delayed) {
     d->m_delayed = _delayed;
 }
 
-bool KActionMenu::stickyMenu() const {
+bool TDEActionMenu::stickyMenu() const {
     return d->m_stickyMenu;
 }
 
-void KActionMenu::setStickyMenu(bool sticky) {
+void TDEActionMenu::setStickyMenu(bool sticky) {
     d->m_stickyMenu = sticky;
 }
 
-int KActionMenu::plug( TQWidget* widget, int index )
+int TDEActionMenu::plug( TQWidget* widget, int index )
 {
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  kdDebug(129) << "KActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
+  kdDebug(129) << "TDEActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( ::tqqt_cast<TQPopupMenu *>( widget ) )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
@@ -1815,11 +1815,11 @@ int KActionMenu::plug( TQWidget* widget, int index )
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<KToolBar *>( widget ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( widget ) )
   {
-    KToolBar *bar = static_cast<KToolBar *>( widget );
+    TDEToolBar *bar = static_cast<TDEToolBar *>( widget );
 
-    int id_ = KAction::getToolButtonID();
+    int id_ = TDEAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() )
       bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
@@ -1827,12 +1827,12 @@ int KActionMenu::plug( TQWidget* widget, int index )
                          index );
     else
     {
-      KInstance *instance;
+      TDEInstance *instance;
 
       if ( m_parentCollection )
         instance = m_parentCollection->instance();
       else
-        instance = KGlobal::instance();
+        instance = TDEGlobal::instance();
 
       bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
@@ -1879,74 +1879,74 @@ int KActionMenu::plug( TQWidget* widget, int index )
 
 ////////
 
-KToolBarPopupAction::KToolBarPopupAction( const TQString& text,
+TDEToolBarPopupAction::TDEToolBarPopupAction( const TQString& text,
                                           const TQString& icon,
-                                          const KShortcut& cut,
+                                          const TDEShortcut& cut,
                                           TQObject* parent, const char* name )
-  : KAction( text, icon, cut, parent, name )
+  : TDEAction( text, icon, cut, parent, name )
 {
   m_popup = 0;
   m_delayed = true;
   m_stickyMenu = true;
 }
 
-KToolBarPopupAction::KToolBarPopupAction( const TQString& text,
+TDEToolBarPopupAction::TDEToolBarPopupAction( const TQString& text,
                                           const TQString& icon,
-                                          const KShortcut& cut,
+                                          const TDEShortcut& cut,
                                           const TQObject* receiver,
                                           const char* slot, TQObject* parent,
                                           const char* name )
-  : KAction( text, icon, cut, receiver, slot, parent, name )
+  : TDEAction( text, icon, cut, receiver, slot, parent, name )
 {
   m_popup = 0;
   m_delayed = true;
   m_stickyMenu = true;
 }
 
-KToolBarPopupAction::KToolBarPopupAction( const KGuiItem& item,
-                                          const KShortcut& cut,
+TDEToolBarPopupAction::TDEToolBarPopupAction( const KGuiItem& item,
+                                          const TDEShortcut& cut,
                                           const TQObject* receiver,
-                                          const char* slot, KActionCollection* parent,
+                                          const char* slot, TDEActionCollection* parent,
                                           const char* name )
-  : KAction( item, cut, receiver, slot, parent, name )
+  : TDEAction( item, cut, receiver, slot, parent, name )
 {
   m_popup = 0;
   m_delayed = true;
   m_stickyMenu = true;
 }
 
-KToolBarPopupAction::~KToolBarPopupAction()
+TDEToolBarPopupAction::~TDEToolBarPopupAction()
 {
     delete m_popup;
 }
 
-bool KToolBarPopupAction::delayed() const {
+bool TDEToolBarPopupAction::delayed() const {
     return m_delayed;
 }
 
-void KToolBarPopupAction::setDelayed(bool delayed) {
+void TDEToolBarPopupAction::setDelayed(bool delayed) {
     m_delayed = delayed;
 }
 
-bool KToolBarPopupAction::stickyMenu() const {
+bool TDEToolBarPopupAction::stickyMenu() const {
     return m_stickyMenu;
 }
 
-void KToolBarPopupAction::setStickyMenu(bool sticky) {
+void TDEToolBarPopupAction::setStickyMenu(bool sticky) {
     m_stickyMenu = sticky;
 }
 
-int KToolBarPopupAction::plug( TQWidget *widget, int index )
+int TDEToolBarPopupAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  // This is very related to KActionMenu::plug.
-  // In fact this class could be an interesting base class for KActionMenu
-  if ( ::tqqt_cast<KToolBar *>( widget ) )
+  // This is very related to TDEActionMenu::plug.
+  // In fact this class could be an interesting base class for TDEActionMenu
+  if ( ::tqqt_cast<TDEToolBar *>( widget ) )
   {
-    KToolBar *bar = (KToolBar *)widget;
+    TDEToolBar *bar = (TDEToolBar *)widget;
 
-    int id_ = KAction::getToolButtonID();
+    int id_ = TDEAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() ) {
         bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
@@ -1954,11 +1954,11 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index )
                            isEnabled(), plainText(),
                            index );
     } else {
-        KInstance * instance;
+        TDEInstance * instance;
         if ( m_parentCollection )
             instance = m_parentCollection->instance();
         else
-            instance = KGlobal::instance();
+            instance = TDEGlobal::instance();
 
         bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
                            TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
@@ -1982,42 +1982,42 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index )
     return containerCount() - 1;
   }
 
-  return KAction::plug( widget, index );
+  return TDEAction::plug( widget, index );
 }
 
-KPopupMenu *KToolBarPopupAction::popupMenu() const
+TDEPopupMenu *TDEToolBarPopupAction::popupMenu() const
 {
     if ( !m_popup ) {
-        KToolBarPopupAction *that = const_cast<KToolBarPopupAction*>(this);
-        that->m_popup = new KPopupMenu;
+        TDEToolBarPopupAction *that = const_cast<TDEToolBarPopupAction*>(this);
+        that->m_popup = new TDEPopupMenu;
     }
     return m_popup;
 }
 
 ////////
 
-KToggleToolBarAction::KToggleToolBarAction( const char* toolBarName,
-         const TQString& text, KActionCollection* parent, const char* name )
-  : KToggleAction( text, KShortcut(), parent, name )
+TDEToggleToolBarAction::TDEToggleToolBarAction( const char* toolBarName,
+         const TQString& text, TDEActionCollection* parent, const char* name )
+  : TDEToggleAction( text, TDEShortcut(), parent, name )
   , m_toolBarName( toolBarName )
   , m_toolBar( 0L )
 {
 }
 
-KToggleToolBarAction::KToggleToolBarAction( KToolBar *toolBar, const TQString &text,
-                                            KActionCollection *parent, const char *name )
-  : KToggleAction( text, KShortcut(), parent, name )
+TDEToggleToolBarAction::TDEToggleToolBarAction( TDEToolBar *toolBar, const TQString &text,
+                                            TDEActionCollection *parent, const char *name )
+  : TDEToggleAction( text, TDEShortcut(), parent, name )
   , m_toolBarName( 0 ), m_toolBar( toolBar )
 {
 }
 
-KToggleToolBarAction::~KToggleToolBarAction()
+TDEToggleToolBarAction::~TDEToggleToolBarAction()
 {
 }
 
-int KToggleToolBarAction::plug( TQWidget* w, int index )
+int TDEToggleToolBarAction::plug( TQWidget* w, int index )
 {
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
       return -1;
 
   if ( !m_toolBar ) {
@@ -2027,7 +2027,7 @@ int KToggleToolBarAction::plug( TQWidget* w, int index )
     while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
       tl = n;
 
-    KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow
+    TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
 
     if ( mw )
         m_toolBar = mw->toolBar( m_toolBarName );
@@ -2042,10 +2042,10 @@ int KToggleToolBarAction::plug( TQWidget* w, int index )
     setEnabled( false );
   }
 
-  return KToggleAction::plug( w, index );
+  return TDEToggleAction::plug( w, index );
 }
 
-void KToggleToolBarAction::setChecked( bool c )
+void TDEToggleToolBarAction::setChecked( bool c )
 {
   if( m_toolBar && c != m_toolBar->isVisible() ) {
     if( c ) {
@@ -2054,29 +2054,29 @@ void KToggleToolBarAction::setChecked( bool c )
       m_toolBar->hide();
     }
     TQMainWindow* mw = m_toolBar->mainWindow();
-    if ( mw && ::tqqt_cast<KMainWindow *>( mw ) )
-      static_cast<KMainWindow *>( mw )->setSettingsDirty();
+    if ( mw && ::tqqt_cast<TDEMainWindow *>( mw ) )
+      static_cast<TDEMainWindow *>( mw )->setSettingsDirty();
   }
-  KToggleAction::setChecked( c );
+  TDEToggleAction::setChecked( c );
 }
 
 ////////
 
-KToggleFullScreenAction::KToggleFullScreenAction( const KShortcut &cut,
+TDEToggleFullScreenAction::TDEToggleFullScreenAction( const TDEShortcut &cut,
                              const TQObject* receiver, const char* slot,
                              TQObject* parent, TQWidget* window,
                              const char* name )
-  : KToggleAction( TQString::null, cut, receiver, slot, parent, name ),
+  : TDEToggleAction( TQString::null, cut, receiver, slot, parent, name ),
     window( NULL )
 {
   setWindow( window );
 }
 
-KToggleFullScreenAction::~KToggleFullScreenAction()
+TDEToggleFullScreenAction::~TDEToggleFullScreenAction()
 {
 }
 
-void KToggleFullScreenAction::setWindow( TQWidget* w )
+void TDEToggleFullScreenAction::setWindow( TQWidget* w )
 {
   if( window )
     window->removeEventFilter( this );
@@ -2085,7 +2085,7 @@ void KToggleFullScreenAction::setWindow( TQWidget* w )
     window->installEventFilter( this );
 }
 
-void KToggleFullScreenAction::setChecked( bool c )
+void TDEToggleFullScreenAction::setChecked( bool c )
 {
   if (c)
   {
@@ -2097,10 +2097,10 @@ void KToggleFullScreenAction::setChecked( bool c )
      setText(i18n("F&ull Screen Mode"));
      setIcon("window_fullscreen");
   }
-  KToggleAction::setChecked( c );
+  TDEToggleAction::setChecked( c );
 }
 
-bool KToggleFullScreenAction::eventFilter( TQObject* o, TQEvent* e )
+bool TDEToggleFullScreenAction::eventFilter( TQObject* o, TQEvent* e )
 {
     if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(window) )
         if( e->type() == TQEvent::WindowStateChange )
@@ -2114,10 +2114,10 @@ bool KToggleFullScreenAction::eventFilter( TQObject* o, TQEvent* e )
 ////////
 
 KWidgetAction::KWidgetAction( TQWidget* widget,
-    const TQString& text, const KShortcut& cut,
+    const TQString& text, const TDEShortcut& cut,
     const TQObject* receiver, const char* slot,
-    KActionCollection* parent, const char* name )
-  : KAction( text, cut, receiver, slot, parent, name )
+    TDEActionCollection* parent, const char* name )
+  : TDEAction( text, cut, receiver, slot, parent, name )
   , m_widget( widget )
   , m_autoSized( false )
 {
@@ -2138,7 +2138,7 @@ void KWidgetAction::setAutoSized( bool autoSized )
   if( !m_widget || !isPlugged() )
     return;
 
-  KToolBar* toolBar = (KToolBar*)m_widget->parent();
+  TDEToolBar* toolBar = (TDEToolBar*)m_widget->parent();
   int i = findContainer( toolBar );
   if ( i == -1 )
     return;
@@ -2149,11 +2149,11 @@ void KWidgetAction::setAutoSized( bool autoSized )
 
 int KWidgetAction::plug( TQWidget* w, int index )
 {
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
       return -1;
 
-  if ( !::tqqt_cast<KToolBar *>( w ) ) {
-    kdError() << "KWidgetAction::plug: KWidgetAction must be plugged into KToolBar." << endl;
+  if ( !::tqqt_cast<TDEToolBar *>( w ) ) {
+    kdError() << "KWidgetAction::plug: KWidgetAction must be plugged into TDEToolBar." << endl;
     return -1;
   }
   if ( !m_widget ) {
@@ -2161,9 +2161,9 @@ int KWidgetAction::plug( TQWidget* w, int index )
     return -1;
   }
 
-  KToolBar* toolBar = static_cast<KToolBar*>( w );
+  TDEToolBar* toolBar = static_cast<TDEToolBar*>( w );
 
-  int id = KAction::getToolButtonID();
+  int id = TDEAction::getToolButtonID();
 
   m_widget->reparent( toolBar, TQPoint() );
   toolBar->insertWidget( id, 0, m_widget, index );
@@ -2183,13 +2183,13 @@ void KWidgetAction::unplug( TQWidget *w )
   if( !m_widget || !isPlugged() )
     return;
 
-  KToolBar* toolBar = (KToolBar*)m_widget->parent();
+  TDEToolBar* toolBar = (TDEToolBar*)m_widget->parent();
   if ( toolBar == w )
   {
       disconnect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) );
       m_widget->reparent( 0L, TQPoint(), false /*showIt*/ );
   }
-  KAction::unplug( w );
+  TDEAction::unplug( w );
 }
 
 void KWidgetAction::slotToolbarDestroyed()
@@ -2205,16 +2205,16 @@ void KWidgetAction::slotToolbarDestroyed()
 
 ////////
 
-KActionSeparator::KActionSeparator( TQObject *parent, const char *name )
-  : KAction( parent, name )
+TDEActionSeparator::TDEActionSeparator( TQObject *parent, const char *name )
+  : TDEAction( parent, name )
 {
 }
 
-KActionSeparator::~KActionSeparator()
+TDEActionSeparator::~TDEActionSeparator()
 {
 }
 
-int KActionSeparator::plug( TQWidget *widget, int index )
+int TDEActionSeparator::plug( TQWidget *widget, int index )
 {
   if ( ::tqqt_cast<TQPopupMenu *>( widget) )
   {
@@ -2239,9 +2239,9 @@ int KActionSeparator::plug( TQWidget *widget, int index )
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<KToolBar *>( widget ) )
+  else if ( ::tqqt_cast<TDEToolBar *>( widget ) )
   {
-    KToolBar *toolBar = static_cast<KToolBar *>( widget );
+    TDEToolBar *toolBar = static_cast<TDEToolBar *>( widget );
 
     int id = toolBar->insertSeparator( index );
 
@@ -2255,46 +2255,46 @@ int KActionSeparator::plug( TQWidget *widget, int index )
   return -1;
 }
 
-KPasteTextAction::KPasteTextAction( const TQString& text,
+TDEPasteTextAction::TDEPasteTextAction( const TQString& text,
                             const TQString& icon,
-                            const KShortcut& cut,
+                            const TDEShortcut& cut,
                             const TQObject* receiver,
                             const char* slot, TQObject* parent,
                             const char* name)
-  : KAction( text, icon, cut, receiver, slot, parent, name )
+  : TDEAction( text, icon, cut, receiver, slot, parent, name )
 {
-  m_popup = new KPopupMenu;
+  m_popup = new TDEPopupMenu;
   connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow()));
   connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
   m_popup->setCheckable(true);
   m_mixedMode = true;
 }
 
-KPasteTextAction::~KPasteTextAction()
+TDEPasteTextAction::~TDEPasteTextAction()
 {
   delete m_popup;
 }
 
-void KPasteTextAction::setMixedMode(bool mode)
+void TDEPasteTextAction::setMixedMode(bool mode)
 {
   m_mixedMode = mode;
 }
 
-int KPasteTextAction::plug( TQWidget *widget, int index )
+int TDEPasteTextAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeKAction(name()))
+  if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  if ( ::tqqt_cast<KToolBar *>( widget ) )
+  if ( ::tqqt_cast<TDEToolBar *>( widget ) )
   {
-    KToolBar *bar = (KToolBar *)widget;
+    TDEToolBar *bar = (TDEToolBar *)widget;
 
-    int id_ = KAction::getToolButtonID();
+    int id_ = TDEAction::getToolButtonID();
 
-    KInstance * instance;
+    TDEInstance * instance;
     if ( m_parentCollection )
         instance = m_parentCollection->instance();
     else
-        instance = KGlobal::instance();
+        instance = TDEGlobal::instance();
 
     bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
                        TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
@@ -2312,10 +2312,10 @@ int KPasteTextAction::plug( TQWidget *widget, int index )
     return containerCount() - 1;
   }
 
-  return KAction::plug( widget, index );
+  return TDEAction::plug( widget, index );
 }
 
-void KPasteTextAction::menuAboutToShow()
+void TDEPasteTextAction::menuAboutToShow()
 {
     m_popup->clear();
     TQStringList list;
@@ -2343,7 +2343,7 @@ void KPasteTextAction::menuAboutToShow()
     }
 }
 
-void KPasteTextAction::menuItemActivated( int id)
+void TDEPasteTextAction::menuItemActivated( int id)
 {
     DCOPClient *client = kapp->dcopClient();
     if (client->isAttached() && client->isApplicationRegistered("klipper")) {
@@ -2359,7 +2359,7 @@ void KPasteTextAction::menuItemActivated( int id)
     TQTimer::singleShot(20, this, TQT_SLOT(slotActivated()));
 }
 
-void KPasteTextAction::slotActivated()
+void TDEPasteTextAction::slotActivated()
 {
   if (!m_mixedMode) {
     TQWidget *w = tqApp->widgetAt(TQCursor::pos(), true);
@@ -2367,55 +2367,55 @@ void KPasteTextAction::slotActivated()
     if (!data->provides("text/plain") && w) {
       m_popup->popup(w->mapToGlobal(TQPoint(0, w->height())));
     } else
-      KAction::slotActivated();
+      TDEAction::slotActivated();
   } else
-    KAction::slotActivated();
+    TDEAction::slotActivated();
 }
 
 
-void KToggleAction::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+void TDEToggleAction::virtual_hook( int id, void* data )
+{ TDEAction::virtual_hook( id, data ); }
 
-void KRadioAction::virtual_hook( int id, void* data )
-{ KToggleAction::virtual_hook( id, data ); }
+void TDERadioAction::virtual_hook( int id, void* data )
+{ TDEToggleAction::virtual_hook( id, data ); }
 
-void KSelectAction::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+void TDESelectAction::virtual_hook( int id, void* data )
+{ TDEAction::virtual_hook( id, data ); }
 
-void KListAction::virtual_hook( int id, void* data )
-{ KSelectAction::virtual_hook( id, data ); }
+void TDEListAction::virtual_hook( int id, void* data )
+{ TDESelectAction::virtual_hook( id, data ); }
 
-void KRecentFilesAction::virtual_hook( int id, void* data )
-{ KListAction::virtual_hook( id, data ); }
+void TDERecentFilesAction::virtual_hook( int id, void* data )
+{ TDEListAction::virtual_hook( id, data ); }
 
-void KFontAction::virtual_hook( int id, void* data )
-{ KSelectAction::virtual_hook( id, data ); }
+void TDEFontAction::virtual_hook( int id, void* data )
+{ TDESelectAction::virtual_hook( id, data ); }
 
-void KFontSizeAction::virtual_hook( int id, void* data )
-{ KSelectAction::virtual_hook( id, data ); }
+void TDEFontSizeAction::virtual_hook( int id, void* data )
+{ TDESelectAction::virtual_hook( id, data ); }
 
-void KActionMenu::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+void TDEActionMenu::virtual_hook( int id, void* data )
+{ TDEAction::virtual_hook( id, data ); }
 
-void KToolBarPopupAction::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+void TDEToolBarPopupAction::virtual_hook( int id, void* data )
+{ TDEAction::virtual_hook( id, data ); }
 
-void KToggleToolBarAction::virtual_hook( int id, void* data )
-{ KToggleAction::virtual_hook( id, data ); }
+void TDEToggleToolBarAction::virtual_hook( int id, void* data )
+{ TDEToggleAction::virtual_hook( id, data ); }
 
-void KToggleFullScreenAction::virtual_hook( int id, void* data )
-{ KToggleAction::virtual_hook( id, data ); }
+void TDEToggleFullScreenAction::virtual_hook( int id, void* data )
+{ TDEToggleAction::virtual_hook( id, data ); }
 
 void KWidgetAction::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+{ TDEAction::virtual_hook( id, data ); }
 
-void KActionSeparator::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+void TDEActionSeparator::virtual_hook( int id, void* data )
+{ TDEAction::virtual_hook( id, data ); }
 
-void KPasteTextAction::virtual_hook( int id, void* data )
-{ KAction::virtual_hook( id, data ); }
+void TDEPasteTextAction::virtual_hook( int id, void* data )
+{ TDEAction::virtual_hook( id, data ); }
 
 /* vim: et sw=2 ts=2
  */
 
-#include "kactionclasses.moc"
+#include "tdeactionclasses.moc"
diff --git a/tdeui/kactionclasses.h b/tdeui/tdeactionclasses.h
index 06e00d179..86594f179 100644
--- a/tdeui/kactionclasses.h
+++ b/tdeui/tdeactionclasses.h
@@ -24,17 +24,17 @@
 */
 //$Id$
 
-#ifndef __kactionclasses_h__
-#define __kactionclasses_h__
+#ifndef __tdeactionclasses_h__
+#define __tdeactionclasses_h__
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqkeysequence.h>
 #include <tqobject.h>
 #include <tqvaluelist.h>
 #include <tqguardedptr.h>
 #include <kguiitem.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstdaction.h>
 #include <kicontheme.h>
 
@@ -44,18 +44,18 @@ class TQComboBox;
 class TQPoint;
 class TQIconSet;
 class TQString;
-class KToolBar;
+class TDEToolBar;
 
-class KAccel;
-class KAccelActions;
-class KConfig;
-class KConfigBase;
+class TDEAccel;
+class TDEAccelActions;
+class TDEConfig;
+class TDEConfigBase;
 class KURL;
-class KInstance;
-class KToolBar;
-class KActionCollection;
-class KPopupMenu;
-class KMainWindow;
+class TDEInstance;
+class TDEToolBar;
+class TDEActionCollection;
+class TDEPopupMenu;
+class TDEMainWindow;
 
 /**
  *  @short Checkbox like action.
@@ -65,7 +65,7 @@ class KMainWindow;
  *  This action provides two states: checked or not.
  *
  */
-class TDEUI_EXPORT KToggleAction : public KAction
+class TDEUI_EXPORT TDEToggleAction : public TDEAction
 {
     Q_OBJECT
     
@@ -83,7 +83,7 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KToggleAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 );
+    TDEToggleAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
@@ -93,7 +93,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const TQString& text, const KShortcut& cut,
+    TDEToggleAction( const TQString& text, const TDEShortcut& cut,
                    const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     /**
@@ -103,7 +103,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+    TDEToggleAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
              TQObject* parent = 0, const char* name = 0 );
 
     /**
@@ -113,7 +113,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+    TDEToggleAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
                    TQObject* parent = 0, const char* name = 0 );
 
     /**
@@ -125,7 +125,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+    TDEToggleAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                    const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     /**
@@ -137,7 +137,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+    TDEToggleAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
                    const TQObject* receiver, const char* slot,
                    TQObject* parent, const char* name = 0 );
 
@@ -145,12 +145,12 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( TQObject* parent = 0, const char* name = 0 );
+    TDEToggleAction( TQObject* parent = 0, const char* name = 0 );
 
     /**
      * Destructor
      */
-    virtual ~KToggleAction();
+    virtual ~TDEToggleAction();
 
     /**
      *  "Plug" or insert this action into a given widget.
@@ -158,7 +158,7 @@ public:
      *  This will typically be a menu or a toolbar.  From this point
      *  on, you will never need to directly manipulate the item in the
      *  menu or toolbar.  You do all enabling/disabling/manipulation
-     *  directly with your KToggleAction object.
+     *  directly with your TDEToggleAction object.
      *
      *  @param widget The GUI element to display this action.
      *  @param index  The index of the item.
@@ -218,8 +218,8 @@ signals:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KToggleActionPrivate;
-    KToggleActionPrivate *d;
+    class TDEToggleActionPrivate;
+    TDEToggleActionPrivate *d;
 };
 
 /**
@@ -228,7 +228,7 @@ private:
  * An action that operates like a radio button. At any given time
  * only a single action from the group will be active.
  */
-class TDEUI_EXPORT KRadioAction : public KToggleAction
+class TDEUI_EXPORT TDERadioAction : public TDEToggleAction
 {
   Q_OBJECT
   
@@ -243,7 +243,7 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 );
+    TDERadioAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
@@ -253,7 +253,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const TQString& text, const KShortcut& cut,
+    TDERadioAction( const TQString& text, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     /**
@@ -263,7 +263,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+    TDERadioAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
                   TQObject* parent = 0, const char* name = 0 );
 
     /**
@@ -273,7 +273,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+    TDERadioAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
                   TQObject* parent = 0, const char* name = 0 );
 
     /**
@@ -285,7 +285,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+    TDERadioAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     /**
@@ -297,7 +297,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+    TDERadioAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot,
                   TQObject* parent, const char* name = 0 );
 
@@ -305,7 +305,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( TQObject* parent = 0, const char* name = 0 );
+    TDERadioAction( TQObject* parent = 0, const char* name = 0 );
 
 protected:
     virtual void slotActivated();
@@ -313,8 +313,8 @@ protected:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KRadioActionPrivate;
-    KRadioActionPrivate *d;
+    class TDERadioActionPrivate;
+    TDERadioActionPrivate *d;
 };
 
 /**
@@ -328,7 +328,7 @@ private:
  *  the formerly checked item becomes unchecked.
  *  There can be only one item checked at a time.
  */
-class TDEUI_EXPORT KSelectAction : public KAction
+class TDEUI_EXPORT TDESelectAction : public TDEAction
 {
     Q_OBJECT
     
@@ -350,7 +350,7 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KSelectAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 );
+    TDESelectAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
@@ -360,7 +360,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const TQString& text, const KShortcut& cut,
+    TDESelectAction( const TQString& text, const TDEShortcut& cut,
                    const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     /**
@@ -370,7 +370,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+    TDESelectAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
              TQObject* parent = 0, const char* name = 0 );
 
     /**
@@ -380,7 +380,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+    TDESelectAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
                    TQObject* parent = 0, const char* name = 0 );
 
     /**
@@ -392,7 +392,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+    TDESelectAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                    const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
 
     /**
@@ -404,7 +404,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+    TDESelectAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
                    const TQObject* receiver, const char* slot,
                    TQObject* parent, const char* name = 0 );
 
@@ -412,12 +412,12 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( TQObject* parent = 0, const char* name = 0 );
+    TDESelectAction( TQObject* parent = 0, const char* name = 0 );
 
     /**
      * Destructor
      */
-    virtual ~KSelectAction();
+    virtual ~TDESelectAction();
 
     /**
      *  "Plug" or insert this action into a given widget.
@@ -425,7 +425,7 @@ public:
      *  This will typically be a menu or a toolbar.
      *  From this point on, you will never need to directly
      *  manipulate the item in the menu or toolbar.
-     *  You do all enabling/disabling/manipulation directly with your KSelectAction object.
+     *  You do all enabling/disabling/manipulation directly with your TDESelectAction object.
      *
      *  @param widget The GUI element to display this action.
      *  @param index  The index of the item.
@@ -572,16 +572,16 @@ protected:
     virtual void virtual_hook( int id, void* data );
 private:
     void setupMenu() const;
-    class KSelectActionPrivate;
-    KSelectActionPrivate *d;
+    class TDESelectActionPrivate;
+    TDESelectActionPrivate *d;
 
 };
 
-/// Remove this class in KDE-4.0. It doesn't add _anything_ to KSelectAction
+/// Remove this class in KDE-4.0. It doesn't add _anything_ to TDESelectAction
 /**
- * @deprecated Use KSelectAction instead.
+ * @deprecated Use TDESelectAction instead.
  */
-class TDEUI_EXPORT_DEPRECATED KListAction : public KSelectAction
+class TDEUI_EXPORT_DEPRECATED TDEListAction : public TDESelectAction
 {
     Q_OBJECT
     
@@ -596,7 +596,7 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KListAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0,
+    TDEListAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0,
                   const char* name = 0 );
 
     /**
@@ -607,7 +607,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const TQString& text, const KShortcut& cut, const TQObject* receiver,
+    TDEListAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver,
                   const char* slot, TQObject* parent, const char* name = 0 );
 
     /**
@@ -617,7 +617,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+    TDEListAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
                       TQObject* parent = 0, const char* name = 0 );
 
     /**
@@ -627,7 +627,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+    TDEListAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
                       TQObject* parent = 0, const char* name = 0 );
 
     /**
@@ -639,7 +639,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+    TDEListAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                           const TQObject* receiver, const char* slot, TQObject* parent,
                   const char* name = 0 );
 
@@ -652,7 +652,7 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+    TDEListAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
                  const TQObject* receiver, const char* slot, TQObject* parent,
                  const char* name = 0 );
 
@@ -660,12 +660,12 @@ public:
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( TQObject* parent = 0, const char* name = 0 );
+    TDEListAction( TQObject* parent = 0, const char* name = 0 );
 
     /**
      * Destructor
      */
-    virtual ~KListAction();
+    virtual ~TDEListAction();
 
 
     virtual TQString currentText() const;
@@ -683,8 +683,8 @@ public slots:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KListActionPrivate;
-    KListActionPrivate *d;
+    class TDEListActionPrivate;
+    TDEListActionPrivate *d;
 };
 
 /**
@@ -697,7 +697,7 @@ private:
  *
  *  @author Michael Koch
  */
-class TDEUI_EXPORT KRecentFilesAction : public KListAction  // TODO public KSelectAction
+class TDEUI_EXPORT TDERecentFilesAction : public TDEListAction  // TODO public TDESelectAction
 {
   Q_OBJECT
   
@@ -710,7 +710,7 @@ public:
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const TQString& text, const KShortcut& cut,
+  TDERecentFilesAction( const TQString& text, const TDEShortcut& cut,
                       TQObject* parent, const char* name = 0,
                       uint maxItems = 10 );
 
@@ -724,7 +724,7 @@ public:
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const TQString& text, const KShortcut& cut,
+  TDERecentFilesAction( const TQString& text, const TDEShortcut& cut,
                       const TQObject* receiver, const char* slot,
                       TQObject* parent, const char* name = 0,
                       uint maxItems = 10 );
@@ -737,7 +737,7 @@ public:
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+  TDERecentFilesAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                       TQObject* parent, const char* name = 0,
                       uint maxItems = 10 );
 
@@ -749,7 +749,7 @@ public:
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+  TDERecentFilesAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
                       TQObject* parent, const char* name = 0,
                       uint maxItems = 10 );
 
@@ -764,7 +764,7 @@ public:
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+  TDERecentFilesAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                       const TQObject* receiver, const char* slot,
                       TQObject* parent, const char* name = 0,
                       uint maxItems = 10 );
@@ -780,7 +780,7 @@ public:
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+  TDERecentFilesAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
                       const TQObject* receiver, const char* slot,
                       TQObject* parent, const char* name = 0,
                       uint maxItems = 10 );
@@ -790,13 +790,13 @@ public:
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( TQObject* parent = 0, const char* name = 0,
+  TDERecentFilesAction( TQObject* parent = 0, const char* name = 0,
                       uint maxItems = 10 );
 
   /**
    *  Destructor.
    */
-  virtual ~KRecentFilesAction();
+  virtual ~TDERecentFilesAction();
 
   virtual int plug( TQWidget *widget, int index = -1 );
 
@@ -834,22 +834,22 @@ public slots:
   void setMaxItems( uint maxItems );
 
   /**
-   *  Loads the recent files entries from a given KConfig object.
+   *  Loads the recent files entries from a given TDEConfig object.
    *  You can provide the name of the group used to load the entries.
    *  If the groupname is empty, entries are load from a group called 'RecentFiles'
    *
-   *  This method does not effect the active group of KConfig.
+   *  This method does not effect the active group of TDEConfig.
    */
-  void loadEntries( KConfig* config, TQString groupname=TQString::null );
+  void loadEntries( TDEConfig* config, TQString groupname=TQString::null );
 
   /**
-   *  Saves the current recent files entries to a given KConfig object.
+   *  Saves the current recent files entries to a given TDEConfig object.
    *  You can provide the name of the group used to load the entries.
    *  If the groupname is empty, entries are saved to a group called 'RecentFiles'
    *
-   *  This method does not effect the active group of KConfig.
+   *  This method does not effect the active group of TDEConfig.
    */
-  void saveEntries( KConfig* config, TQString groupname=TQString::null );
+  void saveEntries( TDEConfig* config, TQString groupname=TQString::null );
 
   /**
    *  Add URL to recent files list.
@@ -903,44 +903,44 @@ protected:
 private:
   void init();
 
-  class KRecentFilesActionPrivate;
-  KRecentFilesActionPrivate *d;
+  class TDERecentFilesActionPrivate;
+  TDERecentFilesActionPrivate *d;
 };
 
-class TDEUI_EXPORT KFontAction : public KSelectAction
+class TDEUI_EXPORT TDEFontAction : public TDESelectAction
 {
     Q_OBJECT
     
     TQ_PROPERTY( TQString font READ font WRITE setFont )
 public:
-    KFontAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0,
+    TDEFontAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0,
                  const char* name = 0 );
-    KFontAction( const TQString& text, const KShortcut& cut,
+    TDEFontAction( const TQString& text, const TDEShortcut& cut,
                  const TQObject* receiver, const char* slot, TQObject* parent,
                  const char* name = 0 );
-    KFontAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+    TDEFontAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
                  TQObject* parent = 0, const char* name = 0 );
-    KFontAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+    TDEFontAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
                  TQObject* parent = 0, const char* name = 0 );
-    KFontAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+    TDEFontAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                  const TQObject* receiver, const char* slot, TQObject* parent,
                  const char* name = 0 );
-    KFontAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+    TDEFontAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
                  const TQObject* receiver, const char* slot, TQObject* parent,
                  const char* name = 0 );
 
 // The ctors with fontListCriteria were added after 3.3-beta1.
 // This define is used in koffice. Remove when koffice has a dependency on tdelibs-3.3 or more.
 #define KFONTACTION_HAS_CRITERIA_ARG
-    KFontAction( uint fontListCriteria, const TQString& text,
-                 const KShortcut& cut = KShortcut(), TQObject* parent = 0,
+    TDEFontAction( uint fontListCriteria, const TQString& text,
+                 const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0,
                  const char* name = 0 );
-    KFontAction( uint fontListCriteria, const TQString& text, const TQString& pix,
-                 const KShortcut& cut = KShortcut(),
+    TDEFontAction( uint fontListCriteria, const TQString& text, const TQString& pix,
+                 const TDEShortcut& cut = TDEShortcut(),
                  TQObject* parent = 0, const char* name = 0 );
 
-    KFontAction( TQObject* parent = 0, const char* name = 0 );
-    ~KFontAction();
+    TDEFontAction( TQObject* parent = 0, const char* name = 0 );
+    ~TDEFontAction();
 
     TQString font() const {
         return currentText();
@@ -954,33 +954,33 @@ public slots:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KFontActionPrivate;
-    KFontActionPrivate *d;
+    class TDEFontActionPrivate;
+    TDEFontActionPrivate *d;
 };
 
-class TDEUI_EXPORT KFontSizeAction : public KSelectAction
+class TDEUI_EXPORT TDEFontSizeAction : public TDESelectAction
 {
     Q_OBJECT
     
     TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 public:
-    KFontSizeAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0,
+    TDEFontSizeAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0,
                      const char* name = 0 );
-    KFontSizeAction( const TQString& text, const KShortcut& cut, const TQObject* receiver,
+    TDEFontSizeAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver,
                      const char* slot, TQObject* parent, const char* name = 0 );
-    KFontSizeAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(),
+    TDEFontSizeAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(),
                      TQObject* parent = 0, const char* name = 0 );
-    KFontSizeAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(),
+    TDEFontSizeAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(),
                      TQObject* parent = 0, const char* name = 0 );
-    KFontSizeAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut,
+    TDEFontSizeAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut,
                      const TQObject* receiver, const char* slot,
                      TQObject* parent, const char* name = 0 );
-    KFontSizeAction( const TQString& text, const TQString& pix, const KShortcut& cut,
+    TDEFontSizeAction( const TQString& text, const TQString& pix, const TDEShortcut& cut,
                      const TQObject* receiver, const char* slot,
                      TQObject* parent, const char* name = 0 );
-    KFontSizeAction( TQObject* parent = 0, const char* name = 0 );
+    TDEFontSizeAction( TQObject* parent = 0, const char* name = 0 );
 
-    virtual ~KFontSizeAction();
+    virtual ~TDEFontSizeAction();
 
     virtual int fontSize() const;
 
@@ -990,7 +990,7 @@ public slots:
 protected slots:
     virtual void slotActivated( int );
     virtual void slotActivated( const TQString& );
-    virtual void slotActivated() { KAction::slotActivated(); }
+    virtual void slotActivated() { TDEAction::slotActivated(); }
 
 signals:
     void fontSizeChanged( int );
@@ -1002,22 +1002,22 @@ private:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KFontSizeActionPrivate;
-    KFontSizeActionPrivate *d;
+    class TDEFontSizeActionPrivate;
+    TDEFontSizeActionPrivate *d;
 };
 
 
 /**
- * A KActionMenu is an action that holds a sub-menu of other actions.
+ * A TDEActionMenu is an action that holds a sub-menu of other actions.
  * insert() and remove() allow to insert and remove actions into this action-menu.
  * Plugged in a popupmenu, it will create a submenu.
  * Plugged in a toolbar, it will create a button with a popup menu.
  *
  * This is the action used by the XMLGUI since it holds other actions.
- * If you want a submenu for selecting one tool among many (without icons), see KSelectAction.
+ * If you want a submenu for selecting one tool among many (without icons), see TDESelectAction.
  * See also setDelayed about the main action.
  */
-class TDEUI_EXPORT KActionMenu : public KAction
+class TDEUI_EXPORT TDEActionMenu : public TDEAction
 {
   Q_OBJECT
   
@@ -1025,29 +1025,29 @@ class TDEUI_EXPORT KActionMenu : public KAction
   TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
 
 public:
-    KActionMenu( const TQString& text, TQObject* parent = 0,
+    TDEActionMenu( const TQString& text, TQObject* parent = 0,
                  const char* name = 0 );
-    KActionMenu( const TQString& text, const TQIconSet& icon,
+    TDEActionMenu( const TQString& text, const TQIconSet& icon,
                  TQObject* parent = 0, const char* name = 0 );
-    KActionMenu( const TQString& text, const TQString& icon,
+    TDEActionMenu( const TQString& text, const TQString& icon,
                  TQObject* parent = 0, const char* name = 0 );
-    KActionMenu( TQObject* parent = 0, const char* name = 0 );
-    virtual ~KActionMenu();
+    TDEActionMenu( TQObject* parent = 0, const char* name = 0 );
+    virtual ~TDEActionMenu();
 
-    virtual void insert( KAction*, int index = -1 );
-    virtual void remove( KAction* );
+    virtual void insert( TDEAction*, int index = -1 );
+    virtual void remove( TDEAction* );
 
-    KPopupMenu* popupMenu() const;
+    TDEPopupMenu* popupMenu() const;
     void popup( const TQPoint& global );
 
     /**
      * Returns true if this action creates a delayed popup menu
-     * when plugged in a KToolbar.
+     * when plugged in a TDEToolbar.
      */
     bool delayed() const;
     /**
      * If set to true, this action will create a delayed popup menu
-     * when plugged in a KToolbar. Otherwise it creates a normal popup.
+     * when plugged in a TDEToolbar. Otherwise it creates a normal popup.
      * Default: delayed
      *
      * Remember that if the "main" action (the toolbar button itself)
@@ -1056,7 +1056,7 @@ public:
      * On the opposite, if the main action can be clicked, it can only happen
      * in a toolbar: in a menu, the parent of a submenu can't be activated.
      * To get a "normal" menu item when plugged a menu (and no submenu)
-     * use KToolBarPopupAction.
+     * use TDEToolBarPopupAction.
      */
     void setDelayed(bool _delayed);
 
@@ -1067,7 +1067,7 @@ public:
     bool stickyMenu() const;
     /**
      * If set to true, this action will create a sticky popup menu
-     * when plugged in a KToolbar.
+     * when plugged in a TDEToolbar.
      * "Sticky", means it's visible until a selection is made or the mouse is
      * clicked elsewhere. This feature allows you to make a selection without
      * having to press and hold down the mouse while making a selection.
@@ -1080,8 +1080,8 @@ public:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KActionMenuPrivate;
-    KActionMenuPrivate *d;
+    class TDEActionMenuPrivate;
+    TDEActionMenuPrivate *d;
 };
 
 /**
@@ -1091,7 +1091,7 @@ private:
  * that has more detail in a toolbar than in a menu (e.g. tool chooser
  * with "Other" leading to a dialog...).
  */
-class TDEUI_EXPORT KToolBarPopupAction : public KAction
+class TDEUI_EXPORT TDEToolBarPopupAction : public TDEAction
 {
   Q_OBJECT
   
@@ -1102,7 +1102,7 @@ public:
     //Not all constructors - because we need an icon, since this action only makes
     // sense when being plugged at least in a toolbar.
     /**
-     * Create a KToolBarPopupAction, with a text, an icon, an optional accelerator,
+     * Create a TDEToolBarPopupAction, with a text, an icon, an optional accelerator,
      * parent and name.
      *
      * @param text The text that will be displayed.
@@ -1111,11 +1111,11 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KToolBarPopupAction( const TQString& text, const TQString& icon, const KShortcut& cut = KShortcut(),
+    TDEToolBarPopupAction( const TQString& text, const TQString& icon, const TDEShortcut& cut = TDEShortcut(),
                          TQObject* parent = 0, const char* name = 0 );
 
     /**
-     * Create a KToolBarPopupAction, with a text, an icon, an accelerator,
+     * Create a TDEToolBarPopupAction, with a text, an icon, an accelerator,
      * a slot connected to the action, parent and name.
      *
      * If you do not want or have a keyboard accelerator, set the
@@ -1129,12 +1129,12 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KToolBarPopupAction( const TQString& text, const TQString& icon, const KShortcut& cut,
+    TDEToolBarPopupAction( const TQString& text, const TQString& icon, const TDEShortcut& cut,
                          const TQObject* receiver, const char* slot,
                          TQObject* parent = 0, const char* name = 0 );
 
     /**
-     * Create a KToolBarPopupAction, with a KGuiItem, an accelerator,
+     * Create a TDEToolBarPopupAction, with a KGuiItem, an accelerator,
      * a slot connected to the action, parent and name. The text and the
      * icon are taken from the KGuiItem.
      *
@@ -1148,11 +1148,11 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KToolBarPopupAction( const KGuiItem& item, const KShortcut& cut,
+    TDEToolBarPopupAction( const KGuiItem& item, const TDEShortcut& cut,
                          const TQObject* receiver, const char* slot,
-                         KActionCollection* parent, const char* name );
+                         TDEActionCollection* parent, const char* name );
 
-    virtual ~KToolBarPopupAction();
+    virtual ~TDEToolBarPopupAction();
 
     virtual int plug( TQWidget *widget, int index = -1 );
 
@@ -1161,16 +1161,16 @@ public:
      * button. You may want to plug items into it on creation, or connect to
      * aboutToShow for a more dynamic menu.
      */
-    KPopupMenu *popupMenu() const;
+    TDEPopupMenu *popupMenu() const;
 
     /**
      * Returns true if this action creates a delayed popup menu
-     * when plugged in a KToolbar.
+     * when plugged in a TDEToolbar.
      */
     bool delayed() const;
     /**
      * If set to true, this action will create a delayed popup menu
-     * when plugged in a KToolbar. Otherwise it creates a normal popup.
+     * when plugged in a TDEToolbar. Otherwise it creates a normal popup.
      * Default: delayed.
      */
     void setDelayed(bool delayed);
@@ -1181,7 +1181,7 @@ public:
     bool stickyMenu() const;
     /**
      * If set to true, this action will create a sticky popup menu
-     * when plugged in a KToolbar.
+     * when plugged in a TDEToolbar.
      * "Sticky", means it's visible until a selection is made or the mouse is
      * clicked elsewhere. This feature allows you to make a selection without
      * having to press and hold down the mouse while making a selection.
@@ -1191,14 +1191,14 @@ public:
     void setStickyMenu(bool sticky);
 
 private:
-    KPopupMenu *m_popup;
+    TDEPopupMenu *m_popup;
     bool m_delayed:1;
     bool m_stickyMenu:1;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KToolBarPopupActionPrivate;
-    KToolBarPopupActionPrivate *d;
+    class TDEToolBarPopupActionPrivate;
+    TDEToolBarPopupActionPrivate *d;
 };
 
 /**
@@ -1214,38 +1214,38 @@ private:
  * visibility has changed, whenever it changes.
  * @since 3.1
  */
-class TDEUI_EXPORT KToggleToolBarAction : public KToggleAction
+class TDEUI_EXPORT TDEToggleToolBarAction : public TDEToggleAction
 {
     Q_OBJECT
     
 public:
     /**
-     * Create a KToggleToolbarAction that manages the toolbar
+     * Create a TDEToggleToolbarAction that manages the toolbar
      * named toolBarName. This can be either the name of a
      * toolbar in an xml ui file, or a toolbar programmatically
      * created with that name.
      */
-    KToggleToolBarAction( const char* toolBarName, const TQString& text,
-                          KActionCollection* parent, const char* name );
-    KToggleToolBarAction( KToolBar *toolBar, const TQString &text,
-                          KActionCollection *parent, const char *name );
-    virtual ~KToggleToolBarAction();
+    TDEToggleToolBarAction( const char* toolBarName, const TQString& text,
+                          TDEActionCollection* parent, const char* name );
+    TDEToggleToolBarAction( TDEToolBar *toolBar, const TQString &text,
+                          TDEActionCollection *parent, const char *name );
+    virtual ~TDEToggleToolBarAction();
 
     virtual int plug( TQWidget * widget, int index = -1 );
 
-    KToolBar *toolBar() { return m_toolBar; }
+    TDEToolBar *toolBar() { return m_toolBar; }
 
 public slots:
     virtual void setChecked( bool );
 
 private:
     TQCString               m_toolBarName;
-    TQGuardedPtr<KToolBar>  m_toolBar;
+    TQGuardedPtr<TDEToolBar>  m_toolBar;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KToggleToolBarActionPrivate;
-    KToggleToolBarActionPrivate *d;
+    class TDEToggleToolBarActionPrivate;
+    TDEToggleToolBarActionPrivate *d;
 };
 
 /**
@@ -1261,13 +1261,13 @@ private:
  * still needs to explicitly set the window state though.
  * @since 3.2
  */
-class TDEUI_EXPORT KToggleFullScreenAction : public KToggleAction
+class TDEUI_EXPORT TDEToggleFullScreenAction : public TDEToggleAction
 {
     Q_OBJECT
     
 public:
     /**
-     * Create a KToggleFullScreenAction
+     * Create a TDEToggleFullScreenAction
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The TQT_SLOT to invoke to execute this action.
@@ -1275,11 +1275,11 @@ public:
      *  @param window the window that will switch to/from full screen mode
      *  @param name An internal name for this action.
      */
-    KToggleFullScreenAction( const KShortcut &cut,
+    TDEToggleFullScreenAction( const TDEShortcut &cut,
                              const TQObject* receiver, const char* slot,
                              TQObject* parent, TQWidget* window,
                              const char* name );
-    virtual ~KToggleFullScreenAction();
+    virtual ~TDEToggleFullScreenAction();
 
     /**
      * Sets the window that will be related to this action.
@@ -1297,8 +1297,8 @@ private:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KToggleFullScreenActionPrivate;
-    KToggleFullScreenActionPrivate *d;
+    class TDEToggleFullScreenActionPrivate;
+    TDEToggleFullScreenActionPrivate *d;
 };
 
 
@@ -1306,7 +1306,7 @@ private:
  * An action that automatically embeds a widget into a
  * toolbar.
  */
-class TDEUI_EXPORT KWidgetAction : public KAction
+class TDEUI_EXPORT KWidgetAction : public TDEAction
 {
     Q_OBJECT
     
@@ -1317,9 +1317,9 @@ public:
      * a toolbar.
      */
     KWidgetAction( TQWidget* widget, const TQString& text,
-                   const KShortcut& cut,
+                   const TDEShortcut& cut,
                    const TQObject* receiver, const char* slot,
-                   KActionCollection* parent, const char* name );
+                   TDEActionCollection* parent, const char* name );
     virtual ~KWidgetAction();
 
     /**
@@ -1331,7 +1331,7 @@ public:
 
     /**
      * Plug the action. The widget passed to the constructor
-     * will be reparented to w, which must inherit KToolBar.
+     * will be reparented to w, which must inherit TDEToolBar.
      */
     virtual int plug( TQWidget* widget, int index = -1 );
     /**
@@ -1351,21 +1351,21 @@ private:
     KWidgetActionPrivate *d;
 };
 
-class TDEUI_EXPORT KActionSeparator : public KAction
+class TDEUI_EXPORT TDEActionSeparator : public TDEAction
 {
     Q_OBJECT
     
 public:
-    KActionSeparator( TQObject* parent = 0, const char* name = 0 );
-    virtual ~KActionSeparator();
+    TDEActionSeparator( TQObject* parent = 0, const char* name = 0 );
+    virtual ~TDEActionSeparator();
 
     virtual int plug( TQWidget *widget, int index = -1 );
 
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KActionSeparatorPrivate;
-    KActionSeparatorPrivate *d;
+    class TDEActionSeparatorPrivate;
+    TDEActionSeparatorPrivate *d;
 };
 
 /**
@@ -1378,13 +1378,13 @@ private:
  *
  * @since 3.2
  */
-class TDEUI_EXPORT KPasteTextAction: public KAction
+class TDEUI_EXPORT TDEPasteTextAction: public TDEAction
 {
     Q_OBJECT
     
 public:
     /**
-     * Create a KPasteTextAction, with a text, an icon, an accelerator,
+     * Create a TDEPasteTextAction, with a text, an icon, an accelerator,
      * a slot connected to the action, parent and name.
      *
      * If you do not want or have a keyboard accelerator, set the
@@ -1398,11 +1398,11 @@ public:
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
-    KPasteTextAction( const TQString& text, const TQString& icon, const KShortcut& cut,
+    TDEPasteTextAction( const TQString& text, const TQString& icon, const TDEShortcut& cut,
                   const TQObject* receiver, const char* slot,
                   TQObject* parent = 0, const char* name = 0 );
 
-    virtual ~KPasteTextAction();
+    virtual ~TDEPasteTextAction();
 
     /**
     * Controls the behavior of the clipboard history menu popup.
@@ -1427,10 +1427,10 @@ protected:
     virtual void virtual_hook( int id, void* data );
 
 private:
-    KPopupMenu *m_popup;
+    TDEPopupMenu *m_popup;
     bool m_mixedMode;
-    class KPasteTextActionPrivate;
-    KPasteTextActionPrivate *d;
+    class TDEPasteTextActionPrivate;
+    TDEPasteTextActionPrivate *d;
 };
 
 #endif
diff --git a/tdeui/kactioncollection.cpp b/tdeui/tdeactioncollection.cpp
index ba809087c..16104e242 100644
--- a/tdeui/kactioncollection.cpp
+++ b/tdeui/tdeactioncollection.cpp
@@ -23,32 +23,32 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kactioncollection.h"
-#include "kactionshortcutlist.h"
-#include "ktoolbar.h"
+#include "tdeactioncollection.h"
+#include "tdeactionshortcutlist.h"
+#include "tdetoolbar.h"
 #include "kxmlguifactory.h"
 #include "kxmlguiclient.h"
 
-#include <kaccel.h>
-#include <kaccelbase.h>
-#include <kapplication.h>
+#include <tdeaccel.h>
+#include <tdeaccelbase.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqpopupmenu.h>
 #include <tqptrdict.h>
 #include <tqvariant.h>
 
-class KActionCollection::KActionCollectionPrivate
+class TDEActionCollection::TDEActionCollectionPrivate
 {
 public:
-  KActionCollectionPrivate()
+  TDEActionCollectionPrivate()
   {
     m_instance = 0;
-    //m_bOneKAccelOnly = false;
+    //m_bOneTDEAccelOnly = false;
     //m_iWidgetCurrent = 0;
     m_bAutoConnectShortcuts = true;
     m_widget = 0;
-    m_kaccel = m_builderKAccel = 0;
+    m_tdeaccel = m_builderTDEAccel = 0;
     m_dctHighlightContainers.setAutoDelete( true );
     m_highlight = false;
     m_currentHighlightAction = 0;
@@ -56,172 +56,172 @@ public:
     m_parentGUIClient = 0L;
   }
 
-  KInstance *m_instance;
+  TDEInstance *m_instance;
   TQString m_sXMLFile;
   bool m_bAutoConnectShortcuts;
-  //bool m_bOneKAccelOnly;
+  //bool m_bOneTDEAccelOnly;
   //int m_iWidgetCurrent;
   //TQValueList<TQWidget*> m_widgetList;
-  //TQValueList<KAccel*> m_kaccelList;
-  TQValueList<KActionCollection*> m_docList;
+  //TQValueList<TDEAccel*> m_tdeaccelList;
+  TQValueList<TDEActionCollection*> m_docList;
   TQWidget *m_widget;
-  KAccel *m_kaccel;
-  KAccel *m_builderKAccel;
+  TDEAccel *m_tdeaccel;
+  TDEAccel *m_builderTDEAccel;
 
-  TQAsciiDict<KAction> m_actionDict;
-  TQPtrDict< TQPtrList<KAction> > m_dctHighlightContainers;
+  TQAsciiDict<TDEAction> m_actionDict;
+  TQPtrDict< TQPtrList<TDEAction> > m_dctHighlightContainers;
   bool m_highlight;
-  KAction *m_currentHighlightAction;
+  TDEAction *m_currentHighlightAction;
   bool m_statusCleared;
   const KXMLGUIClient *m_parentGUIClient;
 };
 
-KActionCollection::KActionCollection( TQWidget *parent, const char *name,
-                                      KInstance *instance )
+TDEActionCollection::TDEActionCollection( TQWidget *parent, const char *name,
+                                      TDEInstance *instance )
   : TQObject( parent, name )
 {
-  kdDebug(129) << "KActionCollection::KActionCollection( " << parent << ", " << name << " ): this = " << this << endl; // ellis
-  d = new KActionCollectionPrivate;
+  kdDebug(129) << "TDEActionCollection::TDEActionCollection( " << parent << ", " << name << " ): this = " << this << endl; // ellis
+  d = new TDEActionCollectionPrivate;
   if( parent )
     setWidget( parent );
-  //d->m_bOneKAccelOnly = (d->m_kaccelList.count() > 0);
+  //d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0);
   setInstance( instance );
 }
 
 
-KActionCollection::KActionCollection( TQWidget *watch, TQObject* parent, const char *name,
-                                      KInstance *instance )
+TDEActionCollection::TDEActionCollection( TQWidget *watch, TQObject* parent, const char *name,
+                                      TDEInstance *instance )
   : TQObject( parent, name )
 {
-  kdDebug(129) << "KActionCollection::KActionCollection( " << watch << ", " << parent << ", " << name << " ): this = " << this << endl; //ellis
-  d = new KActionCollectionPrivate;
+  kdDebug(129) << "TDEActionCollection::TDEActionCollection( " << watch << ", " << parent << ", " << name << " ): this = " << this << endl; //ellis
+  d = new TDEActionCollectionPrivate;
   if( watch )
     setWidget( watch );
-  //d->m_bOneKAccelOnly = (d->m_kaccelList.count() > 0);
+  //d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0);
   setInstance( instance );
 }
 
 #ifndef KDE_NO_COMPAT
 // KDE 4: remove
-KActionCollection::KActionCollection( TQObject *parent, const char *name,
-                                      KInstance *instance )
+TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name,
+                                      TDEInstance *instance )
   : TQObject( parent, name )
 {
-  kdWarning(129) << "KActionCollection::KActionCollection( TQObject *parent, const char *name, KInstance *instance )" << endl; //ellis
+  kdWarning(129) << "TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name, TDEInstance *instance )" << endl; //ellis
   kdDebug(129) << kdBacktrace() << endl;
-  d = new KActionCollectionPrivate;
+  d = new TDEActionCollectionPrivate;
   TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent );
   if( w )
     setWidget( w );
-  //d->m_bOneKAccelOnly = (d->m_kaccelList.count() > 0);
+  //d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0);
   setInstance( instance );
 }
 
-KActionCollection::KActionCollection( const KActionCollection &copy )
+TDEActionCollection::TDEActionCollection( const TDEActionCollection &copy )
     : TQObject()
 {
-  kdWarning(129) << "KActionCollection::KActionCollection( const KActionCollection & ): function is severely deprecated." << endl;
-  d = new KActionCollectionPrivate;
+  kdWarning(129) << "TDEActionCollection::TDEActionCollection( const TDEActionCollection & ): function is severely deprecated." << endl;
+  d = new TDEActionCollectionPrivate;
   *this = copy;
 }
 #endif // KDE 4: remove end
 
-KActionCollection::KActionCollection( const char *name, const KXMLGUIClient *parent )
+TDEActionCollection::TDEActionCollection( const char *name, const KXMLGUIClient *parent )
     : TQObject( 0L, name )
 {
-  d = new KActionCollectionPrivate;
+  d = new TDEActionCollectionPrivate;
   d->m_parentGUIClient=parent;
   d->m_instance=parent->instance();
 }
 
 
-KActionCollection::~KActionCollection()
+TDEActionCollection::~TDEActionCollection()
 {
-  kdDebug(129) << "KActionCollection::~KActionCollection(): this = " << this << endl;
-  for ( TQAsciiDictIterator<KAction> it( d->m_actionDict ); it.current(); ++it ) {
-    KAction* pAction = it.current();
+  kdDebug(129) << "TDEActionCollection::~TDEActionCollection(): this = " << this << endl;
+  for ( TQAsciiDictIterator<TDEAction> it( d->m_actionDict ); it.current(); ++it ) {
+    TDEAction* pAction = it.current();
     if ( pAction->m_parentCollection == this )
       pAction->m_parentCollection = 0L;
   }
 
-  delete d->m_kaccel;
-  delete d->m_builderKAccel;
+  delete d->m_tdeaccel;
+  delete d->m_builderTDEAccel;
   delete d; d = 0;
 }
 
-void KActionCollection::setWidget( TQWidget* w )
+void TDEActionCollection::setWidget( TQWidget* w )
 {
   //if ( d->m_actionDict.count() > 0 ) {
-  //  kdError(129) << "KActionCollection::setWidget(): must be called before any actions are added to collection!" << endl;
+  //  kdError(129) << "TDEActionCollection::setWidget(): must be called before any actions are added to collection!" << endl;
   //  kdDebug(129) << kdBacktrace() << endl;
   //}
   //else
   if ( !d->m_widget ) {
     d->m_widget = w;
-    d->m_kaccel = new KAccel( w, this, "KActionCollection-KAccel" );
+    d->m_tdeaccel = new TDEAccel( w, this, "TDEActionCollection-TDEAccel" );
   }
   else if ( d->m_widget != w )
-    kdWarning(129) << "KActionCollection::setWidget(): tried to change widget from " << d->m_widget << " to " << w << endl;
+    kdWarning(129) << "TDEActionCollection::setWidget(): tried to change widget from " << d->m_widget << " to " << w << endl;
 }
 
-void KActionCollection::setAutoConnectShortcuts( bool b )
+void TDEActionCollection::setAutoConnectShortcuts( bool b )
 {
   d->m_bAutoConnectShortcuts = b;
 }
 
-bool KActionCollection::isAutoConnectShortcuts()
+bool TDEActionCollection::isAutoConnectShortcuts()
 {
   return d->m_bAutoConnectShortcuts;
 }
 
-bool KActionCollection::addDocCollection( KActionCollection* pDoc )
+bool TDEActionCollection::addDocCollection( TDEActionCollection* pDoc )
 {
 	d->m_docList.append( pDoc );
 	return true;
 }
 
-void KActionCollection::beginXMLPlug( TQWidget *widget )
+void TDEActionCollection::beginXMLPlug( TQWidget *widget )
 {
-	kdDebug(129) << "KActionCollection::beginXMLPlug( buildWidget = " << widget << " ): this = " <<  this << " d->m_builderKAccel = " << d->m_builderKAccel << endl;
+	kdDebug(129) << "TDEActionCollection::beginXMLPlug( buildWidget = " << widget << " ): this = " <<  this << " d->m_builderTDEAccel = " << d->m_builderTDEAccel << endl;
 
-	if( widget && !d->m_builderKAccel ) {
-            d->m_builderKAccel = new KAccel( widget, this, "KActionCollection-BuilderKAccel" );
+	if( widget && !d->m_builderTDEAccel ) {
+            d->m_builderTDEAccel = new TDEAccel( widget, this, "TDEActionCollection-BuilderTDEAccel" );
 	}
 }
 
-void KActionCollection::endXMLPlug()
+void TDEActionCollection::endXMLPlug()
 {
-	kdDebug(129) << "KActionCollection::endXMLPlug(): this = " <<  this << endl;
-	//s_kaccelXML = 0;
+	kdDebug(129) << "TDEActionCollection::endXMLPlug(): this = " <<  this << endl;
+	//s_tdeaccelXML = 0;
 }
 
-void KActionCollection::prepareXMLUnplug()
+void TDEActionCollection::prepareXMLUnplug()
 {
-	kdDebug(129) << "KActionCollection::prepareXMLUnplug(): this = " <<  this << endl;
-	unplugShortcuts( d->m_kaccel );
+	kdDebug(129) << "TDEActionCollection::prepareXMLUnplug(): this = " <<  this << endl;
+	unplugShortcuts( d->m_tdeaccel );
 
-	if( d->m_builderKAccel ) {
-		unplugShortcuts( d->m_builderKAccel );
-		delete d->m_builderKAccel;
-		d->m_builderKAccel = 0;
+	if( d->m_builderTDEAccel ) {
+		unplugShortcuts( d->m_builderTDEAccel );
+		delete d->m_builderTDEAccel;
+		d->m_builderTDEAccel = 0;
 	}
 }
 
-void KActionCollection::unplugShortcuts( KAccel* kaccel )
+void TDEActionCollection::unplugShortcuts( TDEAccel* tdeaccel )
 {
-  for ( TQAsciiDictIterator<KAction> it( d->m_actionDict ); it.current(); ++it ) {
-    KAction* pAction = it.current();
-    pAction->removeKAccel( kaccel );
+  for ( TQAsciiDictIterator<TDEAction> it( d->m_actionDict ); it.current(); ++it ) {
+    TDEAction* pAction = it.current();
+    pAction->removeTDEAccel( tdeaccel );
   }
 
   for( uint i = 0; i < d->m_docList.count(); i++ )
-    d->m_docList[i]->unplugShortcuts( kaccel );
+    d->m_docList[i]->unplugShortcuts( tdeaccel );
 }
 
-/*void KActionCollection::addWidget( TQWidget* w )
+/*void TDEActionCollection::addWidget( TQWidget* w )
 {
-  if( !d->m_bOneKAccelOnly ) {
-    kdDebug(129) << "KActionCollection::addWidget( " << w << " ): this = " << this << endl;
+  if( !d->m_bOneTDEAccelOnly ) {
+    kdDebug(129) << "TDEActionCollection::addWidget( " << w << " ): this = " << this << endl;
     for( uint i = 0; i < d->m_widgetList.count(); i++ ) {
       if( d->m_widgetList[i] == w ) {
         d->m_iWidgetCurrent = i;
@@ -230,28 +230,28 @@ void KActionCollection::unplugShortcuts( KAccel* kaccel )
   }
     d->m_iWidgetCurrent = d->m_widgetList.count();
     d->m_widgetList.append( w );
-    d->m_kaccelList.append( new KAccel( w, this, "KActionCollection-KAccel" ) );
+    d->m_tdeaccelList.append( new TDEAccel( w, this, "TDEActionCollection-TDEAccel" ) );
   }
 }
 
-void KActionCollection::removeWidget( TQWidget* w )
+void TDEActionCollection::removeWidget( TQWidget* w )
 {
-  if( !d->m_bOneKAccelOnly ) {
-    kdDebug(129) << "KActionCollection::removeWidget( " << w << " ): this = " << this << endl;
+  if( !d->m_bOneTDEAccelOnly ) {
+    kdDebug(129) << "TDEActionCollection::removeWidget( " << w << " ): this = " << this << endl;
     for( uint i = 0; i < d->m_widgetList.count(); i++ ) {
       if( d->m_widgetList[i] == w ) {
-        // Remove KAccel object from children.
-        KAccel* pKAccel = d->m_kaccelList[i];
-        for ( TQAsciiDictIterator<KAction> it( d->m_actionDict ); it.current(); ++it ) {
-          KAction* pAction = it.current();
+        // Remove TDEAccel object from children.
+        TDEAccel* pTDEAccel = d->m_tdeaccelList[i];
+        for ( TQAsciiDictIterator<TDEAction> it( d->m_actionDict ); it.current(); ++it ) {
+          TDEAction* pAction = it.current();
           if ( pAction->m_parentCollection == this ) {
-            pAction->removeKAccel( pKAccel );
+            pAction->removeTDEAccel( pTDEAccel );
           }
         }
-        delete pKAccel;
+        delete pTDEAccel;
 
         d->m_widgetList.remove( d->m_widgetList.at( i ) );
-        d->m_kaccelList.remove( d->m_kaccelList.at( i ) );
+        d->m_tdeaccelList.remove( d->m_tdeaccelList.at( i ) );
 
         if( d->m_iWidgetCurrent == (int)i )
           d->m_iWidgetCurrent = -1;
@@ -260,46 +260,46 @@ void KActionCollection::removeWidget( TQWidget* w )
         return;
       }
     }
-    kdWarning(129) << "KActionCollection::removeWidget( " << w << " ): widget not in list." << endl;
+    kdWarning(129) << "TDEActionCollection::removeWidget( " << w << " ): widget not in list." << endl;
   }
 }
 
-bool KActionCollection::ownsKAccel() const
+bool TDEActionCollection::ownsTDEAccel() const
 {
-  return d->m_bOneKAccelOnly;
+  return d->m_bOneTDEAccelOnly;
 }
 
-uint KActionCollection::widgetCount() const
+uint TDEActionCollection::widgetCount() const
 {
   return d->m_widgetList.count();
 }
 
-const KAccel* KActionCollection::widgetKAccel( uint i ) const
+const TDEAccel* TDEActionCollection::widgetTDEAccel( uint i ) const
 {
-  return d->m_kaccelList[i];
+  return d->m_tdeaccelList[i];
 }*/
 
-KAccel* KActionCollection::kaccel()
+TDEAccel* TDEActionCollection::tdeaccel()
 {
-  //if( d->m_kaccelList.count() > 0 )
-  //  return d->m_kaccelList[d->m_iWidgetCurrent];
+  //if( d->m_tdeaccelList.count() > 0 )
+  //  return d->m_tdeaccelList[d->m_iWidgetCurrent];
   //else
   //  return 0;
-  return d->m_kaccel;
+  return d->m_tdeaccel;
 }
 
-const KAccel* KActionCollection::kaccel() const
+const TDEAccel* TDEActionCollection::tdeaccel() const
 {
-  //if( d->m_kaccelList.count() > 0 )
-  //  return d->m_kaccelList[d->m_iWidgetCurrent];
+  //if( d->m_tdeaccelList.count() > 0 )
+  //  return d->m_tdeaccelList[d->m_iWidgetCurrent];
   //else
   //  return 0;
-  return d->m_kaccel;
+  return d->m_tdeaccel;
 }
 
 // Return the key to use in d->m_actionDict for the given action.
 // Usually name(), except when unnamed.
-static const char* actionDictKey( KAction* action, char* buffer )
+static const char* actionDictKey( TDEAction* action, char* buffer )
 {
   const char* name = action->name();
   if( !qstrcmp( name, "unnamed" ) )
@@ -310,11 +310,11 @@ static const char* actionDictKey( KAction* action, char* buffer )
   return name;
 }
 
-void KActionCollection::_insert( KAction* action )
+void TDEActionCollection::_insert( TDEAction* action )
 {
   char unnamed_name[100];
   const char *name = actionDictKey( action, unnamed_name );
-  KAction *a = d->m_actionDict[ name ];
+  TDEAction *a = d->m_actionDict[ name ];
   if ( a == action )
       return;
 
@@ -323,27 +323,27 @@ void KActionCollection::_insert( KAction* action )
   emit inserted( action );
 }
 
-void KActionCollection::_remove( KAction* action )
+void TDEActionCollection::_remove( TDEAction* action )
 {
   char unnamed_name[100];
   const char *name = actionDictKey( action, unnamed_name );
 
-  KAction *a = d->m_actionDict.take( name );
+  TDEAction *a = d->m_actionDict.take( name );
   if ( !a || a != action )
       return;
 
   emit removed( action );
   // note that we delete the action without its parent collection set to 0.
-  // This triggers kaccel::remove, to remove any shortcut.
+  // This triggers tdeaccel::remove, to remove any shortcut.
   delete a;
 }
 
-KAction* KActionCollection::_take( KAction* action )
+TDEAction* TDEActionCollection::_take( TDEAction* action )
 {
   char unnamed_name[100];
   const char *name = actionDictKey( action, unnamed_name );
 
-  KAction *a = d->m_actionDict.take( name );
+  TDEAction *a = d->m_actionDict.take( name );
   if ( !a || a != action )
       return 0;
 
@@ -355,30 +355,30 @@ KAction* KActionCollection::_take( KAction* action )
   return a;
 }
 
-void KActionCollection::_clear()
+void TDEActionCollection::_clear()
 {
-  TQAsciiDictIterator<KAction> it( d->m_actionDict );
+  TQAsciiDictIterator<TDEAction> it( d->m_actionDict );
   while ( it.current() )
     _remove( it.current() );
 }
 
-void KActionCollection::insert( KAction* action )   { _insert( action ); }
-void KActionCollection::remove( KAction* action )   { _remove( action ); }
-KAction* KActionCollection::take( KAction* action ) { return _take( action ); }
-void KActionCollection::clear()                     { _clear(); }
-KAccel* KActionCollection::accel()                  { return kaccel(); }
-const KAccel* KActionCollection::accel() const      { return kaccel(); }
-KAccel* KActionCollection::builderKAccel() const    { return d->m_builderKAccel; }
+void TDEActionCollection::insert( TDEAction* action )   { _insert( action ); }
+void TDEActionCollection::remove( TDEAction* action )   { _remove( action ); }
+TDEAction* TDEActionCollection::take( TDEAction* action ) { return _take( action ); }
+void TDEActionCollection::clear()                     { _clear(); }
+TDEAccel* TDEActionCollection::accel()                  { return tdeaccel(); }
+const TDEAccel* TDEActionCollection::accel() const      { return tdeaccel(); }
+TDEAccel* TDEActionCollection::builderTDEAccel() const    { return d->m_builderTDEAccel; }
 
-KAction* KActionCollection::action( const char* name, const char* classname ) const
+TDEAction* TDEActionCollection::action( const char* name, const char* classname ) const
 {
-  KAction* pAction = 0;
+  TDEAction* pAction = 0;
 
   if ( !classname && name )
     pAction = d->m_actionDict[ name ];
 
   else {
-    TQAsciiDictIterator<KAction> it( d->m_actionDict );
+    TQAsciiDictIterator<TDEAction> it( d->m_actionDict );
     for( ; it.current(); ++it )
     {
       if ( ( !name || !strcmp( it.current()->name(), name ) ) &&
@@ -397,34 +397,34 @@ KAction* KActionCollection::action( const char* name, const char* classname ) co
   return pAction;
 }
 
-KAction* KActionCollection::action( int index ) const
+TDEAction* TDEActionCollection::action( int index ) const
 {
-  TQAsciiDictIterator<KAction> it( d->m_actionDict );
+  TQAsciiDictIterator<TDEAction> it( d->m_actionDict );
   it += index;
   return it.current();
 //  return d->m_actions.at( index );
 }
 
-bool KActionCollection::readShortcutSettings( const TQString& sConfigGroup, KConfigBase* pConfig )
+bool TDEActionCollection::readShortcutSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig )
 {
-  return KActionShortcutList(this).readSettings( sConfigGroup, pConfig );
+  return TDEActionShortcutList(this).readSettings( sConfigGroup, pConfig );
 }
 
-bool KActionCollection::writeShortcutSettings( const TQString& sConfigGroup, KConfigBase* pConfig ) const
+bool TDEActionCollection::writeShortcutSettings( const TQString& sConfigGroup, TDEConfigBase* pConfig ) const
 {
-  return KActionShortcutList((KActionCollection*)this).writeSettings( sConfigGroup, pConfig );
+  return TDEActionShortcutList((TDEActionCollection*)this).writeSettings( sConfigGroup, pConfig );
 }
 
-uint KActionCollection::count() const
+uint TDEActionCollection::count() const
 {
   return d->m_actionDict.count();
 }
 
-TQStringList KActionCollection::groups() const
+TQStringList TDEActionCollection::groups() const
 {
   TQStringList lst;
 
-  TQAsciiDictIterator<KAction> it( d->m_actionDict );
+  TQAsciiDictIterator<TDEAction> it( d->m_actionDict );
   for( ; it.current(); ++it )
     if ( !it.current()->group().isEmpty() && !lst.contains( it.current()->group() ) )
       lst.append( it.current()->group() );
@@ -432,11 +432,11 @@ TQStringList KActionCollection::groups() const
   return lst;
 }
 
-KActionPtrList KActionCollection::actions( const TQString& group ) const
+TDEActionPtrList TDEActionCollection::actions( const TQString& group ) const
 {
-  KActionPtrList lst;
+  TDEActionPtrList lst;
 
-  TQAsciiDictIterator<KAction> it( d->m_actionDict );
+  TQAsciiDictIterator<TDEAction> it( d->m_actionDict );
   for( ; it.current(); ++it )
     if ( it.current()->group() == group )
       lst.append( it.current() );
@@ -446,60 +446,60 @@ KActionPtrList KActionCollection::actions( const TQString& group ) const
   return lst;
 }
 
-KActionPtrList KActionCollection::actions() const
+TDEActionPtrList TDEActionCollection::actions() const
 {
-  KActionPtrList lst;
+  TDEActionPtrList lst;
 
-  TQAsciiDictIterator<KAction> it( d->m_actionDict );
+  TQAsciiDictIterator<TDEAction> it( d->m_actionDict );
   for( ; it.current(); ++it )
     lst.append( it.current() );
 
   return lst;
 }
 
-void KActionCollection::setInstance( KInstance *instance )
+void TDEActionCollection::setInstance( TDEInstance *instance )
 {
   if ( instance )
     d->m_instance = instance;
   else
-    d->m_instance = KGlobal::instance();
+    d->m_instance = TDEGlobal::instance();
 }
 
-KInstance *KActionCollection::instance() const
+TDEInstance *TDEActionCollection::instance() const
 {
   return d->m_instance;
 }
 
-void KActionCollection::setXMLFile( const TQString& sXMLFile )
+void TDEActionCollection::setXMLFile( const TQString& sXMLFile )
 {
   d->m_sXMLFile = sXMLFile;
 }
 
-const TQString& KActionCollection::xmlFile() const
+const TQString& TDEActionCollection::xmlFile() const
 {
   return d->m_sXMLFile;
 }
 
-void KActionCollection::setHighlightingEnabled( bool enable )
+void TDEActionCollection::setHighlightingEnabled( bool enable )
 {
   d->m_highlight = enable;
 }
 
-bool KActionCollection::highlightingEnabled() const
+bool TDEActionCollection::highlightingEnabled() const
 {
   return d->m_highlight;
 }
 
-void KActionCollection::connectHighlight( TQWidget *container, KAction *action )
+void TDEActionCollection::connectHighlight( TQWidget *container, TDEAction *action )
 {
   if ( !d->m_highlight )
     return;
 
-  TQPtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
+  TQPtrList<TDEAction> *actionList = d->m_dctHighlightContainers[ container ];
 
   if ( !actionList )
   {
-    actionList = new TQPtrList<KAction>;
+    actionList = new TQPtrList<TDEAction>;
 
     if ( ::tqqt_cast<TQPopupMenu *>( container ) )
     {
@@ -508,7 +508,7 @@ void KActionCollection::connectHighlight( TQWidget *container, KAction *action )
       connect( container, TQT_SIGNAL( aboutToHide() ),
                this, TQT_SLOT( slotMenuAboutToHide() ) );
     }
-    else if ( ::tqqt_cast<KToolBar *>( container ) )
+    else if ( ::tqqt_cast<TDEToolBar *>( container ) )
     {
       connect( container, TQT_SIGNAL( highlighted( int, bool ) ),
                this, TQT_SLOT( slotToolBarButtonHighlighted( int, bool ) ) );
@@ -523,12 +523,12 @@ void KActionCollection::connectHighlight( TQWidget *container, KAction *action )
   actionList->append( action );
 }
 
-void KActionCollection::disconnectHighlight( TQWidget *container, KAction *action )
+void TDEActionCollection::disconnectHighlight( TQWidget *container, TDEAction *action )
 {
   if ( !d->m_highlight )
     return;
 
-  TQPtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
+  TQPtrList<TDEAction> *actionList = d->m_dctHighlightContainers[ container ];
 
   if ( !actionList )
     return;
@@ -539,7 +539,7 @@ void KActionCollection::disconnectHighlight( TQWidget *container, KAction *actio
     d->m_dctHighlightContainers.remove( container );
 }
 
-void KActionCollection::slotMenuItemHighlighted( int id )
+void TDEActionCollection::slotMenuItemHighlighted( int id )
 {
   if ( !d->m_highlight )
     return;
@@ -565,7 +565,7 @@ void KActionCollection::slotMenuItemHighlighted( int id )
   emit actionStatusText( d->m_currentHighlightAction->toolTip() );
 }
 
-void KActionCollection::slotMenuAboutToHide()
+void TDEActionCollection::slotMenuAboutToHide()
 {
     if ( d->m_currentHighlightAction )
         emit actionHighlighted( d->m_currentHighlightAction, false );
@@ -576,14 +576,14 @@ void KActionCollection::slotMenuAboutToHide()
     d->m_statusCleared = true;
 }
 
-void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
+void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
 {
   if ( !d->m_highlight )
     return;
 
   TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() ));
 
-  KAction *action = findAction( container, id );
+  TDEAction *action = findAction( container, id );
 
   if ( !action )
   {
@@ -604,19 +604,19 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
   }
 }
 
-void KActionCollection::slotDestroyed()
+void TDEActionCollection::slotDestroyed()
 {
     d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())) ) );
 }
 
-KAction *KActionCollection::findAction( TQWidget *container, int id )
+TDEAction *TDEActionCollection::findAction( TQWidget *container, int id )
 {
-  TQPtrList<KAction> *actionList = d->m_dctHighlightContainers[ reinterpret_cast<void *>( container ) ];
+  TQPtrList<TDEAction> *actionList = d->m_dctHighlightContainers[ reinterpret_cast<void *>( container ) ];
 
   if ( !actionList )
     return 0;
 
-  TQPtrListIterator<KAction> it( *actionList );
+  TQPtrListIterator<TDEAction> it( *actionList );
   for (; it.current(); ++it )
     if ( it.current()->isPlugged( container, id ) )
       return it.current();
@@ -624,45 +624,45 @@ KAction *KActionCollection::findAction( TQWidget *container, int id )
   return 0;
 }
 
-const KXMLGUIClient *KActionCollection::parentGUIClient() const
+const KXMLGUIClient *TDEActionCollection::parentGUIClient() const
 {
 	return d->m_parentGUIClient;
 }
 
 #ifndef KDE_NO_COMPAT
 // KDE 4: remove
-KActionCollection KActionCollection::operator+(const KActionCollection &c ) const
+TDEActionCollection TDEActionCollection::operator+(const TDEActionCollection &c ) const
 {
-  kdWarning(129) << "KActionCollection::operator+(): function is severely deprecated." << endl;
-  KActionCollection ret( *this );
+  kdWarning(129) << "TDEActionCollection::operator+(): function is severely deprecated." << endl;
+  TDEActionCollection ret( *this );
 
-  TQValueList<KAction *> actions = c.actions();
-  TQValueList<KAction *>::ConstIterator it = actions.begin();
-  TQValueList<KAction *>::ConstIterator end = actions.end();
+  TQValueList<TDEAction *> actions = c.actions();
+  TQValueList<TDEAction *>::ConstIterator it = actions.begin();
+  TQValueList<TDEAction *>::ConstIterator end = actions.end();
   for (; it != end; ++it )
     ret.insert( *it );
 
   return ret;
 }
 
-KActionCollection &KActionCollection::operator=( const KActionCollection &copy )
+TDEActionCollection &TDEActionCollection::operator=( const TDEActionCollection &copy )
 {
-  kdWarning(129) << "KActionCollection::operator=(): function is severely deprecated." << endl;
-  //d->m_bOneKAccelOnly = copy.d->m_bOneKAccelOnly;
+  kdWarning(129) << "TDEActionCollection::operator=(): function is severely deprecated." << endl;
+  //d->m_bOneTDEAccelOnly = copy.d->m_bOneTDEAccelOnly;
   //d->m_iWidgetCurrent = copy.d->m_iWidgetCurrent;
   //d->m_widgetList = copy.d->m_widgetList;
-  //d->m_kaccelList = copy.d->m_kaccelList;
+  //d->m_tdeaccelList = copy.d->m_tdeaccelList;
   d->m_widget = copy.d->m_widget;
-  d->m_kaccel = copy.d->m_kaccel;
+  d->m_tdeaccel = copy.d->m_tdeaccel;
   d->m_actionDict = copy.d->m_actionDict;
   setInstance( copy.instance() );
   return *this;
 }
 
-KActionCollection &KActionCollection::operator+=( const KActionCollection &c )
+TDEActionCollection &TDEActionCollection::operator+=( const TDEActionCollection &c )
 {
-  kdWarning(129) << "KActionCollection::operator+=(): function is severely deprecated." << endl;
-  TQAsciiDictIterator<KAction> it(c.d->m_actionDict);
+  kdWarning(129) << "TDEActionCollection::operator+=(): function is severely deprecated." << endl;
+  TQAsciiDictIterator<TDEAction> it(c.d->m_actionDict);
   for ( ; it.current(); ++it )
     insert( it.current() );
 
@@ -671,44 +671,44 @@ KActionCollection &KActionCollection::operator+=( const KActionCollection &c )
 #endif // KDE 4: remove end
 
 //---------------------------------------------------------------------
-// KActionShortcutList
+// TDEActionShortcutList
 //---------------------------------------------------------------------
 
-KActionShortcutList::KActionShortcutList( KActionCollection* pColl )
+TDEActionShortcutList::TDEActionShortcutList( TDEActionCollection* pColl )
 : m_actions( *pColl )
 	{ }
-KActionShortcutList::~KActionShortcutList()
+TDEActionShortcutList::~TDEActionShortcutList()
 	{ }
-uint KActionShortcutList::count() const
+uint TDEActionShortcutList::count() const
 	{ return m_actions.count(); }
-TQString KActionShortcutList::name( uint i ) const
+TQString TDEActionShortcutList::name( uint i ) const
 	{ return m_actions.action(i)->name(); }
-TQString KActionShortcutList::label( uint i ) const
+TQString TDEActionShortcutList::label( uint i ) const
 	{ return m_actions.action(i)->text(); }
-TQString KActionShortcutList::whatsThis( uint i ) const
+TQString TDEActionShortcutList::whatsThis( uint i ) const
 	{ return m_actions.action(i)->whatsThis(); }
-const KShortcut& KActionShortcutList::shortcut( uint i ) const
+const TDEShortcut& TDEActionShortcutList::shortcut( uint i ) const
 	{ return m_actions.action(i)->shortcut(); }
-const KShortcut& KActionShortcutList::shortcutDefault( uint i ) const
+const TDEShortcut& TDEActionShortcutList::shortcutDefault( uint i ) const
 	{ return m_actions.action(i)->shortcutDefault(); }
-bool KActionShortcutList::isConfigurable( uint i ) const
+bool TDEActionShortcutList::isConfigurable( uint i ) const
 	{ return m_actions.action(i)->isShortcutConfigurable(); }
-bool KActionShortcutList::setShortcut( uint i, const KShortcut& cut )
+bool TDEActionShortcutList::setShortcut( uint i, const TDEShortcut& cut )
 	{ return m_actions.action(i)->setShortcut( cut ); }
-const KInstance* KActionShortcutList::instance() const
+const TDEInstance* TDEActionShortcutList::instance() const
 	{ return m_actions.instance(); }
-TQVariant KActionShortcutList::getOther( Other, uint ) const
+TQVariant TDEActionShortcutList::getOther( Other, uint ) const
 	{ return TQVariant(); }
-bool KActionShortcutList::setOther( Other, uint, TQVariant )
+bool TDEActionShortcutList::setOther( Other, uint, TQVariant )
 	{ return false; }
-const KAction *KActionShortcutList::action( uint i) const
+const TDEAction *TDEActionShortcutList::action( uint i) const
 	{ return m_actions.action(i); }
 
-bool KActionShortcutList::save() const
+bool TDEActionShortcutList::save() const
 {
 	const KXMLGUIClient* guiClient=m_actions.parentGUIClient();
 	const TQString xmlFile=guiClient ? guiClient->xmlFile() : m_actions.xmlFile();
-	kdDebug(129) << "KActionShortcutList::save(): xmlFile = " << xmlFile << endl;
+	kdDebug(129) << "TDEActionShortcutList::save(): xmlFile = " << xmlFile << endl;
 
 	if( m_actions.xmlFile().isEmpty() )
 		return writeSettings();
@@ -756,47 +756,47 @@ bool KActionShortcutList::save() const
 }
 
 //---------------------------------------------------------------------
-// KActionPtrShortcutList
+// TDEActionPtrShortcutList
 //---------------------------------------------------------------------
 
-KActionPtrShortcutList::KActionPtrShortcutList( KActionPtrList& list )
+TDEActionPtrShortcutList::TDEActionPtrShortcutList( TDEActionPtrList& list )
 : m_actions( list )
 	{ }
-KActionPtrShortcutList::~KActionPtrShortcutList()
+TDEActionPtrShortcutList::~TDEActionPtrShortcutList()
 	{ }
-uint KActionPtrShortcutList::count() const
+uint TDEActionPtrShortcutList::count() const
 	{ return m_actions.count(); }
-TQString KActionPtrShortcutList::name( uint i ) const
+TQString TDEActionPtrShortcutList::name( uint i ) const
 	{ return m_actions[i]->name(); }
-TQString KActionPtrShortcutList::label( uint i ) const
+TQString TDEActionPtrShortcutList::label( uint i ) const
 	{ return m_actions[i]->text(); }
-TQString KActionPtrShortcutList::whatsThis( uint i ) const
+TQString TDEActionPtrShortcutList::whatsThis( uint i ) const
 	{ return m_actions[i]->whatsThis(); }
-const KShortcut& KActionPtrShortcutList::shortcut( uint i ) const
+const TDEShortcut& TDEActionPtrShortcutList::shortcut( uint i ) const
 	{ return m_actions[i]->shortcut(); }
-const KShortcut& KActionPtrShortcutList::shortcutDefault( uint i ) const
+const TDEShortcut& TDEActionPtrShortcutList::shortcutDefault( uint i ) const
 	{ return m_actions[i]->shortcutDefault(); }
-bool KActionPtrShortcutList::isConfigurable( uint i ) const
+bool TDEActionPtrShortcutList::isConfigurable( uint i ) const
 	{ return m_actions[i]->isShortcutConfigurable(); }
-bool KActionPtrShortcutList::setShortcut( uint i, const KShortcut& cut )
+bool TDEActionPtrShortcutList::setShortcut( uint i, const TDEShortcut& cut )
 	{ return m_actions[i]->setShortcut( cut ); }
-TQVariant KActionPtrShortcutList::getOther( Other, uint ) const
+TQVariant TDEActionPtrShortcutList::getOther( Other, uint ) const
 	{ return TQVariant(); }
-bool KActionPtrShortcutList::setOther( Other, uint, TQVariant )
+bool TDEActionPtrShortcutList::setOther( Other, uint, TQVariant )
 	{ return false; }
-bool KActionPtrShortcutList::save() const
+bool TDEActionPtrShortcutList::save() const
 	{ return false; }
 
-void KActionShortcutList::virtual_hook( int id, void* data )
-{ KShortcutList::virtual_hook( id, data ); }
+void TDEActionShortcutList::virtual_hook( int id, void* data )
+{ TDEShortcutList::virtual_hook( id, data ); }
 
-void KActionPtrShortcutList::virtual_hook( int id, void* data )
-{ KShortcutList::virtual_hook( id, data ); }
+void TDEActionPtrShortcutList::virtual_hook( int id, void* data )
+{ TDEShortcutList::virtual_hook( id, data ); }
 
-void KActionCollection::virtual_hook( int, void* )
+void TDEActionCollection::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 /* vim: et sw=2 ts=2
  */
 
-#include "kactioncollection.moc"
+#include "tdeactioncollection.moc"
diff --git a/tdeui/kactioncollection.h b/tdeui/tdeactioncollection.h
index 8111effaf..ae6fd6575 100644
--- a/tdeui/kactioncollection.h
+++ b/tdeui/tdeactioncollection.h
@@ -22,17 +22,17 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kactioncollection_h__
-#define __kactioncollection_h__
+#ifndef __tdeactioncollection_h__
+#define __tdeactioncollection_h__
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqkeysequence.h>
 #include <tqobject.h>
 #include <tqvaluelist.h>
 #include <tqguardedptr.h>
 #include <kguiitem.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstdaction.h>
 #include <kicontheme.h>
 
@@ -42,29 +42,29 @@ class TQComboBox;
 class TQPoint;
 class TQIconSet;
 class TQString;
-class KToolBar;
+class TDEToolBar;
 
-class KAccel;
-class KAccelActions;
-class KConfig;
-class KConfigBase;
+class TDEAccel;
+class TDEAccelActions;
+class TDEConfig;
+class TDEConfigBase;
 class KURL;
-class KInstance;
-class KToolBar;
-class KActionCollection;
-class KPopupMenu;
-class KMainWindow;
+class TDEInstance;
+class TDEToolBar;
+class TDEActionCollection;
+class TDEPopupMenu;
+class TDEMainWindow;
 class KXMLGUIClient;
 
-typedef TQValueList<KAction *> KActionPtrList;
+typedef TQValueList<TDEAction *> TDEActionPtrList;
 
 /**
- * A managed set of KAction objects.
+ * A managed set of TDEAction objects.
  * 
- * If you set the tooltips on KActions and want the tooltip to show in statusbar
+ * If you set the tooltips on TDEActions and want the tooltip to show in statusbar
  * (recommended) then you will need to connect a couple of the actionclass signals
  * to the toolbar.
- * The easiest way of doing this is in your KMainWindow subclass, where you create
+ * The easiest way of doing this is in your TDEMainWindow subclass, where you create
  * a statusbar, do:
  *
  * \code
@@ -75,25 +75,25 @@ typedef TQValueList<KAction *> KActionPtrList;
  *           statusBar(), TQT_SLOT( clear() ) );
  * \endcode
  */
-class TDEUI_EXPORT KActionCollection : public TQObject
+class TDEUI_EXPORT TDEActionCollection : public TQObject
 {
-  friend class KAction;
+  friend class TDEAction;
   friend class KXMLGUIClient;
 
   Q_OBJECT
 
 public:
-  KActionCollection( TQWidget *parent, const char *name = 0, KInstance *instance = 0 );
+  TDEActionCollection( TQWidget *parent, const char *name = 0, TDEInstance *instance = 0 );
   /**
    * Use this constructor if you want the collection's actions to restrict
    * their accelerator keys to @p watch rather than the @p parent.  If
    * you don't require shortcuts, you can pass a null to the @p watch parameter.
    */
-  KActionCollection( TQWidget *watch, TQObject* parent, const char *name = 0, KInstance *instance = 0 );
+  TDEActionCollection( TQWidget *watch, TQObject* parent, const char *name = 0, TDEInstance *instance = 0 );
 #ifndef KDE_NO_COMPAT
-  KActionCollection( const KActionCollection &copy );
+  TDEActionCollection( const TDEActionCollection &copy );
 #endif
-  virtual ~KActionCollection();
+  virtual ~TDEActionCollection();
 
   /**
    * This sets the widget to which the keyboard shortcuts should be attached.
@@ -124,82 +124,82 @@ public:
    * would have been ScopeWidget, but that would cause some backwards
    * compatibility problems.
    */
-  //void setDefaultScope( KAction::Scope );
+  //void setDefaultScope( TDEAction::Scope );
 
   /**
    * Doc/View model.  This lets you add the action collection of a document
    * to a view's action collection.
    */
-  bool addDocCollection( KActionCollection* pDoc );
+  bool addDocCollection( TDEActionCollection* pDoc );
 
   /** Returns the number of widgets which this collection is associated with. */
   //uint widgetCount() const;
 
   /**
-   * Returns true if the collection has its own KAccel object.  This will be
+   * Returns true if the collection has its own TDEAccel object.  This will be
    * the case if it was constructed with a valid widget ptr or if setWidget()
    * was called.
    */
-  //bool ownsKAccel() const;
+  //bool ownsTDEAccel() const;
 
-  /** @deprecated  Deprecated because of ambiguous name.  Use kaccel() */
-  virtual KAccel* accel() KDE_DEPRECATED;
-  /** @deprecated  Deprecated because of ambiguous name.  Use kaccel() */
-  virtual const KAccel* accel() const KDE_DEPRECATED;
+  /** @deprecated  Deprecated because of ambiguous name.  Use tdeaccel() */
+  virtual TDEAccel* accel() KDE_DEPRECATED;
+  /** @deprecated  Deprecated because of ambiguous name.  Use tdeaccel() */
+  virtual const TDEAccel* accel() const KDE_DEPRECATED;
 
-  /** Returns the KAccel object of the most recently set widget. */
-  KAccel* kaccel();
-  /** Returns the KAccel object of the most recently set widget. Const version for convenience. */
-  const KAccel* kaccel() const;
+  /** Returns the TDEAccel object of the most recently set widget. */
+  TDEAccel* tdeaccel();
+  /** Returns the TDEAccel object of the most recently set widget. Const version for convenience. */
+  const TDEAccel* tdeaccel() const;
 
-  /** @internal, for KAction::kaccelCurrent() */
-  KAccel* builderKAccel() const;
-  /** Returns the KAccel object associated with widget #. */
-  //KAccel* widgetKAccel( uint i );
-  //const KAccel* widgetKAccel( uint i ) const;
+  /** @internal, for TDEAction::tdeaccelCurrent() */
+  TDEAccel* builderTDEAccel() const;
+  /** Returns the TDEAccel object associated with widget #. */
+  //TDEAccel* widgetTDEAccel( uint i );
+  //const TDEAccel* widgetTDEAccel( uint i ) const;
 
   /** Returns the number of actions in the collection */
   virtual uint count() const;
   bool isEmpty() const { return (count() == 0); }
   /**
-   * Return the KAction* at position "index" in the action collection.
+   * Return the TDEAction* at position "index" in the action collection.
    * @see count()
    */
-  virtual KAction* action( int index ) const;
+  virtual TDEAction* action( int index ) const;
   /**
-   * Find an action (optionally, of a given subclass of KAction) in the action collection.
-   * @param name Name of the KAction.
-   * @param classname Name of the KAction subclass.
-   * @return A pointer to the first KAction in the collection which matches the parameters or
+   * Find an action (optionally, of a given subclass of TDEAction) in the action collection.
+   * @param name Name of the TDEAction.
+   * @param classname Name of the TDEAction subclass.
+   * @return A pointer to the first TDEAction in the collection which matches the parameters or
    * null if nothing matches.
    */
-  virtual KAction* action( const char* name, const char* classname = 0 ) const;
+  virtual TDEAction* action( const char* name, const char* classname = 0 ) const;
 
-  /** Returns a list of all the groups of all the KActions in this action collection.
-   * @see KAction::group()
-   * @see KAction::setGroup()
+  /** Returns a list of all the groups of all the TDEActions in this action collection.
+   * @see TDEAction::group()
+   * @see TDEAction::setGroup()
    */
   virtual TQStringList groups() const;
   /**
    * Returns the list of actions in a particular group managed by this action collection.
    * @param group The name of the group.
    */
-  virtual KActionPtrList actions( const TQString& group ) const;
+  virtual TDEActionPtrList actions( const TQString& group ) const;
   /** Returns the list of actions managed by this action collection. */
-  virtual KActionPtrList actions() const;
+  virtual TDEActionPtrList actions() const;
 
   /**
    * Used for reading shortcut configuration from a non-XML rc file.
    */
-  bool readShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 );
+  bool readShortcutSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 );
   /**
    * Used for writing shortcut configuration to a non-XML rc file.
    */
-  bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, KConfigBase* pConfig = 0 ) const;
+  bool writeShortcutSettings( const TQString& sConfigGroup = TQString::null, TDEConfigBase* pConfig = 0 ) const;
 
-  void setInstance( KInstance *instance );
+  void setInstance( TDEInstance *instance );
   /** The instance with which this class is associated. */
-  KInstance *instance() const;
+  TDEInstance *instance() const;
 
   /**
    * @deprecated
@@ -212,7 +212,7 @@ public:
 
   //TODO FOR KDE4 make this default true
   /**
-   * Enable highlighting notification for specific KActions.
+   * Enable highlighting notification for specific TDEActions.
    * This is false by default, so, by default, the highlighting
    * signals will not be emitted.
    * 
@@ -234,11 +234,11 @@ public:
   bool highlightingEnabled() const;
 
   /**
-   * Call this function if you want to receive a signal whenever a KAction is highlighted in a menu or a toolbar.
+   * Call this function if you want to receive a signal whenever a TDEAction is highlighted in a menu or a toolbar.
    * This is only needed if you do not add this action to this container.
    * You will generally not need to call this function.
    * 
-   * @param container A container in which the KAction is plugged (must inherit TQPopupMenu or KToolBar)
+   * @param container A container in which the TDEAction is plugged (must inherit TQPopupMenu or TDEToolBar)
    * @param action The action you are interested in
    * @see disconnectHighlight()
    * @see actionHighlighted()
@@ -246,13 +246,13 @@ public:
    * @see highlightingEnabled()
    * @see actionHighlighted()
    */
-  void connectHighlight( TQWidget *container, KAction *action );
+  void connectHighlight( TQWidget *container, TDEAction *action );
   /**
    * Disconnect highlight notifications for a particular pair of contianer and action.
    * This is only needed if you do not add this action to this container.
    * You will generally not need to call this function.
    * 
-   * @param container A container in which the KAction is plugged (must inherit TQPopupMenu or KToolBar)
+   * @param container A container in which the TDEAction is plugged (must inherit TQPopupMenu or TDEToolBar)
    * @param action The action you are interested in
    * @see connectHighlight()
    * @see actionHighlighted()
@@ -260,7 +260,7 @@ public:
    * @see highlightingEnabled()
    * @see actionHighlighted()
    */
-  void disconnectHighlight( TQWidget *container, KAction *action );
+  void disconnectHighlight( TQWidget *container, TDEAction *action );
 
   /**
    * The parent KXMLGUIClient, return 0L if not available.
@@ -268,8 +268,8 @@ public:
   const KXMLGUIClient *parentGUIClient() const;
 
 signals:
-  void inserted( KAction* );
-  void removed( KAction* );
+  void inserted( TDEAction* );
+  void removed( TDEAction* );
 
   /** Emitted when @p action is highlighted.
    *  This is only emitted if you have setHighlightingEnabled()
@@ -279,7 +279,7 @@ signals:
    * @see setHighlightingEnabled()
    * @see highlightingEnabled()
    */
-  void actionHighlighted( KAction *action );
+  void actionHighlighted( TDEAction *action );
   /** Emitted when @p action is highlighed or loses highlighting.
    *  This is only emitted if you have setHighlightingEnabled()
    * @see connectHighlight()
@@ -288,7 +288,7 @@ signals:
    * @see setHighlightingEnabled()
    * @see highlightingEnabled()
    */
-  void actionHighlighted( KAction *action, bool highlight );
+  void actionHighlighted( TDEAction *action, bool highlight );
   /** Emitted when an action is highlighted, with text
    *  being the tooltip for the action.
    *  This is only emitted if you have setHighlightingEnabled()
@@ -309,7 +309,7 @@ signals:
 private:
   /**
    * @internal Only to be called by KXMLGUIFactory::addClient().
-   * When actions are being connected, KAction needs to know what
+   * When actions are being connected, TDEAction needs to know what
    * widget it should connect widget-scope actions to, and what
    * main window it should connect
    */
@@ -317,12 +317,12 @@ private:
   void endXMLPlug();
   /** @internal.  Only to be called by KXMLGUIFactory::removeClient() */
   void prepareXMLUnplug();
-  void unplugShortcuts( KAccel* kaccel );
+  void unplugShortcuts( TDEAccel* tdeaccel );
 
   void _clear();
-  void _insert( KAction* );
-  void _remove( KAction* );
-  KAction* _take( KAction* );
+  void _insert( TDEAction* );
+  void _remove( TDEAction* );
+  TDEAction* _take( TDEAction* );
 
 private slots:
    void slotMenuItemHighlighted( int id );
@@ -331,11 +331,11 @@ private slots:
    void slotDestroyed();
 
 private:
-   KAction *findAction( TQWidget *container, int id );
+   TDEAction *findAction( TQWidget *container, int id );
 
 #ifndef KDE_NO_COMPAT
 public:
-  KActionCollection( TQObject *parent, const char *name = 0, KInstance *instance = 0 );
+  TDEActionCollection( TQObject *parent, const char *name = 0, TDEInstance *instance = 0 );
 #endif
 
 public:
@@ -344,34 +344,34 @@ public:
    * Generally you don't have to call this. The action inserts itself automatically
    * into its parent collection. This can be useful however for a short-lived
    * collection (e.g. for a popupmenu, where the signals from the collection are needed too).
-   * (don't forget that in the simple case, a list of actions should be a simple KActionPtrList).
+   * (don't forget that in the simple case, a list of actions should be a simple TDEActionPtrList).
    * If you manually insert actions into a 2nd collection, don't forget to take them out
    * again before destroying the collection.
-   * @param action The KAction to add.
+   * @param action The TDEAction to add.
    */
-  void insert( KAction* action);
+  void insert( TDEAction* action);
 
   /**
    * Removes an action from the collection and deletes it.
-   * Since the KAction destructor removes the action from the collection, you generally
+   * Since the TDEAction destructor removes the action from the collection, you generally
    * don't have to call this.
-   * @param action The KAction to remove.
+   * @param action The TDEAction to remove.
    */
-  void remove( KAction* action );
+  void remove( TDEAction* action );
 
   /**
    * Removes an action from the collection.
-   * Since the KAction destructor removes the action from the collection, you generally
+   * Since the TDEAction destructor removes the action from the collection, you generally
    * don't have to call this.
    * @return NULL if not found else returns action.
-   * @param action the KAction to remove.
+   * @param action the TDEAction to remove.
    */
-  KAction* take( KAction* action );
+  TDEAction* take( TDEAction* action );
 
 #ifndef KDE_NO_COMPAT
-  KActionCollection operator+ ( const KActionCollection& ) const;
-  KActionCollection& operator= ( const KActionCollection& );
-  KActionCollection& operator+= ( const KActionCollection& );
+  TDEActionCollection operator+ ( const TDEActionCollection& ) const;
+  TDEActionCollection& operator= ( const TDEActionCollection& );
+  TDEActionCollection& operator+= ( const TDEActionCollection& );
 #endif // !KDE_NO_COMPAT
 
   // KDE4: clear() doesn't need to be a slot
@@ -385,9 +385,9 @@ public slots:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    KActionCollection( const char* name, const KXMLGUIClient* parent );
-    class KActionCollectionPrivate;
-    KActionCollectionPrivate *d;
+    TDEActionCollection( const char* name, const KXMLGUIClient* parent );
+    class TDEActionCollectionPrivate;
+    TDEActionCollectionPrivate *d;
 };
 
 #endif
diff --git a/tdeui/kactionselector.cpp b/tdeui/tdeactionselector.cpp
index 8923cbd4f..c3c7329b8 100644
--- a/tdeui/kactionselector.cpp
+++ b/tdeui/tdeactionselector.cpp
@@ -17,9 +17,9 @@
 */
 
 
-#include "kactionselector.h"
+#include "tdeactionselector.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h> // for spacingHint()
 #include <kdebug.h>
@@ -31,24 +31,24 @@
 #include <tqevent.h>
 #include <tqwhatsthis.h>
 
-class KActionSelectorPrivate {
+class TDEActionSelectorPrivate {
   public:
   TQListBox *availableListBox, *selectedListBox;
   TQToolButton *btnAdd, *btnRemove, *btnUp, *btnDown;
   TQLabel *lAvailable, *lSelected;
   bool moveOnDoubleClick, keyboardEnabled;
-  KActionSelector::ButtonIconSize iconSize;
+  TDEActionSelector::ButtonIconSize iconSize;
   TQString addIcon, removeIcon, upIcon, downIcon;
-  KActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy;
+  TDEActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy;
   bool showUpDownButtons;
 };
 
 //BEGIN Constructor/destructor
 
-KActionSelector::KActionSelector( TQWidget *parent, const char *name )
+TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  d = new KActionSelectorPrivate();
+  d = new TDEActionSelectorPrivate();
   d->moveOnDoubleClick = true;
   d->keyboardEnabled = true;
   d->iconSize = SmallIcon;
@@ -60,7 +60,7 @@ KActionSelector::KActionSelector( TQWidget *parent, const char *name )
   d->selectedInsertionPolicy = BelowCurrent;
   d->showUpDownButtons = true;
 
-  //int isz = IconSize( KIcon::Small );
+  //int isz = IconSize( TDEIcon::Small );
 
   TQHBoxLayout *lo = new TQHBoxLayout( this );
   lo->setSpacing( KDialog::spacingHint() );
@@ -116,7 +116,7 @@ KActionSelector::KActionSelector( TQWidget *parent, const char *name )
   d->selectedListBox->installEventFilter( this );
 }
 
-KActionSelector::~KActionSelector()
+TDEActionSelector::~TDEActionSelector()
 {
   delete d;
 }
@@ -125,17 +125,17 @@ KActionSelector::~KActionSelector()
 
 //BEGIN Public Methods
 
-TQListBox *KActionSelector::availableListBox() const
+TQListBox *TDEActionSelector::availableListBox() const
 {
   return d->availableListBox;
 }
 
-TQListBox *KActionSelector::selectedListBox() const
+TQListBox *TDEActionSelector::selectedListBox() const
 {
   return d->selectedListBox;
 }
 
-void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
+void TDEActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
 {
   switch ( button )
   {
@@ -156,11 +156,11 @@ void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
     d->btnDown->setIconSet( SmallIconSet( icon, d->iconSize ) );
     break;
     default:
-    kdDebug(13001)<<"KActionSelector::setButtonIcon: DAINBREAD!"<<endl;
+    kdDebug(13001)<<"TDEActionSelector::setButtonIcon: DAINBREAD!"<<endl;
   }
 }
 
-void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button )
+void TDEActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button )
 {
   switch ( button )
   {
@@ -177,11 +177,11 @@ void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton but
     d->btnDown->setIconSet( iconset );
     break;
     default:
-    kdDebug(13001)<<"KActionSelector::setButtonIconSet: DAINBREAD!"<<endl;
+    kdDebug(13001)<<"TDEActionSelector::setButtonIconSet: DAINBREAD!"<<endl;
   }
 }
 
-void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
+void TDEActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
 {
   switch ( button )
   {
@@ -198,11 +198,11 @@ void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button )
     d->btnDown->setTextLabel( tip );
     break;
     default:
-    kdDebug(13001)<<"KActionSelector::setButtonToolTip: DAINBREAD!"<<endl;
+    kdDebug(13001)<<"TDEActionSelector::setButtonToolTip: DAINBREAD!"<<endl;
   }
 }
 
-void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button )
+void TDEActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button )
 {
   switch ( button )
   {
@@ -219,11 +219,11 @@ void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton butto
     TQWhatsThis::add( d->btnDown, text );
     break;
     default:
-    kdDebug(13001)<<"KActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl;
+    kdDebug(13001)<<"TDEActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl;
   }
 }
 
-void KActionSelector::setButtonsEnabled()
+void TDEActionSelector::setButtonsEnabled()
 {
   d->btnAdd->setEnabled( d->availableListBox->currentItem() > -1 );
   d->btnRemove->setEnabled( d->selectedListBox->currentItem() > -1 );
@@ -236,84 +236,84 @@ void KActionSelector::setButtonsEnabled()
 
 //BEGIN Properties
 
-bool KActionSelector::moveOnDoubleClick() const
+bool TDEActionSelector::moveOnDoubleClick() const
 {
   return d->moveOnDoubleClick;
 }
 
-void KActionSelector::setMoveOnDoubleClick( bool b )
+void TDEActionSelector::setMoveOnDoubleClick( bool b )
 {
   d->moveOnDoubleClick = b;
 }
 
-bool KActionSelector::keyboardEnabled() const
+bool TDEActionSelector::keyboardEnabled() const
 {
   return d->keyboardEnabled;
 }
 
-void KActionSelector::setKeyboardEnabled( bool b )
+void TDEActionSelector::setKeyboardEnabled( bool b )
 {
   d->keyboardEnabled = b;
 }
 
-TQString KActionSelector::availableLabel() const
+TQString TDEActionSelector::availableLabel() const
 {
   return d->lAvailable->text();
 }
 
-void KActionSelector::setAvailableLabel( const TQString &text )
+void TDEActionSelector::setAvailableLabel( const TQString &text )
 {
   d->lAvailable->setText( text );
 }
 
-TQString KActionSelector::selectedLabel() const
+TQString TDEActionSelector::selectedLabel() const
 {
   return d->lSelected->text();
 }
 
-void KActionSelector::setSelectedLabel( const TQString &text )
+void TDEActionSelector::setSelectedLabel( const TQString &text )
 {
   d->lSelected->setText( text );
 }
 
-KActionSelector::ButtonIconSize KActionSelector::buttonIconSize() const
+TDEActionSelector::ButtonIconSize TDEActionSelector::buttonIconSize() const
 {
   return d->iconSize;
 }
 
-void KActionSelector::setButtonIconSize( ButtonIconSize size )
+void TDEActionSelector::setButtonIconSize( ButtonIconSize size )
 {
   d->iconSize = size;
   // reload icons
   loadIcons();
 }
 
-KActionSelector::InsertionPolicy KActionSelector::availableInsertionPolicy() const
+TDEActionSelector::InsertionPolicy TDEActionSelector::availableInsertionPolicy() const
 {
   return d->availableInsertionPolicy;
 }
 
-void KActionSelector::setAvailableInsertionPolicy( InsertionPolicy p )
+void TDEActionSelector::setAvailableInsertionPolicy( InsertionPolicy p )
 {
   d->availableInsertionPolicy = p;
 }
 
-KActionSelector::InsertionPolicy KActionSelector::selectedInsertionPolicy() const
+TDEActionSelector::InsertionPolicy TDEActionSelector::selectedInsertionPolicy() const
 {
   return d->selectedInsertionPolicy;
 }
 
-void KActionSelector::setSelectedInsertionPolicy( InsertionPolicy p )
+void TDEActionSelector::setSelectedInsertionPolicy( InsertionPolicy p )
 {
   d->selectedInsertionPolicy = p;
 }
 
-bool KActionSelector::showUpDownButtons() const
+bool TDEActionSelector::showUpDownButtons() const
 {
   return d->showUpDownButtons;
 }
 
-void KActionSelector::setShowUpDownButtons( bool show )
+void TDEActionSelector::setShowUpDownButtons( bool show )
 {
   d->showUpDownButtons = show;
   if ( show )
@@ -332,7 +332,7 @@ void KActionSelector::setShowUpDownButtons( bool show )
 
 //BEGIN Public Slots
 
-void KActionSelector::polish()
+void TDEActionSelector::polish()
 {
   setButtonsEnabled();
 }
@@ -340,7 +340,7 @@ void KActionSelector::polish()
 //END Public Slots
 
 //BEGIN Protected
-void KActionSelector::keyPressEvent( TQKeyEvent *e )
+void TDEActionSelector::keyPressEvent( TQKeyEvent *e )
 {
   if ( ! d->keyboardEnabled ) return;
   if ( (e->state() & TQt::ControlButton) )
@@ -366,7 +366,7 @@ void KActionSelector::keyPressEvent( TQKeyEvent *e )
   }
 }
 
-bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
+bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
 {
   if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress )
   {
@@ -413,7 +413,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e )
 
 //BEGIN Private Slots
 
-void KActionSelector::buttonAddClicked()
+void TDEActionSelector::buttonAddClicked()
 {
   // move all selected items from available to selected listbox
   TQListBoxItem *item = d->availableListBox->firstItem();
@@ -423,15 +423,16 @@ void KActionSelector::buttonAddClicked()
       d->selectedListBox->insertItem( item, insertionIndex( d->selectedListBox, d->selectedInsertionPolicy ) );
       d->selectedListBox->setCurrentItem( item );
       emit added( item );
-    }
-    item = item->next();
+      item = d->availableListBox->firstItem();
+    } else
+      item = item->next();
   }
   if ( d->selectedInsertionPolicy == Sorted )
     d->selectedListBox->sort();
   d->selectedListBox->setFocus();
 }
 
-void KActionSelector::buttonRemoveClicked()
+void TDEActionSelector::buttonRemoveClicked()
 {
   // move all selected items from selected to available listbox
   TQListBoxItem *item = d->selectedListBox->firstItem();
@@ -441,15 +442,16 @@ void KActionSelector::buttonRemoveClicked()
       d->availableListBox->insertItem( item, insertionIndex( d->availableListBox, d->availableInsertionPolicy ) );
       d->availableListBox->setCurrentItem( item );
       emit removed( item );
-    }
-    item = item->next();
+      item = d->selectedListBox->firstItem();
+    } else
+      item = item->next();
   }
   if ( d->availableInsertionPolicy == Sorted )
     d->availableListBox->sort();
   d->availableListBox->setFocus();
 }
 
-void KActionSelector::buttonUpClicked()
+void TDEActionSelector::buttonUpClicked()
 {
   int c = d->selectedListBox->currentItem();
   if ( c < 1 ) return;
@@ -460,7 +462,7 @@ void KActionSelector::buttonUpClicked()
   emit movedUp( item );
 }
 
-void KActionSelector::buttonDownClicked()
+void TDEActionSelector::buttonDownClicked()
 {
   int c = d->selectedListBox->currentItem();
   if ( c < 0 || c == int( d->selectedListBox->count() ) - 1 ) return;
@@ -471,7 +473,7 @@ void KActionSelector::buttonDownClicked()
   emit movedDown( item );
 }
 
-void KActionSelector::itemDoubleClicked( TQListBoxItem *item )
+void TDEActionSelector::itemDoubleClicked( TQListBoxItem *item )
 {
   if ( d->moveOnDoubleClick )
     moveItem( item );
@@ -481,7 +483,7 @@ void KActionSelector::itemDoubleClicked( TQListBoxItem *item )
 
 //BEGIN Private Methods
 
-void KActionSelector::loadIcons()
+void TDEActionSelector::loadIcons()
 {
   d->btnAdd->setIconSet( SmallIconSet( d->addIcon, d->iconSize ) );
   d->btnRemove->setIconSet( SmallIconSet( d->removeIcon, d->iconSize ) );
@@ -489,7 +491,7 @@ void KActionSelector::loadIcons()
   d->btnDown->setIconSet( SmallIconSet( d->downIcon, d->iconSize ) );
 }
 
-void KActionSelector::moveItem( TQListBoxItem *item )
+void TDEActionSelector::moveItem( TQListBoxItem *item )
 {
   TQListBox *lbFrom = item->listBox();
   TQListBox *lbTo;
@@ -516,7 +518,7 @@ void KActionSelector::moveItem( TQListBoxItem *item )
     emit removed( item );
 }
 
-int KActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
+int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 {
   int index;
   switch ( policy )
@@ -535,4 +537,4 @@ int KActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy )
 }
 
 //END Private Methods
-#include "kactionselector.moc"
+#include "tdeactionselector.moc"
diff --git a/tdeui/kactionselector.h b/tdeui/tdeactionselector.h
index 5ac58b0ed..fb382e58e 100644
--- a/tdeui/kactionselector.h
+++ b/tdeui/tdeactionselector.h
@@ -29,7 +29,7 @@ class TQKeyEvent;
 class TQEvent;
 class TQIconSet;
 
-class KActionSelectorPrivate;
+class TDEActionSelectorPrivate;
 
 /**
     @short A widget for selecting and arranging actions/objects
@@ -76,7 +76,7 @@ class KActionSelectorPrivate;
     @author Anders Lund <anders@alweb.dk>
 */
 
-class TDEUI_EXPORT KActionSelector : public TQWidget {
+class TDEUI_EXPORT TDEActionSelector : public TQWidget {
   Q_OBJECT
   TQ_ENUMS( ButtonIconSize InsertionPolicy )
   TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
@@ -89,8 +89,8 @@ class TDEUI_EXPORT KActionSelector : public TQWidget {
   TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
 
 public:
-  KActionSelector( TQWidget *parent=0, const char *name=0 );
-  ~KActionSelector();
+  TDEActionSelector( TQWidget *parent=0, const char *name=0 );
+  ~TDEActionSelector();
 
   /**
      @return The TQListBox holding the available actions
@@ -115,7 +115,7 @@ public:
   /**
     This enum identifies the icon sizes, used for the move buttons.
     The values correspond to the following pixel sizes:
-    @li SmallIcon - the return value of IconSize( KIcon::Small ), the user defined size
+    @li SmallIcon - the return value of IconSize( TDEIcon::Small ), the user defined size
                 of a small icon in KDE. This is the default setting.
     @li Small - 16px
     @li Medium - 22px
@@ -274,7 +274,7 @@ public:
     Sets the iconset for button @p button to @p iconset.
     You can use this method to et a costum icon set. Either
     created by TQIconSet, or use the application instance of
-    KIconLoader (recommended).
+    TDEIconLoader (recommended).
   */
   void setButtonIconSet( const TQIconSet &iconset, MoveButton button );
 
@@ -396,7 +396,7 @@ private:
   /** @private
     Private data storage
   */
-  KActionSelectorPrivate *d;
+  TDEActionSelectorPrivate *d;
 };
 
 #endif // _KACTION_SELECTOR_H_
diff --git a/tdeui/kactionshortcutlist.h b/tdeui/tdeactionshortcutlist.h
index c61a7e2a8..affb6bf2a 100644
--- a/tdeui/kactionshortcutlist.h
+++ b/tdeui/tdeactionshortcutlist.h
@@ -1,66 +1,66 @@
 #ifndef _KACTIONSHORTCUTLIST_H
 #define _KACTIONSHORTCUTLIST_H
 
-#include <kshortcutlist.h>
-#include <kaction.h>
+#include <tdeshortcutlist.h>
+#include <tdeaction.h>
 
 //---------------------------------------------------------------------
-// class KActionShortcutList
+// class TDEActionShortcutList
 //---------------------------------------------------------------------
 
-class KAccelShortcutListPrivate;
-class TDEUI_EXPORT KActionShortcutList : public KShortcutList
+class TDEAccelShortcutListPrivate;
+class TDEUI_EXPORT TDEActionShortcutList : public TDEShortcutList
 {
  public:
-	KActionShortcutList( KActionCollection* );
-	virtual ~KActionShortcutList();
+	TDEActionShortcutList( TDEActionCollection* );
+	virtual ~TDEActionShortcutList();
 
 	virtual uint count() const;
 	virtual TQString name( uint index ) const;
 	virtual TQString label( uint index ) const;
 	virtual TQString whatsThis( uint index ) const;
-	virtual const KShortcut& shortcut( uint index ) const;
-	virtual const KShortcut& shortcutDefault( uint index ) const;
+	virtual const TDEShortcut& shortcut( uint index ) const;
+	virtual const TDEShortcut& shortcutDefault( uint index ) const;
 	virtual bool isConfigurable( uint index ) const;
-	virtual bool setShortcut( uint index, const KShortcut& shortcut );
+	virtual bool setShortcut( uint index, const TDEShortcut& shortcut );
 
-	virtual const KInstance* instance() const;
+	virtual const TDEInstance* instance() const;
 
 	virtual TQVariant getOther( Other, uint index ) const;
 	virtual bool setOther( Other, uint index, TQVariant );
 
 	virtual bool save() const;
 
-	const KAction *action( uint ) const;
+	const TDEAction *action( uint ) const;
 
  protected:
-	KActionCollection& m_actions;
+	TDEActionCollection& m_actions;
 
  protected:
         virtual void virtual_hook( int id, void* data );
  private:
-	KAccelShortcutListPrivate* d;
+	TDEAccelShortcutListPrivate* d;
 };
 
 //---------------------------------------------------------------------
-// class KActionPtrShortcutList
+// class TDEActionPtrShortcutList
 //---------------------------------------------------------------------
 
-class KAccelShortcutListPrivate;
-class TDEUI_EXPORT KActionPtrShortcutList : public KShortcutList
+class TDEAccelShortcutListPrivate;
+class TDEUI_EXPORT TDEActionPtrShortcutList : public TDEShortcutList
 {
  public:
-	KActionPtrShortcutList( KActionPtrList& );
-	virtual ~KActionPtrShortcutList();
+	TDEActionPtrShortcutList( TDEActionPtrList& );
+	virtual ~TDEActionPtrShortcutList();
 
 	virtual uint count() const;
 	virtual TQString name( uint index ) const;
 	virtual TQString label( uint index ) const;
 	virtual TQString whatsThis( uint index ) const;
-	virtual const KShortcut& shortcut( uint index ) const;
-	virtual const KShortcut& shortcutDefault( uint index ) const;
+	virtual const TDEShortcut& shortcut( uint index ) const;
+	virtual const TDEShortcut& shortcutDefault( uint index ) const;
 	virtual bool isConfigurable( uint index ) const;
-	virtual bool setShortcut( uint index, const KShortcut& shortcut);
+	virtual bool setShortcut( uint index, const TDEShortcut& shortcut);
 
 	virtual TQVariant getOther( Other, uint index ) const;
 	virtual bool setOther( Other, uint index, TQVariant );
@@ -68,12 +68,12 @@ class TDEUI_EXPORT KActionPtrShortcutList : public KShortcutList
 	virtual bool save() const;
 
  protected:
-	KActionPtrList& m_actions;
+	TDEActionPtrList& m_actions;
 
  protected:
        virtual void virtual_hook( int id, void* data );
  private:
-	KAccelShortcutListPrivate* d;
+	TDEAccelShortcutListPrivate* d;
 };
 
 #endif // !_KACTIONSHORTCUTLIST_H
diff --git a/tdeui/kcmodule.cpp b/tdeui/tdecmodule.cpp
index 7d82d2957..c6b7d3726 100644
--- a/tdeui/kcmodule.cpp
+++ b/tdeui/tdecmodule.cpp
@@ -23,58 +23,58 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
-#include <kconfigskeleton.h>
-#include <kconfigdialogmanager.h>
+#include <tdeaboutdata.h>
+#include <tdeconfigskeleton.h>
+#include <tdeconfigdialogmanager.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-#include "kcmodule.h"
-#include "kcmodule.moc"
+#include "tdecmodule.h"
+#include "tdecmodule.moc"
 
-class KCModulePrivate
+class TDECModulePrivate
 {
 public:
-    KCModulePrivate():
+    TDECModulePrivate():
         _about( 0 ),
         _useRootOnlyMsg( false ),
         _hasOwnInstance( true ),
         _unmanagedWidgetChangeState( false )
         { }
 
-    KInstance *_instance;
-    KAboutData *_about;
+    TDEInstance *_instance;
+    TDEAboutData *_about;
     TQString _rootOnlyMsg;
     bool _useRootOnlyMsg;
     bool _hasOwnInstance;
-    TQPtrList<KConfigDialogManager> managers;
+    TQPtrList<TDEConfigDialogManager> managers;
     TQString _quickHelp;
 
     // this member is used to record the state on non-automatically
-    // managed widgets, allowing for mixed KConfigXT-drive and manual
+    // managed widgets, allowing for mixed TDEConfigXT-drive and manual
     // widgets to coexist peacefully and do the correct thing with
     // the changed(bool) signal
     bool _unmanagedWidgetChangeState;
 };
 
-KCModule::KCModule(TQWidget *parent, const char *name, const TQStringList &)
+TDECModule::TDECModule(TQWidget *parent, const char *name, const TQStringList &)
     : TQWidget(parent, name)
 {
     init();
     if (name && strlen(name)) {
-        d->_instance = new KInstance(name);
-        KGlobal::locale()->insertCatalogue(name);
+        d->_instance = new TDEInstance(name);
+        TDEGlobal::locale()->insertCatalogue(name);
     } else
-        d->_instance = new KInstance("kcmunnamed");
-    KGlobal::setActiveInstance(this->instance());
+        d->_instance = new TDEInstance("kcmunnamed");
+    TDEGlobal::setActiveInstance(this->instance());
 
     d->managers.setAutoDelete( true );
 
 }
 
-KCModule::KCModule(KInstance *instance, TQWidget *parent, const TQStringList & )
+TDECModule::TDECModule(TDEInstance *instance, TQWidget *parent, const TQStringList & )
     : TQWidget(parent, instance ? instance->instanceName().data() : 0)
 {
     init();
@@ -82,28 +82,28 @@ KCModule::KCModule(KInstance *instance, TQWidget *parent, const TQStringList & )
 
     if (instance)
     {
-        KGlobal::locale()->insertCatalogue(instance->instanceName());
+        TDEGlobal::locale()->insertCatalogue(instance->instanceName());
     }
 
     d->_hasOwnInstance = false;
-    KGlobal::setActiveInstance(this->instance());
+    TDEGlobal::setActiveInstance(this->instance());
 }
 
-void KCModule::init()
+void TDECModule::init()
 {
-    d = new KCModulePrivate;
+    d = new TDECModulePrivate;
    _btn = Help|Default|Apply;
 }
 
-KConfigDialogManager* KCModule::addConfig( KConfigSkeleton *config, TQWidget* widget )
+TDEConfigDialogManager* TDECModule::addConfig( TDEConfigSkeleton *config, TQWidget* widget )
 {
-    KConfigDialogManager* manager = new KConfigDialogManager( widget, config, name() );
+    TDEConfigDialogManager* manager = new TDEConfigDialogManager( widget, config, name() );
     connect( manager, TQT_SIGNAL( widgetModified() ), TQT_SLOT( widgetChanged() ));
     d->managers.append( manager );
     return manager;
 }
 
-KCModule::~KCModule()
+TDECModule::~TDECModule()
 {
     if (d->_hasOwnInstance)
        delete d->_instance;
@@ -111,36 +111,36 @@ KCModule::~KCModule()
     delete d;
 }
 
-void KCModule::load()
+void TDECModule::load()
 {
-    KConfigDialogManager* manager;
+    TDEConfigDialogManager* manager;
     for( manager = d->managers.first(); manager; manager = d->managers.next() )
         manager->updateWidgets();
 }
 
-void KCModule::save()
+void TDECModule::save()
 {
-    KConfigDialogManager* manager;
+    TDEConfigDialogManager* manager;
     for( manager = d->managers.first(); manager; manager = d->managers.next() )
         manager->updateSettings();
     emit( changed( false ));
 }
 
-void KCModule::defaults()
+void TDECModule::defaults()
 {
-    KConfigDialogManager* manager;
+    TDEConfigDialogManager* manager;
     for( manager = d->managers.first(); manager; manager = d->managers.next() )
         manager->updateWidgetsDefault();
 }
 
-void KCModule::widgetChanged()
+void TDECModule::widgetChanged()
 {
     emit changed(d->_unmanagedWidgetChangeState || managedWidgetChangeState());
 }
 
-bool KCModule::managedWidgetChangeState() const
+bool TDECModule::managedWidgetChangeState() const
 {
-    KConfigDialogManager* manager;
+    TDEConfigDialogManager* manager;
     for( manager = d->managers.first(); manager; manager = d->managers.next() )
     {
         if ( manager->hasChanged() )
@@ -150,71 +150,71 @@ bool KCModule::managedWidgetChangeState() const
     return false;
 }
 
-void KCModule::unmanagedWidgetChangeState(bool changed)
+void TDECModule::unmanagedWidgetChangeState(bool changed)
 {
     d->_unmanagedWidgetChangeState = changed;
     widgetChanged();
 }
 
-const KAboutData *KCModule::aboutData() const
+const TDEAboutData *TDECModule::aboutData() const
 {
     return d->_about;
 }
 
-void KCModule::setAboutData( KAboutData* about )
+void TDECModule::setAboutData( TDEAboutData* about )
 {
     delete d->_about;
     d->_about = about;
 }
 
-void KCModule::setRootOnlyMsg(const TQString& msg)
+void TDECModule::setRootOnlyMsg(const TQString& msg)
 {
     d->_rootOnlyMsg = msg;
 }
 
-TQString KCModule::rootOnlyMsg() const
+TQString TDECModule::rootOnlyMsg() const
 {
     return d->_rootOnlyMsg;
 }
 
-void KCModule::setUseRootOnlyMsg(bool on)
+void TDECModule::setUseRootOnlyMsg(bool on)
 {
     d->_useRootOnlyMsg = on;
 }
 
-bool KCModule::useRootOnlyMsg() const
+bool TDECModule::useRootOnlyMsg() const
 {
     return d->_useRootOnlyMsg;
 }
 
-void KCModule::changed()
+void TDECModule::changed()
 {
     emit changed(true);
 }
 
-KInstance *KCModule::instance() const
+TDEInstance *TDECModule::instance() const
 {
     return d->_instance;
 }
 
-void KCModule::setQuickHelp( const TQString& help )
+void TDECModule::setQuickHelp( const TQString& help )
 {
     d->_quickHelp = help;
     emit( quickHelpChanged() );
 }
 
-TQString KCModule::quickHelp() const
+TQString TDECModule::quickHelp() const
 {
     return d->_quickHelp;
 }
 
 
-const TQPtrList<KConfigDialogManager>& KCModule::configs() const
+const TQPtrList<TDEConfigDialogManager>& TDECModule::configs() const
 {
     return d->managers;
 }
 
-void KCModule::virtual_hook( int, void* )
+void TDECModule::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 // vim: sw=4 et sts=4
diff --git a/tdeui/kcmodule.h b/tdeui/tdecmodule.h
index bba06ae4a..12a10fac9 100644
--- a/tdeui/kcmodule.h
+++ b/tdeui/tdecmodule.h
@@ -29,11 +29,11 @@
 
 class TQStringList;
 
-class KAboutData;
-class KConfigDialogManager;
-class KConfigSkeleton;
-class KCModulePrivate;
-class KInstance;
+class TDEAboutData;
+class TDEConfigDialogManager;
+class TDEConfigSkeleton;
+class TDECModulePrivate;
+class TDEInstance;
 
 /**
  * The base class for control center modules.
@@ -54,8 +54,8 @@ class KInstance;
  * \code
  * #include <kgenericfactory.h>
  *
- * typedef KGenericFactory<YourKCModule, TQWidget> YourKCModuleFactory;
- * K_EXPORT_COMPONENT_FACTORY( yourLibName, YourKCModuleFactory("name_of_the_po_file") );
+ * typedef KGenericFactory<YourTDECModule, TQWidget> YourTDECModuleFactory;
+ * K_EXPORT_COMPONENT_FACTORY( yourLibName, YourTDECModuleFactory("name_of_the_po_file") );
  * \endcode
  *
  * The parameter "name_of_the_po_file" has to correspond with the messages target
@@ -66,7 +66,7 @@ class KInstance;
  *
  * @author Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
  */
-class TDEUI_EXPORT KCModule : public TQWidget
+class TDEUI_EXPORT TDECModule : public TQWidget
 {
   Q_OBJECT
 
@@ -76,7 +76,7 @@ public:
    * An enumeration type for the buttons used by this module.
    * You should only use Help, Default and Apply. The rest is obsolete.
    *
-   * @see KCModule::buttons @see KCModule::setButtons
+   * @see TDECModule::buttons @see TDECModule::setButtons
    */
   enum Button {Help=1, Default=2, Apply=16,
                Reset=4, /* obsolete, do not use! */
@@ -89,14 +89,14 @@ public:
    * Make sure you have a TQStringList argument in your
    * implementation.
    */
-  KCModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() );
+  TDECModule(TQWidget *parent=0, const char *name=0, const TQStringList &args=TQStringList() );
 
-  KCModule(KInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
+  TDECModule(TDEInstance *instance, TQWidget *parent=0, const TQStringList &args=TQStringList() );
 
   /*
    * Destroys the module.
    */
-  ~KCModule();
+  ~TDECModule();
 
   /**
    * Load the configuration data into the module.
@@ -111,9 +111,9 @@ public:
    * center, to undo all of his changes and restore the currently valid
    * settings. 
    *
-   * If you use KConfigXT, loading is taken care of automatically and 
+   * If you use TDEConfigXT, loading is taken care of automatically and 
    * you do not need to do it manually. However, if you for some reason reimplement it and
-   * also are using KConfigXT, you must call this function otherwise the loading of KConfigXT 
+   * also are using TDEConfigXT, you must call this function otherwise the loading of TDEConfigXT 
    * options will not work.
    *
    */
@@ -134,9 +134,9 @@ public:
    *
    * save is called when the user clicks "Apply" or "Ok".
    *
-   * If you use KConfigXT, saving is taken care off automatically and 
+   * If you use TDEConfigXT, saving is taken care off automatically and 
    * you do not need to load manually. However, if you for some reason reimplement it and
-   * also are using KConfigXT, you must call this function, otherwise the saving of KConfigXT 
+   * also are using TDEConfigXT, you must call this function, otherwise the saving of TDEConfigXT 
    * options will not work. Call it at the very end of your reimplementation, to avoid
    * changed() signals getting emitted when you modify widgets.
    */
@@ -148,9 +148,9 @@ public:
    * This method is called when the user clicks the "Default"
    * button. It should set the display to useful values.
    *
-   * If you use KConfigXT, you do not have to reimplement this function since
+   * If you use TDEConfigXT, you do not have to reimplement this function since
    * the fetching and settings of default values is done automatically. However, if you 
-   * reimplement and also are using KConfigXT, remember to call the base function at the 
+   * reimplement and also are using TDEConfigXT, remember to call the base function at the 
    * very end of your reimplementation.
    */
   virtual void defaults();
@@ -182,15 +182,15 @@ public:
    * If you override you should  have it return a pointer to a constant.
    *
    *
-   * @returns the KAboutData for this module
+   * @returns the TDEAboutData for this module
    */
-  virtual const KAboutData *aboutData() const;
+  virtual const TDEAboutData *aboutData() const;
   
   /**
-   * This sets the KAboutData returned by aboutData()
+   * This sets the TDEAboutData returned by aboutData()
    * @since 3.3
    */
-   void setAboutData( KAboutData* about );
+   void setAboutData( TDEAboutData* about );
 
   /**
    * Indicate which buttons will be used.
@@ -198,7 +198,7 @@ public:
    * The return value is a value or'ed together from
    * the Button enumeration type.
    *
-   * @see KCModule::setButtons
+   * @see TDECModule::setButtons
    */
   int buttons() const { return _btn; }
 
@@ -212,7 +212,7 @@ public:
    * customized message. If none has been set, a default message
    * will be used.
    *
-   * @see KCModule::setRootOnlyMsg
+   * @see TDECModule::setRootOnlyMsg
    */
   TQString rootOnlyMsg() const;
 
@@ -224,30 +224,30 @@ public:
    * appear (for example if it has already one). This function
    * tells KControl if a RootOnly message should be shown
    *
-   * @see KCModule::setUseRootOnlyMsg
+   * @see TDECModule::setUseRootOnlyMsg
    */
   bool useRootOnlyMsg() const;
 
-  KInstance *instance() const;
+  TDEInstance *instance() const;
 
   /**
-   * @return a list of @ref KConfigDialogManager's in use, if any.
+   * @return a list of @ref TDEConfigDialogManager's in use, if any.
    * @since 3.4
    */
-  const TQPtrList<KConfigDialogManager>& configs() const;
+  const TQPtrList<TDEConfigDialogManager>& configs() const;
 
 protected:
   /**
-   * Adds a KConfigskeleton @p config to watch the widget @p widget
+   * Adds a TDEConfigskeleton @p config to watch the widget @p widget
    *
    * This function is useful if you need to handle multiple configuration files.
    *
    * @since 3.3
-   * @return a pointer to the KConfigDialogManager in use
-   * @param config the KConfigSkeleton to use
+   * @return a pointer to the TDEConfigDialogManager in use
+   * @param config the TDEConfigSkeleton to use
    * @param widget the widget to watch
    */
-  KConfigDialogManager* addConfig( KConfigSkeleton *config, TQWidget* widget );
+  TDEConfigDialogManager* addConfig( TDEConfigSkeleton *config, TQWidget* widget );
 
   /**
    * Sets the quick help.
@@ -300,11 +300,11 @@ 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 KCModule::buttons
+   * @see TDECModule::buttons
    */
   void setButtons(int btn) { _btn = btn; }
 
@@ -315,7 +315,7 @@ protected:
    * corresponding desktop file contains the line X-TDE-RootOnly=true.
    * If no message is set, a default one will be used.
    *
-   * @see KCModule::rootOnlyMsg
+   * @see TDECModule::rootOnlyMsg
    */
   void setRootOnlyMsg(const TQString& msg);
 
@@ -325,7 +325,7 @@ protected:
    * Following the value of @p on, the RootOnly message will be
    * shown or not.
    *
-   * @see KCModule::useRootOnlyMsg
+   * @see TDECModule::useRootOnlyMsg
    */
   void setUseRootOnlyMsg(bool on);
 
@@ -348,7 +348,7 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KCModulePrivate *d;
+  TDECModulePrivate *d;
 
   /**
    * Internal function for initialization of the class.
diff --git a/tdeui/kcompletionbox.cpp b/tdeui/tdecompletionbox.cpp
index 56d52b88a..96c9c1794 100644
--- a/tdeui/kcompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -27,13 +27,13 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotifyclient.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
-#include "kcompletionbox.h"
+#include "tdecompletionbox.h"
 
-class KCompletionBox::KCompletionBoxPrivate
+class TDECompletionBox::TDECompletionBoxPrivate
 {
 public:
     TQWidget *m_parent; // necessary to set the focus back
@@ -44,8 +44,8 @@ public:
     bool emitSelected;
 };
 
-KCompletionBox::KCompletionBox( TQWidget *parent, const char *name )
- :KListBox( parent, name, (WFlags)WType_Popup ), d(new KCompletionBoxPrivate)
+TDECompletionBox::TDECompletionBox( TQWidget *parent, const char *name )
+ :TDEListBox( parent, name, (WFlags)WType_Popup ), d(new TDECompletionBoxPrivate)
 {
 
     d->m_parent        = parent;
@@ -76,13 +76,13 @@ KCompletionBox::KCompletionBox( TQWidget *parent, const char *name )
              TQT_SLOT( slotItemClicked( TQListBoxItem * )) );
 }
 
-KCompletionBox::~KCompletionBox()
+TDECompletionBox::~TDECompletionBox()
 {
     d->m_parent = 0L;
     delete d;
 }
 
-TQStringList KCompletionBox::items() const
+TQStringList TDECompletionBox::items() const
 {
     TQStringList list;
 
@@ -96,7 +96,7 @@ TQStringList KCompletionBox::items() const
     return list;
 }
 
-void KCompletionBox::slotActivated( TQListBoxItem *item )
+void TDECompletionBox::slotActivated( TQListBoxItem *item )
 {
     if ( !item )
         return;
@@ -105,7 +105,7 @@ void KCompletionBox::slotActivated( TQListBoxItem *item )
     emit activated( item->text() );
 }
 
-bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e )
+bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
 {
     int type = e->type();
 
@@ -243,11 +243,11 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e )
         }
     }
 
-    return KListBox::eventFilter( o, e );
+    return TDEListBox::eventFilter( o, e );
 }
 
 
-void KCompletionBox::popup()
+void TDECompletionBox::popup()
 {
     if ( count() == 0 )
         hide();
@@ -265,7 +265,7 @@ void KCompletionBox::popup()
     }
 }
 
-void KCompletionBox::sizeAndPosition()
+void TDECompletionBox::sizeAndPosition()
 {
     int currentGeom = height();
     TQPoint currentPos = pos();
@@ -275,7 +275,7 @@ void KCompletionBox::sizeAndPosition()
     int x = currentPos.x(), y = currentPos.y();
     if ( d->m_parent ) {
       if ( !isVisible() ) {
-        TQRect screenSize = KGlobalSettings::desktopGeometry(d->m_parent);
+        TQRect screenSize = TDEGlobalSettings::desktopGeometry(d->m_parent);
 
         TQPoint orig = d->m_parent->mapToGlobal( TQPoint(0, d->m_parent->height()) );
         x = orig.x() + geom.x();
@@ -297,7 +297,7 @@ void KCompletionBox::sizeAndPosition()
     }
 }
 
-void KCompletionBox::show()
+void TDECompletionBox::show()
 {
     d->upwardBox = false;
     if ( d->m_parent ) {
@@ -309,34 +309,34 @@ void KCompletionBox::show()
     // are pretty b0rked.
     //triggerUpdate( true );
 
-    // Workaround for I'm not sure whose bug - if this KCompletionBox' parent
+    // Workaround for I'm not sure whose bug - if this TDECompletionBox' parent
     // is in a layout, that layout will detect inserting new child (posted
     // ChildInserted event), and will trigger relayout (post LayoutHint event).
     // TQWidget::show() sends also posted ChildInserted events for the parent,
     // and later all LayoutHint events, which causes layout updating.
-    // The problem is, KCompletionBox::eventFilter() detects resizing
+    // The problem is, TDECompletionBox::eventFilter() detects resizing
     // of the parent, and calls hide() - and this hide() happen in the middle
     // of show(), causing inconsistent state. I'll try to submit a Qt patch too.
     tqApp->sendPostedEvents();
-    KListBox::show();
+    TDEListBox::show();
 }
 
-void KCompletionBox::hide()
+void TDECompletionBox::hide()
 {
     if ( d->m_parent )
         tqApp->removeEventFilter( this );
     d->cancelText = TQString::null;
-    KListBox::hide();
+    TDEListBox::hide();
 }
 
-TQRect KCompletionBox::calculateGeometry() const
+TQRect TDECompletionBox::calculateGeometry() const
 {
     int x = 0, y = 0;
     int ih = itemHeight();
     int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth();
 
-    int w = (d->m_parent) ? d->m_parent->width() : KListBox::minimumSizeHint().width();
-    w = QMAX( KListBox::minimumSizeHint().width(), w );
+    int w = (d->m_parent) ? d->m_parent->width() : TDEListBox::minimumSizeHint().width();
+    w = QMAX( TDEListBox::minimumSizeHint().width(), w );
 
     //If we're inside a combox, Qt by default makes the dropdown
     // as wide as the combo, and gives the style a chance
@@ -373,12 +373,12 @@ TQRect KCompletionBox::calculateGeometry() const
     return TQRect(x, y, w, h);
 }
 
-TQSize KCompletionBox::sizeHint() const
+TQSize TDECompletionBox::sizeHint() const
 {
     return calculateGeometry().size();
 }
 
-void KCompletionBox::down()
+void TDECompletionBox::down()
 {
     int i = currentItem();
 
@@ -393,57 +393,57 @@ void KCompletionBox::down()
         setCurrentItem( i + 1 );
 }
 
-void KCompletionBox::up()
+void TDECompletionBox::up()
 {
     if ( currentItem() > 0 )
         setCurrentItem( currentItem() - 1 );
 }
 
-void KCompletionBox::pageDown()
+void TDECompletionBox::pageDown()
 {
     int i = currentItem() + numItemsVisible();
     i = i > (int)count() - 1 ? (int)count() - 1 : i;
     setCurrentItem( i );
 }
 
-void KCompletionBox::pageUp()
+void TDECompletionBox::pageUp()
 {
     int i = currentItem() - numItemsVisible();
     i = i < 0 ? 0 : i;
     setCurrentItem( i );
 }
 
-void KCompletionBox::home()
+void TDECompletionBox::home()
 {
     setCurrentItem( 0 );
 }
 
-void KCompletionBox::end()
+void TDECompletionBox::end()
 {
     setCurrentItem( count() -1 );
 }
 
-void KCompletionBox::setTabHandling( bool enable )
+void TDECompletionBox::setTabHandling( bool enable )
 {
     d->tabHandling = enable;
 }
 
-bool KCompletionBox::isTabHandling() const
+bool TDECompletionBox::isTabHandling() const
 {
     return d->tabHandling;
 }
 
-void KCompletionBox::setCancelledText( const TQString& text )
+void TDECompletionBox::setCancelledText( const TQString& text )
 {
     d->cancelText = text;
 }
 
-TQString KCompletionBox::cancelledText() const
+TQString TDECompletionBox::cancelledText() const
 {
     return d->cancelText;
 }
 
-void KCompletionBox::canceled()
+void TDECompletionBox::canceled()
 {
     if ( !d->cancelText.isNull() )
         emit userCancelled( d->cancelText );
@@ -451,7 +451,7 @@ void KCompletionBox::canceled()
         hide();
 }
 
-class KCompletionBoxItem : public TQListBoxItem
+class TDECompletionBoxItem : public TQListBoxItem
 {
 public:
     //Returns true if dirty.
@@ -465,7 +465,7 @@ public:
 };
 
 
-void KCompletionBox::insertItems( const TQStringList& items, int index )
+void TDECompletionBox::insertItems( const TQStringList& items, int index )
 {
     bool block = signalsBlocked();
     blockSignals( true );
@@ -474,7 +474,7 @@ void KCompletionBox::insertItems( const TQStringList& items, int index )
     d->down_workaround = true;
 }
 
-void KCompletionBox::setItems( const TQStringList& items )
+void TDECompletionBox::setItems( const TQStringList& items )
 {
     bool block = signalsBlocked();
     blockSignals( true );
@@ -494,7 +494,7 @@ void KCompletionBox::setItems( const TQStringList& items )
 
         for ( ; it != itEnd; ++it) {
             if ( item ) {
-                const bool changed = ((KCompletionBoxItem*)item)->reuse( *it );
+                const bool changed = ((TDECompletionBoxItem*)item)->reuse( *it );
                 dirty = dirty || changed;
                 item = item->next();
             }
@@ -527,12 +527,12 @@ void KCompletionBox::setItems( const TQStringList& items )
     d->down_workaround = true;
 }
 
-void KCompletionBox::slotCurrentChanged()
+void TDECompletionBox::slotCurrentChanged()
 {
     d->down_workaround = false;
 }
 
-void KCompletionBox::slotItemClicked( TQListBoxItem *item )
+void TDECompletionBox::slotItemClicked( TQListBoxItem *item )
 {
     if ( item )
     {
@@ -546,17 +546,17 @@ void KCompletionBox::slotItemClicked( TQListBoxItem *item )
     }
 }
 
-void KCompletionBox::setActivateOnSelect(bool state)
+void TDECompletionBox::setActivateOnSelect(bool state)
 {
     d->emitSelected = state;
 }
 
-bool KCompletionBox::activateOnSelect() const
+bool TDECompletionBox::activateOnSelect() const
 {
     return d->emitSelected;
 }
 
-void KCompletionBox::virtual_hook( int id, void* data )
-{ KListBox::virtual_hook( id, data ); }
+void TDECompletionBox::virtual_hook( int id, void* data )
+{ TDEListBox::virtual_hook( id, data ); }
 
-#include "kcompletionbox.moc"
+#include "tdecompletionbox.moc"
diff --git a/tdeui/kcompletionbox.h b/tdeui/tdecompletionbox.h
index 8016ceab2..b874fec99 100644
--- a/tdeui/kcompletionbox.h
+++ b/tdeui/tdecompletionbox.h
@@ -25,22 +25,22 @@
 
 class TQEvent;
 #include <tqstringlist.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 /**
  * @short A helper widget for "completion-widgets" (KLineEdit, KComboBox))
  *
  * A little utility class for "completion-widgets", like KLineEdit or
- * KComboBox. KCompletionBox is a listbox, displayed as a rectangle without
+ * KComboBox. TDECompletionBox is a listbox, displayed as a rectangle without
  * any window decoration, usually directly under the lineedit or combobox.
  * It is filled with all possible matches for a completion, so the user
  * can select the one he wants.
  *
- * It is used when KGlobalSettings::Completion == CompletionPopup or CompletionPopupAuto.
+ * It is used when TDEGlobalSettings::Completion == CompletionPopup or CompletionPopupAuto.
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class TDEUI_EXPORT KCompletionBox : public KListBox
+class TDEUI_EXPORT TDECompletionBox : public TDEListBox
 {
     Q_OBJECT
     TQ_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
@@ -49,17 +49,17 @@ class TDEUI_EXPORT KCompletionBox : public KListBox
 
 public:
     /**
-     * Constructs a KCompletionBox.
+     * Constructs a TDECompletionBox.
      *
      * The parent widget is used to give the focus back when pressing the
      * up-button on the very first item.
      */
-    KCompletionBox( TQWidget *parent, const char *name = 0 );
+    TDECompletionBox( TQWidget *parent, const char *name = 0 );
 
     /**
      * Destroys the box
      */
-    ~KCompletionBox();
+    ~TDECompletionBox();
 
     virtual TQSize sizeHint() const;
 
@@ -216,7 +216,7 @@ protected:
     void sizeAndPosition();
 
     /**
-     * Reimplemented from KListBox to get events from the viewport (to hide
+     * Reimplemented from TDEListBox to get events from the viewport (to hide
      * this widget on mouse-click, Escape-presses, etc.
      */
     virtual bool eventFilter( TQObject *, TQEvent * );
@@ -238,8 +238,8 @@ protected:
     virtual void virtual_hook( int id, void* data );
 
 private:
-    class KCompletionBoxPrivate;
-    KCompletionBoxPrivate* const d;
+    class TDECompletionBoxPrivate;
+    TDECompletionBoxPrivate* const d;
 };
 
 
diff --git a/tdeui/kconfigdialog.cpp b/tdeui/tdeconfigdialog.cpp
index ccbba1cf0..df43defc5 100644
--- a/tdeui/kconfigdialog.cpp
+++ b/tdeui/tdeconfigdialog.cpp
@@ -19,11 +19,11 @@
  *  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 <klocale.h>
+#include <tdeconfigskeleton.h>
+#include <tdeconfigdialogmanager.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -31,30 +31,30 @@
 #include <tqvbox.h>
 #include <tqmap.h>
 
-TQAsciiDict<KConfigDialog> KConfigDialog::openDialogs;
+TQAsciiDict<TDEConfigDialog> TDEConfigDialog::openDialogs;
 
 // This class is here purly so we don't break binary compatibility down the road.
-class KConfigDialog::KConfigDialogPrivate
+class TDEConfigDialog::TDEConfigDialogPrivate
 {
 public:
-  KConfigDialogPrivate(KDialogBase::DialogType t)
+  TDEConfigDialogPrivate(KDialogBase::DialogType t)
   : shown(false), type(t), manager(0) { }
 
   bool shown;
   KDialogBase::DialogType type;
-  KConfigDialogManager *manager;
-  TQMap<TQWidget *, KConfigDialogManager *> managerForPage;
+  TDEConfigDialogManager *manager;
+  TQMap<TQWidget *, TDEConfigDialogManager *> managerForPage;
 };
 
-KConfigDialog::KConfigDialog( TQWidget *parent, const char *name,
-          KConfigSkeleton *config,
+TDEConfigDialog::TDEConfigDialog( TQWidget *parent, const char *name,
+          TDEConfigSkeleton *config,
           DialogType dialogType,
           int dialogButtons,
           ButtonCode defaultButton,
           bool modal ) :
     KDialogBase( dialogType, (WFlags)TQt::WStyle_DialogBorder,
           parent, name, modal, i18n("Configure"), dialogButtons, defaultButton ),
-    d(new KConfigDialogPrivate(dialogType))
+    d(new TDEConfigDialogPrivate(dialogType))
 {
   if ( name ) {
     openDialogs.insert(name, this);
@@ -71,19 +71,19 @@ KConfigDialog::KConfigDialog( TQWidget *parent, const char *name,
   connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault()));
   connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons()));
 
-  d->manager = new KConfigDialogManager(this, config);
+  d->manager = new TDEConfigDialogManager(this, config);
   setupManagerConnections(d->manager);
 
   enableButton(Apply, false);
 }
 
-KConfigDialog::~KConfigDialog()
+TDEConfigDialog::~TDEConfigDialog()
 {
   openDialogs.remove(name());
   delete d;
 }
 
-void KConfigDialog::addPage(TQWidget *page,
+void TDEConfigDialog::addPage(TQWidget *page,
                                 const TQString &itemName,
                                 const TQString &pixmapName,
                                 const TQString &header,
@@ -94,25 +94,25 @@ void KConfigDialog::addPage(TQWidget *page,
     d->manager->addWidget(page);
 }
 
-void KConfigDialog::addPage(TQWidget *page,
-                                KConfigSkeleton *config,
+void TDEConfigDialog::addPage(TQWidget *page,
+                                TDEConfigSkeleton *config,
                                 const TQString &itemName,
                                 const TQString &pixmapName,
                                 const TQString &header)
 {
   addPageInternal(page, itemName, pixmapName, header);
-  d->managerForPage[page] = new KConfigDialogManager(page, config);
+  d->managerForPage[page] = new TDEConfigDialogManager(page, config);
   setupManagerConnections(d->managerForPage[page]);
 }
 
-void KConfigDialog::addPageInternal(TQWidget *page,
+void TDEConfigDialog::addPageInternal(TQWidget *page,
                                         const TQString &itemName,
                                         const TQString &pixmapName,
                                         const TQString &header)
 {
   if(d->shown)
   {
-    kdDebug(240) << "KConfigDialog::addPage: can not add a page after the dialog has been shown.";
+    kdDebug(240) << "TDEConfigDialog::addPage: can not add a page after the dialog has been shown.";
     return;
   }
   switch(d->type)
@@ -144,11 +144,11 @@ void KConfigDialog::addPageInternal(TQWidget *page,
     break;
 
     default:
-      kdDebug(240) << "KConfigDialog::addpage: unknown type.";
+      kdDebug(240) << "TDEConfigDialog::addpage: unknown type.";
   }
 }
 
-void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager)
+void TDEConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager)
 {
   connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot()));
   connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
@@ -158,26 +158,26 @@ void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager)
   connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault()));
 }
 
-KConfigDialog* KConfigDialog::exists(const char* name)
+TDEConfigDialog* TDEConfigDialog::exists(const char* name)
 {
   return openDialogs.find(name);
 }
 
-bool KConfigDialog::showDialog(const char* name)
+bool TDEConfigDialog::showDialog(const char* name)
 {
-  KConfigDialog *dialog = exists(name);
+  TDEConfigDialog *dialog = exists(name);
   if(dialog)
     dialog->show();
   return (dialog != NULL);
 }
 
-void KConfigDialog::updateButtons()
+void TDEConfigDialog::updateButtons()
 {
   static bool only_once = false;
   if (only_once) return;
   only_once = true;
 
-  TQMap<TQWidget *, KConfigDialogManager *>::iterator it;
+  TQMap<TQWidget *, TDEConfigDialogManager *>::iterator it;
 
   bool has_changed = d->manager->hasChanged() || hasChanged();
   for (it = d->managerForPage.begin();
@@ -203,7 +203,7 @@ void KConfigDialog::updateButtons()
   only_once = false;
 }
 
-void KConfigDialog::settingsChangedSlot()
+void TDEConfigDialog::settingsChangedSlot()
 {
   // Update the buttons
   updateButtons();
@@ -211,9 +211,9 @@ void KConfigDialog::settingsChangedSlot()
   emit settingsChanged(name());
 }
 
-void KConfigDialog::show()
+void TDEConfigDialog::show()
 {
-  TQMap<TQWidget *, KConfigDialogManager *>::iterator it;
+  TQMap<TQWidget *, TDEConfigDialogManager *>::iterator it;
 
   updateWidgets();
   d->manager->updateWidgets();
@@ -243,17 +243,17 @@ void KConfigDialog::show()
   KDialogBase::show();
 }
 
-void KConfigDialog::updateSettings()
+void TDEConfigDialog::updateSettings()
 {
 }
 
-void KConfigDialog::updateWidgets()
+void TDEConfigDialog::updateWidgets()
 {
 }
 
-void KConfigDialog::updateWidgetsDefault()
+void TDEConfigDialog::updateWidgetsDefault()
 {
 }
 
 
-#include "kconfigdialog.moc"
+#include "tdeconfigdialog.moc"
diff --git a/tdeui/kconfigdialog.h b/tdeui/tdeconfigdialog.h
index 9268ab1f2..f7cc10e26 100644
--- a/tdeui/kconfigdialog.h
+++ b/tdeui/tdeconfigdialog.h
@@ -21,35 +21,35 @@
 #ifndef KCONFIGDIALOG_H
 #define KCONFIGDIALOG_H
 
-class KConfig;
-class KConfigSkeleton;
-class KConfigDialogManager;
+class TDEConfig;
+class TDEConfigSkeleton;
+class TDEConfigDialogManager;
 #include <kdialogbase.h>
 #include <tqasciidict.h>
 
 /**
  * \short Standard %KDE configuration dialog class
  *
- * The KConfigDialog class provides an easy and uniform means of displaying
- * a settings dialog using KDialogBase, KConfigDialogManager and a
- * KConfigSkeleton derived settings class.
+ * The TDEConfigDialog class provides an easy and uniform means of displaying
+ * a settings dialog using KDialogBase, TDEConfigDialogManager and a
+ * TDEConfigSkeleton derived settings class.
  *
- * KConfigDialog handles the enabling and disabling of buttons, creation
+ * TDEConfigDialog handles the enabling and disabling of buttons, creation
  * of the dialog, and deletion of the widgets.  Because of
- * KConfigDialogManager, this class also manages: restoring
+ * TDEConfigDialogManager, this class also manages: restoring
  * the settings, reseting them to the default values, and saving them. This
  * requires that the names of the widgets corresponding to configuration entries
  * have to have the same name plus an additional "kcfg_" prefix. For example the
  * widget named "kcfg_MyOption" would be associated with the configuration entry
  * "MyOption".
  *
- * Here is an example usage of KConfigDialog:
+ * Here is an example usage of TDEConfigDialog:
  *
  * \code
  * void KCoolApp::showSettings(){
- *   if(KConfigDialog::showDialog("settings"))
+ *   if(TDEConfigDialog::showDialog("settings"))
  *     return;
- *   KConfigDialog *dialog = new KConfigDialog(this, "settings", MySettings::self(), KDialogBase::IconList);
+ *   TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", MySettings::self(), KDialogBase::IconList);
  *   dialog->addPage(new General(0, "General"), i18n("General") );
  *   dialog->addPage(new Appearance(0, "Style"), i18n("Appearance") );
  *   connect(dialog, TQT_SIGNAL(settingsChanged()), mainWidget, TQT_SLOT(loadSettings()));
@@ -65,11 +65,11 @@ class KConfigDialogManager;
  * Please note that using the setMainWidget method inherited from KDialogBase
  * currently yields broken behaviour at runtime; use @ref addPage() instead.
  *
- * @see KConfigSkeleton
+ * @see TDEConfigSkeleton
  * @author Waldo Bastian <bastian@kde.org>
  * @since 3.2
  */
-class TDEUI_EXPORT KConfigDialog : public KDialogBase {
+class TDEUI_EXPORT TDEConfigDialog : public KDialogBase {
 Q_OBJECT
 
 signals:
@@ -87,7 +87,7 @@ signals:
   /**
    * One or more of the settings have been permanently changed such as if
    * the user clicked on the Apply or Ok button.
-   * This signal is useful when using KConfigDialog to configure
+   * This signal is useful when using TDEConfigDialog to configure
    * items in a list.  When emitted the main class would then know what
    * item in the list was actually changed.
    * @param dialogName the name of the dialog.
@@ -116,12 +116,12 @@ public:
    * @param modal - Whether the dialog should be modal. To prevent more than one
    * non-modal settings dialog from showing the static function showDialog() can be
    * used in determining if the settings dialog already exists before creating
-   * a new KConfigDialog object.
+   * a new TDEConfigDialog object.
    */
   // KDE4: Add the "separator" parameter as in KDialogBase
   //       Make "dialogType" an int
-  KConfigDialog( TQWidget *parent, const char *name,
-                 KConfigSkeleton *config,
+  TDEConfigDialog( TQWidget *parent, const char *name,
+                 TDEConfigSkeleton *config,
                  DialogType dialogType = IconList,
                  int dialogButtons = Default|Ok|Apply|Cancel|Help,
                  ButtonCode defaultButton = Ok,
@@ -132,10 +132,10 @@ public:
    * Deletes private class.
    * @see exists()
    */
-  ~KConfigDialog();
+  ~TDEConfigDialog();
 
   /**
-   * Adds page to the dialog and to KConfigDialogManager.  When an
+   * Adds page to the dialog and to TDEConfigDialogManager.  When an
    * application is done adding pages show() should be called to
    * display the dialog.
    * Note that after you call show() you can not add any more pages
@@ -146,7 +146,7 @@ public:
    * @param pixmapName - Name of the pixmap that should be used if needed.
    * @param header - Header text use in the list modes. Ignored in Tabbed
    *        mode. If empty, the itemName text is used when needed.
-   * @param manage - Whether KConfigDialogManager should manage the page or not.
+   * @param manage - Whether TDEConfigDialogManager should manage the page or not.
    */
   // KDE4: Add a default value for itemName & pixmapName
   void addPage( TQWidget *page, const TQString &itemName,
@@ -155,9 +155,9 @@ public:
                 bool manage=true );
 
   /**
-   * Adds page to the dialog that is managed by a custom KConfigDialogManager.
+   * Adds page to the dialog that is managed by a custom TDEConfigDialogManager.
    * This is useful for dialogs that contain settings spread over more than
-   * one configuration file and thus have/need more than one KConfigSkeleton.
+   * one configuration file and thus have/need more than one TDEConfigSkeleton.
    * When an application is done adding pages show() should be called to
    * display the dialog.
    * Note that after you call show() you can not add any more pages
@@ -171,7 +171,7 @@ public:
    *        mode. If empty, the itemName text is used when needed.
    */
   // KDE4: Add a default value for itemName & pixmapName
-  void addPage( TQWidget *page, KConfigSkeleton *config,
+  void addPage( TQWidget *page, TDEConfigSkeleton *config,
                 const TQString &itemName,
                 const TQString &pixmapName,
                 const TQString &header=TQString::null );
@@ -182,7 +182,7 @@ public:
    * @param name - Dialog name to look for.
    * @return Pointer to widget or NULL if it does not exist.
    */
-  static KConfigDialog* exists( const char* name );
+  static TDEConfigDialog* exists( const char* name );
 
   /**
    * Attempts to show the dialog with the name 'name'.
@@ -260,19 +260,19 @@ private:
    * Sets the connections from a manager to the dialog (and the other
    * way round) up.
    */
-  void setupManagerConnections(KConfigDialogManager *manager);
+  void setupManagerConnections(TDEConfigDialogManager *manager);
 
 private:
   /**
    * The list of existing dialogs.
    */
-  static TQAsciiDict<KConfigDialog> openDialogs;
+  static TQAsciiDict<TDEConfigDialog> openDialogs;
 
-  class KConfigDialogPrivate;
+  class TDEConfigDialogPrivate;
   /**
    * Private class.
    */
-  KConfigDialogPrivate *d;
+  TDEConfigDialogPrivate *d;
 };
 
 #endif //KCONFIGDIALOG_H
diff --git a/tdeui/kfontcombo.cpp b/tdeui/tdefontcombo.cpp
index 9ef3af912..cb250385f 100644
--- a/tdeui/kfontcombo.cpp
+++ b/tdeui/tdefontcombo.cpp
@@ -23,12 +23,12 @@
 #include <tqregexp.h>
 
 #include <kcharsets.h>
-#include <kconfig.h>
-#include <kglobal.h>
-#include <kfontdialog.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
+#include <tdefontdialog.h>
 
-#include "kfontcombo.h"
-#include "kfontcombo.moc"
+#include "tdefontcombo.h"
+#include "tdefontcombo.moc"
 
 #include <ft2build.h>
 #include <fontconfig/fontconfig.h>
@@ -41,9 +41,9 @@
 #include <X11/Xft/Xft.h>
 
 
-struct KFontComboPrivate
+struct TDEFontComboPrivate
 {
-    KFontComboPrivate()
+    TDEFontComboPrivate()
         : bold(false),
           italic(false),
           underline(false),
@@ -65,11 +65,11 @@ struct KFontComboPrivate
     TQString defaultFamily;
 };
 
-class KFontListItem : public TQListBoxItem
+class TDEFontListItem : public TQListBoxItem
 {
 public:
-    KFontListItem(const TQString &fontName, KFontCombo *combo);
-    virtual ~KFontListItem();
+    TDEFontListItem(const TQString &fontName, TDEFontCombo *combo);
+    virtual ~TDEFontListItem();
 
     virtual int width(const TQListBox *) const;
     virtual int height(const TQListBox *) const;
@@ -83,13 +83,13 @@ private:
     void createFont();
 
 private:
-    KFontCombo *m_combo;
+    TDEFontCombo *m_combo;
     TQString m_fontName;
     TQFont *m_font;
     bool m_canPaintName;
 };
 
-KFontListItem::KFontListItem(const TQString &fontName, KFontCombo *combo)
+TDEFontListItem::TDEFontListItem(const TQString &fontName, TDEFontCombo *combo)
     : TQListBoxItem(combo->listBox()),
       m_combo(combo),
       m_fontName(fontName),
@@ -99,19 +99,19 @@ KFontListItem::KFontListItem(const TQString &fontName, KFontCombo *combo)
     setText(fontName);
 }
 
-KFontListItem::~KFontListItem()
+TDEFontListItem::~TDEFontListItem()
 {
     delete m_font;
 }
 
-int KFontListItem::width(const TQListBox *lb) const
+int TDEFontListItem::width(const TQListBox *lb) const
 {
     if (m_font)
        return TQFontMetrics(*m_font).width(text()) + 6;
     return lb->fontMetrics().width(text()) + 6;
 }
 
-int KFontListItem::height(const TQListBox *lb) const
+int TDEFontListItem::height(const TQListBox *lb) const
 {
     if (m_combo->d->displayFonts)
         return m_combo->d->lineSpacing + 2;
@@ -119,7 +119,7 @@ int KFontListItem::height(const TQListBox *lb) const
     return fm.lineSpacing() + 2;
 }
 
-void KFontListItem::paint(TQPainter *p)
+void TDEFontListItem::paint(TQPainter *p)
 {
     if (m_combo->d->displayFonts)
     {
@@ -144,7 +144,7 @@ void KFontListItem::paint(TQPainter *p)
     }
 }
 
-void KFontListItem::updateFont()
+void TDEFontListItem::updateFont()
 {
     if (!m_font)
         return;
@@ -156,7 +156,7 @@ void KFontListItem::updateFont()
     m_font->setPointSize(m_combo->d->size);
 }
 
-void KFontListItem::createFont()
+void TDEFontListItem::createFont()
 {
     if (m_font)
         return;
@@ -172,33 +172,33 @@ void KFontListItem::createFont()
     updateFont();
 }
 
-KFontCombo::KFontCombo(TQWidget *parent, const char *name)
+TDEFontCombo::TDEFontCombo(TQWidget *parent, const char *name)
     : KComboBox(true, parent, name)
 {
     init();
     TQStringList families;
-    KFontChooser::getFontList(families, 0);
+    TDEFontChooser::getFontList(families, 0);
     setFonts(families);
 }
 
-KFontCombo::KFontCombo(const TQStringList &fonts, TQWidget *parent, const char *name)
+TDEFontCombo::TDEFontCombo(const TQStringList &fonts, TQWidget *parent, const char *name)
     : KComboBox(true, parent, name)
 {
     init();
     setFonts(fonts);
 }
 
-void KFontCombo::setFonts(const TQStringList &fonts)
+void TDEFontCombo::setFonts(const TQStringList &fonts)
 {
     clear();
     for (TQStringList::ConstIterator it = fonts.begin(); it != fonts.end(); ++it)
-        new KFontListItem(*it, this);
+        new TDEFontListItem(*it, this);
 }
 
 /*
- * Maintenance note: Keep in sync with KFontAction::setFont()
+ * Maintenance note: Keep in sync with TDEFontAction::setFont()
  */
-void KFontCombo::setCurrentFont(const TQString &family)
+void TDEFontCombo::setCurrentFont(const TQString &family)
 {
     TQString lowerName = family.lower();
     int c = count();
@@ -257,27 +257,27 @@ void KFontCombo::setCurrentFont(const TQString &family)
        setCurrentFont( realFamily );
 }
 
-void KFontCombo::slotModified( int )
+void TDEFontCombo::slotModified( int )
 {
    d->modified = 1;
 }
 
-TQString KFontCombo::currentFont() const
+TQString TDEFontCombo::currentFont() const
 {
    if (d->modified)
       return currentText();
    return d->defaultFamily;
 }
 
-void KFontCombo::setCurrentItem(int i)
+void TDEFontCombo::setCurrentItem(int i)
 {
     d->modified = true;
     TQComboBox::setCurrentItem(i);
 }
 
-void KFontCombo::init()
+void TDEFontCombo::init()
 {
-    d = new KFontComboPrivate;
+    d = new TDEFontComboPrivate;
     d->displayFonts = displayFonts();
     setInsertionPolicy(NoInsertion);
     setAutoCompletion(true);
@@ -285,12 +285,12 @@ void KFontCombo::init()
     connect( this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotModified(int)));
 }
 
-KFontCombo::~KFontCombo()
+TDEFontCombo::~TDEFontCombo()
 {
     delete d;
 }
 
-void KFontCombo::setBold(bool bold)
+void TDEFontCombo::setBold(bool bold)
 {
     if (d->bold == bold)
         return;
@@ -298,12 +298,12 @@ void KFontCombo::setBold(bool bold)
     updateFonts();
 }
 
-bool KFontCombo::bold() const
+bool TDEFontCombo::bold() const
 {
     return d->bold;
 }
 
-void KFontCombo::setItalic(bool italic)
+void TDEFontCombo::setItalic(bool italic)
 {
     if (d->italic == italic)
         return;
@@ -311,12 +311,12 @@ void KFontCombo::setItalic(bool italic)
     updateFonts();
 }
 
-bool KFontCombo::italic() const
+bool TDEFontCombo::italic() const
 {
     return d->italic;
 }
 
-void KFontCombo::setUnderline(bool underline)
+void TDEFontCombo::setUnderline(bool underline)
 {
     if (d->underline == underline)
         return;
@@ -324,12 +324,12 @@ void KFontCombo::setUnderline(bool underline)
     updateFonts();
 }
 
-bool KFontCombo::underline() const
+bool TDEFontCombo::underline() const
 {
     return d->underline;
 }
 
-void KFontCombo::setStrikeOut(bool strikeOut)
+void TDEFontCombo::setStrikeOut(bool strikeOut)
 {
     if (d->strikeOut == strikeOut)
         return;
@@ -337,12 +337,12 @@ void KFontCombo::setStrikeOut(bool strikeOut)
     updateFonts();
 }
 
-bool KFontCombo::strikeOut() const
+bool TDEFontCombo::strikeOut() const
 {
     return d->strikeOut;
 }
 
-void KFontCombo::setSize(int size)
+void TDEFontCombo::setSize(int size)
 {
     if (d->size == size)
         return;
@@ -354,29 +354,29 @@ void KFontCombo::setSize(int size)
     updateFonts();
 }
 
-int KFontCombo::size() const
+int TDEFontCombo::size() const
 {
     return d->size;
 }
 
-void KFontCombo::updateFonts()
+void TDEFontCombo::updateFonts()
 {
     if (!d->displayFonts)
         return;
 
     for (unsigned int i = 0; i < listBox()->count(); ++i)
     {
-        KFontListItem *item = static_cast<KFontListItem *>(listBox()->item(i));
+        TDEFontListItem *item = static_cast<TDEFontListItem *>(listBox()->item(i));
         item->updateFont();
     }
 }
 
-bool KFontCombo::displayFonts()
+bool TDEFontCombo::displayFonts()
 {
-    KConfigGroupSaver saver(KGlobal::config(), "KDE");
-    return KGlobal::config()->readBoolEntry("DisplayFontItems", true);
+    TDEConfigGroupSaver saver(TDEGlobal::config(), "KDE");
+    return TDEGlobal::config()->readBoolEntry("DisplayFontItems", true);
 }
 
-void KFontCombo::virtual_hook( int id, void* data )
+void TDEFontCombo::virtual_hook( int id, void* data )
 { KComboBox::virtual_hook( id, data ); }
 
diff --git a/tdeui/kfontcombo.h b/tdeui/tdefontcombo.h
index 9b480ff18..13c55215b 100644
--- a/tdeui/kfontcombo.h
+++ b/tdeui/tdefontcombo.h
@@ -32,7 +32,7 @@
  *
  * @author Malte Starostik <malte@kde.org>
  */
-class TDEUI_EXPORT KFontCombo : public KComboBox
+class TDEUI_EXPORT TDEFontCombo : public KComboBox
 {
     Q_OBJECT
     TQ_PROPERTY(TQString family READ currentFont WRITE setCurrentFont)
@@ -48,7 +48,7 @@ public:
      * @param parent The parent widget
      * @param name The object name for the widget
      */
-    KFontCombo(TQWidget *parent, const char *name = 0);
+    TDEFontCombo(TQWidget *parent, const char *name = 0);
     /**
      * Constructor that takes an already initialzed font list
      *
@@ -56,11 +56,11 @@ public:
      * @param parent The parent widget
      * @param name The object name for the widget
      */
-    KFontCombo(const TQStringList &fonts, TQWidget *parent, const char *name = 0);
+    TDEFontCombo(const TQStringList &fonts, TQWidget *parent, const char *name = 0);
     /**
      * Destructor
      */
-    virtual ~KFontCombo();
+    virtual ~TDEFontCombo();
 
     /**
      * Sets the font list.
@@ -168,11 +168,11 @@ private:
     void init();
 
 private:
-    friend class KFontListItem;
+    friend class TDEFontListItem;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    struct KFontComboPrivate *d;
+    struct TDEFontComboPrivate *d;
 };
 
 #endif
diff --git a/tdeui/kfontdialog.cpp b/tdeui/tdefontdialog.cpp
index eb5b262f8..75f4599e0 100644
--- a/tdeui/kfontdialog.cpp
+++ b/tdeui/tdefontdialog.cpp
@@ -41,20 +41,20 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tqlineedit.h>
-#include <klistbox.h>
-#include <klocale.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <knuminput.h>
 
-#include "kfontdialog.moc"
+#include "tdefontdialog.moc"
 
 static int minimumListWidth( const TQListBox *list )
 {
@@ -80,16 +80,16 @@ static int minimumListHeight( const TQListBox *list, int numVisibleEntry )
   return ( w * numVisibleEntry + 2 * list->frameWidth() );
 }
 
-class KFontChooser::KFontChooserPrivate
+class TDEFontChooser::TDEFontChooserPrivate
 {
 public:
-    KFontChooserPrivate()
+    TDEFontChooserPrivate()
         { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, Qt::black);
           m_palette.setColor(TQPalette::Active, TQColorGroup::Base, Qt::white); }
     TQPalette m_palette;
 };
 
-KFontChooser::KFontChooser(TQWidget *parent, const char *name,
+TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
 			   bool onlyFixed, const TQStringList &fontList,
 			   bool makeFrame, int visibleListSize, bool diff,
                            TQButton::ToggleState *sizeIsRelativeState )
@@ -101,7 +101,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
     i18n( "Here you can choose the font to be used." );
   TQWhatsThis::add( this, mainWhatsThisText );
 
-  d = new KFontChooserPrivate;
+  d = new TDEFontChooserPrivate;
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
   int checkBoxGap = KDialog::spacingHint() / 2;
 
@@ -192,7 +192,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
   //
   // now create the actual boxes that hold the info
   //
-  familyListBox = new KListBox( page, "familyListBox");
+  familyListBox = new TDEListBox( page, "familyListBox");
   familyListBox->setEnabled( !diff );
   gridLayout->addWidget( familyListBox, row, 0 );
   TQString fontFamilyWhatsThisText =
@@ -214,7 +214,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
   familyListBox->setMinimumHeight(
     minimumListHeight( familyListBox, visibleListSize  ) );
 
-  styleListBox = new KListBox( page, "styleListBox");
+  styleListBox = new TDEListBox( page, "styleListBox");
   styleListBox->setEnabled( !diff );
   gridLayout->addWidget(styleListBox, row, 1);
   TQString fontStyleWhatsThisText =
@@ -233,7 +233,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
 	  TQT_SLOT(style_chosen_slot(const TQString &)));
 
 
-  sizeListBox = new KListBox( page, "sizeListBox");
+  sizeListBox = new TDEListBox( page, "sizeListBox");
   sizeOfFont = new KIntNumInput( page, "sizeOfFont");
   sizeOfFont->setMinValue(4);
 
@@ -290,7 +290,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
 
   row ++;
   sampleEdit = new TQLineEdit( page, "sampleEdit");
-  TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black );
+  TQFont tmpFont( TDEGlobalSettings::generalFont().family(), 64, TQFont::Black );
   sampleEdit->setFont(tmpFont);
   //i18n: This is a classical test phrase. (It contains all letters from A to Z.)
   sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
@@ -325,22 +325,22 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
   vbox->addWidget( xlfdEdit );
 
   // lets initialize the display if possible
-  setFont( KGlobalSettings::generalFont(), usingFixed );
+  setFont( TDEGlobalSettings::generalFont(), usingFixed );
   // check or uncheck or gray out the "relative" checkbox
   if( sizeIsRelativeState && sizeIsRelativeCheckBox )
     setSizeIsRelative( *sizeIsRelativeState );
 
-  KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver(config, TQString::fromLatin1("General"));
   showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
 }
 
-KFontChooser::~KFontChooser()
+TDEFontChooser::~TDEFontChooser()
 {
   delete d;
 }
 
-void KFontChooser::fillSizeList() {
+void TDEFontChooser::fillSizeList() {
   if(! sizeListBox) return; //assertion.
 
   static const int c[] =
@@ -359,7 +359,7 @@ void KFontChooser::fillSizeList() {
   }
 }
 
-void KFontChooser::setColor( const TQColor & col )
+void TDEFontChooser::setColor( const TQColor & col )
 {
   d->m_palette.setColor( TQPalette::Active, TQColorGroup::Text, col );
   TQPalette pal = sampleEdit->palette();
@@ -367,12 +367,12 @@ void KFontChooser::setColor( const TQColor & col )
   sampleEdit->setPalette( pal );
 }
 
-TQColor KFontChooser::color() const
+TQColor TDEFontChooser::color() const
 {
   return d->m_palette.color( TQPalette::Active, TQColorGroup::Text );
 }
 
-void KFontChooser::setBackgroundColor( const TQColor & col )
+void TDEFontChooser::setBackgroundColor( const TQColor & col )
 {
   d->m_palette.setColor( TQPalette::Active, TQColorGroup::Base, col );
   TQPalette pal = sampleEdit->palette();
@@ -380,12 +380,12 @@ void KFontChooser::setBackgroundColor( const TQColor & col )
   sampleEdit->setPalette( pal );
 }
 
-TQColor KFontChooser::backgroundColor() const
+TQColor TDEFontChooser::backgroundColor() const
 {
   return d->m_palette.color( TQPalette::Active, TQColorGroup::Base );
 }
 
-void KFontChooser::setSizeIsRelative( TQButton::ToggleState relative )
+void TDEFontChooser::setSizeIsRelative( TQButton::ToggleState relative )
 {
   // check or uncheck or gray out the "relative" checkbox
   if( sizeIsRelativeCheckBox ) {
@@ -396,20 +396,20 @@ void KFontChooser::setSizeIsRelative( TQButton::ToggleState relative )
   }
 }
 
-TQButton::ToggleState KFontChooser::sizeIsRelative() const
+TQButton::ToggleState TDEFontChooser::sizeIsRelative() const
 {
   return sizeIsRelativeCheckBox
        ? sizeIsRelativeCheckBox->state()
        : TQButton::NoChange;
 }
 
-TQSize KFontChooser::sizeHint( void ) const
+TQSize TDEFontChooser::sizeHint( void ) const
 {
   return minimumSizeHint();
 }
 
 
-void KFontChooser::enableColumn( int column, bool state )
+void TDEFontChooser::enableColumn( int column, bool state )
 {
   if( column & FamilyList )
   {
@@ -426,7 +426,7 @@ void KFontChooser::enableColumn( int column, bool state )
 }
 
 
-void KFontChooser::setFont( const TQFont& aFont, bool onlyFixed )
+void TDEFontChooser::setFont( const TQFont& aFont, bool onlyFixed )
 {
   selFont = aFont;
   selectedSize=aFont.pointSize();
@@ -443,7 +443,7 @@ void KFontChooser::setFont( const TQFont& aFont, bool onlyFixed )
 }
 
 
-int KFontChooser::fontDiffFlags() {
+int TDEFontChooser::fontDiffFlags() {
    int diffFlags = 0;
    if (familyCheckbox && styleCheckbox && sizeCheckbox) {
       diffFlags = (int)(familyCheckbox->isChecked() ? FontDiffFamily : 0)
@@ -453,7 +453,7 @@ int KFontChooser::fontDiffFlags() {
    return diffFlags;
 }
 
-void KFontChooser::toggled_checkbox()
+void TDEFontChooser::toggled_checkbox()
 {
   familyListBox->setEnabled( familyCheckbox->isChecked() );
   styleListBox->setEnabled( styleCheckbox->isChecked() );
@@ -461,7 +461,7 @@ void KFontChooser::toggled_checkbox()
   sizeOfFont->setEnabled( sizeCheckbox->isChecked() );
 }
 
-void KFontChooser::family_chosen_slot(const TQString& family)
+void TDEFontChooser::family_chosen_slot(const TQString& family)
 {
     TQFontDatabase dbase;
     TQStringList styles = TQStringList(dbase.styles(family));
@@ -496,7 +496,7 @@ void KFontChooser::family_chosen_slot(const TQString& family)
     style_chosen_slot(TQString::null);
 }
 
-void KFontChooser::size_chosen_slot(const TQString& size){
+void TDEFontChooser::size_chosen_slot(const TQString& size){
 
   selectedSize=size.toInt();
   sizeOfFont->setValue(selectedSize);
@@ -504,12 +504,12 @@ void KFontChooser::size_chosen_slot(const TQString& size){
   emit fontSelected(selFont);
 }
 
-void KFontChooser::size_value_slot(int val) {
+void TDEFontChooser::size_value_slot(int val) {
   selFont.setPointSize(val);
   emit fontSelected(selFont);
 }
 
-void KFontChooser::style_chosen_slot(const TQString& style)
+void TDEFontChooser::style_chosen_slot(const TQString& style)
 {
     TQString currentStyle;
     if (style.isEmpty())
@@ -549,7 +549,7 @@ void KFontChooser::style_chosen_slot(const TQString& style)
         selectedStyle = style;
 }
 
-void KFontChooser::displaySample(const TQFont& font)
+void TDEFontChooser::displaySample(const TQFont& font)
 {
   sampleEdit->setFont(font);
   sampleEdit->setCursorPosition(0);
@@ -561,7 +561,7 @@ void KFontChooser::displaySample(const TQFont& font)
   //kdDebug() << "      (" << font.toString() << ")\n";
 }
 
-void KFontChooser::setupDisplay()
+void TDEFontChooser::setupDisplay()
 {
   // Calling familyListBox->setCurrentItem() causes the value of selFont
   // to change, so we save the family, style and size beforehand.
@@ -638,7 +638,7 @@ void KFontChooser::setupDisplay()
 }
 
 
-void KFontChooser::getFontList( TQStringList &list, uint fontListCriteria)
+void TDEFontChooser::getFontList( TQStringList &list, uint fontListCriteria)
 {
   TQFontDatabase dbase;
   TQStringList lstSys(dbase.families());
@@ -671,7 +671,7 @@ void KFontChooser::getFontList( TQStringList &list, uint fontListCriteria)
   list = lstSys;
 }
 
-void KFontChooser::addFont( TQStringList &list, const char *xfont )
+void TDEFontChooser::addFont( TQStringList &list, const char *xfont )
 {
   const char *ptr = strchr( xfont, '-' );
   if ( !ptr )
@@ -699,7 +699,7 @@ void KFontChooser::addFont( TQStringList &list, const char *xfont )
   }
 }
 
-void KFontChooser::fillFamilyListBox(bool onlyFixedFonts)
+void TDEFontChooser::fillFamilyListBox(bool onlyFixedFonts)
 {
   TQStringList fontList;
   getFontList(fontList, onlyFixedFonts?FixedWidthFonts:0);
@@ -707,7 +707,7 @@ void KFontChooser::fillFamilyListBox(bool onlyFixedFonts)
   familyListBox->insertStringList(fontList);
 }
 
-void KFontChooser::showXLFDArea(bool show)
+void TDEFontChooser::showXLFDArea(bool show)
 {
   if( show )
   {
@@ -721,24 +721,24 @@ void KFontChooser::showXLFDArea(bool show)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-KFontDialog::KFontDialog( TQWidget *parent, const char* name,
+TDEFontDialog::TDEFontDialog( TQWidget *parent, const char* name,
 			  bool onlyFixed, bool modal,
 			  const TQStringList &fontList, bool makeFrame, bool diff,
                           TQButton::ToggleState *sizeIsRelativeState )
   : KDialogBase( parent, name, modal, i18n("Select Font"), Ok|Cancel, Ok )
 {
-  chooser = new KFontChooser( this, "fontChooser",
+  chooser = new TDEFontChooser( this, "fontChooser",
                               onlyFixed, fontList, makeFrame, 8,
                               diff, sizeIsRelativeState );
   setMainWidget(chooser);
 }
 
 
-int KFontDialog::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed,
+int TDEFontDialog::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed,
                              TQWidget *parent, bool makeFrame,
                              TQButton::ToggleState *sizeIsRelativeState )
 {
-  KFontDialog dlg( parent, "Font Selector", onlyFixed, true, TQStringList(),
+  TDEFontDialog dlg( parent, "Font Selector", onlyFixed, true, TQStringList(),
 		   makeFrame, true, sizeIsRelativeState );
   dlg.setFont( theFont, onlyFixed );
 
@@ -753,11 +753,11 @@ int KFontDialog::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed,
   return result;
 }
 
-int KFontDialog::getFont( TQFont &theFont, bool onlyFixed,
+int TDEFontDialog::getFont( TQFont &theFont, bool onlyFixed,
                           TQWidget *parent, bool makeFrame,
                           TQButton::ToggleState *sizeIsRelativeState )
 {
-  KFontDialog dlg( parent, "Font Selector", onlyFixed, true, TQStringList(),
+  TDEFontDialog dlg( parent, "Font Selector", onlyFixed, true, TQStringList(),
 		   makeFrame, false, sizeIsRelativeState );
   dlg.setFont( theFont, onlyFixed );
 
@@ -772,12 +772,12 @@ int KFontDialog::getFont( TQFont &theFont, bool onlyFixed,
 }
 
 
-int KFontDialog::getFontAndText( TQFont &theFont, TQString &theString,
+int TDEFontDialog::getFontAndText( TQFont &theFont, TQString &theString,
 				 bool onlyFixed, TQWidget *parent,
 				 bool makeFrame,
                                  TQButton::ToggleState *sizeIsRelativeState )
 {
-  KFontDialog dlg( parent, "Font and Text Selector", onlyFixed, true,
+  TDEFontDialog dlg( parent, "Font and Text Selector", onlyFixed, true,
 		   TQStringList(), makeFrame, false, sizeIsRelativeState );
   dlg.setFont( theFont, onlyFixed );
 
@@ -792,8 +792,8 @@ int KFontDialog::getFontAndText( TQFont &theFont, TQString &theString,
   return result;
 }
 
-void KFontChooser::virtual_hook( int, void* )
+void TDEFontChooser::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KFontDialog::virtual_hook( int id, void* data )
+void TDEFontDialog::virtual_hook( int id, void* data )
 { KDialogBase::virtual_hook( id, data ); }
diff --git a/tdeui/kfontdialog.h b/tdeui/tdefontdialog.h
index 7f859543c..02ffcbcd4 100644
--- a/tdeui/kfontdialog.h
+++ b/tdeui/tdefontdialog.h
@@ -36,22 +36,22 @@ class TQFont;
 class TQGroupBox;
 class TQLabel;
 class TQStringList;
-class KListBox;
+class TDEListBox;
 class KIntNumInput;
 /**
  * @short A font selection widget.
  *
- * While KFontChooser as an ordinary widget can be embedded in
+ * While TDEFontChooser as an ordinary widget can be embedded in
  * custom dialogs and therefore is very flexible, in most cases
  * it is preferable to use the convenience functions in
- * KFontDialog.
+ * TDEFontDialog.
  *
- * \image html kfontchooser.png "KDE Font Chooser"
+ * \image html tdefontchooser.png "KDE Font Chooser"
  *
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
  * @version $Id$
  */
-class TDEUI_EXPORT KFontChooser : public TQWidget
+class TDEUI_EXPORT TDEFontChooser : public TQWidget
 {
   Q_OBJECT
   TQ_PROPERTY( TQFont font READ font WRITE setFont )
@@ -79,8 +79,8 @@ public:
    * <p>Consider the following code snippet;
    * \code
    *    TQStringList list;
-   *    KFontChooser::getFontList(list,SmoothScalableFonts);
-   *    KFontChooser chooseFont = new KFontChooser(0, "FontList", false, list);
+   *    TDEFontChooser::getFontList(list,SmoothScalableFonts);
+   *    TDEFontChooser chooseFont = new TDEFontChooser(0, "FontList", false, list);
    * \endcode
    * <p>
    * The above creates a font chooser dialog with only SmoothScaleble fonts.
@@ -94,7 +94,7 @@ public:
    *        If that has not been created, X is queried, and all fonts
    *        available on the system are displayed.
    * @param diff Display the difference version dialog.
-   *        See KFontDialog::getFontDiff().
+   *        See TDEFontDialog::getFontDiff().
    * @param makeFrame Draws a frame with titles around the contents.
    * @param visibleListSize The minimum number of visible entries in the
    *        fontlists.
@@ -105,7 +105,7 @@ public:
    *        *sizeIsRelativeState, user choice may be retrieved by
    *        calling sizeIsRelative().
    */
-  KFontChooser(TQWidget *parent = 0L, const char *name = 0L,
+  TDEFontChooser(TQWidget *parent = 0L, const char *name = 0L,
 	       bool onlyFixed = false,
 	       const TQStringList &fontList = TQStringList(),
 	       bool makeFrame = true, int visibleListSize=8,
@@ -114,7 +114,7 @@ public:
   /**
    * Destructs the font chooser.
    */
-  virtual ~KFontChooser();
+  virtual ~TDEFontChooser();
 
   /**
    * Enables or disable a font column in the chooser.
@@ -245,7 +245,7 @@ public:
    *
    * @param list The list is returned here.
    * @param fontListCriteria should contain all the restrictions for font selection as OR-ed values
-   *        @see KFontChooser::FontListCriteria for the individual values
+   *        @see TDEFontChooser::FontListCriteria for the individual values
    */
   static void getFontList( TQStringList &list, uint fontListCriteria);
 
@@ -291,9 +291,9 @@ private:
   TQCheckBox    *styleCheckbox;
   TQCheckBox    *sizeCheckbox;
   TQLabel       *sizeLabel;
-  KListBox     *familyListBox;
-  KListBox     *styleListBox;
-  KListBox     *sizeListBox;
+  TDEListBox     *familyListBox;
+  TDEListBox     *styleListBox;
+  TDEListBox     *sizeListBox;
   TQComboBox    *charsetsCombo; // BIC: remove in KDE4
   TQCheckBox    *sizeIsRelativeCheckBox;
 
@@ -308,17 +308,17 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KFontChooserPrivate;
-  KFontChooserPrivate *d;
+  class TDEFontChooserPrivate;
+  TDEFontChooserPrivate *d;
 };
 
 /**
  * @short A font selection dialog.
  *
- * The KFontDialog provides a dialog for interactive font selection.
- * It is basically a thin wrapper around the KFontChooser widget,
+ * The TDEFontDialog provides a dialog for interactive font selection.
+ * It is basically a thin wrapper around the TDEFontChooser widget,
  * which can also be used standalone. In most cases, the simplest
- * use of this class is the static method KFontDialog::getFont(),
+ * use of this class is the static method TDEFontDialog::getFont(),
  * which pops up the dialog, allows the user to select a font, and
  * returns when the dialog is closed.
  *
@@ -326,17 +326,17 @@ private:
  *
  * \code
  *      TQFont myFont;
- *      int result = KFontDialog::getFont( myFont );
- *      if ( result == KFontDialog::Accepted )
+ *      int result = TDEFontDialog::getFont( myFont );
+ *      if ( result == TDEFontDialog::Accepted )
  *            ...
  * \endcode
  *
- * \image html kfontdialog.png "KDE Font Dialog"
+ * \image html tdefontdialog.png "KDE Font Dialog"
  *
  * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
  * @version $Id$
  */
-class TDEUI_EXPORT KFontDialog : public KDialogBase  {
+class TDEUI_EXPORT TDEFontDialog : public KDialogBase  {
     Q_OBJECT
 
 public:
@@ -362,7 +362,7 @@ public:
    *        calling sizeIsRelative().
    *
    */
-  KFontDialog( TQWidget *parent = 0L, const char *name = 0,
+  TDEFontDialog( TQWidget *parent = 0L, const char *name = 0,
 	       bool onlyFixed = false, bool modal = false,
 	       const TQStringList &fontlist = TQStringList(),
 	       bool makeFrame = true, bool diff = false,
@@ -434,11 +434,11 @@ public:
    *        difference selection bitmask should be written.
    *        Check the returned bitmask like:
    *        \code
-   *        if ( diffFlags & KFontChooser::FontDiffFamily )
+   *        if ( diffFlags & TDEFontChooser::FontDiffFamily )
    *            [...]
-   *        if ( diffFlags & KFontChooser::FontDiffStyle )
+   *        if ( diffFlags & TDEFontChooser::FontDiffStyle )
    *            [...]
-   *        if ( diffFlags & KFontChooser::FontDiffSize )
+   *        if ( diffFlags & TDEFontChooser::FontDiffSize )
    *            [...]
    *        \endcode
    * @param onlyFixed if true, only select from fixed-width fonts.
@@ -491,13 +491,13 @@ signals:
   void fontSelected( const TQFont &font );
 
 protected:
-  KFontChooser *chooser;
+  TDEFontChooser *chooser;
 
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KFontDialogPrivate;
-  KFontDialogPrivate *d;
+  class TDEFontDialogPrivate;
+  TDEFontDialogPrivate *d;
 
 };
 
diff --git a/tdeui/kfontrequester.cpp b/tdeui/tdefontrequester.cpp
index 293f9d546..459938d12 100644
--- a/tdeui/kfontrequester.cpp
+++ b/tdeui/tdefontrequester.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kfontrequester.h"
+#include "tdefontrequester.h"
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -25,10 +25,10 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kfontdialog.h>
-#include <klocale.h>
+#include <tdefontdialog.h>
+#include <tdelocale.h>
 
-KFontRequester::KFontRequester( TQWidget *parent, const char *name,
+TDEFontRequester::TDEFontRequester( TQWidget *parent, const char *name,
     bool onlyFixed ) : TQWidget( parent, name ),
     m_onlyFixed( onlyFixed )
 {
@@ -49,7 +49,7 @@ KFontRequester::KFontRequester( TQWidget *parent, const char *name,
   setToolTip();
 }
 
-void KFontRequester::setFont( const TQFont &font, bool onlyFixed )
+void TDEFontRequester::setFont( const TQFont &font, bool onlyFixed )
 {
   m_selFont = font;
   m_onlyFixed = onlyFixed;
@@ -58,21 +58,21 @@ void KFontRequester::setFont( const TQFont &font, bool onlyFixed )
   emit fontSelected( m_selFont );
 }
 
-void KFontRequester::setSampleText( const TQString &text )
+void TDEFontRequester::setSampleText( const TQString &text )
 {
   m_sampleText = text;
   displaySampleText();
 }
 
-void KFontRequester::setTitle( const TQString &title )
+void TDEFontRequester::setTitle( const TQString &title )
 {
   m_title = title;
   setToolTip();
 }
 
-void KFontRequester::buttonClicked()
+void TDEFontRequester::buttonClicked()
 {
-  int result = KFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() );
+  int result = TDEFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() );
 
   if ( result == KDialog::Accepted )
   {
@@ -81,7 +81,7 @@ void KFontRequester::buttonClicked()
   }
 }
 
-void KFontRequester::displaySampleText()
+void TDEFontRequester::displaySampleText()
 {
   m_sampleLabel->setFont( m_selFont );
 
@@ -96,7 +96,7 @@ void KFontRequester::displaySampleText()
     m_sampleLabel->setText( m_sampleText );
 }
 
-void KFontRequester::setToolTip()
+void TDEFontRequester::setToolTip()
 {
   TQToolTip::remove( m_button );
   TQToolTip::add( m_button, i18n( "Click to select a font" ) );
@@ -121,7 +121,7 @@ void KFontRequester::setToolTip()
   }
 }
 
-#include "kfontrequester.moc"
+#include "tdefontrequester.moc"
 
 /* vim: et sw=2 ts=2
 */
diff --git a/tdeui/kfontrequester.h b/tdeui/tdefontrequester.h
index 5d59f5897..7117585ef 100644
--- a/tdeui/kfontrequester.h
+++ b/tdeui/tdefontrequester.h
@@ -31,17 +31,17 @@ class TQPushButton;
 
 /**
  * This class provides a widget with a lineedit and a button, which invokes
- * a font dialog (KFontDialog).
+ * a font dialog (TDEFontDialog).
  *
  * The lineedit provides a preview of the selected font. The preview text can
  * be customized. You can also have the font dialog show only the fixed fonts.
  *
- * \image html kfontrequester.png "KDE Font Requester"
+ * \image html tdefontrequester.png "KDE Font Requester"
  *
  * @author Nadeem Hasan <nhasan@kde.org>
  *
  */
-class TDEUI_EXPORT KFontRequester : public TQWidget
+class TDEUI_EXPORT TDEFontRequester : public TQWidget
 {
   Q_OBJECT
 
@@ -59,7 +59,7 @@ class TDEUI_EXPORT KFontRequester : public TQWidget
      * @param onlyFixed Only display fonts which have fixed-width character
      *        sizes.
      */
-    KFontRequester( TQWidget *parent=0L, const char *name=0L,
+    TDEFontRequester( TQWidget *parent=0L, const char *name=0L,
         bool onlyFixed=false );
 
     /**
@@ -147,8 +147,8 @@ class TDEUI_EXPORT KFontRequester : public TQWidget
 
   private:
 
-    class KFontRequesterPrivate;
-    KFontRequesterPrivate *d;
+    class TDEFontRequesterPrivate;
+    TDEFontRequesterPrivate *d;
 };
 
 #endif // KFONTREQUESTER_H
diff --git a/tdeui/klistbox.cpp b/tdeui/tdelistbox.cpp
index 13c5ab325..0e4c5d520 100644
--- a/tdeui/klistbox.cpp
+++ b/tdeui/tdelistbox.cpp
@@ -19,22 +19,22 @@
 
 #include <tqtimer.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h> 
 #include <kdebug.h>
 
-#include "klistbox.h"
+#include "tdelistbox.h"
 
-KListBox::KListBox( TQWidget *parent, const char *name, WFlags f )
+TDEListBox::TDEListBox( TQWidget *parent, const char *name, WFlags f )
     : TQListBox( parent, name, f ), d(0)
 {
     connect( this, TQT_SIGNAL( onViewport() ),
 	     this, TQT_SLOT( slotOnViewport() ) );
     connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ),
 	     this, TQT_SLOT( slotOnItem( TQListBoxItem * ) ) );
-    slotSettingsChanged(KApplication::SETTINGS_MOUSE);
+    slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
     if (kapp)
     {
         connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
@@ -48,7 +48,7 @@ KListBox::KListBox( TQWidget *parent, const char *name, WFlags f )
     	     this, TQT_SLOT( slotAutoSelect() ) );
 }
 
-void KListBox::slotOnItem( TQListBoxItem *item )
+void TDEListBox::slotOnItem( TQListBoxItem *item )
 {
     if ( item && m_bChangeCursorOverItem && m_bUseSingle )
         viewport()->setCursor( KCursor().handCursor() );
@@ -59,7 +59,7 @@ void KListBox::slotOnItem( TQListBoxItem *item )
     }
 }
 
-void KListBox::slotOnViewport()
+void TDEListBox::slotOnViewport()
 {
     if ( m_bChangeCursorOverItem )
         viewport()->unsetCursor();
@@ -69,11 +69,11 @@ void KListBox::slotOnViewport()
 }
 
 
-void KListBox::slotSettingsChanged(int category)
+void TDEListBox::slotSettingsChanged(int category)
 {
-    if (category != KApplication::SETTINGS_MOUSE)
+    if (category != TDEApplication::SETTINGS_MOUSE)
         return;
-    m_bUseSingle = KGlobalSettings::singleClick();
+    m_bUseSingle = TDEGlobalSettings::singleClick();
 
     disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *,
 						  const TQPoint & ) ),
@@ -99,14 +99,14 @@ void KListBox::slotSettingsChanged(int category)
 // 					  const TQPoint & ) ) );
     }
 
-    m_bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon();
-    m_autoSelectDelay = KGlobalSettings::autoSelectDelay();
+    m_bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon();
+    m_autoSelectDelay = TDEGlobalSettings::autoSelectDelay();
 
     if( !m_bUseSingle || !m_bChangeCursorOverItem )
         viewport()->unsetCursor();
 }
 
-void KListBox::slotAutoSelect()
+void TDEListBox::slotAutoSelect()
 {
   // check that the item still exists
   if( index( m_pCurrentItem ) == -1 )
@@ -116,7 +116,7 @@ void KListBox::slotAutoSelect()
   if( !hasFocus() )
     setFocus();
 
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
 
   TQListBoxItem* previousItem = item( currentItem() ); 
   setCurrentItem( m_pCurrentItem );
@@ -176,9 +176,9 @@ void KListBox::slotAutoSelect()
     kdDebug() << "That´s not supposed to happen!!!!" << endl;
 }
 
-void KListBox::emitExecute( TQListBoxItem *item, const TQPoint &pos )
+void TDEListBox::emitExecute( TQListBoxItem *item, const TQPoint &pos )
 {
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
     
   m_pAutoSelect->stop();
   
@@ -196,7 +196,7 @@ void KListBox::emitExecute( TQListBoxItem *item, const TQPoint &pos )
 // to start help or close the dialog. This functionality
 // should be done in TQListView but it is not (at least now)
 //
-void KListBox::keyPressEvent(TQKeyEvent *e)
+void TDEListBox::keyPressEvent(TQKeyEvent *e)
 {
   if( e->key() == Key_Escape )
   {
@@ -212,21 +212,21 @@ void KListBox::keyPressEvent(TQKeyEvent *e)
   }
 }
 
-void KListBox::focusOutEvent( TQFocusEvent *fe )
+void TDEListBox::focusOutEvent( TQFocusEvent *fe )
 {
   m_pAutoSelect->stop();
 
   TQListBox::focusOutEvent( fe );
 }
 
-void KListBox::leaveEvent( TQEvent *e ) 
+void TDEListBox::leaveEvent( TQEvent *e ) 
 {
   m_pAutoSelect->stop();
 
   TQListBox::leaveEvent( e );
 }
 
-void KListBox::contentsMousePressEvent( TQMouseEvent *e )
+void TDEListBox::contentsMousePressEvent( TQMouseEvent *e )
 {
   if( (selectionMode() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) ) {
     bool block = signalsBlocked();
@@ -240,7 +240,7 @@ void KListBox::contentsMousePressEvent( TQMouseEvent *e )
   TQListBox::contentsMousePressEvent( e );
 }
 
-void KListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
+void TDEListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
 {
   TQListBox::contentsMouseDoubleClickEvent( e );
 
@@ -254,13 +254,13 @@ void KListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
   }
 }
 
-void KListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos )
+void TDEListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos )
 {
   if( (btn == Qt::LeftButton) && item )
     emitExecute( item, pos );
 }
 
-void KListBox::virtual_hook( int, void* )
+void TDEListBox::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "klistbox.moc"
+#include "tdelistbox.moc"
diff --git a/tdeui/klistbox.h b/tdeui/tdelistbox.h
index 981cfa3a3..8ef949527 100644
--- a/tdeui/klistbox.h
+++ b/tdeui/tdelistbox.h
@@ -37,12 +37,12 @@
  * settings.  If you want to get informed when the user selects
  * something connect to the TQListBox::selectionChanged() signal.
  **/
-class TDEUI_EXPORT KListBox : public TQListBox
+class TDEUI_EXPORT TDEListBox : public TQListBox
 {
     Q_OBJECT
 
 public:
-  KListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+  TDEListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 
 signals:
 
@@ -121,8 +121,8 @@ private slots:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KListBoxPrivate;
-  KListBoxPrivate* const d;
+  class TDEListBoxPrivate;
+  TDEListBoxPrivate* const d;
 };
 
 #endif
diff --git a/tdeui/klistview.cpp b/tdeui/tdelistview.cpp
index b52fe6876..4750a7138 100644
--- a/tdeui/klistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -27,20 +27,20 @@
 #include <tqstyle.h>
 #include <tqpainter.h>
 
-#include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeglobalsettings.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
 
-#include "klistview.h"
-#include "klistviewlineedit.h"
+#include "tdelistview.h"
+#include "tdelistviewlineedit.h"
 
-class KListView::Tooltip : public TQToolTip
+class TDEListView::Tooltip : public TQToolTip
 {
 public:
-  Tooltip (KListView* parent, TQToolTipGroup* group = 0L);
+  Tooltip (TDEListView* parent, TQToolTipGroup* group = 0L);
   virtual ~Tooltip () {}
 
 protected:
@@ -50,29 +50,29 @@ protected:
   virtual void maybeTip (const TQPoint&);
 
 private:
-  KListView* mParent;
+  TDEListView* mParent;
 };
 
-KListView::Tooltip::Tooltip (KListView* parent, TQToolTipGroup* group)
+TDEListView::Tooltip::Tooltip (TDEListView* parent, TQToolTipGroup* group)
   : TQToolTip (parent, group),
         mParent (parent)
 {
 }
 
-void KListView::Tooltip::maybeTip (const TQPoint&)
+void TDEListView::Tooltip::maybeTip (const TQPoint&)
 {
   // FIXME
 }
 
-class KListView::KListViewPrivate
+class TDEListView::TDEListViewPrivate
 {
 public:
-  KListViewPrivate (KListView* listview)
+  TDEListViewPrivate (TDEListView* listview)
     : pCurrentItem (0),
       autoSelectDelay(0),
       dragOverItem(0),
-      dragDelay (KGlobalSettings::dndEventDelay()),
-      editor (new KListViewLineEdit (listview)),
+      dragDelay (TDEGlobalSettings::dndEventDelay()),
+      editor (new TDEListViewLineEdit (listview)),
       cursorInExecuteArea(false),
       itemsMovable (true),
       selectedBySimpleMove(false),
@@ -94,20 +94,20 @@ public:
       selectionDirection(0),
       tooltipColumn (0),
       selectionMode (Single),
-      contextMenuKey (KGlobalSettings::contextMenuKey()),
-      showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()),
+      contextMenuKey (TDEGlobalSettings::contextMenuKey()),
+      showContextMenusOnPress (TDEGlobalSettings::showContextMenusOnPress()),
       mDropVisualizerWidth (4),
       paintAbove (0),
       paintCurrent (0),
       paintBelow (0),
       painting (false),
-      shadeSortColumn(KGlobalSettings::shadeSortColumn())
+      shadeSortColumn(TDEGlobalSettings::shadeSortColumn())
   {
       renameable.append(0);
       connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int)));
   }
 
-  ~KListViewPrivate ()
+  ~TDEListViewPrivate ()
   {
     delete editor;
   }
@@ -124,7 +124,7 @@ public:
   TQPoint startDragPos;
   int dragDelay;
 
-  KListViewLineEdit *editor;
+  TDEListViewLineEdit *editor;
   TQValueList<int> renameable;
 
   bool cursorInExecuteArea:1;
@@ -173,7 +173,7 @@ public:
 };
 
 
-KListViewLineEdit::KListViewLineEdit(KListView *parent)
+TDEListViewLineEdit::TDEListViewLineEdit(TDEListView *parent)
         : KLineEdit(parent->viewport()), item(0), col(0), p(parent)
 {
         setFrame( false );
@@ -183,16 +183,16 @@ KListViewLineEdit::KListViewLineEdit(KListView *parent)
                          TQT_SLOT( slotItemRemoved( TQListViewItem * ) ));
 }
 
-KListViewLineEdit::~KListViewLineEdit()
+TDEListViewLineEdit::~TDEListViewLineEdit()
 {
 }
 
-TQListViewItem *KListViewLineEdit::currentItem() const
+TQListViewItem *TDEListViewLineEdit::currentItem() const
 {
 	return item;
 }
 
-void KListViewLineEdit::load(TQListViewItem *i, int c)
+void TDEListViewLineEdit::load(TQListViewItem *i, int c)
 {
         item=i;
         col=c;
@@ -232,7 +232,7 @@ void KListViewLineEdit::load(TQListViewItem *i, int c)
  *	tabOrderedRename functionality.
  */
 
-static int nextCol (KListView *pl, TQListViewItem *pi, int start, int dir)
+static int nextCol (TDEListView *pl, TQListViewItem *pi, int start, int dir)
 {
 	if (pi)
 	{
@@ -273,7 +273,7 @@ static TQListViewItem *lastQChild (TQListViewItem *pi)
 	return pi;
 }
 
-void KListViewLineEdit::selectNextCell (TQListViewItem *pitem, int column, bool forward)
+void TDEListViewLineEdit::selectNextCell (TQListViewItem *pitem, int column, bool forward)
 {
 	const int ncols = p->columns();
 	const int dir = forward ? +1 : -1;
@@ -321,7 +321,7 @@ void KListViewLineEdit::selectNextCell (TQListViewItem *pitem, int column, bool
 #undef KeyPress
 #endif
 
-bool KListViewLineEdit::event (TQEvent *pe)
+bool TDEListViewLineEdit::event (TQEvent *pe)
 {
 	if (pe->type() == TQEvent::KeyPress)
 	{
@@ -340,7 +340,7 @@ bool KListViewLineEdit::event (TQEvent *pe)
 	return KLineEdit::event(pe);
 }
 
-void KListViewLineEdit::keyPressEvent(TQKeyEvent *e)
+void TDEListViewLineEdit::keyPressEvent(TQKeyEvent *e)
 {
 	if(e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter )
 		terminate(true);
@@ -355,16 +355,16 @@ void KListViewLineEdit::keyPressEvent(TQKeyEvent *e)
 		KLineEdit::keyPressEvent(e);
 }
 
-void KListViewLineEdit::terminate()
+void TDEListViewLineEdit::terminate()
 {
     terminate(true);
 }
 
-void KListViewLineEdit::terminate(bool commit)
+void TDEListViewLineEdit::terminate(bool commit)
 {
     if ( item )
     {
-        //kdDebug() << "KListViewLineEdit::terminate " << commit << endl;
+        //kdDebug() << "TDEListViewLineEdit::terminate " << commit << endl;
         if (commit)
             item->setText(col, text());
         int c=col;
@@ -378,7 +378,7 @@ void KListViewLineEdit::terminate(bool commit)
     }
 }
 
-void KListViewLineEdit::focusOutEvent(TQFocusEvent *ev)
+void TDEListViewLineEdit::focusOutEvent(TQFocusEvent *ev)
 {
     TQFocusEvent * focusEv = static_cast<TQFocusEvent*>(ev);
     // Don't let a RMB close the editor
@@ -388,7 +388,7 @@ void KListViewLineEdit::focusOutEvent(TQFocusEvent *ev)
         KLineEdit::focusOutEvent(ev);
 }
 
-void KListViewLineEdit::paintEvent( TQPaintEvent *e )
+void TDEListViewLineEdit::paintEvent( TQPaintEvent *e )
 {
     KLineEdit::paintEvent( e );
 
@@ -402,7 +402,7 @@ void KListViewLineEdit::paintEvent( TQPaintEvent *e )
 // selection changed -> terminate. As our "item" can be already deleted,
 // we can't call terminate(false), because that would emit done() with
 // a dangling pointer to "item".
-void KListViewLineEdit::slotSelectionChanged()
+void TDEListViewLineEdit::slotSelectionChanged()
 {
     item = 0;
     col = 0;
@@ -411,7 +411,7 @@ void KListViewLineEdit::slotSelectionChanged()
 
 // if the current item was removed -> terminate.  Can't call terminate(false)
 // due to same reason as slotSelectionChanged().
-void KListViewLineEdit::slotItemRemoved(TQListViewItem *i)
+void TDEListViewLineEdit::slotItemRemoved(TQListViewItem *i)
 {
     if (currentItem() != i)
         return;
@@ -422,9 +422,9 @@ void KListViewLineEdit::slotItemRemoved(TQListViewItem *i)
 }
 
 
-KListView::KListView( TQWidget *parent, const char *name )
+TDEListView::TDEListView( TQWidget *parent, const char *name )
   : TQListView( parent, name ),
-        d (new KListViewPrivate (this))
+        d (new TDEListViewPrivate (this))
 {
   setDragAutoScroll(true);
 
@@ -438,7 +438,7 @@ KListView::KListView( TQWidget *parent, const char *name )
   connect (this, TQT_SIGNAL(contentsMoving(int,int)),
                    this, TQT_SLOT(cleanItemHighlighter()));
 
-  slotSettingsChanged(KApplication::SETTINGS_MOUSE);
+  slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
   if (kapp)
   {
     connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
@@ -462,17 +462,17 @@ KListView::KListView( TQWidget *parent, const char *name )
                            this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
         }
 
-  connect (this, TQT_SIGNAL (menuShortCutPressed (KListView*, TQListViewItem*)),
-                   this, TQT_SLOT (emitContextMenu (KListView*, TQListViewItem*)));
-  d->alternateBackground = KGlobalSettings::alternateBackgroundColor();
+  connect (this, TQT_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)),
+                   this, TQT_SLOT (emitContextMenu (TDEListView*, TQListViewItem*)));
+  d->alternateBackground = TDEGlobalSettings::alternateBackgroundColor();
 }
 
-KListView::~KListView()
+TDEListView::~TDEListView()
 {
   delete d;
 }
 
-bool KListView::isExecuteArea( const TQPoint& point )
+bool TDEListView::isExecuteArea( const TQPoint& point )
 {
   TQListViewItem* item = itemAt( point );
   if ( item ) {
@@ -482,12 +482,12 @@ bool KListView::isExecuteArea( const TQPoint& point )
   return false;
 }
 
-bool KListView::isExecuteArea( int x )
+bool TDEListView::isExecuteArea( int x )
 {
   return isExecuteArea( x, 0 );
 }
 
-bool KListView::isExecuteArea( int x, TQListViewItem* item )
+bool TDEListView::isExecuteArea( int x, TQListViewItem* item )
 {
   if( allColumnsShowFocus() )
     return true;
@@ -521,7 +521,7 @@ bool KListView::isExecuteArea( int x, TQListViewItem* item )
   }
 }
 
-void KListView::slotOnItem( TQListViewItem *item )
+void TDEListView::slotOnItem( TQListViewItem *item )
 {
   TQPoint vp = viewport()->mapFromGlobal( TQCursor::pos() );
   if ( item && isExecuteArea( vp.x() ) && (d->autoSelectDelay > -1) && d->bUseSingle ) {
@@ -530,7 +530,7 @@ void KListView::slotOnItem( TQListViewItem *item )
   }
 }
 
-void KListView::slotOnViewport()
+void TDEListView::slotOnViewport()
 {
   if ( d->bChangeCursorOverItem )
     viewport()->unsetCursor();
@@ -539,13 +539,13 @@ void KListView::slotOnViewport()
   d->pCurrentItem = 0L;
 }
 
-void KListView::slotSettingsChanged(int category)
+void TDEListView::slotSettingsChanged(int category)
 {
   switch (category)
   {
-  case KApplication::SETTINGS_MOUSE:
-    d->dragDelay =  KGlobalSettings::dndEventDelay();
-    d->bUseSingle = KGlobalSettings::singleClick();
+  case TDEApplication::SETTINGS_MOUSE:
+    d->dragDelay =  TDEGlobalSettings::dndEventDelay();
+    d->bUseSingle = TDEGlobalSettings::singleClick();
 
     disconnect(this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)),
                this, TQT_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)));
@@ -554,18 +554,18 @@ void KListView::slotSettingsChanged(int category)
       connect (this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)),
                this, TQT_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int)));
 
-    d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon();
+    d->bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon();
     if ( !d->disableAutoSelection )
-      d->autoSelectDelay = KGlobalSettings::autoSelectDelay();
+      d->autoSelectDelay = TDEGlobalSettings::autoSelectDelay();
 
     if( !d->bUseSingle || !d->bChangeCursorOverItem )
        viewport()->unsetCursor();
 
     break;
 
-  case KApplication::SETTINGS_POPUPMENU:
-    d->contextMenuKey = KGlobalSettings::contextMenuKey ();
-    d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress ();
+  case TDEApplication::SETTINGS_POPUPMENU:
+    d->contextMenuKey = TDEGlobalSettings::contextMenuKey ();
+    d->showContextMenusOnPress = TDEGlobalSettings::showContextMenusOnPress ();
 
     if (d->showContextMenusOnPress)
     {
@@ -588,7 +588,7 @@ void KListView::slotSettingsChanged(int category)
   }
 }
 
-void KListView::slotAutoSelect()
+void TDEListView::slotAutoSelect()
 {
   // check that the item still exists
   if( itemIndex( d->pCurrentItem ) == -1 )
@@ -604,7 +604,7 @@ void KListView::slotAutoSelect()
   if( !hasFocus() )
     setFocus();
 
-  ButtonState keybstate = KApplication::keyboardMouseState();
+  ButtonState keybstate = TDEApplication::keyboardMouseState();
 
   TQListViewItem* previousItem = currentItem();
   setCurrentItem( d->pCurrentItem );
@@ -646,7 +646,7 @@ void KListView::slotAutoSelect()
       if( selectionMode() == TQListView::Single )
                 emit selectionChanged( d->pCurrentItem );
     }
-    else if( (keybstate & KApplication::ControlModifier) )
+    else if( (keybstate & TDEApplication::ControlModifier) )
       setSelected( d->pCurrentItem, !d->pCurrentItem->isSelected() );
     else {
       bool block = signalsBlocked();
@@ -661,10 +661,10 @@ void KListView::slotAutoSelect()
     }
   }
   else
-    kdDebug() << "KListView::slotAutoSelect: That�s not supposed to happen!!!!" << endl;
+    kdDebug() << "TDEListView::slotAutoSelect: That�s not supposed to happen!!!!" << endl;
 }
 
-void KListView::slotHeaderChanged()
+void TDEListView::slotHeaderChanged()
 {
 
   const int colCount = columns();
@@ -677,7 +677,7 @@ void KListView::slotHeaderChanged()
   }
 }
 
-void KListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c )
+void TDEListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c )
 {
     if( isExecuteArea( viewport()->mapFromGlobal(pos) ) ) {
 	d->validDrag=false;
@@ -691,7 +691,7 @@ void KListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c )
         }
         else
         {
-            ButtonState keybstate = KApplication::keyboardMouseState();
+            ButtonState keybstate = TDEApplication::keyboardMouseState();
 
             d->autoSelect.stop();
 
@@ -705,9 +705,9 @@ void KListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c )
     }
 }
 
-void KListView::focusInEvent( TQFocusEvent *fe )
+void TDEListView::focusInEvent( TQFocusEvent *fe )
 {
- //   kdDebug()<<"KListView::focusInEvent()"<<endl;
+ //   kdDebug()<<"TDEListView::focusInEvent()"<<endl;
   TQListView::focusInEvent( fe );
   if ((d->selectedBySimpleMove)
       && (d->selectionMode == FileManager)
@@ -721,7 +721,7 @@ void KListView::focusInEvent( TQFocusEvent *fe )
   };
 }
 
-void KListView::focusOutEvent( TQFocusEvent *fe )
+void TDEListView::focusOutEvent( TQFocusEvent *fe )
 {
   cleanDropVisualizer();
   cleanItemHighlighter();
@@ -743,22 +743,22 @@ void KListView::focusOutEvent( TQFocusEvent *fe )
   TQListView::focusOutEvent( fe );
 }
 
-void KListView::leaveEvent( TQEvent *e )
+void TDEListView::leaveEvent( TQEvent *e )
 {
   d->autoSelect.stop();
 
   TQListView::leaveEvent( e );
 }
 
-bool KListView::event( TQEvent *e )
+bool TDEListView::event( TQEvent *e )
 {
   if (e->type() == TQEvent::ApplicationPaletteChange)
-    d->alternateBackground=KGlobalSettings::alternateBackgroundColor();
+    d->alternateBackground=TDEGlobalSettings::alternateBackgroundColor();
 
   return TQListView::event(e);
 }
 
-void KListView::contentsMousePressEvent( TQMouseEvent *e )
+void TDEListView::contentsMousePressEvent( TQMouseEvent *e )
 {
   if( (selectionModeExt() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) )
   {
@@ -805,7 +805,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e )
   TQListView::contentsMousePressEvent( e );
 }
 
-void KListView::contentsMouseMoveEvent( TQMouseEvent *e )
+void TDEListView::contentsMouseMoveEvent( TQMouseEvent *e )
 {
   if (!dragEnabled() || d->startDragPos.isNull() || !d->validDrag)
       TQListView::contentsMouseMoveEvent (e);
@@ -845,7 +845,7 @@ void KListView::contentsMouseMoveEvent( TQMouseEvent *e )
     }
 }
 
-void KListView::contentsMouseReleaseEvent( TQMouseEvent *e )
+void TDEListView::contentsMouseReleaseEvent( TQMouseEvent *e )
 {
   if (e->button() == Qt::LeftButton)
   {
@@ -878,7 +878,7 @@ void KListView::contentsMouseReleaseEvent( TQMouseEvent *e )
   TQListView::contentsMouseReleaseEvent( e );
 }
 
-void KListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
+void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
 {
   // We don't want to call the parent method because it does setOpen,
   // whereas we don't do it in single click mode... (David)
@@ -900,13 +900,13 @@ void KListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
   }
 }
 
-void KListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c )
+void TDEListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c )
 {
   if( (btn == Qt::LeftButton) && item )
     emitExecute(item, pos, c);
 }
 
-void KListView::contentsDropEvent(TQDropEvent* e)
+void TDEListView::contentsDropEvent(TQDropEvent* e)
 {
   cleanDropVisualizer();
   cleanItemHighlighter();
@@ -932,7 +932,7 @@ void KListView::contentsDropEvent(TQDropEvent* e)
   }
 }
 
-void KListView::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme)
+void TDEListView::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme)
 {
   TQPtrList<TQListViewItem> items, afterFirsts, afterNows;
   TQListViewItem *current=currentItem();
@@ -982,7 +982,7 @@ void KListView::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterm
     emit moved();
 }
 
-void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
+void TDEListView::contentsDragMoveEvent(TQDragMoveEvent *event)
 {
   if (acceptDrag(event))
   {
@@ -1026,20 +1026,20 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
       event->ignore();
 }
 
-void KListView::slotDragExpand()
+void TDEListView::slotDragExpand()
 {
   if ( itemAt( d->dragOverPoint ) == d->dragOverItem )
     d->dragOverItem->setOpen( true );
 }
 
-void KListView::contentsDragLeaveEvent (TQDragLeaveEvent*)
+void TDEListView::contentsDragLeaveEvent (TQDragLeaveEvent*)
 {
   d->dragExpand.stop();
   cleanDropVisualizer();
   cleanItemHighlighter();
 }
 
-void KListView::cleanDropVisualizer()
+void TDEListView::cleanDropVisualizer()
 {
   if (d->mOldDropVisualizer.isValid())
   {
@@ -1049,12 +1049,12 @@ void KListView::cleanDropVisualizer()
   }
 }
 
-int KListView::depthToPixels( int depth )
+int TDEListView::depthToPixels( int depth )
 {
     return treeStepSize() * ( depth + (rootIsDecorated() ? 1 : 0) ) + itemMargin();
 }
 
-void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after)
+void TDEListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after)
 {
 	TQPoint p (contentsToViewport(pos));
 
@@ -1123,7 +1123,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView
   parent = after ? after->parent() : 0L ;
 }
 
-TQListViewItem* KListView::lastChild () const
+TQListViewItem* TDEListView::lastChild () const
 {
   TQListViewItem* lastchild = firstChild();
 
@@ -1133,7 +1133,7 @@ TQListViewItem* KListView::lastChild () const
   return lastchild;
 }
 
-TQListViewItem *KListView::lastItem() const
+TQListViewItem *TDEListView::lastItem() const
 {
   TQListViewItem* last = lastChild();
 
@@ -1143,12 +1143,12 @@ TQListViewItem *KListView::lastItem() const
   return last;
 }
 
-KLineEdit *KListView::renameLineEdit() const
+KLineEdit *TDEListView::renameLineEdit() const
 {
   return d->editor;
 }
 
-void KListView::startDrag()
+void TDEListView::startDrag()
 {
   TQDragObject *drag = dragObject();
 
@@ -1159,7 +1159,7 @@ void KListView::startDrag()
     emit moved();
 }
 
-TQDragObject *KListView::dragObject()
+TQDragObject *TDEListView::dragObject()
 {
   if (!currentItem())
         return 0;
@@ -1168,63 +1168,63 @@ TQDragObject *KListView::dragObject()
   return new TQStoredDrag("application/x-qlistviewitem", viewport());
 }
 
-void KListView::setItemsMovable(bool b)
+void TDEListView::setItemsMovable(bool b)
 {
   d->itemsMovable=b;
 }
 
-bool KListView::itemsMovable() const
+bool TDEListView::itemsMovable() const
 {
   return d->itemsMovable;
 }
 
-void KListView::setItemsRenameable(bool b)
+void TDEListView::setItemsRenameable(bool b)
 {
   d->itemsRenameable=b;
 }
 
-bool KListView::itemsRenameable() const
+bool TDEListView::itemsRenameable() const
 {
   return d->itemsRenameable;
 }
 
 
-void KListView::setDragEnabled(bool b)
+void TDEListView::setDragEnabled(bool b)
 {
   d->dragEnabled=b;
 }
 
-bool KListView::dragEnabled() const
+bool TDEListView::dragEnabled() const
 {
   return d->dragEnabled;
 }
 
-void KListView::setAutoOpen(bool b)
+void TDEListView::setAutoOpen(bool b)
 {
   d->autoOpen=b;
 }
 
-bool KListView::autoOpen() const
+bool TDEListView::autoOpen() const
 {
   return d->autoOpen;
 }
 
-bool KListView::dropVisualizer() const
+bool TDEListView::dropVisualizer() const
 {
   return d->dropVisualizer;
 }
 
-void KListView::setDropVisualizer(bool b)
+void TDEListView::setDropVisualizer(bool b)
 {
   d->dropVisualizer=b;
 }
 
-TQPtrList<TQListViewItem> KListView::selectedItems() const
+TQPtrList<TQListViewItem> TDEListView::selectedItems() const
 {
   return selectedItems(true);
 }
 
-TQPtrList<TQListViewItem> KListView::selectedItems(bool includeHiddenItems) const
+TQPtrList<TQListViewItem> TDEListView::selectedItems(bool includeHiddenItems) const
 {
   TQPtrList<TQListViewItem> list;
 
@@ -1248,7 +1248,7 @@ TQPtrList<TQListViewItem> KListView::selectedItems(bool includeHiddenItems) cons
         flags |= TQListViewItemIterator::Visible;
       }
 
-      TQListViewItemIterator it(const_cast<KListView *>(this), flags);
+      TQListViewItemIterator it(const_cast<TDEListView *>(this), flags);
 
       for(; it.current(); ++it)
           list.append(it.current());
@@ -1261,7 +1261,7 @@ TQPtrList<TQListViewItem> KListView::selectedItems(bool includeHiddenItems) cons
 }
 
 
-void KListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListViewItem *after)
+void TDEListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListViewItem *after)
 {
   // sanity check - don't move a item into its own child structure
   TQListViewItem *i = parent;
@@ -1291,18 +1291,18 @@ void KListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListVie
         insertItem(item);
 }
 
-void KListView::contentsDragEnterEvent(TQDragEnterEvent *event)
+void TDEListView::contentsDragEnterEvent(TQDragEnterEvent *event)
 {
   if (acceptDrag (event))
     event->accept();
 }
 
-void KListView::setDropVisualizerWidth (int w)
+void TDEListView::setDropVisualizerWidth (int w)
 {
   d->mDropVisualizerWidth = w > 0 ? w : 1;
 }
 
-TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent,
+TQRect TDEListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent,
                                     TQListViewItem *after)
 {
     TQRect insertmarker;
@@ -1341,7 +1341,7 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent,
         insertmarker.setBottom (insertmarker.bottom() + d->mDropVisualizerWidth/2);
     }
 
-    // This is not used anymore, at least by KListView itself (see viewportPaintEvent)
+    // This is not used anymore, at least by TDEListView itself (see viewportPaintEvent)
     // Remove for KDE 4.0.
     if (p)
         p->fillRect(insertmarker, Dense4Pattern);
@@ -1349,7 +1349,7 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent,
     return insertmarker;
 }
 
-TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
+TQRect TDEListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
 {
   TQRect r;
 
@@ -1365,7 +1365,7 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
   return r;
 }
 
-void KListView::cleanItemHighlighter ()
+void TDEListView::cleanItemHighlighter ()
 {
   if (d->mOldDropHighlighter.isValid())
   {
@@ -1375,7 +1375,7 @@ void KListView::cleanItemHighlighter ()
   }
 }
 
-void KListView::rename(TQListViewItem *item, int c)
+void TDEListView::rename(TQListViewItem *item, int c)
 {
   if (d->renameable.contains(c))
   {
@@ -1384,12 +1384,12 @@ void KListView::rename(TQListViewItem *item, int c)
   }
 }
 
-bool KListView::isRenameable (int col) const
+bool TDEListView::isRenameable (int col) const
 {
   return d->renameable.contains(col);
 }
 
-void KListView::setRenameable (int col, bool renameable)
+void TDEListView::setRenameable (int col, bool renameable)
 {
   if (col>=header()->count()) return;
 
@@ -1398,69 +1398,69 @@ void KListView::setRenameable (int col, bool renameable)
     d->renameable+=col;
 }
 
-void KListView::doneEditing(TQListViewItem *item, int row)
+void TDEListView::doneEditing(TQListViewItem *item, int row)
 {
   emit itemRenamed(item, item->text(row), row);
   emit itemRenamed(item);
 }
 
-bool KListView::acceptDrag(TQDropEvent* e) const
+bool TDEListView::acceptDrag(TQDropEvent* e) const
 {
   return acceptDrops() && itemsMovable() && (e->source()==viewport());
 }
 
-void KListView::setCreateChildren(bool b)
+void TDEListView::setCreateChildren(bool b)
 {
         d->createChildren=b;
 }
 
-bool KListView::createChildren() const
+bool TDEListView::createChildren() const
 {
         return d->createChildren;
 }
 
 
-int KListView::tooltipColumn() const
+int TDEListView::tooltipColumn() const
 {
         return d->tooltipColumn;
 }
 
-void KListView::setTooltipColumn(int column)
+void TDEListView::setTooltipColumn(int column)
 {
         d->tooltipColumn=column;
 }
 
-void KListView::setDropHighlighter(bool b)
+void TDEListView::setDropHighlighter(bool b)
 {
         d->dropHighlighter=b;
 }
 
-bool KListView::dropHighlighter() const
+bool TDEListView::dropHighlighter() const
 {
         return d->dropHighlighter;
 }
 
-bool KListView::showTooltip(TQListViewItem *item, const TQPoint &, int column) const
+bool TDEListView::showTooltip(TQListViewItem *item, const TQPoint &, int column) const
 {
         return ((column==tooltipColumn()) && !tooltip(item, column).isEmpty());
 }
 
-TQString KListView::tooltip(TQListViewItem *item, int column) const
+TQString TDEListView::tooltip(TQListViewItem *item, int column) const
 {
         return item->text(column);
 }
 
-void KListView::setTabOrderedRenaming(bool b)
+void TDEListView::setTabOrderedRenaming(bool b)
 {
 	d->tabRename = b;
 }
 
-bool KListView::tabOrderedRenaming() const
+bool TDEListView::tabOrderedRenaming() const
 {
 	return d->tabRename;
 }
 
-void KListView::keyPressEvent (TQKeyEvent* e)
+void TDEListView::keyPressEvent (TQKeyEvent* e)
 {
   //don't we need a contextMenuModifier too ? (aleXXX)
   if (e->key() == d->contextMenuKey)
@@ -1475,7 +1475,7 @@ void KListView::keyPressEvent (TQKeyEvent* e)
         fileManagerKeyPressEvent (e);
 }
 
-void KListView::activateAutomaticSelection()
+void TDEListView::activateAutomaticSelection()
 {
    d->selectedBySimpleMove=true;
    d->selectedUsingMouse=false;
@@ -1487,17 +1487,17 @@ void KListView::activateAutomaticSelection()
    };
 }
 
-void KListView::deactivateAutomaticSelection()
+void TDEListView::deactivateAutomaticSelection()
 {
    d->selectedBySimpleMove=false;
 }
 
-bool KListView::automaticSelection() const
+bool TDEListView::automaticSelection() const
 {
    return d->selectedBySimpleMove;
 }
 
-void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
+void TDEListView::fileManagerKeyPressEvent (TQKeyEvent* e)
 {
    //don't care whether it's on the keypad or not
     int e_state=(e->state() & ~Keypad);
@@ -1827,7 +1827,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
        emit selectionChanged();
 }
 
-void KListView::setSelectionModeExt (SelectionModeExt mode)
+void TDEListView::setSelectionModeExt (SelectionModeExt mode)
 {
     d->selectionMode = mode;
 
@@ -1850,12 +1850,12 @@ void KListView::setSelectionModeExt (SelectionModeExt mode)
     }
 }
 
-KListView::SelectionModeExt KListView::selectionModeExt () const
+TDEListView::SelectionModeExt TDEListView::selectionModeExt () const
 {
   return d->selectionMode;
 }
 
-int KListView::itemIndex( const TQListViewItem *item ) const
+int TDEListView::itemIndex( const TQListViewItem *item ) const
 {
     if ( !item )
         return -1;
@@ -1874,7 +1874,7 @@ int KListView::itemIndex( const TQListViewItem *item ) const
     }
 }
 
-TQListViewItem* KListView::itemAtIndex(int index)
+TQListViewItem* TDEListView::itemAtIndex(int index)
 {
    if (index<0)
       return 0;
@@ -1890,7 +1890,7 @@ TQListViewItem* KListView::itemAtIndex(int index)
 }
 
 
-void KListView::emitContextMenu (KListView*, TQListViewItem* i)
+void TDEListView::emitContextMenu (TDEListView*, TQListViewItem* i)
 {
   TQPoint p;
 
@@ -1902,24 +1902,24 @@ void KListView::emitContextMenu (KListView*, TQListViewItem* i)
   emit contextMenu (this, i, p);
 }
 
-void KListView::emitContextMenu (TQListViewItem* i, const TQPoint& p, int)
+void TDEListView::emitContextMenu (TQListViewItem* i, const TQPoint& p, int)
 {
   emit contextMenu (this, i, p);
 }
 
-void KListView::setAcceptDrops (bool val)
+void TDEListView::setAcceptDrops (bool val)
 {
   TQListView::setAcceptDrops (val);
   viewport()->setAcceptDrops (val);
 }
 
-int KListView::dropVisualizerWidth () const
+int TDEListView::dropVisualizerWidth () const
 {
         return d->mDropVisualizerWidth;
 }
 
 
-void KListView::viewportPaintEvent(TQPaintEvent *e)
+void TDEListView::viewportPaintEvent(TQPaintEvent *e)
 {
   d->paintAbove = 0;
   d->paintCurrent = 0;
@@ -1946,23 +1946,23 @@ void KListView::viewportPaintEvent(TQPaintEvent *e)
   d->painting = false;
 }
 
-void KListView::setFullWidth()
+void TDEListView::setFullWidth()
 {
   setFullWidth(true);
 }
 
-void KListView::setFullWidth(bool fullWidth)
+void TDEListView::setFullWidth(bool fullWidth)
 {
   d->fullWidth = fullWidth;
   header()->setStretchEnabled(fullWidth, columns()-1);
 }
 
-bool KListView::fullWidth() const
+bool TDEListView::fullWidth() const
 {
   return d->fullWidth;
 }
 
-int KListView::addColumn(const TQString& label, int width)
+int TDEListView::addColumn(const TQString& label, int width)
 {
   int result = TQListView::addColumn(label, width);
   if (d->fullWidth) {
@@ -1972,7 +1972,7 @@ int KListView::addColumn(const TQString& label, int width)
   return result;
 }
 
-int KListView::addColumn(const TQIconSet& iconset, const TQString& label, int width)
+int TDEListView::addColumn(const TQIconSet& iconset, const TQString& label, int width)
 {
   int result = TQListView::addColumn(iconset, label, width);
   if (d->fullWidth) {
@@ -1982,42 +1982,42 @@ int KListView::addColumn(const TQIconSet& iconset, const TQString& label, int wi
   return result;
 }
 
-void KListView::removeColumn(int index)
+void TDEListView::removeColumn(int index)
 {
   TQListView::removeColumn(index);
   if (d->fullWidth && index == columns()) header()->setStretchEnabled(true, columns()-1);
 }
 
-void KListView::viewportResizeEvent(TQResizeEvent* e)
+void TDEListView::viewportResizeEvent(TQResizeEvent* e)
 {
   TQListView::viewportResizeEvent(e);
 }
 
-const TQColor &KListView::alternateBackground() const
+const TQColor &TDEListView::alternateBackground() const
 {
   return d->alternateBackground;
 }
 
-void KListView::setAlternateBackground(const TQColor &c)
+void TDEListView::setAlternateBackground(const TQColor &c)
 {
   d->alternateBackground = c;
   repaint();
 }
 
-void KListView::setShadeSortColumn(bool shadeSortColumn)
+void TDEListView::setShadeSortColumn(bool shadeSortColumn)
 {
   d->shadeSortColumn = shadeSortColumn;
   repaint();
 }
 
-bool KListView::shadeSortColumn() const
+bool TDEListView::shadeSortColumn() const
 {
   return d->shadeSortColumn;
 }
 
-void KListView::saveLayout(KConfig *config, const TQString &group) const
+void TDEListView::saveLayout(TDEConfig *config, const TQString &group) const
 {
-  KConfigGroupSaver saver(config, group);
+  TDEConfigGroupSaver saver(config, group);
   TQStringList widths, order;
 
   const int colCount = columns();
@@ -2033,9 +2033,9 @@ void KListView::saveLayout(KConfig *config, const TQString &group) const
   config->writeEntry("SortAscending", d->sortAscending);
 }
 
-void KListView::restoreLayout(KConfig *config, const TQString &group)
+void TDEListView::restoreLayout(TDEConfig *config, const TQString &group)
 {
-  KConfigGroupSaver saver(config, group);
+  TDEConfigGroupSaver saver(config, group);
   TQStringList cols = config->readListEntry("ColumnWidths");
   int i = 0;
   { // scope the iterators
@@ -2068,7 +2068,7 @@ void KListView::restoreLayout(KConfig *config, const TQString &group)
     setSorting(config->readNumEntry("SortColumn"), config->readBoolEntry("SortAscending", true));
 }
 
-void KListView::setSorting(int column, bool ascending)
+void TDEListView::setSorting(int column, bool ascending)
 {
   TQListViewItem *selected = 0;
 
@@ -2095,23 +2095,23 @@ void KListView::setSorting(int column, bool ascending)
 
   TQListViewItem* item = firstChild();
   while ( item ) {
-    KListViewItem *kItem = dynamic_cast<KListViewItem*>(item);
+    TDEListViewItem *kItem = dynamic_cast<TDEListViewItem*>(item);
     if (kItem) kItem->m_known = false;
     item = item->itemBelow();
   }
 }
 
-int KListView::columnSorted(void) const
+int TDEListView::columnSorted(void) const
 {
   return d->sortColumn;
 }
 
-bool KListView::ascendingSort(void) const
+bool TDEListView::ascendingSort(void) const
 {
   return d->sortAscending;
 }
 
-void KListView::takeItem(TQListViewItem *item)
+void TDEListView::takeItem(TQListViewItem *item)
 {
   if(item && item == d->editor->currentItem())
     d->editor->terminate();
@@ -2119,7 +2119,7 @@ void KListView::takeItem(TQListViewItem *item)
   TQListView::takeItem(item);
 }
 
-void KListView::disableAutoSelection()
+void TDEListView::disableAutoSelection()
 {
   if ( d->disableAutoSelection )
     return;
@@ -2129,45 +2129,45 @@ void KListView::disableAutoSelection()
   d->autoSelectDelay = -1;
 }
 
-void KListView::resetAutoSelection()
+void TDEListView::resetAutoSelection()
 {
   if ( !d->disableAutoSelection )
     return;
 
   d->disableAutoSelection = false;
-  d->autoSelectDelay = KGlobalSettings::autoSelectDelay();
+  d->autoSelectDelay = TDEGlobalSettings::autoSelectDelay();
 }
 
-void KListView::doubleClicked( TQListViewItem *item, const TQPoint &pos, int c )
+void TDEListView::doubleClicked( TQListViewItem *item, const TQPoint &pos, int c )
 {
   emit TQListView::doubleClicked( item, pos, c );
 }
 
-KListViewItem::KListViewItem(TQListView *parent)
+TDEListViewItem::TDEListViewItem(TQListView *parent)
   : TQListViewItem(parent)
 {
   init();
 }
 
-KListViewItem::KListViewItem(TQListViewItem *parent)
+TDEListViewItem::TDEListViewItem(TQListViewItem *parent)
   : TQListViewItem(parent)
 {
   init();
 }
 
-KListViewItem::KListViewItem(TQListView *parent, TQListViewItem *after)
+TDEListViewItem::TDEListViewItem(TQListView *parent, TQListViewItem *after)
   : TQListViewItem(parent, after)
 {
   init();
 }
 
-KListViewItem::KListViewItem(TQListViewItem *parent, TQListViewItem *after)
+TDEListViewItem::TDEListViewItem(TQListViewItem *parent, TQListViewItem *after)
   : TQListViewItem(parent, after)
 {
   init();
 }
 
-KListViewItem::KListViewItem(TQListView *parent,
+TDEListViewItem::TDEListViewItem(TQListView *parent,
     TQString label1, TQString label2, TQString label3, TQString label4,
     TQString label5, TQString label6, TQString label7, TQString label8)
   : TQListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
@@ -2175,7 +2175,7 @@ KListViewItem::KListViewItem(TQListView *parent,
   init();
 }
 
-KListViewItem::KListViewItem(TQListViewItem *parent,
+TDEListViewItem::TDEListViewItem(TQListViewItem *parent,
     TQString label1, TQString label2, TQString label3, TQString label4,
     TQString label5, TQString label6, TQString label7, TQString label8)
   : TQListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
@@ -2183,7 +2183,7 @@ KListViewItem::KListViewItem(TQListViewItem *parent,
   init();
 }
 
-KListViewItem::KListViewItem(TQListView *parent, TQListViewItem *after,
+TDEListViewItem::TDEListViewItem(TQListView *parent, TQListViewItem *after,
     TQString label1, TQString label2, TQString label3, TQString label4,
     TQString label5, TQString label6, TQString label7, TQString label8)
   : TQListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
@@ -2191,7 +2191,7 @@ KListViewItem::KListViewItem(TQListView *parent, TQListViewItem *after,
   init();
 }
 
-KListViewItem::KListViewItem(TQListViewItem *parent, TQListViewItem *after,
+TDEListViewItem::TDEListViewItem(TQListViewItem *parent, TQListViewItem *after,
     TQString label1, TQString label2, TQString label3, TQString label4,
     TQString label5, TQString label6, TQString label7, TQString label8)
   : TQListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
@@ -2199,44 +2199,44 @@ KListViewItem::KListViewItem(TQListViewItem *parent, TQListViewItem *after,
   init();
 }
 
-KListViewItem::~KListViewItem()
+TDEListViewItem::~TDEListViewItem()
 {
   if(listView())
-    emit static_cast<KListView *>(listView())->itemRemoved(this);
+    emit static_cast<TDEListView *>(listView())->itemRemoved(this);
 }
 
-void KListViewItem::init()
+void TDEListViewItem::init()
 {
   m_odd = m_known = false;
-  KListView *lv = static_cast<KListView *>(listView());
+  TDEListView *lv = static_cast<TDEListView *>(listView());
   setDragEnabled( dragEnabled() || lv->dragEnabled() );
   emit lv->itemAdded(this);
 }
 
-void KListViewItem::insertItem(TQListViewItem *item)
+void TDEListViewItem::insertItem(TQListViewItem *item)
 {
   TQListViewItem::insertItem(item);
   if(listView())
-    emit static_cast<KListView *>(listView())->itemAdded(item);
+    emit static_cast<TDEListView *>(listView())->itemAdded(item);
 }
 
-void KListViewItem::takeItem(TQListViewItem *item)
+void TDEListViewItem::takeItem(TQListViewItem *item)
 {
   TQListViewItem::takeItem(item);
   if(listView())
-    emit static_cast<KListView *>(listView())->itemRemoved(item);
+    emit static_cast<TDEListView *>(listView())->itemRemoved(item);
 }
 
-const TQColor &KListViewItem::backgroundColor()
+const TQColor &TDEListViewItem::backgroundColor()
 {
   if (isAlternate())
-    return static_cast< KListView* >(listView())->alternateBackground();
+    return static_cast< TDEListView* >(listView())->alternateBackground();
   return listView()->viewport()->colorGroup().base();
 }
 
-TQColor KListViewItem::backgroundColor(int column)
+TQColor TDEListViewItem::backgroundColor(int column)
 {
-  KListView* view = static_cast< KListView* >(listView());
+  TDEListView* view = static_cast< TDEListView* >(listView());
   TQColor color = isAlternate() ?
                  view->alternateBackground() :
                  view->viewport()->colorGroup().base();
@@ -2260,14 +2260,14 @@ TQColor KListViewItem::backgroundColor(int column)
   return color;
 }
 
-bool KListViewItem::isAlternate()
+bool TDEListViewItem::isAlternate()
 {
-  KListView* const lv = static_cast<KListView *>(listView());
+  TDEListView* const lv = static_cast<TDEListView *>(listView());
   if (lv && lv->alternateBackground().isValid())
   {
-    KListViewItem *above;
+    TDEListViewItem *above;
 
-    KListView::KListViewPrivate* const lvD = lv->d;
+    TDEListView::TDEListViewPrivate* const lvD = lv->d;
 
     // Ok, there's some weirdness here that requires explanation as this is a
     // speed hack.  itemAbove() is a O(n) operation (though this isn't
@@ -2294,11 +2294,11 @@ bool KListViewItem::isAlternate()
         lvD->paintBelow = itemBelow();
       }
 
-      above = dynamic_cast<KListViewItem *>(lvD->paintAbove);
+      above = dynamic_cast<TDEListViewItem *>(lvD->paintAbove);
     }
     else
     {
-      above = dynamic_cast<KListViewItem *>(itemAbove());
+      above = dynamic_cast<TDEListViewItem *>(itemAbove());
     }
 
     m_known = above ? above->m_known : true;
@@ -2308,18 +2308,18 @@ bool KListViewItem::isAlternate()
     }
     else
     {
-       KListViewItem *item;
+       TDEListViewItem *item;
        bool previous = true;
        if (parent())
        {
-          item = dynamic_cast<KListViewItem *>(parent());
+          item = dynamic_cast<TDEListViewItem *>(parent());
           if (item)
              previous = item->m_odd;
-          item = dynamic_cast<KListViewItem *>(parent()->firstChild());
+          item = dynamic_cast<TDEListViewItem *>(parent()->firstChild());
        }
        else
        {
-          item = dynamic_cast<KListViewItem *>(lv->firstChild());
+          item = dynamic_cast<TDEListViewItem *>(lv->firstChild());
        }
 
        while(item)
@@ -2327,7 +2327,7 @@ bool KListViewItem::isAlternate()
           previous = !previous;
           item->m_odd = previous;
           item->m_known = true;
-          item = dynamic_cast<KListViewItem *>(item->nextSibling());
+          item = dynamic_cast<TDEListViewItem *>(item->nextSibling());
        }
     }
     return m_odd;
@@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate()
   return false;
 }
 
-void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
+void TDEListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
   TQColorGroup _cg = cg;
   TQListView* lv = listView();
@@ -2363,7 +2363,7 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
     selection of the current item is just set to \a select.
 */
 
-void KListView::selectAll( bool select )
+void TDEListView::selectAll( bool select )
 {
     if ( selectionMode() == Multi || selectionMode() == Extended ) {
 	bool b = signalsBlocked();
@@ -2402,10 +2402,10 @@ void KListView::selectAll( bool select )
     }
 }
 
-void KListView::virtual_hook( int, void* )
+void TDEListView::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "klistview.moc"
-#include "klistviewlineedit.moc"
+#include "tdelistview.moc"
+#include "tdelistviewlineedit.moc"
 
 // vim: noet
diff --git a/tdeui/klistview.h b/tdeui/tdelistview.h
index e60ae70b8..995e2b678 100644
--- a/tdeui/klistview.h
+++ b/tdeui/tdelistview.h
@@ -20,13 +20,14 @@
 #ifndef KLISTVIEW_H
 #define KLISTVIEW_H
 
+#include <tqheader.h>
 #include <tqlistview.h>
 
 #include <tqptrlist.h>
 #include <tdelibs_export.h>
 
 class TQDragObject;
-class KConfig;
+class TDEConfig;
 class KLineEdit;
 /**
  * This Widget extends the functionality of TQListView to honor the system
@@ -46,13 +47,13 @@ class KLineEdit;
  * To see where you are dropping, setDropVisualizer(true).
  * And also you'll need acceptDrag(TQDropEvent*)
  *
- * KListView is drag-enabled, too: to benefit from that you have to derive from it.
+ * TDEListView is drag-enabled, too: to benefit from that you have to derive from it.
  * Reimplement dragObject() and (possibly) startDrag(),
  * and setDragEnabled(true).
  */
-class TDEUI_EXPORT KListView : public TQListView
+class TDEUI_EXPORT TDEListView : public TQListView
 {
-  friend class KListViewItem;
+  friend class TDEListViewItem;
 
   Q_OBJECT
   
@@ -116,12 +117,12 @@ public:
    * The parameters @p parent and @p name are handled by
    * TQListView, as usual.
    */
-  KListView (TQWidget *parent = 0, const char *name = 0);
+  TDEListView (TQWidget *parent = 0, const char *name = 0);
 
   /**
    * Destructor.
    */
-  virtual ~KListView();
+  virtual ~TDEListView();
 
  /**
    * Reimplemented for internal reasons.
@@ -193,7 +194,7 @@ public:
 
   /**
    * @return the lineedit used for inline renaming.
-   * Use that to setup a KCompletion or TQValidator for the lineedit
+   * Use that to setup a TDECompletion or TQValidator for the lineedit
    *
    * @since 3.2
    */
@@ -333,7 +334,7 @@ public:
 
   /**
    * sets the alternate background background color.
-   * This only has an effect if the items are KListViewItems
+   * This only has an effect if the items are TDEListViewItems
    *
    * @param c the color to use for every other item. Set to an invalid
    *        color to disable alternate colors.
@@ -350,20 +351,20 @@ public:
 
   /**
    * Saves the list view's layout (column widtsh, column order, sort column)
-   * to a KConfig group
+   * to a TDEConfig group
    *
-   * @param config the KConfig object to write to
+   * @param config the TDEConfig object to write to
    * @param group the config group to use
    */
-  void saveLayout(KConfig *config, const TQString &group) const;
+  void saveLayout(TDEConfig *config, const TQString &group) const;
   /**
-   * Reads the list view's layout from a KConfig group as stored with
+   * Reads the list view's layout from a TDEConfig group as stored with
    * saveLayout
    *
-   * @param config the KConfig object to read from
+   * @param config the TDEConfig object to read from
    * @param group the config group to use
    */
-  void restoreLayout(KConfig *config, const TQString &group);
+  void restoreLayout(TDEConfig *config, const TQString &group);
   /**
    * Reimplemented to remember the current sort column and order.
    * @param column is the column to be sorted, or -1 to sort in order of
@@ -452,7 +453,7 @@ signals:
    * @param after is the item after which the drop occurred (or 0L, if
    * the drop was above all items
    */
-  void dropped (KListView* list, TQDropEvent* e, TQListViewItem* after);
+  void dropped (TDEListView* list, TQDropEvent* e, TQListViewItem* after);
 
   /**
    * This signal gets emitted whenever something acceptable is
@@ -466,7 +467,7 @@ signals:
    * @param after is the item after which the drop occurred (or 0L, if
    * the drop was above all items
    */
-  void dropped (KListView* list, TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after);
+  void dropped (TDEListView* list, TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after);
 
   /**
    * This signal gets emitted whenever something acceptable is
@@ -494,7 +495,7 @@ signals:
    * a move is made, for example, to disable sorting
    *
    * This is sent only once per each groups of moves.  That is, for each
-   * drop that is a move this will be emitted once, before KListView calls
+   * drop that is a move this will be emitted once, before TDEListView calls
    * @see moveItem()
    */
   void aboutToMove();
@@ -538,13 +539,13 @@ signals:
    * This signal is emitted when the shortcut key for popup-menus is pressed.
    *
    * Normally you should not use this, just connect a slot to signal
-   * contextMenu (KListView*, TQListViewItem*, const TQPoint&) to correctly
+   * contextMenu (TDEListView*, TQListViewItem*, const TQPoint&) to correctly
    * handle showing context menus regardless of settings.
    *
    * @param list is this listview.
    * @param item is the currentItem() at the time the key was pressed. May be 0L.
    */
-  void menuShortCutPressed (KListView* list, TQListViewItem* item);
+  void menuShortCutPressed (TDEListView* list, TQListViewItem* item);
 
   /**
    * This signal is emitted whenever a context-menu should be shown for item @p i.
@@ -554,7 +555,7 @@ signals:
    * @param i is the item for which the menu should be shown. May be 0L.
    * @param p is the point at which the menu should be shown.
    */
-  void contextMenu (KListView* l, TQListViewItem* i, const TQPoint& p);
+  void contextMenu (TDEListView* l, TQListViewItem* i, const TQPoint& p);
 
   void itemAdded(TQListViewItem *item);
   void itemRemoved(TQListViewItem *item);
@@ -571,7 +572,7 @@ public slots:
    * Use this function to enable the feature on other columns.
    *
    * If you want more intelligent (dynamic) selection,
-   * you'll have to derive from KListView,
+   * you'll have to derive from TDEListView,
    * and override rename() and call only call it
    * if you want the item to be renamed.
    */
@@ -947,7 +948,7 @@ protected slots:
   /**
    * Emit the contextMenu signal. This slot is for key presses.
    */
-  void emitContextMenu (KListView*, TQListViewItem*);
+  void emitContextMenu (TDEListView*, TQListViewItem*);
 
   /**
    * Accessory slot for AutoSelect
@@ -1004,8 +1005,8 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KListViewPrivate;
-  KListViewPrivate* const d;
+  class TDEListViewPrivate;
+  TDEListViewPrivate* const d;
   bool isExecuteArea( int x, TQListViewItem* item );
 };
 
@@ -1015,46 +1016,46 @@ private:
  *
  * @short listview item with alternate background color support
  */
-class TDEUI_EXPORT KListViewItem : public TQListViewItem
+class TDEUI_EXPORT TDEListViewItem : public TQListViewItem
 {
-  friend class KListView;
+  friend class TDEListView;
 public:
   /**
    * constructors. The semantics remain as in TQListViewItem.
    * Although they accept a TQListViewItem as parent, please
-   * don't mix KListViewItem (or subclasses) with QListViewItem
+   * don't mix TDEListViewItem (or subclasses) with QListViewItem
    * (or subclasses).
    */
-  KListViewItem(TQListView *parent);
-  KListViewItem(TQListViewItem *parent);
-  KListViewItem(TQListView *parent, TQListViewItem *after);
-  KListViewItem(TQListViewItem *parent, TQListViewItem *after);
+  TDEListViewItem(TQListView *parent);
+  TDEListViewItem(TQListViewItem *parent);
+  TDEListViewItem(TQListView *parent, TQListViewItem *after);
+  TDEListViewItem(TQListViewItem *parent, TQListViewItem *after);
 
-  KListViewItem(TQListView *parent,
+  TDEListViewItem(TQListView *parent,
     TQString, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null);
 
-  KListViewItem(TQListViewItem *parent,
+  TDEListViewItem(TQListViewItem *parent,
     TQString, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null);
 
-  KListViewItem(TQListView *parent, TQListViewItem *after,
+  TDEListViewItem(TQListView *parent, TQListViewItem *after,
     TQString, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null);
 
-  KListViewItem(TQListViewItem *parent, TQListViewItem *after,
+  TDEListViewItem(TQListViewItem *parent, TQListViewItem *after,
     TQString, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null,
     TQString = TQString::null, TQString = TQString::null);
 
-  virtual ~KListViewItem();
+  virtual ~TDEListViewItem();
 
   virtual void insertItem(TQListViewItem *item);
   virtual void takeItem(TQListViewItem *item);
diff --git a/tdeui/klistviewlineedit.h b/tdeui/tdelistviewlineedit.h
index f08997925..0c19e90f5 100644
--- a/tdeui/klistviewlineedit.h
+++ b/tdeui/tdelistviewlineedit.h
@@ -19,18 +19,18 @@
 #define KLISTVIEWLINEEDIT_H
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 /**
- * the editor for a KListView.  please don't use this.
+ * the editor for a TDEListView.  please don't use this.
  * @internal
  **/
-class TDEUI_EXPORT KListViewLineEdit : public KLineEdit
+class TDEUI_EXPORT TDEListViewLineEdit : public KLineEdit
 {
 Q_OBJECT
 public:
-	KListViewLineEdit(KListView *parent);
-	~KListViewLineEdit();
+	TDEListViewLineEdit(TDEListView *parent);
+	~TDEListViewLineEdit();
 
 	TQListViewItem *currentItem() const;
 
@@ -52,7 +52,7 @@ protected:
 	void terminate(bool commit);
 	TQListViewItem *item;
 	int col;
-	KListView* const p;
+	TDEListView* const p;
 
 protected slots:
 	void slotSelectionChanged();
diff --git a/tdeui/klistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp
index 7f96ed94d..b74b4d1c1 100644
--- a/tdeui/klistviewsearchline.cpp
+++ b/tdeui/tdelistviewsearchline.cpp
@@ -16,14 +16,14 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "klistviewsearchline.h"
+#include "tdelistviewsearchline.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqapplication.h>
 #include <tqtimer.h>
@@ -33,17 +33,17 @@
 
 #define KLISTVIEWSEARCHLINE_ALLVISIBLECOLUMNS_ID 2004
 
-class KListViewSearchLine::KListViewSearchLinePrivate
+class TDEListViewSearchLine::TDEListViewSearchLinePrivate
 {
 public:
-    KListViewSearchLinePrivate() :
+    TDEListViewSearchLinePrivate() :
         listView(0),
         caseSensitive(false),
         activeSearch(false),
         keepParentsVisible(true),
         queuedSearches(0) {}
 
-    KListView *listView;
+    TDEListView *listView;
     bool caseSensitive;
     bool activeSearch;
     bool keepParentsVisible;
@@ -56,10 +56,10 @@ public:
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-KListViewSearchLine::KListViewSearchLine(TQWidget *parent, KListView *listView, const char *name) :
+TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, TDEListView *listView, const char *name) :
     KLineEdit(parent, name)
 {
-    d = new KListViewSearchLinePrivate;
+    d = new TDEListViewSearchLinePrivate;
 
     d->listView = listView;
 
@@ -77,10 +77,10 @@ KListViewSearchLine::KListViewSearchLine(TQWidget *parent, KListView *listView,
         setEnabled(false);
 }
 
-KListViewSearchLine::KListViewSearchLine(TQWidget *parent, const char *name) :
+TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, const char *name) :
     KLineEdit(parent, name)
 {
-    d = new KListViewSearchLinePrivate;
+    d = new TDEListViewSearchLinePrivate;
 
     d->listView = 0;
 
@@ -90,27 +90,27 @@ KListViewSearchLine::KListViewSearchLine(TQWidget *parent, const char *name) :
     setEnabled(false);
 }
 
-KListViewSearchLine::~KListViewSearchLine()
+TDEListViewSearchLine::~TDEListViewSearchLine()
 {
     delete d;
 }
 
-bool KListViewSearchLine::caseSensitive() const
+bool TDEListViewSearchLine::caseSensitive() const
 {
     return d->caseSensitive;
 }
 
-TQValueList<int> KListViewSearchLine::searchColumns() const
+TQValueList<int> TDEListViewSearchLine::searchColumns() const
 {
     return d->searchColumns;
 }
 
-bool KListViewSearchLine::keepParentsVisible() const
+bool TDEListViewSearchLine::keepParentsVisible() const
 {
     return d->keepParentsVisible;
 }
 
-KListView *KListViewSearchLine::listView() const
+TDEListView *TDEListViewSearchLine::listView() const
 {
     return d->listView;
 }
@@ -119,7 +119,7 @@ KListView *KListViewSearchLine::listView() const
 // public slots
 ////////////////////////////////////////////////////////////////////////////////
 
-void KListViewSearchLine::updateSearch(const TQString &s)
+void TDEListViewSearchLine::updateSearch(const TQString &s)
 {
     if(!d->listView)
         return;
@@ -133,9 +133,9 @@ void KListViewSearchLine::updateSearch(const TQString &s)
 
     switch(d->listView->selectionMode())
     {
-    case KListView::NoSelection:
+    case TDEListView::NoSelection:
         break;
-    case KListView::Single:
+    case TDEListView::Single:
         currentItem = d->listView->selectedItem();
         break;
     default:
@@ -160,22 +160,22 @@ void KListViewSearchLine::updateSearch(const TQString &s)
         d->listView->ensureItemVisible(currentItem);
 }
 
-void KListViewSearchLine::setCaseSensitive(bool cs)
+void TDEListViewSearchLine::setCaseSensitive(bool cs)
 {
     d->caseSensitive = cs;
 }
 
-void KListViewSearchLine::setKeepParentsVisible(bool v)
+void TDEListViewSearchLine::setKeepParentsVisible(bool v)
 {
     d->keepParentsVisible = v;
 }
 
-void KListViewSearchLine::setSearchColumns(const TQValueList<int> &columns)
+void TDEListViewSearchLine::setSearchColumns(const TQValueList<int> &columns)
 {
     d->searchColumns = columns;
 }
 
-void KListViewSearchLine::setListView(KListView *lv)
+void TDEListViewSearchLine::setListView(TDEListView *lv)
 {
     if(d->listView) {
         disconnect(d->listView, TQT_SIGNAL(destroyed()),
@@ -202,7 +202,7 @@ void KListViewSearchLine::setListView(KListView *lv)
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const
+bool TDEListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const
 {
     if(s.isEmpty())
         return true;
@@ -231,7 +231,7 @@ bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString
     return false;
 }
 
-TQPopupMenu *KListViewSearchLine::createPopupMenu()
+TQPopupMenu *TDEListViewSearchLine::createPopupMenu()
 {
     TQPopupMenu *popup = KLineEdit::createPopupMenu();
 
@@ -281,14 +281,14 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu()
 // protected slots
 ////////////////////////////////////////////////////////////////////////////////
 
-void KListViewSearchLine::queueSearch(const TQString &search)
+void TDEListViewSearchLine::queueSearch(const TQString &search)
 {
     d->queuedSearches++;
     d->search = search;
     TQTimer::singleShot(200, this, TQT_SLOT(activateSearch()));
 }
 
-void KListViewSearchLine::activateSearch()
+void TDEListViewSearchLine::activateSearch()
 {
     --(d->queuedSearches);
 
@@ -300,18 +300,18 @@ void KListViewSearchLine::activateSearch()
 // private slots
 ////////////////////////////////////////////////////////////////////////////////
 
-void KListViewSearchLine::itemAdded(TQListViewItem *item) const
+void TDEListViewSearchLine::itemAdded(TQListViewItem *item) const
 {
     item->setVisible(itemMatches(item, text()));
 }
 
-void KListViewSearchLine::listViewDeleted()
+void TDEListViewSearchLine::listViewDeleted()
 {
     d->listView = 0;
     setEnabled(false);
 }
 
-void KListViewSearchLine::searchColumnsMenuActivated(int id)
+void TDEListViewSearchLine::searchColumnsMenuActivated(int id)
 {
     if(id == KLISTVIEWSEARCHLINE_ALLVISIBLECOLUMNS_ID) {
         if(d->searchColumns.isEmpty())
@@ -340,7 +340,7 @@ void KListViewSearchLine::searchColumnsMenuActivated(int id)
 // private methods
 ////////////////////////////////////////////////////////////////////////////////
 
-void KListViewSearchLine::checkItemParentsNotVisible()
+void TDEListViewSearchLine::checkItemParentsNotVisible()
 {
     TQListViewItemIterator it(d->listView);
     for(; it.current(); ++it)
@@ -364,7 +364,7 @@ void KListViewSearchLine::checkItemParentsNotVisible()
  *  \return \c true if an item which should be visible is found, \c false if all items found should be hidden. If this function
  *             returns true and \p highestHiddenParent was not 0, highestHiddenParent will have been shown.
  */
-bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListViewItem *highestHiddenParent)
+bool TDEListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListViewItem *highestHiddenParent)
 {
     bool visible = false;
     TQListViewItem * first = item;
@@ -403,24 +403,24 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// KListViewSearchLineWidget
+// TDEListViewSearchLineWidget
 ////////////////////////////////////////////////////////////////////////////////
 
-class KListViewSearchLineWidget::KListViewSearchLineWidgetPrivate
+class TDEListViewSearchLineWidget::TDEListViewSearchLineWidgetPrivate
 {
 public:
-    KListViewSearchLineWidgetPrivate() : listView(0), searchLine(0), clearButton(0) {}
-    KListView *listView;
-    KListViewSearchLine *searchLine;
+    TDEListViewSearchLineWidgetPrivate() : listView(0), searchLine(0), clearButton(0) {}
+    TDEListView *listView;
+    TDEListViewSearchLine *searchLine;
     TQToolButton *clearButton;
 };
 
-KListViewSearchLineWidget::KListViewSearchLineWidget(KListView *listView,
+TDEListViewSearchLineWidget::TDEListViewSearchLineWidget(TDEListView *listView,
                                                      TQWidget *parent,
                                                      const char *name) :
     TQHBox(parent, name)
 {
-    d = new KListViewSearchLineWidgetPrivate;
+    d = new TDEListViewSearchLineWidgetPrivate;
     d->listView = listView;
 
     setSpacing(5);
@@ -428,19 +428,19 @@ KListViewSearchLineWidget::KListViewSearchLineWidget(KListView *listView,
     TQTimer::singleShot(0, this, TQT_SLOT(createWidgets()));
 }
 
-KListViewSearchLineWidget::~KListViewSearchLineWidget()
+TDEListViewSearchLineWidget::~TDEListViewSearchLineWidget()
 {
     delete d;
 }
 
-KListViewSearchLine *KListViewSearchLineWidget::createSearchLine(KListView *listView)
+TDEListViewSearchLine *TDEListViewSearchLineWidget::createSearchLine(TDEListView *listView)
 {
     if(!d->searchLine)
-        d->searchLine = new KListViewSearchLine(this, listView);
+        d->searchLine = new TDEListViewSearchLine(this, listView);
     return d->searchLine;
 }
 
-void KListViewSearchLineWidget::createWidgets()
+void TDEListViewSearchLineWidget::createWidgets()
 {
     positionInToolBar();
 
@@ -463,14 +463,14 @@ void KListViewSearchLineWidget::createWidgets()
     connect(d->clearButton, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear()));
 }
 
-KListViewSearchLine *KListViewSearchLineWidget::searchLine() const
+TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const
 {
     return d->searchLine;
 }
 
-void KListViewSearchLineWidget::positionInToolBar()
+void TDEListViewSearchLineWidget::positionInToolBar()
 {
-    KToolBar *toolBar = tqt_dynamic_cast<KToolBar *>(parent());
+    TDEToolBar *toolBar = tqt_dynamic_cast<TDEToolBar *>(parent());
 
     if(toolBar) {
 
@@ -486,7 +486,7 @@ void KListViewSearchLineWidget::positionInToolBar()
                 toolBar->setItemAutoSized(id);
                 if(!d->clearButton) {
                     TQString icon = TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase";
-                    d->clearButton = new KToolBarButton(icon, 2005, toolBar);
+                    d->clearButton = new TDEToolBarButton(icon, 2005, toolBar);
                 }
                 toolBar->insertWidget(2005, d->clearButton->width(), d->clearButton, index);
                 break;
@@ -498,4 +498,4 @@ void KListViewSearchLineWidget::positionInToolBar()
         d->searchLine->show();
 }
 
-#include "klistviewsearchline.moc"
+#include "tdelistviewsearchline.moc"
diff --git a/tdeui/klistviewsearchline.h b/tdeui/tdelistviewsearchline.h
index f763aad72..4c278a9d9 100644
--- a/tdeui/klistviewsearchline.h
+++ b/tdeui/tdelistviewsearchline.h
@@ -22,7 +22,7 @@
 #include <klineedit.h>
 #include <tqhbox.h>
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class TQToolButton;
 
@@ -31,12 +31,12 @@ class TQToolButton;
  * listview based on a simple text search.
  *
  * No changes to the application other than instantiating this class with an
- * appropriate KListView should be needed.
+ * appropriate TDEListView should be needed.
  *
  * If you want the clear button and the search label, you should take a look at
- * the KListViewSearchLineWidget
+ * the TDEListViewSearchLineWidget
  *
- * @note { When iterating over items in the KListView, make sure that
+ * @note { When iterating over items in the TDEListView, make sure that
  * the iterator only includes visible items (for example, by adding
  * TQListViewItemIterator::Visible to the iterator flags). Otherwise,
  * actions (such as deletion) may be taken on items that have been
@@ -44,31 +44,31 @@ class TQToolButton;
  * @since 3.3
  */
 
-class TDEUI_EXPORT KListViewSearchLine : public KLineEdit
+class TDEUI_EXPORT TDEListViewSearchLine : public KLineEdit
 {
     Q_OBJECT
 
 public:
 
     /**
-     * Constructs a KListViewSearchLine with \a listView being the KListView to
+     * Constructs a TDEListViewSearchLine with \a listView being the TDEListView to
      * be filtered.
      *
      * If \a listView is null then the widget will be disabled until a listview
      * is set with setListView().
      */
-    KListViewSearchLine(TQWidget *parent = 0, KListView *listView = 0, const char *name = 0);
+    TDEListViewSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0);
 
     /**
-     * Constructs a KListViewSearchLine without any KListView to filter. The
-     * KListView object has to be set later with setListView(). 
+     * Constructs a TDEListViewSearchLine without any TDEListView to filter. The
+     * TDEListView object has to be set later with setListView(). 
      */
-    KListViewSearchLine(TQWidget *parent, const char *name);
+    TDEListViewSearchLine(TQWidget *parent, const char *name);
 
     /**
-     * Destroys the KListViewSearchLine.
+     * Destroys the TDEListViewSearchLine.
      */
-    virtual ~KListViewSearchLine();
+    virtual ~TDEListViewSearchLine();
 
     /**
      * Returns true if the search is case sensitive.  This defaults to false.
@@ -98,7 +98,7 @@ public:
      *
      * @see setListView()
      */
-    KListView *listView() const;
+    TDEListView *listView() const;
 
 public slots:
     /**
@@ -136,12 +136,12 @@ public slots:
     void setSearchColumns(const TQValueList<int> &columns);
 
     /**
-     * Sets the KListView that is filtered by this search line.  If \a lv is null
+     * Sets the TDEListView that is filtered by this search line.  If \a lv is null
      * then the widget will be disabled.
      *
      * @see listView()
      */
-    void setListView(KListView *lv);
+    void setListView(TDEListView *lv);
 
 protected:
 
@@ -206,43 +206,43 @@ private slots:
     void searchColumnsMenuActivated(int);
 
 private:
-    class KListViewSearchLinePrivate;
-    KListViewSearchLinePrivate *d;
+    class TDEListViewSearchLinePrivate;
+    TDEListViewSearchLinePrivate *d;
 };
 
 /**
- * Creates a widget featuring a KListViewSearchLine, a label with the text
+ * Creates a widget featuring a TDEListViewSearchLine, a label with the text
  * "Search" and a button to clear the search.
  *
  * @since 3.4
  */
-class TDEUI_EXPORT KListViewSearchLineWidget : public TQHBox
+class TDEUI_EXPORT TDEListViewSearchLineWidget : public TQHBox
 {
     Q_OBJECT
 
 public:
     /**
-     * Creates a KListViewSearchLineWidget for \a listView with \a parent as the
+     * Creates a TDEListViewSearchLineWidget for \a listView with \a parent as the
      * parent with and \a name.
      */
-    KListViewSearchLineWidget(KListView *listView = 0, TQWidget *parent = 0,
+    TDEListViewSearchLineWidget(TDEListView *listView = 0, TQWidget *parent = 0,
                               const char *name = 0);
 
     /**
-     * Destroys the KListViewSearchLineWidget
+     * Destroys the TDEListViewSearchLineWidget
      */
-    ~KListViewSearchLineWidget();
+    ~TDEListViewSearchLineWidget();
 
     /**
      * Creates the search line.  This can be useful to reimplement in cases where
-     * a KListViewSearchLine subclass is used.
+     * a TDEListViewSearchLine subclass is used.
      */
-    virtual KListViewSearchLine *createSearchLine(KListView *listView);
+    virtual TDEListViewSearchLine *createSearchLine(TDEListView *listView);
 
     /**
      * Returns a pointer to the search line.
      */
-    KListViewSearchLine *searchLine() const;
+    TDEListViewSearchLine *searchLine() const;
 
 protected slots:
     /**
@@ -257,8 +257,8 @@ private slots:
     void positionInToolBar();
 
 private:
-    class KListViewSearchLineWidgetPrivate;
-    KListViewSearchLineWidgetPrivate *d;
+    class TDEListViewSearchLineWidgetPrivate;
+    TDEListViewSearchLineWidgetPrivate *d;
 };
 
 #endif
diff --git a/tdeui/kmainwindow.cpp b/tdeui/tdemainwindow.cpp
index ffb59588b..ba9c51556 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -23,9 +23,9 @@
  */
 #include "config.h"
 
-#include "kmainwindow.h"
-#include "kmainwindowiface.h"
-#include "ktoolbarhandler.h"
+#include "tdemainwindow.h"
+#include "tdemainwindowiface.h"
+#include "tdetoolbarhandler.h"
 #include "kwhatsthismanager_p.h"
 #include <tqsessionmanager.h>
 #include <tqobjectlist.h>
@@ -34,19 +34,19 @@
 #include <tqwidgetlist.h>
 #include <tqtimer.h>
 
-#include <kaccel.h>
-#include <kaction.h>
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <twin.h>
 #include <kedittoolbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #if defined Q_WS_X11
@@ -57,7 +57,7 @@
 #include <ctype.h>
 #include <assert.h>
 
-class KMainWindowPrivate {
+class TDEMainWindowPrivate {
 public:
     bool showHelpMenu:1;
 
@@ -67,16 +67,16 @@ public:
     bool care_about_geometry:1;
     bool shuttingDown:1;
     TQString autoSaveGroup;
-    KAccel * kaccel;
-    KMainWindowInterface *m_interface;
+    TDEAccel * tdeaccel;
+    TDEMainWindowInterface *m_interface;
     KDEPrivate::ToolBarHandler *toolBarHandler;
     TQTimer* settingsTimer;
-    KToggleAction *showStatusBarAction;
+    TDEToggleAction *showStatusBarAction;
     TQRect defaultWindowSize;
     TQPtrList<TQDockWindow> hiddenDockWindows;
 };
 
-TQPtrList<KMainWindow>* KMainWindow::memberList = 0L;
+TQPtrList<TDEMainWindow>* TDEMainWindow::memberList = 0L;
 static bool no_query_exit = false;
 static KMWSessionManaged* ksm = 0;
 static KStaticDeleter<KMWSessionManaged> ksmd;
@@ -92,14 +92,14 @@ public:
     }
     bool saveState( TQSessionManager& )
     {
-        KConfig* config = KApplication::kApplication()->sessionConfig();
-        if ( KMainWindow::memberList->first() ){
+        TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
+        if ( TDEMainWindow::memberList->first() ){
             // According to Jochen Wilhelmy <digisnap@cs.tu-berlin.de>, this
             // hook is useful for better document orientation
-            KMainWindow::memberList->first()->saveGlobalProperties(config);
+            TDEMainWindow::memberList->first()->saveGlobalProperties(config);
         }
 
-        TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
+        TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
         int n = 0;
         for (it.toFirst(); it.current(); ++it){
             n++;
@@ -115,10 +115,10 @@ public:
         // not really a fast method but the only compatible one
         if ( sm.allowsInteraction() ) {
             bool canceled = false;
-            TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
+            TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
             ::no_query_exit = true;
             for (it.toFirst(); it.current() && !canceled;){
-                KMainWindow *window = *it;
+                TDEMainWindow *window = *it;
                 ++it; // Update now, the current window might get deleted
                 if ( !window->testWState( TQt::WState_ForceHide ) ) {
                     TQCloseEvent e;
@@ -144,9 +144,9 @@ public:
             if (canceled)
                return false;
 
-            KMainWindow* last = 0;
+            TDEMainWindow* last = 0;
             for (it.toFirst(); it.current() && !canceled; ++it){
-                KMainWindow *window = *it;
+                TDEMainWindow *window = *it;
                 if ( !window->testWState( TQt::WState_ForceHide ) ) {
                     last = window;
                 }
@@ -164,19 +164,19 @@ public:
 
 static bool being_first = true;
 
-KMainWindow::KMainWindow( TQWidget* parent, const char *name, WFlags f )
+TDEMainWindow::TDEMainWindow( TQWidget* parent, const char *name, WFlags f )
     : TQMainWindow( parent, name, f ), KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )
 {
-    initKMainWindow(name, 0);
+    initTDEMainWindow(name, 0);
 }
 
-KMainWindow::KMainWindow( int cflags, TQWidget* parent, const char *name, WFlags f )
+TDEMainWindow::TDEMainWindow( int cflags, TQWidget* parent, const char *name, WFlags f )
     : TQMainWindow( parent, name, f ), KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )
 {
-    initKMainWindow(name, cflags);
+    initTDEMainWindow(name, cflags);
 }
 
-void KMainWindow::initKMainWindow(const char *name, int cflags)
+void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
 {
     KWhatsThisManager::init ();
     setDockMenuEnabled( false );
@@ -185,7 +185,7 @@ void KMainWindow::initKMainWindow(const char *name, int cflags)
     actionCollection()->setWidget( this );
     connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown()));
     if( !memberList )
-        memberList = new TQPtrList<KMainWindow>;
+        memberList = new TQPtrList<TDEMainWindow>;
 
     if ( !ksm )
         ksm = ksmd.setObject(ksm, new KMWSessionManaged());
@@ -233,12 +233,12 @@ void KMainWindow::initKMainWindow(const char *name, int cflags)
 
     memberList->append( this );
 
-    d = new KMainWindowPrivate;
+    d = new TDEMainWindowPrivate;
     d->showHelpMenu = true;
     d->settingsDirty = false;
     d->autoSaveSettings = false;
     d->autoSaveWindowSize = true; // for compatibility
-    d->kaccel = actionCollection()->kaccel();
+    d->tdeaccel = actionCollection()->tdeaccel();
     d->toolBarHandler = 0;
     d->settingsTimer = 0;
     d->showStatusBarAction = NULL;
@@ -255,13 +255,13 @@ void KMainWindow::initKMainWindow(const char *name, int cflags)
     if ( cflags & NoDCOPObject)
         d->m_interface = 0;
     else
-        d->m_interface = new KMainWindowInterface(this);
+        d->m_interface = new TDEMainWindowInterface(this);
 
     if (!kapp->authorize("movable_toolbars"))
         setDockWindowsMovable(false);
 }
 
-KAction *KMainWindow::toolBarMenuAction()
+TDEAction *TDEMainWindow::toolBarMenuAction()
 {
     if ( !d->toolBarHandler )
 	return 0;
@@ -270,13 +270,13 @@ KAction *KMainWindow::toolBarMenuAction()
 }
 
 
-void KMainWindow::setupToolbarMenuActions()
+void TDEMainWindow::setupToolbarMenuActions()
 {
     if ( d->toolBarHandler )
         d->toolBarHandler->setupActions();
 }
 
-void KMainWindow::parseGeometry(bool parsewidth)
+void TDEMainWindow::parseGeometry(bool parsewidth)
 {
     assert ( !kapp->geometryArgument().isNull() );
     assert ( d->care_about_geometry );
@@ -303,15 +303,15 @@ void KMainWindow::parseGeometry(bool parsewidth)
         if ( parsewidth && !(m & YValue) )
             y = geometry().y();
         if ( (m & XNegative) )
-            x = KApplication::desktop()->width()  + x - w;
+            x = TDEApplication::desktop()->width()  + x - w;
         if ( (m & YNegative) )
-            y = KApplication::desktop()->height() + y - h;
+            y = TDEApplication::desktop()->height() + y - h;
         move(x, y);
     }
 #endif
 }
 
-KMainWindow::~KMainWindow()
+TDEMainWindow::~TDEMainWindow()
 {
     delete d->settingsTimer;
     TQMenuBar* mb = internalMenuBar();
@@ -321,7 +321,7 @@ KMainWindow::~KMainWindow()
     memberList->remove( this );
 }
 
-KPopupMenu* KMainWindow::helpMenu( const TQString &aboutAppText, bool showWhatsThis )
+TDEPopupMenu* TDEMainWindow::helpMenu( const TQString &aboutAppText, bool showWhatsThis )
 {
     if( !mHelpMenu ) {
         if ( aboutAppText.isEmpty() )
@@ -338,7 +338,7 @@ KPopupMenu* KMainWindow::helpMenu( const TQString &aboutAppText, bool showWhatsT
     return mHelpMenu->menu();
 }
 
-KPopupMenu* KMainWindow::customHelpMenu( bool showWhatsThis )
+TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis )
 {
     if( !mHelpMenu ) {
         mHelpMenu = new KHelpMenu( this, TQString::null, showWhatsThis );
@@ -349,11 +349,11 @@ KPopupMenu* KMainWindow::customHelpMenu( bool showWhatsThis )
     return mHelpMenu->menu();
 }
 
-bool KMainWindow::canBeRestored( int number )
+bool TDEMainWindow::canBeRestored( int number )
 {
     if ( !kapp->isRestored() )
         return false;
-    KConfig *config = kapp->sessionConfig();
+    TDEConfig *config = kapp->sessionConfig();
     if ( !config )
         return false;
     config->setGroup( TQString::fromLatin1("Number") );
@@ -361,11 +361,11 @@ bool KMainWindow::canBeRestored( int number )
     return number >= 1 && number <= n;
 }
 
-const TQString KMainWindow::classNameOfToplevel( int number )
+const TQString TDEMainWindow::classNameOfToplevel( int number )
 {
     if ( !kapp->isRestored() )
         return TQString::null;
-    KConfig *config = kapp->sessionConfig();
+    TDEConfig *config = kapp->sessionConfig();
     if ( !config )
         return TQString::null;
     TQString s;
@@ -378,7 +378,7 @@ const TQString KMainWindow::classNameOfToplevel( int number )
         return config->readEntry( TQString::fromLatin1("ClassName") );
 }
 
-void KMainWindow::show()
+void TDEMainWindow::show()
 {
     TQMainWindow::show();
 
@@ -388,7 +388,7 @@ void KMainWindow::show()
     d->hiddenDockWindows.clear();
 }
 
-void KMainWindow::hide()
+void TDEMainWindow::hide()
 {
     if ( isVisible() ) {
 
@@ -408,45 +408,45 @@ void KMainWindow::hide()
     TQWidget::hide();
 }
 
-bool KMainWindow::restore( int number, bool show )
+bool TDEMainWindow::restore( int number, bool show )
 {
     if ( !canBeRestored( number ) )
         return false;
-    KConfig *config = kapp->sessionConfig();
+    TDEConfig *config = kapp->sessionConfig();
     if ( readPropertiesInternal( config, number ) ){
         if ( show )
-            KMainWindow::show();
+            TDEMainWindow::show();
         return false;
     }
     return false;
 }
 
-KXMLGUIFactory *KMainWindow::guiFactory()
+KXMLGUIFactory *TDEMainWindow::guiFactory()
 {
     if ( !factory_ )
         factory_ = new KXMLGUIFactory( this, TQT_TQOBJECT(this), "guifactory" );
     return factory_;
 }
 
-int KMainWindow::configureToolbars()
+int TDEMainWindow::configureToolbars()
 {
-    saveMainWindowSettings(KGlobal::config());
+    saveMainWindowSettings(TDEGlobal::config());
     KEditToolbar dlg(actionCollection(), xmlFile(), true, this);
     connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig()));
     return dlg.exec();
 }
 
-void KMainWindow::saveNewToolbarConfig()
+void TDEMainWindow::saveNewToolbarConfig()
 {
     createGUI(xmlFile());
-    applyMainWindowSettings( KGlobal::config() );
+    applyMainWindowSettings( TDEGlobal::config() );
 }
 
-void KMainWindow::setupGUI( int options, const TQString & xmlfile ) {
+void TDEMainWindow::setupGUI( int options, const TQString & xmlfile ) {
     setupGUI(TQSize(), options, xmlfile);
 }
 
-void KMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xmlfile ) {
+void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xmlfile ) {
     if( options & Keys ){
         KStdAction::keyBindings(guiFactory(),
                     TQT_SLOT(configureShortcuts()), actionCollection());
@@ -488,7 +488,7 @@ void KMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xm
 
 }
 
-void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
+void TDEMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
 {
     // disabling the updates prevents unnecessary redraws
     setUpdatesEnabled( false );
@@ -544,7 +544,7 @@ void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
       // using stuff like the toolbar editor ).
       // In addition we have to take care of not removing containers
       // like popupmenus, defined in the XML document.
-      // this code should probably go into a separate method in KMainWindow.
+      // this code should probably go into a separate method in TDEMainWindow.
       // there's just one problem: I'm bad in finding names ;-) , so
       // I skipped this ;-)
 
@@ -568,27 +568,27 @@ void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
     updateGeometry();
 }
 
-void KMainWindow::setHelpMenuEnabled(bool showHelpMenu)
+void TDEMainWindow::setHelpMenuEnabled(bool showHelpMenu)
 {
     d->showHelpMenu = showHelpMenu;
 }
 
-bool KMainWindow::isHelpMenuEnabled()
+bool TDEMainWindow::isHelpMenuEnabled()
 {
     return d->showHelpMenu;
 }
 
-void KMainWindow::setCaption( const TQString &caption )
+void TDEMainWindow::setCaption( const TQString &caption )
 {
     setPlainCaption( kapp->makeStdCaption(caption) );
 }
 
-void KMainWindow::setCaption( const TQString &caption, bool modified )
+void TDEMainWindow::setCaption( const TQString &caption, bool modified )
 {
     setPlainCaption( kapp->makeStdCaption(caption, true, modified) );
 }
 
-void KMainWindow::setPlainCaption( const TQString &caption )
+void TDEMainWindow::setPlainCaption( const TQString &caption )
 {
     TQMainWindow::setCaption( caption );
 #if defined Q_WS_X11
@@ -597,7 +597,7 @@ void KMainWindow::setPlainCaption( const TQString &caption )
 #endif
 }
 
-void KMainWindow::appHelpActivated( void )
+void TDEMainWindow::appHelpActivated( void )
 {
     if( !mHelpMenu ) {
         mHelpMenu = new KHelpMenu( this );
@@ -607,7 +607,7 @@ void KMainWindow::appHelpActivated( void )
     mHelpMenu->appHelpActivated();
 }
 
-void KMainWindow::slotStateChanged(const TQString &newstate)
+void TDEMainWindow::slotStateChanged(const TQString &newstate)
 {
   stateChanged(newstate, KXMLGUIClient::StateNoReverse);
 }
@@ -615,7 +615,7 @@ void KMainWindow::slotStateChanged(const TQString &newstate)
 /*
  * Get rid of this for KDE 4.0
  */
-void KMainWindow::slotStateChanged(const TQString &newstate,
+void TDEMainWindow::slotStateChanged(const TQString &newstate,
                                    KXMLGUIClient::ReverseStateChange reverse)
 {
   stateChanged(newstate, reverse);
@@ -624,14 +624,14 @@ void KMainWindow::slotStateChanged(const TQString &newstate,
 /*
  * Enable this for KDE 4.0
  */
-// void KMainWindow::slotStateChanged(const TQString &newstate,
+// void TDEMainWindow::slotStateChanged(const TQString &newstate,
 //                                    bool reverse)
 // {
 //   stateChanged(newstate,
 //                reverse ? KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse);
 // }
 
-void KMainWindow::closeEvent ( TQCloseEvent *e )
+void TDEMainWindow::closeEvent ( TQCloseEvent *e )
 {
     // Save settings if auto-save is enabled, and settings have changed
     if (d->settingsDirty && d->autoSaveSettings)
@@ -641,7 +641,7 @@ void KMainWindow::closeEvent ( TQCloseEvent *e )
         e->accept();
 
         int not_withdrawn = 0;
-        TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
+        TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
         for (it.toFirst(); it.current(); ++it){
             if ( !it.current()->isHidden() && it.current()->isTopLevel() && it.current() != this )
                 not_withdrawn++;
@@ -661,35 +661,35 @@ void KMainWindow::closeEvent ( TQCloseEvent *e )
     }
 }
 
-bool KMainWindow::queryExit()
+bool TDEMainWindow::queryExit()
 {
     return true;
 }
 
-bool KMainWindow::queryClose()
+bool TDEMainWindow::queryClose()
 {
     return true;
 }
 
-void KMainWindow::saveGlobalProperties( KConfig*  )
+void TDEMainWindow::saveGlobalProperties( TDEConfig*  )
 {
 }
 
-void KMainWindow::readGlobalProperties( KConfig*  )
+void TDEMainWindow::readGlobalProperties( TDEConfig*  )
 {
 }
 
 #if defined(KDE_COMPAT)
-void KMainWindow::updateRects()
+void TDEMainWindow::updateRects()
 {
 }
 #endif
 
-void KMainWindow::showAboutApplication()
+void TDEMainWindow::showAboutApplication()
 {
 }
 
-void KMainWindow::savePropertiesInternal( KConfig *config, int number )
+void TDEMainWindow::savePropertiesInternal( TDEConfig *config, int number )
 {
     bool oldASWS = d->autoSaveWindowSize;
     d->autoSaveWindowSize = true; // make saveMainWindowSettings save the window size
@@ -713,9 +713,9 @@ void KMainWindow::savePropertiesInternal( KConfig *config, int number )
     d->autoSaveWindowSize = oldASWS;
 }
 
-void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &configGroup)
+void TDEMainWindow::saveMainWindowSettings(TDEConfig *config, const TQString &configGroup)
 {
-    kdDebug(200) << "KMainWindow::saveMainWindowSettings " << configGroup << endl;
+    kdDebug(200) << "TDEMainWindow::saveMainWindowSettings " << configGroup << endl;
     TQString oldGroup;
 
     if (!configGroup.isEmpty())
@@ -746,8 +746,8 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &config
     }
 
     int n = 1; // Toolbar counter. toolbars are counted from 1,
-    KToolBar *toolbar = 0;
-    TQPtrListIterator<KToolBar> it( toolBarIterator() );
+    TDEToolBar *toolbar = 0;
+    TQPtrListIterator<TDEToolBar> it( toolBarIterator() );
     while ( ( toolbar = it.current() ) ) {
         ++it;
         TQString group;
@@ -766,7 +766,7 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &config
        config->setGroup(oldGroup);
 }
 
-void KMainWindow::setStandardToolBarMenuEnabled( bool enable )
+void TDEMainWindow::setStandardToolBarMenuEnabled( bool enable )
 {
     if ( enable ) {
         if ( d->toolBarHandler )
@@ -788,12 +788,12 @@ void KMainWindow::setStandardToolBarMenuEnabled( bool enable )
     }
 }
 
-bool KMainWindow::isStandardToolBarMenuEnabled() const
+bool TDEMainWindow::isStandardToolBarMenuEnabled() const
 {
     return ( d->toolBarHandler );
 }
 
-void KMainWindow::createStandardStatusBarAction(){
+void TDEMainWindow::createStandardStatusBarAction(){
   if(!d->showStatusBarAction){
     d->showStatusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(setSettingsDirty()), actionCollection());
     KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already.
@@ -802,7 +802,7 @@ void KMainWindow::createStandardStatusBarAction(){
   }
 }
 
-bool KMainWindow::readPropertiesInternal( KConfig *config, int number )
+bool TDEMainWindow::readPropertiesInternal( TDEConfig *config, int number )
 {
     if ( number == 1 )
         readGlobalProperties( config );
@@ -826,16 +826,16 @@ bool KMainWindow::readPropertiesInternal( KConfig *config, int number )
     return true;
 }
 
-void KMainWindow::applyMainWindowSettings(KConfig *config, const TQString &configGroup)
+void TDEMainWindow::applyMainWindowSettings(TDEConfig *config, const TQString &configGroup)
 {
     return applyMainWindowSettings(config,configGroup,false);
 }
 
-void KMainWindow::applyMainWindowSettings(KConfig *config, const TQString &configGroup,bool force)
+void TDEMainWindow::applyMainWindowSettings(TDEConfig *config, const TQString &configGroup,bool force)
 {
-    kdDebug(200) << "KMainWindow::applyMainWindowSettings" << endl;
+    kdDebug(200) << "TDEMainWindow::applyMainWindowSettings" << endl;
 
-    KConfigGroupSaver saver( config, configGroup.isEmpty() ? config->group() : configGroup );
+    TDEConfigGroupSaver saver( config, configGroup.isEmpty() ? config->group() : configGroup );
 
     restoreWindowSize(config);
 
@@ -860,8 +860,8 @@ void KMainWindow::applyMainWindowSettings(KConfig *config, const TQString &confi
     }
 
     int n = 1; // Toolbar counter. toolbars are counted from 1,
-    KToolBar *toolbar;
-    TQPtrListIterator<KToolBar> it( toolBarIterator() ); // must use own iterator
+    TDEToolBar *toolbar;
+    TQPtrListIterator<TDEToolBar> it( toolBarIterator() ); // must use own iterator
 
     for ( ; it.current(); ++it) {
         toolbar= it.current();
@@ -881,9 +881,9 @@ void KMainWindow::applyMainWindowSettings(KConfig *config, const TQString &confi
     finalizeGUI( true );
 }
 
-void KMainWindow::finalizeGUI( bool force )
+void TDEMainWindow::finalizeGUI( bool force )
 {
-    //kdDebug(200) << "KMainWindow::finalizeGUI force=" << force << endl;
+    //kdDebug(200) << "TDEMainWindow::finalizeGUI force=" << force << endl;
     // The whole reason for this is that moveToolBar relies on the indexes
     // of the other toolbars, so in theory it should be called only once per
     // toolbar, but in increasing order of indexes.
@@ -891,7 +891,7 @@ void KMainWindow::finalizeGUI( bool force )
     // we call positionYourself again for each of them, but this time
     // the toolbariterator should give them in the proper order.
     // Both the XMLGUI and applySettings call this, hence "force" for the latter.
-    TQPtrListIterator<KToolBar> it( toolBarIterator() );
+    TQPtrListIterator<TDEToolBar> it( toolBarIterator() );
     for ( ; it.current() ; ++it ) {
         it.current()->positionYourself( force );
     }
@@ -899,7 +899,7 @@ void KMainWindow::finalizeGUI( bool force )
     d->settingsDirty = false;
 }
 
-void KMainWindow::saveWindowSize( KConfig * config ) const
+void TDEMainWindow::saveWindowSize( TDEConfig * config ) const
 {
   int scnum = TQApplication::desktop()->screenNumber(parentWidget());
   TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
@@ -931,7 +931,7 @@ void KMainWindow::saveWindowSize( KConfig * config ) const
      config->writeEntry(heightString, h );
 }
 
-void KMainWindow::restoreWindowSize( KConfig * config )
+void TDEMainWindow::restoreWindowSize( TDEConfig * config )
 {
     if (d->care_about_geometry) {
         parseGeometry(true);
@@ -977,19 +977,19 @@ void KMainWindow::restoreWindowSize( KConfig * config )
     }
 }
 
-bool KMainWindow::initialGeometrySet() const
+bool TDEMainWindow::initialGeometrySet() const
 {
     return d->care_about_geometry;
 }
 
-void KMainWindow::ignoreInitialGeometry()
+void TDEMainWindow::ignoreInitialGeometry()
 {
     d->care_about_geometry = false;
 }
 
-void KMainWindow::setSettingsDirty()
+void TDEMainWindow::setSettingsDirty()
 {
-    //kdDebug(200) << "KMainWindow::setSettingsDirty" << endl;
+    //kdDebug(200) << "TDEMainWindow::setSettingsDirty" << endl;
     d->settingsDirty = true;
     if ( d->autoSaveSettings )
     {
@@ -1004,17 +1004,17 @@ void KMainWindow::setSettingsDirty()
     }
 }
 
-bool KMainWindow::settingsDirty() const
+bool TDEMainWindow::settingsDirty() const
 {
     return d->settingsDirty;
 }
 
-TQString KMainWindow::settingsGroup() const
+TQString TDEMainWindow::settingsGroup() const
 {
     return d->autoSaveGroup;
 }
 
-void KMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWindowSize )
+void TDEMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWindowSize )
 {
     d->autoSaveSettings = true;
     d->autoSaveGroup = groupName;
@@ -1026,49 +1026,49 @@ void KMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWind
              this, TQT_SLOT( setSettingsDirty() ) );
 
     // Now read the previously saved settings
-    applyMainWindowSettings( KGlobal::config(), groupName );
+    applyMainWindowSettings( TDEGlobal::config(), groupName );
 }
 
-void KMainWindow::resetAutoSaveSettings()
+void TDEMainWindow::resetAutoSaveSettings()
 {
     d->autoSaveSettings = false;
     if ( d->settingsTimer )
         d->settingsTimer->stop();
 }
 
-bool KMainWindow::autoSaveSettings() const
+bool TDEMainWindow::autoSaveSettings() const
 {
     return d->autoSaveSettings;
 }
 
-TQString KMainWindow::autoSaveGroup() const
+TQString TDEMainWindow::autoSaveGroup() const
 {
     return d->autoSaveGroup;
 }
 
-void KMainWindow::saveAutoSaveSettings()
+void TDEMainWindow::saveAutoSaveSettings()
 {
     Q_ASSERT( d->autoSaveSettings );
-    //kdDebug(200) << "KMainWindow::saveAutoSaveSettings -> saving settings" << endl;
-    saveMainWindowSettings( KGlobal::config(), d->autoSaveGroup );
-    KGlobal::config()->sync();
+    //kdDebug(200) << "TDEMainWindow::saveAutoSaveSettings -> saving settings" << endl;
+    saveMainWindowSettings( TDEGlobal::config(), d->autoSaveGroup );
+    TDEGlobal::config()->sync();
     d->settingsDirty = false;
     if ( d->settingsTimer )
         d->settingsTimer->stop();
 }
 
-void KMainWindow::resizeEvent( TQResizeEvent * )
+void TDEMainWindow::resizeEvent( TQResizeEvent * )
 {
     if ( d->autoSaveWindowSize )
         setSettingsDirty();
 }
 
-bool KMainWindow::hasMenuBar()
+bool TDEMainWindow::hasMenuBar()
 {
     return (internalMenuBar());
 }
 
-KMenuBar *KMainWindow::menuBar()
+KMenuBar *TDEMainWindow::menuBar()
 {
     KMenuBar * mb = internalMenuBar();
     if ( !mb ) {
@@ -1080,7 +1080,7 @@ KMenuBar *KMainWindow::menuBar()
     return mb;
 }
 
-KStatusBar *KMainWindow::statusBar()
+KStatusBar *TDEMainWindow::statusBar()
 {
     KStatusBar * sb = internalStatusBar();
     if ( !sb ) {
@@ -1092,7 +1092,7 @@ KStatusBar *KMainWindow::statusBar()
     return sb;
 }
 
-void KMainWindow::shuttingDown()
+void TDEMainWindow::shuttingDown()
 {
     // Needed for Qt <= 3.0.3 at least to prevent reentrancy
     // when queryExit() shows a dialog. Check before removing!
@@ -1107,7 +1107,7 @@ void KMainWindow::shuttingDown()
 
 }
 
-KMenuBar *KMainWindow::internalMenuBar()
+KMenuBar *TDEMainWindow::internalMenuBar()
 {
     TQObjectList *l = queryList( "KMenuBar", 0, false, false );
     if ( !l || !l->first() ) {
@@ -1120,7 +1120,7 @@ KMenuBar *KMainWindow::internalMenuBar()
     return m;
 }
 
-KStatusBar *KMainWindow::internalStatusBar()
+KStatusBar *TDEMainWindow::internalStatusBar()
 {
     TQObjectList *l = queryList( "KStatusBar", 0, false, false );
     if ( !l || !l->first() ) {
@@ -1133,70 +1133,70 @@ KStatusBar *KMainWindow::internalStatusBar()
     return s;
 }
 
-void KMainWindow::childEvent( TQChildEvent* e)
+void TDEMainWindow::childEvent( TQChildEvent* e)
 {
     TQMainWindow::childEvent( e );
 }
 
-KToolBar *KMainWindow::toolBar( const char * name )
+TDEToolBar *TDEMainWindow::toolBar( const char * name )
 {
     if (!name)
        name = "mainToolBar";
-    KToolBar *tb = (KToolBar*)child( name, "KToolBar" );
+    TDEToolBar *tb = (TDEToolBar*)child( name, "TDEToolBar" );
     if ( tb )
         return tb;
     bool honor_mode = (!strcmp(name, "mainToolBar"));
 
     if ( builderClient() )
-        return new KToolBar(this, name, honor_mode); // XMLGUI constructor
+        return new TDEToolBar(this, name, honor_mode); // XMLGUI constructor
     else
-        return new KToolBar(this, DockTop, false, name, honor_mode ); // non-XMLGUI
+        return new TDEToolBar(this, DockTop, false, name, honor_mode ); // non-XMLGUI
 }
 
-TQPtrListIterator<KToolBar> KMainWindow::toolBarIterator()
+TQPtrListIterator<TDEToolBar> TDEMainWindow::toolBarIterator()
 {
     toolbarList.clear();
     TQPtrList<TQToolBar> lst;
     for ( int i = (int)TQMainWindow::DockUnmanaged; i <= (int)DockMinimized; ++i ) {
         lst = toolBars( (ToolBarDock)i );
         for ( TQToolBar *tb = lst.first(); tb; tb = lst.next() ) {
-            if ( !tb->inherits( "KToolBar" ) )
+            if ( !tb->inherits( "TDEToolBar" ) )
                 continue;
-            toolbarList.append( (KToolBar*)tb );
+            toolbarList.append( (TDEToolBar*)tb );
         }
     }
-    return TQPtrListIterator<KToolBar>( toolbarList );
+    return TQPtrListIterator<TDEToolBar>( toolbarList );
 }
 
-KAccel * KMainWindow::accel()
+TDEAccel * TDEMainWindow::accel()
 {
-    if ( !d->kaccel )
-        d->kaccel = new KAccel( this, "kmw-kaccel" );
-    return d->kaccel;
+    if ( !d->tdeaccel )
+        d->tdeaccel = new TDEAccel( this, "kmw-tdeaccel" );
+    return d->tdeaccel;
 }
 
-void KMainWindow::paintEvent( TQPaintEvent * pe )
+void TDEMainWindow::paintEvent( TQPaintEvent * pe )
 {
     TQMainWindow::paintEvent(pe); //Upcall to handle SH_MainWindow_SpaceBelowMenuBar rendering
 }
 
-TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
+TQSize TDEMainWindow::sizeForCentralWidgetSize(TQSize size)
 {
-    KToolBar *tb = (KToolBar*)child( "mainToolBar", "KToolBar" );
+    TDEToolBar *tb = (TDEToolBar*)child( "mainToolBar", "TDEToolBar" );
     if (tb && !tb->isHidden()) {
         switch( tb->barPos() )
         {
-          case KToolBar::Top:
-          case KToolBar::Bottom:
+          case TDEToolBar::Top:
+          case TDEToolBar::Bottom:
             size += TQSize(0, tb->sizeHint().height());
             break;
 
-          case KToolBar::Left:
-          case KToolBar::Right:
+          case TDEToolBar::Left:
+          case TDEToolBar::Right:
             size += TQSize(toolBar()->sizeHint().width(), 0);
             break;
 
-          case KToolBar::Flat:
+          case TDEToolBar::Flat:
             size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
             break;
 
@@ -1222,28 +1222,28 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
 #warning Remove, should be in Qt
 #endif
 #endif
-void KMainWindow::setIcon( const TQPixmap& p )
+void TDEMainWindow::setIcon( const TQPixmap& p )
 {
     TQMainWindow::setIcon( p );
 #ifdef Q_WS_X11 
-    // Qt3 doesn't support _NET_WM_ICON, but KApplication::setTopWidget(), which
-    // is used by KMainWindow, sets it
+    // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which
+    // is used by TDEMainWindow, sets it
     KWin::setIcons( winId(), p, TQPixmap());
 #endif
 }
 
-TQPtrList<KMainWindow>* KMainWindow::getMemberList() { return memberList; }
+TQPtrList<TDEMainWindow>* TDEMainWindow::getMemberList() { return memberList; }
 
 // why do we support old gcc versions? using KXMLGUIBuilder::finalizeGUI;
 // DF: because they compile KDE much faster :)
-void KMainWindow::finalizeGUI( KXMLGUIClient *client )
+void TDEMainWindow::finalizeGUI( KXMLGUIClient *client )
 { KXMLGUIBuilder::finalizeGUI( client ); }
 
-void KMainWindow::virtual_hook( int id, void* data )
+void TDEMainWindow::virtual_hook( int id, void* data )
 { KXMLGUIBuilder::virtual_hook( id, data );
   KXMLGUIClient::virtual_hook( id, data ); }
 
 
 
-#include "kmainwindow.moc"
+#include "tdemainwindow.moc"
 
diff --git a/tdeui/kmainwindow.h b/tdeui/tdemainwindow.h
index 8aba596f1..571a13797 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/tdemainwindow.h
@@ -26,19 +26,19 @@
 #include "kxmlguibuilder.h"
 #include <tqmainwindow.h>
 #include <tqmetaobject.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KXMLGUIFactory;
-class KConfig;
+class TDEConfig;
 class KHelpMenu;
 class KStatusBar;
 class TQStatusBar;
 class KMenuBar;
 class KMWSessionManaged;
-class KMainWindowPrivate;
-class KAccel;
-class KToolBarMenuAction;
+class TDEMainWindowPrivate;
+class TDEAccel;
+class TDEToolBarMenuAction;
 class DCOPObject;
 
 #define KDE_DEFAULT_WINDOWFLAGS WType_TopLevel | WDestructiveClose
@@ -53,7 +53,7 @@ class DCOPObject;
  * It manages the geometry for all its children, including your
  * main widget.
  *
- * Normally, you will inherit from KMainWindow,
+ * Normally, you will inherit from TDEMainWindow,
  * then construct (or use some existing) widget as
  * your main view. You can set only one main view.
  *
@@ -61,19 +61,19 @@ class DCOPObject;
  * and only one statusbar.
  *
  * The toolbars, menubar, and statusbar can be created by the
- * KMainWindow and - unlike the old KMainWindow - may, but do not
- * have to, be deleted by you. KMainWindow will handle that internally.
+ * TDEMainWindow and - unlike the old TDEMainWindow - may, but do not
+ * have to, be deleted by you. TDEMainWindow will handle that internally.
  *
  * Height and width can be operated independently from each other. Simply
  * define the minimum/maximum height/width of your main widget and
- * KMainWindow will take this into account. For fixed size windows set
+ * TDEMainWindow will take this into account. For fixed size windows set
  * your main widget to a fixed size.
  *
  * Fixed aspect ratios (heightForWidth()) and fixed width widgets are
  * not supported.
 *
- * KMainWindow will set icon, mini icon and caption, which it gets
- * from KApplication. It provides full session management, and
+ * TDEMainWindow will set icon, mini icon and caption, which it gets
+ * from TDEApplication. It provides full session management, and
  * will save its position, geometry and positions of toolbars and
  * menubar on logout. If you want to save additional data, reimplement
  * saveProperties() and (to read them again on next login)
@@ -85,17 +85,17 @@ class DCOPObject;
  * There are also kRestoreMainWindows convenience functions which
  * can restore all your windows on next login.
  *
- *  Note that a KMainWindow per-default is created with the
+ *  Note that a TDEMainWindow per-default is created with the
  *  WDestructiveClose flag, i.e. it is automatically destroyed when the
  *  window is closed. If you do not want this behavior, specify 0 as
  *  widget flag in the constructor.
  *
- * @see KApplication
+ * @see TDEApplication
  * @author Reginald Stadlbauer (reggie@kde.org) Stephan Kulow (coolo@kde.org), Matthias Ettrich (ettrich@kde.org), Chris Schlaeger (cs@kde.org), Sven Radej (radej@kde.org). Maintained by Sven Radej (radej@kde.org)
 
  */
 
-class TDEUI_EXPORT KMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient
+class TDEUI_EXPORT TDEMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient
 {
     friend class KMWSessionManaged;
     Q_OBJECT
@@ -105,15 +105,15 @@ public:
      * Construct a main window.
      *
      * @param parent The widget parent. This is usually 0 but it may also be the window
-     * group leader. In that case, the KMainWindow becomes sort of a
+     * group leader. In that case, the TDEMainWindow becomes sort of a
      * secondary window.
      *
      * @param name The object name. For session management and window management to work
      * properly, all main windows in the application should have a
-     * different name. When passing 0 (the default), KMainWindow will create
+     * different name. When passing 0 (the default), TDEMainWindow will create
      * a unique name, but it's recommended to explicitly pass a window name that will
      * also describe the type of the window. If there can be several windows of the same
-     * type, append '#' (hash) to the name, and KMainWindow will append numbers to make
+     * type, append '#' (hash) to the name, and TDEMainWindow will append numbers to make
      * the names unique. For example, for a mail client which has one main window showing
      * the mails and folders, and which can also have one or more windows for composing
      * mails, the name for the folders window should be e.g. "mainwindow" and
@@ -128,25 +128,25 @@ public:
      *
      * @see http://doc.trolltech.com/3.2/tqt.html#WidgetFlags-enum
      *
-     * KMainWindows must be created on the heap with 'new', like:
+     * TDEMainWindows must be created on the heap with 'new', like:
      * \code
-     * KMainWindow *kmw = new KMainWindow (...);
+     * TDEMainWindow *kmw = new TDEMainWindow (...);
      * \endcode
      **/
 #ifdef qdoc
-    KMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose );
+    TDEMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose );
 #else
-    KMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) );
+    TDEMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) );
 #endif
 
     /**
      * Flags that can be passed in an argument to the constructor to
      * change the behavior.
      *
-     * NoDCOPObject tells KMainWindow not to create a KMainWindowInterface.
+     * NoDCOPObject tells TDEMainWindow not to create a TDEMainWindowInterface.
      * This can be useful in particular for inherited classes, which
      * might want to create more specific dcop interfaces. It's a good
-     * idea to use KMainWindowInterface as the base class for such interfaces
+     * idea to use TDEMainWindowInterface as the base class for such interfaces
      * though (to provide the standard mainwindow functionality via DCOP).
      */
     enum CreationFlags
@@ -155,14 +155,14 @@ public:
     };
 
     /**
-     * Overloaded constructor which allows passing some KMainWindow::CreationFlags.
+     * Overloaded constructor which allows passing some TDEMainWindow::CreationFlags.
      *
      * @since 3.2
      */
 #ifdef qdoc
-    KMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose );
+    TDEMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose );
 #else
-    KMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) );
+    TDEMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) );
 #endif
 
     /**
@@ -171,7 +171,7 @@ public:
      * Will also destroy the toolbars, and menubar if
      * needed.
      */
-    virtual ~KMainWindow();
+    virtual ~TDEMainWindow();
 
     /**
      * Retrieve the standard help menu.
@@ -183,13 +183,13 @@ public:
      *
      * Example (adding a standard help menu to your application):
      * \code
-     * KPopupMenu *help = helpMenu( <myTextString> );
+     * TDEPopupMenu *help = helpMenu( <myTextString> );
      * menuBar()->insertItem( i18n("&Help"), help );
      * \endcode
      *
      * @param aboutAppText The string that is used in the application
      *        specific dialog box. If you leave this string empty the
-     *        information in the global KAboutData of the
+     *        information in the global TDEAboutData of the
      *        application will be used to make a standard dialog box.
      *
      * @param showWhatsThis Set this to false if you do not want to include
@@ -197,7 +197,7 @@ public:
      *
      * @return A standard help menu.
      */
-    KPopupMenu* helpMenu( const TQString &aboutAppText = TQString::null,
+    TDEPopupMenu* helpMenu( const TQString &aboutAppText = TQString::null,
 			  bool showWhatsThis = true );
 
     /**
@@ -222,7 +222,7 @@ public:
      *
      * @return A standard help menu.
      */
-    KPopupMenu* customHelpMenu( bool showWhatsThis = true );
+    TDEPopupMenu* customHelpMenu( bool showWhatsThis = true );
 
     /**
      * <b>Session Management</b>
@@ -236,7 +236,7 @@ public:
      * \code
      * if (kapp->isRestored()){
      *   int n = 1;
-     *   while (KMainWindow::canBeRestored(n)){
+     *   while (TDEMainWindow::canBeRestored(n)){
      *     (new childMW)->restore(n);
      *     n++;
      *   }
@@ -250,7 +250,7 @@ public:
      * application.
      *
      * If your application uses different kinds of toplevel
-     * windows, then you can use KMainWindow::classNameOfToplevel(n)
+     * windows, then you can use TDEMainWindow::classNameOfToplevel(n)
      * to determine the exact type before calling the childMW
      * constructor in the example from above.
      *
@@ -270,7 +270,7 @@ public:
      * less code to write.
      *
      * For new code or if you have more than one kind of toplevel
-     * widget (each derived from KMainWindow, of course), you can
+     * widget (each derived from TDEMainWindow, of course), you can
      * use the templated kRestoreMainWindows global functions:
      *
      * \code
@@ -379,25 +379,25 @@ public:
      *
      * If there is no status bar yet, one will be created.
      *
-     * Note that tooltips for kactions in actionCollection() are not
+     * Note that tooltips for tdeactions in actionCollection() are not
      * automatically connected to this statusBar.
-     * See the KActionCollection documentation for more details.
+     * See the TDEActionCollection documentation for more details.
      *
-     * @see KActionCollection
+     * @see TDEActionCollection
      */
     KStatusBar *statusBar();
 
     /**
-     * List of members of KMainWindow class.
+     * List of members of TDEMainWindow class.
      */
-    static TQPtrList<KMainWindow>* memberList;
+    static TQPtrList<TDEMainWindow>* memberList;
 
     //KDE4: replace with memberList() and make memberList member private
     /**
-     * List of members of KMainWindow class.
+     * List of members of TDEMainWindow class.
      * @since 3.4
      */
-    static TQPtrList<KMainWindow>* getMemberList();
+    static TQPtrList<TDEMainWindow>* getMemberList();
 
     /**
      * Returns a pointer to the toolbar with the specified name.
@@ -409,18 +409,18 @@ public:
      *
      * @return A pointer to the toolbar
      **/
-    KToolBar *toolBar( const char *name=0 );
+    TDEToolBar *toolBar( const char *name=0 );
 
     /**
      * @return An iterator over the list of all toolbars for this window.
      */
-    TQPtrListIterator<KToolBar> toolBarIterator();
+    TQPtrListIterator<TDEToolBar> toolBarIterator();
 
     /**
-     * @return A KAccel instance bound to this mainwindow. Used automatically
-     * by KAction to make keybindings work in all cases.
+     * @return A TDEAccel instance bound to this mainwindow. Used automatically
+     * by TDEAction to make keybindings work in all cases.
      */
-    KAccel *accel();
+    TDEAccel *accel();
 
     void setFrameBorderWidth( int ) {}
 
@@ -428,7 +428,7 @@ public:
      * Call this to enable "auto-save" of toolbar/menubar/statusbar settings
      * (and optionally window size).
      * If the *bars were moved around/shown/hidden when the window is closed,
-     * saveMainWindowSettings( KGlobal::config(), groupName ) will be called.
+     * saveMainWindowSettings( TDEGlobal::config(), groupName ) will be called.
      *
      * @param groupName a name that identifies this "type of window".
      * You can have several types of window in the same application.
@@ -437,11 +437,11 @@ public:
      * when saving.
      *
      * Typically, you will call setAutoSaveSettings() in your
-     * KMainWindow-inherited class constructor, and it will take care
+     * TDEMainWindow-inherited class constructor, and it will take care
      * of restoring and saving automatically. Make sure you call this
      * _after all_ your *bars have been created.
      *
-     * To make sure that KMainWindow propertly obtains the default
+     * To make sure that TDEMainWindow propertly obtains the default
      * size of the window you should do the following:
      * - Remove hard coded resize() calls in the constructor or main, they
      *   should be removed in favor of letting the automatic resizing
@@ -489,9 +489,9 @@ public:
      * group name is used.
      * @param force if set, even default settings are re-applied
      */
-    void applyMainWindowSettings(KConfig *config, const TQString &groupName, bool force);
+    void applyMainWindowSettings(TDEConfig *config, const TQString &groupName, bool force);
     // KDE4 merge with force=false
-    void applyMainWindowSettings(KConfig *config, const TQString &groupName = TQString::null);
+    void applyMainWindowSettings(TDEConfig *config, const TQString &groupName = TQString::null);
 
     /**
      * Save settings for statusbar, menubar and toolbar to their respective
@@ -501,11 +501,11 @@ public:
      * @param groupName Group name to use. If not specified, the last used
      * group name is used
      */
-    void saveMainWindowSettings(KConfig *config, const TQString &groupName = TQString::null);
+    void saveMainWindowSettings(TDEConfig *config, const TQString &groupName = TQString::null);
 
     /**
-     * Sets whether KMainWindow should provide a menu that allows showing/hiding
-     * the available toolbars ( using KToggleToolBarAction ) . In case there
+     * Sets whether TDEMainWindow should provide a menu that allows showing/hiding
+     * the available toolbars ( using TDEToggleToolBarAction ) . In case there
      * is only one toolbar configured a simple 'Show \<toolbar name here\>' menu item
      * is shown.
      *
@@ -527,8 +527,8 @@ public:
 
 
     /**
-     * Sets whether KMainWindow should provide a menu that allows showing/hiding
-     * of the statusbar ( using KToggleStatusBarAction ).
+     * Sets whether TDEMainWindow should provide a menu that allows showing/hiding
+     * of the statusbar ( using TDEToggleStatusBarAction ).
      *
      * The menu / menu item is implemented using xmlgui. It will be inserted
      * in your menu structure in the 'Settings' menu.
@@ -537,13 +537,13 @@ public:
      * ( or similar ).
      *
      * If an application maintains the action on its own (i.e. never calls
-     * this function) a connection needs to be made to let KMainWindow
+     * this function) a connection needs to be made to let TDEMainWindow
      * know when that status (hidden/shown) of the statusbar has changed.
      * For example:
      * connect(action, TQT_SIGNAL(activated()),
-     *         kmainwindow, TQT_SLOT(setSettingsDirty()));
+     *         tdemainwindow, TQT_SLOT(setSettingsDirty()));
      * Otherwise the status (hidden/show) of the statusbar might not be saved
-     * by KMainWindow.
+     * by TDEMainWindow.
      * @since 3.2
      */
     void createStandardStatusBarAction();
@@ -622,10 +622,10 @@ public:
      * Returns a pointer to the mainwindows action responsible for the toolbars menu
      * @since 3.1
      */
-    KAction *toolBarMenuAction();
+    TDEAction *toolBarMenuAction();
 
     /**
-     * @internal for KToolBar
+     * @internal for TDEToolBar
      * @since 3.3.1
      */
     void setupToolbarMenuActions();
@@ -731,7 +731,7 @@ public slots:
      * Example (adding a help button to the first toolbar):
      *
      * \code
-     * KIconLoader &loader = *KGlobal::iconLoader();
+     * TDEIconLoader &loader = *TDEGlobal::iconLoader();
      * TQPixmap pixmap = loader.loadIcon( "help" );
      * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()),
      *   this, TQT_SLOT(appHelpActivated()), true, i18n("Help") );
@@ -798,9 +798,9 @@ protected:
     // would be useful only for the annoying 'really quit' dialog, which
     // also doesn't make sense in apps with multiple mainwindows.
     // And saving configuration in something called queryExit()? IMHO
-    // one can e.g. use KApplication::shutDown(), which if nothing else
+    // one can e.g. use TDEApplication::shutDown(), which if nothing else
     // has at least better fitting name.
-    // See also KApplication::sessionSaving().
+    // See also TDEApplication::sessionSaving().
     // This stuff should get changed somehow, so that it at least doesn't
     // mess with session management.
     /**
@@ -820,15 +820,15 @@ protected:
 
        If you need to do serious things on exit (like shutting a
        dial-up connection down), connect to the signal
- KApplication::shutDown().
+ TDEApplication::shutDown().
 
        Default implementation returns @p true. Returning @p false will
        cancel the exiting. In the latter case, the last window will
-       remain visible. If KApplication::sessionSaving() is true, refusing
+       remain visible. If TDEApplication::sessionSaving() is true, refusing
        the exit will also cancel KDE logout.
 
        @see queryClose()
-       @see KApplication::sessionSaving()
+       @see TDEApplication::sessionSaving()
      */
     virtual bool queryExit();
 
@@ -840,7 +840,7 @@ protected:
        safe to close it, i.e. without the user losing some data.
 
        Default implementation returns true. Returning @p false will cancel
-       the closing, and, if KApplication::sessionSaving() is true, it will also
+       the closing, and, if TDEApplication::sessionSaving() is true, it will also
        cancel KDE logout.
 
        Reimplement this function to prevent the user from losing data.
@@ -864,7 +864,7 @@ protected:
        may be canceled, in which case the document should remain open.
 
        @see queryExit()
-       @see KApplication::sessionSaving()
+       @see TDEApplication::sessionSaving()
     */
     virtual bool queryClose();
 
@@ -873,20 +873,20 @@ 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
-     * KMainWindow uses one group for each window.  Please
+     * You @em must @em not change the group of the @p tdeconfig object, since
+     * TDEMainWindow uses one group for each window.  Please
      * reimplement these function in childclasses.
      *
      * Note: No user interaction is allowed
      * in this function!
      *
      */
-    virtual void saveProperties( KConfig* ) {}
+    virtual void saveProperties( TDEConfig* ) {}
 
    /**
     * Read your instance-specific properties.
     */
-    virtual void readProperties( KConfig* ) {}
+    virtual void readProperties( TDEConfig* ) {}
 
    /**
      * Save your application-wide properties. The function is
@@ -904,16 +904,16 @@ protected:
      *
      * Default implementation does nothing.
      */
-    virtual void saveGlobalProperties( KConfig* sessionConfig );
+    virtual void saveGlobalProperties( TDEConfig* sessionConfig );
 
     /**
      * The counterpart of saveGlobalProperties().
      *
      * Read the application-specific properties in again.
      */
-    virtual void readGlobalProperties( KConfig* sessionConfig );
-    void savePropertiesInternal( KConfig*, int );
-    bool readPropertiesInternal( KConfig*, int );
+    virtual void readGlobalProperties( TDEConfig* sessionConfig );
+    void savePropertiesInternal( TDEConfig*, int );
+    bool readPropertiesInternal( TDEConfig*, int );
 
     /**
      * For inherited classes
@@ -927,13 +927,13 @@ protected:
      * For inherited classes
      * Note that the group must be set before calling
      */
-    void saveWindowSize( KConfig * config ) const;
+    void saveWindowSize( TDEConfig * config ) const;
     /**
      * For inherited classes
      * Note that the group must be set before calling, and that
      * a -geometry on the command line has priority.
      */
-    void restoreWindowSize( KConfig * config );
+    void restoreWindowSize( TDEConfig * config );
 
     /// parse the geometry from the geometry command line argument
     void parseGeometry(bool parsewidth);
@@ -1007,16 +1007,16 @@ private:
     KStatusBar *internalStatusBar();
     KHelpMenu *mHelpMenu, *helpMenu2;
     KXMLGUIFactory *factory_;
-    TQPtrList<KToolBar> toolbarList;
+    TQPtrList<TDEToolBar> toolbarList;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    KMainWindowPrivate *d;
-    void initKMainWindow(const char *name, int cflags);
+    TDEMainWindowPrivate *d;
+    void initTDEMainWindow(const char *name, int cflags);
 };
 
 #define RESTORE(type) { int n = 1;\
-    while (KMainWindow::canBeRestored(n)){\
+    while (TDEMainWindow::canBeRestored(n)){\
       (new type)->restore(n);\
       n++;}}
 
@@ -1027,15 +1027,15 @@ private:
  *  number of template arguments) are a replacement for the RESTORE
  *  macro provided in earlier versions of KDE. The old RESTORE macro
  *  is still provided for backwards compatibility. See
- *  KMainWindow documentation for more.
+ *  TDEMainWindow documentation for more.
  *
  * \since KDE 3.2
  *
  **/
 template <typename T>
 inline void kRestoreMainWindows() {
-  for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
-    const TQString className = KMainWindow::classNameOfToplevel( n );
+  for ( int n = 1 ; TDEMainWindow::canBeRestored( n ) ; ++n ) {
+    const TQString className = TDEMainWindow::classNameOfToplevel( n );
     if ( className == TQString::fromLatin1( T::staticMetaObject()->className() ) )
       (new T)->restore( n );
   }
@@ -1046,8 +1046,8 @@ inline void kRestoreMainWindows() {
   const char * classNames[2];
   classNames[0] = T0::staticMetaObject()->className();
   classNames[1] = T1::staticMetaObject()->className();
-  for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
-    const TQString className = KMainWindow::classNameOfToplevel( n );
+  for ( int n = 1 ; TDEMainWindow::canBeRestored( n ) ; ++n ) {
+    const TQString className = TDEMainWindow::classNameOfToplevel( n );
     if ( className == TQString::fromLatin1( classNames[0] ) )
       (new T0)->restore( n );
     else if ( className == TQString::fromLatin1( classNames[1] ) )
@@ -1061,8 +1061,8 @@ inline void kRestoreMainWindows() {
   classNames[0] = T0::staticMetaObject()->className();
   classNames[1] = T1::staticMetaObject()->className();
   classNames[2] = T2::staticMetaObject()->className();
-  for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
-    const TQString className = KMainWindow::classNameOfToplevel( n );
+  for ( int n = 1 ; TDEMainWindow::canBeRestored( n ) ; ++n ) {
+    const TQString className = TDEMainWindow::classNameOfToplevel( n );
     if ( className == TQString::fromLatin1( classNames[0] ) )
       (new T0)->restore( n );
     else if ( className == TQString::fromLatin1( classNames[1] ) )
diff --git a/tdeui/kmainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp
index f8ef88c31..8f8a9d40c 100644
--- a/tdeui/kmainwindowiface.cpp
+++ b/tdeui/tdemainwindowiface.cpp
@@ -17,18 +17,18 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kmainwindowiface.h"
+#include "tdemainwindowiface.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopactionproxy.h>
 #include <kdcoppropertyproxy.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <tqclipboard.h>
 
 
-KMainWindowInterface::KMainWindowInterface(KMainWindow * mainWindow)
+TDEMainWindowInterface::TDEMainWindowInterface(TDEMainWindow * mainWindow)
 	: DCOPObject( mainWindow->name()) 
 {
 	m_MainWindow = mainWindow;
@@ -36,30 +36,30 @@ KMainWindowInterface::KMainWindowInterface(KMainWindow * mainWindow)
 	m_dcopPropertyProxy = new KDCOPPropertyProxy(TQT_TQOBJECT(m_MainWindow));
 }
 
-KMainWindowInterface::~KMainWindowInterface()
+TDEMainWindowInterface::~TDEMainWindowInterface()
 {
 	delete m_dcopActionProxy;
         delete m_dcopPropertyProxy;
 }
 
-QCStringList KMainWindowInterface::actions()
+QCStringList TDEMainWindowInterface::actions()
 {
 	delete m_dcopActionProxy;
 	m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this );
 	QCStringList tmp_actions;
-	TQValueList<KAction *> lst = m_dcopActionProxy->actions();
-	TQValueList<KAction *>::ConstIterator it = lst.begin();
-	TQValueList<KAction *>::ConstIterator end = lst.end();
+	TQValueList<TDEAction *> lst = m_dcopActionProxy->actions();
+	TQValueList<TDEAction *>::ConstIterator it = lst.begin();
+	TQValueList<TDEAction *>::ConstIterator end = lst.end();
 	for (; it != end; ++it )
 		if ((*it)->isPlugged())
 			tmp_actions.append( (TQCString)(*it)->name() );
 	return tmp_actions;
 }
-bool KMainWindowInterface::activateAction( TQCString action)
+bool TDEMainWindowInterface::activateAction( TQCString action)
 {
 	delete m_dcopActionProxy;
 	m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this );
-	KAction *tmp_Action = m_dcopActionProxy->action(action);
+	TDEAction *tmp_Action = m_dcopActionProxy->action(action);
 	if (tmp_Action)
 	{
 		tmp_Action->activate();
@@ -68,11 +68,11 @@ bool KMainWindowInterface::activateAction( TQCString action)
 	else
 		return false;
 }
-bool KMainWindowInterface::disableAction( TQCString action)
+bool TDEMainWindowInterface::disableAction( TQCString action)
 {
 	delete m_dcopActionProxy;
 	m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this );
-	KAction *tmp_Action = m_dcopActionProxy->action(action);
+	TDEAction *tmp_Action = m_dcopActionProxy->action(action);
 	if (tmp_Action)
 	{
 		tmp_Action->setEnabled(false);
@@ -81,11 +81,11 @@ bool KMainWindowInterface::disableAction( TQCString action)
 	else
 		return false;
 }
-bool KMainWindowInterface::enableAction( TQCString action)
+bool TDEMainWindowInterface::enableAction( TQCString action)
 {
 	delete m_dcopActionProxy;
 	m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this );
-	KAction *tmp_Action = m_dcopActionProxy->action(action);
+	TDEAction *tmp_Action = m_dcopActionProxy->action(action);
 	if (tmp_Action)
 	{
 		tmp_Action->setEnabled(true);
@@ -94,11 +94,11 @@ bool KMainWindowInterface::enableAction( TQCString action)
 	else
 		return false;
 }
-bool KMainWindowInterface::actionIsEnabled( TQCString action)
+bool TDEMainWindowInterface::actionIsEnabled( TQCString action)
 {
 	delete m_dcopActionProxy;
 	m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this );
-	KAction *tmp_Action = m_dcopActionProxy->action(action);
+	TDEAction *tmp_Action = m_dcopActionProxy->action(action);
 	if (tmp_Action)
 	{
 		return tmp_Action->isEnabled();
@@ -106,11 +106,11 @@ bool KMainWindowInterface::actionIsEnabled( TQCString action)
 	else
 		return false;
 }
-TQCString KMainWindowInterface::actionToolTip( TQCString action)
+TQCString TDEMainWindowInterface::actionToolTip( TQCString action)
 {
 	delete m_dcopActionProxy;
 	m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this );
-	KAction *tmp_Action = m_dcopActionProxy->action(action);
+	TDEAction *tmp_Action = m_dcopActionProxy->action(action);
 	if (tmp_Action)
 	{
 		return tmp_Action->toolTip().utf8();
@@ -119,74 +119,74 @@ TQCString KMainWindowInterface::actionToolTip( TQCString action)
 		return "Error no such object!";
 }
 
-DCOPRef KMainWindowInterface::action( const TQCString &name )
+DCOPRef TDEMainWindowInterface::action( const TQCString &name )
 {
 	return DCOPRef( kapp->dcopClient()->appId(), m_dcopActionProxy->actionObjectId( name ) );
 }
 
-TQMap<TQCString,DCOPRef> KMainWindowInterface::actionMap()
+TQMap<TQCString,DCOPRef> TDEMainWindowInterface::actionMap()
 {
 	return m_dcopActionProxy->actionMap();
 }
 
-int KMainWindowInterface::getWinID()
+int TDEMainWindowInterface::getWinID()
 {
 	return (int) m_MainWindow->winId();
 }
-void KMainWindowInterface::grabWindowToClipBoard()
+void TDEMainWindowInterface::grabWindowToClipBoard()
 {
 	TQClipboard *clipboard = TQApplication::clipboard();
 	clipboard->setPixmap(TQPixmap::grabWidget(m_MainWindow));
 }
-void KMainWindowInterface::hide()
+void TDEMainWindowInterface::hide()
 {
 	m_MainWindow->hide();
 }
-void KMainWindowInterface::maximize()
+void TDEMainWindowInterface::maximize()
 {
 	m_MainWindow->showMaximized();
 }
-void KMainWindowInterface::minimize()
+void TDEMainWindowInterface::minimize()
 {
 	m_MainWindow->showMinimized();
 }
-void KMainWindowInterface::resize(int newX, int newY)
+void TDEMainWindowInterface::resize(int newX, int newY)
 {
 	m_MainWindow->resize(newX, newY);
 }
-void KMainWindowInterface::move(int newX, int newY)
+void TDEMainWindowInterface::move(int newX, int newY)
 {
 	m_MainWindow->move(newX, newY);
 }
-void KMainWindowInterface::setGeometry(int newX, int newY, int newWidth, int newHeight)
+void TDEMainWindowInterface::setGeometry(int newX, int newY, int newWidth, int newHeight)
 {
 	m_MainWindow->setGeometry(newX, newY, newWidth, newHeight);
 }
-void KMainWindowInterface::raise()
+void TDEMainWindowInterface::raise()
 {
 	m_MainWindow->raise();
 }
-void KMainWindowInterface::lower()
+void TDEMainWindowInterface::lower()
 {
 	m_MainWindow->lower();
 }
-void KMainWindowInterface::restore()
+void TDEMainWindowInterface::restore()
 {
 	m_MainWindow->showNormal();
 }
-void KMainWindowInterface::close()
+void TDEMainWindowInterface::close()
 {
 	m_MainWindow->close();
 }
-void KMainWindowInterface::show()
+void TDEMainWindowInterface::show()
 {
 	m_MainWindow->show();
 }
-QCStringList KMainWindowInterface::functionsDynamic()
+QCStringList TDEMainWindowInterface::functionsDynamic()
 {
 	return m_dcopPropertyProxy->functions();
 }
-bool KMainWindowInterface::processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData)
+bool TDEMainWindowInterface::processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData)
 {
 	return m_dcopPropertyProxy->processPropertyRequest( fun, data, replyType, replyData);
 
diff --git a/tdeui/kmainwindowiface.h b/tdeui/tdemainwindowiface.h
index 58ca74e2c..f469096ef 100644
--- a/tdeui/kmainwindowiface.h
+++ b/tdeui/tdemainwindowiface.h
@@ -27,32 +27,32 @@
 
 class KDCOPActionProxy;
 class KDCOPPropertyProxy;
-class KMainWindow;
+class TDEMainWindow;
 
 /**
- * @short DCOP interface to KMainWindow.
+ * @short DCOP interface to TDEMainWindow.
  *
- * This is the main interface to the KMainWindow.  This will provide a consistent
+ * This is the main interface to the TDEMainWindow.  This will provide a consistent
  * DCOP interface to all KDE applications that use it.
  *
  * @author Ian Reinhart Geiser <geiseri@yahoo.com>
  */
-class TDEUI_EXPORT KMainWindowInterface : virtual public DCOPObject
+class TDEUI_EXPORT TDEMainWindowInterface : virtual public DCOPObject
 {
 K_DCOP
 
 public:
 	/**
 	Construct a new interface object.
-	@param mainWindow - The parent KMainWindow object
-	that will provide us with the KAction objects.
+	@param mainWindow - The parent TDEMainWindow object
+	that will provide us with the TDEAction objects.
 	*/
-	KMainWindowInterface( KMainWindow * mainWindow );
+	TDEMainWindowInterface( TDEMainWindow * mainWindow );
 	/**
 	Destructor
 	Cleans up the dcop action proxy object.
 	**/
-	~KMainWindowInterface();
+	~TDEMainWindowInterface();
 
 	QCStringList functionsDynamic();
 	bool processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData);
@@ -106,10 +106,10 @@ k_dcop:
 	TQCString actionToolTip( TQCString action);
 
 	/**
-	Returns a dcop reference to the selected KAction
+	Returns a dcop reference to the selected TDEAction
 	@param name The name of the action.  The names of valid
 	actions can be found by calling actions().
-	@return A DCOPRef for the kaction.
+	@return A DCOPRef for the tdeaction.
 	**/
 	DCOPRef action( const TQCString &name );
 
@@ -151,7 +151,7 @@ k_dcop:
 //	QCStringList getQTProperties();
 
 private:
-	KMainWindow *m_MainWindow;
+	TDEMainWindow *m_MainWindow;
 	KDCOPActionProxy *m_dcopActionProxy;
 	KDCOPPropertyProxy *m_dcopPropertyProxy;
 };
diff --git a/tdeui/kmenubar.cpp b/tdeui/tdemenubar.cpp
index 7f6983275..0a5fe0188 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/tdemenubar.cpp
@@ -32,11 +32,11 @@
 #include <tqstyle.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
-#include <kglobalsettings.h>
-#include <kmenubar.h>
-#include <kapplication.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobalsettings.h>
+#include <tdemenubar.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kmanagerselection.h>
 
@@ -94,7 +94,7 @@ public:
     int margin;     // dtto
     bool fallback_mode; // dtto
 #ifdef Q_WS_X11
-    KSelectionWatcher* selection;
+    TDESelectionWatcher* selection;
 #endif
     TQTimer selection_timer;
     TQSize min_size;
@@ -177,7 +177,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
   if ( isTopLevelMenu() )
   {
 #ifdef Q_WS_X11
-      d->selection = new KSelectionWatcher( KMenuBarPrivate::makeSelectionAtom(),
+      d->selection = new TDESelectionWatcher( KMenuBarPrivate::makeSelectionAtom(),
           DefaultScreen( tqt_xdisplay()));
       connect( d->selection, TQT_SIGNAL( newOwner( Window )),
           this, TQT_SLOT( updateFallbackSize()));
@@ -235,8 +235,8 @@ void KMenuBar::show()
 
 void KMenuBar::slotReadConfig()
 {
-  KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver( config, "KDE" );
+  TDEConfig *config = TDEGlobal::config();
+  TDEConfigGroupSaver saver( config, "KDE" );
   setTopLevelMenuInternal( config->readBoolEntry( "macStyle", false ) );
 }
 
@@ -329,7 +329,7 @@ void KMenuBar::selectionTimeout()
     if ( d->topLevel )
     {
         d->fallback_mode = true; // KMenuBar is handling its position itself
-        KConfigGroup xineramaConfig(KGlobal::config(),"Xinerama");
+        TDEConfigGroup xineramaConfig(TDEGlobal::config(),"Xinerama");
         int screen = xineramaConfig.readNumEntry("MenubarScreen",
             TQApplication::desktop()->screenNumber(TQPoint(0,0)) );
         TQRect area;
@@ -568,4 +568,4 @@ void KMenuBar::drawContents( TQPainter* p )
 void KMenuBar::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kmenubar.moc"
+#include "tdemenubar.moc"
diff --git a/tdeui/kmenubar.h b/tdeui/tdemenubar.h
index e657671e3..e657671e3 100644
--- a/tdeui/kmenubar.h
+++ b/tdeui/tdemenubar.h
diff --git a/tdeui/kmessagebox.cpp b/tdeui/tdemessagebox.cpp
index ee526dcdb..3208e94d8 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/tdemessagebox.cpp
@@ -31,19 +31,19 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kguiitem.h>
-#include <klistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kstdguiitem.h>
 #include <kactivelabel.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
@@ -82,7 +82,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon)
         break;
     }
 
-   TQPixmap ret = KGlobal::iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+   TQPixmap ret = TDEGlobal::iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
 
    if (ret.isNull())
        return TQMessageBox::standardIcon(icon);
@@ -174,7 +174,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
     // Calculate a proper size for the text.
     {
        TQSimpleRichText rt(qt_text, dialog->font());
-       TQRect d = KGlobalSettings::desktopGeometry(dialog);
+       TQRect d = TDEGlobalSettings::desktopGeometry(dialog);
 
        pref_width = d.width() / 3;
        rt.setWidth(pref_width);
@@ -224,10 +224,10 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
     lay->addWidget( label2 );
     lay->addStretch();
 
-    KListBox *listbox = 0;
+    TDEListBox *listbox = 0;
     if (!strlist.isEmpty())
     {
-       listbox=new KListBox( topcontents );
+       listbox=new TDEListBox( topcontents );
        listbox->insertStringList( strlist );
        listbox->setSelectionMode( TQListBox::NoSelection );
        topcontents->setStretchFactor(listbox, 1);
@@ -343,8 +343,8 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName,
 {
     if ( dontShowAgainName.isEmpty() ) return true;
     TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
-    KConfig *config = againConfig ? againConfig : KGlobal::config();
-    KConfigGroupSaver saver( config, grpNotifMsgs );
+    TDEConfig *config = againConfig ? againConfig : TDEGlobal::config();
+    TDEConfigGroupSaver saver( config, grpNotifMsgs );
     TQString dontAsk = config->readEntry(dontShowAgainName).lower();
     if (dontAsk == "yes") {
         result = Yes;
@@ -362,8 +362,8 @@ KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName)
 {
     if ( dontShowAgainName.isEmpty() ) return true;
     TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
-    KConfig *config = againConfig ? againConfig : KGlobal::config();
-    KConfigGroupSaver saver( config, grpNotifMsgs );
+    TDEConfig *config = againConfig ? againConfig : TDEGlobal::config();
+    TDEConfigGroupSaver saver( config, grpNotifMsgs );
     return config->readBoolEntry(dontShowAgainName,  true);
 }
 
@@ -373,8 +373,8 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName,
 {
     if ( dontShowAgainName.isEmpty() ) return;
     TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
-    KConfig *config = againConfig ? againConfig : KGlobal::config();
-    KConfigGroupSaver saver( config, grpNotifMsgs );
+    TDEConfig *config = againConfig ? againConfig : TDEGlobal::config();
+    TDEConfigGroupSaver saver( config, grpNotifMsgs );
     config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':'));
     config->sync();
 }
@@ -384,15 +384,15 @@ KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName)
 {
     if ( dontShowAgainName.isEmpty() ) return;
     TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
-    KConfig *config = againConfig ? againConfig : KGlobal::config();
-    KConfigGroupSaver saver( config, grpNotifMsgs );
+    TDEConfig *config = againConfig ? againConfig : TDEGlobal::config();
+    TDEConfigGroupSaver saver( config, grpNotifMsgs );
     config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':'));
     config->sync();
 }
 
-KConfig* KMessageBox::againConfig = NULL;
+TDEConfig* KMessageBox::againConfig = NULL;
 void
-KMessageBox::setDontShowAskAgainConfig(KConfig* cfg)
+KMessageBox::setDontShowAskAgainConfig(TDEConfig* cfg)
 {
   againConfig = cfg;
 }
@@ -935,12 +935,12 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri
 void
 KMessageBox::enableAllMessages()
 {
-   KConfig *config = againConfig ? againConfig : KGlobal::config();
+   TDEConfig *config = againConfig ? againConfig : TDEGlobal::config();
    TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
    if (!config->hasGroup(grpNotifMsgs))
       return;
 
-   KConfigGroupSaver saver( config, grpNotifMsgs );
+   TDEConfigGroupSaver saver( config, grpNotifMsgs );
 
    typedef TQMap<TQString, TQString> configMap;
 
@@ -955,12 +955,12 @@ KMessageBox::enableAllMessages()
 void
 KMessageBox::enableMessage(const TQString &dontShowAgainName)
 {
-   KConfig *config = againConfig ? againConfig : KGlobal::config();
+   TDEConfig *config = againConfig ? againConfig : TDEGlobal::config();
    TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
    if (!config->hasGroup(grpNotifMsgs))
       return;
 
-   KConfigGroupSaver saver( config, grpNotifMsgs );
+   TDEConfigGroupSaver saver( config, grpNotifMsgs );
 
    config->deleteEntry(dontShowAgainName);
    config->sync();
@@ -981,7 +981,7 @@ KMessageBox::about(TQWidget *parent, const TQString &text,
                                 parent, "about", true, true,
                                 KStdGuiItem::ok() );
     
-    TQPixmap ret = KApplication::kApplication()->icon();
+    TQPixmap ret = TDEApplication::kApplication()->icon();
     if (ret.isNull())
         ret = TQMessageBox::standardIcon(TQMessageBox::Information);
     dialog->setIcon(ret);
diff --git a/tdeui/kmessagebox.h b/tdeui/tdemessagebox.h
index 419d1edc7..b7724f5ce 100644
--- a/tdeui/kmessagebox.h
+++ b/tdeui/tdemessagebox.h
@@ -27,7 +27,7 @@
 
 class TQWidget;
 class TQStringList;
-class KConfig;
+class TDEConfig;
 class KDialogBase;
 
  /**
@@ -74,7 +74,7 @@ public:
    Notify = 1,        ///< Emit a KNotifyClient event
    AllowLink = 2,     ///< The message may contain links.
    Dangerous = 4,     ///< The action to be confirmed by the dialog is a potentially destructive one
-   PlainCaption = 8,  /**< Do not use KApplication::makeStdCaption()
+   PlainCaption = 8,  /**< Do not use TDEApplication::makeStdCaption()
    		           @since 3.4
 		       */
    NoExec = 16        /**< Do not call exec() in createKMessageBox()
@@ -1094,10 +1094,10 @@ public:
 
     /**
      * Use @p cfg for all settings related to the dontShowAgainName feature.
-     * If @p cfg is 0 (default) KGlobal::config() will be used.
+     * If @p cfg is 0 (default) TDEGlobal::config() will be used.
      * @since 3.2
      */    
-    static void setDontShowAskAgainConfig(KConfig* cfg);
+    static void setDontShowAskAgainConfig(TDEConfig* cfg);
 
     /**
      * Create content and layout of a standard dialog
@@ -1160,7 +1160,7 @@ public:
                              TQMessageBox::Icon notifyType=TQMessageBox::Information);
 
 private:
-    static KConfig* againConfig;
+    static TDEConfig* againConfig;
 };
 
 #endif
diff --git a/tdeui/kpopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index d910b7781..46d5c758f 100644
--- a/tdeui/kpopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -27,18 +27,18 @@
 
 #include <tqstyle.h>
 
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
-KPopupTitle::KPopupTitle(TQWidget *parent, const char *name)
+TDEPopupTitle::TDEPopupTitle(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
     setMinimumSize(16, fontMetrics().height()+8);
 }
 
-KPopupTitle::KPopupTitle(KPixmapEffect::GradientType /* gradient */,
+TDEPopupTitle::TDEPopupTitle(KPixmapEffect::GradientType /* gradient */,
                          const TQColor &/* color */, const TQColor &/* textColor */,
                          TQWidget *parent, const char *name)
    : TQWidget(parent, name)
@@ -46,7 +46,7 @@ KPopupTitle::KPopupTitle(KPixmapEffect::GradientType /* gradient */,
     calcSize();
 }
 
-KPopupTitle::KPopupTitle(const KPixmap & /* background */, const TQColor &/* color */,
+TDEPopupTitle::TDEPopupTitle(const KPixmap & /* background */, const TQColor &/* color */,
                          const TQColor &/* textColor */, TQWidget *parent,
                          const char *name)
     : TQWidget(parent, name)
@@ -54,7 +54,7 @@ KPopupTitle::KPopupTitle(const KPixmap & /* background */, const TQColor &/* col
     calcSize();
 }
 
-void KPopupTitle::setTitle(const TQString &text, const TQPixmap *icon)
+void TDEPopupTitle::setTitle(const TQString &text, const TQPixmap *icon)
 {
     titleStr = text;
     if (icon)
@@ -65,19 +65,19 @@ void KPopupTitle::setTitle(const TQString &text, const TQPixmap *icon)
     calcSize();
 }
 
-void KPopupTitle::setText( const TQString &text )
+void TDEPopupTitle::setText( const TQString &text )
 {
     titleStr = text;
     calcSize();
 }
 
-void KPopupTitle::setIcon( const TQPixmap &pix )
+void TDEPopupTitle::setIcon( const TQPixmap &pix )
 {
     miniicon = pix;
     calcSize();
 }
 
-void KPopupTitle::calcSize()
+void TDEPopupTitle::calcSize()
 {
     TQFont f = font();
     f.setBold(true);
@@ -86,7 +86,7 @@ void KPopupTitle::calcSize()
     setMinimumSize( w+16, h+8 );
 }
 
-void KPopupTitle::paintEvent(TQPaintEvent *)
+void TDEPopupTitle::paintEvent(TQPaintEvent *)
 {
     TQRect r(rect());
     TQPainter p(this);
@@ -115,15 +115,15 @@ void KPopupTitle::paintEvent(TQPaintEvent *)
     }
 }
 
-TQSize KPopupTitle::sizeHint() const
+TQSize TDEPopupTitle::sizeHint() const
 {
     return minimumSize();
 }
 
-class KPopupMenu::KPopupMenuPrivate
+class TDEPopupMenu::TDEPopupMenuPrivate
 {
 public:
-    KPopupMenuPrivate ()
+    TDEPopupMenuPrivate ()
         : noMatches(false)
         , shortcuts(false)
         , autoExec(false)
@@ -132,7 +132,7 @@ public:
         , m_ctxMenu(0)
     {}
 
-    ~KPopupMenuPrivate ()
+    ~TDEPopupMenuPrivate ()
     {
         delete m_ctxMenu;
     }
@@ -156,112 +156,112 @@ public:
     TQPopupMenu* m_ctxMenu;
     static bool s_continueCtxMenuShow;
     static int s_highlightedItem;
-    static KPopupMenu* s_contextedMenu;
+    static TDEPopupMenu* s_contextedMenu;
 };
 
-int KPopupMenu::KPopupMenuPrivate::s_highlightedItem(-1);
-KPopupMenu* KPopupMenu::KPopupMenuPrivate::s_contextedMenu(0);
-bool KPopupMenu::KPopupMenuPrivate::s_continueCtxMenuShow(true);
+int TDEPopupMenu::TDEPopupMenuPrivate::s_highlightedItem(-1);
+TDEPopupMenu* TDEPopupMenu::TDEPopupMenuPrivate::s_contextedMenu(0);
+bool TDEPopupMenu::TDEPopupMenuPrivate::s_continueCtxMenuShow(true);
 
-KPopupMenu::KPopupMenu(TQWidget *parent, const char *name)
+TDEPopupMenu::TDEPopupMenu(TQWidget *parent, const char *name)
     : TQPopupMenu(parent, name)
 {
-    d = new KPopupMenuPrivate;
+    d = new TDEPopupMenuPrivate;
     resetKeyboardVars();
     connect(&(d->clearTimer), TQT_SIGNAL(timeout()), TQT_SLOT(resetKeyboardVars()));
 }
 
-KPopupMenu::~KPopupMenu()
+TDEPopupMenu::~TDEPopupMenu()
 {
-    if (KPopupMenuPrivate::s_contextedMenu == this)
+    if (TDEPopupMenuPrivate::s_contextedMenu == this)
     {
-        KPopupMenuPrivate::s_contextedMenu = 0;
-        KPopupMenuPrivate::s_highlightedItem = -1;
+        TDEPopupMenuPrivate::s_contextedMenu = 0;
+        TDEPopupMenuPrivate::s_highlightedItem = -1;
     }
 
     delete d;
 }
 
-int KPopupMenu::insertTitle(const TQString &text, int id, int index)
+int TDEPopupMenu::insertTitle(const TQString &text, int id, int index)
 {
-    KPopupTitle *titleItem = new KPopupTitle();
+    TDEPopupTitle *titleItem = new TDEPopupTitle();
     titleItem->setTitle(text);
     int ret = insertItem(titleItem, id, index);
     setItemEnabled(ret, false);
     return ret;
 }
 
-int KPopupMenu::insertTitle(const TQPixmap &icon, const TQString &text, int id,
+int TDEPopupMenu::insertTitle(const TQPixmap &icon, const TQString &text, int id,
                             int index)
 {
-    KPopupTitle *titleItem = new KPopupTitle();
+    TDEPopupTitle *titleItem = new TDEPopupTitle();
     titleItem->setTitle(text, &icon);
     int ret = insertItem(titleItem, id, index);
     setItemEnabled(ret, false);
     return ret;
 }
 
-void KPopupMenu::changeTitle(int id, const TQString &text)
+void TDEPopupMenu::changeTitle(int id, const TQString &text)
 {
     TQMenuItem *item = findItem(id);
     if(item){
         if(item->widget())
-            ((KPopupTitle *)item->widget())->setTitle(text);
+            ((TDEPopupTitle *)item->widget())->setTitle(text);
 #ifndef NDEBUG
         else
-            kdWarning() << "KPopupMenu: changeTitle() called with non-title id "<< id << endl;
+            kdWarning() << "TDEPopupMenu: changeTitle() called with non-title id "<< id << endl;
 #endif
     }
 #ifndef NDEBUG
     else
-        kdWarning() << "KPopupMenu: changeTitle() called with invalid id " << id << endl;
+        kdWarning() << "TDEPopupMenu: changeTitle() called with invalid id " << id << endl;
 #endif
 }
 
-void KPopupMenu::changeTitle(int id, const TQPixmap &icon, const TQString &text)
+void TDEPopupMenu::changeTitle(int id, const TQPixmap &icon, const TQString &text)
 {
     TQMenuItem *item = findItem(id);
     if(item){
         if(item->widget())
-            ((KPopupTitle *)item->widget())->setTitle(text, &icon);
+            ((TDEPopupTitle *)item->widget())->setTitle(text, &icon);
 #ifndef NDEBUG
         else
-            kdWarning() << "KPopupMenu: changeTitle() called with non-title id "<< id << endl;
+            kdWarning() << "TDEPopupMenu: changeTitle() called with non-title id "<< id << endl;
 #endif
     }
 #ifndef NDEBUG
     else
-        kdWarning() << "KPopupMenu: changeTitle() called with invalid id " << id << endl;
+        kdWarning() << "TDEPopupMenu: changeTitle() called with invalid id " << id << endl;
 #endif
 }
 
-TQString KPopupMenu::title(int id) const
+TQString TDEPopupMenu::title(int id) const
 {
     if(id == -1) // obsolete
         return d->m_lastTitle;
     TQMenuItem *item = findItem(id);
     if(item){
         if(item->widget())
-            return ((KPopupTitle *)item->widget())->title();
+            return ((TDEPopupTitle *)item->widget())->title();
         else
-            tqWarning("KPopupMenu: title() called with non-title id %d.", id);
+            tqWarning("TDEPopupMenu: title() called with non-title id %d.", id);
     }
     else
-        tqWarning("KPopupMenu: title() called with invalid id %d.", id);
+        tqWarning("TDEPopupMenu: title() called with invalid id %d.", id);
     return TQString::null;
 }
 
-TQPixmap KPopupMenu::titlePixmap(int id) const
+TQPixmap TDEPopupMenu::titlePixmap(int id) const
 {
     TQMenuItem *item = findItem(id);
     if(item){
         if(item->widget())
-            return ((KPopupTitle *)item->widget())->icon();
+            return ((TDEPopupTitle *)item->widget())->icon();
         else
-            tqWarning("KPopupMenu: titlePixmap() called with non-title id %d.", id);
+            tqWarning("TDEPopupMenu: titlePixmap() called with non-title id %d.", id);
     }
     else
-        tqWarning("KPopupMenu: titlePixmap() called with invalid id %d.", id);
+        tqWarning("TDEPopupMenu: titlePixmap() called with invalid id %d.", id);
     TQPixmap tmp;
     return tmp;
 }
@@ -269,25 +269,25 @@ TQPixmap KPopupMenu::titlePixmap(int id) const
 /**
  * This is re-implemented for keyboard navigation.
  */
-void KPopupMenu::closeEvent(TQCloseEvent*e)
+void TDEPopupMenu::closeEvent(TQCloseEvent*e)
 {
     if (d->shortcuts)
         resetKeyboardVars();
     TQPopupMenu::closeEvent(e);
 }
 
-void KPopupMenu::activateItemAt(int index)
+void TDEPopupMenu::activateItemAt(int index)
 {
     d->state = Qt::NoButton;
     TQPopupMenu::activateItemAt(index);
 }
 
-TQt::ButtonState KPopupMenu::state() const
+TQt::ButtonState TDEPopupMenu::state() const
 {
     return d->state;
 }
 
-void KPopupMenu::keyPressEvent(TQKeyEvent* e)
+void TDEPopupMenu::keyPressEvent(TQKeyEvent* e)
 {
     d->state = Qt::NoButton;
     if (!d->shortcuts) {
@@ -445,13 +445,13 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e)
     TQPopupMenu::keyPressEvent(e);
 }
 
-bool KPopupMenu::focusNextPrevChild( bool next )
+bool TDEPopupMenu::focusNextPrevChild( bool next )
 {
     resetKeyboardVars();
     return TQPopupMenu::focusNextPrevChild( next );
 }
 
-TQString KPopupMenu::underlineText(const TQString& text, uint length)
+TQString TDEPopupMenu::underlineText(const TQString& text, uint length)
 {
     TQString ret = text;
     for (uint i = 0; i < length; i++) {
@@ -461,7 +461,7 @@ TQString KPopupMenu::underlineText(const TQString& text, uint length)
     return ret;
 }
 
-void KPopupMenu::resetKeyboardVars(bool noMatches /* = false */)
+void TDEPopupMenu::resetKeyboardVars(bool noMatches /* = false */)
 {
     // Clean up keyboard variables
     if (d->lastHitIndex != -1) {
@@ -476,12 +476,12 @@ void KPopupMenu::resetKeyboardVars(bool noMatches /* = false */)
     d->noMatches = noMatches;
 }
 
-void KPopupMenu::setKeyboardShortcutsEnabled(bool enable)
+void TDEPopupMenu::setKeyboardShortcutsEnabled(bool enable)
 {
     d->shortcuts = enable;
 }
 
-void KPopupMenu::setKeyboardShortcutsExecute(bool enable)
+void TDEPopupMenu::setKeyboardShortcutsExecute(bool enable)
 {
     d->autoExec = enable;
 }
@@ -493,7 +493,7 @@ void KPopupMenu::setKeyboardShortcutsExecute(bool enable)
  * RMB menus on menus
  */
 
-void KPopupMenu::mousePressEvent(TQMouseEvent* e)
+void TDEPopupMenu::mousePressEvent(TQMouseEvent* e)
 {
     if (d->m_ctxMenu && d->m_ctxMenu->isVisible())
     {
@@ -504,7 +504,7 @@ void KPopupMenu::mousePressEvent(TQMouseEvent* e)
     TQPopupMenu::mousePressEvent(e);
 }
 
-void KPopupMenu::mouseReleaseEvent(TQMouseEvent* e)
+void TDEPopupMenu::mouseReleaseEvent(TQMouseEvent* e)
 {
     // Save the button, and the modifiers from state()
     d->state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask));
@@ -513,7 +513,7 @@ void KPopupMenu::mouseReleaseEvent(TQMouseEvent* e)
 	TQPopupMenu::mouseReleaseEvent(e);
 }
 
-TQPopupMenu* KPopupMenu::contextMenu()
+TQPopupMenu* TDEPopupMenu::contextMenu()
 {
     if (!d->m_ctxMenu)
     {
@@ -524,27 +524,27 @@ TQPopupMenu* KPopupMenu::contextMenu()
     return d->m_ctxMenu;
 }
 
-const TQPopupMenu* KPopupMenu::contextMenu() const
+const TQPopupMenu* TDEPopupMenu::contextMenu() const
 {
-    return const_cast< KPopupMenu* >( this )->contextMenu();
+    return const_cast< TDEPopupMenu* >( this )->contextMenu();
 }
 
-void KPopupMenu::hideContextMenu()
+void TDEPopupMenu::hideContextMenu()
 {
-    KPopupMenuPrivate::s_continueCtxMenuShow = false;
+    TDEPopupMenuPrivate::s_continueCtxMenuShow = false;
 }
 
-int KPopupMenu::contextMenuFocusItem()
+int TDEPopupMenu::contextMenuFocusItem()
 {
-    return KPopupMenuPrivate::s_highlightedItem;
+    return TDEPopupMenuPrivate::s_highlightedItem;
 }
 
-KPopupMenu* KPopupMenu::contextMenuFocus()
+TDEPopupMenu* TDEPopupMenu::contextMenuFocus()
 {
-    return KPopupMenuPrivate::s_contextedMenu;
+    return TDEPopupMenuPrivate::s_contextedMenu;
 }
 
-void KPopupMenu::itemHighlighted(int /* whichItem */)
+void TDEPopupMenu::itemHighlighted(int /* whichItem */)
 {
     if (!d->m_ctxMenu || !d->m_ctxMenu->isVisible())
     {
@@ -555,9 +555,9 @@ void KPopupMenu::itemHighlighted(int /* whichItem */)
     showCtxMenu(mapFromGlobal(TQCursor::pos()));
 }
 
-void KPopupMenu::showCtxMenu(TQPoint pos)
+void TDEPopupMenu::showCtxMenu(TQPoint pos)
 {
-    TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem);
+    TQMenuItem* item = findItem(TDEPopupMenuPrivate::s_highlightedItem);
     if (item)
     {
         TQPopupMenu* subMenu = item->popup();
@@ -567,30 +567,30 @@ void KPopupMenu::showCtxMenu(TQPoint pos)
         }
     }
 
-    KPopupMenuPrivate::s_highlightedItem = idAt(pos);
+    TDEPopupMenuPrivate::s_highlightedItem = idAt(pos);
 
-    if (KPopupMenuPrivate::s_highlightedItem == -1)
+    if (TDEPopupMenuPrivate::s_highlightedItem == -1)
     {
-        KPopupMenuPrivate::s_contextedMenu = 0;
+        TDEPopupMenuPrivate::s_contextedMenu = 0;
         return;
     }
 
-    emit aboutToShowContextMenu(this, KPopupMenuPrivate::s_highlightedItem, d->m_ctxMenu);
+    emit aboutToShowContextMenu(this, TDEPopupMenuPrivate::s_highlightedItem, d->m_ctxMenu);
 
-    TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup();
+    TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup();
     if (subMenu)
     {
         connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu()));
         TQTimer::singleShot(100, subMenu, TQT_SLOT(hide()));
     }
 
-    if (!KPopupMenuPrivate::s_continueCtxMenuShow)
+    if (!TDEPopupMenuPrivate::s_continueCtxMenuShow)
     {
-        KPopupMenuPrivate::s_continueCtxMenuShow = true;
+        TDEPopupMenuPrivate::s_continueCtxMenuShow = true;
         return;
     }
 
-    KPopupMenuPrivate::s_contextedMenu = this;
+    TDEPopupMenuPrivate::s_contextedMenu = this;
     d->m_ctxMenu->popup(this->mapToGlobal(pos));
     connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int)));
 }
@@ -599,9 +599,9 @@ void KPopupMenu::showCtxMenu(TQPoint pos)
  * this method helps prevent submenus popping up while we have a context menu
  * showing
  */
-void KPopupMenu::ctxMenuHideShowingMenu()
+void TDEPopupMenu::ctxMenuHideShowingMenu()
 {
-    TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem);
+    TQMenuItem* item = findItem(TDEPopupMenuPrivate::s_highlightedItem);
     if (item)
     {
         TQPopupMenu* subMenu = item->popup();
@@ -612,11 +612,11 @@ void KPopupMenu::ctxMenuHideShowingMenu()
     }
 }
 
-void KPopupMenu::ctxMenuHiding()
+void TDEPopupMenu::ctxMenuHiding()
 {
-    if (KPopupMenuPrivate::s_highlightedItem)
+    if (TDEPopupMenuPrivate::s_highlightedItem)
     {
-        TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup();
+        TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup();
         if (subMenu)
         {
             disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu()));
@@ -624,10 +624,10 @@ void KPopupMenu::ctxMenuHiding()
     }
 
     disconnect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int)));
-    KPopupMenuPrivate::s_continueCtxMenuShow = true;
+    TDEPopupMenuPrivate::s_continueCtxMenuShow = true;
 }
 
-void KPopupMenu::contextMenuEvent(TQContextMenuEvent* e)
+void TDEPopupMenu::contextMenuEvent(TQContextMenuEvent* e)
 {
     if (d->m_ctxMenu)
     {
@@ -647,7 +647,7 @@ void KPopupMenu::contextMenuEvent(TQContextMenuEvent* e)
     TQPopupMenu::contextMenuEvent(e);
 }
 
-void KPopupMenu::hideEvent(TQHideEvent*)
+void TDEPopupMenu::hideEvent(TQHideEvent*)
 {
     if (d->m_ctxMenu && d->m_ctxMenu->isVisible())
     {
@@ -669,26 +669,26 @@ void KPopupMenu::hideEvent(TQHideEvent*)
  */
 
 // Obsolete
-KPopupMenu::KPopupMenu(const TQString& title, TQWidget *parent, const char *name)
+TDEPopupMenu::TDEPopupMenu(const TQString& title, TQWidget *parent, const char *name)
     : TQPopupMenu(parent, name)
 {
-    d = new KPopupMenuPrivate;
+    d = new TDEPopupMenuPrivate;
     insertTitle(title);
 }
 
 // Obsolete
-void KPopupMenu::setTitle(const TQString &title)
+void TDEPopupMenu::setTitle(const TQString &title)
 {
-    KPopupTitle *titleItem = new KPopupTitle();
+    TDEPopupTitle *titleItem = new TDEPopupTitle();
     titleItem->setTitle(title);
     insertItem(titleItem);
     d->m_lastTitle = title;
 }
 
-void KPopupTitle::virtual_hook( int, void* )
+void TDEPopupTitle::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KPopupMenu::virtual_hook( int, void* )
+void TDEPopupMenu::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kpopupmenu.moc"
+#include "tdepopupmenu.moc"
diff --git a/tdeui/kpopupmenu.h b/tdeui/tdepopupmenu.h
index 5c29fd2f9..2d50e2d56 100644
--- a/tdeui/kpopupmenu.h
+++ b/tdeui/tdepopupmenu.h
@@ -25,17 +25,17 @@
 #include <kpixmap.h>
 #include <tdelibs_export.h>
 /**
- * @short KPopupMenu title widget.
+ * @short TDEPopupMenu title widget.
  *
- * Title widget for use in KPopupMenu.
+ * Title widget for use in TDEPopupMenu.
  *
  * You usually don't have to create this manually since
- * KPopupMenu::insertTitle will do it for you, but it is allowed if
+ * TDEPopupMenu::insertTitle will do it for you, but it is allowed if
  * you wish to customize it's look.
  *
  * @author Daniel M. Duley <mosfet@kde.org>
  */
-class TDEUI_EXPORT KPopupTitle : public TQWidget
+class TDEUI_EXPORT TDEPopupTitle : public TQWidget
 {
     Q_OBJECT
 
@@ -44,19 +44,19 @@ public:
      * Constructs a title widget with the user specified gradient, pixmap,
      * and colors.
      */
-    KPopupTitle(TQWidget *parent=0, const char *name=0);
+    TDEPopupTitle(TQWidget *parent=0, const char *name=0);
     /**
      * @deprecated
      * Constructs a title widget with the specified gradient and colors.
      */
-    KPopupTitle(KPixmapEffect::GradientType gradient, const TQColor &color,
+    TDEPopupTitle(KPixmapEffect::GradientType gradient, const TQColor &color,
                 const TQColor &textColor, TQWidget *parent=0,
                 const char *name=0) KDE_DEPRECATED;
     /**
      * @deprecated
      * Constructs a title widget with the specified pixmap and colors.
      */
-    KPopupTitle(const KPixmap &background, const TQColor &color,
+    TDEPopupTitle(const KPixmap &background, const TQColor &color,
                 const TQColor &textColor, TQWidget *parent=0,
                 const char *name=0) KDE_DEPRECATED;
     /**
@@ -98,14 +98,14 @@ protected:
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    class KPopupTitlePrivate;
-    KPopupTitlePrivate *d;
+    class TDEPopupTitlePrivate;
+    TDEPopupTitlePrivate *d;
 };
 
 /**
  * @short A menu with title items.
  *
- * KPopupMenu is a class for menus with standard title items and keyboard
+ * TDEPopupMenu is a class for menus with standard title items and keyboard
  * accessibility for popups with many options and/or varying options. It acts
  * identically to TQPopupMenu, with the addition of insertTitle(),
  * changeTitle(), setKeyboardShortcutsEnabled() and
@@ -120,19 +120,19 @@ private:
  * @author Daniel M. Duley <mosfet@kde.org>
  * @author Hamish Rodda <rodda@kde.org>
  */
-class TDEUI_EXPORT KPopupMenu : public TQPopupMenu {
+class TDEUI_EXPORT TDEPopupMenu : public TQPopupMenu {
     Q_OBJECT
     
 public:
     /**
-     * Constructs a KPopupMenu.
+     * Constructs a TDEPopupMenu.
      */
-    KPopupMenu(TQWidget *parent=0, const char *name=0);
+    TDEPopupMenu(TQWidget *parent=0, const char *name=0);
 
     /**
      * Destructs the object
      */
-    ~KPopupMenu();
+    ~TDEPopupMenu();
 
     /**
      * Inserts a title item with no icon.
@@ -191,7 +191,7 @@ public:
      * Obsolete method provided for backwards compatibility only. Use the
      * normal constructor and insertTitle instead.
      */
-    KPopupMenu(const TQString &title, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED;
+    TDEPopupMenu(const TQString &title, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED;
 
     /**
      * @deprecated
@@ -219,10 +219,10 @@ public:
     void hideContextMenu();
 
     /**
-     * Returns the KPopupMenu associated with the current context menu
+     * Returns the TDEPopupMenu associated with the current context menu
      * @since 3.2
      */
-    static KPopupMenu* contextMenuFocus();
+    static TDEPopupMenu* contextMenuFocus();
 
     /**
      * returns the ID of the menuitem associated with the current context menu
@@ -250,7 +250,7 @@ signals:
      * @param ctxMenu The context menu itself
      * @since 3.2
      */
-    void aboutToShowContextMenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu);
+    void aboutToShowContextMenu(TDEPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu);
 
 protected:
     virtual void closeEvent(TQCloseEvent *);
@@ -275,8 +275,8 @@ protected slots:
     void ctxMenuHideShowingMenu();
 
 private:
-    class KPopupMenuPrivate;
-    KPopupMenuPrivate *d;
+    class TDEPopupMenuPrivate;
+    TDEPopupMenuPrivate *d;
 };
 
 #endif
diff --git a/tdeui/kselect.cpp b/tdeui/tdeselect.cpp
index 70a63a9a8..272f7a144 100644
--- a/tdeui/kselect.cpp
+++ b/tdeui/tdeselect.cpp
@@ -22,7 +22,7 @@
 #include <tqdrawutil.h>
 #include <tqstyle.h>
 #include <kimageeffect.h>
-#include "kselect.h"
+#include "tdeselect.h"
 
 #define STORE_W 8
 #define STORE_W2 STORE_W * 2
@@ -235,14 +235,14 @@ void KXYSelector::drawCursor( TQPainter *p, int xp, int yp )
  */
 
 
-KSelector::KSelector( TQWidget *parent, const char *name )
+TDESelector::TDESelector( TQWidget *parent, const char *name )
 	: TQWidget( parent, name ), TQRangeControl()
 {
 	_orientation = Qt::Horizontal;
 	_indent = true;
 }
 
-KSelector::KSelector( Orientation o, TQWidget *parent, const char *name )
+TDESelector::TDESelector( Orientation o, TQWidget *parent, const char *name )
 	: TQWidget( parent, name ), TQRangeControl()
 {
 	_orientation = o;
@@ -250,11 +250,11 @@ KSelector::KSelector( Orientation o, TQWidget *parent, const char *name )
 }
 
 
-KSelector::~KSelector()
+TDESelector::~TDESelector()
 {}
 
 
-TQRect KSelector::contentsRect() const
+TQRect TDESelector::contentsRect() const
 {
 	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	int iw = (w < 5) ? 5 : w;
@@ -264,7 +264,7 @@ TQRect KSelector::contentsRect() const
 		return TQRect( iw, w, width() - 2 * iw, height() - w * 2 - 5 );
 }
 
-void KSelector::paintEvent( TQPaintEvent * )
+void TDESelector::paintEvent( TQPaintEvent * )
 {
 	TQPainter painter;
 	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
@@ -292,23 +292,23 @@ void KSelector::paintEvent( TQPaintEvent * )
 	painter.end();
 }
 
-void KSelector::mousePressEvent( TQMouseEvent *e )
+void TDESelector::mousePressEvent( TQMouseEvent *e )
 {
 	moveArrow( e->pos() );
 }
 
-void KSelector::mouseMoveEvent( TQMouseEvent *e )
+void TDESelector::mouseMoveEvent( TQMouseEvent *e )
 {
 	moveArrow( e->pos() );
 }
 
-void KSelector::wheelEvent( TQWheelEvent *e )
+void TDESelector::wheelEvent( TQWheelEvent *e )
 {
 	int val = value() + e->delta()/120;
 	setValue( val );
 }
 
-void KSelector::valueChange()
+void TDESelector::valueChange()
 {
 	TQPainter painter;
 	TQPoint pos;
@@ -326,7 +326,7 @@ void KSelector::valueChange()
 	emit valueChanged( value() );
 }
 
-void KSelector::moveArrow( const TQPoint &pos )
+void TDESelector::moveArrow( const TQPoint &pos )
 {
 	int val;
 	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
@@ -342,7 +342,7 @@ void KSelector::moveArrow( const TQPoint &pos )
 	setValue( val );
 }
 
-TQPoint KSelector::calcArrowPos( int val )
+TQPoint TDESelector::calcArrowPos( int val )
 {
 	TQPoint p;
 
@@ -364,10 +364,10 @@ TQPoint KSelector::calcArrowPos( int val )
 	return p;
 }
 
-void KSelector::drawContents( TQPainter * )
+void TDESelector::drawContents( TQPainter * )
 {}
 
-void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
+void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
 {
   if ( show )
   {
@@ -404,7 +404,7 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
 //----------------------------------------------------------------------------
 
 KGradientSelector::KGradientSelector( TQWidget *parent, const char *name )
-    : KSelector( parent, name )
+    : TDESelector( parent, name )
 {
     init();
 }
@@ -412,7 +412,7 @@ KGradientSelector::KGradientSelector( TQWidget *parent, const char *name )
 
 KGradientSelector::KGradientSelector( Orientation o, TQWidget *parent,
 		const char *name )
-	: KSelector( o, parent, name )
+	: TDESelector( o, parent, name )
 {
     init();
 }
@@ -524,11 +524,11 @@ void KGradientSelector::drawContents( TQPainter *painter )
 void KXYSelector::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-void KSelector::virtual_hook( int, void* )
+void TDESelector::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KGradientSelector::virtual_hook( int id, void* data )
-{ KSelector::virtual_hook( id, data ); }
+{ TDESelector::virtual_hook( id, data ); }
 
-#include "kselect.moc"
+#include "tdeselect.moc"
 
diff --git a/tdeui/kselect.h b/tdeui/tdeselect.h
index 77b35a175..fd9a90ccd 100644
--- a/tdeui/kselect.h
+++ b/tdeui/tdeselect.h
@@ -148,7 +148,7 @@ private:
 
 
 /**
- * KSelector is the base class for other widgets which
+ * TDESelector is the base class for other widgets which
  * provides the ability to choose from a one-dimensional
  * range of values. An example is the KGradientSelector
  * which allows to choose from a range of colors.
@@ -156,7 +156,7 @@ private:
  * A custom drawing routine for the widget surface has
  * to be provided by the subclass.
  */
-class TDEUI_EXPORT KSelector : public TQWidget, public TQRangeControl
+class TDEUI_EXPORT TDESelector : public TQWidget, public TQRangeControl
 {
   Q_OBJECT
   TQ_PROPERTY( int value READ value WRITE setValue )
@@ -167,16 +167,16 @@ public:
   /**
    * Constructs a horizontal one-dimensional selection widget.
    */
-  KSelector( TQWidget *parent=0, const char *name=0 );
+  TDESelector( TQWidget *parent=0, const char *name=0 );
   /**
    * Constructs a one-dimensional selection widget with
    * a given orientation.
    */
-  KSelector( Orientation o, TQWidget *parent = 0L, const char *name = 0L );
+  TDESelector( Orientation o, TQWidget *parent = 0L, const char *name = 0L );
   /*
    * Destructs the widget.
    */
-  ~KSelector();
+  ~TDESelector();
 
   /**
    * @return the orientation of the widget.
@@ -277,8 +277,8 @@ private:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  class KSelectorPrivate;
-  KSelectorPrivate *d;
+  class TDESelectorPrivate;
+  TDESelectorPrivate *d;
 };
 
 
@@ -290,7 +290,7 @@ private:
  * \image html kgradientselector.png "KDE Gradient Selector Widget"
  *
  **/
-class TDEUI_EXPORT KGradientSelector : public KSelector
+class TDEUI_EXPORT KGradientSelector : public TDESelector
 {
   Q_OBJECT
 
diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index 27d721626..35a7706c7 100644
--- a/tdeui/kshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kshortcutdialog.h"
+#include "tdeshortcutdialog.h"
 
 #include <tqvariant.h>
 
@@ -41,8 +41,8 @@
 # include <kkeyserver.h>
 #endif
 
-#include <kshortcutdialog_simple.h>
-#include <kshortcutdialog_advanced.h>
+#include <tdeshortcutdialog_simple.h>
+#include <tdeshortcutdialog_advanced.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
@@ -52,19 +52,19 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kkeynative.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 
-bool KShortcutDialog::s_showMore = false;
+bool TDEShortcutDialog::s_showMore = false;
 
-KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, TQWidget* parent, const char* name )
+TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShortcut, TQWidget* parent, const char* name )
 : KDialogBase( parent, name, true, i18n("Configure Shortcut"),
                KDialogBase::Details|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Cancel, true )
 {
@@ -75,9 +75,9 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T
         m_stack->setMargin(0);
         setMainWidget(m_stack);
         
-        m_simple = new KShortcutDialogSimple(m_stack);
+        m_simple = new TDEShortcutDialogSimple(m_stack);
 
-        m_adv = new KShortcutDialogAdvanced(m_stack);
+        m_adv = new TDEShortcutDialogAdvanced(m_stack);
         m_adv->hide();
         
 	m_bQtShortcut = bQtShortcut;
@@ -119,7 +119,7 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T
 	setShortcut( shortcut );
 	resize( 0, 0 );
 
-	s_showMore = KConfigGroup(KGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore);
+	s_showMore = TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore);
 	updateDetails();
 
 	#ifdef Q_WS_X11
@@ -127,19 +127,19 @@ KShortcutDialog::KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, T
 	#endif
 }
 
-KShortcutDialog::~KShortcutDialog()
+TDEShortcutDialog::~TDEShortcutDialog()
 {
-	KConfigGroup group(KGlobal::config(), "General");
+	TDEConfigGroup group(TDEGlobal::config(), "General");
 	group.writeEntry("ShowAlternativeShortcutConfig", s_showMore);
 }
 
-void KShortcutDialog::setShortcut( const KShortcut & shortcut )
+void TDEShortcutDialog::setShortcut( const TDEShortcut & shortcut )
 {
 	m_shortcut = shortcut;
 	updateShortcutDisplay();
 }
 
-void KShortcutDialog::updateShortcutDisplay()
+void TDEShortcutDialog::updateShortcutDisplay()
 {
 	TQString s[2] = { m_shortcut.seq(0).toString(), m_shortcut.seq(1).toString() };
 
@@ -190,13 +190,13 @@ void KShortcutDialog::updateShortcutDisplay()
 	enableButton(Details, bLessOk);
 }
 
-void KShortcutDialog::slotDetails()
+void TDEShortcutDialog::slotDetails()
 {
 	s_showMore = (m_adv->isHidden());
 	updateDetails();
 }
 
-void KShortcutDialog::updateDetails()
+void TDEShortcutDialog::updateDetails()
 {
 	bool showAdvanced = s_showMore || (m_shortcut.count() > 1);
 	setDetails(showAdvanced);
@@ -224,7 +224,7 @@ void KShortcutDialog::updateDetails()
 	adjustSize();
 }
 
-void KShortcutDialog::slotSelectPrimary()
+void TDEShortcutDialog::slotSelectPrimary()
 {
 	m_bRecording = false;
 	m_iSeq = 0;
@@ -235,7 +235,7 @@ void KShortcutDialog::slotSelectPrimary()
 	updateShortcutDisplay();
 }
 
-void KShortcutDialog::slotSelectAlternate()
+void TDEShortcutDialog::slotSelectAlternate()
 {
 	m_bRecording = false;
 	m_iSeq = 1;
@@ -246,20 +246,20 @@ void KShortcutDialog::slotSelectAlternate()
 	updateShortcutDisplay();
 }
 
-void KShortcutDialog::slotClearShortcut()
+void TDEShortcutDialog::slotClearShortcut()
 {
 	m_shortcut.setSeq( 0, KKeySequence() );
 	updateShortcutDisplay();
 }
 
-void KShortcutDialog::slotClearPrimary()
+void TDEShortcutDialog::slotClearPrimary()
 {
 	m_shortcut.setSeq( 0, KKeySequence() );
 	m_adv->m_btnPrimary->setChecked( true );
 	slotSelectPrimary();
 }
 
-void KShortcutDialog::slotClearAlternate()
+void TDEShortcutDialog::slotClearAlternate()
 {
 	if( m_shortcut.count() == 2 )
 		m_shortcut.init( m_shortcut.seq(0) );
@@ -267,7 +267,7 @@ void KShortcutDialog::slotClearAlternate()
 	slotSelectAlternate();
 }
 
-void KShortcutDialog::slotMultiKeyMode( bool bOn )
+void TDEShortcutDialog::slotMultiKeyMode( bool bOn )
 {
 	// If turning off multi-key mode during a recording,
 	if( !bOn && m_bRecording ) {
@@ -281,7 +281,7 @@ void KShortcutDialog::slotMultiKeyMode( bool bOn )
 /* we don't use the generic Qt code on X11 because it allows us 
  to grab the keyboard so that all keypresses are seen
  */
-bool KShortcutDialog::x11Event( XEvent *pEvent )
+bool TDEShortcutDialog::x11Event( XEvent *pEvent )
 {
 	switch( pEvent->type ) {
 		case XKeyPress:
@@ -348,7 +348,7 @@ static bool convertSymXToMod( uint keySymX, uint* pmod )
 	return true;
 }
 
-void KShortcutDialog::x11KeyPressEvent( XEvent* pEvent )
+void TDEShortcutDialog::x11KeyPressEvent( XEvent* pEvent )
 {
 	KKeyNative keyNative( pEvent );
 	uint keyModX = keyNative.mod();
@@ -370,7 +370,7 @@ void KShortcutDialog::x11KeyPressEvent( XEvent* pEvent )
 	updateShortcutDisplay();
 }
 
-void KShortcutDialog::x11KeyReleaseEvent( XEvent* pEvent )
+void TDEShortcutDialog::x11KeyReleaseEvent( XEvent* pEvent )
 {
 	// We're only interested in the release of modifier keys,
 	//  and then only when it's for the first key in a sequence.
@@ -391,7 +391,7 @@ void KShortcutDialog::x11KeyReleaseEvent( XEvent* pEvent )
 	}
 }
 #elif defined(Q_WS_WIN)
-void KShortcutDialog::keyPressEvent( TQKeyEvent * e )
+void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e )
 {
 	kdDebug() << e->text() << " " << (int)e->text()[0].latin1()<<  " " << (int)e->ascii() << endl;
 	//if key is a letter, it must be stored as lowercase
@@ -457,7 +457,7 @@ void KShortcutDialog::keyPressEvent( TQKeyEvent * e )
 	}
 }
 
-bool KShortcutDialog::event ( TQEvent * e )
+bool TDEShortcutDialog::event ( TQEvent * e )
 {
 	if (e->type()==TQEvent::KeyRelease) {
 		int modQt = KKeyServer::qtButtonStateToMod( static_cast<TQKeyEvent*>(e)->state() );
@@ -488,7 +488,7 @@ bool KShortcutDialog::event ( TQEvent * e )
 }
 #endif
 
-void KShortcutDialog::keyPressed( KKey key )
+void TDEShortcutDialog::keyPressed( KKey key )
 {
 	kdDebug(125) << "keyPressed: " << key.toString() << endl;
 
@@ -526,4 +526,4 @@ void KShortcutDialog::keyPressed( KKey key )
 		TQTimer::singleShot(500, this, TQT_SLOT(accept()));
 }
 
-#include "kshortcutdialog.moc"
+#include "tdeshortcutdialog.moc"
diff --git a/tdeui/kshortcutdialog.h b/tdeui/tdeshortcutdialog.h
index e1f7643be..f989e0191 100644
--- a/tdeui/kshortcutdialog.h
+++ b/tdeui/tdeshortcutdialog.h
@@ -21,46 +21,46 @@
 #define _KSHORTCUTDIALOG_H_
 
 #include "kdialogbase.h"
-#include "kshortcut.h"
+#include "tdeshortcut.h"
 
 class TQVBox;
 class KPushButton;
-class KShortcutDialogSimple;
-class KShortcutDialogAdvanced;
+class TDEShortcutDialogSimple;
+class TDEShortcutDialogAdvanced;
 
 /**
  * @short Dialog for configuring a shortcut.
  *
- * This dialog allows configuring a single KShortcut. KKeyDialog
+ * This dialog allows configuring a single TDEShortcut. KKeyDialog
  * should be usually used instead.
  *
  * @internal
  * @see KKeyDialog
  * @since 3.4
  */
-class TDEUI_EXPORT KShortcutDialog : public KDialogBase
+class TDEUI_EXPORT TDEShortcutDialog : public KDialogBase
 {
 	Q_OBJECT
 public:
-	KShortcutDialog( const KShortcut& shortcut, bool bQtShortcut, TQWidget* parent = 0, const char* name = 0 );
-	~KShortcutDialog();
+	TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShortcut, TQWidget* parent = 0, const char* name = 0 );
+	~TDEShortcutDialog();
 
-	void setShortcut( const KShortcut & shortcut );
-	const KShortcut& shortcut() const { return m_shortcut; }
+	void setShortcut( const TDEShortcut & shortcut );
+	const TDEShortcut& shortcut() const { return m_shortcut; }
 
 private:
 	// true if qt shortcut, false if native shortcut
 	bool m_bQtShortcut;
 
-	KShortcut m_shortcut;
+	TDEShortcut m_shortcut;
 	bool m_bGrab;
 	KPushButton* m_ptxtCurrent;
 	uint m_iSeq;
 	uint m_iKey;
 	bool m_bRecording;
 	uint m_mod;
-	KShortcutDialogSimple *m_simple;
-	KShortcutDialogAdvanced *m_adv;
+	TDEShortcutDialogSimple *m_simple;
+	TDEShortcutDialogAdvanced *m_adv;
 	TQVBox *m_stack;
 	
 	void updateShortcutDisplay();
@@ -89,7 +89,7 @@ protected slots:
 	void slotMultiKeyMode( bool bOn );
 
 private:
-        class KShortcutDialogPrivate* d;
+        class TDEShortcutDialogPrivate* d;
         static bool s_showMore;
 };
 
diff --git a/tdeui/kshortcutdialog_advanced.ui b/tdeui/tdeshortcutdialog_advanced.ui
index 6466174d2..b1cc70460 100644
--- a/tdeui/kshortcutdialog_advanced.ui
+++ b/tdeui/tdeshortcutdialog_advanced.ui
@@ -1,8 +1,8 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>KShortcutDialogAdvanced</class>
+<class>TDEShortcutDialogAdvanced</class>
 <widget class="TQWidget">
     <property name="name">
-        <cstring>KShortcutDialogAdvanced</cstring>
+        <cstring>TDEShortcutDialogAdvanced</cstring>
     </property>
     <property name="geometry">
         <rect>
@@ -238,12 +238,12 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">kshortcut.h</include>
+    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
-    <forward>class KShortcut</forward>
+    <forward>class TDEShortcut</forward>
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/tdeui/kshortcutdialog_simple.ui b/tdeui/tdeshortcutdialog_simple.ui
index 97d87b582..c21b6f940 100644
--- a/tdeui/kshortcutdialog_simple.ui
+++ b/tdeui/tdeshortcutdialog_simple.ui
@@ -1,8 +1,8 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>KShortcutDialogSimple</class>
+<class>TDEShortcutDialogSimple</class>
 <widget class="TQWidget">
     <property name="name">
-        <cstring>KShortcutDialogSimple</cstring>
+        <cstring>TDEShortcutDialogSimple</cstring>
     </property>
     <property name="geometry">
         <rect>
@@ -105,12 +105,12 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">kshortcut.h</include>
+    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
-    <forward>class KShortcut</forward>
+    <forward>class TDEShortcut</forward>
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/tdeui/kspell.cpp b/tdeui/tdespell.cpp
index 7a17ad607..d764fa89d 100644
--- a/tdeui/kspell.cpp
+++ b/tdeui/tdespell.cpp
@@ -37,12 +37,12 @@
 #include <tqtextcodec.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include "kspell.h"
-#include "kspelldlg.h"
+#include <tdelocale.h>
+#include "tdespell.h"
+#include "tdespelldlg.h"
 #include <twin.h>
 #include <kprocio.h>
 
@@ -236,7 +236,7 @@ KSpell::startIspell()
 
   //Note to potential debuggers:  -Tlatin2 _is_ being added on the
   //  _first_ try.  But, some versions of ispell will fail with this
-  // option, so kspell tries again without it.  That's why as 'ps -ax'
+  // option, so tdespell tries again without it.  That's why as 'ps -ax'
   // shows "ispell -a -S ..." withou the "-Tlatin2" option.
 
     if ( trystart<1 ) {
@@ -296,11 +296,11 @@ KSpell::startIspell()
 
   if (trystart == 0) //don't connect these multiple times
   {
-    connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
-             this, TQT_SLOT(ispellErrors(KProcess *, char *, int)) );
+    connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+             this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) );
 
-    connect( proc, TQT_SIGNAL(processExited(KProcess *)),
-             this, TQT_SLOT(ispellExit (KProcess *)) );
+    connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
+             this, TQT_SLOT(ispellExit (TDEProcess *)) );
 
     OUTPUT(KSpell2);
   }
@@ -313,7 +313,7 @@ KSpell::startIspell()
 }
 
 void
-KSpell::ispellErrors( KProcess *, char *buffer, int buflen )
+KSpell::ispellErrors( TDEProcess *, char *buffer, int buflen )
 {
   buffer[buflen-1] = '\0';
   //  kdDebug(750) << "ispellErrors [" << buffer << "]\n" << endl;
@@ -595,7 +595,7 @@ void KSpell::checkWord2( KProcIO* )
 
 void KSpell::checkNext()
 {
-// Queue words to prevent kspell from turning into a fork bomb
+// Queue words to prevent tdespell from turning into a fork bomb
   d->checking = false;
   if (!d->unchecked.empty()) {
     BufferedWord buf = d->unchecked.front();
@@ -1313,7 +1313,7 @@ void KSpell::cleanUp()
   proc->closeStdin();
 }
 
-void KSpell::ispellExit( KProcess* )
+void KSpell::ispellExit( TDEProcess* )
 {
   kdDebug() << "KSpell::ispellExit() " << m_status << endl;
 
@@ -1558,7 +1558,7 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption,
   maxtrystart = 2;
 
   if ( obj && slot )
-      // caller wants to know when kspell is ready
+      // caller wants to know when tdespell is ready
       connect( this, TQT_SIGNAL(ready(KSpell *)), obj, slot);
   else
       // Hack for modal spell checking
@@ -1573,5 +1573,5 @@ TQString KSpell::modaltext;
 int KSpell::modalreturn = 0;
 TQWidget* KSpell::modalWidgetHack = 0;
 
-#include "kspell.moc"
+#include "tdespell.moc"
 
diff --git a/tdeui/kspell.h b/tdeui/tdespell.h
index e96b61a2e..812c3e0d7 100644
--- a/tdeui/kspell.h
+++ b/tdeui/tdespell.h
@@ -28,7 +28,7 @@
 
 class TQTextCodec;
 class KProcIO;
-class KProcess;
+class TDEProcess;
 class KSpellDlg;
 
 /**
@@ -227,7 +227,7 @@ public:
    * After calling checkWord, you can use this to get the dialog box's
    *  result code.
    * The possible
-   *  values are (from kspelldlg.h):
+   *  values are (from tdespelldlg.h):
    *    @li KS_CANCEL
    *    @li KS_REPLACE
    *    @li KS_REPLACEALL
@@ -461,9 +461,9 @@ protected slots:
   void suggestWord( KProcIO * );
 
   void slotStopCancel (int);
-  void ispellExit (KProcess *);
+  void ispellExit (TDEProcess *);
   void emitDeath();
-  void ispellErrors (KProcess *, char *, int);
+  void ispellErrors (TDEProcess *, char *, int);
   void checkNext();
 
 private slots:
diff --git a/tdeui/kspelldlg.cpp b/tdeui/tdespelldlg.cpp
index d21b6975e..9e8206505 100644
--- a/tdeui/kspelldlg.cpp
+++ b/tdeui/tdespelldlg.cpp
@@ -24,11 +24,11 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
-#include <klocale.h>
-#include <klistbox.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kprogress.h>
@@ -36,8 +36,8 @@
 #include <kdebug.h>
 
 #include "ksconfig.h"
-#include "kspelldlg.h"
-#include "kspellui.h"
+#include "tdespelldlg.h"
+#include "tdespellui.h"
 
 //to initially disable sorting in the suggestions listview
 #define NONSORTINGCOLUMN 2
@@ -99,7 +99,7 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b
   connect( d->spellConfig, TQT_SIGNAL(configChanged()),
            TQT_SLOT(slotConfigChanged()) );
 
-  setHelp( "spelldlg", "kspell" );
+  setHelp( "spelldlg", "tdespell" );
   setMinimumSize( sizeHint() );
   emit ready( false );
 }
@@ -282,4 +282,4 @@ KSpellDlg::slotConfigChanged()
   done( KS_CONFIG );
 }
 
-#include "kspelldlg.moc"
+#include "tdespelldlg.moc"
diff --git a/tdeui/kspelldlg.h b/tdeui/tdespelldlg.h
index c42476814..9b0da8205 100644
--- a/tdeui/kspelldlg.h
+++ b/tdeui/tdespelldlg.h
@@ -26,7 +26,7 @@ class TQStringList;
 class TQLabel;
 class TQListViewItem;
 class TQPushButton;
-class KListBox;
+class TDEListBox;
 class KLineEdit;
 class KProgress;
 
@@ -51,7 +51,7 @@ class TDEUI_EXPORT KSpellDlg : public KDialogBase
   KSpellDlgPrivate *d;
   KLineEdit *editbox;
   KProgress *progbar;
-  KListBox *listbox;
+  TDEListBox *listbox;
   TQStringList *sugg;
   TQPushButton *qpbrep, *qpbrepa;
   TQLabel *wordlabel;
diff --git a/tdeui/kspellui.ui b/tdeui/tdespellui.ui
index ac1deecd7..ac1deecd7 100644
--- a/tdeui/kspellui.ui
+++ b/tdeui/tdespellui.ui
diff --git a/tdeui/ktoolbar.cpp b/tdeui/tdetoolbar.cpp
index 32e5b9f14..a3ced3a19 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -42,25 +42,25 @@
 #include <tqstyle.h>
 #include <tqlayout.h>
 
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
 #include <klineedit.h>
 #include <kseparator.h>
-#include <klocale.h>
-#include <kapplication.h>
-#include <kaction.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kanimwidget.h>
 #include <kedittoolbar.h>
 #include <kipc.h>
 #include <twin.h>
 #include <kdebug.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 enum {
     CONTEXT_TOP = 0,
@@ -76,12 +76,12 @@ enum {
     CONTEXT_ICONSIZES = 50 // starting point for the icon size list, put everything else before
 };
 
-class KToolBarPrivate
+class TDEToolBarPrivate
 {
 public:
-    KToolBarPrivate() {
+    TDEToolBarPrivate() {
         m_iconSize     = 0;
-        m_iconText     = KToolBar::IconOnly;
+        m_iconText     = TDEToolBar::IconOnly;
         m_highlight    = true;
         m_transparent  = true;
         m_honorStyle   = false;
@@ -105,7 +105,7 @@ public:
     }
 
     int m_iconSize;
-    KToolBar::IconText m_iconText;
+    TDEToolBar::IconText m_iconText;
     bool m_highlight : 1;
     bool m_transparent : 1;
     bool m_honorStyle : 1;
@@ -144,7 +144,7 @@ public:
    TQPtrList<TQWidget> idleButtons;
 };
 
-KToolBarSeparator::KToolBarSeparator(Orientation o , bool l, TQToolBar *parent,
+TDEToolBarSeparator::TDEToolBarSeparator(Orientation o , bool l, TQToolBar *parent,
                                      const char* name )
     :TQFrame( parent, name ), line( l )
 {
@@ -155,13 +155,13 @@ KToolBarSeparator::KToolBarSeparator(Orientation o , bool l, TQToolBar *parent,
     setBackgroundOrigin( ParentOrigin );
 }
 
-void KToolBarSeparator::setOrientation( Orientation o )
+void TDEToolBarSeparator::setOrientation( Orientation o )
 {
     orient = o;
     setFrameStyle( NoFrame );
 }
 
-void KToolBarSeparator::drawContents( TQPainter* p )
+void TDEToolBarSeparator::drawContents( TQPainter* p )
 {
     if ( line ) {
         TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -176,23 +176,23 @@ void KToolBarSeparator::drawContents( TQPainter* p )
     }
 }
 
-void KToolBarSeparator::styleChange( TQStyle& )
+void TDEToolBarSeparator::styleChange( TQStyle& )
 {
     setOrientation( orient );
 }
 
-TQSize KToolBarSeparator::sizeHint() const
+TQSize TDEToolBarSeparator::sizeHint() const
 {
     int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
     return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
 }
 
-TQSizePolicy KToolBarSeparator::sizePolicy() const
+TQSizePolicy TDEToolBarSeparator::sizePolicy() const
 {
     return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
 }
 
-KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig )
+TDEToolBar::TDEToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig )
     : TQToolBar( TQString::fromLatin1( name ),
       tqt_dynamic_cast<TQMainWindow*>(parent),
       parent, false,
@@ -201,7 +201,7 @@ KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool re
     init( readConfig, honorStyle );
 }
 
-KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
+TDEToolBar::TDEToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
     : TQToolBar( TQString::fromLatin1( name ),
       parentWindow, dock, newLine,
       name ? name : "mainToolBar")
@@ -209,7 +209,7 @@ KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock,
     init( readConfig, honorStyle );
 }
 
-KToolBar::KToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
+TDEToolBar::TDEToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
     : TQToolBar( TQString::fromLatin1( name ),
       parentWindow, dock, newLine,
       name ? name : "mainToolBar")
@@ -217,15 +217,15 @@ KToolBar::KToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine, co
     init( readConfig, honorStyle );
 }
 
-KToolBar::~KToolBar()
+TDEToolBar::~TDEToolBar()
 {
     emit toolbarDestroyed();
     delete d;
 }
 
-void KToolBar::init( bool readConfig, bool honorStyle )
+void TDEToolBar::init( bool readConfig, bool honorStyle )
 {
-    d = new KToolBarPrivate;
+    d = new TDEToolBarPrivate;
     setFullSize( true );
     d->m_honorStyle = honorStyle;
     context = 0;
@@ -254,10 +254,10 @@ void KToolBar::init( bool readConfig, bool honorStyle )
     connect( this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(rebuildLayout()) );
 }
 
-int KToolBar::insertButton(const TQString& icon, int id, bool enabled,
-                            const TQString& text, int index, KInstance *_instance )
+int TDEToolBar::insertButton(const TQString& icon, int id, bool enabled,
+                            const TQString& text, int index, TDEInstance *_instance )
 {
-    KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance );
+    TDEToolBarButton *button = new TDEToolBarButton( icon, id, this, 0, text, _instance );
 
     insertWidgetInternal( button, index, id );
     button->setEnabled( enabled );
@@ -266,11 +266,11 @@ int KToolBar::insertButton(const TQString& icon, int id, bool enabled,
 }
 
 
-int KToolBar::insertButton(const TQString& icon, int id, const char *signal,
+int TDEToolBar::insertButton(const TQString& icon, int id, const char *signal,
                             const TQObject *receiver, const char *slot,
-                            bool enabled, const TQString& text, int index, KInstance *_instance )
+                            bool enabled, const TQString& text, int index, TDEInstance *_instance )
 {
-    KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance);
+    TDEToolBarButton *button = new TDEToolBarButton( icon, id, this, 0, text, _instance);
     insertWidgetInternal( button, index, id );
     button->setEnabled( enabled );
     connect( button, signal, receiver, slot );
@@ -279,10 +279,10 @@ int KToolBar::insertButton(const TQString& icon, int id, const char *signal,
 }
 
 
-int KToolBar::insertButton(const TQPixmap& pixmap, int id, bool enabled,
+int TDEToolBar::insertButton(const TQPixmap& pixmap, int id, bool enabled,
                             const TQString& text, int index )
 {
-    KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text);
+    TDEToolBarButton *button = new TDEToolBarButton( pixmap, id, this, 0, text);
     insertWidgetInternal( button, index, id );
     button->setEnabled( enabled );
     doConnections( button );
@@ -290,12 +290,12 @@ int KToolBar::insertButton(const TQPixmap& pixmap, int id, bool enabled,
 }
 
 
-int KToolBar::insertButton(const TQPixmap& pixmap, int id, const char *signal,
+int TDEToolBar::insertButton(const TQPixmap& pixmap, int id, const char *signal,
                             const TQObject *receiver, const char *slot,
                             bool enabled, const TQString& text,
                             int index )
 {
-    KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text);
+    TDEToolBarButton *button = new TDEToolBarButton( pixmap, id, this, 0, text);
     insertWidgetInternal( button, index, id );
     button->setEnabled( enabled );
     connect( button, signal, receiver, slot );
@@ -304,10 +304,10 @@ int KToolBar::insertButton(const TQPixmap& pixmap, int id, const char *signal,
 }
 
 
-int KToolBar::insertButton(const TQString& icon, int id, TQPopupMenu *popup,
+int TDEToolBar::insertButton(const TQString& icon, int id, TQPopupMenu *popup,
                             bool enabled, const TQString &text, int index )
 {
-    KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text );
+    TDEToolBarButton *button = new TDEToolBarButton( icon, id, this, 0, text );
     insertWidgetInternal( button, index, id );
     button->setEnabled( enabled );
     button->setPopup( popup );
@@ -316,10 +316,10 @@ int KToolBar::insertButton(const TQString& icon, int id, TQPopupMenu *popup,
 }
 
 
-int KToolBar::insertButton(const TQPixmap& pixmap, int id, TQPopupMenu *popup,
+int TDEToolBar::insertButton(const TQPixmap& pixmap, int id, TQPopupMenu *popup,
                             bool enabled, const TQString &text, int index )
 {
-    KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text );
+    TDEToolBarButton *button = new TDEToolBarButton( pixmap, id, this, 0, text );
     insertWidgetInternal( button, index, id );
     button->setEnabled( enabled );
     button->setPopup( popup );
@@ -328,7 +328,7 @@ int KToolBar::insertButton(const TQPixmap& pixmap, int id, TQPopupMenu *popup,
 }
 
 
-int KToolBar::insertLined (const TQString& text, int id,
+int TDEToolBar::insertLined (const TQString& text, int id,
                             const char *signal,
                             const TQObject *receiver, const char *slot,
                             bool enabled ,
@@ -347,7 +347,7 @@ int KToolBar::insertLined (const TQString& text, int id,
     return index;
 }
 
-int KToolBar::insertCombo (const TQStringList &list, int id, bool writable,
+int TDEToolBar::insertCombo (const TQStringList &list, int id, bool writable,
                             const char *signal, const TQObject *receiver,
                             const char *slot, bool enabled,
                             const TQString& tooltiptext,
@@ -371,7 +371,7 @@ int KToolBar::insertCombo (const TQStringList &list, int id, bool writable,
 }
 
 
-int KToolBar::insertCombo (const TQString& text, int id, bool writable,
+int TDEToolBar::insertCombo (const TQString& text, int id, bool writable,
                             const char *signal, TQObject *receiver,
                             const char *slot, bool enabled,
                             const TQString& tooltiptext,
@@ -391,29 +391,29 @@ int KToolBar::insertCombo (const TQString& text, int id, bool writable,
     return index;
 }
 
-int KToolBar::insertSeparator(int index, int id)
+int TDEToolBar::insertSeparator(int index, int id)
 {
-    TQWidget *w = new KToolBarSeparator( orientation(), false, this, "tool bar separator" );
+    TQWidget *w = new TDEToolBarSeparator( orientation(), false, this, "tool bar separator" );
     insertWidgetInternal( w, index, id );
     return index;
 }
 
-int KToolBar::insertLineSeparator(int index, int id)
+int TDEToolBar::insertLineSeparator(int index, int id)
 {
-    TQWidget *w = new KToolBarSeparator( orientation(), true, this, "tool bar separator" );
+    TQWidget *w = new TDEToolBarSeparator( orientation(), true, this, "tool bar separator" );
     insertWidgetInternal( w, index, id );
     return index;
 }
 
 
-int KToolBar::insertWidget(int id, int /*width*/, TQWidget *widget, int index)
+int TDEToolBar::insertWidget(int id, int /*width*/, TQWidget *widget, int index)
 {
     removeWidgetInternal( widget ); // in case we already have it ?
     insertWidgetInternal( widget, index, id );
     return index;
 }
 
-int KToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slot,
+int TDEToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slot,
                                     const TQString& icons, int index )
 {
     KAnimWidget *anim = new KAnimWidget( icons, d->m_iconSize, this );
@@ -425,7 +425,7 @@ int KToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slot,
     return index;
 }
 
-KAnimWidget *KToolBar::animatedWidget( int id )
+KAnimWidget *TDEToolBar::animatedWidget( int id )
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
@@ -453,7 +453,7 @@ KAnimWidget *KToolBar::animatedWidget( int id )
 }
 
 
-void KToolBar::addConnection (int id, const char *signal,
+void TDEToolBar::addConnection (int id, const char *signal,
                                const TQObject *receiver, const char *slot)
 {
     TQWidget* w = getWidget( id );
@@ -461,7 +461,7 @@ void KToolBar::addConnection (int id, const char *signal,
         connect( w, signal, receiver, slot );
 }
 
-void KToolBar::setItemEnabled( int id, bool enabled )
+void TDEToolBar::setItemEnabled( int id, bool enabled )
 {
     TQWidget* w = getWidget( id );
     if ( w )
@@ -469,77 +469,77 @@ void KToolBar::setItemEnabled( int id, bool enabled )
 }
 
 
-void KToolBar::setButtonPixmap( int id, const TQPixmap& _pixmap )
+void TDEToolBar::setButtonPixmap( int id, const TQPixmap& _pixmap )
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if ( button )
         button->setPixmap( _pixmap );
 }
 
 
-void KToolBar::setButtonIcon( int id, const TQString& _icon )
+void TDEToolBar::setButtonIcon( int id, const TQString& _icon )
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if ( button )
         button->setIcon( _icon );
 }
 
-void KToolBar::setButtonIconSet( int id, const TQIconSet& iconset )
+void TDEToolBar::setButtonIconSet( int id, const TQIconSet& iconset )
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if ( button )
         button->setIconSet( iconset );
 }
 
 
-void KToolBar::setDelayedPopup (int id , TQPopupMenu *_popup, bool toggle )
+void TDEToolBar::setDelayedPopup (int id , TQPopupMenu *_popup, bool toggle )
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if ( button )
         button->setDelayedPopup( _popup, toggle );
 }
 
 
-void KToolBar::setAutoRepeat (int id, bool flag)
+void TDEToolBar::setAutoRepeat (int id, bool flag)
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if ( button )
         button->setAutoRepeat( flag );
 }
 
 
-void KToolBar::setToggle (int id, bool flag )
+void TDEToolBar::setToggle (int id, bool flag )
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if ( button )
         button->setToggle( flag );
 }
 
 
-void KToolBar::toggleButton (int id)
+void TDEToolBar::toggleButton (int id)
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if ( button )
         button->toggle();
 }
 
 
-void KToolBar::setButton (int id, bool flag)
+void TDEToolBar::setButton (int id, bool flag)
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if ( button )
         button->on( flag );
 }
 
 
-bool KToolBar::isButtonOn (int id) const
+bool TDEToolBar::isButtonOn (int id) const
 {
-    KToolBarButton * button = const_cast<KToolBar*>( this )->getButton( id );
+    TDEToolBarButton * button = const_cast<TDEToolBar*>( this )->getButton( id );
     return button ? button->isOn() : false;
 }
 
 
-void KToolBar::setLinedText (int id, const TQString& text)
+void TDEToolBar::setLinedText (int id, const TQString& text)
 {
     KLineEdit * lineEdit = getLined( id );
     if ( lineEdit )
@@ -547,21 +547,21 @@ void KToolBar::setLinedText (int id, const TQString& text)
 }
 
 
-TQString KToolBar::getLinedText (int id) const
+TQString TDEToolBar::getLinedText (int id) const
 {
-    KLineEdit * lineEdit = const_cast<KToolBar*>( this )->getLined( id );
+    KLineEdit * lineEdit = const_cast<TDEToolBar*>( this )->getLined( id );
     return lineEdit ? lineEdit->text() : TQString::null;
 }
 
 
-void KToolBar::insertComboItem (int id, const TQString& text, int index)
+void TDEToolBar::insertComboItem (int id, const TQString& text, int index)
 {
     KComboBox * comboBox = getCombo( id );
     if (comboBox)
         comboBox->insertItem( text, index );
 }
 
-void KToolBar::insertComboList (int id, const TQStringList &list, int index)
+void TDEToolBar::insertComboList (int id, const TQStringList &list, int index)
 {
     KComboBox * comboBox = getCombo( id );
     if (comboBox)
@@ -569,7 +569,7 @@ void KToolBar::insertComboList (int id, const TQStringList &list, int index)
 }
 
 
-void KToolBar::removeComboItem (int id, int index)
+void TDEToolBar::removeComboItem (int id, int index)
 {
     KComboBox * comboBox = getCombo( id );
     if (comboBox)
@@ -577,7 +577,7 @@ void KToolBar::removeComboItem (int id, int index)
 }
 
 
-void KToolBar::setCurrentComboItem (int id, int index)
+void TDEToolBar::setCurrentComboItem (int id, int index)
 {
     KComboBox * comboBox = getCombo( id );
     if (comboBox)
@@ -585,7 +585,7 @@ void KToolBar::setCurrentComboItem (int id, int index)
 }
 
 
-void KToolBar::changeComboItem  (int id, const TQString& text, int index)
+void TDEToolBar::changeComboItem  (int id, const TQString& text, int index)
 {
     KComboBox * comboBox = getCombo( id );
     if (comboBox)
@@ -593,7 +593,7 @@ void KToolBar::changeComboItem  (int id, const TQString& text, int index)
 }
 
 
-void KToolBar::clearCombo (int id)
+void TDEToolBar::clearCombo (int id)
 {
     KComboBox * comboBox = getCombo( id );
     if (comboBox)
@@ -601,14 +601,14 @@ void KToolBar::clearCombo (int id)
 }
 
 
-TQString KToolBar::getComboItem (int id, int index) const
+TQString TDEToolBar::getComboItem (int id, int index) const
 {
-    KComboBox * comboBox = const_cast<KToolBar*>( this )->getCombo( id );
+    KComboBox * comboBox = const_cast<TDEToolBar*>( this )->getCombo( id );
     return comboBox ? comboBox->text( index ) : TQString::null;
 }
 
 
-KComboBox * KToolBar::getCombo(int id)
+KComboBox * TDEToolBar::getCombo(int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
@@ -617,7 +617,7 @@ KComboBox * KToolBar::getCombo(int id)
 }
 
 
-KLineEdit * KToolBar::getLined (int id)
+KLineEdit * TDEToolBar::getLined (int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
@@ -626,16 +626,16 @@ KLineEdit * KToolBar::getLined (int id)
 }
 
 
-KToolBarButton * KToolBar::getButton (int id)
+TDEToolBarButton * TDEToolBar::getButton (int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    return tqt_dynamic_cast<KToolBarButton *>( *it );
+    return tqt_dynamic_cast<TDEToolBarButton *>( *it );
 }
 
 
-void KToolBar::alignItemRight (int id, bool right )
+void TDEToolBar::alignItemRight (int id, bool right )
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
@@ -647,14 +647,14 @@ void KToolBar::alignItemRight (int id, bool right )
 }
 
 
-TQWidget *KToolBar::getWidget (int id)
+TQWidget *TDEToolBar::getWidget (int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     return ( it == id2widget.end() ) ? 0 : (*it);
 }
 
 
-void KToolBar::setItemAutoSized (int id, bool yes )
+void TDEToolBar::setItemAutoSized (int id, bool yes )
 {
     TQWidget *w = getWidget(id);
     if ( w && yes )
@@ -662,7 +662,7 @@ void KToolBar::setItemAutoSized (int id, bool yes )
 }
 
 
-void KToolBar::clear ()
+void TDEToolBar::clear ()
 {
     /* Delete any idle buttons, so TQToolBar doesn't delete them itself, making a mess */
     for(TQWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next())
@@ -675,12 +675,12 @@ void KToolBar::clear ()
 }
 
 
-void KToolBar::removeItem(int id)
+void TDEToolBar::removeItem(int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
     {
-        kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl;
+        kdDebug(220) << name() << " TDEToolBar::removeItem item " << id << " not found" << endl;
         return;
     }
     TQWidget * w = (*it);
@@ -691,12 +691,12 @@ void KToolBar::removeItem(int id)
 }
 
 
-void KToolBar::removeItemDelayed(int id)
+void TDEToolBar::removeItemDelayed(int id)
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
     {
-        kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl;
+        kdDebug(220) << name() << " TDEToolBar::removeItem item " << id << " not found" << endl;
         return;
     }
     TQWidget * w = (*it);
@@ -710,7 +710,7 @@ void KToolBar::removeItemDelayed(int id)
 }
 
 
-void KToolBar::hideItem (int id)
+void TDEToolBar::hideItem (int id)
 {
     TQWidget *w = getWidget(id);
     if ( w )
@@ -718,7 +718,7 @@ void KToolBar::hideItem (int id)
 }
 
 
-void KToolBar::showItem (int id)
+void TDEToolBar::showItem (int id)
 {
     TQWidget *w = getWidget(id);
     if ( w )
@@ -726,38 +726,38 @@ void KToolBar::showItem (int id)
 }
 
 
-int KToolBar::itemIndex (int id)
+int TDEToolBar::itemIndex (int id)
 {
     TQWidget *w = getWidget(id);
     return w ? widgets.findRef(w) : -1;
 }
 
-int KToolBar::idAt (int index)
+int TDEToolBar::idAt (int index)
 {
     TQWidget *w = widgets.at(index);
     return widget2id[w];
 }
 
-void KToolBar::setFullSize(bool flag )
+void TDEToolBar::setFullSize(bool flag )
 {
     setHorizontalStretchable( flag );
     setVerticalStretchable( flag );
 }
 
 
-bool KToolBar::fullSize() const
+bool TDEToolBar::fullSize() const
 {
     return isHorizontalStretchable() || isVerticalStretchable();
 }
 
 
-void KToolBar::enableMoving(bool flag )
+void TDEToolBar::enableMoving(bool flag )
 {
     setMovingEnabled(flag);
 }
 
 
-void KToolBar::setBarPos (BarPosition bpos)
+void TDEToolBar::setBarPos (BarPosition bpos)
 {
     if ( !mainWindow() )
         return;
@@ -766,22 +766,22 @@ void KToolBar::setBarPos (BarPosition bpos)
 }
 
 
-KToolBar::BarPosition KToolBar::barPos() const
+TDEToolBar::BarPosition TDEToolBar::barPos() const
 {
     if ( !this->mainWindow() )
-        return place() == TQDockWindow::InDock ? KToolBar::Top : KToolBar::Floating;
+        return place() == TQDockWindow::InDock ? TDEToolBar::Top : TDEToolBar::Floating;
     Dock dock;
     int dm1, dm2;
     bool dm3;
     this->mainWindow()->getLocation( (TQToolBar*)this, dock, dm1, dm3, dm2 );
     if ( dock == DockUnmanaged ) {
-        return (KToolBar::BarPosition)DockTop;
+        return (TDEToolBar::BarPosition)DockTop;
     }
     return (BarPosition)dock;
 }
 
 
-bool KToolBar::enable(BarStatus stat)
+bool TDEToolBar::enable(BarStatus stat)
 {
     bool mystat = isVisible();
 
@@ -794,47 +794,47 @@ bool KToolBar::enable(BarStatus stat)
 }
 
 
-void KToolBar::setMaxHeight ( int h )
+void TDEToolBar::setMaxHeight ( int h )
 {
     setMaximumHeight( h );
 }
 
-int KToolBar::maxHeight()
+int TDEToolBar::maxHeight()
 {
     return maximumHeight();
 }
 
 
-void KToolBar::setMaxWidth (int dw)
+void TDEToolBar::setMaxWidth (int dw)
 {
     setMaximumWidth( dw );
 }
 
 
-int KToolBar::maxWidth()
+int TDEToolBar::maxWidth()
 {
     return maximumWidth();
 }
 
 
-void KToolBar::setTitle (const TQString& _title)
+void TDEToolBar::setTitle (const TQString& _title)
 {
     setLabel( _title );
 }
 
 
-void KToolBar::enableFloating (bool )
+void TDEToolBar::enableFloating (bool )
 {
 }
 
 
-void KToolBar::setIconText(IconText it)
+void TDEToolBar::setIconText(IconText it)
 {
     setIconText( it, true );
 }
 
 
-void KToolBar::setIconText(IconText icontext, bool update)
+void TDEToolBar::setIconText(IconText icontext, bool update)
 {
     bool doUpdate=false;
 
@@ -865,18 +865,18 @@ void KToolBar::setIconText(IconText icontext, bool update)
 }
 
 
-KToolBar::IconText KToolBar::iconText() const
+TDEToolBar::IconText TDEToolBar::iconText() const
 {
     return d->m_iconText;
 }
 
 
-void KToolBar::setIconSize(int size)
+void TDEToolBar::setIconSize(int size)
 {
     setIconSize( size, true );
 }
 
-void KToolBar::setIconSize(int size, bool update)
+void TDEToolBar::setIconSize(int size, bool update)
 {
     bool doUpdate=false;
 
@@ -902,7 +902,7 @@ void KToolBar::setIconSize(int size, bool update)
     }
 }
 
-int KToolBar::iconSize() const
+int TDEToolBar::iconSize() const
 {
     if ( !d->m_iconSize ) // default value?
 		return iconSizeDefault();
@@ -910,35 +910,35 @@ int KToolBar::iconSize() const
 	return d->m_iconSize;
 }
 
-int KToolBar::iconSizeDefault() const
+int TDEToolBar::iconSizeDefault() const
 {
 	if (!::qstrcmp(name(), "mainToolBar"))
-		return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar);
+		return TDEGlobal::iconLoader()->currentSize(TDEIcon::MainToolbar);
 
-	return KGlobal::iconLoader()->currentSize(KIcon::Toolbar);
+	return TDEGlobal::iconLoader()->currentSize(TDEIcon::Toolbar);
 }
 
-void KToolBar::setEnableContextMenu(bool enable )
+void TDEToolBar::setEnableContextMenu(bool enable )
 {
     d->m_enableContext = enable;
 }
 
 
-bool KToolBar::contextMenuEnabled() const
+bool TDEToolBar::contextMenuEnabled() const
 {
     return d->m_enableContext;
 }
 
 
-void KToolBar::setItemNoStyle(int id, bool no_style )
+void TDEToolBar::setItemNoStyle(int id, bool no_style )
 {
-    KToolBarButton * button = getButton( id );
+    TDEToolBarButton * button = getButton( id );
     if (button)
         button->setNoStyle( no_style );
 }
 
 
-void KToolBar::setFlat (bool flag)
+void TDEToolBar::setFlat (bool flag)
 {
     if ( !mainWindow() )
         return;
@@ -947,19 +947,19 @@ void KToolBar::setFlat (bool flag)
     else
         mainWindow()->moveDockWindow( this, DockTop );
     // And remember to save the new look later
-    KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
 
 
-int KToolBar::count() const
+int TDEToolBar::count() const
 {
     return id2widget.count();
 }
 
 
-void KToolBar::saveState()
+void TDEToolBar::saveState()
 {
     // first, try to save to the xml file
     if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() ) {
@@ -1020,12 +1020,12 @@ void KToolBar::saveState()
     }
 
     // if that didn't work, we save to the config file
-    KConfig *config = KGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     saveSettings(config, TQString::null);
     config->sync();
 }
 
-TQString KToolBar::settingsGroup() const
+TQString TDEToolBar::settingsGroup() const
 {
     TQString configGroup;
     if (!::qstrcmp(name(), "unnamed") || !::qstrcmp(name(), "mainToolBar"))
@@ -1040,7 +1040,7 @@ TQString KToolBar::settingsGroup() const
     return configGroup;
 }
 
-void KToolBar::saveSettings(KConfig *config, const TQString &_configGroup)
+void TDEToolBar::saveSettings(TDEConfig *config, const TQString &_configGroup)
 {
     TQString configGroup = _configGroup;
     if (configGroup.isEmpty())
@@ -1053,7 +1053,7 @@ void KToolBar::saveSettings(KConfig *config, const TQString &_configGroup)
 
     //kdDebug(220) << name() << "                position=" << position << " index=" << index << " offset=" << offset() << " newLine=" << newLine() << endl;
 
-    KConfigGroupSaver saver(config, configGroup);
+    TDEConfigGroupSaver saver(config, configGroup);
 
     if(!config->hasDefault("Position") && position == d->PositionDefault )
       config->revertToDefault("Position");
@@ -1093,22 +1093,22 @@ void KToolBar::saveSettings(KConfig *config, const TQString &_configGroup)
     // reappear at the same position the next time.
     // The whole set of indexes has to be saved.
     //kdDebug(220) << name() << "                writing index " << index << endl;
-    KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
     // don't save if there's only one toolbar
 
     // Don't use kmw->toolBarIterator() because you might
     // mess up someone else's iterator.  Make the list on your own
-    TQPtrList<KToolBar> toolbarList;
+    TQPtrList<TDEToolBar> toolbarList;
     TQPtrList<TQToolBar> lst;
     for ( int i = (int)TQMainWindow::DockUnmanaged; i <= (int)DockMinimized; ++i ) {
         lst = kmw->toolBars( (ToolBarDock)i );
         for ( TQToolBar *tb = lst.first(); tb; tb = lst.next() ) {
-            if ( !tb->inherits( "KToolBar" ) )
+            if ( !tb->inherits( "TDEToolBar" ) )
                 continue;
-            toolbarList.append( (KToolBar*)tb );
+            toolbarList.append( (TDEToolBar*)tb );
         }
     }
-    TQPtrListIterator<KToolBar> toolbarIterator( toolbarList );
+    TQPtrListIterator<TDEToolBar> toolbarIterator( toolbarList );
     if ( !kmw || toolbarIterator.count() > 1 )
         config->writeEntry("Index", index);
     else
@@ -1126,24 +1126,24 @@ void KToolBar::saveSettings(KConfig *config, const TQString &_configGroup)
 }
 
 
-void KToolBar::setXMLGUIClient( KXMLGUIClient *client )
+void TDEToolBar::setXMLGUIClient( KXMLGUIClient *client )
 {
     d->m_xmlguiClient = client;
 }
 
-void KToolBar::setText( const TQString & txt )
+void TDEToolBar::setText( const TQString & txt )
 {
     setLabel( txt + " (" + kapp->caption() + ") " );
 }
 
 
-TQString KToolBar::text() const
+TQString TDEToolBar::text() const
 {
     return label();
 }
 
 
-void KToolBar::doConnections( KToolBarButton *button )
+void TDEToolBar::doConnections( TDEToolBarButton *button )
 {
     connect(button, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL( clicked( int ) ) );
     connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL( doubleClicked( int ) ) );
@@ -1153,14 +1153,14 @@ void KToolBar::doConnections( KToolBarButton *button )
     connect(button, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SIGNAL( highlighted( int, bool ) ) );
 }
 
-void KToolBar::mousePressEvent ( TQMouseEvent *m )
+void TDEToolBar::mousePressEvent ( TQMouseEvent *m )
 {
     if ( !mainWindow() )
         return;
     TQMainWindow *mw = mainWindow();
     if ( mw->toolBarsMovable() && d->m_enableContext ) {
         if ( m->button() == Qt::RightButton ) {
-	    TQGuardedPtr<KToolBar> guard( this );
+	    TQGuardedPtr<TDEToolBar> guard( this );
             int i = contextMenu()->exec( m->globalPos(), 0 );
 	    // "Configure Toolbars" recreates toolbars, so we might not exist anymore.
 	    if ( guard )
@@ -1204,14 +1204,14 @@ void KToolBar::mousePressEvent ( TQMouseEvent *m )
                 else
                     return; // assume this was an action handled elsewhere, no need for setSettingsDirty()
             }
-            KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mw);
+            TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mw);
             if ( kmw )
                 kmw->setSettingsDirty();
         }
     }
 }
 
-void KToolBar::doModeChange()
+void TDEToolBar::doModeChange()
 {
     for(TQWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next())
        w->blockSignals(false);
@@ -1220,7 +1220,7 @@ void KToolBar::doModeChange()
     emit modechange();
 }
 
-void KToolBar::rebuildLayout()
+void TDEToolBar::rebuildLayout()
 { 
     for(TQWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next())
        w->blockSignals(false);
@@ -1238,7 +1238,7 @@ void KToolBar::rebuildLayout()
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
         if ( w == rightAligned )
             continue;
-        KToolBarSeparator *ktbs = tqt_dynamic_cast<KToolBarSeparator *>(w);
+        TDEToolBarSeparator *ktbs = tqt_dynamic_cast<TDEToolBarSeparator *>(w);
         if ( ktbs && !ktbs->showLine() ) {
             l->addSpacing( orientation() == Qt::Vertical ? w->sizeHint().height() : w->sizeHint().width() );
             w->hide();
@@ -1267,7 +1267,7 @@ void KToolBar::rebuildLayout()
     TQApplication::postEvent( this, new TQEvent( TQEvent::LayoutHint ) );
 }
 
-void KToolBar::childEvent( TQChildEvent *e )
+void TDEToolBar::childEvent( TQChildEvent *e )
 {
     if ( e->child()->isWidgetType() ) {
         TQWidget * w = tqt_dynamic_cast<TQWidget *>(e->child());
@@ -1304,7 +1304,7 @@ void KToolBar::childEvent( TQChildEvent *e )
     TQToolBar::childEvent( e );
 }
 
-void KToolBar::insertWidgetInternal( TQWidget *w, int &index, int id )
+void TDEToolBar::insertWidgetInternal( TQWidget *w, int &index, int id )
 {
     // we can't have it in widgets, or something is really wrong
     //widgets.removeRef( w );
@@ -1323,19 +1323,19 @@ void KToolBar::insertWidgetInternal( TQWidget *w, int &index, int id )
     widget2id.insert( w, id );
 }
 
-void KToolBar::showEvent( TQShowEvent *e )
+void TDEToolBar::showEvent( TQShowEvent *e )
 {
     TQToolBar::showEvent( e );
     rebuildLayout();
 }
 
-void KToolBar::setStretchableWidget( TQWidget *w )
+void TDEToolBar::setStretchableWidget( TQWidget *w )
 {
     TQToolBar::setStretchableWidget( w );
     stretchableWidget = w;
 }
 
-TQSizePolicy KToolBar::sizePolicy() const
+TQSizePolicy TDEToolBar::sizePolicy() const
 {
     if ( orientation() == Qt::Horizontal )
         return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
@@ -1343,18 +1343,18 @@ TQSizePolicy KToolBar::sizePolicy() const
         return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
 }
 
-TQSize KToolBar::sizeHint() const
+TQSize TDEToolBar::sizeHint() const
 {
     TQSize minSize(0,0);
-    KToolBar *ncThis = const_cast<KToolBar *>(this);
+    TDEToolBar *ncThis = const_cast<TDEToolBar *>(this);
 
     ncThis->polish();
 
     int margin = static_cast<TQWidget*>(ncThis)->layout()->margin() + frameWidth();
     switch( barPos() )
     {
-     case KToolBar::Top:
-     case KToolBar::Bottom:
+     case TDEToolBar::Top:
+     case TDEToolBar::Bottom:
        for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
        {
           TQSize sh = w->sizeHint();
@@ -1375,8 +1375,8 @@ TQSize KToolBar::sizeHint() const
        minSize += TQSize(margin*2, margin*2);
        break;
 
-     case KToolBar::Left:
-     case KToolBar::Right:
+     case TDEToolBar::Left:
+     case TDEToolBar::Right:
        for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
        {
           TQSize sh = w->sizeHint();
@@ -1401,32 +1401,32 @@ TQSize KToolBar::sizeHint() const
     return minSize;
 }
 
-TQSize KToolBar::minimumSize() const
+TQSize TDEToolBar::minimumSize() const
 {
     return minimumSizeHint();
 }
 
-TQSize KToolBar::minimumSizeHint() const
+TQSize TDEToolBar::minimumSizeHint() const
 {
     return sizeHint();
 }
 
-bool KToolBar::highlight() const
+bool TDEToolBar::highlight() const
 {
     return d->m_highlight;
 }
 
-void KToolBar::hide()
+void TDEToolBar::hide()
 {
     TQToolBar::hide();
 }
 
-void KToolBar::show()
+void TDEToolBar::show()
 {
     TQToolBar::show();
 }
 
-void KToolBar::resizeEvent( TQResizeEvent *e )
+void TDEToolBar::resizeEvent( TQResizeEvent *e )
 {
     bool b = isUpdatesEnabled();
     setUpdatesEnabled( false );
@@ -1445,16 +1445,16 @@ void KToolBar::resizeEvent( TQResizeEvent *e )
       }
     }
 //     else {
-//         printf("[WARNING] In KToolBar::resizeEvent, but this code block should not be executing.  Preventing toolbar lockup.  [Code 0045]\n\r");
+//         printf("[WARNING] In TDEToolBar::resizeEvent, but this code block should not be executing.  Preventing toolbar lockup.  [Code 0045]\n\r");
 //         setUpdatesEnabled( true );
 //     }
 }
 
-void KToolBar::slotIconChanged(int group)
+void TDEToolBar::slotIconChanged(int group)
 {
-    if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar))
+    if ((group != TDEIcon::Toolbar) && (group != TDEIcon::MainToolbar))
         return;
-    if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar"))
+    if ((group == TDEIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar"))
         return;
 
     doModeChange();
@@ -1463,48 +1463,48 @@ void KToolBar::slotIconChanged(int group)
         updateGeometry();
 }
 
-void KToolBar::slotReadConfig()
+void TDEToolBar::slotReadConfig()
 {
     //kdDebug(220) << name() << " slotReadConfig" << endl;
     // Read appearance settings (hmm, we used to do both here,
     // but a well behaved application will call applyMainWindowSettings
     // anyway, right ?)
-    applyAppearanceSettings(KGlobal::config(), TQString::null );
+    applyAppearanceSettings(TDEGlobal::config(), TQString::null );
 }
 
-void KToolBar::slotAppearanceChanged()
+void TDEToolBar::slotAppearanceChanged()
 {
     // Read appearance settings from global file.
-    applyAppearanceSettings(KGlobal::config(), TQString::null, true /* lose local settings */ );
+    applyAppearanceSettings(TDEGlobal::config(), TQString::null, true /* lose local settings */ );
 
     // And remember to save the new look later
-    KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
 
 //static
-bool KToolBar::highlightSetting()
+bool TDEToolBar::highlightSetting()
 {
     TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
-    KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
-    return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true);
+    TDEConfigGroupSaver saver(TDEGlobal::config(), grpToolbar);
+    return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true);
 }
 
 //static
-bool KToolBar::transparentSetting()
+bool TDEToolBar::transparentSetting()
 {
     TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
-    KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
-    return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true);
+    TDEConfigGroupSaver saver(TDEGlobal::config(), grpToolbar);
+    return TDEGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true);
 }
 
 //static
-KToolBar::IconText KToolBar::iconTextSetting()
+TDEToolBar::IconText TDEToolBar::iconTextSetting()
 {
     TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
-    KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
-    TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly"));
+    TDEConfigGroupSaver saver(TDEGlobal::config(), grpToolbar);
+    TQString icontext = TDEGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly"));
     if ( icontext == "IconTextRight" )
         return IconTextRight;
     else if ( icontext == "IconTextBottom" )
@@ -1515,7 +1515,7 @@ KToolBar::IconText KToolBar::iconTextSetting()
         return IconOnly;
 }
 
-void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configGroup, bool forceGlobal)
+void TDEToolBar::applyAppearanceSettings(TDEConfig *config, const TQString &_configGroup, bool forceGlobal)
 {
     TQString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup;
     //kdDebug(220) << name() << " applyAppearanceSettings: configGroup=" << configGroup << " forceGlobal=" << forceGlobal << endl;
@@ -1527,12 +1527,12 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG
     // This is the reason for the xmlgui tests below.
     bool xmlgui = d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty();
 
-    KConfig *gconfig = KGlobal::config();
+    TDEConfig *gconfig = TDEGlobal::config();
 
-    static const TQString &attrIconText  = KGlobal::staticQString("IconText");
-    static const TQString &attrHighlight = KGlobal::staticQString("Highlighting");
-    static const TQString &attrTrans     = KGlobal::staticQString("TransparentMoving");
-    static const TQString &attrIconSize  = KGlobal::staticQString("IconSize");
+    static const TQString &attrIconText  = TDEGlobal::staticQString("IconText");
+    static const TQString &attrHighlight = TDEGlobal::staticQString("Highlighting");
+    static const TQString &attrTrans     = TDEGlobal::staticQString("TransparentMoving");
+    static const TQString &attrIconSize  = TDEGlobal::staticQString("IconSize");
 
     // we actually do this in two steps.
     // First, we read in the global styles [Toolbar style] (from the KControl module).
@@ -1547,8 +1547,8 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG
 
     // this is the first iteration
     TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
-    { // start block for KConfigGroupSaver
-        KConfigGroupSaver saver(gconfig, grpToolbar);
+    { // start block for TDEConfigGroupSaver
+        TDEConfigGroupSaver saver(gconfig, grpToolbar);
 
         // first, get the generic settings
         highlight   = gconfig->readBoolEntry(attrHighlight, true);
@@ -1590,7 +1590,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG
         }
 
         // revert back to the old group
-    } // end block for KConfigGroupSaver
+    } // end block for TDEConfigGroupSaver
 
     bool doUpdate = false;
 
@@ -1637,12 +1637,12 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG
         updateGeometry();
 }
 
-void KToolBar::applySettings(KConfig *config, const TQString &_configGroup)
+void TDEToolBar::applySettings(TDEConfig *config, const TQString &_configGroup)
 {
     return applySettings(config,_configGroup,false);
 }
 
-void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool force)
+void TDEToolBar::applySettings(TDEConfig *config, const TQString &_configGroup, bool force)
 {
     //kdDebug(220) << name() << " applySettings group=" << _configGroup << endl;
 
@@ -1654,7 +1654,7 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool
        Global config / <appnamerc> user settings                        if no XMLGUI is used
        Global config / App-XML attributes / <appnamerc> user settings   if XMLGUI is used
 
-      So in the first case, we simply read everything from KConfig as below,
+      So in the first case, we simply read everything from TDEConfig as below,
       but in the second case we don't do anything here if there is no app-specific config,
       and the XMLGUI-related code (loadState()) uses the static methods of this class
       to get the global defaults.
@@ -1668,13 +1668,13 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool
     // ...and now the position stuff
     if ( config->hasGroup(configGroup) || force )
     {
-        KConfigGroupSaver cgs(config, configGroup);
+        TDEConfigGroupSaver cgs(config, configGroup);
 
-        static const TQString &attrPosition  = KGlobal::staticQString("Position");
-        static const TQString &attrIndex  = KGlobal::staticQString("Index");
-        static const TQString &attrOffset  = KGlobal::staticQString("Offset");
-        static const TQString &attrNewLine  = KGlobal::staticQString("NewLine");
-        static const TQString &attrHidden  = KGlobal::staticQString("Hidden");
+        static const TQString &attrPosition  = TDEGlobal::staticQString("Position");
+        static const TQString &attrIndex  = TDEGlobal::staticQString("Index");
+        static const TQString &attrOffset  = TDEGlobal::staticQString("Offset");
+        static const TQString &attrNewLine  = TDEGlobal::staticQString("NewLine");
+        static const TQString &attrHidden  = TDEGlobal::staticQString("Hidden");
 
         TQString position = config->readEntry(attrPosition, d->PositionDefault);
         int index = config->readNumEntry(attrIndex, -1);
@@ -1705,7 +1705,7 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool
         if ( mainWindow() )
         {
             //kdDebug(220) << name() << " applySettings updating ToolbarInfo" << endl;
-            d->toolBarInfo = KToolBarPrivate::ToolBarInfo( pos, index, newLine, offset );
+            d->toolBarInfo = TDEToolBarPrivate::ToolBarInfo( pos, index, newLine, offset );
             positionYourself( true );
         }
         if (isVisible ())
@@ -1713,7 +1713,7 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool
     }
 }
 
-bool KToolBar::event( TQEvent *e )
+bool TDEToolBar::event( TQEvent *e )
 {
     if ( (e->type() == TQEvent::LayoutHint) && isUpdatesEnabled() )
        d->repaintTimer.start( 100, true );
@@ -1730,7 +1730,7 @@ bool KToolBar::event( TQEvent *e )
     return TQToolBar::event( e );
 }
 
-void KToolBar::slotRepaint()
+void TDEToolBar::slotRepaint()
 {
     setUpdatesEnabled( false );
     // Send a resizeEvent to update the "toolbar extension arrow"
@@ -1743,40 +1743,40 @@ void KToolBar::slotRepaint()
     repaint( true );
 }
 
-void KToolBar::toolBarPosChanged( TQToolBar *tb )
+void TDEToolBar::toolBarPosChanged( TQToolBar *tb )
 {
     if ( tb != this )
         return;
     if ( d->oldPos == DockMinimized )
         rebuildLayout();
     d->oldPos = (TQMainWindow::ToolBarDock)barPos();
-    KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
 
-static KToolBar::Dock stringToDock( const TQString& attrPosition )
+static TDEToolBar::Dock stringToDock( const TQString& attrPosition )
 {
-    KToolBar::Dock dock = KToolBar::DockTop;
+    TDEToolBar::Dock dock = TDEToolBar::DockTop;
     if ( !attrPosition.isEmpty() ) {
         if ( attrPosition == "top" )
-            dock = KToolBar::DockTop;
+            dock = TDEToolBar::DockTop;
         else if ( attrPosition == "left" )
-            dock = KToolBar::DockLeft;
+            dock = TDEToolBar::DockLeft;
         else if ( attrPosition == "right" )
-            dock = KToolBar::DockRight;
+            dock = TDEToolBar::DockRight;
         else if ( attrPosition == "bottom" )
-            dock = KToolBar::DockBottom;
+            dock = TDEToolBar::DockBottom;
         else if ( attrPosition == "floating" )
-            dock = KToolBar::DockTornOff;
+            dock = TDEToolBar::DockTornOff;
         else if ( attrPosition == "flat" )
-            dock = KToolBar::DockMinimized;
+            dock = TDEToolBar::DockMinimized;
     }
     return dock;
 }
 
 
-void KToolBar::loadState( const TQDomElement &element )
+void TDEToolBar::loadState( const TQDomElement &element )
 {
     TQMainWindow *mw = mainWindow();
 
@@ -1801,9 +1801,9 @@ void KToolBar::loadState( const TQDomElement &element )
       This method is called in order to load toolbar settings from XML.
       However this can be used in two rather different cases:
       - for the initial loading of the app's XML. In that case the settings
-        are only the defaults, the user's KConfig settings will override them
+        are only the defaults, the user's TDEConfig settings will override them
         (KDE4 TODO: how about saving those user settings into the local XML file instead?
-        Then this whole thing would be simpler, no KConfig settings to apply afterwards.
+        Then this whole thing would be simpler, no TDEConfig settings to apply afterwards.
         OTOH we'd have to migrate those settings when the .rc version increases,
         like we do for shortcuts)
 
@@ -1834,13 +1834,13 @@ void KToolBar::loadState( const TQDomElement &element )
         if ( !attrIconText.isEmpty() ) {
             //kdDebug(220) << name() << " loadState attrIconText=" << attrIconText << endl;
             if ( attrIconText == "icontextright" )
-                setIconText( KToolBar::IconTextRight );
+                setIconText( TDEToolBar::IconTextRight );
             else if ( attrIconText == "textonly" )
-                setIconText( KToolBar::TextOnly );
+                setIconText( TDEToolBar::TextOnly );
             else if ( attrIconText == "icontextbottom" )
-                setIconText( KToolBar::IconTextBottom );
+                setIconText( TDEToolBar::IconTextBottom );
             else if ( attrIconText == "icononly" )
-                setIconText( KToolBar::IconOnly );
+                setIconText( TDEToolBar::IconOnly );
         } else
 	{
 	    //kdDebug(220) << name() << " loadState no iconText attribute in XML, using iconTextSetting=" << iconTextSetting() << endl;
@@ -1889,7 +1889,7 @@ void KToolBar::loadState( const TQDomElement &element )
         }
     }
 
-    d->toolBarInfo = KToolBarPrivate::ToolBarInfo( dock, index, newLine, offset );
+    d->toolBarInfo = TDEToolBarPrivate::ToolBarInfo( dock, index, newLine, offset );
     mw->addDockWindow( this, dock, newLine );
     mw->moveDockWindow( this, dock, newLine, index, offset );
 
@@ -1914,12 +1914,12 @@ void KToolBar::loadState( const TQDomElement &element )
 
     // Apply transparent-toolbar-moving setting (ok, this is global to the mainwindow,
     // but we do it only if there are toolbars...)
-    // KDE4: move to KMainWindow
+    // KDE4: move to TDEMainWindow
     if ( transparentSetting() != !mw->opaqueMoving() )
         mw->setOpaqueMoving( !transparentSetting() );
 }
 
-int KToolBar::dockWindowIndex()
+int TDEToolBar::dockWindowIndex()
 {
     int index = 0;
     Q_ASSERT( mainWindow() );
@@ -1932,26 +1932,26 @@ int KToolBar::dockWindowIndex()
     return index;
 }
 
-void KToolBar::getAttributes( TQString &position, TQString &icontext, int &index )
+void TDEToolBar::getAttributes( TQString &position, TQString &icontext, int &index )
 {
     // get all of the stuff to save
     switch ( barPos() ) {
-    case KToolBar::Flat:
+    case TDEToolBar::Flat:
         position = "Flat";
         break;
-    case KToolBar::Bottom:
+    case TDEToolBar::Bottom:
         position = "Bottom";
         break;
-    case KToolBar::Left:
+    case TDEToolBar::Left:
         position = "Left";
         break;
-    case KToolBar::Right:
+    case TDEToolBar::Right:
         position = "Right";
         break;
-    case KToolBar::Floating:
+    case TDEToolBar::Floating:
         position = "Floating";
         break;
-    case KToolBar::Top:
+    case TDEToolBar::Top:
     default:
         position = "Top";
         break;
@@ -1960,16 +1960,16 @@ void KToolBar::getAttributes( TQString &position, TQString &icontext, int &index
     index = dockWindowIndex();
 
     switch (d->m_iconText) {
-    case KToolBar::IconTextRight:
+    case TDEToolBar::IconTextRight:
         icontext = "IconTextRight";
         break;
-    case KToolBar::IconTextBottom:
+    case TDEToolBar::IconTextBottom:
         icontext = "IconTextBottom";
         break;
-    case KToolBar::TextOnly:
+    case TDEToolBar::TextOnly:
         icontext = "TextOnly";
         break;
-    case KToolBar::IconOnly:
+    case TDEToolBar::IconOnly:
     default:
         icontext = "IconOnly";
         break;
@@ -1977,7 +1977,7 @@ void KToolBar::getAttributes( TQString &position, TQString &icontext, int &index
     //kdDebug(220) << name() << " getAttributes: icontext=" << icontext << endl;
 }
 
-void KToolBar::saveState( TQDomElement &current )
+void TDEToolBar::saveState( TQDomElement &current )
 {
     Q_ASSERT( !current.isNull() );
     TQString position, icontext;
@@ -2006,8 +2006,8 @@ void KToolBar::saveState( TQDomElement &current )
     //kdDebug(220) << name() << " saveState: saving index=" << index << " iconText=" << icontext << " hidden=" << isHidden() << endl;
 }
 
-// Called by KMainWindow::finalizeGUI
-void KToolBar::positionYourself( bool force )
+// Called by TDEMainWindow::finalizeGUI
+void TDEToolBar::positionYourself( bool force )
 {
     if (force)
         d->positioned = false;
@@ -2035,16 +2035,16 @@ void KToolBar::positionYourself( bool force )
     d->positioned = true;
 }
 
-KPopupMenu *KToolBar::contextMenu()
+TDEPopupMenu *TDEToolBar::contextMenu()
 {
   if ( context )
     return context;
   // Construct our context popup menu. Name it qt_dockwidget_internal so it
   // won't be deleted by TQToolBar::clear().
-  context = new KPopupMenu( this, "qt_dockwidget_internal" );
+  context = new TDEPopupMenu( this, "qt_dockwidget_internal" );
   context->insertTitle(i18n("Toolbar Menu"));
 
-  KPopupMenu *orient = new KPopupMenu( context, "orient" );
+  TDEPopupMenu *orient = new TDEPopupMenu( context, "orient" );
   orient->insertItem( i18n("toolbar position string","Top"),  CONTEXT_TOP );
   orient->insertItem( i18n("toolbar position string","Left"), CONTEXT_LEFT );
   orient->insertItem( i18n("toolbar position string","Right"), CONTEXT_RIGHT );
@@ -2053,23 +2053,23 @@ KPopupMenu *KToolBar::contextMenu()
   orient->insertItem( i18n("toolbar position string","Floating"), CONTEXT_FLOAT );
   orient->insertItem( i18n("min toolbar", "Flat"), CONTEXT_FLAT );
 
-  KPopupMenu *mode = new KPopupMenu( context, "mode" );
+  TDEPopupMenu *mode = new TDEPopupMenu( context, "mode" );
   mode->insertItem( i18n("Icons Only"), CONTEXT_ICONS );
   mode->insertItem( i18n("Text Only"), CONTEXT_TEXT );
   mode->insertItem( i18n("Text Alongside Icons"), CONTEXT_TEXTRIGHT );
   mode->insertItem( i18n("Text Under Icons"), CONTEXT_TEXTUNDER );
 
-  KPopupMenu *size = new KPopupMenu( context, "size" );
+  TDEPopupMenu *size = new TDEPopupMenu( context, "size" );
   size->insertItem( i18n("Default"), CONTEXT_ICONSIZES );
   // Query the current theme for available sizes
-  KIconTheme *theme = KGlobal::instance()->iconLoader()->theme();
+  TDEIconTheme *theme = TDEGlobal::instance()->iconLoader()->theme();
   TQValueList<int> avSizes;
   if (theme)
   {
       if (!::qstrcmp(name(), "mainToolBar"))
-          avSizes = theme->querySizes( KIcon::MainToolbar);
+          avSizes = theme->querySizes( TDEIcon::MainToolbar);
       else
-          avSizes = theme->querySizes( KIcon::Toolbar);
+          avSizes = theme->querySizes( TDEIcon::Toolbar);
   }
 
   d->iconSizes = avSizes;
@@ -2131,24 +2131,24 @@ KPopupMenu *KToolBar::contextMenu()
   return context;
 }
 
-void KToolBar::slotContextAboutToShow()
+void TDEToolBar::slotContextAboutToShow()
 {
   // The idea here is to reuse the "static" part of the menu to save time.
   // But the "Toolbars" action is dynamic (can be a single action or a submenu)
   // and ToolBarHandler::setupActions() deletes it, so better not keep it around.
   // So we currently plug/unplug the last two actions of the menu.
   // Another way would be to keep around the actions and plug them all into a (new each time) popupmenu.
-  KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow());
+  TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
   if ( kmw ) {
       kmw->setupToolbarMenuActions();
       // Only allow hiding a toolbar if the action is also plugged somewhere else (e.g. menubar)
-      KAction *tbAction = kmw->toolBarMenuAction();
+      TDEAction *tbAction = kmw->toolBarMenuAction();
       if ( tbAction && tbAction->containerCount() > 0 )
           tbAction->plug(context);
   }
 
   // try to find "configure toolbars" action
-  KAction *configureAction = 0;
+  TDEAction *configureAction = 0;
   const char* actionName = KStdAction::name(KStdAction::ConfigureToolbars);
   if ( d->m_xmlguiClient )
     configureAction = d->m_xmlguiClient->actionCollection()->action(actionName);
@@ -2192,39 +2192,39 @@ void KToolBar::slotContextAboutToShow()
 
   switch ( barPos() )
   {
-  case KToolBar::Flat:
+  case TDEToolBar::Flat:
       context->setItemChecked( CONTEXT_FLAT, true );
       break;
-  case KToolBar::Bottom:
+  case TDEToolBar::Bottom:
       context->setItemChecked( CONTEXT_BOTTOM, true );
       break;
-  case KToolBar::Left:
+  case TDEToolBar::Left:
       context->setItemChecked( CONTEXT_LEFT, true );
       break;
-  case KToolBar::Right:
+  case TDEToolBar::Right:
       context->setItemChecked( CONTEXT_RIGHT, true );
       break;
-  case KToolBar::Floating:
+  case TDEToolBar::Floating:
       context->setItemChecked( CONTEXT_FLOAT, true );
       break;
-  case KToolBar::Top:
+  case TDEToolBar::Top:
       context->setItemChecked( CONTEXT_TOP, true );
       break;
   default: break;
   }
 }
 
-void KToolBar::slotContextAboutToHide()
+void TDEToolBar::slotContextAboutToHide()
 {
   // We have to unplug whatever slotContextAboutToShow plugged into the menu.
   // Unplug the toolbar menu action
-  KMainWindow *kmw = tqt_dynamic_cast<KMainWindow *>(mainWindow());
+  TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
   if ( kmw && kmw->toolBarMenuAction() )
     if ( kmw->toolBarMenuAction()->containerCount() > 1 )
       kmw->toolBarMenuAction()->unplug(context);
 
   // Unplug the configure toolbars action too, since it's afterwards anyway
-  KAction *configureAction = 0;
+  TDEAction *configureAction = 0;
   const char* actionName = KStdAction::name(KStdAction::ConfigureToolbars);
   if ( d->m_xmlguiClient )
     configureAction = d->m_xmlguiClient->actionCollection()->action(actionName);
@@ -2242,12 +2242,12 @@ void KToolBar::slotContextAboutToHide()
   }
 }
 
-void KToolBar::widgetDestroyed()
+void TDEToolBar::widgetDestroyed()
 {
     removeWidgetInternal( (TQWidget*)sender() );
 }
 
-void KToolBar::removeWidgetInternal( TQWidget * w )
+void TDEToolBar::removeWidgetInternal( TQWidget * w )
 {
     widgets.removeRef( w );
     TQMap< TQWidget*, int >::Iterator it = widget2id.find( w );
@@ -2257,8 +2257,8 @@ void KToolBar::removeWidgetInternal( TQWidget * w )
     widget2id.remove( it );
 }
 
-void KToolBar::virtual_hook( int, void* )
+void TDEToolBar::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "ktoolbar.moc"
+#include "tdetoolbar.moc"
 
diff --git a/tdeui/ktoolbar.h b/tdeui/tdetoolbar.h
index aa447ed5c..857673f28 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/tdetoolbar.h
@@ -33,7 +33,7 @@
 #include <tqframe.h>
 #include <tqiconset.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TQDomElement;
 class TQSize;
@@ -44,23 +44,23 @@ class TQDomDocument;
 class TQTimer;
 
 class KLineEdit;
-class KToolBar;
-class KToolBarButton;
-class KToolBoxManager;
+class TDEToolBar;
+class TDEToolBarButton;
+class TDEToolBoxManager;
 class KAnimWidget;
-class KPopupMenu;
-class KInstance;
+class TDEPopupMenu;
+class TDEInstance;
 class KComboBox;
 class KXMLGUIClient;
 
-class KToolBarPrivate;
+class TDEToolBarPrivate;
 
-class TDEUI_EXPORT KToolBarSeparator : public TQFrame
+class TDEUI_EXPORT TDEToolBarSeparator : public TQFrame
 {
     Q_OBJECT
     
 public:
-    KToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 );
+    TDEToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 );
 
     TQSize sizeHint() const;
     Orientation orientation() const { return orient; }
@@ -82,26 +82,26 @@ private:
   *
   * A KDE-style toolbar.
   *
-  * KToolBar can be dragged around in and between different docks.
+  * TDEToolBar can be dragged around in and between different docks.
   *
-  * A KToolBar can contain all sorts of widgets.
+  * A TDEToolBar can contain all sorts of widgets.
   *
-  * KToolBar can be used as a standalone widget, but KMainWindow
+  * TDEToolBar can be used as a standalone widget, but TDEMainWindow
   * provides easy factories and management of one or more toolbars.
-  * Once you have a KToolBar object, you can insert items into it with the
+  * Once you have a TDEToolBar object, you can insert items into it with the
   * insert... methods, or remove them with the removeItem() method. This
   * can be done at any time; the toolbar will be automatically updated.
   * There are also many methods to set per-child properties like alignment
   * and toggle behavior.
   *
-  * KToolBar uses a global config group to load toolbar settings on
+  * TDEToolBar uses a global config group to load toolbar settings on
   * construction. It will reread this config group on a
-  * KApplication::appearanceChanged() signal.
+  * TDEApplication::appearanceChanged() signal.
   *
   * @author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>.
   */
 
-class TDEUI_EXPORT KToolBar : public TQToolBar
+class TDEUI_EXPORT TDEToolBar : public TQToolBar
 {
     Q_OBJECT
     
@@ -136,12 +136,12 @@ public:
    * true.  All other toolbars will be IconOnly and use Medium icons.
    *
    * @param parent      The standard toolbar parent (usually a
-   * KMainWindow)
+   * TDEMainWindow)
    * @param name        The standard internal name
    * @param honorStyle  If true, then global settings for IconSize and IconText will be honored
    * @param readConfig  whether to apply the configuration (global and application-specific)
    */
-    KToolBar( TQWidget *parent, const char *name = 0, bool honorStyle = false, bool readConfig = true );
+    TDEToolBar( TQWidget *parent, const char *name = 0, bool honorStyle = false, bool readConfig = true );
 
   /**
    * Constructor for non-XML-GUI applications.
@@ -158,7 +158,7 @@ public:
    * @param honorStyle  If true, then global settings for IconSize and IconText will be honored
    * @param readConfig  whether to apply the configuration (global and application-specific)
    */
-    KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock /*= TQMainWindow::Top*/, bool newLine = false,
+    TDEToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock /*= TQMainWindow::Top*/, bool newLine = false,
               const char *name = 0, bool honorStyle = false, bool readConfig = true );
 
   /**
@@ -176,20 +176,20 @@ public:
    * @param honorStyle  If true, then global settings for IconSize and IconText will be honored
    * @param readConfig  whether to apply the configuration (global and application-specific)
    */
-    KToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine = false,
+    TDEToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine = false,
               const char *name = 0, bool honorStyle = false, bool readConfig = true );
 
   /**
    * Destructor
    */
-    virtual ~KToolBar();
+    virtual ~TDEToolBar();
 
   /**
-   * Insert a button (a KToolBarButton) with a pixmap.  The
+   * Insert a button (a TDEToolBarButton) with a pixmap.  The
    * pixmap is loaded by the button itself based on the global icon
    * settings.
    *
-   * You should connect to one or more signals in KToolBar:
+   * You should connect to one or more signals in TDEToolBar:
    * clicked() , pressed() , released() , or
    * highlighted()  and if the button is a toggle button
    * ( setToggle() ) toggled() .  Those signals have @p id
@@ -207,7 +207,7 @@ public:
    */
     int insertButton(const TQString& icon, int id, bool enabled = true,
 		     const TQString& text = TQString::null, int index=-1,
-		     KInstance *_instance = KGlobal::instance());
+		     TDEInstance *_instance = TDEGlobal::instance());
 
    /**
    * This is the same as above, but with specified signals and
@@ -230,10 +230,10 @@ public:
     int insertButton(const TQString& icon, int id, const char *signal,
 		     const TQObject *receiver, const char *slot,
 		     bool enabled = true, const TQString& text = TQString::null,
-		     int index=-1, KInstance *_instance = KGlobal::instance() );
+		     int index=-1, TDEInstance *_instance = TDEGlobal::instance() );
 
   /**
-   * Inserts a button (a KToolBarButton) with the specified
+   * Inserts a button (a TDEToolBarButton) with the specified
    * pixmap.  This pixmap will be used as the "active" one and the
    * disabled and default ones will be autogenerated.
    *
@@ -241,7 +241,7 @@ public:
    * allows you to specify the icon name rather then the pixmap
    * itself.  Specifying the icon name is much more flexible.
    *
-   * You should connect to one or more signals in KToolBar:
+   * You should connect to one or more signals in TDEToolBar:
    * clicked() , pressed() , released() , or
    * highlighted()  and if the button is a toggle button
    * ( setToggle() ) toggled() .  Those signals have @p id
@@ -602,12 +602,12 @@ public:
     KComboBox * getCombo(int id);
 
     /**
-   * Returns a pointer to KToolBarLined with @p id.
-   * @return a pointer to KToolBarLined with @p id.
+   * Returns a pointer to TDEToolBarLined with @p id.
+   * @return a pointer to TDEToolBarLined with @p id.
    *
    * Example:
    * \code
-   * KLineEdit * lined = toolbar->getKToolBarLined(lined_id);
+   * KLineEdit * lined = toolbar->getTDEToolBarLined(lined_id);
    * \endcode
    * That way you can get access to other public methods
    * that KLineEdit provides. KLineEdit is the same thing
@@ -616,18 +616,18 @@ public:
     KLineEdit * getLined (int id);
 
     /**
-   * Returns a pointer to KToolBarButton.
+   * Returns a pointer to TDEToolBarButton.
    *
    * Example:
    * \code
-   * KToolBarButton * button = toolbar->getButton(button_id);
+   * TDEToolBarButton * button = toolbar->getButton(button_id);
    * \endcode
    * That way you can get access to other public methods
-   * that KToolBarButton provides.
+   * that TDEToolBarButton provides.
    *
    *  Using this method is not recommended.
    */
-    KToolBarButton * getButton (int id);
+    TDEToolBarButton * getButton (int id);
 
     /**
    * Align item to the right.
@@ -830,11 +830,11 @@ public:
 
   /**
    * Set the icon size to load. Usually you should not call
-   * this, the icon size is taken care of by KIconLoader
+   * this, the icon size is taken care of by TDEIconLoader
    * and globally configured.
    * By default, the toolbar will load icons of size 32 for main
    * toolbars and 22 for other toolbars
-   * @see KIconLoader.
+   * @see TDEIconLoader.
    *
    * @param size The size to use
    */
@@ -900,25 +900,25 @@ public:
    * precedence).
    */
     void saveState(); // BIC: remove for KDE4? This doesn't appear to be used internally,
-                      // and apps use saveMainWindowSettings in KMainWindow anyway.
+                      // and apps use saveMainWindowSettings in TDEMainWindow anyway.
 
   /**
    * Save the toolbar settings to group @p configGroup in @p config.
    */
-    void saveSettings(KConfig *config, const TQString &configGroup);
+    void saveSettings(TDEConfig *config, const TQString &configGroup);
 
   /**
    * Read the toolbar settings from group @p configGroup in @p config
    * and apply them. Even default settings are re-applied if @p force is set.
    */
-    void applySettings(KConfig *config, const TQString &configGroup,bool force);
+    void applySettings(TDEConfig *config, const TQString &configGroup,bool force);
     // KDE4 merge with force=false
-    void applySettings(KConfig *config, const TQString &configGroup);
+    void applySettings(TDEConfig *config, const TQString &configGroup);
 
   /*
    * Tell the toolbar what XML-GUI resource file it should use to save
    * it's state.  The state of the toolbar (position, size, etc) is
-   * saved in KConfig files if the application does not use XML-GUI
+   * saved in TDEConfig files if the application does not use XML-GUI
    * but if the app does, then it's saved the XML file.  This function
    * allows this to happen.
    *
@@ -1036,8 +1036,8 @@ signals:
      * Emitted when toolbar changes position, or when
      * an item is removed from toolbar.
      *
-     * If you subclass KMainWindow and reimplement
-     * KMainWindow::resizeEvent() be sure to connect to
+     * If you subclass TDEMainWindow and reimplement
+     * TDEMainWindow::resizeEvent() be sure to connect to
      * this signal. Note: You can connect this signal to a slot that
      * doesn't take parameter.
      */
@@ -1054,7 +1054,7 @@ signals:
 
     /**
      * This signal is emitted when the toolbar is getting deleted,
-     * and before ~KToolbar finishes (so it's still time to remove
+     * and before ~TDEToolbar finishes (so it's still time to remove
      * widgets from the toolbar).
      * Used by KWidgetAction.
      * @since 3.2
@@ -1090,7 +1090,7 @@ protected:
     void showEvent( TQShowEvent *e );
     void resizeEvent( TQResizeEvent *e );
     bool event( TQEvent *e );
-    void applyAppearanceSettings(KConfig *config, const TQString &_configGroup, bool forceGlobal = false);
+    void applyAppearanceSettings(TDEConfig *config, const TQString &_configGroup, bool forceGlobal = false);
     TQString settingsGroup() const;
 
 private slots:
@@ -1106,25 +1106,25 @@ private slots:
 
 private:
     void init( bool readConfig = true, bool honorStyle = false );
-    void doConnections( KToolBarButton *button );
+    void doConnections( TDEToolBarButton *button );
     void insertWidgetInternal( TQWidget *w, int &index, int id );
     void removeWidgetInternal( TQWidget *w );
     void getAttributes( TQString &position, TQString &icontext, int &index );
     int dockWindowIndex();
-    KPopupMenu *contextMenu();
+    TDEPopupMenu *contextMenu();
     void doModeChange();
 
     TQMap<TQWidget*, int > widget2id;
     typedef TQMap<int, TQWidget* > Id2WidgetMap;
     Id2WidgetMap id2widget;
-    KPopupMenu *context;
+    TDEPopupMenu *context;
     TQPtrList<TQWidget> widgets;
     TQTimer *layoutTimer;
     TQGuardedPtr<TQWidget> stretchableWidget, rightAligned;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
-    KToolBarPrivate *d;
+    TDEToolBarPrivate *d;
 };
 
 #endif
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index a2d3c27fe..abf23ffc7 100644
--- a/tdeui/ktoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -24,8 +24,8 @@
 #include <config.h>
 #include <string.h>
 
-#include "ktoolbarbutton.h"
-#include "ktoolbar.h"
+#include "tdetoolbarbutton.h"
+#include "tdetoolbar.h"
 
 #include <tqstyle.h>
 #include <tqimage.h>
@@ -38,22 +38,22 @@
 #include <tqpainter.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
 
 // needed to get our instance
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
-template class TQIntDict<KToolBarButton>;
+template class TQIntDict<TDEToolBarButton>;
 
-class KToolBarButtonPrivate
+class TDEToolBarButtonPrivate
 {
 public:
-  KToolBarButtonPrivate()
+  TDEToolBarButtonPrivate()
   {
     m_buttonDown  = false;
 
@@ -65,13 +65,13 @@ public:
     m_isActive    = false;
 
     m_iconName    = TQString::null;
-    m_iconText    = KToolBar::IconOnly;
+    m_iconText    = TDEToolBar::IconOnly;
     m_iconSize    = 0;
 
     m_parent   = 0;
-    m_instance = KGlobal::instance();
+    m_instance = TDEGlobal::instance();
   }
-  ~KToolBarButtonPrivate()
+  ~TDEToolBarButtonPrivate()
   {
   }
 
@@ -86,39 +86,39 @@ public:
 
   TQString m_iconName;
 
-  KToolBar *m_parent;
-  KToolBar::IconText m_iconText;
+  TDEToolBar *m_parent;
+  TDEToolBar::IconText m_iconText;
   int m_iconSize;
   TQSize size;
 
   TQPoint m_mousePressPos;
 
-  KInstance  *m_instance;
+  TDEInstance  *m_instance;
 };
 
 // This will construct a separator
-KToolBarButton::KToolBarButton( TQWidget *_parent, const char *_name )
+TDEToolBarButton::TDEToolBarButton( TQWidget *_parent, const char *_name )
   : TQToolButton( _parent , _name)
 {
-  d = new KToolBarButtonPrivate;
+  d = new TDEToolBarButtonPrivate;
 
   resize(6,6);
   hide();
   d->m_isSeparator = true;
 }
 
-KToolBarButton::KToolBarButton( const TQString& _icon, int _id,
+TDEToolBarButton::TDEToolBarButton( const TQString& _icon, int _id,
                                 TQWidget *_parent, const char *_name,
-                                const TQString &_txt, KInstance *_instance )
+                                const TQString &_txt, TDEInstance *_instance )
     : TQToolButton( _parent, _name ), d( 0 )
 {
-  d = new KToolBarButtonPrivate;
+  d = new TDEToolBarButtonPrivate;
 
   d->m_id     = _id;
   TQToolButton::setTextLabel(_txt);
   d->m_instance = _instance;
 
-  d->m_parent = tqt_dynamic_cast<KToolBar*>(_parent);
+  d->m_parent = tqt_dynamic_cast<TDEToolBar*>(_parent);
   if (d->m_parent) {
     connect(d->m_parent, TQT_SIGNAL( modechange() ),
             this,         TQT_SLOT( modeChange() ));
@@ -141,17 +141,17 @@ KToolBarButton::KToolBarButton( const TQString& _icon, int _id,
   modeChange();
 }
 
-KToolBarButton::KToolBarButton( const TQPixmap& pixmap, int _id,
+TDEToolBarButton::TDEToolBarButton( const TQPixmap& pixmap, int _id,
                                 TQWidget *_parent, const char *name,
                                 const TQString& txt)
     : TQToolButton( _parent, name ), d( 0 )
 {
-  d = new KToolBarButtonPrivate;
+  d = new TDEToolBarButtonPrivate;
 
   d->m_id       = _id;
   TQToolButton::setTextLabel(txt);
 
-  d->m_parent = tqt_dynamic_cast<KToolBar*>(_parent);
+  d->m_parent = tqt_dynamic_cast<TDEToolBar*>(_parent);
   if (d->m_parent) {
     connect(d->m_parent, TQT_SIGNAL( modechange() ),
             this,         TQT_SLOT( modeChange() ));
@@ -173,12 +173,12 @@ KToolBarButton::KToolBarButton( const TQPixmap& pixmap, int _id,
   modeChange();
 }
 
-KToolBarButton::~KToolBarButton()
+TDEToolBarButton::~TDEToolBarButton()
 {
   delete d; d = 0;
 }
 
-void KToolBarButton::modeChange()
+void TDEToolBarButton::modeChange()
 {
   TQSize mysize;
 
@@ -196,9 +196,9 @@ void KToolBarButton::modeChange()
   int pix_width  = d->m_iconSize;
   if ( d->m_iconSize == 0 ) {
       if (d->m_parent && !strcmp(d->m_parent->name(), "mainToolBar"))
-          pix_width = IconSize( KIcon::MainToolbar );
+          pix_width = IconSize( TDEIcon::MainToolbar );
       else
-          pix_width = IconSize( KIcon::Toolbar );
+          pix_width = IconSize( TDEIcon::Toolbar );
   }
   int pix_height = pix_width;
 
@@ -206,10 +206,10 @@ void KToolBarButton::modeChange()
   int text_width = 0;
 
   TQToolTip::remove(this);
-  if (d->m_iconText != KToolBar::IconOnly)
+  if (d->m_iconText != TDEToolBar::IconOnly)
   {
     // okay, we have to deal with fonts.  let's get our information now
-    TQFont tmp_font = KGlobalSettings::toolBarFont();
+    TQFont tmp_font = TDEGlobalSettings::toolBarFont();
 
     // now parse out our font sizes from our chosen font
     TQFontMetrics fm(tmp_font);
@@ -226,19 +226,19 @@ void KToolBarButton::modeChange()
 
   switch (d->m_iconText)
   {
-  case KToolBar::IconOnly:
+  case TDEToolBar::IconOnly:
     mysize = TQSize(pix_width, pix_height);
     break;
 
-  case KToolBar::IconTextRight:
+  case TDEToolBar::IconTextRight:
     mysize = TQSize(pix_width + text_width + 4, pix_height);
     break;
 
-  case KToolBar::TextOnly:
+  case TDEToolBar::TextOnly:
     mysize = TQSize(text_width + 4, text_height);
     break;
 
-  case KToolBar::IconTextBottom:
+  case TDEToolBar::IconTextBottom:
     mysize = TQSize((text_width + 4 > pix_width) ? text_width + 4 : pix_width, pix_height + text_height);
     break;
 
@@ -257,7 +257,7 @@ void KToolBarButton::modeChange()
   updateGeometry();
 }
 
-void KToolBarButton::setTextLabel( const TQString& text, bool tipToo)
+void TDEToolBarButton::setTextLabel( const TQString& text, bool tipToo)
 {
   if (text.isNull())
     return;
@@ -270,13 +270,13 @@ void KToolBarButton::setTextLabel( const TQString& text, bool tipToo)
   update();
 }
 
-void KToolBarButton::setText( const TQString& text)
+void TDEToolBarButton::setText( const TQString& text)
 {
   setTextLabel(text, true);
   modeChange();
 }
 
-void KToolBarButton::setIcon( const TQString &icon )
+void TDEToolBarButton::setIcon( const TQString &icon )
 {
   d->m_iconName = icon;
   if (d->m_parent)
@@ -284,19 +284,19 @@ void KToolBarButton::setIcon( const TQString &icon )
   // TQObject::name() return "const char *" instead of TQString.
   if (d->m_parent && !strcmp(d->m_parent->name(), "mainToolBar"))
     TQToolButton::setIconSet( d->m_instance->iconLoader()->loadIconSet(
-        d->m_iconName, KIcon::MainToolbar, d->m_iconSize ));
+        d->m_iconName, TDEIcon::MainToolbar, d->m_iconSize ));
   else
     TQToolButton::setIconSet( d->m_instance->iconLoader()->loadIconSet(
-        d->m_iconName, KIcon::Toolbar, d->m_iconSize ));
+        d->m_iconName, TDEIcon::Toolbar, d->m_iconSize ));
 }
 
-void KToolBarButton::setIconSet( const TQIconSet &iconset )
+void TDEToolBarButton::setIconSet( const TQIconSet &iconset )
 {
   TQToolButton::setIconSet( iconset );
 }
 
 // remove?
-void KToolBarButton::setPixmap( const TQPixmap &pixmap )
+void TDEToolBarButton::setPixmap( const TQPixmap &pixmap )
 {
   if( pixmap.isNull()) // called by TQToolButton
   {
@@ -308,69 +308,69 @@ void KToolBarButton::setPixmap( const TQPixmap &pixmap )
   TQToolButton::setIconSet( set );
 }
 
-void KToolBarButton::setDefaultPixmap( const TQPixmap &pixmap )
+void TDEToolBarButton::setDefaultPixmap( const TQPixmap &pixmap )
 {
   TQIconSet set = iconSet();
   set.setPixmap( pixmap, TQIconSet::Automatic, TQIconSet::Normal );
   TQToolButton::setIconSet( set );
 }
 
-void KToolBarButton::setDisabledPixmap( const TQPixmap &pixmap )
+void TDEToolBarButton::setDisabledPixmap( const TQPixmap &pixmap )
 {
   TQIconSet set = iconSet();
   set.setPixmap( pixmap, TQIconSet::Automatic, TQIconSet::Disabled );
   TQToolButton::setIconSet( set );
 }
 
-void KToolBarButton::setDefaultIcon( const TQString& icon )
+void TDEToolBarButton::setDefaultIcon( const TQString& icon )
 {
   TQIconSet set = iconSet();
   TQPixmap pm;
   if (d->m_parent && !strcmp(d->m_parent->name(), "mainToolBar"))
-    pm = d->m_instance->iconLoader()->loadIcon( icon, KIcon::MainToolbar,
+    pm = d->m_instance->iconLoader()->loadIcon( icon, TDEIcon::MainToolbar,
         d->m_iconSize );
   else
-    pm = d->m_instance->iconLoader()->loadIcon( icon, KIcon::Toolbar,
+    pm = d->m_instance->iconLoader()->loadIcon( icon, TDEIcon::Toolbar,
         d->m_iconSize );
   set.setPixmap( pm, TQIconSet::Automatic, TQIconSet::Normal );
   TQToolButton::setIconSet( set );
 }
 
-void KToolBarButton::setDisabledIcon( const TQString& icon )
+void TDEToolBarButton::setDisabledIcon( const TQString& icon )
 {
   TQIconSet set = iconSet();
   TQPixmap pm;
   if (d->m_parent && !strcmp(d->m_parent->name(), "mainToolBar"))
-    pm = d->m_instance->iconLoader()->loadIcon( icon, KIcon::MainToolbar,
+    pm = d->m_instance->iconLoader()->loadIcon( icon, TDEIcon::MainToolbar,
         d->m_iconSize );
   else
-    pm = d->m_instance->iconLoader()->loadIcon( icon, KIcon::Toolbar,
+    pm = d->m_instance->iconLoader()->loadIcon( icon, TDEIcon::Toolbar,
         d->m_iconSize );
   set.setPixmap( pm, TQIconSet::Automatic, TQIconSet::Disabled );
   TQToolButton::setIconSet( set );
 }
 
-TQPopupMenu *KToolBarButton::popup()
+TQPopupMenu *TDEToolBarButton::popup()
 {
   // obsolete
   // KDE4: remove me
   return TQToolButton::popup();
 }
 
-void KToolBarButton::setPopup(TQPopupMenu *p, bool)
+void TDEToolBarButton::setPopup(TQPopupMenu *p, bool)
 {
   TQToolButton::setPopup(p);
   TQToolButton::setPopupDelay(-1);
 }
 
 
-void KToolBarButton::setDelayedPopup (TQPopupMenu *p, bool)
+void TDEToolBarButton::setDelayedPopup (TQPopupMenu *p, bool)
 {
   TQToolButton::setPopup(p);
   TQToolButton::setPopupDelay(TQApplication::startDragTime());
 }
 
-void KToolBarButton::leaveEvent(TQEvent *)
+void TDEToolBarButton::leaveEvent(TQEvent *)
 {
   if( d->m_isRaised || d->m_isActive )
   {
@@ -382,7 +382,7 @@ void KToolBarButton::leaveEvent(TQEvent *)
   emit highlighted(d->m_id, false);
 }
 
-void KToolBarButton::enterEvent(TQEvent *)
+void TDEToolBarButton::enterEvent(TQEvent *)
 {
   if (d->m_highlight)
   {
@@ -403,7 +403,7 @@ void KToolBarButton::enterEvent(TQEvent *)
   emit highlighted(d->m_id, true);
 }
 
-bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
+bool TDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
 {
   if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
   {
@@ -421,7 +421,7 @@ bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
       {
         TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
         if ((mev->pos() - d->m_mousePressPos).manhattanLength()
-              > KGlobalSettings::dndEventDelay())
+              > TDEGlobalSettings::dndEventDelay())
         {
           openPopup();
           return true;
@@ -446,7 +446,7 @@ bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
   return TQToolButton::eventFilter(o, ev);
 }
 
-void KToolBarButton::mousePressEvent( TQMouseEvent * e )
+void TDEToolBarButton::mousePressEvent( TQMouseEvent * e )
 {
   d->m_buttonDown = true;
 
@@ -460,7 +460,7 @@ void KToolBarButton::mousePressEvent( TQMouseEvent * e )
   TQToolButton::mousePressEvent(e);
 }
 
-void KToolBarButton::mouseReleaseEvent( TQMouseEvent * e )
+void TDEToolBarButton::mouseReleaseEvent( TQMouseEvent * e )
 {
   TQt::ButtonState state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask));
   if ( e->button() == Qt::MidButton )
@@ -479,7 +479,7 @@ void KToolBarButton::mouseReleaseEvent( TQMouseEvent * e )
     emit buttonClicked( d->m_id, state );
 }
 
-void KToolBarButton::drawButton( TQPainter *_painter )
+void TDEToolBarButton::drawButton( TQPainter *_painter )
 {
   TQStyle::SFlags flags   = TQStyle::Style_Default;
   TQStyle::SCFlags active = TQStyle::SC_None;
@@ -498,12 +498,12 @@ void KToolBarButton::drawButton( TQPainter *_painter )
 	colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
 
   int dx, dy;
-  TQFont tmp_font(KGlobalSettings::toolBarFont());
+  TQFont tmp_font(TDEGlobalSettings::toolBarFont());
   TQFontMetrics fm(tmp_font);
   TQRect textRect;
   int textFlags = 0;
 
-  if (d->m_iconText == KToolBar::IconOnly) // icon only
+  if (d->m_iconText == TDEToolBar::IconOnly) // icon only
   {
     TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic,
         isEnabled() ? (d->m_isActive ? TQIconSet::Active : TQIconSet::Normal) :
@@ -521,7 +521,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
       _painter->drawPixmap( dx, dy, pixmap );
     }
   }
-  else if (d->m_iconText == KToolBar::IconTextRight) // icon and text (if any)
+  else if (d->m_iconText == TDEToolBar::IconTextRight) // icon and text (if any)
   {
     TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic,
         isEnabled() ? (d->m_isActive ? TQIconSet::Active : TQIconSet::Normal) :
@@ -555,7 +555,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
       textRect = TQRect(dx, dy, width()-dx, height());
     }
   }
-  else if (d->m_iconText == KToolBar::TextOnly)
+  else if (d->m_iconText == TDEToolBar::TextOnly)
   {
     if (!textLabel().isNull())
     {
@@ -570,7 +570,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
       textRect = TQRect( dx, dy, fm.width(textLabel()), fm.lineSpacing() );
     }
   }
-  else if (d->m_iconText == KToolBar::IconTextBottom)
+  else if (d->m_iconText == TDEToolBar::IconTextBottom)
   {
     TQPixmap pixmap = iconSet().pixmap( TQIconSet::Automatic,
         isEnabled() ? (d->m_isActive ? TQIconSet::Active : TQIconSet::Normal) :
@@ -606,11 +606,11 @@ void KToolBarButton::drawButton( TQPainter *_painter )
   // Draw the text at the position given by textRect, and using textFlags
   if (!textLabel().isNull() && !textRect.isNull())
   {
-      _painter->setFont(KGlobalSettings::toolBarFont());
+      _painter->setFont(TDEGlobalSettings::toolBarFont());
       if (!isEnabled())
         _painter->setPen(palette().disabled().dark());
       else if(d->m_isRaised)
-        _painter->setPen(KGlobalSettings::toolBarHighlightColor());
+        _painter->setPen(TDEGlobalSettings::toolBarHighlightColor());
       else
 	_painter->setPen( colorGroup().buttonText() );
       _painter->drawText(textRect, textFlags, textLabel());
@@ -629,7 +629,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
   }
 }
 
-void KToolBarButton::paletteChange(const TQPalette &)
+void TDEToolBarButton::paletteChange(const TQPalette &)
 {
   if(!d->m_isSeparator)
   {
@@ -638,12 +638,12 @@ void KToolBarButton::paletteChange(const TQPalette &)
   }
 }
 
-bool KToolBarButton::event(TQEvent *e)
+bool TDEToolBarButton::event(TQEvent *e)
 {
   if (e->type() == TQEvent::ParentFontChange || e->type() == TQEvent::ApplicationFontChange)
   {
      //If we use toolbar text, apply the settings again, to relayout...
-     if (d->m_iconText != KToolBar::IconOnly)
+     if (d->m_iconText != TDEToolBar::IconOnly)
        modeChange();
      return true;
   }
@@ -652,62 +652,62 @@ bool KToolBarButton::event(TQEvent *e)
 }
 
 
-void KToolBarButton::showMenu()
+void TDEToolBarButton::showMenu()
 {
   // obsolete
   // KDE4: remove me
 }
 
-void KToolBarButton::slotDelayTimeout()
+void TDEToolBarButton::slotDelayTimeout()
 {
   // obsolete
   // KDE4: remove me
 }
 
-void KToolBarButton::slotClicked()
+void TDEToolBarButton::slotClicked()
 {
   emit clicked( d->m_id );
 
   // emit buttonClicked when the button was clicked while being in an extension popupmenu
   if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) {
-    ButtonState state = KApplication::keyboardMouseState();
+    ButtonState state = TDEApplication::keyboardMouseState();
     if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton )
       state = ButtonState( Qt::LeftButton | state );
     emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton
   }
 }
 
-void KToolBarButton::slotPressed()
+void TDEToolBarButton::slotPressed()
 {
   emit pressed( d->m_id );
 }
 
-void KToolBarButton::slotReleased()
+void TDEToolBarButton::slotReleased()
 {
   emit released( d->m_id );
 }
 
-void KToolBarButton::slotToggled()
+void TDEToolBarButton::slotToggled()
 {
   emit toggled( d->m_id );
 }
 
-void KToolBarButton::setNoStyle(bool no_style)
+void TDEToolBarButton::setNoStyle(bool no_style)
 {
     d->m_noStyle = no_style;
 
     modeChange();
-    d->m_iconText = KToolBar::IconTextRight;
+    d->m_iconText = TDEToolBar::IconTextRight;
     repaint(false);
 }
 
-void KToolBarButton::setRadio (bool f)
+void TDEToolBarButton::setRadio (bool f)
 {
     if ( d )
 	d->m_isRadio = f;
 }
 
-void KToolBarButton::on(bool flag)
+void TDEToolBarButton::on(bool flag)
 {
   if(isToggleButton())
     setOn(flag);
@@ -719,13 +719,13 @@ void KToolBarButton::on(bool flag)
   repaint();
 }
 
-void KToolBarButton::toggle()
+void TDEToolBarButton::toggle()
 {
   setOn(!isOn());
   repaint();
 }
 
-void KToolBarButton::setToggle(bool flag)
+void TDEToolBarButton::setToggle(bool flag)
 {
   setToggleButton(flag);
   if (flag)
@@ -734,48 +734,48 @@ void KToolBarButton::setToggle(bool flag)
     disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
 }
 
-TQSize KToolBarButton::sizeHint() const
+TQSize TDEToolBarButton::sizeHint() const
 {
    return d->size;
 }
 
-TQSize KToolBarButton::minimumSizeHint() const
+TQSize TDEToolBarButton::minimumSizeHint() const
 {
    return d->size;
 }
 
-TQSize KToolBarButton::minimumSize() const
+TQSize TDEToolBarButton::minimumSize() const
 {
    return d->size;
 }
 
-bool KToolBarButton::isRaised() const
+bool TDEToolBarButton::isRaised() const
 {
     return d->m_isRaised;
 }
 
-bool KToolBarButton::isActive() const
+bool TDEToolBarButton::isActive() const
 {
     return d->m_isActive;
 }
 
-int KToolBarButton::iconTextMode() const
+int TDEToolBarButton::iconTextMode() const
 {
     return static_cast<int>( d->m_iconText );
 }
 
-int KToolBarButton::id() const
+int TDEToolBarButton::id() const
 {
     return d->m_id;
 }
 
-// KToolBarButtonList
-KToolBarButtonList::KToolBarButtonList()
+// TDEToolBarButtonList
+TDEToolBarButtonList::TDEToolBarButtonList()
 {
    setAutoDelete(false);
 }
 
-void KToolBarButton::virtual_hook( int, void* )
+void TDEToolBarButton::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "ktoolbarbutton.moc"
+#include "tdetoolbarbutton.moc"
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/tdetoolbarbutton.h
index 340761bd0..c73c1145a 100644
--- a/tdeui/ktoolbarbutton.h
+++ b/tdeui/tdetoolbarbutton.h
@@ -27,21 +27,21 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
-class KToolBar;
-class KToolBarButtonPrivate;
-class KInstance;
+class TDEToolBar;
+class TDEToolBarButtonPrivate;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
 
 /**
- * A toolbar button. This is used internally by KToolBar, use the
- * KToolBar methods instead.
+ * A toolbar button. This is used internally by TDEToolBar, use the
+ * TDEToolBar methods instead.
  * @internal
  */
-class TDEUI_EXPORT KToolBarButton : public TQToolButton
+class TDEUI_EXPORT TDEToolBarButton : public TQToolButton
 {
   Q_OBJECT
   
@@ -59,9 +59,9 @@ public:
    * @param txt    This button's text (in a tooltip or otherwise)
    * @param _instance the instance to use for this button
    */
-  KToolBarButton(const TQString& icon, int id, TQWidget *parent,
+  TDEToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = TDEGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
@@ -74,7 +74,7 @@ public:
    * @param name   This button's internal name
    * @param txt    This button's text (in a tooltip or otherwise)
    */
-  KToolBarButton(const TQPixmap& pixmap, int id, TQWidget *parent,
+  TDEToolBarButton(const TQPixmap& pixmap, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null);
 
   /**
@@ -83,12 +83,12 @@ public:
    * @param parent This button's parent
    * @param name   This button's internal name
    */
-  KToolBarButton(TQWidget *parent=0L, const char *name=0L);
+  TDEToolBarButton(TQWidget *parent=0L, const char *name=0L);
 
   /**
    * Standard destructor
    */
-  ~KToolBarButton();
+  ~TDEToolBarButton();
 
 #ifndef KDE_NO_COMPAT
   /**
@@ -313,19 +313,19 @@ protected slots:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KToolBarButtonPrivate *d;
+  TDEToolBarButtonPrivate *d;
 };
 
 /**
-* List of KToolBarButton objects.
+* List of TDEToolBarButton objects.
 * @internal
 * @version $Id$
 */
-class TDEUI_EXPORT KToolBarButtonList : public TQIntDict<KToolBarButton>
+class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
 {
 public:
-   KToolBarButtonList();
-   ~KToolBarButtonList() {}
+   TDEToolBarButtonList();
+   ~TDEToolBarButtonList() {}
 };
 
 #endif
diff --git a/tdeui/ktoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
index bdeba7281..da621fadd 100644
--- a/tdeui/ktoolbarhandler.cpp
+++ b/tdeui/tdetoolbarhandler.cpp
@@ -16,14 +16,14 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "ktoolbarhandler.h"
+#include "tdetoolbarhandler.h"
 
 #include <tqpopupmenu.h>
-#include <kapplication.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
-#include <klocale.h>
-#include <kaction.h>
+#include <tdeapplication.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
 #include <assert.h>
 
 namespace
@@ -44,14 +44,14 @@ namespace
     class BarActionBuilder
     {
     public:
-        BarActionBuilder( KActionCollection *actionCollection, KMainWindow *mainWindow, TQPtrList<KToolBar> &oldToolBarList )
+        BarActionBuilder( TDEActionCollection *actionCollection, TDEMainWindow *mainWindow, TQPtrList<TDEToolBar> &oldToolBarList )
             : m_actionCollection( actionCollection ), m_mainWindow( mainWindow ), m_needsRebuild( false )
         {
             TQPtrList<TQDockWindow> dockWindows = m_mainWindow->dockWindows();
             TQPtrListIterator<TQDockWindow> dockWindowIt( dockWindows );
             for ( ; dockWindowIt.current(); ++dockWindowIt ) {
 
-                KToolBar *toolBar = tqt_dynamic_cast<KToolBar *>( dockWindowIt.current() );
+                TDEToolBar *toolBar = tqt_dynamic_cast<TDEToolBar *>( dockWindowIt.current() );
                 if ( !toolBar )
                     continue;
 
@@ -67,30 +67,30 @@ namespace
 
         bool needsRebuild() const { return m_needsRebuild; }
 
-        TQPtrList<KAction> create()
+        TQPtrList<TDEAction> create()
         {
             if ( !m_needsRebuild )
-                return TQPtrList<KAction>();
+                return TQPtrList<TDEAction>();
 
-            TQPtrListIterator<KToolBar> toolBarIt( m_toolBars );
+            TQPtrListIterator<TDEToolBar> toolBarIt( m_toolBars );
             for ( ; toolBarIt.current(); ++toolBarIt )
                 handleToolBar( toolBarIt.current() );
 
-            TQPtrList<KAction> actions;
+            TQPtrList<TDEAction> actions;
 
             if ( m_toolBarActions.count() == 0 )
                 return actions;
 
             if ( m_toolBarActions.count() == 1 ) {
-                KToggleToolBarAction* action = static_cast<KToggleToolBarAction *>( m_toolBarActions.getFirst() );
+                TDEToggleToolBarAction* action = static_cast<TDEToggleToolBarAction *>( m_toolBarActions.getFirst() );
                 action->setText( i18n( "Show Toolbar" ) );
                 action->setCheckedState( i18n( "Hide Toolbar" ) );
                 return m_toolBarActions;
             }
 
-            KActionMenu *menuAction = new KActionMenu( i18n( "Toolbars" ), m_actionCollection, "toolbars_submenu_action" );
+            TDEActionMenu *menuAction = new TDEActionMenu( i18n( "Toolbars" ), m_actionCollection, "toolbars_submenu_action" );
 
-            TQPtrListIterator<KAction> actionIt( m_toolBarActions );
+            TQPtrListIterator<TDEAction> actionIt( m_toolBarActions );
             for ( ; actionIt.current(); ++actionIt )
                 menuAction->insert( actionIt.current() );
 
@@ -98,12 +98,12 @@ namespace
             return actions;
         }
 
-        const TQPtrList<KToolBar> &toolBars() const { return m_toolBars; }
+        const TQPtrList<TDEToolBar> &toolBars() const { return m_toolBars; }
 
     private:
-        void handleToolBar( KToolBar *toolBar )
+        void handleToolBar( TDEToolBar *toolBar )
         {
-            KToggleToolBarAction *action = new KToggleToolBarAction(
+            TDEToggleToolBarAction *action = new TDEToggleToolBarAction(
                 toolBar,
                 toolBar->label(),
                 m_actionCollection,
@@ -112,11 +112,11 @@ namespace
             m_toolBarActions.append( action );
         }
 
-        KActionCollection *m_actionCollection;
-        KMainWindow *m_mainWindow;
+        TDEActionCollection *m_actionCollection;
+        TDEMainWindow *m_mainWindow;
 
-        TQPtrList<KToolBar> m_toolBars;
-        TQPtrList<KAction> m_toolBarActions;
+        TQPtrList<TDEToolBar> m_toolBars;
+        TQPtrList<TDEAction> m_toolBarActions;
 
         bool m_needsRebuild : 1;
     };
@@ -124,13 +124,13 @@ namespace
 
 using namespace KDEPrivate;
 
-ToolBarHandler::ToolBarHandler( KMainWindow *mainWindow, const char *name )
+ToolBarHandler::ToolBarHandler( TDEMainWindow *mainWindow, const char *name )
     : TQObject( mainWindow, name ), KXMLGUIClient( mainWindow )
 {
     init( mainWindow );
 }
 
-ToolBarHandler::ToolBarHandler( KMainWindow *mainWindow, TQObject *parent, const char *name )
+ToolBarHandler::ToolBarHandler( TDEMainWindow *mainWindow, TQObject *parent, const char *name )
     : TQObject( parent, name ), KXMLGUIClient( mainWindow )
 {
     init( mainWindow );
@@ -142,7 +142,7 @@ ToolBarHandler::~ToolBarHandler()
     m_actions.clear();
 }
 
-KAction *ToolBarHandler::toolBarMenuAction()
+TDEAction *ToolBarHandler::toolBarMenuAction()
 {
     assert( m_actions.count() == 1 );
     return m_actions.getFirst();
@@ -167,7 +167,7 @@ void ToolBarHandler::setupActions()
     m_actions = builder.create();
 
     /*
-    for (  TQPtrListIterator<KToolBar> toolBarIt( m_toolBars );
+    for (  TQPtrListIterator<TDEToolBar> toolBarIt( m_toolBars );
            toolBarIt.current(); ++toolBarIt )
         toolBarIt.current()->disconnect( this );
         */
@@ -175,13 +175,13 @@ void ToolBarHandler::setupActions()
     m_toolBars = builder.toolBars();
 
     /*
-    for (  TQPtrListIterator<KToolBar> toolBarIt( m_toolBars );
+    for (  TQPtrListIterator<TDEToolBar> toolBarIt( m_toolBars );
            toolBarIt.current(); ++toolBarIt )
         connect( toolBarIt.current(), TQT_SIGNAL( destroyed() ),
                  this, TQT_SLOT( setupActions() ) );
                  */
 
-    if (kapp && kapp->authorizeKAction("options_show_toolbar"))
+    if (kapp && kapp->authorizeTDEAction("options_show_toolbar"))
 	plugActionList( actionListName, m_actions );
 
     connectToActionContainers();
@@ -193,7 +193,7 @@ void ToolBarHandler::clientAdded( KXMLGUIClient *client )
         setupActions();
 }
 
-void ToolBarHandler::init( KMainWindow *mainWindow )
+void ToolBarHandler::init( TDEMainWindow *mainWindow )
 {
     d = 0;
     m_mainWindow = mainWindow;
@@ -218,12 +218,12 @@ void ToolBarHandler::init( KMainWindow *mainWindow )
 
 void ToolBarHandler::connectToActionContainers()
 {
-    TQPtrListIterator<KAction> actionIt( m_actions );
+    TQPtrListIterator<TDEAction> actionIt( m_actions );
     for ( ; actionIt.current(); ++actionIt )
         connectToActionContainer( actionIt.current() );
 }
 
-void ToolBarHandler::connectToActionContainer( KAction *action )
+void ToolBarHandler::connectToActionContainer( TDEAction *action )
 {
     uint containerCount = action->containerCount();
     for ( uint i = 0; i < containerCount; ++i )
@@ -240,7 +240,7 @@ void ToolBarHandler::connectToActionContainer( TQWidget *container )
              this, TQT_SLOT( setupActions() ) );
 }
 
-#include "ktoolbarhandler.moc"
+#include "tdetoolbarhandler.moc"
 
 /* vim: et sw=4 ts=4
  */
diff --git a/tdeui/ktoolbarhandler.h b/tdeui/tdetoolbarhandler.h
index e6336967f..729129a67 100644
--- a/tdeui/ktoolbarhandler.h
+++ b/tdeui/tdetoolbarhandler.h
@@ -23,8 +23,8 @@
 #include <tqguardedptr.h>
 #include <kxmlguiclient.h>
 
-class KMainWindow;
-class KToolBar;
+class TDEMainWindow;
+class TDEToolBar;
 
 namespace KDEPrivate
 {
@@ -35,11 +35,11 @@ class ToolBarHandler : public TQObject,
 {
     Q_OBJECT
 public:
-    ToolBarHandler( KMainWindow *mainWindow, const char *name = 0 );
-    ToolBarHandler( KMainWindow *mainWindow, TQObject *parent, const char *name = 0 );
+    ToolBarHandler( TDEMainWindow *mainWindow, const char *name = 0 );
+    ToolBarHandler( TDEMainWindow *mainWindow, TQObject *parent, const char *name = 0 );
     virtual ~ToolBarHandler();
 
-    KAction *toolBarMenuAction();
+    TDEAction *toolBarMenuAction();
 
 public slots:
     void setupActions();
@@ -48,17 +48,17 @@ private slots:
     void clientAdded( KXMLGUIClient *client );
 
 private:
-    void init( KMainWindow *mainWindow );
+    void init( TDEMainWindow *mainWindow );
     void connectToActionContainers();
-    void connectToActionContainer( KAction *action );
+    void connectToActionContainer( TDEAction *action );
     void connectToActionContainer( TQWidget *container );
 
     struct Data;
     Data *d;
 
-    TQGuardedPtr<KMainWindow> m_mainWindow;
-    TQPtrList<KAction> m_actions;
-    TQPtrList<KToolBar> m_toolBars;
+    TQGuardedPtr<TDEMainWindow> m_mainWindow;
+    TQPtrList<TDEAction> m_actions;
+    TQPtrList<TDEToolBar> m_toolBars;
 };
 
 } // namespace KDEPrivate
diff --git a/tdeui/ktoolbarlabelaction.cpp b/tdeui/tdetoolbarlabelaction.cpp
index b86906e57..dcac8fc8b 100644
--- a/tdeui/ktoolbarlabelaction.cpp
+++ b/tdeui/tdetoolbarlabelaction.cpp
@@ -16,15 +16,15 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "ktoolbarlabelaction.h"
+#include "tdetoolbarlabelaction.h"
 
 #include <tqlabel.h>
 #include <tqapplication.h>
 
-class KToolBarLabelAction::KToolBarLabelActionPrivate
+class TDEToolBarLabelAction::TDEToolBarLabelActionPrivate
 {
 public:
-  KToolBarLabelActionPrivate()
+  TDEToolBarLabelActionPrivate()
     : m_label(0)
   {
   }
@@ -32,53 +32,53 @@ public:
 };
 
 
-KToolBarLabelAction::KToolBarLabelAction(const TQString &text,
-					 const KShortcut &cut,
+TDEToolBarLabelAction::TDEToolBarLabelAction(const TQString &text,
+					 const TDEShortcut &cut,
 					 const TQObject *receiver, 
 					 const char *slot,
-					 KActionCollection *parent,
+					 TDEActionCollection *parent,
 					 const char *name)
   : KWidgetAction(new TQLabel(text, 0, "kde toolbar widget"), text, cut,
 		  receiver, slot, parent, name), 
-    d(new KToolBarLabelActionPrivate)
+    d(new TDEToolBarLabelActionPrivate)
 {
   init();
 }
 
-KToolBarLabelAction::KToolBarLabelAction(TQWidget* buddy, 
+TDEToolBarLabelAction::TDEToolBarLabelAction(TQWidget* buddy, 
 					 const TQString &text,
-					 const KShortcut &cut,
+					 const TDEShortcut &cut,
 					 const TQObject *receiver, 
 					 const char *slot,
- 					 KActionCollection *parent, 
+ 					 TDEActionCollection *parent, 
 					 const char *name)
   : KWidgetAction(new TQLabel(buddy, text, 0, "kde toolbar widget"), text, 
 		  cut, receiver, slot, parent, name),
-    d(new KToolBarLabelActionPrivate)
+    d(new TDEToolBarLabelActionPrivate)
 {
   init();
 }
 
-KToolBarLabelAction::KToolBarLabelAction(TQLabel* label, 
-					 const KShortcut &cut, 
+TDEToolBarLabelAction::TDEToolBarLabelAction(TQLabel* label, 
+					 const TDEShortcut &cut, 
 					 const TQObject *receiver,
 					 const char *slot,
-					 KActionCollection* parent, 
+					 TDEActionCollection* parent, 
 					 const char *name)
   : KWidgetAction(label, label->text(), cut, receiver, slot, parent, name),
-    d(new KToolBarLabelActionPrivate)
+    d(new TDEToolBarLabelActionPrivate)
 {
   Q_ASSERT(TQString::fromLatin1("kde toolbar widget") == label->name());
   init();
 }
 
-KToolBarLabelAction::~KToolBarLabelAction()
+TDEToolBarLabelAction::~TDEToolBarLabelAction()
 {
   delete d;
   d = 0;
 }
 
-void KToolBarLabelAction::init()
+void TDEToolBarLabelAction::init()
 {
   d->m_label = static_cast<TQLabel*>(widget());
   /* these lines were copied from Konqueror's KonqDraggableLabel class in
@@ -90,28 +90,28 @@ void KToolBarLabelAction::init()
   d->m_label->adjustSize();
 }
 
-void KToolBarLabelAction::setText(const TQString& text)
+void TDEToolBarLabelAction::setText(const TQString& text)
 {
   KWidgetAction::setText(text);
   d->m_label->setText(text);
 }
 
-void KToolBarLabelAction::setBuddy(TQWidget* buddy)
+void TDEToolBarLabelAction::setBuddy(TQWidget* buddy)
 {
   d->m_label->setBuddy(buddy);
 }
 
-TQWidget* KToolBarLabelAction::buddy() const
+TQWidget* TDEToolBarLabelAction::buddy() const
 {
   return d->m_label->buddy();
 }
 
-TQLabel* KToolBarLabelAction::label() const
+TQLabel* TDEToolBarLabelAction::label() const
 {
   return d->m_label;
 }
 
-void KToolBarLabelAction::virtual_hook(int, void*)
+void TDEToolBarLabelAction::virtual_hook(int, void*)
 {
 
 }
diff --git a/tdeui/ktoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h
index 2cf7c99be..0bf893cc2 100644
--- a/tdeui/ktoolbarlabelaction.h
+++ b/tdeui/tdetoolbarlabelaction.h
@@ -18,14 +18,14 @@
 #ifndef KTOOLBARLABELACTION_H
 #define KTOOLBARLABELACTION_H
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 class TQLabel;
 
 /**
  * @short Class to display a label in a toolbar.
  *
- * KToolBarLabelAction is a convenience class for displaying a label in a
+ * TDEToolBarLabelAction is a convenience class for displaying a label in a
  * toolbar.
  *
  * It provides easy access to the label's #setBuddy(TQWidget*) and #buddy()
@@ -38,7 +38,7 @@ class TQLabel;
  *   = new KWidgetAction(findCombo, i18n("F&ind Combo"), Qt::Key_F6, this,
  *                       TQT_SLOT(slotFocus()), actionCollection(), "find_combo");
  *
- * new KToolBarLabelAction(findCombo, i18n("F&ind "), 0, this,
+ * new TDEToolBarLabelAction(findCombo, i18n("F&ind "), 0, this,
  *                         TQT_SLOT(slotFocus()), actionCollection(),
  *             "find_label");
  *
@@ -46,7 +46,7 @@ class TQLabel;
  *
  * @author Felix Berger <felixberger@beldesign.de>
  */
-class TDEUI_EXPORT KToolBarLabelAction : public KWidgetAction
+class TDEUI_EXPORT TDEToolBarLabelAction : public KWidgetAction
 {
 public:
   /**
@@ -59,10 +59,10 @@ public:
    * @param parent This action's parent.
    * @param name An internal name for this action.
    */
-  KToolBarLabelAction(const TQString &text,
-		      const KShortcut &cut,
+  TDEToolBarLabelAction(const TQString &text,
+		      const TDEShortcut &cut,
 		      const TQObject *receiver, const char *slot,
-		      KActionCollection *parent, const char *name);
+		      TDEActionCollection *parent, const char *name);
   /**
    * Constructs a toolbar label setting a buddy for the label.
    *
@@ -75,10 +75,10 @@ public:
    * @param parent This action's parent.
    * @param name An internal name for this action.
    */
-  KToolBarLabelAction(TQWidget* buddy, const TQString &text,
-		      const KShortcut &cut,
+  TDEToolBarLabelAction(TQWidget* buddy, const TQString &text,
+		      const TDEShortcut &cut,
 		      const TQObject *receiver, const char *slot,
-		      KActionCollection *parent, const char *name);
+		      TDEActionCollection *parent, const char *name);
   /**
    * Constructs a toolbar label for a label.
    *
@@ -98,11 +98,11 @@ public:
    * @param parent This action's parent.
    * @param name An internal name for this action.
    */
-  KToolBarLabelAction(TQLabel* label, const KShortcut &cut, 
+  TDEToolBarLabelAction(TQLabel* label, const TDEShortcut &cut, 
 		      const TQObject *receiver, const char *slot,
-		      KActionCollection* parent, const char *name);
+		      TDEActionCollection* parent, const char *name);
 
-  virtual ~KToolBarLabelAction();
+  virtual ~TDEToolBarLabelAction();
   /**
    * Reimplemented to update both the action's text and the label's text.
    */
@@ -128,8 +128,8 @@ protected:
   virtual void virtual_hook(int id, void* data);
 
 private:
-  class KToolBarLabelActionPrivate;
-  KToolBarLabelActionPrivate *d;
+  class TDEToolBarLabelActionPrivate;
+  TDEToolBarLabelActionPrivate *d;
   void init();
 };
 
diff --git a/tdeui/ktoolbarradiogroup.cpp b/tdeui/tdetoolbarradiogroup.cpp
index ab8e50e08..937354357 100644
--- a/tdeui/ktoolbarradiogroup.cpp
+++ b/tdeui/tdetoolbarradiogroup.cpp
@@ -22,36 +22,36 @@
 
 #include <config.h>
 
-#include "ktoolbarradiogroup.h"
-#include "ktoolbar.h"
-#include "ktoolbarbutton.h"
+#include "tdetoolbarradiogroup.h"
+#include "tdetoolbar.h"
+#include "tdetoolbarbutton.h"
 
 /*************************************************************************
- *                          KToolBarRadioGroup                                  *
+ *                          TDEToolBarRadioGroup                                  *
  *************************************************************************/
 
 
-KToolBarRadioGroup::KToolBarRadioGroup (KToolBar *_parent, const char *_name)
+TDEToolBarRadioGroup::TDEToolBarRadioGroup (TDEToolBar *_parent, const char *_name)
 : TQObject(_parent, _name)
 {
-  buttons = new KToolBarButtonList();
+  buttons = new TDEToolBarButtonList();
   tb = _parent;
   connect (tb, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int)));
 }
 
-KToolBarRadioGroup::~KToolBarRadioGroup()
+TDEToolBarRadioGroup::~TDEToolBarRadioGroup()
 {
   delete buttons;
 }
 
-void KToolBarRadioGroup::addButton (int id)
+void TDEToolBarRadioGroup::addButton (int id)
 {
-    KToolBarButton *b = tb->getButton( id );
+    TDEToolBarButton *b = tb->getButton( id );
     b->setRadio( true );
     buttons->insert( id, b );
 }
 
-void KToolBarRadioGroup::removeButton (int id)
+void TDEToolBarRadioGroup::removeButton (int id)
 {
   if (!buttons->find(id))
      return;
@@ -59,11 +59,11 @@ void KToolBarRadioGroup::removeButton (int id)
   buttons->remove(id);
 }
 
-void KToolBarRadioGroup::slotToggled(int id)
+void TDEToolBarRadioGroup::slotToggled(int id)
 {
   if (buttons->find(id) && buttons->find(id)->isOn())
   {
-    TQIntDictIterator<KToolBarButton> it(*buttons);
+    TQIntDictIterator<TDEToolBarButton> it(*buttons);
     while (it.current())
     {
       if (it.currentKey() != id)
@@ -73,5 +73,5 @@ void KToolBarRadioGroup::slotToggled(int id)
   }
 }
 
-#include "ktoolbarradiogroup.moc"
+#include "tdetoolbarradiogroup.moc"
 
diff --git a/tdeui/ktoolbarradiogroup.h b/tdeui/tdetoolbarradiogroup.h
index 6b2cc5140..de567ae62 100644
--- a/tdeui/ktoolbarradiogroup.h
+++ b/tdeui/tdetoolbarradiogroup.h
@@ -26,19 +26,19 @@
 
 #include <tdelibs_export.h>
 
-class KToolBar;
-class KToolBarButtonList;
-class KToolBarRadioGroupPrivate;
+class TDEToolBar;
+class TDEToolBarButtonList;
+class TDEToolBarRadioGroupPrivate;
 
 /*************************************************************************
- *                          KToolBarRadioGroup                                  *
+ *                          TDEToolBarRadioGroup                                  *
  *************************************************************************/
  /**
   * @short Class for group of radio butons in toolbar.
   *
-  * KToolBarRadioGroup is class for group of radio butons in toolbar.
+  * TDEToolBarRadioGroup is class for group of radio butons in toolbar.
   * Take toggle buttons which you already inserted into toolbar,
-  * create KToolBarRadioGroup instance and add them here.
+  * create TDEToolBarRadioGroup instance and add them here.
   * All buttons will emit signals toggled (bool) (or you can
   * use sitgnal toggled (int id) from toolbar). When one button is set
   * down, all others are unset. All buttons emit signals - those who
@@ -46,19 +46,19 @@ class KToolBarRadioGroupPrivate;
   *
   * @author Sven Radej <radej@kde.org>
   */
-class TDEUI_EXPORT KToolBarRadioGroup : public TQObject
+class TDEUI_EXPORT TDEToolBarRadioGroup : public TQObject
 {
   Q_OBJECT
 
 public:
   /**
-   * Constructor. Parent must be KToolBar .
+   * Constructor. Parent must be TDEToolBar .
    */
-  KToolBarRadioGroup (KToolBar *_parent, const char *_name=0);
+  TDEToolBarRadioGroup (TDEToolBar *_parent, const char *_name=0);
   /**
    * Destructor.
    */
-  ~KToolBarRadioGroup ();
+  ~TDEToolBarRadioGroup ();
 
   /**
    * Adds button to group. Button cannot be unset by mouse clicks (you
@@ -79,10 +79,10 @@ public slots:
   void slotToggled (int);
 
 private:
-  KToolBarButtonList *buttons;
-  KToolBar *tb;
+  TDEToolBarButtonList *buttons;
+  TDEToolBar *tb;
 
-  KToolBarRadioGroupPrivate *d;
+  TDEToolBarRadioGroupPrivate *d;
 };
 
 #endif
diff --git a/tdeui/tests/CMakeLists.txt b/tdeui/tests/CMakeLists.txt
index 9b3cc6568..719902623 100644
--- a/tdeui/tests/CMakeLists.txt
+++ b/tdeui/tests/CMakeLists.txt
@@ -27,21 +27,21 @@ set( test_PROGS
   kcolortest kcolordlgtest kcomboboxtest kcompletiontest
   kdatepicktest kdatewidgettest kdialogbasetest
   kdockwidgetdemo kdockwidgettest
-  kdualcolortest keditlistboxtest kfontdialogtest
+  kdualcolortest keditlistboxtest tdefontdialogtest
   kgradienttest khashtest kdesattest
   kledtest klineedittest klineeditdlgtest
   kmessageboxtest knuminputtest
   kpalettetest
-  kpopuptest kprogresstest krulertest kseparatortest
+  tdepopuptest kprogresstest krulertest kseparatortest
   kstatusbartest ktabctltest
   kunbalancedgrdtest twindowtest kwizardtest
   itemcontainertest kpanelmenutest kedittest
-  kxmlguitest kaccelgentest ksystemtraytest klistviewtest
-  ktextedittest kmainwindowtest kmainwindowrestoretest
-  kactiontest kdatetimewidgettest ktimewidgettest
-  kspelltest kinputdialogtest ktabwidgettest kwordwraptest
+  kxmlguitest tdeaccelgentest ksystemtraytest tdelistviewtest
+  ktextedittest tdemainwindowtest tdemainwindowrestoretest
+  tdeactiontest kdatetimewidgettest ktimewidgettest
+  tdespelltest kinputdialogtest ktabwidgettest kwordwraptest
   kdocktest qxembedtest ksqueezedtextlabeltest
-  kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
+  kpixmapregionselectordialogtest kjanuswidgettest tdetoolbarlabelactiontest
 )
 
 foreach( PROG ${test_PROGS} )
diff --git a/tdeui/tests/Makefile.am b/tdeui/tests/Makefile.am
index a7c0cb26d..361d437a9 100644
--- a/tdeui/tests/Makefile.am
+++ b/tdeui/tests/Makefile.am
@@ -26,21 +26,21 @@ check_PROGRAMS = kaboutdialogtest kblendtest kbuttonboxtest kcharselecttest \
 	kcolortest kcolordlgtest kcomboboxtest kcompletiontest \
 	kdatepicktest kdatewidgettest kdialogbasetest \
 	kdockwidgetdemo kdockwidgettest \
-	kdualcolortest keditlistboxtest kfontdialogtest \
+	kdualcolortest keditlistboxtest tdefontdialogtest \
 	kgradienttest khashtest kdesattest\
 	kledtest klineedittest klineeditdlgtest \
 	kmessageboxtest knuminputtest \
 	kpalettetest \
-	kpopuptest kprogresstest krulertest kseparatortest \
+	tdepopuptest kprogresstest krulertest kseparatortest \
 	kstatusbartest ktabctltest \
 	kunbalancedgrdtest twindowtest kwizardtest \
 	itemcontainertest kpanelmenutest kedittest \
-	kxmlguitest kaccelgentest ksystemtraytest klistviewtest \
-	ktextedittest kmainwindowtest kmainwindowrestoretest \
-	kactiontest kdatetimewidgettest ktimewidgettest \
-	kspelltest kinputdialogtest ktabwidgettest kwordwraptest \
+	kxmlguitest tdeaccelgentest ksystemtraytest tdelistviewtest \
+	ktextedittest tdemainwindowtest tdemainwindowrestoretest \
+	tdeactiontest kdatetimewidgettest ktimewidgettest \
+	tdespelltest kinputdialogtest ktabwidgettest kwordwraptest \
 	kdocktest qxembedtest ksqueezedtextlabeltest \
-	kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
+	kpixmapregionselectordialogtest kjanuswidgettest tdetoolbarlabelactiontest
 
 METASOURCES = AUTO
 
@@ -62,7 +62,7 @@ kdialogbasetest_SOURCES = kdialogbasetest.cpp
 kdualcolortest_SOURCES = kdualcolortest.cpp
 kedittest_SOURCES = kedittest.cpp
 keditlistboxtest_SOURCES = keditlistboxtest.cpp
-kfontdialogtest_SOURCES = kfontdialogtest.cpp
+tdefontdialogtest_SOURCES = tdefontdialogtest.cpp
 kgradienttest_SOURCES = kgradienttest.cpp
 khashtest_SOURCES = khashtest.cpp
 kledtest_SOURCES = kledtest.cpp
@@ -71,7 +71,7 @@ klineeditdlgtest_SOURCES = klineeditdlgtest.cpp
 kmessageboxtest_SOURCES = kmessageboxtest.cpp
 knuminputtest_SOURCES = knuminputtest.cpp
 kpalettetest_SOURCES = kpalettetest.cpp
-kpopuptest_SOURCES = kpopuptest.cpp
+tdepopuptest_SOURCES = tdepopuptest.cpp
 kprogresstest_SOURCES = kprogresstest.cpp
 krulertest_SOURCES = krulertest.cpp
 kseparatortest_SOURCES = kseparatortest.cpp
@@ -86,14 +86,14 @@ kpanelmenutest_SOURCES = kpanelmenutest.cpp
 kdockwidgetdemo_SOURCES = kdockwidgetdemo.cpp
 kdockwidgettest_SOURCES = kdockwidgettest.cpp
 kxmlguitest_SOURCES = kxmlguitest.cpp
-kaccelgentest_SOURCES = kaccelgentest.cpp
+tdeaccelgentest_SOURCES = tdeaccelgentest.cpp
 ksystemtraytest_SOURCES = ksystemtraytest.cpp
-klistviewtest_SOURCES = klistviewtest.cpp
+tdelistviewtest_SOURCES = tdelistviewtest.cpp
 ktextedittest_SOURCES = ktextedittest.cpp
-kmainwindowtest_SOURCES = kmainwindowtest.cpp
-kmainwindowrestoretest_SOURCES = kmainwindowrestoretest.cpp
-kactiontest_SOURCES = kactiontest.cpp
-kspelltest_SOURCES = kspelltest.cpp
+tdemainwindowtest_SOURCES = tdemainwindowtest.cpp
+tdemainwindowrestoretest_SOURCES = tdemainwindowrestoretest.cpp
+tdeactiontest_SOURCES = tdeactiontest.cpp
+tdespelltest_SOURCES = tdespelltest.cpp
 kinputdialogtest_SOURCES = kinputdialogtest.cpp
 ktabwidgettest_SOURCES = ktabwidgettest.cpp
 kwordwraptest_SOURCES = kwordwraptest.cpp
@@ -102,4 +102,4 @@ qxembedtest_SOURCES=qxembedtest.cpp
 ksqueezedtextlabeltest_SOURCES = ksqueezedtextlabeltest.cpp
 kjanuswidgettest_SOURCES = kjanuswidgettest.cpp
 kpixmapregionselectordialogtest_SOURCES = kpixmapregionselectordialogtest.cpp
-ktoolbarlabelactiontest_SOURCES = ktoolbarlabelactiontest.cpp
+tdetoolbarlabelactiontest_SOURCES = tdetoolbarlabelactiontest.cpp
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index 1767bec5f..c3b6d1ddc 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -1,5 +1,5 @@
 /*
-* Tests the item container widgets KIconView, KListView, KListBox
+* Tests the item container widgets TDEIconView, TDEListView, TDEListBox
 *
 * Copyright (c) 2000 by Michael Reiher <michael.reiher@gmx.de>
 *
@@ -16,12 +16,12 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
+#include <tdeconfig.h>
 #include <kiconview.h>
-#include <klistview.h>
-#include <klistbox.h>
+#include <tdelistview.h>
+#include <tdelistbox.h>
 
 #include "itemcontainertest.h"
 
@@ -54,7 +54,7 @@ static const char * item_xpm[] = {
 "        ......        "};
 
 
-KApplication *app;
+TDEApplication *app;
 
 TopLevel::TopLevel(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
@@ -88,25 +88,25 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     m_plblItem = new TQLabel( gbItem );
     vBox->addWidget( gbItem );
 
-    TQButtonGroup* bgListView = new TQButtonGroup( 1, Qt::Horizontal, "KListView", this);
+    TQButtonGroup* bgListView = new TQButtonGroup( 1, Qt::Horizontal, "TDEListView", this);
     TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView);
     vBox->addWidget( bgListView );
     connect( cbListView, TQT_SIGNAL( toggled( bool ) ),
 	     this, TQT_SLOT( slotToggleSingleColumn( bool ) ) );
 
-    KGlobal::config()->reparseConfiguration();
+    TDEGlobal::config()->reparseConfiguration();
 
     //Create IconView
-    TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "KIconView", this);
-    m_pIconView = new KIconView( gbIconView );
+    TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "TDEIconView", this);
+    m_pIconView = new TDEIconView( gbIconView );
     hBox->addWidget( gbIconView );
     hBox->addSpacing( 5 );
     connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
 	     this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) );
 
     //Create ListView
-    TQGroupBox* gbListView = new TQGroupBox( 1, Qt::Horizontal, "KListView", this);
-    m_pListView = new KListView( gbListView );
+    TQGroupBox* gbListView = new TQGroupBox( 1, Qt::Horizontal, "TDEListView", this);
+    m_pListView = new TDEListView( gbListView );
     m_pListView->addColumn("Item");
     m_pListView->addColumn("Text");
     hBox->addWidget( gbListView );
@@ -115,8 +115,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
 	     this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) );
 
     //Create ListBox
-    TQGroupBox* gbListBox = new TQGroupBox( 1, Qt::Horizontal, "KListBox", this);
-    m_pListBox = new KListBox( gbListBox );
+    TQGroupBox* gbListBox = new TQGroupBox( 1, Qt::Horizontal, "TDEListBox", this);
+    m_pListBox = new TDEListBox( gbListBox );
     hBox->addWidget( gbListBox );
     connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ),
 	     this, TQT_SLOT( slotListBoxExec( TQListBoxItem* ) ) );
@@ -151,24 +151,24 @@ void TopLevel::slotSwitchMode( int id )
 
   switch( id ) {
   case TopLevel::NoSelection:
-    m_pIconView->setSelectionMode( KIconView::NoSelection );
+    m_pIconView->setSelectionMode( TDEIconView::NoSelection );
     m_pListView->setSelectionMode( TQListView::NoSelection );
-    m_pListBox->setSelectionMode( KListBox::NoSelection );
+    m_pListBox->setSelectionMode( TDEListBox::NoSelection );
     break;
   case TopLevel::Single:
-    m_pIconView->setSelectionMode( KIconView::Single );
+    m_pIconView->setSelectionMode( TDEIconView::Single );
     m_pListView->setSelectionMode( TQListView::Single );
-    m_pListBox->setSelectionMode( KListBox::Single );
+    m_pListBox->setSelectionMode( TDEListBox::Single );
     break;
   case TopLevel::Multi:
-    m_pIconView->setSelectionMode( KIconView::Multi );
+    m_pIconView->setSelectionMode( TDEIconView::Multi );
     m_pListView->setSelectionMode( TQListView::Multi );
-    m_pListBox->setSelectionMode( KListBox::Multi );
+    m_pListBox->setSelectionMode( TDEListBox::Multi );
     break;
   case TopLevel::Extended:
-    m_pIconView->setSelectionMode( KIconView::Extended );
+    m_pIconView->setSelectionMode( TDEIconView::Extended );
     m_pListView->setSelectionMode( TQListView::Extended );
-    m_pListBox->setSelectionMode( KListBox::Extended );
+    m_pListBox->setSelectionMode( TDEListBox::Extended );
     break;
   default:
     Q_ASSERT(0);
@@ -177,7 +177,7 @@ void TopLevel::slotSwitchMode( int id )
 
 void TopLevel::slotIconViewExec( TQIconViewItem* item )
 {
-  m_plblWidget->setText("KIconView");
+  m_plblWidget->setText("TDEIconView");
   m_plblSignal->setText("executed");
   if( item ) 
     m_plblItem->setText( item->text() );
@@ -187,7 +187,7 @@ void TopLevel::slotIconViewExec( TQIconViewItem* item )
 
 void TopLevel::slotListViewExec( TQListViewItem* item )
 {
-  m_plblWidget->setText("KListView");
+  m_plblWidget->setText("TDEListView");
   m_plblSignal->setText("executed");
   if( item ) 
     m_plblItem->setText( item->text(0) );
@@ -197,7 +197,7 @@ void TopLevel::slotListViewExec( TQListViewItem* item )
 
 void TopLevel::slotListBoxExec( TQListBoxItem* item )
 {
-  m_plblWidget->setText("KListBox");
+  m_plblWidget->setText("TDEListBox");
   m_plblSignal->setText("executed");
   if( item ) 
     m_plblItem->setText( item->text() );
@@ -212,7 +212,7 @@ void TopLevel::slotToggleSingleColumn( bool b )
 
 int main( int argc, char ** argv )
 {
-    app = new KApplication ( argc, argv, "ItemContainerTest" );
+    app = new TDEApplication ( argc, argv, "ItemContainerTest" );
 
     TopLevel *toplevel = new TopLevel(0, "itemcontainertest");
 
diff --git a/tdeui/tests/itemcontainertest.h b/tdeui/tests/itemcontainertest.h
index 86a356ab3..cb6cc3a51 100644
--- a/tdeui/tests/itemcontainertest.h
+++ b/tdeui/tests/itemcontainertest.h
@@ -3,9 +3,9 @@
 
 #include <tqwidget.h>
 
-class KIconView;
-class KListView;
-class KListBox;
+class TDEIconView;
+class TDEListView;
+class TDEListBox;
 class TQButtonGroup;
 class TQLabel;
 
@@ -31,9 +31,9 @@ public slots:
     void slotClicked( TQIconViewItem* ) { tqDebug("CLICK");}
     void slotDoubleClicked( TQIconViewItem* ) { tqDebug("DOUBLE CLICK");}
 protected:
-    KIconView* m_pIconView;
-    KListView* m_pListView;
-    KListBox* m_pListBox;
+    TDEIconView* m_pIconView;
+    TDEListView* m_pListView;
+    TDEListBox* m_pListBox;
 
     TQButtonGroup* m_pbgView;
     TQButtonGroup* m_pbgMode;
diff --git a/tdeui/tests/kaboutdialogtest.cpp b/tdeui/tests/kaboutdialogtest.cpp
index 6103c6ba4..e0680b52f 100644
--- a/tdeui/tests/kaboutdialogtest.cpp
+++ b/tdeui/tests/kaboutdialogtest.cpp
@@ -8,19 +8,19 @@
  * $Revision$
  */
 
-#include "kaboutdialog.h"
+#include "tdeaboutdialog.h"
 // #include <kimgio.h>
 #include <tqimage.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
-  (void)new KApplication(argc, argv, "KAboutDialogTest");
+  (void)new TDEApplication(argc, argv, "TDEAboutDialogTest");
   TQImage logo;
   TQImage bg;
   TQPixmap pix;
-  KAboutDialog about;
+  TDEAboutDialog about;
   // -----
   // kimgioRegister();
   if(logo.load("RayTracedGear.png"))
@@ -45,8 +45,8 @@ int main(int argc, char** argv)
 //      ("Cl&ose", "Close this dialog.",
 //       "<b>Close</b> the dialog<br>"
 //  	  "<i>(there are no settings to save).</i>");
-  about.setCaption("KAboutDialog example");
-  about.setVersion("KAboutDialog, Draft Study");
+  about.setCaption("TDEAboutDialog example");
+  about.setVersion("TDEAboutDialog, Draft Study");
   about.setHelp("kdehelp/intro.html", "intro");
   // ----- set the application author:
   about.setAuthor
diff --git a/tdeui/tests/kactiontest.cpp b/tdeui/tests/kactiontest.cpp
deleted file mode 100644
index ea97883c8..000000000
--- a/tdeui/tests/kactiontest.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#include <tqguardedptr.h>
-
-#include <kapplication.h>
-#include <kaction.h>
-
-#include <assert.h>
-
-int main( int argc, char **argv )
-{
-    KApplication app( argc, argv, "kactiontest" );
-
-    KActionCollection coll( static_cast<TQObject *>( 0 ) );
-
-    TQGuardedPtr<KAction> action1 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action2 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action3 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action4 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action5 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action6 = new KRadioAction("test",0, &coll);
-    TQGuardedPtr<KAction> action7 = new KRadioAction("test",0, &coll);
-   
-    coll.clear();
-    assert( coll.isEmpty() );
-
-    assert( action1.isNull() );
-    assert( action2.isNull() );
-    assert( action3.isNull() );
-    assert( action4.isNull() );
-    assert( action5.isNull() );
-    assert( action6.isNull() );
-    assert( action7.isNull() );
-    
-    return 0;
-}
-
-/* vim: et sw=4 ts=4
- */
diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp
index 59a57dc6a..4672b76ee 100644
--- a/tdeui/tests/kblendtest.cpp
+++ b/tdeui/tests/kblendtest.cpp
@@ -1,5 +1,5 @@
 #include "kblendtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
@@ -89,7 +89,7 @@ void KBlendWidget::paintEvent(TQPaintEvent */*ev*/)
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "KBlendTest");
+    TDEApplication app(argc, argv, "KBlendTest");
     KBlendWidget w;
     app.setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp
index 1773c47f9..c9eb1134b 100644
--- a/tdeui/tests/kbuttonboxtest.cpp
+++ b/tdeui/tests/kbuttonboxtest.cpp
@@ -16,7 +16,7 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kbuttonbox.h"
 #include <tqlayout.h>
 #include <tqlabel.h>
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 
 int main(int argc, char **argv) {
-  KApplication a(argc, argv, "dummy");
+  TDEApplication a(argc, argv, "dummy");
 
   // example 1
   {
diff --git a/tdeui/tests/kcharselecttest.cpp b/tdeui/tests/kcharselecttest.cpp
index facd17bca..5ee4ee381 100644
--- a/tdeui/tests/kcharselecttest.cpp
+++ b/tdeui/tests/kcharselecttest.cpp
@@ -1,10 +1,10 @@
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include "kcharselect.h"
 
 int main (int argc,char **argv)
 {
-    KApplication app( argc, argv, "kcharselecttest" );
+    TDEApplication app( argc, argv, "kcharselecttest" );
 
     KCharSelect selector( 0, "char selector" );
     selector.resize( selector.sizeHint() );
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index f372e6a96..dbe39484c 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -17,19 +17,19 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kcolordialog.h"
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 
 int main( int argc, char *argv[] )
 {
 	TQColor color;
 
-	KLocale::setMainCatalogue("tdelibs");
+	TDELocale::setMainCatalogue("tdelibs");
 	TQApplication::setColorMode( TQApplication::CustomColors );
-	KApplication a( argc, argv, "KColorDialogTest" );
-        KConfig aConfig;
+	TDEApplication a( argc, argv, "KColorDialogTest" );
+        TDEConfig aConfig;
         aConfig.setGroup( "KColorDialog-test" );
     
 	color = aConfig.readColorEntry( "Chosen" );
diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp
index 68f50371b..243de265b 100644
--- a/tdeui/tests/kcolortest.cpp
+++ b/tdeui/tests/kcolortest.cpp
@@ -1,6 +1,6 @@
 
 #include "kcolortest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <stdio.h>
 #include <tqdatetime.h>
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
       else
 	printf("Usage: %s [int_vs_fade | fullscreen [old_way]]\n ", argv[0]);
     }
-    KApplication *app = new KApplication(argc, argv, "KColorTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KColorTest");
     KColorWidget w;
     app->setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 44b849b44..d2b59a4c2 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -6,10 +6,10 @@
 
 #include <assert.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <ksimpleconfig.h>
 
@@ -52,7 +52,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
 
   m_ro = new KComboBox(hbox, "ReadOnlyCombo" );
   lbl->setBuddy (m_ro);
-  m_ro->setCompletionMode( KGlobalSettings::CompletionAuto );
+  m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto );
   TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
   TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
   vbox->addWidget (hbox);
@@ -139,10 +139,10 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   // Setup konq's combobox
   KSimpleConfig historyConfig( "konq_history" );
   historyConfig.setGroup( "Location Bar" );
-  KCompletion * s_pCompletion = new KCompletion;
-  s_pCompletion->setOrder( KCompletion::Weighted );
+  TDECompletion * s_pCompletion = new TDECompletion;
+  s_pCompletion->setOrder( TDECompletion::Weighted );
   s_pCompletion->setItems( historyConfig.readListEntry( "ComboContents" ) );
-  s_pCompletion->setCompletionMode( KGlobalSettings::completionMode() );
+  s_pCompletion->setCompletionMode( TDEGlobalSettings::completionMode() );
   m_konqc->setCompletionObject( s_pCompletion );
 
   TQPixmap pix = SmallIcon("www");
@@ -217,7 +217,7 @@ void KComboBoxTest::quitApp()
 
 int main ( int argc, char **argv)
 {
-  KApplication a(argc, argv, "kcomboboxtest");
+  TDEApplication a(argc, argv, "kcomboboxtest");
   KComboBoxTest* t= new KComboBoxTest;
   a.setMainWidget (t);
   t->show ();
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index 3e60a0ddd..261534465 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './kcompletiontest.ui'
 **
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 /*
@@ -186,7 +186,7 @@ TQStringList Form1::defaultItems() const
 
 int main(int argc, char **argv )
 {
-    KApplication app( argc, argv, "kcompletiontest" );
+    TDEApplication app( argc, argv, "kcompletiontest" );
 
     Form1 *form = new Form1();
     form->show();
diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp
index bea01a434..8bdab90a4 100644
--- a/tdeui/tests/kdatepicktest.cpp
+++ b/tdeui/tests/kdatepicktest.cpp
@@ -1,12 +1,12 @@
 #include "kdatepicker.h"
 #include <tqlineedit.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
-  KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KDatePickertest");
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEApplication app(argc, argv, "KDatePickertest");
   KDatePicker picker;
   app.setMainWidget(&picker);
   picker.show();
diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp
index ab55b0a32..f94a2a9f7 100644
--- a/tdeui/tests/kdatetimewidgettest.cpp
+++ b/tdeui/tests/kdatetimewidgettest.cpp
@@ -1,11 +1,11 @@
 #include "kdatetimewidget.h"
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
-  KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KDateTimeWidgettest");
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEApplication app(argc, argv, "KDateTimeWidgettest");
   KDateTimeWidget dateTimeWidget;
   app.setMainWidget(&dateTimeWidget);
   dateTimeWidget.show();
diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp
index af75b42bc..22340b4c9 100644
--- a/tdeui/tests/kdatewidgettest.cpp
+++ b/tdeui/tests/kdatewidgettest.cpp
@@ -1,12 +1,12 @@
 #include "kdatewidget.h"
 #include <tqlineedit.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
-  KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KDateWidgettest");
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEApplication app(argc, argv, "KDateWidgettest");
   KDateWidget dateWidget;
   app.setMainWidget(&dateWidget);
   dateWidget.show();
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index 28f7d4cf2..8eab0b125 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -1,5 +1,5 @@
 #include "kdesattest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
@@ -55,7 +55,7 @@ void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KDesatTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KDesatTest");
     KDesatWidget w;
     app->setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp
index c3653b59f..7f8023bd2 100644
--- a/tdeui/tests/kdialogbasetest.cpp
+++ b/tdeui/tests/kdialogbasetest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 
 #include <tqstring.h>
@@ -6,7 +6,7 @@
 
 int main(int argc, char** argv)
 {
-  KApplication app(argc, argv, "DialogBaseTest");
+  TDEApplication app(argc, argv, "DialogBaseTest");
   // -----
   TQString text= // the explanation shown by the example dialog
     "<center><h1>DialogBase Example</h1></center><hr><br>"
diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp
index 84895c414..538e2b888 100644
--- a/tdeui/tests/kdocktest.cpp
+++ b/tdeui/tests/kdocktest.cpp
@@ -1,6 +1,6 @@
 #include "kdocktest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <tqwidget.h>
@@ -54,7 +54,7 @@ DockTest::DockTest( TQWidget* parent )
 int
 main( int argc, char** argv )
 {
-  KApplication a( argc,argv, "docktest" );
+  TDEApplication a( argc,argv, "docktest" );
   DockTest* ap = new DockTest();
   ap->setCaption("DockWidget demo");
   a.setMainWidget( ap );
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index 7847a6299..a922acf2d 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -19,8 +19,8 @@
 #include <tqstrlist.h>
 #include <tqpainter.h>
 
-#include <kconfig.h>
-#include <kapplication.h>
+#include <tdeconfig.h>
+#include <tdeapplication.h>
 //#include <kimgio.h>
 #include <stdlib.h>
 
@@ -81,7 +81,7 @@ static const char *preview_xpm[] = {
 SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const char* name )
 :TQDialog(0L,name,true)
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup( TQString::fromLatin1("SFileDialogData:") + name );
   if ( initially.isNull() ){
     initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() );
@@ -166,7 +166,7 @@ void SFileDialog::dockChange()
 
 SFileDialog::~SFileDialog()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup( TQString("SFileDialogData:") + name() );
   config->writeEntry( "Bookmarks", fd->getBookmark() );
 
@@ -188,7 +188,7 @@ void SFileDialog::setDockDefaultPos( KDockWidget* d )
 void SFileDialog::changeDir( const TQString& f )
 {
   if ( !f.isEmpty() ){
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( TQString("SFileDialogData:") + name() );
     config->writePathEntry( "InitiallyDir", f );
   }
@@ -768,7 +768,7 @@ TQString DirectoryView::selectedDir()
 /**********************************************************************************************/
 
 int main(int argc, char* argv[]) {
-  KApplication app(argc,argv,"kdockwidgetdemo");
+  TDEApplication app(argc,argv,"kdockwidgetdemo");
 
 #if 0
   SFileDialog* openfile = new SFileDialog();
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index 74d8ecac4..aacac19a0 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -15,11 +15,11 @@
 #include "kdockwidgettest.h"
 
 #include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
-#include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdemenubar.h>
+#include <tdetoolbar.h>
 #include <tqvbox.h>
 
 static const char*folder[]={
@@ -184,7 +184,7 @@ void DockApplication::initMenuBar()
 void DockApplication::initToolBars()
 {
   TQPixmap p(folder);
-  KToolBar* tool_bar_0 = toolBar(0);
+  TDEToolBar* tool_bar_0 = toolBar(0);
   tool_bar_0->setFullSize(false);
   tool_bar_0->insertButton( p, 1 );
   tool_bar_0->insertButton(p, 2 );
@@ -242,7 +242,7 @@ void DockApplication::gSetPix2() {
 }
 
 int main(int argc, char* argv[]) {
-  KApplication a(argc,argv, "kdockdemoapp1");
+  TDEApplication a(argc,argv, "kdockdemoapp1");
   DockApplication* ap = new DockApplication("DockWidget demo");
   ap->setCaption("DockWidget demo");
   a.setMainWidget(ap);
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index 6fa2d1571..512bfc610 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -1,7 +1,7 @@
 #include "kdualcolortest.h"
 #include <kdualcolorbutton.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqpalette.h>
 
@@ -51,7 +51,7 @@ void KDualColorWidget::slotCurrentChanged(KDualColorButton::DualColor current)
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KDualColorTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KDualColorTest");
     KDualColorWidget w;
     app->setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp
index 90dbb74d0..5b4e45ddb 100644
--- a/tdeui/tests/keditlistboxtest.cpp
+++ b/tdeui/tests/keditlistboxtest.cpp
@@ -1,10 +1,10 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditlistbox.h>
 #include <kcombobox.h>
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "keditlistboxtest" );
+    TDEApplication app( argc, argv, "keditlistboxtest" );
 
     KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) );
     KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"),
diff --git a/tdeui/tests/kedittest.cpp b/tdeui/tests/kedittest.cpp
index 17a593e74..f806c3bdf 100644
--- a/tdeui/tests/kedittest.cpp
+++ b/tdeui/tests/kedittest.cpp
@@ -1,10 +1,10 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <keditcl.h>
 #include <tqpopupmenu.h>
 
 int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "kedittest" );
+  TDEApplication app( argc, argv, "kedittest" );
   KEdit *edit = new KEdit( 0L );
   TQPopupMenu *pop = new TQPopupMenu( 0L );
   pop->insertItem( "Popupmenu item" );
diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp
index 6942ca55d..4ee8c0f93 100644
--- a/tdeui/tests/kgradienttest.cpp
+++ b/tdeui/tests/kgradienttest.cpp
@@ -1,5 +1,5 @@
 #include "kgradienttest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
@@ -98,7 +98,7 @@ void KGradientWidget::paintEvent(TQPaintEvent */*ev*/)
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KGradientTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KGradientTest");
     KGradientWidget w;
     w.resize(250 * cols, 250 * rows);
     app->setMainWidget(&w);
diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp
index 2f00c9296..d392fcbc5 100644
--- a/tdeui/tests/khashtest.cpp
+++ b/tdeui/tests/khashtest.cpp
@@ -1,5 +1,5 @@
 #include "khashtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 #include <tqpainter.h>
@@ -126,7 +126,7 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/)
 int main(int argc, char **argv)
 {
 
-    KApplication *app = new KApplication(argc, argv, "KHashTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KHashTest");
     KHashWidget w;
     w.resize(250 * cols, 250 * rows);
     app->setMainWidget(&w);
diff --git a/tdeui/tests/kinputdialogtest.cpp b/tdeui/tests/kinputdialogtest.cpp
index 66db4617a..b40b5c562 100644
--- a/tdeui/tests/kinputdialogtest.cpp
+++ b/tdeui/tests/kinputdialogtest.cpp
@@ -3,7 +3,7 @@
  * License: GPL V2
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
 
@@ -12,7 +12,7 @@
 
 int main( int argc, char *argv[] )
 {
-  KApplication app( argc, argv, "kinputdialogtest" );
+  TDEApplication app( argc, argv, "kinputdialogtest" );
 
   bool ok;
   TQString svalue;
diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp
index 59db252e2..71e72fb13 100644
--- a/tdeui/tests/kjanuswidgettest.cpp
+++ b/tdeui/tests/kjanuswidgettest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kjanuswidget.h>
 
 #include <tqstring.h>
@@ -7,7 +7,7 @@
 
 int main(int argc, char** argv)
 {
-  KApplication app(argc, argv, "JanusWidgetTest");
+  TDEApplication app(argc, argv, "JanusWidgetTest");
   // -----
   KJanusWidget* janus = new KJanusWidget( 0, 0, KJanusWidget::IconList );
 
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index 54ae8b6e1..4ba158776 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <stdlib.h>
@@ -134,7 +134,7 @@ KLedTest::timeout()
 
 int main( int argc, char **argv )
 {
-    KApplication a( argc, argv, "KLedTest" );
+    TDEApplication a( argc, argv, "KLedTest" );
     KLedTest widget;
     // -----
     /*
diff --git a/tdeui/tests/klineeditdlgtest.cpp b/tdeui/tests/klineeditdlgtest.cpp
index 7db673bb1..ecc6ac984 100644
--- a/tdeui/tests/klineeditdlgtest.cpp
+++ b/tdeui/tests/klineeditdlgtest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineeditdlg.h>
 
 #include <tqstring.h>
@@ -6,7 +6,7 @@
 
 int main(int argc, char** argv)
 {
-  KApplication app(argc, argv, "klineedittest");
+  TDEApplication app(argc, argv, "klineedittest");
   KLineEditDlg dialog( "_text", "_value", 0L );
   if(dialog.exec())
     {
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 3508982fa..20e9b6ca8 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -4,15 +4,15 @@
 #include <tqhbox.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kglobalsettings.h>
-#include <kcompletionbox.h>
+#include <tdeglobalsettings.h>
+#include <tdecompletionbox.h>
 
 #include "klineedittest.h"
 
@@ -118,11 +118,11 @@ void KLineEditTest::slotHide()
 
 int main ( int argc, char **argv)
 {
-    KAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    KApplication::addCmdLineOptions();
+    TDEAboutData aboutData( "klineedittest", "klineedittest", "1.0" );
+    TDECmdLineArgs::init(argc, argv, &aboutData);
+    TDEApplication::addCmdLineOptions();
     
-    KApplication a;    
+    TDEApplication a;    
     KLineEditTest *t = new KLineEditTest();
     //t->lineEdit()->setTrapReturnKey( true );
     //t->lineEdit()->completionBox()->setTabHandling( false );
diff --git a/tdeui/tests/klistviewtest.cpp b/tdeui/tests/klistviewtest.cpp
deleted file mode 100644
index 6189c76e9..000000000
--- a/tdeui/tests/klistviewtest.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <klistview.h>
-#include <kapplication.h>
-#include <kdialogbase.h>
-#include <tqvbox.h>
-
-
-int main( int argc, char **argv )
-{
-	KApplication app( argc, argv, "klistviewtest" );
-	KDialogBase dialog;
-	KListView *view = new KListView( dialog.makeVBoxMainWidget() );
-	view->setSelectionModeExt( KListView::FileManager );
-	view->setDragEnabled( true );
-	view->setItemsMovable( false );
-	view->setAcceptDrops( true );
-	view->addColumn("Column 1");
-	view->addColumn("Column 2");
-	view->addColumn("Column 3");
-
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 1");
-	new KListViewItem( view, "Item 2", "Some more", "Hi Mom :)" );
-
-	view->restoreLayout( KGlobal::config(), "ListView" );
-
-	new KListViewItem( view, "Item 3" );
-
-	dialog.exec();
-	view->saveLayout( KGlobal::config(), "ListView" );
-
-	return 0;
-}
diff --git a/tdeui/tests/kmainwindowrestoretest.h b/tdeui/tests/kmainwindowrestoretest.h
deleted file mode 100644
index f29ae2fca..000000000
--- a/tdeui/tests/kmainwindowrestoretest.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
-#define _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
-
-#include <kmainwindow.h>
-
-class MainWin1 : public KMainWindow {
-  Q_OBJECT
-public:
-  MainWin1() : KMainWindow() {}
-  virtual ~MainWin1() {}
-};
-
-class MainWin2 : public KMainWindow {
-  Q_OBJECT
-public:
-  MainWin2() : KMainWindow() {}
-  virtual ~MainWin2() {}
-};
-
-class MainWin3 : public KMainWindow {
-  Q_OBJECT
-public:
-  MainWin3() : KMainWindow() {}
-  virtual ~MainWin3() {}
-};
-
-class MainWin4 : public KMainWindow {
-  Q_OBJECT
-public:
-  MainWin4() : KMainWindow() {}
-  virtual ~MainWin4() {}
-};
-
-class MainWin5 : public KMainWindow {
-  Q_OBJECT
-public:
-  MainWin5() : KMainWindow() {}
-  virtual ~MainWin5() {}
-};
-
-class MainWin6 : public KMainWindow {
-  Q_OBJECT
-public:
-  MainWin6() : KMainWindow() {}
-  virtual ~MainWin6() {}
-};
-
-#endif // _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index 3603edf57..2a56a7ead 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -1,4 +1,4 @@
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
 
 #include <tqdialog.h>
 #include <tqlayout.h>
@@ -8,9 +8,9 @@
 #include <stdio.h>
 
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class ExampleWidget : public QLabel
 {
@@ -63,7 +63,7 @@ void showResult(int test, int i)
 int main( int argc, char *argv[] )
 {
     int i, test;
-    new KApplication( argc, argv, "MyApplication" );
+    new TDEApplication( argc, argv, "MyApplication" );
 
     ExampleWidget *w = new ExampleWidget();
     w->show();    
diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp
index fdf8697e9..9a333dfda 100644
--- a/tdeui/tests/knuminputtest.cpp
+++ b/tdeui/tests/knuminputtest.cpp
@@ -11,12 +11,12 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 
 #include "knuminputtest.h"
 
-KApplication *a;
+TDEApplication *a;
 
 #include <kdebug.h>
 void TopLevel::slotPrint( int n ) {
@@ -132,7 +132,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
 
 int main( int argc, char ** argv )
 {
-    a = new KApplication ( argc, argv, "KNuminputTest" );
+    a = new TDEApplication ( argc, argv, "KNuminputTest" );
 
     TopLevel *toplevel = new TopLevel(0, "knuminputtest");
 
diff --git a/tdeui/tests/kpalettetest.cpp b/tdeui/tests/kpalettetest.cpp
index 32b91ff96..94036244e 100644
--- a/tdeui/tests/kpalettetest.cpp
+++ b/tdeui/tests/kpalettetest.cpp
@@ -1,5 +1,5 @@
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <stdlib.h>
@@ -12,7 +12,7 @@
 
 int main( int argc, char **argv )
 {
-    KApplication a( argc, argv, "KPalettetest" );
+    TDEApplication a( argc, argv, "KPalettetest" );
 
     TQStringList palettes = KPalette::getPaletteList();
     for(TQStringList::ConstIterator it = palettes.begin(); 
diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp
index 678a1eeb6..a14cb3366 100644
--- a/tdeui/tests/kpanelmenutest.cpp
+++ b/tdeui/tests/kpanelmenutest.cpp
@@ -1,5 +1,5 @@
 #include "kpanelmenutest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 
@@ -57,7 +57,7 @@ void TestWidget::slotSubMenuCalled(int id)
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "menutest");
+    TDEApplication *app = new TDEApplication(argc, argv, "menutest");
     
     TestWidget w;
     app->setMainWidget(&w);
diff --git a/tdeui/tests/kpixmapregionselectordialogtest.cpp b/tdeui/tests/kpixmapregionselectordialogtest.cpp
index c698c66f2..28a51a3f7 100644
--- a/tdeui/tests/kpixmapregionselectordialogtest.cpp
+++ b/tdeui/tests/kpixmapregionselectordialogtest.cpp
@@ -1,23 +1,23 @@
 #include "kpixmapregionselectordialog.h"
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <iostream>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
    { "+file", "The image file to open", 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 int main(int argc, char**argv)
 {
-  KCmdLineArgs::init(argc, argv, "test", "test" ,"test" ,"1.0");
-  KCmdLineArgs::addCmdLineOptions( options );
-  KApplication app("test");
+  TDECmdLineArgs::init(argc, argv, "test", "test" ,"test" ,"1.0");
+  TDECmdLineArgs::addCmdLineOptions( options );
+  TDEApplication app("test");
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->count()!=1)
   {
     std::cout << "Usage: kpixmapregionselectordialogtest <imageFile>" << std::endl;
diff --git a/tdeui/tests/kprogresstest.cpp b/tdeui/tests/kprogresstest.cpp
index 7b7024135..6106a236b 100644
--- a/tdeui/tests/kprogresstest.cpp
+++ b/tdeui/tests/kprogresstest.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include "kprogress.h"
 
@@ -46,7 +46,7 @@ void MyWidget::timerEvent(TQTimerEvent *)
 
 int main(int argc, char *argv[])
 {
-	KApplication app(argc, argv, "KProgressTest");
+	TDEApplication app(argc, argv, "KProgressTest");
 	MyWidget w;
 	
 	app.setMainWidget(&w);
diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp
index 2f16605d9..628c5096e 100644
--- a/tdeui/tests/krulertest.cpp
+++ b/tdeui/tests/krulertest.cpp
@@ -51,7 +51,7 @@ MouseWidget::resizeEvent( TQResizeEvent *r )
 
 
 KRulerTest::KRulerTest( const char *name )
-  : KMainWindow(0, name)
+  : TDEMainWindow(0, name)
 {
   mainframe = new TQFrame(this);
 
@@ -358,10 +358,10 @@ KRulerTest::slotSetYTrans(double d)
 /* --- MAIN -----------------------*/
 int main(int argc, char **argv)
 {
-  KApplication *testapp;
+  TDEApplication *testapp;
   KRulerTest   *window;
 
-  testapp = new KApplication(argc, argv,"krulertest");
+  testapp = new TDEApplication(argc, argv,"krulertest");
   testapp->setFont(TQFont("Helvetica",12),true);
 
   window = new KRulerTest("main");
diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h
index d180e93a0..0242fb5d7 100644
--- a/tdeui/tests/krulertest.h
+++ b/tdeui/tests/krulertest.h
@@ -3,8 +3,8 @@
 #ifndef krulertest_h
 #define krulertest_h
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include <tqwidget.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
@@ -42,7 +42,7 @@ private:
 };
 
 
-class KRulerTest : public KMainWindow
+class KRulerTest : public TDEMainWindow
 {
 Q_OBJECT
 public:
diff --git a/tdeui/tests/kseparatortest.cpp b/tdeui/tests/kseparatortest.cpp
index 17e965ca8..a791fa930 100644
--- a/tdeui/tests/kseparatortest.cpp
+++ b/tdeui/tests/kseparatortest.cpp
@@ -18,7 +18,7 @@
  */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqlayout.h>
 #include <tqwidget.h>
 
diff --git a/tdeui/tests/ksqueezedtextlabeltest.cpp b/tdeui/tests/ksqueezedtextlabeltest.cpp
index 62f3c1a76..7c3fd413c 100644
--- a/tdeui/tests/ksqueezedtextlabeltest.cpp
+++ b/tdeui/tests/ksqueezedtextlabeltest.cpp
@@ -1,9 +1,9 @@
 #include "ksqueezedtextlabel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main( int argc, char **argv )
 {
-	KApplication app( argc, argv, "KSqueezedTextLabelTest" );
+	TDEApplication app( argc, argv, "KSqueezedTextLabelTest" );
 
 	KSqueezedTextLabel l( "This is a rather long string", 0);
 	app.setMainWidget( &l );
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 669044c55..0a8c6d10c 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -10,19 +10,19 @@
 #include <stdlib.h>
 
 #include "kstatusbar.h"
-#include <kapplication.h>
-#include <kmainwindow.h>
-#include <kmenubar.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
+#include <tdemenubar.h>
 #include "kstatusbartest.h"
 
 testWindow::testWindow (TQWidget *, const char *name)
-    : KMainWindow (0, name)
+    : TDEMainWindow (0, name)
  {
     // Setup Menus
     menuBar = new KMenuBar (this);
     fileMenu = new TQPopupMenu;
     menuBar->insertItem ("&File", fileMenu);
-    fileMenu->insertItem ("&Exit", KApplication::kApplication(),
+    fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
                           TQT_SLOT( quit() ), ALT + Key_Q );
     statusbar = new KStatusBar (this);
     statusbar->insertItem("Zoom: XXXX", 0);
@@ -41,7 +41,7 @@ testWindow::testWindow (TQWidget *, const char *name)
 
     setCentralWidget(widget);
 
-    setCaption( KApplication::kApplication()->caption() );
+    setCaption( TDEApplication::kApplication()->caption() );
 
     smenu = new TQPopupMenu;
   
@@ -104,7 +104,7 @@ testWindow::~testWindow ()
 
 int main( int argc, char *argv[] )
 {
-        KApplication *myApp = new KApplication( argc, argv, "KStatusBarTest" );
+        TDEApplication *myApp = new TDEApplication( argc, argv, "KStatusBarTest" );
         testWindow *test = new testWindow;
 
         myApp->setMainWidget(test);
diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h
index 37f500334..712f24352 100644
--- a/tdeui/tests/kstatusbartest.h
+++ b/tdeui/tests/kstatusbartest.h
@@ -1,14 +1,14 @@
 #ifndef test_kstatusbar_h
 #define test_kstatusbar_h
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tqpopupmenu.h>
 #include <kstatusbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TQMultiLineEdit;
 
-class testWindow  : public KMainWindow
+class testWindow  : public TDEMainWindow
 {
     Q_OBJECT
 
diff --git a/tdeui/tests/ksystemtraytest.cpp b/tdeui/tests/ksystemtraytest.cpp
index dcee78346..27a6629d9 100644
--- a/tdeui/tests/ksystemtraytest.cpp
+++ b/tdeui/tests/ksystemtraytest.cpp
@@ -1,9 +1,9 @@
 #include <ksystemtray.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main(int argc, char **argv)
 {
-	KApplication app( argc, argv, "ksystemtraytest" );
+	TDEApplication app( argc, argv, "ksystemtraytest" );
 	TQLabel *l = new TQLabel("System Tray Main Window", 0L);
 	KSystemTray *tray = new KSystemTray( l );
     tray->setText("Test");
diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp
index 33e7fc5b7..05fe2aeb3 100644
--- a/tdeui/tests/ktabctltest.cpp
+++ b/tdeui/tests/ktabctltest.cpp
@@ -2,7 +2,7 @@
  *
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqobject.h>
@@ -30,7 +30,7 @@
 
 TQFont default_font("Helvetica", 12);
 
-KApplication *a;
+TDEApplication *a;
 
 TopLevel::TopLevel(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
@@ -90,7 +90,7 @@ void TopLevel::okPressed()
 
 int main( int argc, char ** argv )
 {
-    a = new KApplication ( argc, argv, "KTabCtlTest" );
+    a = new TDEApplication ( argc, argv, "KTabCtlTest" );
 
     a->setFont(default_font);
 
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 32ed5c89f..64d2795fc 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -2,8 +2,8 @@
 #include <tqlayout.h>
 #include <tqdragobject.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
 
@@ -354,8 +354,8 @@ void Test::toggleLabels(bool state)
 
 int main(int argc, char** argv )
 {
-    KCmdLineArgs::init(argc, argv, "ktabwidgettest", "ktabwidget test app", "1.0");
-    KApplication app(argc, argv);
+    TDECmdLineArgs::init(argc, argv, "ktabwidgettest", "ktabwidget test app", "1.0");
+    TDEApplication app(argc, argv);
     Test *t = new Test();
 
     app.setMainWidget( t );
diff --git a/tdeui/tests/ktextedittest.cpp b/tdeui/tests/ktextedittest.cpp
index d43f77260..6570bf26d 100644
--- a/tdeui/tests/ktextedittest.cpp
+++ b/tdeui/tests/ktextedittest.cpp
@@ -17,14 +17,14 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktextedit.h>
 
 #include <tqfile.h>
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "ktextedittest" );
+    TDEApplication app( argc, argv, "ktextedittest" );
     KTextEdit *edit = new KTextEdit();
     edit->setReadOnly( true );
     edit->setCheckSpellingEnabled( true );
diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp
index 324accc7d..731dc3219 100644
--- a/tdeui/tests/ktimewidgettest.cpp
+++ b/tdeui/tests/ktimewidgettest.cpp
@@ -1,11 +1,11 @@
 #include "ktimewidget.h"
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 
 int main(int argc, char** argv)
 {
-  KLocale::setMainCatalogue("tdelibs");
-  KApplication app(argc, argv, "KTimeWidgettest");
+  TDELocale::setMainCatalogue("tdelibs");
+  TDEApplication app(argc, argv, "KTimeWidgettest");
   KTimeWidget timeWidget;
   app.setMainWidget(&timeWidget);
   timeWidget.show();
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index 7f5b2cc78..40904000b 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -1,5 +1,5 @@
 #include "kunbalancedgrdtest.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include <tqpainter.h>
 #include <tqstring.h>
@@ -166,7 +166,7 @@ void myTopWidget::rebalance()
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KUnbalancedGradientTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KUnbalancedGradientTest");
     myTopWidget w;
     app->setMainWidget(&w);
     w.show();
diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp
index 91974263e..0635188d0 100644
--- a/tdeui/tests/kwizardtest.cpp
+++ b/tdeui/tests/kwizardtest.cpp
@@ -20,12 +20,12 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kwizard.h>
 
 int main(int argc, char **argv)
 {
-  KApplication a(argc,argv,"kwizardtest");
+  TDEApplication a(argc,argv,"kwizardtest");
   KWizard *wiz = new KWizard(0, "kwizardtest", false);
   TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()),
 		   &a, TQT_SLOT(quit()));
diff --git a/tdeui/tests/kwordwraptest.cpp b/tdeui/tests/kwordwraptest.cpp
index ad60bd897..690fbf157 100644
--- a/tdeui/tests/kwordwraptest.cpp
+++ b/tdeui/tests/kwordwraptest.cpp
@@ -16,14 +16,14 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqwidget.h>
 #include "kwordwrap.h"
 
 int main(int argc, char *argv[])
 {
-	KApplication app(argc, argv, "KWordWrapTest");
+	TDEApplication app(argc, argv, "KWordWrapTest");
 	
 	TQFont font( "helvetica", 12 ); // let's hope we all have the same...
 	TQFontMetrics fm( font );
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index a903aeb3f..1a79526aa 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -1,10 +1,10 @@
 #include "kxmlguitest.h"
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>
 #include <kxmlguibuilder.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
@@ -18,13 +18,13 @@ void Client::slotSec()
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kxmlguitest" );
+    TDEApplication app( argc, argv, "kxmlguitest" );
 
     // KXMLGUIClient looks in the "data" resource for the .rc files
     // Let's add $PWD (ideally $srcdir instead...) to it
-    KGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() );
+    TDEGlobal::dirs()->addResourceDir( "data", TQDir::currentDirPath() );
 
-    KMainWindow *mainwindow = new KMainWindow;
+    TDEMainWindow *mainwindow = new TDEMainWindow;
 
     TQLineEdit* line = new TQLineEdit( mainwindow );
     mainwindow->setCentralWidget( line );
@@ -36,10 +36,10 @@ int main( int argc, char **argv )
     KXMLGUIFactory *factory = new KXMLGUIFactory( builder );
 
     Client *shell = new Client;
-    shell->setInstance( new KInstance( "konqueror" ) );
+    shell->setInstance( new TDEInstance( "konqueror" ) );
     shell->instance()->dirs()->addResourceDir( "data", TQDir::currentDirPath() );
 
-    (void)new KAction( "Split", "view_left_right", 0, 0, 0, shell->actionCollection(), "splitviewh" );
+    (void)new TDEAction( "Split", "view_left_right", 0, 0, 0, shell->actionCollection(), "splitviewh" );
 
     shell->setXMLFile( "./kxmlguitest_shell.rc" );
 
@@ -47,8 +47,8 @@ int main( int argc, char **argv )
 
     Client *part = new Client;
 
-    (void)new KAction( "decfont", "viewmag-", 0, 0, 0, part->actionCollection(), "decFontSizes" );
-    (void)new KAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" );
+    (void)new TDEAction( "decfont", "viewmag-", 0, 0, 0, part->actionCollection(), "decFontSizes" );
+    (void)new TDEAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" );
 
     part->setXMLFile( "./kxmlguitest_part.rc" );
 
diff --git a/tdeui/tests/kxmlguitest.h b/tdeui/tests/kxmlguitest.h
index 1adb1a14b..bc88711f7 100644
--- a/tdeui/tests/kxmlguitest.h
+++ b/tdeui/tests/kxmlguitest.h
@@ -11,7 +11,7 @@ public:
     Client() {}
 
     void setXMLFile( const TQString &f, bool merge = true ) { KXMLGUIClient::setXMLFile( f, merge ); }
-    void setInstance( KInstance *inst ) { KXMLGUIClient::setInstance( inst ); }
+    void setInstance( TDEInstance *inst ) { KXMLGUIClient::setInstance( inst ); }
 
 public slots:
     void slotSec();
diff --git a/tdeui/tests/kxmlguitest_part.rc b/tdeui/tests/kxmlguitest_part.rc
index 84f5e4f57..b6454cf30 100644
--- a/tdeui/tests/kxmlguitest_part.rc
+++ b/tdeui/tests/kxmlguitest_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="7">
+<kpartgui name="tdehtmlpart" version="7">
 <ToolBar name="mainToolBar"><text>Main Toolbar</text>
  <Action name="decFontSizes" />
  <Separator />
diff --git a/tdeui/tests/kaccelgentest.cpp b/tdeui/tests/tdeaccelgentest.cpp
index f5f95ac57..bd456aefd 100644
--- a/tdeui/tests/kaccelgentest.cpp
+++ b/tdeui/tests/tdeaccelgentest.cpp
@@ -1,4 +1,4 @@
-#include "kaccelgen.h"
+#include "tdeaccelgen.h"
 
 #include <tqstringlist.h>
 
@@ -30,7 +30,7 @@ int main()
 	         << "&yoyo && dyne";
 
     TQStringList output;
-    KAccelGen::generate( input, output );
+    TDEAccelGen::generate( input, output );
     check( "TQStringList value generation", expected, output );
 
     TQMap<TQString,TQString> map;
@@ -39,13 +39,13 @@ int main()
     }
     input.sort();
     expected.clear();
-    KAccelGen::generate( input, expected );
+    TDEAccelGen::generate( input, expected );
 
     output.clear();
-    KAccelGen::generateFromValues( map, output );
+    TDEAccelGen::generateFromValues( map, output );
     check( "map value generation", expected, output );
 
     output.clear();
-    KAccelGen::generateFromKeys( map, output );
+    TDEAccelGen::generateFromKeys( map, output );
     check( "map key generation", expected, output );
 }
diff --git a/tdeui/tests/tdeactiontest.cpp b/tdeui/tests/tdeactiontest.cpp
new file mode 100644
index 000000000..dcec16189
--- /dev/null
+++ b/tdeui/tests/tdeactiontest.cpp
@@ -0,0 +1,38 @@
+
+#include <tqguardedptr.h>
+
+#include <tdeapplication.h>
+#include <tdeaction.h>
+
+#include <assert.h>
+
+int main( int argc, char **argv )
+{
+    TDEApplication app( argc, argv, "tdeactiontest" );
+
+    TDEActionCollection coll( static_cast<TQObject *>( 0 ) );
+
+    TQGuardedPtr<TDEAction> action1 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action2 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action3 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action4 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action5 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action6 = new TDERadioAction("test",0, &coll);
+    TQGuardedPtr<TDEAction> action7 = new TDERadioAction("test",0, &coll);
+   
+    coll.clear();
+    assert( coll.isEmpty() );
+
+    assert( action1.isNull() );
+    assert( action2.isNull() );
+    assert( action3.isNull() );
+    assert( action4.isNull() );
+    assert( action5.isNull() );
+    assert( action6.isNull() );
+    assert( action7.isNull() );
+    
+    return 0;
+}
+
+/* vim: et sw=4 ts=4
+ */
diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/tdefontdialogtest.cpp
index 205fd48f7..ff7ac2840 100644
--- a/tdeui/tests/kfontdialogtest.cpp
+++ b/tdeui/tests/tdefontdialogtest.cpp
@@ -24,26 +24,26 @@
 */
 
 
-#include <kapplication.h>
-#include "kfontdialog.h"
-#include <kconfig.h>
+#include <tdeapplication.h>
+#include "tdefontdialog.h"
+#include <tdeconfig.h>
 
 
  int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "KFontDialogTest" );
+  TDEApplication app( argc, argv, "TDEFontDialogTest" );
 
-  KConfig aConfig;
-  aConfig.setGroup( "KFontDialog-test" );
+  TDEConfig aConfig;
+  aConfig.setGroup( "TDEFontDialog-test" );
 
   app.setFont(TQFont("Helvetica",12));
 
   //  TQFont font = TQFont("Times",18,TQFont::Bold);
 
   TQFont font = aConfig.readFontEntry( "Chosen" );
-  int nRet = KFontDialog::getFont(font);
+  int nRet = TDEFontDialog::getFont(font);
   int flags;
-  nRet = KFontDialog::getFontDiff(font, flags);
+  nRet = TDEFontDialog::getFontDiff(font, flags);
   aConfig.writeEntry( "Chosen", font, true );
 
   aConfig.sync();
diff --git a/tdeui/tests/tdelistviewtest.cpp b/tdeui/tests/tdelistviewtest.cpp
new file mode 100644
index 000000000..c2a0e78cf
--- /dev/null
+++ b/tdeui/tests/tdelistviewtest.cpp
@@ -0,0 +1,39 @@
+#include <tdelistview.h>
+#include <tdeapplication.h>
+#include <kdialogbase.h>
+#include <tqvbox.h>
+
+
+int main( int argc, char **argv )
+{
+	TDEApplication app( argc, argv, "tdelistviewtest" );
+	KDialogBase dialog;
+	TDEListView *view = new TDEListView( dialog.makeVBoxMainWidget() );
+	view->setSelectionModeExt( TDEListView::FileManager );
+	view->setDragEnabled( true );
+	view->setItemsMovable( false );
+	view->setAcceptDrops( true );
+	view->addColumn("Column 1");
+	view->addColumn("Column 2");
+	view->addColumn("Column 3");
+
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 1");
+	new TDEListViewItem( view, "Item 2", "Some more", "Hi Mom :)" );
+
+	view->restoreLayout( TDEGlobal::config(), "ListView" );
+
+	new TDEListViewItem( view, "Item 3" );
+
+	dialog.exec();
+	view->saveLayout( TDEGlobal::config(), "ListView" );
+
+	return 0;
+}
diff --git a/tdeui/tests/kmainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp
index 7415085ac..559348ec0 100644
--- a/tdeui/tests/kmainwindowrestoretest.cpp
+++ b/tdeui/tests/tdemainwindowrestoretest.cpp
@@ -1,7 +1,7 @@
 
-#include "kmainwindowrestoretest.h"
+#include "tdemainwindowrestoretest.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlabel.h>
 
@@ -14,7 +14,7 @@
 
 int main( int argc, char * argv[] ) {
 
-  KApplication app( argc, argv, "kmainwindowrestoretest" );
+  TDEApplication app( argc, argv, "tdemainwindowrestoretest" );
 
   if ( kapp->isRestored() ) {
     kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >();
@@ -38,4 +38,4 @@ int main( int argc, char * argv[] ) {
   return app.exec();
 }
 
-#include "kmainwindowrestoretest.moc"
+#include "tdemainwindowrestoretest.moc"
diff --git a/tdeui/tests/tdemainwindowrestoretest.h b/tdeui/tests/tdemainwindowrestoretest.h
new file mode 100644
index 000000000..7d02e4aca
--- /dev/null
+++ b/tdeui/tests/tdemainwindowrestoretest.h
@@ -0,0 +1,48 @@
+#ifndef _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
+#define _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
+
+#include <tdemainwindow.h>
+
+class MainWin1 : public TDEMainWindow {
+  Q_OBJECT
+public:
+  MainWin1() : TDEMainWindow() {}
+  virtual ~MainWin1() {}
+};
+
+class MainWin2 : public TDEMainWindow {
+  Q_OBJECT
+public:
+  MainWin2() : TDEMainWindow() {}
+  virtual ~MainWin2() {}
+};
+
+class MainWin3 : public TDEMainWindow {
+  Q_OBJECT
+public:
+  MainWin3() : TDEMainWindow() {}
+  virtual ~MainWin3() {}
+};
+
+class MainWin4 : public TDEMainWindow {
+  Q_OBJECT
+public:
+  MainWin4() : TDEMainWindow() {}
+  virtual ~MainWin4() {}
+};
+
+class MainWin5 : public TDEMainWindow {
+  Q_OBJECT
+public:
+  MainWin5() : TDEMainWindow() {}
+  virtual ~MainWin5() {}
+};
+
+class MainWin6 : public TDEMainWindow {
+  Q_OBJECT
+public:
+  MainWin6() : TDEMainWindow() {}
+  virtual ~MainWin6() {}
+};
+
+#endif // _TDEUI_TESTS_KMAINWINDOWRESTORETEST_H_
diff --git a/tdeui/tests/kmainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index 5b7afd36f..b19818d4c 100644
--- a/tdeui/tests/kmainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -1,11 +1,11 @@
 #include <tqtimer.h>
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
-#include "kmainwindowtest.h"
+#include "tdemainwindowtest.h"
 
 MainWindow::MainWindow()
 {
@@ -24,7 +24,7 @@ void MainWindow::showMessage()
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "kmainwindowtest" );
+    TDEApplication app( argc, argv, "tdemainwindowtest" );
 
     MainWindow* mw = new MainWindow; // deletes itself when closed
     mw->show();
@@ -32,7 +32,7 @@ int main( int argc, char **argv )
     return app.exec();
 }
 
-#include "kmainwindowtest.moc"
+#include "tdemainwindowtest.moc"
 
 /* vim: et sw=4 ts=4
  */
diff --git a/tdeui/tests/kmainwindowtest.h b/tdeui/tests/tdemainwindowtest.h
index 4fb426ac5..b7c5d9e3c 100644
--- a/tdeui/tests/kmainwindowtest.h
+++ b/tdeui/tests/tdemainwindowtest.h
@@ -1,9 +1,9 @@
 #ifndef KMAINWINDOWTEST_H
 #define KMAINWINDOWTEST_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
-class MainWindow : public KMainWindow
+class MainWindow : public TDEMainWindow
 {
     Q_OBJECT
 public:
diff --git a/tdeui/tests/kpopuptest.cpp b/tdeui/tests/tdepopuptest.cpp
index 3db71106b..f9a97bad4 100644
--- a/tdeui/tests/kpopuptest.cpp
+++ b/tdeui/tests/tdepopuptest.cpp
@@ -1,11 +1,11 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqcursor.h>
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 
 class DemoWidget : public TQWidget {
 private:
-    KPopupMenu *menu;
+    TDEPopupMenu *menu;
     
 void mousePressEvent(TQMouseEvent *)
 {
@@ -20,7 +20,7 @@ void paintEvent(TQPaintEvent *)
 public:
     DemoWidget() : TQWidget()
     {
-        menu = new KPopupMenu("Popup Menu:");
+        menu = new TDEPopupMenu("Popup Menu:");
         menu->insertItem("Item1");
         menu->insertItem("Item2");
         menu->insertSeparator();
@@ -30,7 +30,7 @@ public:
 
 int main(int argc, char **argv)
 {
-    KApplication app(argc, argv, "kpopupmenutest");
+    TDEApplication app(argc, argv, "tdepopupmenutest");
     DemoWidget w;
     app.setMainWidget(&w);
     w.setFont(TQFont("helvetica", 12, TQFont::Bold), true);
diff --git a/tdeui/tests/kspelltest.cpp b/tdeui/tests/tdespelltest.cpp
index 9180ed376..5ec103b99 100644
--- a/tdeui/tests/kspelltest.cpp
+++ b/tdeui/tests/tdespelltest.cpp
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kspell.h"
-#include <kapplication.h>
+#include "tdespell.h"
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
@@ -26,7 +26,7 @@
 
 int main(int argc, char **argv)
 {
-    KApplication *app = new KApplication(argc, argv, "KSpellTest");
+    TDEApplication *app = new TDEApplication(argc, argv, "KSpellTest");
 
     // test ASCII
     //TQString text( "I have noo idee of how to wride englisch or englisch" );
diff --git a/tdeui/tests/ktoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp
index 020834605..b919c2725 100644
--- a/tdeui/tests/ktoolbarlabelactiontest.cpp
+++ b/tdeui/tests/tdetoolbarlabelactiontest.cpp
@@ -18,19 +18,19 @@
 
 #include <tqguardedptr.h>
 
-#include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstandarddirs.h>
-#include <ktoolbarlabelaction.h>
+#include <tdetoolbarlabelaction.h>
 #include <ksqueezedtextlabel.h> 
 #include <kdebug.h>
 #include <tqvbox.h>
 
 #include <assert.h>
 
-class MainWindow : public KMainWindow
+class MainWindow : public TDEMainWindow
 {
 public:
   MainWindow()
@@ -47,7 +47,7 @@ public:
 
 
     // first constructor
-    KToolBarLabelAction* label1 = new KToolBarLabelAction("&Label 1", 0,
+    TDEToolBarLabelAction* label1 = new TDEToolBarLabelAction("&Label 1", 0,
 							  0, 0,
 							  actionCollection(),
 							  "label1");
@@ -55,8 +55,8 @@ public:
     KLineEdit* lineEdit = new KLineEdit(this);
     new KWidgetAction(lineEdit, "Line Edit", 0, this, 0,
 		      actionCollection(), "lineEdit");
-    KToolBarLabelAction* label2 = 
-      new KToolBarLabelAction(lineEdit, "L&abel 2", 0, 0, 0,
+    TDEToolBarLabelAction* label2 = 
+      new TDEToolBarLabelAction(lineEdit, "L&abel 2", 0, 0, 0,
 			      actionCollection(),
 			      "label2");
 
@@ -69,7 +69,7 @@ public:
       ("&Really long, long, long and boring text goes here", this, 
         "kde toolbar widget");
 
-    KToolBarLabelAction* label3 = new KToolBarLabelAction(customLabel, 0, 0, 0,
+    TDEToolBarLabelAction* label3 = new TDEToolBarLabelAction(customLabel, 0, 0, 0,
  							  actionCollection(),
 							  "label3");
   
@@ -78,15 +78,15 @@ public:
 
     // customLabel->setText("&test me again some time soon");
     
-    createGUI("ktoolbarlabelactiontestui.rc");
+    createGUI("tdetoolbarlabelactiontestui.rc");
   }
 };
 
 int main( int argc, char **argv )
 {
-  KApplication app( argc, argv, "ktoolbarlabelactiontest" );
+  TDEApplication app( argc, argv, "tdetoolbarlabelactiontest" );
 
-  KGlobal::instance()->dirs()->addResourceDir("data", ".");
+  TDEGlobal::instance()->dirs()->addResourceDir("data", ".");
 
   MainWindow* mw = new MainWindow;
   app.setMainWidget(mw);
diff --git a/tdeui/tests/ktoolbarlabelactiontestui.rc b/tdeui/tests/tdetoolbarlabelactiontestui.rc
index 75d02e54e..0a0e03091 100644
--- a/tdeui/tests/ktoolbarlabelactiontestui.rc
+++ b/tdeui/tests/tdetoolbarlabelactiontestui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ktoolbarlabelactiontest" version="0.1">
+<kpartgui name="tdetoolbarlabelactiontest" version="0.1">
 <ToolBar>
 <Action name="label1"/>
 <Action name="label2"/>
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 02b47c2d8..77e01d289 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -9,36 +9,36 @@
 #include <stdlib.h>
 
 #include <kstatusbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <khelpmenu.h>
-#include <kcmdlineargs.h>
-#include <kmenubar.h>
-#include <ktoolbarradiogroup.h>
+#include <tdecmdlineargs.h>
+#include <tdemenubar.h>
+#include <tdetoolbarradiogroup.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqmultilineedit.h>
 #include "twindowtest.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 //#include <dclock.h>
 
 /*
- Ok this is a constructor of our top widget. It inherits KMainWindow.
+ Ok this is a constructor of our top widget. It inherits TDEMainWindow.
  In constructor wi will create all of our interface elements:
  menubar, toolbar(s), statusbar, and main widget. Non of those
  interface is obligatory, i.e. you don't have to use menubar,
  toolbars or statusbar if you don't want to. Theoreticly, you
  don't need even main widget (but in that case, you'll get blank
- KMainWindow).
+ TDEMainWindow).
  */
 
 static int itemId = 0;
 
 testWindow::testWindow (TQWidget *parent, const char *name)
-    : KMainWindow (parent,name)
+    : TDEMainWindow (parent,name)
 {
     ena=false;
     setCaption("test window");
@@ -55,7 +55,7 @@ setAutoSaveSettings();
     menuBar->insertItem ("&File", fileMenu);
     // We insert item "Exit" with accelerator ALT-Q, and connect
     // it to application's exit-slot.
-    fileMenu->insertItem ("&Exit", KApplication::kApplication(),
+    fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
                           TQT_SLOT( quit() ), ALT + Key_Q );
 
     // Another popup...
@@ -148,12 +148,12 @@ setAutoSaveSettings();
 
     // Now add another button and align it right
     pix = BarIcon("exit");
-    tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), KApplication::kApplication(),
+    tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
                           TQT_SLOT( quit() ), true, "Exit");
     tb->alignItemRight (6);
 
     // Another toolbar
-    tb1 = new KToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators
+    tb1 = new TDEToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators
 
 
     pix = BarIcon("filenew");
@@ -194,7 +194,7 @@ setAutoSaveSettings();
     tb1->setToggle(7);
 
     //Create
-    rg = new KToolBarRadioGroup (tb1);
+    rg = new TDEToolBarRadioGroup (tb1);
 
     rg->addButton(4);
     rg->addButton(5);
@@ -230,7 +230,7 @@ setAutoSaveSettings();
     //... and main widget
     setCentralWidget (widget);
 
-    // This is not strictly related to toolbars, menubars or KMainWindow.
+    // This is not strictly related to toolbars, menubars or TDEMainWindow.
     // Setup popup for completions
     completions = new TQPopupMenu;
   
@@ -328,7 +328,7 @@ void testWindow::slotCompletion()
   completions->popup(TQCursor::pos()); // This popup should understunf keys up and down
 
   /* This is just an example. KLined automatically sets cursor at end of string
-   when ctrl-d or ctrl-s is pressed. KToolBar will also put cursor at end of text in Lined
+   when ctrl-d or ctrl-s is pressed. TDEToolBar will also put cursor at end of text in Lined
    after inserting text with setLinedText (...).
   */
 
@@ -408,7 +408,7 @@ void testWindow::slotExit ()
    {
      TQPixmap pix;
      pix = BarIcon("exit");
-     tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), KApplication::kApplication(),
+     tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
                            TQT_SLOT( quit() ), true, "Exit");
      tb->alignItemRight (6);
      exitB = true;
@@ -502,9 +502,9 @@ void testWindow::slotMakeItem3Current()
 int main( int argc, char *argv[] )
 {
     int i;
-    KCmdLineArgs::init(argc, argv, "KWindowTest", "description", "version");
+    TDECmdLineArgs::init(argc, argv, "KWindowTest", "description", "version");
 
-    KApplication *myApp = new KApplication();
+    TDEApplication *myApp = new TDEApplication();
     testWindow *test = new testWindow;
 
     myApp->setMainWidget(test);
diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h
index 14e2a6da8..d1d9d460e 100644
--- a/tdeui/tests/twindowtest.h
+++ b/tdeui/tests/twindowtest.h
@@ -4,16 +4,16 @@
 #include <tqpopupmenu.h>
 #include <tqtimer.h>
 #include <tqprogressbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
 
 class TQMultiLineEdit;
-class KToolBarRadioGroup;
+class TDEToolBarRadioGroup;
 class KHelpMenu;
 
-class testWindow  : public KMainWindow
+class testWindow  : public TDEMainWindow
 {
     Q_OBJECT
 
@@ -56,8 +56,8 @@ protected:
     TQPopupMenu *toolBarMenu;
     KStatusBar *statusBar;
     KHelpMenu *helpMenu;
-    KToolBar *tb;
-    KToolBar *tb1;
+    TDEToolBar *tb;
+    TDEToolBar *tb1;
     bool lineL;
     bool exitB;
     bool greenF;
@@ -65,7 +65,7 @@ protected:
     TQMultiLineEdit *widget;
     TQTimer *timer;
     TQProgressBar *pr;
-    KToolBarRadioGroup *rg;
+    TDEToolBarRadioGroup *rg;
 };
 #endif
 
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index b1d05c57e..bc2df2f66 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -33,12 +33,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <twin.h> 
 #include <twinmodule.h> 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 
 #include <netwm.h> 
-#include <kapplication.h>
-#include <kstyle.h>
+#include <tdeapplication.h>
+#include <tdestyle.h>
 #include <dcopclient.h>
 
 #undef Bool
@@ -83,7 +83,7 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection:
 } // namespace
 
 KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name)
-  : KPopupMenu(parent, name)
+  : TDEPopupMenu(parent, name)
 {
     twin_module = new KWinModule(TQT_TQOBJECT(this));
 
@@ -251,7 +251,7 @@ void KWindowListMenu::slotCascadeWindows()
 }
 
 void KWindowListMenu::virtual_hook( int id, void* data )
-{ KPopupMenu::virtual_hook( id, data ); }
+{ TDEPopupMenu::virtual_hook( id, data ); }
 
 #endif // Q_WS_X11
 
diff --git a/tdeui/twindowlistmenu.h b/tdeui/twindowlistmenu.h
index dcd81826f..20da236f1 100644
--- a/tdeui/twindowlistmenu.h
+++ b/tdeui/twindowlistmenu.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __twindowlistmenu_h__
 #define __twindowlistmenu_h__
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqmap.h>
 
 #ifdef Q_MOC_RUN
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class KWinModule;
 class KWindowListMenuPrivate;
 
-class TDEUI_EXPORT KWindowListMenu : public KPopupMenu
+class TDEUI_EXPORT KWindowListMenu : public TDEPopupMenu
 {
     Q_OBJECT
 
diff --git a/kunittest/CMakeLists.txt b/tdeunittest/CMakeLists.txt
index 74ab23e13..5509d9026 100644
--- a/kunittest/CMakeLists.txt
+++ b/tdeunittest/CMakeLists.txt
@@ -24,12 +24,12 @@ link_directories(
 ##### headers ###################################
 
 install( FILES runner.h tester.h module.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kunittest )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeunittest )
 
 
-##### libkunittest ##############################
+##### libtdeunittest ##############################
 
-set( target kunittest )
+set( target tdeunittest )
 
 set( ${target}_SRCS
   runner.cpp tester.cpp
@@ -43,10 +43,10 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-##### kunittestmodrunner ########################
+##### tdeunittestmodrunner ########################
 
-tde_add_executable( kunittestmodrunner
+tde_add_executable( tdeunittestmodrunner
   SOURCES modrunner.cpp
-  LINK kunittest-shared
+  LINK tdeunittest-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdeunittest/Makefile.am b/tdeunittest/Makefile.am
new file mode 100644
index 000000000..5eb6852ab
--- /dev/null
+++ b/tdeunittest/Makefile.am
@@ -0,0 +1,27 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+lib_LTLIBRARIES = libtdeunittest.la
+libtdeunittest_la_SOURCES = runner.cpp tester.cpp
+libtdeunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
+libtdeunittest_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
+
+libtdeunittestinclude_HEADERS = runner.h tester.h module.h
+libtdeunittestincludedir = $(includedir)/tdeunittest
+
+bin_PROGRAMS = tdeunittestmodrunner
+tdeunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeunittestmodrunner_LDADD = libtdeunittest.la $(LIB_TDECORE)
+tdeunittestmodrunner_SOURCES = modrunner.cpp
+
+# The check_ target makes sure we don't install the modules,
+# $(KDE_CHECK_PLUGIN) assures a shared library is created.
+check_LTLIBRARIES = tdeunittest_samplemodule.la
+tdeunittest_samplemodule_la_SOURCES = samplemodule.cpp
+tdeunittest_samplemodule_la_LIBADD = libtdeunittest.la
+tdeunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+
+check-local:
+	./tdeunittestmodrunner
+
+include ../admin/Doxyfile.am
diff --git a/kunittest/modrunner.cpp b/tdeunittest/modrunner.cpp
index cb633189d..350778f6c 100644
--- a/kunittest/modrunner.cpp
+++ b/tdeunittest/modrunner.cpp
@@ -24,11 +24,11 @@
  */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
 
 #include "runner.h"
 
@@ -37,26 +37,26 @@ static const char description[] =
 
 static const char version[] = "0.1";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
-    {"query [regexp]", I18N_NOOP("Only run modules whose filenames match the regexp."), "^kunittest_.*\\.la$"},
+    {"query [regexp]", I18N_NOOP("Only run modules whose filenames match the regexp."), "^tdeunittest_.*\\.la$"},
     {"folder [folder]", I18N_NOOP("Only run tests modules which are found in the folder. Use the query option to select modules."), "."},
     { "enable-dbgcap", I18N_NOOP("Disables debug capturing. You typically use this option when you use the GUI."), 0},
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 
 int main( int argc, char **argv )
 {    
-    KInstance instance("modrunner");
+    TDEInstance instance("modrunner");
 
-    KAboutData about("KUnitTest Module Runner", I18N_NOOP("KUnitTest ModRunner"), version, description,
-                     KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0,
+    TDEAboutData about("KUnitTest Module Runner", I18N_NOOP("KUnitTest ModRunner"), version, description,
+                     TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0,
                      "Jeroen.Wijnhout@kdemail.net");
 
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
     KUnitTest::Runner::loadModules(args->getOption("folder"), args->getOption("query"));
     KUnitTest::Runner::setDebugCapturingEnabled(args->isSet("enable-dbgcap"));
diff --git a/kunittest/module.h b/tdeunittest/module.h
index 7f4b24789..d30c248c7 100644
--- a/kunittest/module.h
+++ b/tdeunittest/module.h
@@ -34,7 +34,7 @@
 #include <tqstring.h>
 
 #include <klibloader.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
 
 namespace KUnitTest
 {
@@ -45,10 +45,10 @@ namespace KUnitTest
     * There is no need in calling the K_EXPORT_COMPONENT_FACTORY macro,
     * this is taken care of automatically.
     * 
-    * @code KUNITTEST_MODULE(kunittest_samplemodule,"TestSuite") @endcode
+    * @code KUNITTEST_MODULE(tdeunittest_samplemodule,"TestSuite") @endcode
     */
     #define KUNITTEST_MODULE(library,suite)                                                 \
-    static const TQString s_kunittest_suite  = TQString::fromLatin1(suite);                   \
+    static const TQString s_tdeunittest_suite  = TQString::fromLatin1(suite);                   \
     class library##Module : public TQObject                                                  \
     {                                                                                       \
     public:                                                                                 \
@@ -64,7 +64,7 @@ namespace KUnitTest
                                                                                             \
     KUnitTest::RegistryType library##Module::s_registry;                                    \
                                                                                             \
-    void kunittest_registerModuleTester(const char *name, KUnitTest::Tester *test)          \
+    void tdeunittest_registerModuleTester(const char *name, KUnitTest::Tester *test)          \
     {                                                                                       \
         library##Module::s_registry.insert(name, test);                                     \
     }                                                                                       \
@@ -93,9 +93,9 @@ namespace KUnitTest
         tester##ModuleAutoregister()                                                            \
         {                                                                                       \
             KUnitTest::Tester *test = new tester();                                             \
-            TQString name = s_kunittest_suite + TQString::fromLatin1("::") + TQString::fromLocal8Bit(#tester); \
+            TQString name = s_tdeunittest_suite + TQString::fromLatin1("::") + TQString::fromLocal8Bit(#tester); \
             test->setName(name.local8Bit());                                                    \
-            kunittest_registerModuleTester(name.local8Bit(), test );                            \
+            tdeunittest_registerModuleTester(name.local8Bit(), test );                            \
         }                                                                                       \
     } tester##ModuleAutoregisterInstance;
 
@@ -110,9 +110,9 @@ namespace KUnitTest
     public:                                                                                   \
         tester##ModuleAutoregister()                                                          \
         {                                                                                     \
-            TQString fullName = s_kunittest_suite + TQString("::") + TQString::fromLocal8Bit(name); \
+            TQString fullName = s_tdeunittest_suite + TQString("::") + TQString::fromLocal8Bit(name); \
             KUnitTest::Tester *test = new tester(fullName.local8Bit());                       \
-            kunittest_registerModuleTester(fullName.local8Bit(), test);                       \
+            tdeunittest_registerModuleTester(fullName.local8Bit(), test);                       \
         }                                                                                     \
     } tester##ModuleAutoregisterInstance;
 }
diff --git a/kunittest/runner.cpp b/tdeunittest/runner.cpp
index 972a34276..c63b6ed6c 100644
--- a/kunittest/runner.cpp
+++ b/tdeunittest/runner.cpp
@@ -35,7 +35,7 @@ using namespace std;
 
 #include <kdebug.h>
 #include <klibloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "runner.h"
@@ -54,11 +54,11 @@ namespace KUnitTest
     void Runner::loadModules(const TQString &folder, const TQString &query)
     {
         TQRegExp reQuery(query);
-        TQDir dir(folder, "kunittest_*.la");
+        TQDir dir(folder, "tdeunittest_*.la");
 
         // Add the folder to the "module" resource such that the KLibLoader can
         // find the modules in this folder.
-        KGlobal::dirs()->addResourceDir("module", folder);
+        TDEGlobal::dirs()->addResourceDir("module", folder);
         kdDebug() << "Looking in folder: " << dir.absPath() << endl;
 
         // Get a list of all modules.
diff --git a/kunittest/runner.h b/tdeunittest/runner.h
index 5ed386b00..3b1c3d90d 100644
--- a/kunittest/runner.h
+++ b/tdeunittest/runner.h
@@ -1,5 +1,5 @@
 /*
- * kunittest.h
+ * tdeunittest.h
  *
  * Copyright (C)  2004  Zack Rusin <zack@kde.org>
  *
@@ -54,7 +54,7 @@ namespace KUnitTest
      * defines the name of the test suite.
      */
     #define KUNITTEST_SUITE(suite)\
-    static const TQString s_kunittest_suite  = suite;
+    static const TQString s_tdeunittest_suite  = suite;
 
     /*! @def KUNITTEST_REGISTER_TESTER( tester )
      * @brief Automatic registration of Tester classes.
@@ -66,10 +66,10 @@ namespace KUnitTest
      * You can always use the static Runner::registerTester(const char *name, Tester *test) method.
     */
     #define KUNITTEST_REGISTER_TESTER( tester )\
-    static TesterAutoregister tester##Autoregister( TQString(s_kunittest_suite + TQString("::") + TQString::fromLocal8Bit(#tester)).local8Bit() , new tester ())
+    static TesterAutoregister tester##Autoregister( TQString(s_tdeunittest_suite + TQString("::") + TQString::fromLocal8Bit(#tester)).local8Bit() , new tester ())
 
     #define KUNITTEST_REGISTER_NAMEDTESTER( name, tester )\
-    static TesterAutoregister tester##Autoregister( TQString(s_kunittest_suite + TQString("::") + TQString::fromLocal8Bit(name)).local8Bit() , new tester ())
+    static TesterAutoregister tester##Autoregister( TQString(s_tdeunittest_suite + TQString("::") + TQString::fromLocal8Bit(name)).local8Bit() , new tester ())
 
     /*! The type of the registry. */
     typedef TQAsciiDict<Tester> RegistryType;
@@ -123,7 +123,7 @@ namespace KUnitTest
          */
         static void loadModules(const TQString &folder, const TQString &query);
 
-        /*! The runner can spit out special debug messages needed by the Perl script: kunittest_debughelper.
+        /*! The runner can spit out special debug messages needed by the Perl script: tdeunittest_debughelper.
          * This script can attach the debug output of each suite to the results in the KUnitTest GUI.
          * Not very useful for console minded developers, so this static method can be used to disable
          * those debug messages.
diff --git a/kunittest/samplemodule.cpp b/tdeunittest/samplemodule.cpp
index 390102c38..8dede090a 100644
--- a/kunittest/samplemodule.cpp
+++ b/tdeunittest/samplemodule.cpp
@@ -23,14 +23,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 #include "samplemodule.h"
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_samplemodule, "Suite1" );
+KUNITTEST_MODULE( tdeunittest_samplemodule, "Suite1" );
 KUNITTEST_MODULE_REGISTER_TESTER( SampleTester );
 
 void SampleTester::allTests()
diff --git a/kunittest/samplemodule.h b/tdeunittest/samplemodule.h
index b5fd2bcd4..0798ed1e3 100644
--- a/kunittest/samplemodule.h
+++ b/tdeunittest/samplemodule.h
@@ -27,7 +27,7 @@
 #define SAMPLETESTMODULE_H
 
 #include "tester.h"
-// Outside of tdelibs you would use: #include <kunittest/tester.h>
+// Outside of tdelibs you would use: #include <tdeunittest/tester.h>
 
 class SampleTester : public KUnitTest::Tester
 {
diff --git a/kunittest/tester.cpp b/tdeunittest/tester.cpp
index 11a24e653..11a24e653 100644
--- a/kunittest/tester.cpp
+++ b/tdeunittest/tester.cpp
diff --git a/kunittest/tester.h b/tdeunittest/tester.h
index 061f319b3..b0ce3e685 100644
--- a/kunittest/tester.h
+++ b/tdeunittest/tester.h
@@ -53,20 +53,20 @@
  * You are responsible for what you do with it though. It
  * is licensed under a BSD license - read the top of each file.
  *
- * All the GUI related stuff is in tdesdk/kunittest, the core libraries are in tdelibs/kunittest.
- * A simple example modules is in kdelisbs/kunittest/samplemodule.{h,cpp}, however more examples
- * can be found in tdesdk/kunittest/example.
+ * All the GUI related stuff is in tdesdk/tdeunittest, the core libraries are in tdelibs/tdeunittest.
+ * A simple example modules is in kdelisbs/tdeunittest/samplemodule.{h,cpp}, however more examples
+ * can be found in tdesdk/tdeunittest/example.
  *
  * There are roughly two ways to use the KUnitTest library. Either you create dynamically
- * loadable modules and use the kunittestmodrunner or kunittestguimodrunner programs to run
- * the tests, or you use the kunittest/kunittestgui library to create your own test runner
+ * loadable modules and use the tdeunittestmodrunner or tdeunittestguimodrunner programs to run
+ * the tests, or you use the tdeunittest/tdeunittestgui library to create your own test runner
  * application.
  *
  * The main parts of the KUnitTest library are:
  * @li runner.{h,cpp} - it is the tester runner, holds all tests and runs
  * them.
  * @li runnergui.{h,cpp} - the GUI wrapper around the runner. The GUI neatly organizes the
- *   test results. With the kunittest helper script it can even add the debug output
+ *   test results. With the tdeunittest helper script it can even add the debug output
  *   to the test results. For this you need to have the tdesdk module installed.
  * @li tester.h - which holds the base of a pure test object (Tester).
  * @li module.h - defines macros to create a dynamically loadable module.
@@ -134,25 +134,25 @@ SampleTest - 1 test passed, 1 test failed
  * looks like this:
  *
  * @code
- * #include <kaboutdata.h>
- * #include <kapplication.h>
- * #include <kcmdlineargs.h>
- * #include <kcmdlineargs.h>
- * #include <klocale.h>
- * #include <kunittest/runnergui.h>
+ * #include <tdeaboutdata.h>
+ * #include <tdeapplication.h>
+ * #include <tdecmdlineargs.h>
+ * #include <tdecmdlineargs.h>
+ * #include <tdelocale.h>
+ * #include <tdeunittest/runnergui.h>
  *
  * static const char description[] = I18N_NOOP("SampleTests");
  * static const char version[] = "0.1";
- * static KCmdLineOptions options[] = { KCmdLineLastOption };
+ * static TDECmdLineOptions options[] = { TDECmdLineLastOption };
  *
  * int main( int argc, char** argv )
  * {
- *     KAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description,
- *                     KAboutData::License_BSD, "(C) 2005 You!", 0, 0, "mail@provider");
+ *     TDEAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description,
+ *                     TDEAboutData::License_BSD, "(C) 2005 You!", 0, 0, "mail@provider");
  *
- *     KCmdLineArgs::init(argc, argv, &about);
- *     KCmdLineArgs::addCmdLineOptions( options );
- *     KApplication app;
+ *     TDECmdLineArgs::init(argc, argv, &about);
+ *     TDECmdLineArgs::addCmdLineOptions( options );
+ *     TDEApplication app;
  *
  *     KUnitTest::RunnerGUI runner(0);
  *     runner.show();
@@ -170,11 +170,11 @@ SampleTest - 1 test passed, 1 test failed
  * check_PROGRAMS = sampletests
  * sampletests_SOURCES = main.cpp sampletest.cpp
  * sampletests_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- * sampletests_LDADD = -lkunittest
+ * sampletests_LDADD = -ltdeunittest
  * noinst_HEADERS = sampletest.h
  *
  * check:
- *    kunittest $(top_builddir)/src/sampletests SampleTests
+ *    tdeunittest $(top_builddir)/src/sampletests SampleTests
  * @endcode
  *
  * Most of this Makefile.am will be self-explanatory. After running
@@ -183,7 +183,7 @@ SampleTest - 1 test passed, 1 test failed
  * to rebuild the test suite everytime you run make.
  *
  * You can run the binary on its own, but you get more functionality if you use
- * the kunittest helper script. The Makefile.am is set up in such
+ * the tdeunittest helper script. The Makefile.am is set up in such
  * a way that this helper script is automatically run after you do a
  * "make check". This scripts take two arguments, the first is the path
  * to the binary to run. The second the application name, in this case SampleTests.
@@ -193,7 +193,7 @@ SampleTest - 1 test passed, 1 test failed
  * @section module Creating test modules
  *
  * If you think that writing your own test runner if too much work then you can also
- * use the kunittestermodrunner application or the kunitguimodrunner script to run
+ * use the tdeunittestermodrunner application or the kunitguimodrunner script to run
  * the tests for you. You do have to put your tests in a dynamically loadable module though.
  * Fortunately KUnitTest comes with a few macros to help you do this.
  *
@@ -203,21 +203,21 @@ SampleTest - 1 test passed, 1 test failed
  * modifications. First we need to include the module.h header:
  *
  * @code
- * #include <kunittest/module.h>
+ * #include <tdeunittest/module.h>
  * @endcode
  *
  * This header file is needed because it defines some macro you'll need. In fact this is
  * how you use them:
  *
  * @code
- * KUNITTEST_MODULE( kunittest_samplemodule, "Tests for sample module" );
+ * KUNITTEST_MODULE( tdeunittest_samplemodule, "Tests for sample module" );
  * KUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester );
  * KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester );
  * @endcode
  *
  * The first macro, KUNITTEST_MODULE(), makes sure that the module can be loaded and that
- * the test classes are created. The first argument "kunittest_samplemodule" is the library
- * name, in this case the library we're creating a kunittest_samplemodule.la module. The
+ * the test classes are created. The first argument "tdeunittest_samplemodule" is the library
+ * name, in this case the library we're creating a tdeunittest_samplemodule.la module. The
  * second argument is name which will appear in the test runner for this test suite.
  *
  * The tester class are now added by the KUNITTEST_MODULE_REGISTER_TESTER() macro, not the
@@ -229,10 +229,10 @@ SampleTest - 1 test passed, 1 test failed
  * @code
  * INCLUDES = -I$(top_srcdir)/include $(all_includes)
  * METASOURCES = AUTO
- * check_LTLIBRARIES = kunittest_samplemodule.la
- * kunittest_samplemodule_la_SOURCES = samplemodule.cpp
- * kunittest_samplemodule_la_LIBADD = $(LIB_KUNITTEST)
- * kunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+ * check_LTLIBRARIES = tdeunittest_samplemodule.la
+ * tdeunittest_samplemodule_la_SOURCES = samplemodule.cpp
+ * tdeunittest_samplemodule_la_LIBADD = $(LIB_KUNITTEST)
+ * tdeunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
  * @endcode
  *
  * The $(KDE_CHECK_PLUGIN) macro is there to make sure a dynamically loadable
@@ -242,19 +242,19 @@ SampleTest - 1 test passed, 1 test failed
  * the tests in the module is now as easy as:
  *
  * @code
- * $ make check && kunittestmodrunner
+ * $ make check && tdeunittestmodrunner
  * @endcode
  *
- * The kunittestmodrunner application loads all kunittest_*.la modules in the current
+ * The tdeunittestmodrunner application loads all tdeunittest_*.la modules in the current
  * directory. The exit code of this console application is the number of unexpected failures.
  *
- * If you want the GUI, you should use the kunittestmod script:
+ * If you want the GUI, you should use the tdeunittestmod script:
  *
  * @code
- * $ make check && kunittestmod
+ * $ make check && tdeunittestmod
  * @endcode
  *
- * This script starts kunittestguimodrunner application and a helper script to take
+ * This script starts tdeunittestguimodrunner application and a helper script to take
  * care of dealing with debug output.
  *
  * @section advanced Advanced usage
@@ -310,11 +310,11 @@ SampleTest - 1 test passed, 1 test failed
  *
  * The library comes with several helper scripts:
  *
- * @li kunittest [app] [dcopobject] : Runs the application app and redirects all debug output to the dcopobject.
- * @li kunittestmod --folder [folder] --query [query] : Loads and runs all modules in the folder matching the query. Use a GUI.
- * @li kunittest_debughelper [dcopobject] : A PERL script that is able to redirect debug output to a RunnerGUI instance.
+ * @li tdeunittest [app] [dcopobject] : Runs the application app and redirects all debug output to the dcopobject.
+ * @li tdeunittestmod --folder [folder] --query [query] : Loads and runs all modules in the folder matching the query. Use a GUI.
+ * @li tdeunittest_debughelper [dcopobject] : A PERL script that is able to redirect debug output to a RunnerGUI instance.
  *
- * These scripts are part of the tdesdk/kunittest module.
+ * These scripts are part of the tdesdk/tdeunittest module.
  */
 
 /*!
diff --git a/kutils/CMakeLists.txt b/tdeutils/CMakeLists.txt
index a033088cd..1e1982da4 100644
--- a/kutils/CMakeLists.txt
+++ b/tdeutils/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
 )
 
@@ -33,9 +33,9 @@ link_directories(
 
 install( FILES
     kfind.h kfinddialog.h kreplace.h kreplacedialog.h
-    kcmoduleinfo.h kcmoduleloader.h kcmultidialog.h
-    kmultitabbar.h kplugininfo.h kcmoduleproxy.h
-    kpluginselector.h kcmodulecontainer.h
+    tdecmoduleinfo.h tdecmoduleloader.h kcmultidialog.h
+    tdemultitabbar.h kplugininfo.h tdecmoduleproxy.h
+    kpluginselector.h tdecmodulecontainer.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
@@ -44,23 +44,23 @@ install( FILES
 install( FILES kplugininfo.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
-#### kutils #####################################
+#### tdeutils #####################################
 
-set( target kutils )
+set( target tdeutils )
 
 set( ${target}_SRCS
   kfind.cpp kfinddialog.cpp kreplace.cpp
-  kreplacedialog.cpp kcmoduleinfo.cpp kcmoduleloader.cpp
-  kcmultidialog.cpp kmultitabbar.cpp kplugininfo.cpp
-  kcmoduleproxy.cpp kpluginselector.cpp kcmodulecontainer.cpp
-  kcmoduleproxyIface.skel kcmoduleproxyIfaceImpl.cpp
+  kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp
+  kcmultidialog.cpp tdemultitabbar.cpp kplugininfo.cpp
+  tdecmoduleproxy.cpp kpluginselector.cpp tdecmodulecontainer.cpp
+  tdecmoduleproxyIface.skel tdecmoduleproxyIfaceImpl.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
   EMBED ksettings-static
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
   DEPENDENCIES dcopidl
 )
diff --git a/kutils/Mainpage.dox b/tdeutils/Mainpage.dox
index 935908d1d..77abe5777 100644
--- a/kutils/Mainpage.dox
+++ b/tdeutils/Mainpage.dox
@@ -1,6 +1,6 @@
 /** @mainpage Some random bits and pieces
 
-Some utility classes for KSettings, KCModule and KPlugin.
+Some utility classes for KSettings, TDECModule and KPlugin.
 
 @authors
 Matthias Kretz \<kretz@kde.org\><br>
diff --git a/tdeutils/Makefile.am b/tdeutils/Makefile.am
new file mode 100644
index 000000000..b8ae57de2
--- /dev/null
+++ b/tdeutils/Makefile.am
@@ -0,0 +1,31 @@
+SUBDIRS = ksettings .
+INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
+
+lib_LTLIBRARIES   = libtdeutils.la
+libtdeutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+# Needs TDETrader
+libtdeutils_la_LIBADD  = ../tdeio/libtdeio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11)
+
+libtdeutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
+                       kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp \
+                       kcmultidialog.cpp tdemultitabbar.cpp kplugininfo.cpp \
+                       tdecmoduleproxy.cpp kpluginselector.cpp \
+                       tdecmodulecontainer.cpp tdecmoduleproxyIface.skel \
+                       tdecmoduleproxyIfaceImpl.cpp
+
+include_HEADERS = kfind.h kfinddialog.h kreplace.h kreplacedialog.h \
+                  tdecmoduleinfo.h tdecmoduleloader.h kcmultidialog.h \
+                  tdemultitabbar.h kplugininfo.h tdecmoduleproxy.h \
+                  kpluginselector.h tdecmodulecontainer.h
+
+noinst_HEADERS = tdemultitabbar_p.h kpluginselector_p.h \
+                 tdecmoduleproxyIface.h tdecmoduleproxyIfaceImpl.h
+
+kde_servicetypes_DATA = kplugininfo.desktop
+
+METASOURCES = AUTO
+
+DOXYGEN_REFERENCES = tdecore tdeui kio
+include ../admin/Doxyfile.am
+
+# vim: et
diff --git a/kutils/TODO b/tdeutils/TODO
index 82f28e129..7d9f473ab 100644
--- a/kutils/TODO
+++ b/tdeutils/TODO
@@ -1,25 +1,25 @@
 
 This is a list of random changes to do in KDE 4 with the various KCM* classes.
 
-* KCModuleinfo;
+* TDECModuleinfo;
 	- Make it inherit KService; saves a lot of code, simplifies ctors/overloads in surrounding classes
 	- Implement docPath in KService
 	- Get rid of loadAll() and do lazy loading in each getter
 
-* Merge KCModuleProxy and its DCOP Object class(MI)
+* Merge TDECModuleProxy and its DCOP Object class(MI)
 
-* Get rid of `QStringlist arguments` in KCModule and all the helper classes(simplify API)
+* Get rid of `QStringlist arguments` in TDECModule and all the helper classes(simplify API)
 
 * Move stuff to d pointers.. Too much hackish solutions otherwise
 
 * Get rid of bool fallback argument in helper classes(never fails, simplify API)
 
-* Re-implement the QScrollView(d->view) in KCModuleProxy; the protection against violation of HIG-clause. It needs kde-core-devel approval.
+* Re-implement the QScrollView(d->view) in TDECModuleProxy; the protection against violation of HIG-clause. It needs kde-core-devel approval.
 
-* The API in KCModule, KCModuleProxy, and the various desktop entries, concerning root loading are butt ugly. It needs cleaning and simplification.
+* The API in TDECModule, TDECModuleProxy, and the various desktop entries, concerning root loading are butt ugly. It needs cleaning and simplification.
 
-* There's big confusion regarding /when/ the changed(bool) signal should be emitted, abd by /whom/. This can't be fixed properly in 3.x since it means breaking behavior. In KDE 4 it must be made clear if KCModuleProxy should take care of emitting appropriate signals for load()/save()/defaults, or if modules manually should handle it(is there a reason?).
+* There's big confusion regarding /when/ the changed(bool) signal should be emitted, abd by /whom/. This can't be fixed properly in 3.x since it means breaking behavior. In KDE 4 it must be made clear if TDECModuleProxy should take care of emitting appropriate signals for load()/save()/defaults, or if modules manually should handle it(is there a reason?).
 
-* Root modules in KCModuleProxy doesn't support D&D, or it is perhaps implemented in QXEmbed? Anyway, this is what the  XEmbed Protocol Specification says:
+* Root modules in TDECModuleProxy doesn't support D&D, or it is perhaps implemented in QXEmbed? Anyway, this is what the  XEmbed Protocol Specification says:
 
 Solving the drag-and-drop problem, however, is quite easy, since the XDND protocol was carefully designed in a way that makes it possible to support embedded windows. Basically, the embedder has to operate as drag-and-drop proxy for the client. Any XDND messages like XdndEnter, Xdnd,Leave, etc. simply have to be passed through. A toolkit's XDND implementation has to take this situation in consideration.
diff --git a/kutils/groups.dox b/tdeutils/groups.dox
index 95d926d73..a4e0a633f 100644
--- a/kutils/groups.dox
+++ b/tdeutils/groups.dox
@@ -27,7 +27,7 @@ namespace description for an overview.
 */
 
 /**
-@defgroup kcmodule KControl module classes
+@defgroup tdecmodule KControl module classes
 
 Thwse classes provide the KControl module API.
 */
diff --git a/kutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index 58c196abc..6a074040b 100644
--- a/kutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
@@ -26,20 +26,20 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstdguiitem.h>
 #include <kuser.h>
 
-#include "kcmoduleloader.h"
-#include "kcmoduleproxy.h"
+#include "tdecmoduleloader.h"
+#include "tdecmoduleproxy.h"
 #include "kcmultidialog.h"
 #include "kcmultidialog.moc"
 
@@ -51,7 +51,7 @@ class KCMultiDialog::KCMultiDialogPrivate
         {}
 
         bool hasRootKCM;
-        KCModuleProxy* currentModule;
+        TDECModuleProxy* currentModule;
 };
 
  
@@ -141,7 +141,7 @@ void KCMultiDialog::apply()
     ModuleList::Iterator end = m_modules.end();
     for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it )
     {
-        KCModuleProxy * m = ( *it ).kcm;
+        TDECModuleProxy * m = ( *it ).kcm;
         if( m->changed() )
         {
             m->save();
@@ -196,10 +196,10 @@ void KCMultiDialog::slotHelp()
     KURL url( KURL("help:/"), docPath );
 
     if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
-        KProcess process;
+        TDEProcess process;
         process << "khelpcenter"
                 << url.url();
-        process.start(KProcess::DontCare);
+        process.start(TDEProcess::DontCare);
 		process.detach();
     } else {
         new KRun(url);
@@ -228,10 +228,10 @@ void KCMultiDialog::addModule(const TQString& path, bool withfallback, TQStringL
 
     KService::Ptr service = KService::serviceByStorageId( complete );
 
-    addModule( KCModuleInfo( service ), TQStringList(), withfallback, args );
+    addModule( TDECModuleInfo( service ), TQStringList(), withfallback, args );
 }
 
-void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
+void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo,
         TQStringList parentmodulenames, bool withfallback, TQStringList args)
 {
     kdDebug(710) << "KCMultiDialog::addModule " 
@@ -243,7 +243,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
     if ( !kapp->authorizeControlModule( moduleinfo.service()->menuId() ))
             return;
 
-    if( !KCModuleLoader::testModule( moduleinfo ))
+    if( !TDECModuleLoader::testModule( moduleinfo ))
             return;
 
     TQFrame* page = 0;
@@ -254,12 +254,12 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
                 parentmodulenames += moduleinfo.moduleName();
                 page = addHBoxPage( parentmodulenames, moduleinfo.comment(),
                         SmallIcon( moduleinfo.icon(),
-                            IconSize( KIcon::Small ) ) );
+                            IconSize( TDEIcon::Small ) ) );
                 break;
             case IconList:
                 page = addHBoxPage( moduleinfo.moduleName(),
                         moduleinfo.comment(), DesktopIcon( moduleinfo.icon(),
-                            KIcon::SizeMedium ) );
+                            TDEIcon::SizeMedium ) );
                 break;
             case Plain:
                 page = plainPage();
@@ -271,17 +271,17 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
                 break;
         }
     if(!page) {
-        KCModuleLoader::unloadModule(moduleinfo);
+        TDECModuleLoader::unloadModule(moduleinfo);
         return;
     }
-    KCModuleProxy * module;
+    TDECModuleProxy * module;
     if( m_orphanModules.contains( moduleinfo.service() ) )
     {
-        // the KCModule already exists - it was removed from the dialog in
+        // the TDECModule already exists - it was removed from the dialog in
         // removeAllModules
         module = m_orphanModules[ moduleinfo.service() ];
         m_orphanModules.remove( moduleinfo.service() );
-        kdDebug( 710 ) << "Use KCModule from the list of orphans for " <<
+        kdDebug( 710 ) << "Use TDECModule from the list of orphans for " <<
             moduleinfo.moduleName() << ": " << module << endl;
 
         module->reparent( page, 0, TQPoint( 0, 0 ), true );
@@ -294,7 +294,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
     }
     else
     {
-        module = new KCModuleProxy( moduleinfo, withfallback, page, 0, args );
+        module = new TDECModuleProxy( moduleinfo, withfallback, page, 0, args );
         TQStringList parentComponents = moduleinfo.service()->property(
                 "X-TDE-ParentComponents" ).toStringList();
         moduleParentComponents.insert( module,
@@ -327,7 +327,7 @@ void KCMultiDialog::removeAllModules()
     for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it )
     {
         kdDebug( 710 ) << "remove 2" << endl;
-        KCModuleProxy * kcm = ( *it ).kcm;
+        TDECModuleProxy * kcm = ( *it ).kcm;
         TQObject * page = TQT_TQOBJECT(kcm->parent());
         kcm->hide();
         if( page )
@@ -337,7 +337,7 @@ void KCMultiDialog::removeAllModules()
             delete page;
         }
         m_orphanModules[ ( *it ).service ] = kcm;
-        kdDebug( 710 ) << "added KCModule to the list of orphans: " <<
+        kdDebug( 710 ) << "added TDECModule to the list of orphans: " <<
             kcm << endl;
     }
     m_modules.clear();
@@ -354,19 +354,19 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page)
 {
     kdDebug(710) << k_funcinfo << endl;
 
-    TQObject * obj = page->child( 0, "KCModuleProxy" );
+    TQObject * obj = page->child( 0, "TDECModuleProxy" );
     if( ! obj )
         return;
 
-    KCModuleProxy * module = ::tqqt_cast<KCModuleProxy*>(obj);
+    TDECModuleProxy * module = ::tqqt_cast<TDECModuleProxy*>(obj);
     if( ! module )
         return;
     d->currentModule = module;
 
     enableButton( KDialogBase::Help,
-            d->currentModule->buttons() & KCModule::Help );
+            d->currentModule->buttons() & TDECModule::Help );
     enableButton( KDialogBase::Default,
-            d->currentModule->buttons() & KCModule::Default );
+            d->currentModule->buttons() & TDECModule::Default );
 
     disconnect( this, TQT_SIGNAL(user2Clicked()), 0, 0 );
 
diff --git a/kutils/kcmultidialog.h b/tdeutils/kcmultidialog.h
index c26836e31..ca6d2d6c7 100644
--- a/kutils/kcmultidialog.h
+++ b/tdeutils/kcmultidialog.h
@@ -26,14 +26,14 @@
 #include <tqptrdict.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 
-class KCModuleProxy;
-class KCModuleInfo;
+class TDECModuleProxy;
+class TDECModuleInfo;
 
 /**
- * @ingroup kcmodule
+ * @ingroup tdecmodule
  * @short A method that offers a KDialogBase containing arbitrary
  *        KControl Modules.
  *
@@ -126,7 +126,7 @@ public:
     /**
      * Add a module.
      *
-     * @param moduleinfo Pass a KCModuleInfo object which will be
+     * @param moduleinfo Pass a TDECModuleInfo object which will be
      *                   used for creating the module. It will be added
      *                   to the list of modules the dialog will show.
      *
@@ -140,7 +140,7 @@ public:
      *
      * @param args   List of arguments to pass to the module.
      **/
-    void addModule(const KCModuleInfo& moduleinfo, TQStringList
+    void addModule(const TDECModuleInfo& moduleinfo, TQStringList
             parentmodulenames = TQStringList(), bool withfallback=false, TQStringList args = TQStringList());
 
     /**
@@ -156,7 +156,7 @@ public:
 
 signals:
     /**
-     * Emitted after all KCModules have been told to save their configuration.
+     * Emitted after all TDECModules have been told to save their configuration.
      *
      * The applyClicked and okClicked signals are emitted before the
      * configuration is saved.
@@ -164,7 +164,7 @@ signals:
     void configCommitted();
 
     /**
-     * Emitted after the KCModules have been told to save their configuration.
+     * Emitted after the TDECModules have been told to save their configuration.
      * It is emitted once for every instance the KCMs that were changed belong
      * to.
      *
@@ -265,14 +265,14 @@ private:
 
     struct CreatedModule
     {
-        KCModuleProxy * kcm;
+        TDECModuleProxy * kcm;
         KService::Ptr service;
         /* KDE 4 Move to Private class */
     };
     typedef TQValueList<CreatedModule> ModuleList;
     ModuleList m_modules;
 
-    typedef TQMap<KService::Ptr, KCModuleProxy*> OrphanMap;
+    typedef TQMap<KService::Ptr, TDECModuleProxy*> OrphanMap;
     OrphanMap m_orphanModules;
 
     TQPtrDict<TQStringList> moduleParentComponents;
diff --git a/kutils/kdeglobals.kcfg b/tdeutils/kdeglobals.kcfg
index 02b25f909..02b25f909 100644
--- a/kutils/kdeglobals.kcfg
+++ b/tdeutils/kdeglobals.kcfg
diff --git a/kutils/kdeglobals.kcfgc b/tdeutils/kdeglobals.kcfgc
index fee74fc45..fee74fc45 100644
--- a/kutils/kdeglobals.kcfgc
+++ b/tdeutils/kdeglobals.kcfgc
diff --git a/kutils/kfind.cpp b/tdeutils/kfind.cpp
index 7b2da6899..74fb46e9a 100644
--- a/kutils/kfind.cpp
+++ b/tdeutils/kfind.cpp
@@ -21,9 +21,9 @@
 
 #include "kfind.h"
 #include "kfinddialog.h"
-#include <kapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
 #include <tqstylesheet.h>
diff --git a/kutils/kfind.h b/tdeutils/kfind.h
index ab088ef33..ab088ef33 100644
--- a/kutils/kfind.h
+++ b/tdeutils/kfind.h
diff --git a/kutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp
index ef3c131cc..718fdca2f 100644
--- a/kutils/kfinddialog.cpp
+++ b/tdeutils/kfinddialog.cpp
@@ -29,13 +29,13 @@
 #include <tqregexp.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <assert.h>
 #include <tqwhatsthis.h>
 
 #include <kregexpeditorinterface.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 class KFindDialog::KFindDialogPrivate
 {
diff --git a/kutils/kfinddialog.h b/tdeutils/kfinddialog.h
index fcf870836..fcf870836 100644
--- a/kutils/kfinddialog.h
+++ b/tdeutils/kfinddialog.h
diff --git a/kutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp
index 7b83be7ed..9ea0eb2bc 100644
--- a/kutils/kplugininfo.cpp
+++ b/tdeutils/kplugininfo.cpp
@@ -21,8 +21,8 @@
 #include <ksimpleconfig.h>
 #include <ktrader.h>
 #include <kdebug.h>
-#include <kconfigbase.h>
-#include <kglobal.h>
+#include <tdeconfigbase.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kservice.h>
@@ -60,7 +60,7 @@ class KPluginInfo::KPluginInfoPrivate
         bool enabledbydefault;
         bool pluginenabled;
 
-        KConfig * config;
+        TDEConfig * config;
         TQString configgroup;
         KService::Ptr service;
         TQValueList<KService::Ptr> kcmservices;
@@ -151,7 +151,7 @@ KPluginInfo::~KPluginInfo()
     delete d;
 }
 
-TQValueList<KPluginInfo*> KPluginInfo::fromServices( const KService::List & services, KConfig * config, const TQString & group )
+TQValueList<KPluginInfo*> KPluginInfo::fromServices( const KService::List & services, TDEConfig * config, const TQString & group )
 {
     TQValueList<KPluginInfo*> infolist;
     KPluginInfo * info;
@@ -165,7 +165,7 @@ TQValueList<KPluginInfo*> KPluginInfo::fromServices( const KService::List & serv
     return infolist;
 }
 
-TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, KConfig * config, const TQString & group )
+TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, TDEConfig * config, const TQString & group )
 {
     TQValueList<KPluginInfo*> infolist;
     for( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it )
@@ -177,9 +177,9 @@ TQValueList<KPluginInfo*> KPluginInfo::fromFiles( const TQStringList & files, KC
     return infolist;
 }
 
-TQValueList<KPluginInfo*> KPluginInfo::fromKPartsInstanceName( const TQString & name, KConfig * config, const TQString & group )
+TQValueList<KPluginInfo*> KPluginInfo::fromKPartsInstanceName( const TQString & name, TDEConfig * config, const TQString & group )
 {
-    TQStringList files = KGlobal::dirs()->findAllResources( "data", name +
+    TQStringList files = TDEGlobal::dirs()->findAllResources( "data", name +
             "/kpartplugins/*.desktop", true, false );
     return fromFiles( files, config, group );
 }
@@ -276,7 +276,7 @@ const TQValueList<KService::Ptr> & KPluginInfo::kcmServices() const
 {
     if ( !d->kcmservicesCached )
     {
-        d->kcmservices = KTrader::self()->query( "KCModule", "'" + d->pluginName +
+        d->kcmservices = TDETrader::self()->query( "TDECModule", "'" + d->pluginName +
             "' in [X-TDE-ParentComponents]" );
         kdDebug( 703 ) << "found " << d->kcmservices.count() << " offers for " <<
             d->pluginName << endl;
@@ -287,13 +287,13 @@ const TQValueList<KService::Ptr> & KPluginInfo::kcmServices() const
     return d->kcmservices;
 }
 
-void KPluginInfo::setConfig( KConfig * config, const TQString & group )
+void KPluginInfo::setConfig( TDEConfig * config, const TQString & group )
 {
     d->config = config;
     d->configgroup = group;
 }
 
-KConfig * KPluginInfo::config() const
+TDEConfig * KPluginInfo::config() const
 {
     return d->config;
 }
@@ -316,14 +316,14 @@ TQVariant KPluginInfo::operator[]( const TQString & key ) const
     return property( key );
 }
 
-void KPluginInfo::save( KConfigGroup * config )
+void KPluginInfo::save( TDEConfigGroup * config )
 {
     kdDebug( 703 ) << k_funcinfo << endl;
     if( 0 == config )
     {
         if( 0 == d->config )
         {
-            kdWarning( 703 ) << "no KConfigGroup, cannot save" << endl;
+            kdWarning( 703 ) << "no TDEConfigGroup, cannot save" << endl;
             return;
         }
         d->config->setGroup( d->configgroup );
@@ -333,14 +333,14 @@ void KPluginInfo::save( KConfigGroup * config )
         config->writeEntry( d->pluginName + "Enabled", isPluginEnabled() );
 }
 
-void KPluginInfo::load( KConfigGroup * config )
+void KPluginInfo::load( TDEConfigGroup * config )
 {
     kdDebug( 703 ) << k_funcinfo << endl;
     if( 0 == config )
     {
         if( 0 == d->config )
         {
-            kdWarning( 703 ) << "no KConfigGroup, cannot load" << endl;
+            kdWarning( 703 ) << "no TDEConfigGroup, cannot load" << endl;
             return;
         }
         d->config->setGroup( d->configgroup );
diff --git a/kutils/kplugininfo.desktop b/tdeutils/kplugininfo.desktop
index d88712b9d..d88712b9d 100644
--- a/kutils/kplugininfo.desktop
+++ b/tdeutils/kplugininfo.desktop
diff --git a/kutils/kplugininfo.h b/tdeutils/kplugininfo.h
index b75edf1a2..8a4d79c8b 100644
--- a/kutils/kplugininfo.h
+++ b/tdeutils/kplugininfo.h
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <kservice.h>
 
-class KConfigGroup;
+class TDEConfigGroup;
 
 /**
  * @ingroup main
@@ -74,7 +74,7 @@ class KUTILS_EXPORT KPluginInfo
          *
          * @param filename  The filename of the .desktop file.
          * @param resource  If filename is relative, you need to specify a resource type
-         * (e.g. "service", "apps"... KStandardDirs). Otherwise,
+         * (e.g. "service", "apps"... TDEStandardDirs). Otherwise,
          * resource isn't used.
          */
         KPluginInfo( const TQString & filename, const char* resource = 0 );
@@ -120,22 +120,22 @@ class KUTILS_EXPORT KPluginInfo
          * KService objects. If you get a trader offer of the plugins you want
          * to use you can just pass them to this function.
          */
-        static KPluginInfo::List fromServices( const KService::List & services, KConfig * config = 0, const TQString & group = TQString::null );
+        static KPluginInfo::List fromServices( const KService::List & services, TDEConfig * config = 0, const TQString & group = TQString::null );
 
         /**
          * @return A list of KPluginInfo objects constructed from a list of
          * filenames. If you make a lookup using, for example,
-         * KStandardDirs::findAllResources() you pass the list of files to this
+         * TDEStandardDirs::findAllResources() you pass the list of files to this
          * function.
          */
-        static KPluginInfo::List fromFiles( const TQStringList & files, KConfig * config = 0, const TQString & group = TQString::null );
+        static KPluginInfo::List fromFiles( const TQStringList & files, TDEConfig * config = 0, const TQString & group = TQString::null );
 
         /**
          * @return A list of KPluginInfo objects for the KParts plugins of an
          * instance. You only need the name of the instance not a pointer to the
-         * KInstance object.
+         * TDEInstance object.
          */
-        static KPluginInfo::List fromKPartsInstanceName( const TQString &, KConfig * config = 0, const TQString & group = TQString::null );
+        static KPluginInfo::List fromKPartsInstanceName( const TQString &, TDEConfig * config = 0, const TQString & group = TQString::null );
 
         /**
          * @return Whether the plugin should be hidden.
@@ -263,25 +263,25 @@ class KUTILS_EXPORT KPluginInfo
 
         /**
          * @return A list of Service pointers if the plugin installs one or more
-         *         KCModule
+         *         TDECModule
          */
         const TQValueList<KService::Ptr> & kcmServices() const;
 
         /**
-         * Set the KConfigGroup to use for load()ing and save()ing the
-         * configuration. This will be overridden by the KConfigGroup passed to
+         * Set the TDEConfigGroup to use for load()ing and save()ing the
+         * configuration. This will be overridden by the TDEConfigGroup passed to
          * save() or load() (if one is passed).
          */
-        void setConfig( KConfig * config, const TQString & group );
+        void setConfig( TDEConfig * config, const TQString & group );
 
         /**
-         * @return If the KPluginInfo object has a KConfig object set return
+         * @return If the KPluginInfo object has a TDEConfig object set return
          * it, else return 0.
          */
-        KConfig * config() const;
+        TDEConfig * config() const;
 
         /**
-         * @return The groupname used in the KConfig object for load()ing and
+         * @return The groupname used in the TDEConfig object for load()ing and
          * save()ing whether the plugin is enabled.
          */
         const TQString & configgroup() const;
@@ -289,18 +289,18 @@ class KUTILS_EXPORT KPluginInfo
         /**
          * Save state of the plugin - enabled or not. This function is provided
          * for reimplementation if you need to save somewhere else.
-         * @param config    The KConfigGroup holding the information whether
+         * @param config    The TDEConfigGroup holding the information whether
          *                  plugin is enabled.
          */
-        virtual void save( KConfigGroup * config = 0 );
+        virtual void save( TDEConfigGroup * config = 0 );
 
         /**
          * Load the state of the plugin - enabled or not. This function is provided
          * for reimplementation if you need to save somewhere else.
-         * @param config    The KConfigGroup holding the information whether
+         * @param config    The TDEConfigGroup holding the information whether
          *                  plugin is enabled.
          */
-        virtual void load( KConfigGroup * config = 0 );
+        virtual void load( TDEConfigGroup * config = 0 );
 
         /**
          * Restore defaults (enabled or not).
diff --git a/kutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index a385d2719..9fe08b027 100644
--- a/kutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -35,30 +35,30 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <klistview.h>
+#include <tdelocale.h>
+#include <tdelistview.h>
 #include <ksimpleconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <ktabctl.h>
-#include <kcmoduleinfo.h>
+#include <tdecmoduleinfo.h>
 #include <tqvaluelist.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <ktabwidget.h>
 #include <kiconloader.h>
-#include <kcmodule.h>
-#include "kcmoduleinfo.h"
-#include "kcmoduleloader.h"
+#include <tdecmodule.h>
+#include "tdecmoduleinfo.h"
+#include "tdecmoduleloader.h"
 #include <tqsplitter.h>
 #include <tqframe.h>
 #include "kplugininfo.h"
 #include <kinstance.h>
 #include <tqptrdict.h>
 #include <tqstringlist.h>
-#include "kcmoduleproxy.h"
+#include "tdecmoduleproxy.h"
 
 /*
     QCheckListViewItem that holds a pointer to the KPluginInfo object.
@@ -67,7 +67,7 @@
 class KPluginInfoLVI : public TQCheckListItem
 {
 public:
-    KPluginInfoLVI( KPluginInfo *pluginInfo, KListView *parent )
+    KPluginInfoLVI( KPluginInfo *pluginInfo, TDEListView *parent )
     : TQCheckListItem( parent, pluginInfo->name(), TQCheckListItem::CheckBox ), m_pluginInfo( pluginInfo )
     {
     }
@@ -86,15 +86,15 @@ private:
 class KPluginListViewToolTip : public TQToolTip
 {
 public:
-	KPluginListViewToolTip( TQWidget *parent, KListView *lv );
+	KPluginListViewToolTip( TQWidget *parent, TDEListView *lv );
 
 	void maybeTip( const TQPoint &pos );
 
 private:
-	KListView *m_listView;
+	TDEListView *m_listView;
 };
 
-KPluginListViewToolTip::KPluginListViewToolTip( TQWidget *parent, KListView *lv )
+KPluginListViewToolTip::KPluginListViewToolTip( TQWidget *parent, TDEListView *lv )
 : TQToolTip( parent ), m_listView( lv )
 {
 }
@@ -123,7 +123,7 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
 {
     KPluginSelectionWidgetPrivate( KPluginSelector * _kps,
                                    const TQString & _cat,
-                                   KConfigGroup * _config )
+                                   TDEConfigGroup * _config )
      : widgetstack( 0 )
         , kps( _kps )
         , config( _config )
@@ -146,14 +146,14 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
 
     TQWidgetStack * widgetstack;
     KPluginSelector * kps;
-    KConfigGroup * config;
+    TDEConfigGroup * config;
     KPluginListViewToolTip *tooltip;
 
-    TQDict<KCModuleInfo> pluginconfigmodules;
+    TQDict<TDECModuleInfo> pluginconfigmodules;
     TQMap<TQString, int> widgetIDs;
     TQMap<KPluginInfo*, bool> plugincheckedchanged;
     TQString catname;
-    TQValueList<KCModuleProxy*> modulelist;
+    TQValueList<TDECModuleProxy*> modulelist;
     TQPtrDict<TQStringList> moduleParentComponents;
 
     KPluginInfo * currentplugininfo;
@@ -165,7 +165,7 @@ struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
 KPluginSelectionWidget::KPluginSelectionWidget(
         const TQValueList<KPluginInfo*> & plugininfos, KPluginSelector * kps,
         TQWidget * parent, const TQString & catname, const TQString & category,
-        KConfigGroup * config, const char * name )
+        TDEConfigGroup * config, const char * name )
     : TQWidget( parent, name )
     , d( new KPluginSelectionWidgetPrivate( kps, catname, config ) )
 {
@@ -182,7 +182,7 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos
 {
     // setup Widgets
     ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
-    KListView * listview = new KListView( this );
+    TDEListView * listview = new TDEListView( this );
     d->tooltip = new KPluginListViewToolTip( listview->viewport(), listview );
     connect( listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this,
             TQT_SLOT( executed( TQListViewItem * ) ) );
@@ -195,7 +195,7 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos
     listview->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
     listview->setAcceptDrops( false );
     listview->setFullWidth( true );
-    listview->setSelectionModeExt( KListView::Single );
+    listview->setSelectionModeExt( TDEListView::Single );
     listview->setAllColumnsShowFocus( true );
     listview->addColumn( i18n( "Name" ) );
     for( TQValueList<KPluginInfo*>::ConstIterator it = plugininfos.begin();
@@ -207,7 +207,7 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos
         {
             TQCheckListItem * item = new KPluginInfoLVI( *it, listview );
             if( ! ( *it )->icon().isEmpty() )
-                item->setPixmap( 0, SmallIcon( ( *it )->icon(), IconSize( KIcon::Small ) ) );
+                item->setPixmap( 0, SmallIcon( ( *it )->icon(), IconSize( TDEIcon::Small ) ) );
             item->setOn( ( *it )->isPluginEnabled() );
             d->pluginInfoMap.insert( item, *it );
         }
@@ -238,9 +238,9 @@ bool KPluginSelectionWidget::pluginIsLoaded( const TQString & pluginName ) const
 
 
 TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent,
-        const KCModuleInfo & moduleinfo )
+        const TDECModuleInfo & moduleinfo )
 {
-    KCModuleProxy * module = new KCModuleProxy( moduleinfo, false,
+    TDECModuleProxy * module = new TDECModuleProxy( moduleinfo, false,
             parent );
     if( !module->realModule() )
     {
@@ -281,7 +281,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch
         {
             if( !( *it )->noDisplay() )
             {
-                KCModuleInfo moduleinfo( *it );
+                TDECModuleInfo moduleinfo( *it );
                 TQWidget * module = insertKCM( tabwidget, moduleinfo );
                 tabwidget->addTab( module, moduleinfo.moduleName() );
             }
@@ -291,7 +291,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch
     {
         if( !plugininfo->kcmServices().front()->noDisplay() )
         {
-            KCModuleInfo moduleinfo(
+            TDECModuleInfo moduleinfo(
                     plugininfo->kcmServices().front() );
             TQWidget * module = insertKCM( d->widgetstack, moduleinfo );
             module->setEnabled( checked );
@@ -431,7 +431,7 @@ void KPluginSelectionWidget::load()
             d->currentchecked = info->isPluginEnabled();
     }
 
-    for( TQValueList<KCModuleProxy*>::Iterator it = d->modulelist.begin();
+    for( TQValueList<TDECModuleProxy*>::Iterator it = d->modulelist.begin();
             it != d->modulelist.end(); ++it )
         if( ( *it )->changed() )
             ( *it )->load();
@@ -454,7 +454,7 @@ void KPluginSelectionWidget::save()
         d->plugincheckedchanged[ info ] = false;
     }
     TQStringList updatedModules;
-    for( TQValueList<KCModuleProxy*>::Iterator it = d->modulelist.begin();
+    for( TQValueList<TDECModuleProxy*>::Iterator it = d->modulelist.begin();
             it != d->modulelist.end(); ++it )
         if( ( *it )->changed() )
         {
@@ -570,34 +570,34 @@ void KPluginSelector::checkNeedForTabWidget()
     }
 }
 
-static TQValueList<KPluginInfo*> kpartsPluginInfos( const TQString& instanceName )
+static TQValueList<KPluginInfo*> tdepartsPluginInfos( const TQString& instanceName )
 {
     if( instanceName.isNull() )
         return TQValueList<KPluginInfo*>(); //nothing
 
-    const TQStringList desktopfilenames = KGlobal::dirs()->findAllResources( "data",
+    const TQStringList desktopfilenames = TDEGlobal::dirs()->findAllResources( "data",
             instanceName + "/kpartplugins/*.desktop", true, false );
     return KPluginInfo::fromFiles( desktopfilenames );
 }
 
 void KPluginSelector::addPlugins( const TQString & instanceName,
-        const TQString & catname, const TQString & category, KConfig * config )
+        const TQString & catname, const TQString & category, TDEConfig * config )
 {
-    const TQValueList<KPluginInfo*> plugininfos = kpartsPluginInfos( instanceName );
+    const TQValueList<KPluginInfo*> plugininfos = tdepartsPluginInfos( instanceName );
     if ( plugininfos.isEmpty() )
         return;
     checkNeedForTabWidget();
     Q_ASSERT( config ); // please set config, or use addPlugins( instance, ... ) which takes care of it
     if ( !config ) // KDE4: ensure that config is always set; make it second in the arg list?
         config = new KSimpleConfig(  instanceName ); // memleak!
-    KConfigGroup * cfgGroup = new KConfigGroup( config, "KParts Plugins" );
+    TDEConfigGroup * cfgGroup = new TDEConfigGroup( config, "KParts Plugins" );
     kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl;
     addPluginsInternal( plugininfos, catname, category, cfgGroup );
 }
 
 void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugininfos,
                                           const TQString & catname, const TQString & category,
-                                          KConfigGroup* cfgGroup )
+                                          TDEConfigGroup* cfgGroup )
 {
     KPluginSelectionWidget * w;
     if( d->tabwidget )
@@ -618,8 +618,8 @@ void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugin
     d->pswidgets += w;
 }
 
-void KPluginSelector::addPlugins( const KInstance * instance, const TQString &
-        catname, const TQString & category, KConfig * config )
+void KPluginSelector::addPlugins( const TDEInstance * instance, const TQString &
+        catname, const TQString & category, TDEConfig * config )
 {
     if ( !config )
         config = instance->config();
@@ -627,11 +627,11 @@ void KPluginSelector::addPlugins( const KInstance * instance, const TQString &
 }
 
 void KPluginSelector::addPlugins( const TQValueList<KPluginInfo*> & plugininfos,
-        const TQString & catname, const TQString & category, KConfig * config )
+        const TQString & catname, const TQString & category, TDEConfig * config )
 {
     checkNeedForTabWidget();
-    // the KConfigGroup becomes owned by KPluginSelectionWidget
-    KConfigGroup * cfgGroup = new KConfigGroup( config ? config : KGlobal::config(), "Plugins" );
+    // the TDEConfigGroup becomes owned by KPluginSelectionWidget
+    TDEConfigGroup * cfgGroup = new TDEConfigGroup( config ? config : TDEGlobal::config(), "Plugins" );
     kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl;
     addPluginsInternal( plugininfos, catname, category, cfgGroup );
 }
@@ -696,10 +696,10 @@ void KPluginSelector::defaults()
     // tabwidget - defaults() will be called for all of them)
 
     TQWidget * pluginconfig = d->widgetstack->visibleWidget();
-    KCModuleProxy * kcm = ::tqqt_cast<KCModuleProxy*>(pluginconfig);
+    TDECModuleProxy * kcm = ::tqqt_cast<TDECModuleProxy*>(pluginconfig);
     if( kcm )
     {
-        kdDebug( 702 ) << "call KCModule::defaults() for the plugins KCM"
+        kdDebug( 702 ) << "call TDECModule::defaults() for the plugins KCM"
             << endl;
         kcm->defaults();
         return;
@@ -707,14 +707,14 @@ void KPluginSelector::defaults()
 
     // if we get here the visible Widget must be a tabwidget holding more than
     // one KCM
-    TQObjectList * kcms = pluginconfig->queryList( "KCModuleProxy",
+    TQObjectList * kcms = pluginconfig->queryList( "TDECModuleProxy",
             0, false, false );
     TQObjectListIt it( *kcms );
     TQObject * obj;
     while( ( obj = it.current() ) != 0 )
     {
         ++it;
-        ( ( KCModule* )obj )->defaults();
+        ( ( TDECModule* )obj )->defaults();
     }
     delete kcms;
     // FIXME: update changed state
diff --git a/kutils/kpluginselector.h b/tdeutils/kpluginselector.h
index 278906793..4316f4880 100644
--- a/kutils/kpluginselector.h
+++ b/tdeutils/kpluginselector.h
@@ -25,11 +25,11 @@
 
 #include <tdelibs_export.h>
 
-class KInstance;
+class TDEInstance;
 class KPluginInfo;
 class TQWidgetStack;
-class KConfig;
-class KConfigGroup;
+class TDEConfig;
+class TDEConfigGroup;
 
 /**
  * @ingroup main
@@ -78,7 +78,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          * The information about the plugins will be loaded from the
          * share/apps/&lt;instancename&gt;/kpartplugins directory.
          *
-         * @param instanceName The name of the KInstance of the plugin's parent.
+         * @param instanceName The name of the TDEInstance of the plugin's parent.
          * @param catname      The translated name of the category. This is the
          *                     name that is shown in the TabWidget if there is
          *                     more than one category.
@@ -89,10 +89,10 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          *                     with the Category key == @p category. If @p
          *                     category is not set the Category key is ignored
          *                     and all plugins are shown.
-         * @param config       The KConfig object that holds the state of the
+         * @param config       The TDEConfig object that holds the state of the
          *                     plugins being enabled or not. By default it should
          *                     be instance->config(). It is recommended to
-         *                     always pass a KConfig object if you use
+         *                     always pass a TDEConfig object if you use
          *                     KSettings::PluginPage since you never know from where the
          *                     page will be called (think global config app).
          *                     For example KViewCanvas passes KSimpleConfig(
@@ -101,16 +101,16 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
         void addPlugins( const TQString & instanceName,
                 const TQString & catname = TQString::null,
                 const TQString & category = TQString::null,
-                KConfig * config = 0 );
+                TDEConfig * config = 0 );
 
         /**
          * Add a list of KParts plugins. Convenience method for the one above.
          * If not set explicitely, @p config is set to instance->config().
          */
-        void addPlugins( const KInstance * instance,
+        void addPlugins( const TDEInstance * instance,
                 const TQString & catname = TQString::null,
                 const TQString & category = TQString::null,
-                KConfig * config = 0 );
+                TDEConfig * config = 0 );
 
         /**
          * Add a list of non-KParts plugins
@@ -128,10 +128,10 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          *                     with the Category key == @p category. If @p
          *                     category is not set the Category key is ignored
          *                     and all plugins are shown.
-         * @param config       The KConfig object that holds the state of the
+         * @param config       The TDEConfig object that holds the state of the
          *                     plugins being enabled or not. By default it will
-         *                     use KGlobal::config(). It is recommended to
-         *                     always pass a KConfig object if you use
+         *                     use TDEGlobal::config(). It is recommended to
+         *                     always pass a TDEConfig object if you use
          *                     KSettings::PluginPage since you never know from where the
          *                     page will be called (think global config app).
          *                     For example KViewCanvas passes KSimpleConfig(
@@ -140,7 +140,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
         void addPlugins( const TQValueList<KPluginInfo*> & plugininfos,
                 const TQString & catname = TQString::null,
                 const TQString & category = TQString::null,
-                KConfig * config = 0 );
+                TDEConfig * config = 0 );
 
         /**
          * Set whether the area for showing the KCMs of the plugins should be
@@ -208,7 +208,7 @@ class KUTILS_EXPORT KPluginSelector : public TQWidget
          */
 	void addPluginsInternal( const TQValueList<KPluginInfo*> plugininfos,
                                  const TQString & catname, const TQString & category,
-                                 KConfigGroup* cfgGroup );
+                                 TDEConfigGroup* cfgGroup );
 
 	class KPluginSelectorPrivate;
         KPluginSelectorPrivate * d;
diff --git a/kutils/kpluginselector_p.h b/tdeutils/kpluginselector_p.h
index eb509a41e..c287ce555 100644
--- a/kutils/kpluginselector_p.h
+++ b/tdeutils/kpluginselector_p.h
@@ -24,10 +24,10 @@
 
 #include <tdelibs_export.h>
 
-class KConfigGroup;
+class TDEConfigGroup;
 class TQListViewItem;
 class KPluginInfo;
-class KCModuleInfo;
+class TDECModuleInfo;
 
 /**
  * This is a widget to configure what Plugins should be loaded. This widget is
@@ -53,7 +53,7 @@ class KPluginSelectionWidget : public TQWidget
          * @param parent       The parent widget.
          * @param catname      The translated name of the category.
          * @param category     The unstranslated category key name.
-         * @param config       Set the KConfigGroup object that holds the
+         * @param config       Set the TDEConfigGroup object that holds the
          *                     state of the plugins being enabled or not.
          * @param name         The name of the widget (passed to TQWidget)
          *
@@ -61,7 +61,7 @@ class KPluginSelectionWidget : public TQWidget
          */
         KPluginSelectionWidget( const TQValueList<KPluginInfo*> & plugininfos,
                 KPluginSelector * kps, TQWidget * parent, const TQString & catname,
-                const TQString & category, KConfigGroup * config = 0,
+                const TQString & category, TDEConfigGroup * config = 0,
                 const char * name = 0 );
 
         virtual ~KPluginSelectionWidget();
@@ -162,13 +162,13 @@ class KPluginSelectionWidget : public TQWidget
 
     private:
         /**
-         * Load a KCM from a KCModuleInfo. If successfull connect changed
+         * Load a KCM from a TDECModuleInfo. If successfull connect changed
          * signal and return the module. If not, create a label showing "Error",
          * show the loaderError and return the label.
          *
          * @internal
          */
-        TQWidget * insertKCM( TQWidget * parent, const KCModuleInfo & );
+        TQWidget * insertKCM( TQWidget * parent, const TDECModuleInfo & );
 
         /**
          * Embed the KCMs for the plugin into the widgetstack
diff --git a/kutils/kreplace.cpp b/tdeutils/kreplace.cpp
index f825e93cc..98e3ce93c 100644
--- a/kutils/kreplace.cpp
+++ b/tdeutils/kreplace.cpp
@@ -19,11 +19,11 @@
 */
 
 #include <tqlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include "kreplace.h"
 #include "kreplacedialog.h"
 #include <tqregexp.h>
diff --git a/kutils/kreplace.h b/tdeutils/kreplace.h
index ea385189b..ea385189b 100644
--- a/kutils/kreplace.h
+++ b/tdeutils/kreplace.h
diff --git a/kutils/kreplacedialog.cpp b/tdeutils/kreplacedialog.cpp
index 88c006b4d..d8e74af44 100644
--- a/kutils/kreplacedialog.cpp
+++ b/tdeutils/kreplacedialog.cpp
@@ -26,8 +26,8 @@
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 /**
diff --git a/kutils/kreplacedialog.h b/tdeutils/kreplacedialog.h
index 409666dbd..409666dbd 100644
--- a/kutils/kreplacedialog.h
+++ b/tdeutils/kreplacedialog.h
diff --git a/kutils/ksettings/CMakeLists.txt b/tdeutils/ksettings/CMakeLists.txt
index 3e4744bd8..b495c90db 100644
--- a/kutils/ksettings/CMakeLists.txt
+++ b/tdeutils/ksettings/CMakeLists.txt
@@ -13,10 +13,10 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kutils
+  ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
 )
 
 ##### headers ###################################
diff --git a/kutils/ksettings/Makefile.am b/tdeutils/ksettings/Makefile.am
index 39e7183b2..39e7183b2 100644
--- a/kutils/ksettings/Makefile.am
+++ b/tdeutils/ksettings/Makefile.am
diff --git a/kutils/ksettings/README.dox b/tdeutils/ksettings/README.dox
index 4abfc6be5..88268f671 100644
--- a/kutils/ksettings/README.dox
+++ b/tdeutils/ksettings/README.dox
@@ -45,7 +45,7 @@ mechanisms.
 Every page is a KCM. This is what you need for creating a page:
 
 \code
-class MyAppConfig : public KCModule
+class MyAppConfig : public TDECModule
 {
   Q_OBJECT
 public:
@@ -67,7 +67,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_myappconfig, MyAppConfigFactory(
     "kcm_myappconfig" ) );
 
 MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args )
-  : KCModule( MyAppConfigFactory::instance(), parent, args )
+  : TDECModule( MyAppConfigFactory::instance(), parent, args )
 {
   // create the pages GUI
   load();
@@ -76,9 +76,9 @@ MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args
 // implementations for the other methods
 \endcode
 
-For the KConfig object you can either use
-KGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ).
-I added a method to KSettings::Dispatcher that gives you the KConfig
+For the TDEConfig object you can either use
+TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ).
+I added a method to KSettings::Dispatcher that gives you the TDEConfig
 object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName
 
 
@@ -94,7 +94,7 @@ An example file:
 Encoding=UTF-8
 Icon=myapp
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=myappconfig
@@ -115,16 +115,16 @@ Some explanation for those keys:
 - Icon is the icon that will be used in the listview/iconview for your page.
 - X-TDE-Library is the name of the library where the page is in. The library
   always needs to be prefixed with kcm_ but you don't write the prefix in the
-  desktop file. For more docu on this look for the KCModule docu.
+  desktop file. For more docu on this look for the TDECModule docu.
 - X-TDE-FactoryName is either the name of the Factory you used in the
   KGenericFactory call or the suffix of the create_ function that you created.
-  Again for more info look for the KCModule docu.
+  Again for more info look for the TDECModule docu.
 - X-TDE-ParentApp is the name of the application this config page belongs to. It
   is used by the first two \ref KSettings::Dialog constructors. The Dialog will
   use all modules that set X-TDE-ParentApp to
-  KGlobal::instance()->instanceName(). It
+  TDEGlobal::instance()->instanceName(). It
   should be pretty easy to find out what name that is: look at the first
-  argument to the KAboutData ctor.
+  argument to the TDEAboutData ctor.
 - X-TDE-ParentComponents is a list of the components (plugin/KPart/whatever)
   this config page belongs to. Normally there is only one component.
   It is used for two things:
diff --git a/kutils/ksettings/TODO b/tdeutils/ksettings/TODO
index 9950ddfd9..9950ddfd9 100644
--- a/kutils/ksettings/TODO
+++ b/tdeutils/ksettings/TODO
diff --git a/kutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp
index 097d1f6d7..f60613bce 100644
--- a/kutils/ksettings/componentsdialog.cpp
+++ b/tdeutils/ksettings/componentsdialog.cpp
@@ -18,15 +18,15 @@
 */
 
 #include "ksettings/componentsdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <kplugininfo.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kseparator.h>
 
 namespace KSettings
@@ -35,7 +35,7 @@ namespace KSettings
 class ComponentsDialog::ComponentsDialogPrivate
 {
     public:
-        KListView * listview;
+        TDEListView * listview;
         TQFrame * infowidget;
         TQLabel * iconwidget;
         TQLabel * commentwidget;
@@ -51,7 +51,7 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name )
     TQWidget * page = new TQWidget( this );
     setMainWidget( page );
     ( new TQHBoxLayout( page, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
-    d->listview = new KListView( page );
+    d->listview = new TDEListView( page );
     d->listview->setMinimumSize( 200, 200 );
     d->infowidget = new TQFrame( page );
     d->infowidget->setMinimumSize( 200, 200 );
@@ -68,7 +68,7 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name )
     d->listview->setRootIsDecorated( true );
     d->listview->setSorting( -1 );
     d->listview->setAcceptDrops( false );
-    d->listview->setSelectionModeExt( KListView::Single );
+    d->listview->setSelectionModeExt( TDEListView::Single );
     d->listview->setAllColumnsShowFocus( true );
 
     connect( d->listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this,
@@ -119,7 +119,7 @@ void ComponentsDialog::show()
         TQCheckListItem * item = new TQCheckListItem( d->listview, ( *it )->name(),
                 TQCheckListItem::CheckBox );
         if( ! ( *it )->icon().isEmpty() )
-            item->setPixmap( 0, SmallIcon( ( *it )->icon(), IconSize( KIcon::Small ) ) );
+            item->setPixmap( 0, SmallIcon( ( *it )->icon(), IconSize( TDEIcon::Small ) ) );
         item->setOn( ( *it )->isPluginEnabled() );
         d->plugininfomap[ item ] = ( *it );
     }
@@ -144,7 +144,7 @@ void ComponentsDialog::executed( TQListViewItem * item )
     info->setPluginEnabled( checked );
     //checkDependencies( info );
     // show info about the component on the right
-    d->iconwidget->setPixmap( SmallIcon( info->icon(), KIcon::SizeLarge ) );
+    d->iconwidget->setPixmap( SmallIcon( info->icon(), TDEIcon::SizeLarge ) );
     d->commentwidget->setText( info->comment() );
     //d->descriptionwidget->setText( info->description() );
 }
diff --git a/kutils/ksettings/componentsdialog.h b/tdeutils/ksettings/componentsdialog.h
index e3f8b60a0..e3f8b60a0 100644
--- a/kutils/ksettings/componentsdialog.h
+++ b/tdeutils/ksettings/componentsdialog.h
diff --git a/kutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp
index 8fbe74c81..e74b9ac48 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/tdeutils/ksettings/dialog.cpp
@@ -21,7 +21,7 @@
 
 
 #include <kcmultidialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
 #include <ktrader.h>
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
-#include "kcmoduleinfo.h"
+#include "tdecmoduleinfo.h"
 
 namespace KSettings
 {
@@ -58,7 +58,7 @@ class PageNode
 		enum Type { KCM, Group, Root };
 		union Value
 		{
-			KCModuleInfo * kcm;
+			TDECModuleInfo * kcm;
 			GroupInfo * group;
 		};
 		Type m_type;
@@ -71,7 +71,7 @@ class PageNode
 		bool m_dirty;
 
 	protected:
-		PageNode( KCModuleInfo * info, PageNode * parent )
+		PageNode( TDECModuleInfo * info, PageNode * parent )
 			: m_type( KCM )
 			, m_parent( parent )
 			, m_visible( true )
@@ -221,7 +221,7 @@ class PageNode
 				TQPixmap icon;
 				if( ! m_value.group->icon.isNull() )
 					icon = SmallIcon( m_value.group->icon,
-							IconSize( KIcon::Small ) );
+							IconSize( TDEIcon::Small ) );
 				TQVBox * page = dlg->addVBoxPage( m_value.group->name,
 						TQString::null, icon );
 				TQLabel * comment = new TQLabel( m_value.group->comment, page );
@@ -291,7 +291,7 @@ class PageNode
 			return false;
 		}
 
-		bool insert( KCModuleInfo * info, const TQString & parentid )
+		bool insert( TDECModuleInfo * info, const TQString & parentid )
 		{
 			if( parentid.isNull() )
 			{
@@ -428,7 +428,7 @@ KCMultiDialog * Dialog::dialog()
 TQValueList<KService::Ptr> Dialog::instanceServices() const
 {
 	kdDebug( 700 ) << k_funcinfo << endl;
-	TQString instanceName = KGlobal::instance()->instanceName();
+	TQString instanceName = TDEGlobal::instance()->instanceName();
 	d->registeredComponents.append( instanceName );
 	kdDebug( 700 ) << "calling KServiceGroup::childGroup( " << instanceName
 		<< " )" << endl;
@@ -467,10 +467,10 @@ TQValueList<KService::Ptr> Dialog::parentComponentsServices(
 	constraint = "('" + constraint + "' in [X-TDE-ParentComponents])";
 
 	kdDebug( 700 ) << "constraint = " << constraint << endl;
-	return KTrader::self()->query( "KCModule", constraint );
+	return TDETrader::self()->query( "TDECModule", constraint );
 }
 
-bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
+bool Dialog::isPluginForKCMEnabled( TDECModuleInfo * moduleinfo ) const
 {
 	// if the user of this class requested to hide disabled modules
 	// we check whether it should be enabled or not
@@ -491,9 +491,9 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
 		// we check if the parent component is a plugin
 		if( ! d->plugininfomap.contains( *pcit ) )
 		{
-			// if not the KCModule must be enabled
+			// if not the TDECModule must be enabled
 			enabled = true;
-			// we're done for this KCModuleInfo
+			// we're done for this TDECModuleInfo
 			break;
 		}
 		// if it is a plugin we check whether the plugin is enabled
@@ -502,7 +502,7 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
 		enabled = pinfo->isPluginEnabled();
 		kdDebug( 700 ) << "parent " << *pcit << " is "
 			<< ( enabled ? "enabled" : "disabled" ) << endl;
-		// if it is enabled we're done for this KCModuleInfo
+		// if it is enabled we're done for this TDECModuleInfo
 		if( enabled )
 			break;
 	}
@@ -533,8 +533,8 @@ void Dialog::createDialogFromServices()
 {
 	// read .setdlg files
 	TQString setdlgpath = locate( "appdata",
-			KGlobal::instance()->instanceName() + ".setdlg" );
-	TQStringList setdlgaddon = KGlobal::dirs()->findAllResources( "appdata",
+			TDEGlobal::instance()->instanceName() + ".setdlg" );
+	TQStringList setdlgaddon = TDEGlobal::dirs()->findAllResources( "appdata",
 			"ksettingsdialog/*.setdlg" );
 	if( ! setdlgpath.isNull() )
 		parseGroupFile( setdlgpath );
@@ -543,12 +543,12 @@ void Dialog::createDialogFromServices()
 				it != setdlgaddon.end(); ++it )
 			parseGroupFile( *it );
 
-	// now we process the KCModule services
+	// now we process the TDECModule services
 	for( TQValueList<KService::Ptr>::ConstIterator it = d->services.begin();
 			it != d->services.end(); ++it )
 	{
-		// we create the KCModuleInfo
-		KCModuleInfo * info = new KCModuleInfo( *it );
+		// we create the TDECModuleInfo
+		TDECModuleInfo * info = new TDECModuleInfo( *it );
 		TQString parentid;
 		TQVariant tmp = info->service()->property( "X-TDE-CfgDlgHierarchy",
 			TQVariant::String );
@@ -577,10 +577,10 @@ void Dialog::createDialogFromServices()
 	// TODO: Don't show the reset button until the issue with the
 	// KPluginSelector::load() method is solved.
 	// Problem:
-	// KCMultiDialog::show() call KCModule::load() to reset all KCMs
+	// KCMultiDialog::show() call TDECModule::load() to reset all KCMs
 	// (KPluginSelector::load() resets all plugin selections and all plugin
 	// KCMs).
-	// The reset button calls KCModule::load(), too but in this case we want the
+	// The reset button calls TDECModule::load(), too but in this case we want the
 	// KPluginSelector to only reset the current visible plugin KCM and not
 	// touch the plugin selections.
 	// I have no idea how to check that in KPluginSelector::load()...
diff --git a/kutils/ksettings/dialog.h b/tdeutils/ksettings/dialog.h
index 5a8afa510..1a3c741a6 100644
--- a/kutils/ksettings/dialog.h
+++ b/tdeutils/ksettings/dialog.h
@@ -26,7 +26,7 @@
 template<class T> class TQValueList;
 class KPluginInfo;
 class KCMultiDialog;
-class KCModuleInfo;
+class TDECModuleInfo;
 
 namespace KSettings
 {
@@ -52,10 +52,10 @@ namespace KSettings
  * If you use a KPart that was not especially designed for your app you can use
  * the second constructor:
  * \code
- * TQStringList kpartslist;
- * for( all my kparts )
- *   kpartslist += m_mypart->instance().instanceName();
- * m_cfgdlg = new Dialog( kpartslist, this );
+ * TQStringList tdepartslist;
+ * for( all my tdeparts )
+ *   tdepartslist += m_mypart->instance().instanceName();
+ * m_cfgdlg = new Dialog( tdepartslist, this );
  * \endcode
  * and the action for the config dialog is connected to the show slot:
  * \code
@@ -95,7 +95,7 @@ class KUTILS_EXPORT Dialog : public TQObject
 
         /**
          * Construct a new Preferences Dialog for the application. It uses all
-         * KCMs with X-TDE-ParentApp set to KGlobal::instance()->instanceName().
+         * KCMs with X-TDE-ParentApp set to TDEGlobal::instance()->instanceName().
          *
          * @param parent       The parent is only used as the parent for the
          *                     dialog - centering the dialog over the parent
@@ -106,7 +106,7 @@ class KUTILS_EXPORT Dialog : public TQObject
 
         /**
          * Construct a new Preferences Dialog for the application. It uses all
-         * KCMs with X-TDE-ParentApp set to KGlobal::instance()->instanceName().
+         * KCMs with X-TDE-ParentApp set to TDEGlobal::instance()->instanceName().
          *
          * @param content      Select whether you want a static or configurable
          *                     config dialog.
@@ -188,7 +188,7 @@ class KUTILS_EXPORT Dialog : public TQObject
          * @internal
          * Check whether the plugin associated with this KCM is enabled.
          */
-        bool isPluginForKCMEnabled( KCModuleInfo * ) const;
+        bool isPluginForKCMEnabled( TDECModuleInfo * ) const;
 
         TQValueList<KService::Ptr> instanceServices() const;
         TQValueList<KService::Ptr> parentComponentsServices(
@@ -204,7 +204,7 @@ class KUTILS_EXPORT Dialog : public TQObject
          * If this module is put into a TreeList hierarchy this will return a
          * list of the names of the parent modules.
          */
-        TQStringList parentModuleNames( KCModuleInfo * );
+        TQStringList parentModuleNames( TDECModuleInfo * );
 
         /**
          * @internal
diff --git a/kutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp
index 7f20c1bc3..3a423422f 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/tdeutils/ksettings/dispatcher.cpp
@@ -23,7 +23,7 @@
 
 #include <kstaticdeleter.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <assert.h>
 
 namespace KSettings
@@ -58,10 +58,10 @@ Dispatcher::~Dispatcher()
     //delete d;
 }
 
-void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const char * slot )
+void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, const char * slot )
 {
     assert( instance != 0 );
-    // keep the KInstance around and call
+    // keep the TDEInstance around and call
     // instance->config()->reparseConfiguration when the app should reparse
     TQCString instanceName = instance->instanceName();
     kdDebug( 701 ) << k_funcinfo << instanceName << endl;
@@ -83,12 +83,12 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
     connect( recv, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( unregisterInstance( TQObject * ) ) );
 }
 
-KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
+TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
 {
     kdDebug( 701 ) << k_funcinfo << endl;
     if( m_instanceInfo.contains( instanceName ) )
     {
-        KInstance * inst = m_instanceInfo[ instanceName ].instance;
+        TDEInstance * inst = m_instanceInfo[ instanceName ].instance;
         if( inst )
             return inst->config();
     }
@@ -113,7 +113,7 @@ void Dispatcher::reparseConfiguration( const TQCString & instanceName )
     // check if the instanceName is valid:
     if( ! m_instanceInfo.contains( instanceName ) )
         return;
-    // first we reparse the config of the instance so that the KConfig object
+    // first we reparse the config of the instance so that the TDEConfig object
     // will be up to date
     m_instanceInfo[ instanceName ].instance->config()->reparseConfiguration();
     TQSignal * sig = m_instanceInfo[ instanceName ].signal;
@@ -145,7 +145,7 @@ void Dispatcher::unregisterInstance( TQObject * obj )
     }
 }
 
-//X KInstance * Dispatcher::instanceForName( const TQCString & instanceName )
+//X TDEInstance * Dispatcher::instanceForName( const TQCString & instanceName )
 //X {
 //X     return m_instanceInfo[ instanceName ].instance;
 //X }
diff --git a/kutils/ksettings/dispatcher.h b/tdeutils/ksettings/dispatcher.h
index 52829f9e7..fa0c9e6c9 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/tdeutils/ksettings/dispatcher.h
@@ -28,8 +28,8 @@ class TQCString;
 class TQSignal;
 class TQStrList;
 template<class T> class KStaticDeleter;
-class KInstance;
-class KConfig;
+class TDEInstance;
+class TDEConfig;
 
 namespace KSettings
 {
@@ -39,7 +39,7 @@ namespace KSettings
  * @short Dispatch change notifications from the KCMs to the program.
  *
  * Since your program does not have direct control over the KCMs that get loaded
- * into the KConfigureDialog you need a way to get notified. This is what you
+ * into the TDEConfigureDialog you need a way to get notified. This is what you
  * do:
  * \code
  * Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( loadSettings() ) );
@@ -61,22 +61,22 @@ class KUTILS_EXPORT Dispatcher : public TQObject
 
         /**
          * Register a slot to be called when the configuration for the instance
-         * has changed. @p instance is the KInstance object
+         * has changed. @p instance is the TDEInstance object
          * that is passed to KGenericFactory (if it is used). You can query
          * it with KGenericFactory<YourClassName>::instance().
          * instance->instanceName() is also the same name that is put into the
          * .desktop file of the KCMs for the X-TDE-ParentComponents.
          *
-         * @param instance     The KInstance object
+         * @param instance     The TDEInstance object
          * @param recv         The object that should receive the signal
          * @param slot         The slot to be called: TQT_SLOT( slotName() )
          */
-        void registerInstance( KInstance * instance, TQObject * recv, const char * slot );
+        void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot );
 
         /**
-         * @return the KConfig object that belongs to the instanceName
+         * @return the TDEConfig object that belongs to the instanceName
          */
-        KConfig * configForInstanceName( const TQCString & instanceName );
+        TDEConfig * configForInstanceName( const TQCString & instanceName );
 
         /**
          * @return a list of all the instance names that are currently
@@ -85,10 +85,10 @@ class KUTILS_EXPORT Dispatcher : public TQObject
         TQStrList instanceNames() const;
 
 //X         /**
-//X          * @return The KInstance object belonging to the instance name you pass
+//X          * @return The TDEInstance object belonging to the instance name you pass
 //X          * (only works for registered instances of course).
 //X          */
-//X         KInstance * instanceForName( const TQCString & instanceName );
+//X         TDEInstance * instanceForName( const TQCString & instanceName );
 
     public slots:
         /**
@@ -100,10 +100,10 @@ class KUTILS_EXPORT Dispatcher : public TQObject
         void reparseConfiguration( const TQCString & instanceName );
 
         /**
-         * When this slot is called the KConfig objects of all the registered
-         * instances are sync()ed. This is usefull when some other KConfig
+         * When this slot is called the TDEConfig objects of all the registered
+         * instances are sync()ed. This is usefull when some other TDEConfig
          * objects will read/write from/to the same config file, so that you
-         * can first write out the current state of the KConfig objects.
+         * can first write out the current state of the TDEConfig objects.
          */
         void syncConfiguration();
 
@@ -116,7 +116,7 @@ class KUTILS_EXPORT Dispatcher : public TQObject
         static Dispatcher * m_self;
 
         struct InstanceInfo {
-            KInstance * instance;
+            TDEInstance * instance;
             TQSignal * signal;
             int count;
         };
diff --git a/kutils/ksettings/pluginpage.cpp b/tdeutils/ksettings/pluginpage.cpp
index 99ea904f2..c7208dc69 100644
--- a/kutils/ksettings/pluginpage.cpp
+++ b/tdeutils/ksettings/pluginpage.cpp
@@ -38,7 +38,7 @@ class PluginPage::PluginPagePrivate
 };
 
     PluginPage::PluginPage( TQWidget * parent, const char * name, const TQStringList & args )
-    : KCModule( parent, name, args )
+    : TDECModule( parent, name, args )
     , d( new PluginPagePrivate )
 {
     ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
@@ -46,8 +46,8 @@ class PluginPage::PluginPagePrivate
     connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) );
 }
 
-    PluginPage::PluginPage( KInstance * instance, TQWidget * parent, const TQStringList & args )
-    : KCModule( instance, parent, args )
+    PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args )
+    : TDECModule( instance, parent, args )
     , d( new PluginPagePrivate )
 {
     ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
diff --git a/kutils/ksettings/pluginpage.h b/tdeutils/ksettings/pluginpage.h
index df9acd490..7f5c7e952 100644
--- a/kutils/ksettings/pluginpage.h
+++ b/tdeutils/ksettings/pluginpage.h
@@ -20,7 +20,7 @@
 #ifndef KSETTINGS_PLUGINPAGE_H
 #define KSETTINGS_PLUGINPAGE_H
 
-#include <kcmodule.h>
+#include <tdecmodule.h>
 #include <tdelibs_export.h>
 
 class KPluginSelector;
@@ -31,7 +31,7 @@ namespace KSettings
 /**
  * @ingroup settings
  * @ingroup plugin
- * @short Convenience KCModule for creating a plugins config page.
+ * @short Convenience TDECModule for creating a plugins config page.
  *
  * This class makes it very easy to create a plugins configuration page to your
  * program. All you need to do is create a class that is derived from
@@ -44,8 +44,8 @@ namespace KSettings
  * MyAppPluginConfig( TQWidget * parent, const char *, const TQStringList & args )
  *     : PluginPage( MyAppPluginConfigFactory::instance(), parent, args )
  * {
- *     pluginSelector()->addPlugins( KGlobal::instance()->instanceName(), i18n( "General Plugins" ), "General" );
- *     pluginSelector()->addPlugins( KGlobal::instance()->instanceName(), i18n( "Effects" ), "Effects" );
+ *     pluginSelector()->addPlugins( TDEGlobal::instance()->instanceName(), i18n( "General Plugins" ), "General" );
+ *     pluginSelector()->addPlugins( TDEGlobal::instance()->instanceName(), i18n( "Effects" ), "Effects" );
  * }
  * \endcode
  *
@@ -55,7 +55,7 @@ namespace KSettings
    Encoding=UTF-8
    Icon=plugin
    Type=Service
-   ServiceTypes=KCModule
+   ServiceTypes=TDECModule
 
    X-TDE-ModuleType=Library
    X-TDE-Library=myapppluginconfig
@@ -70,21 +70,21 @@ namespace KSettings
  * @author Matthias Kretz <kretz@kde.org>
  * @since 3.2
  */
-class KUTILS_EXPORT PluginPage : public KCModule
+class KUTILS_EXPORT PluginPage : public TDECModule
 {
     Q_OBJECT
     public:
         /**
-         * Standart KCModule constructor. Automatically creates the the
+         * Standart TDECModule constructor. Automatically creates the the
          * KPluginSelector widget.
          */
         PluginPage( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() );
 
         /**
-         * Standart KCModule constructor. Automatically creates the the
+         * Standart TDECModule constructor. Automatically creates the the
          * KPluginSelector widget.
          */
-        PluginPage( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
+        PluginPage( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
 
         ~PluginPage();
 
@@ -103,7 +103,7 @@ class KUTILS_EXPORT PluginPage : public KCModule
         virtual void load();
 
         /**
-         * Save the state of the plugins to KConfig objects
+         * Save the state of the plugins to TDEConfig objects
          */
         virtual void save();
         virtual void defaults();
diff --git a/kutils/kcmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp
index c613e4385..004ceb78a 100644
--- a/kutils/kcmodulecontainer.cpp
+++ b/tdeutils/tdecmodulecontainer.cpp
@@ -24,26 +24,26 @@
 #include <tqtooltip.h>
 #include <tqvaluelist.h>
 
-#include <kcmodule.h>
-#include <kcmoduleinfo.h>
-#include <kcmoduleloader.h>
-#include <kcmoduleproxy.h>
+#include <tdecmodule.h>
+#include <tdecmoduleinfo.h>
+#include <tdecmoduleloader.h>
+#include <tdecmoduleproxy.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kservice.h>
 #include <kstdguiitem.h>
 
-#include "kcmodulecontainer.h"
-#include "kcmodulecontainer.moc"
+#include "tdecmodulecontainer.h"
+#include "tdecmodulecontainer.moc"
 
 /***********************************************************************/
-class KCModuleContainer::KCModuleContainerPrivate
+class TDECModuleContainer::TDECModuleContainerPrivate
 {
 	public:
-		KCModuleContainerPrivate( const TQStringList& mods )
+		TDECModuleContainerPrivate( const TQStringList& mods )
 			: modules( mods )
 			, tabWidget( 0 )
 			, buttons( 0 )
@@ -70,22 +70,22 @@ class KCModuleContainer::KCModuleContainerPrivate
 
 
 /***********************************************************************/
-KCModuleContainer::KCModuleContainer( TQWidget* parent, const char* name, 
+TDECModuleContainer::TDECModuleContainer( TQWidget* parent, const char* name, 
 	const TQString& mods )
-	: KCModule( parent, name )
+	: TDECModule( parent, name )
 {
-	d = new KCModuleContainerPrivate( TQStringList::split( ",", TQString(mods).remove( " " )) );
+	d = new TDECModuleContainerPrivate( TQStringList::split( ",", TQString(mods).remove( " " )) );
 	init();
 }
 
-KCModuleContainer::KCModuleContainer( TQWidget* parent, const char* name, 
+TDECModuleContainer::TDECModuleContainer( TQWidget* parent, const char* name, 
 	const TQStringList& mods )
-	: KCModule( parent, name ), d( new KCModuleContainerPrivate( mods ) )
+	: TDECModule( parent, name ), d( new TDECModuleContainerPrivate( mods ) )
 {
 	init();
 }
 
-void KCModuleContainer::init()
+void TDECModuleContainer::init()
 {
 	d->topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "topLayout" );
 	d->tabWidget = new TQTabWidget(this, "tabWidget");
@@ -104,7 +104,7 @@ void KCModuleContainer::init()
 
 }
 
-void KCModuleContainer::finalize()
+void TDECModuleContainer::finalize()
 {
 	setButtons( d->buttons );
 	if ( d->hasRootKCM ) /* Add a root mode button */
@@ -121,7 +121,7 @@ void KCModuleContainer::finalize()
 	}
 }
 
-void KCModuleContainer::addModule( const TQString& module )
+void TDECModuleContainer::addModule( const TQString& module )
 {
 	/* In case it doesn't exist we just silently drop it.
 	 * This allows people to easily extend containers.
@@ -129,25 +129,25 @@ void KCModuleContainer::addModule( const TQString& module )
 	 */
 	if ( !KService::serviceByDesktopName( module ) )
 	{
-		kdDebug(713) << "KCModuleContainer: module '" << 
+		kdDebug(713) << "TDECModuleContainer: module '" << 
 			module << "' was not found and thus not loaded" << endl;
 		return;
 	}
 
-	if( !KCModuleLoader::testModule( module ))
+	if( !TDECModuleLoader::testModule( module ))
 		return;
 
-	KCModuleProxy* proxy = new KCModuleProxy( module, false, d->tabWidget, module.latin1());
+	TDECModuleProxy* proxy = new TDECModuleProxy( module, false, d->tabWidget, module.latin1());
 	allModules.append( proxy );
 
-	d->tabWidget->addTab( proxy, TQIconSet(KGlobal::iconLoader()->loadIcon(
-					proxy->moduleInfo().icon(), KIcon::Desktop)),
+	d->tabWidget->addTab( proxy, TQIconSet(TDEGlobal::iconLoader()->loadIcon(
+					proxy->moduleInfo().icon(), TDEIcon::Desktop)),
 			/* QT eats ampersands for dinner. But not this time. */
 			proxy->moduleInfo().moduleName().replace( "&", "&&" ));
 
 	d->tabWidget->setTabToolTip( proxy, proxy->moduleInfo().comment() );
 
-	connect( proxy, TQT_SIGNAL(changed(KCModuleProxy *)), TQT_SLOT(moduleChanged(KCModuleProxy *)));
+	connect( proxy, TQT_SIGNAL(changed(TDECModuleProxy *)), TQT_SLOT(moduleChanged(TDECModuleProxy *)));
 
 	/* Collect our buttons - we go for the common deliminator */
 	d->buttons = d->buttons | proxy->realModule()->buttons();
@@ -159,7 +159,7 @@ void KCModuleContainer::addModule( const TQString& module )
 
 }
 
-void KCModuleContainer::tabSwitched( TQWidget * module )
+void TDECModuleContainer::tabSwitched( TQWidget * module )
 {
 	if ( !d->hasRootKCM )
 		return;
@@ -168,7 +168,7 @@ void KCModuleContainer::tabSwitched( TQWidget * module )
 	disconnect( d->btnRootMode, 0, 0, 0 );
 	/* Welcome to the real world huh baby? */
 	
-	KCModuleProxy* mod = (KCModuleProxy *) module;
+	TDECModuleProxy* mod = (TDECModuleProxy *) module;
 
 	if ( mod->moduleInfo().needsRootPrivileges() && !mod->rootMode() )
 	{
@@ -182,24 +182,24 @@ void KCModuleContainer::tabSwitched( TQWidget * module )
 		d->btnRootMode->setEnabled( false );
 
 	setQuickHelp( mod->quickHelp() );
-	setAboutData( const_cast<KAboutData*>(mod->aboutData()) );
+	setAboutData( const_cast<TDEAboutData*>(mod->aboutData()) );
 
 }
 
-void KCModuleContainer::runAsRoot()
+void TDECModuleContainer::runAsRoot()
 {
 	if ( d->tabWidget->currentPage() )
-		( (KCModuleProxy *) d->tabWidget->currentPage() )->runAsRoot();
+		( (TDECModuleProxy *) d->tabWidget->currentPage() )->runAsRoot();
 	d->btnRootMode->setEnabled( false );
 }
 
-void KCModuleContainer::rootExited()
+void TDECModuleContainer::rootExited()
 {
 	connect( d->btnRootMode, TQT_SIGNAL( clicked() ), TQT_SLOT( runAsRoot() ));
 	d->btnRootMode->setEnabled( true );
 }
 
-void KCModuleContainer::save()
+void TDECModuleContainer::save()
 {
 	ModuleList list = changedModules;
 	ModuleList::iterator it;
@@ -212,7 +212,7 @@ void KCModuleContainer::save()
 
 }
 
-void KCModuleContainer::load()
+void TDECModuleContainer::load()
 {
 	ModuleList list = allModules;
 	ModuleList::iterator it;
@@ -224,7 +224,7 @@ void KCModuleContainer::load()
 	emit changed( false );
 }
 
-void KCModuleContainer::defaults()
+void TDECModuleContainer::defaults()
 {
 	ModuleList list = allModules;
 	ModuleList::iterator it;
@@ -237,7 +237,7 @@ void KCModuleContainer::defaults()
 }
 
 
-void KCModuleContainer::moduleChanged(KCModuleProxy * proxy)
+void TDECModuleContainer::moduleChanged(TDECModuleProxy * proxy)
 {
 	changedModules.append( proxy );
 	if( changedModules.isEmpty() )
@@ -246,7 +246,7 @@ void KCModuleContainer::moduleChanged(KCModuleProxy * proxy)
 	emit changed(true);
 }
 
-KCModuleContainer::~KCModuleContainer()
+TDECModuleContainer::~TDECModuleContainer()
 {
 	delete d;
 }
diff --git a/kutils/kcmodulecontainer.h b/tdeutils/tdecmodulecontainer.h
index 7b8551b21..5708f80cf 100644
--- a/kutils/kcmodulecontainer.h
+++ b/tdeutils/tdecmodulecontainer.h
@@ -24,67 +24,67 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <kcmodule.h>
-#include <kcmoduleloader.h>
+#include <tdecmodule.h>
+#include <tdecmoduleloader.h>
 
 class TQTabWidget;
 class TQWidget;
 class TQVBoxLayout;
 
-class KCModuleProxy;
+class TDECModuleProxy;
 
 /**
- * @ingroup kcmodule
- * @brief KCModuleContainer is a convenience class encapsulating several KCModules.
+ * @ingroup tdecmodule
+ * @brief TDECModuleContainer is a convenience class encapsulating several TDECModules.
  *
- * The KCModuleContainer class is a convenience class for organizing a multiple set
- * of KCModule. KCModuleContainer is a sub class of KCModule and builds an interface mainly
+ * The TDECModuleContainer class is a convenience class for organizing a multiple set
+ * of TDECModule. TDECModuleContainer is a sub class of TDECModule and builds an interface mainly
  * consisting of a tab widget where each tab contains one of the modules specified via one of the
- * constructors. KCModuleContainer can handle modules which requires root permissions. What you
+ * constructors. TDECModuleContainer can handle modules which requires root permissions. What you
  * most likely want is the KCMODULECONTAINER macro. \n
  * Sometimes it is of interest to detect in runtime whether a module should be loaded or not. This
- * can be achieved by sub classing KCModuleContainer, doing the probing/testing checks and then manually
+ * can be achieved by sub classing TDECModuleContainer, doing the probing/testing checks and then manually
  * call addModule for each module which should be displayed. When all calls to addModule is done, call
  * finalize() which performs some necessary final steps.
  *
  * @author Frans Englich <frans.englich@telia.com>
  * @since 3.4
  */
-class KUTILS_EXPORT KCModuleContainer : public KCModule
+class KUTILS_EXPORT TDECModuleContainer : public TDECModule
 {
 	Q_OBJECT
 	public:
 		/**
-		 * Creates a KCModuleContainer with tabs, each one containing one of the
+		 * Creates a TDECModuleContainer with tabs, each one containing one of the
 		 * specified modules in @p mods.
 		 *
                  * @param parent the parent TQWidget.
                  * @param name the module's name.
-		 * @param mods The list of KCModules to be loaded. The name of each
-		 * KCModule is its service name, that is the name of the desktop file without
+		 * @param mods The list of TDECModules to be loaded. The name of each
+		 * TDECModule is its service name, that is the name of the desktop file without
 		 * the ".desktop" part
 		 *
 		 */
-		KCModuleContainer( TQWidget* parent, const char* name, const TQStringList& mods );
+		TDECModuleContainer( TQWidget* parent, const char* name, const TQStringList& mods );
 
 		/**
 		 * This is a convenience function, instead of building a TQStringList you
 		 * can specify the modules in a comma separated TQString. For example;
 		 * \code
-		 * KCModuleContainer* cont = KCModuleContainer( this, "kcm_misc", TQString("kcm_energy, kcm_keyboard ,kcm_useraccount, kcm_mouse") );
+		 * TDECModuleContainer* cont = TDECModuleContainer( this, "kcm_misc", TQString("kcm_energy, kcm_keyboard ,kcm_useraccount, kcm_mouse") );
 		 * \endcode
 		 * The other constructor takes its modules in a QStringlist which also can be constructed from a
 		 * string and thus you will have to be explicit on the data type.
 		 *
-		 * What you probably want is the KCMODULECONTAINER macro which builds an KCModule
+		 * What you probably want is the KCMODULECONTAINER macro which builds an TDECModule
 		 * for you, taking the modules you want as argument.
 		 *
 		 * @param parent The parent widget
 		 * @param name The service name
 		 * @param mods The modules to load
-		 * @return The KCModule containing the requested modules.
+		 * @return The TDECModule containing the requested modules.
 		 */
-		KCModuleContainer( TQWidget *parent, const char* name, const TQString& mods = TQString() );
+		TDECModuleContainer( TQWidget *parent, const char* name, const TQString& mods = TQString() );
 
 		/**
 		 * Adds the specified module to the tab widget. Setting the tab icon, text,
@@ -98,7 +98,7 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 		/**
 		 * Default destructor.
 		 */
-		virtual ~KCModuleContainer();
+		virtual ~TDECModuleContainer();
 
 		/**
 		 * Reimplemented for internal purposes.
@@ -122,16 +122,16 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 
 		/**
 		 * Sets this KCM's buttons and adds a AdminMode button
-		 * if necessary. If KCModuleContainer is subclassed finalize()
+		 * if necessary. If TDECModuleContainer is subclassed finalize()
 		 * should be called in the constructor after all calls to addModule
 		 * have been done. Call it once.
 		 */
 		void finalize();
 
-		typedef TQValueList<KCModuleProxy*> ModuleList;
+		typedef TQValueList<TDECModuleProxy*> ModuleList;
 
 		/**
-		 * A list containing KCModuleProxy objects which
+		 * A list containing TDECModuleProxy objects which
 		 * have changed and must be saved.
 		 */
 		ModuleList changedModules;
@@ -148,7 +148,7 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 		 */
 		void tabSwitched( TQWidget * module );
 
-		void moduleChanged(KCModuleProxy *proxy);
+		void moduleChanged(TDECModuleProxy *proxy);
 
 		/**
 		 * Called when the user clicks our custom root button.
@@ -164,19 +164,19 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 
 		void init();
 
-		class KCModuleContainerPrivate;
-		KCModuleContainerPrivate *d;
+		class TDECModuleContainerPrivate;
+		TDECModuleContainerPrivate *d;
 
 };
 
 /**
- * @ingroup kcmodule
- * This macro creates an factory declaration which when run creates an KCModule with specified
+ * @ingroup tdecmodule
+ * This macro creates an factory declaration which when run creates an TDECModule with specified
  * modules. For example:
  * \code
  * KCMODULECONTAINER( "kcm_fonts, kcm_keyboard,kcm_fonts", misc_modules)
  * \endcode
- * would create a KCModule with three tabs, each containing one of the specified KCMs. Each
+ * would create a TDECModule with three tabs, each containing one of the specified KCMs. Each
  * use of the macro must be accompanied by a desktop file where the factory name equals
  * the second argument in the macro(in this example, misc_modules). \n
  * The module container takes care of testing the contained modules when being shown, as well
@@ -188,16 +188,16 @@ class KUTILS_EXPORT KCModuleContainer : public KCModule
 #define KCMODULECONTAINER( modules, factoryName ) \
 extern "C" \
 { \
-	KCModule *create_## factoryName(TQWidget *parent, const char *name) \
+	TDECModule *create_## factoryName(TQWidget *parent, const char *name) \
 	{ \
-		return new KCModuleContainer( parent, name, TQString( modules ) ); \
+		return new TDECModuleContainer( parent, name, TQString( modules ) ); \
 	} \
 	\
 	bool test_## factoryName() \
 	{ \
 		TQStringList modList = TQStringList::split( ",", TQString(modules).remove( " " )); \
 		for ( TQStringList::Iterator it = modList.begin(); it != modList.end(); ++it ) \
-			if ( KCModuleLoader::testModule( *it ) ) \
+			if ( TDECModuleLoader::testModule( *it ) ) \
 				return true; \
 		return false; \
 	} \
diff --git a/kutils/kcmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp
index c34069c09..4869bb1ef 100644
--- a/kutils/kcmoduleinfo.cpp
+++ b/tdeutils/tdecmoduleinfo.cpp
@@ -25,19 +25,19 @@
 
 #include <kdesktopfile.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-#include "kcmoduleinfo.h"
+#include "tdecmoduleinfo.h"
 
-class KCModuleInfo::KCModuleInfoPrivate
+class TDECModuleInfo::TDECModuleInfoPrivate
 {
   public:
-    KCModuleInfoPrivate() :
+    TDECModuleInfoPrivate() :
       testModule( false )
     {}
-    ~KCModuleInfoPrivate()
+    ~TDECModuleInfoPrivate()
     { }
 
     TQString factoryName;
@@ -45,34 +45,34 @@ class KCModuleInfo::KCModuleInfoPrivate
 
 };
 
-KCModuleInfo::KCModuleInfo()
+TDECModuleInfo::TDECModuleInfo()
 {
   _allLoaded = false;
-  d = new KCModuleInfoPrivate;
+  d = new TDECModuleInfoPrivate;
 }
 
-KCModuleInfo::KCModuleInfo(const TQString& desktopFile)
+TDECModuleInfo::TDECModuleInfo(const TQString& desktopFile)
 {
   KService::Ptr service = KService::serviceByStorageId(desktopFile);
   if(!service) setName(desktopFile);
   init(service);
 }
 
-KCModuleInfo::KCModuleInfo( KService::Ptr moduleInfo )
+TDECModuleInfo::TDECModuleInfo( KService::Ptr moduleInfo )
 {
   init(moduleInfo);
 }
 
-KCModuleInfo::KCModuleInfo( const KCModuleInfo &rhs )
+TDECModuleInfo::TDECModuleInfo( const TDECModuleInfo &rhs )
 {
-    d = new KCModuleInfoPrivate;
+    d = new TDECModuleInfoPrivate;
     ( *this ) = rhs;
 }
 
 // this re-implementation exists to ensure that other code always calls
 // our re-implementation, so in case we add data to the d pointer in the future 
 // we can be sure that we get called when we are copied.
-KCModuleInfo &KCModuleInfo::operator=( const KCModuleInfo &rhs )
+TDECModuleInfo &TDECModuleInfo::operator=( const TDECModuleInfo &rhs )
 {
     _keywords = rhs._keywords;
     _name = rhs._name;
@@ -92,7 +92,7 @@ KCModuleInfo &KCModuleInfo::operator=( const KCModuleInfo &rhs )
     return *this;
 }
 
-TQString KCModuleInfo::factoryName() const
+TQString TDECModuleInfo::factoryName() const
 {
   if( d->factoryName.isEmpty() )
   {
@@ -104,25 +104,25 @@ TQString KCModuleInfo::factoryName() const
   return d->factoryName;
 }
 
-bool KCModuleInfo::operator==( const KCModuleInfo & rhs ) const
+bool TDECModuleInfo::operator==( const TDECModuleInfo & rhs ) const
 {
   return ( ( _name == rhs._name ) && ( _lib == rhs._lib ) && ( _fileName == rhs._fileName ) );
 }
 
-bool KCModuleInfo::operator!=( const KCModuleInfo & rhs ) const
+bool TDECModuleInfo::operator!=( const TDECModuleInfo & rhs ) const
 {
   return ! operator==( rhs );
 }
 
-KCModuleInfo::~KCModuleInfo()
+TDECModuleInfo::~TDECModuleInfo()
 { 
   delete d;
 }
 
-void KCModuleInfo::init(KService::Ptr s)
+void TDECModuleInfo::init(KService::Ptr s)
 {
   _allLoaded = false;
-  d = new KCModuleInfoPrivate;
+  d = new TDECModuleInfoPrivate;
 
   if ( s )
     _service = s;
@@ -147,7 +147,7 @@ void KCModuleInfo::init(KService::Ptr s)
 }
 
 void
-KCModuleInfo::loadAll() 
+TDECModuleInfo::loadAll() 
 {
   if( !_service ) /* We have a bogus service. All get functions will return empty/zero values */
     return;
@@ -180,19 +180,19 @@ KCModuleInfo::loadAll()
 }
 
 TQString
-KCModuleInfo::docPath() const
+TDECModuleInfo::docPath() const
 {
   if (!_allLoaded) 
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   return _doc;
 }
 
 TQString
-KCModuleInfo::handle() const
+TDECModuleInfo::handle() const
 {
   if (!_allLoaded) 
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   if (_handle.isEmpty())
      return _lib;
@@ -201,38 +201,38 @@ KCModuleInfo::handle() const
 }
 
 int
-KCModuleInfo::weight() const
+TDECModuleInfo::weight() const
 {
   if (!_allLoaded) 
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   return _weight;
 }
 
 bool
-KCModuleInfo::needsRootPrivileges() const
+TDECModuleInfo::needsRootPrivileges() const
 {
   if (!_allLoaded) 
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   return _needsRootPrivileges;
 }
 
 bool
-KCModuleInfo::isHiddenByDefault() const
+TDECModuleInfo::isHiddenByDefault() const
 {
   if (!_allLoaded)
-    const_cast<KCModuleInfo*>(this)->loadAll();
+    const_cast<TDECModuleInfo*>(this)->loadAll();
 
   return _isHiddenByDefault;
 }
 
-bool KCModuleInfo::needsTest() const 
+bool TDECModuleInfo::needsTest() const 
 {
   return d->testModule;
 }
 
-void KCModuleInfo::setNeedsTest( bool val )
+void TDECModuleInfo::setNeedsTest( bool val )
 {
   d->testModule = val;
 }
diff --git a/kutils/kcmoduleinfo.h b/tdeutils/tdecmoduleinfo.h
index b2e79ee46..2951e96d2 100644
--- a/kutils/kcmoduleinfo.h
+++ b/tdeutils/tdecmoduleinfo.h
@@ -31,13 +31,13 @@ class TQString;
 class TQStringList;
 
 /**
- * @ingroup kcmodule
- * A class that provides information about a KCModule
+ * @ingroup tdecmodule
+ * A class that provides information about a TDECModule
  *
- * KCModuleInfo provides various technical information, such as icon, library
- * etc. about a KCModule.n
+ * TDECModuleInfo provides various technical information, such as icon, library
+ * etc. about a TDECModule.n
  * @note Any values set with the set* functions is not
- * written back with KCModuleInfo it only reads value from the desktop file.
+ * written back with TDECModuleInfo it only reads value from the desktop file.
  *
  * @internal
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
@@ -46,19 +46,19 @@ class TQStringList;
  * @since 3.2
  *
  */
-class KUTILS_EXPORT KCModuleInfo
+class KUTILS_EXPORT TDECModuleInfo
 {
 
 public:
 
   /**
-   * Constructs a KCModuleInfo.
-   * @note a KCModuleInfo object will have to be manually deleted, it is not
+   * Constructs a TDECModuleInfo.
+   * @note a TDECModuleInfo object will have to be manually deleted, it is not
    * done automatically for you.
    * @param desktopFile the desktop file representing the module, or
    * the name of the module.
    */
-  KCModuleInfo(const TQString& desktopFile);
+  TDECModuleInfo(const TQString& desktopFile);
 
   /**
    * Same as above but takes a KService::Ptr as argument.
@@ -67,27 +67,27 @@ public:
    *
    * @param moduleInfo specifies the module
    */
-  KCModuleInfo( KService::Ptr moduleInfo );
+  TDECModuleInfo( KService::Ptr moduleInfo );
 
 
   /**
-   * Same as above but takes a KCModuleInfo as argument.
+   * Same as above but takes a TDECModuleInfo as argument.
    *
    * @param rhs specifies the module
    */
-  KCModuleInfo( const KCModuleInfo &rhs );
+  TDECModuleInfo( const TDECModuleInfo &rhs );
 
   /**
-   * Same as above but creates an empty KCModuleInfo.
+   * Same as above but creates an empty TDECModuleInfo.
    * You should not normally call this.
    * @since 3.4
    */
-  KCModuleInfo();
+  TDECModuleInfo();
 
   /**
    * Assignment operator
    */
-  KCModuleInfo &operator=( const KCModuleInfo &rhs );
+  TDECModuleInfo &operator=( const TDECModuleInfo &rhs );
 
   /**
    * Equal operator
@@ -95,17 +95,17 @@ public:
    * @return true if @p rhs equals itself
    */
 
-  bool operator==( const KCModuleInfo &rhs ) const;
+  bool operator==( const TDECModuleInfo &rhs ) const;
 
   /**
    * @return true if @p rhs is not equal itself
    */
-  bool operator!=( const KCModuleInfo &rhs ) const;
+  bool operator!=( const TDECModuleInfo &rhs ) const;
 
   /**
    * Default destructor.
    */
-  ~KCModuleInfo();
+  ~TDECModuleInfo();
 
   /**
    * @return the filename of the .desktop file that describes the KCM
@@ -132,7 +132,7 @@ public:
   // changed from name() to avoid ambiguity with TQObject::name() on multiple inheritance
 
   /**
-   * @return a KSharedPtr to KService created from the modules .desktop file
+   * @return a TDESharedPtr to KService created from the modules .desktop file
    */
   KService::Ptr service() const { return _service; }
 
@@ -262,7 +262,7 @@ protected:
   void setDocPath(const TQString &p) { _doc = p; }
 
   /**
-   * Reads the service entries specific for KCModule from the desktop file.
+   * Reads the service entries specific for TDECModule from the desktop file.
    * The usual desktop entries are read in init.
    */
   void loadAll();
@@ -276,7 +276,7 @@ private:
 
 private:
 
-  // KDE4 These needs to be moved to KCModuleInfoPrivate
+  // KDE4 These needs to be moved to TDECModuleInfoPrivate
   TQStringList _keywords;
   TQString     _name, _icon, _lib, _handle, _fileName, _doc, _comment;
   bool        _needsRootPrivileges : 1;
@@ -286,8 +286,8 @@ private:
 
   KService::Ptr _service;
 
-  class KCModuleInfoPrivate;
-  KCModuleInfoPrivate *d;
+  class TDECModuleInfoPrivate;
+  TDECModuleInfoPrivate *d;
 
 };
 
diff --git a/kutils/kcmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp
index c8327a25e..ced28ae7a 100644
--- a/kutils/kcmoduleloader.cpp
+++ b/tdeutils/tdecmoduleloader.cpp
@@ -25,13 +25,13 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeparts/componentfactory.h>
 
-#include "kcmoduleloader.h"
+#include "tdecmoduleloader.h"
 
 
 /***************************************************************/
@@ -39,11 +39,11 @@
  * When something goes wrong in loading the module, this one
  * jumps in as a "dummy" module.
  */
-class KCMError : public KCModule
+class KCMError : public TDECModule
 {
 	public:
 		KCMError( const TQString& msg, const TQString& details, TQWidget* parent )
-			: KCModule( parent, "KCMError" )
+			: TDECModule( parent, "KCMError" )
 		{
 			TQVBoxLayout* topLayout = new TQVBoxLayout( this );
 			topLayout->addWidget( new TQLabel( msg, this ) );
@@ -55,7 +55,7 @@ class KCMError : public KCModule
 
 
 
-KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
+TDECModule* TDECModuleLoader::load(const TDECModuleInfo &mod, const TQString &libname,
     KLibLoader *loader, ErrorReporting report, TQWidget * parent,
     const char * name, const TQStringList & args )
 {
@@ -72,7 +72,7 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
       KLibFactory *factory = lib->factory();
       if ( factory )
       {
-        KCModule *module = KParts::ComponentFactory::createInstanceFromFactory<KCModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args );
+        TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args );
         if (module)
           return module;
       }
@@ -87,8 +87,8 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
     if (create)
     {
       // create the module
-      KCModule* (*func)(TQWidget *, const char *);
-      func = (KCModule* (*)(TQWidget *, const char *)) create;
+      TDECModule* (*func)(TQWidget *, const char *);
+      func = (TDECModule* (*)(TQWidget *, const char *)) create;
       return  func( parent, name ? name : mod.handle().latin1() );
     }
     else
@@ -113,12 +113,12 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
   return 0;
 }
 
-KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args )
+TDECModule* TDECModuleLoader::loadModule(const TDECModuleInfo &mod, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args )
 {
   return loadModule( mod, None, withfallback, parent, name, args );
 }
 
-KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting report, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args )
+TDECModule* TDECModuleLoader::loadModule(const TDECModuleInfo &mod, ErrorReporting report, bool withfallback, TQWidget * parent, const char * name, const TQStringList & args )
 {
   /*
    * Simple libraries as modules are the easiest case:
@@ -153,7 +153,7 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
 
     KLibLoader *loader = KLibLoader::self();
 
-    KCModule *module = load(mod, "kcm_%1", loader, report, parent, name, args );
+    TDECModule *module = load(mod, "kcm_%1", loader, report, parent, name, args );
     /*
      * Only try to load libkcm_* if it exists, otherwise KLibLoader::lastErrorMessage would say
      * "libkcm_foo not found" instead of the real problem with loading kcm_foo.
@@ -170,14 +170,14 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
   /*
    * Ok, we could not load the library.
    * Try to run it as an executable.
-   * This must not be done when calling from kcmshell, or you'll
+   * This must not be done when calling from tdecmshell, or you'll
    * have infinite recursion
-   * (startService calls kcmshell which calls modloader which calls startService...)
+   * (startService calls tdecmshell which calls modloader which calls startService...)
    *
    */
   if(withfallback)
   {
-    KApplication::startServiceByDesktopPath(mod.fileName(), TQString::null);
+    TDEApplication::startServiceByDesktopPath(mod.fileName(), TQString::null);
   }
   else
   {
@@ -189,19 +189,19 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
   return 0;
 }
 
-KCModule* KCModuleLoader::loadModule(const TQString &module, TQWidget *parent,
+TDECModule* TDECModuleLoader::loadModule(const TQString &module, TQWidget *parent,
       const char *name, const TQStringList & args)
 {
-  return loadModule(KCModuleInfo(module), None, false, parent, name, args);
+  return loadModule(TDECModuleInfo(module), None, false, parent, name, args);
 }
 
-KCModule* KCModuleLoader::loadModule(const TQString &module, ErrorReporting
+TDECModule* TDECModuleLoader::loadModule(const TQString &module, ErrorReporting
     report, TQWidget *parent, const char *name, const TQStringList & args)
 {
-  return loadModule(KCModuleInfo(module), report, false, parent, name, args);
+  return loadModule(TDECModuleInfo(module), report, false, parent, name, args);
 }
 
-void KCModuleLoader::unloadModule(const KCModuleInfo &mod)
+void TDECModuleLoader::unloadModule(const TDECModuleInfo &mod)
 {
   // get the library loader instance
   KLibLoader *loader = KLibLoader::self();
@@ -214,7 +214,7 @@ void KCModuleLoader::unloadModule(const KCModuleInfo &mod)
   loader->unloadLibrary(TQFile::encodeName(libname.arg(mod.library())));
 }
 
-void KCModuleLoader::showLastLoaderError(TQWidget *parent)
+void TDECModuleLoader::showLastLoaderError(TQWidget *parent)
 {
   KMessageBox::detailedError(parent,
       i18n("There was an error loading the module."),i18n("<qt><p>The diagnostics is:<br>%1"
@@ -227,12 +227,12 @@ void KCModuleLoader::showLastLoaderError(TQWidget *parent)
 
 }
 
-bool KCModuleLoader::testModule( const TQString& module )
+bool TDECModuleLoader::testModule( const TQString& module )
 {
-  return testModule( KCModuleInfo( module ) );
+  return testModule( TDECModuleInfo( module ) );
 }
 
-bool KCModuleLoader::testModule( const KCModuleInfo& module )
+bool TDECModuleLoader::testModule( const TDECModuleInfo& module )
 {
   if (!module.service())
   {
@@ -250,7 +250,7 @@ bool KCModuleLoader::testModule( const KCModuleInfo& module )
     /**
      * If something fails we return true - we can't risk functionality becoming
      * unavailable because of a buggy test. Furthermore, the error needs to
-     * show so it is discovered. KCModuleProxy will detect the error and load
+     * show so it is discovered. TDECModuleProxy will detect the error and load
      * a corresponding KCMError.
      * */
     KLibLoader* loader = KLibLoader::self();
@@ -281,7 +281,7 @@ bool KCModuleLoader::testModule( const KCModuleInfo& module )
   }
 }
 
-KCModule* KCModuleLoader::reportError( ErrorReporting report, const TQString & text,
+TDECModule* TDECModuleLoader::reportError( ErrorReporting report, const TQString & text,
         TQString details, TQWidget * parent )
 {
   if( details.isNull() )
diff --git a/kutils/kcmoduleloader.h b/tdeutils/tdecmoduleloader.h
index 9e0871241..1ae9f6b9f 100644
--- a/kutils/kcmoduleloader.h
+++ b/tdeutils/tdecmoduleloader.h
@@ -21,33 +21,33 @@
 #ifndef MODLOADER_H
 #define MODLOADER_H
 
-#include <kcmodule.h>
-#include <kcmoduleinfo.h>
+#include <tdecmodule.h>
+#include <tdecmoduleinfo.h>
 
 class TQWidget;
 class KLibLoader;
 
 /**
- * @ingroup kcmodule
+ * @ingroup tdecmodule
  * @brief Loads a KControl Module.
  *
- * KCModuleLoader tries in several ways 
- * to locate and load a KCModule. If loading fails a 
+ * TDECModuleLoader tries in several ways 
+ * to locate and load a TDECModule. If loading fails a 
  * zero pointer is returned. \n
- * It is very unlikely KCModuleLoader is what you want 
- * and @ref KCModuleProxy suits your needs.
+ * It is very unlikely TDECModuleLoader is what you want 
+ * and @ref TDECModuleProxy suits your needs.
  * 
  * @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
  * @author Frans Englich <frans.englich@telia.com>
  * @since 3.2
  * @internal
 **/
-class KUTILS_EXPORT KCModuleLoader
+class KUTILS_EXPORT TDECModuleLoader
 {
   public:
 
     /**
-     * Loads a @ref KCModule. If loading fails a zero pointer is returned.
+     * Loads a @ref TDECModule. If loading fails a zero pointer is returned.
      * @param module what module to load
      * @param withFallback if true and loading failed a separate window
      * with the module may appear and a zero pointer is a returned
@@ -55,17 +55,17 @@ class KUTILS_EXPORT KCModuleLoader
      * @param name The widget's name
      * @param args A list of arguments for the module to load
      *
-     * @return a pointer to the loaded @ref KCModule
+     * @return a pointer to the loaded @ref TDECModule
      *
      * @deprecated use the function which explicitly states the error reporting
      * method
      */
-    static KCModule *loadModule(const KCModuleInfo &module, bool withFallback=true, 
+    static TDECModule *loadModule(const TDECModuleInfo &module, bool withFallback=true, 
         TQWidget * parent = 0, const char * name = 0,
         const TQStringList & args = TQStringList() ) KDE_DEPRECATED;
 
     /**
-     * Loads a @ref KCModule. If loading fails a zero pointer is returned.
+     * Loads a @ref TDECModule. If loading fails a zero pointer is returned.
      * @param module what module to load
      * with the module may appear and a zero pointer is a returned
      * @param parent The parent widget
@@ -75,7 +75,7 @@ class KUTILS_EXPORT KCModuleLoader
      * @deprecated use the function which explicitly states the error reporting
      * method
      */
-    static KCModule *loadModule(const TQString &module, TQWidget *parent = 0,
+    static TDECModule *loadModule(const TQString &module, TQWidget *parent = 0,
         const char *name = 0, const TQStringList & args = TQStringList()) KDE_DEPRECATED;
 
     /**
@@ -88,7 +88,7 @@ class KUTILS_EXPORT KCModuleLoader
       None = 0,
       /**
        * the error report is shown instead of the 
-       * KCModule that should have * been loaded 
+       * TDECModule that should have * been loaded 
        */
       Inline = 1,
       /** 
@@ -102,7 +102,7 @@ class KUTILS_EXPORT KCModuleLoader
     };
 
     /**
-     * Loads a @ref KCModule. If loading fails a zero pointer is returned.
+     * Loads a @ref TDECModule. If loading fails a zero pointer is returned.
      * @param module what module to load
      * @param report see ErrorReporting
      * @param withFallback if true and loading failed a separate window
@@ -111,15 +111,15 @@ class KUTILS_EXPORT KCModuleLoader
      * @param name The widget's name
      * @param args A list of arguments for the module to load
      *
-     * @return a pointer to the loaded @ref KCModule
+     * @return a pointer to the loaded @ref TDECModule
      * @since 3.4
      */
-    static KCModule *loadModule(const KCModuleInfo &module, ErrorReporting
+    static TDECModule *loadModule(const TDECModuleInfo &module, ErrorReporting
         report, bool withFallback=true, TQWidget * parent = 0,
         const char * name = 0, const TQStringList & args = TQStringList() );
 
     /**
-     * Loads a @ref KCModule. If loading fails a zero pointer is returned.
+     * Loads a @ref TDECModule. If loading fails a zero pointer is returned.
      * @param module what module to load
      * @param report see ErrorReporting
      * with the module may appear and a zero pointer is a returned
@@ -127,10 +127,10 @@ class KUTILS_EXPORT KCModuleLoader
      * @param name The widget's name
      * @param args A list of arguments for the module to load
      *
-     * @return a pointer to the loaded @ref KCModule
+     * @return a pointer to the loaded @ref TDECModule
      * @since 3.4
      */
-    static KCModule *loadModule(const TQString &module, ErrorReporting
+    static TDECModule *loadModule(const TQString &module, ErrorReporting
         report, TQWidget *parent = 0, const char *name = 0,
         const TQStringList & args = TQStringList());
 
@@ -138,7 +138,7 @@ class KUTILS_EXPORT KCModuleLoader
      * Unloads the module's library
      * @param mod What module to unload for
      */
-    static void unloadModule(const KCModuleInfo &mod);
+    static void unloadModule(const TDECModuleInfo &mod);
 
     /**
      * Display a message box explaining an error occured and possible
@@ -151,7 +151,7 @@ class KUTILS_EXPORT KCModuleLoader
 
 
     /**
-     * Checks whether an KCModule should be shown by running its 
+     * Checks whether an TDECModule should be shown by running its 
      * test function. If it is unsure whether a module should be shown, it should 
      * be made available, leaving the decision to the user.
      * If false is returned, the module should not be loaded in any interface.
@@ -187,10 +187,10 @@ class KUTILS_EXPORT KCModuleLoader
      * @returns true if the module should be loaded
      * @since 3.4
      */
-    static bool testModule( const KCModuleInfo& module );
+    static bool testModule( const TDECModuleInfo& module );
 
     /**
-     * Returns a KCModule containing the messages @p report and @p text.
+     * Returns a TDECModule containing the messages @p report and @p text.
      *
      * @param report the type of error reporting, see ErrorReporting
      * @param text the main message
@@ -200,7 +200,7 @@ class KUTILS_EXPORT KCModuleLoader
      * @since 3.4
      * @internal
      */
-    static KCModule* reportError( ErrorReporting report, const TQString & text,
+    static TDECModule* reportError( ErrorReporting report, const TQString & text,
         TQString details, TQWidget * parent );
 
   private:
@@ -209,7 +209,7 @@ class KUTILS_EXPORT KCModuleLoader
      * Internal loader called by the public loaders.
      * @internal
      */
-    static KCModule* load(const KCModuleInfo &mod, const TQString &libname, 
+    static TDECModule* load(const TDECModuleInfo &mod, const TQString &libname, 
         KLibLoader *loader, ErrorReporting report, TQWidget * parent = 0,
         const char * name = 0, const TQStringList & args = TQStringList() );
 
diff --git a/kutils/kcmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 2323cd262..eeac43b02 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -35,14 +35,14 @@
 #include <dcopclient.h>
 #include <qxembed.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmodule.h>
-#include <kcmoduleinfo.h>
-#include <kcmoduleloader.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmodule.h>
+#include <tdecmoduleinfo.h>
+#include <tdecmoduleloader.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
@@ -50,15 +50,15 @@
 
 #include <X11/Xlib.h>
 
-#include "kcmoduleproxy.h"
-#include "kcmoduleproxyIface.h"
-#include "kcmoduleproxyIfaceImpl.h"
+#include "tdecmoduleproxy.h"
+#include "tdecmoduleproxyIface.h"
+#include "tdecmoduleproxyIfaceImpl.h"
 
 /***************************************************************/
-class KCModuleProxy::KCModuleProxyPrivate
+class TDECModuleProxy::TDECModuleProxyPrivate
 {
 	public:
-		KCModuleProxyPrivate( const KCModuleInfo & info )
+		TDECModuleProxyPrivate( const TDECModuleInfo & info )
 			: args( 0 )
 			, kcm( 0 )
 			//, view( 0 )
@@ -78,7 +78,7 @@ class KCModuleProxy::KCModuleProxyPrivate
 			, isInitialized( false )
 		{}
 
-		~KCModuleProxyPrivate()
+		~TDECModuleProxyPrivate()
 		{
 			delete rootInfo; // Delete before embedWidget!
 			delete embedWidget; // Delete before embedFrame!
@@ -91,17 +91,17 @@ class KCModuleProxy::KCModuleProxyPrivate
 		}
 
 		TQStringList							args;
-		KCModule							*kcm;
+		TDECModule							*kcm;
 		QXEmbed								*embedWidget;
-		KProcess							*rootProcess;
+		TDEProcess							*rootProcess;
 		TQVBox								*embedFrame;
-		KCModuleProxyIfaceImpl  					*dcopObject;
+		TDECModuleProxyIfaceImpl  					*dcopObject;
 		DCOPClient							*dcopClient;
 		TQVBoxLayout							*topLayout; /* Contains TQScrollView view, and root stuff */
-		KCModuleProxyRootCommunicatorImpl				*rootCommunicator;
+		TDECModuleProxyRootCommunicatorImpl				*rootCommunicator;
 		TQLabel								*rootInfo;
 		TQCString							dcopName;
-		KCModuleInfo 							modInfo;
+		TDECModuleInfo 							modInfo;
 		bool 								withFallback;
 		bool 								changed;
 		bool 								rootMode;
@@ -115,7 +115,7 @@ class KCModuleProxy::KCModuleProxyPrivate
 /*
  TODO:
 
- - How KCModuleProxy behaves wrt memory leaks and behavior, when exiting
+ - How TDECModuleProxy behaves wrt memory leaks and behavior, when exiting
  	from root mode is not tested, because no code make use of it. It needs 
 	work, if it should be used.
 
@@ -137,7 +137,7 @@ class KCModuleProxy::KCModuleProxyPrivate
 
  */
 /***************************************************************/
-KCModule * KCModuleProxy::realModule() const
+TDECModule * TDECModuleProxy::realModule() const
 {
 
 	/*
@@ -151,17 +151,17 @@ KCModule * KCModuleProxy::realModule() const
 	if( d->kcm )
 		return d->kcm;
 
-	/* /We/ have no kcm, but kcmshell running with root prevs does.. */
+	/* /We/ have no kcm, but tdecmshell running with root prevs does.. */
 	if( d->rootMode )
 		return 0;
 
 	TQApplication::setOverrideCursor( Qt::WaitCursor );
 	
-	KCModuleProxy * that = const_cast<KCModuleProxy*>( this );
+	TDECModuleProxy * that = const_cast<TDECModuleProxy*>( this );
 
 	if( !d->isInitialized )
 	{
-  		d->dcopName = TQString(moduleInfo().handle().prepend("KCModuleProxy-")).utf8();
+  		d->dcopName = TQString(moduleInfo().handle().prepend("TDECModuleProxy-")).utf8();
 		d->topLayout = new TQVBoxLayout( that, 0, 0, "topLayout" );
 
 		d->isInitialized = true;
@@ -180,9 +180,9 @@ KCModule * KCModuleProxy::realModule() const
 	   * or, it was an random application which had picked that name */
 		kdDebug(711) << "Module not already loaded, loading module" << endl;
 
-		d->dcopObject = new KCModuleProxyIfaceImpl( d->dcopName, that );
+		d->dcopObject = new TDECModuleProxyIfaceImpl( d->dcopName, that );
 
-		d->kcm = KCModuleLoader::loadModule( moduleInfo(), KCModuleLoader::Inline, d->withFallback,
+		d->kcm = TDECModuleLoader::loadModule( moduleInfo(), TDECModuleLoader::Inline, d->withFallback,
 			that, name(), d->args );
 
 		connect( d->kcm, TQT_SIGNAL( changed( bool ) ),
@@ -248,7 +248,7 @@ KCModule * KCModuleProxy::realModule() const
 		{
 			stream >> result;
 
-			d->kcm = KCModuleLoader::reportError( KCModuleLoader::Inline, 
+			d->kcm = TDECModuleLoader::reportError( TDECModuleLoader::Inline, 
 					i18n( "Argument is application name", "This configuration section is "
 						"already opened in %1" ).arg( result ), " ", that );
 
@@ -256,7 +256,7 @@ KCModule * KCModuleProxy::realModule() const
 		}
 		else
 		{
-			kdDebug(711) << "Calling KCModuleProxy's DCOP interface for fetching the name failed." << endl;
+			kdDebug(711) << "Calling TDECModuleProxy's DCOP interface for fetching the name failed." << endl;
 			d->bogusOccupier = true;
 			TQApplication::restoreOverrideCursor();
 			return realModule();
@@ -268,7 +268,7 @@ KCModule * KCModuleProxy::realModule() const
 	return d->kcm;
 }
 
-void KCModuleProxy::applicationRemoved( const TQCString& app )
+void TDECModuleProxy::applicationRemoved( const TQCString& app )
 {
 	if( app == d->dcopName )
 	{
@@ -282,7 +282,7 @@ void KCModuleProxy::applicationRemoved( const TQCString& app )
 	}
 }
 
-void KCModuleProxy::showEvent( TQShowEvent * ev )
+void TDECModuleProxy::showEvent( TQShowEvent * ev )
 {
 
 	kdDebug(711) << k_funcinfo << endl;
@@ -296,7 +296,7 @@ void KCModuleProxy::showEvent( TQShowEvent * ev )
 
 }
 
-void KCModuleProxy::runAsRoot()
+void TDECModuleProxy::runAsRoot()
 {
 	if ( !moduleInfo().needsRootPrivileges() )
 		return;
@@ -329,7 +329,7 @@ void KCModuleProxy::runAsRoot()
 	lblBusy->show();
 
 	deleteClient();
-	/* The DCOP registration is now gone, and it will occur again when kcmshell soon 
+	/* The DCOP registration is now gone, and it will occur again when tdecmshell soon 
 	 * registers. Here's a race condition in other words, but how likely is that?
 	 *
 	 * - It's a user initiated action, which means the user have to do weird stuff, very
@@ -340,7 +340,7 @@ void KCModuleProxy::runAsRoot()
 	 * the DCOP object is established.
 	 */
 
-	/* Prepare the process to run the kcmshell */
+	/* Prepare the process to run the tdecmshell */
 	TQString cmd = moduleInfo().service()->exec().stripWhiteSpace();
 	if (cmd.left(5) == "tdesu")
 	{
@@ -351,25 +351,25 @@ void KCModuleProxy::runAsRoot()
 			cmd = TQString(cmd.remove( 0, cmd.find( ' ' ) )).stripWhiteSpace();
 	}
 
-	if (cmd.left(8) == "kcmshell")
+	if (cmd.left(8) == "tdecmshell")
 		cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
 
 	/* Run the process */
-	TQString tdesu = KStandardDirs::findExe("tdesu");
+	TQString tdesu = TDEStandardDirs::findExe("tdesu");
 	if (!tdesu.isEmpty())
 	{
 
-		d->rootProcess = new KProcess;
+		d->rootProcess = new TDEProcess;
 
 		*d->rootProcess << tdesu;
 		*d->rootProcess << "--nonewdcop" << "-n" << "-d" << TQString( "-i%1" ).arg(moduleInfo().icon());
 
-		*d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "kcmshell"))
-			.arg(cmd).arg(d->embedWidget->winId()).arg(KGlobal::locale()->language());
+		*d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell"))
+			.arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language());
 
-		connect(d->rootProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(rootExited()));
+		connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited()));
 
-		if ( !d->rootProcess->start( KProcess::NotifyOnExit ))
+		if ( !d->rootProcess->start( TDEProcess::NotifyOnExit ))
 		{
 			d->rootMode = false;
 			rootExited();
@@ -378,7 +378,7 @@ void KCModuleProxy::runAsRoot()
 		{
 			d->rootMode = true;
 			kapp->dcopClient();
-			d->rootCommunicator = new KCModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this );
+			d->rootCommunicator = new TDECModuleProxyRootCommunicatorImpl( d->dcopName + "-RootCommunicator", this );
 		}
 
 		delete lblBusy;
@@ -395,7 +395,7 @@ void KCModuleProxy::runAsRoot()
 	TQApplication::restoreOverrideCursor();
 }
 
-void KCModuleProxy::rootExited()
+void TDECModuleProxy::rootExited()
 {
 	kdDebug(711) << k_funcinfo << endl;
 
@@ -426,15 +426,15 @@ void KCModuleProxy::rootExited()
 	emit childClosed();
 }
 
-KCModuleProxy::~KCModuleProxy()
+TDECModuleProxy::~TDECModuleProxy()
 {
 	deleteClient();
-	KCModuleLoader::unloadModule(moduleInfo());
+	TDECModuleLoader::unloadModule(moduleInfo());
 
 	delete d;
 }
 
-void KCModuleProxy::deleteClient()
+void TDECModuleProxy::deleteClient()
 {
 	if( d->embedWidget )
 		XKillClient(tqt_xdisplay(), d->embedWidget->embeddedWinId());
@@ -456,7 +456,7 @@ void KCModuleProxy::deleteClient()
 
 }
 
-void KCModuleProxy::moduleChanged( bool c )
+void TDECModuleProxy::moduleChanged( bool c )
 {
 	if(  d->changed == c )
 		return;
@@ -466,21 +466,21 @@ void KCModuleProxy::moduleChanged( bool c )
 	emit changed( this );
 }
 
-void KCModuleProxy::moduleDestroyed()
+void TDECModuleProxy::moduleDestroyed()
 {
 	d->kcm = 0;
 }
 
-KCModuleProxy::KCModuleProxy( const KService::Ptr & service, bool withFallback, 
+TDECModuleProxy::TDECModuleProxy( const KService::Ptr & service, bool withFallback, 
 		TQWidget  * parent, const char * name, const TQStringList & args)
 	: TQWidget( parent, name )
 {
-	init( KCModuleInfo( service ));
+	init( TDECModuleInfo( service ));
 	d->args = args;
 	d->withFallback = withFallback;
 }
 
-KCModuleProxy::KCModuleProxy( const KCModuleInfo & info, bool withFallback,
+TDECModuleProxy::TDECModuleProxy( const TDECModuleInfo & info, bool withFallback,
 		TQWidget * parent, const char * name, const TQStringList & args )
 	: TQWidget( parent, name )
 {
@@ -489,21 +489,21 @@ KCModuleProxy::KCModuleProxy( const KCModuleInfo & info, bool withFallback,
 	d->withFallback = withFallback;
 }
 
-KCModuleProxy::KCModuleProxy( const TQString& serviceName, bool withFallback, 
+TDECModuleProxy::TDECModuleProxy( const TQString& serviceName, bool withFallback, 
 		TQWidget * parent, const char * name, 
 		const TQStringList & args)
 	: TQWidget( parent, name )
 {
-	init( KCModuleInfo( serviceName ));
+	init( TDECModuleInfo( serviceName ));
 	d->args = args;
 	d->withFallback = withFallback;
 }
 
-void KCModuleProxy::init( const KCModuleInfo& info )
+void TDECModuleProxy::init( const TDECModuleInfo& info )
 { 
 	kdDebug(711) << k_funcinfo << endl;
 
-	d = new KCModuleProxyPrivate( info );
+	d = new TDECModuleProxyPrivate( info );
 
 	/* This is all we do for now; all the heavy work is 
 	 * done in realModule(). It's called when the module
@@ -513,7 +513,7 @@ void KCModuleProxy::init( const KCModuleInfo& info )
 
 }
 
-void KCModuleProxy::load()
+void TDECModuleProxy::load()
 {
 
 	if( d->rootMode )
@@ -525,7 +525,7 @@ void KCModuleProxy::load()
 	}
 }
 
-void KCModuleProxy::save()
+void TDECModuleProxy::save()
 {
 	if( d->rootMode )
 		callRootModule( "save()" );
@@ -536,7 +536,7 @@ void KCModuleProxy::save()
 	}
 }
 
-void KCModuleProxy::callRootModule( const TQCString& function )
+void TDECModuleProxy::callRootModule( const TQCString& function )
 {
 	TQByteArray sendData, replyData;
 	TQCString replyType;
@@ -549,7 +549,7 @@ void KCModuleProxy::callRootModule( const TQCString& function )
 
 }
 
-void KCModuleProxy::defaults()
+void TDECModuleProxy::defaults()
 {
 	if( d->rootMode )
 		callRootModule( "defaults()" );
@@ -557,7 +557,7 @@ void KCModuleProxy::defaults()
 		d->kcm->defaults();
 }
 
-TQString KCModuleProxy::quickHelp() const
+TQString TDECModuleProxy::quickHelp() const
 {
 
 	if( !d->rootMode )
@@ -586,65 +586,65 @@ TQString KCModuleProxy::quickHelp() const
 	}
 }
 
-const KAboutData * KCModuleProxy::aboutData() const
+const TDEAboutData * TDECModuleProxy::aboutData() const
 {
 	if( !d->rootMode )
 		return realModule() ? realModule()->aboutData() : 0;
 	else
-	/* This needs fixing, perhaps cache a KAboutData copy 
+	/* This needs fixing, perhaps cache a TDEAboutData copy 
 	 * while in root mode? */
 		return 0;
 		
 
 }
 
-int KCModuleProxy::buttons() const
+int TDECModuleProxy::buttons() const
 {
 	return realModule() ? realModule()->buttons() :
-		KCModule::Help | KCModule::Default | KCModule::Apply ;
+		TDECModule::Help | TDECModule::Default | TDECModule::Apply ;
 }
 
-TQString KCModuleProxy::rootOnlyMsg() const
+TQString TDECModuleProxy::rootOnlyMsg() const
 {
 	return realModule() ? realModule()->rootOnlyMsg() : TQString::null;
 }
 
-bool KCModuleProxy::useRootOnlyMsg() const
+bool TDECModuleProxy::useRootOnlyMsg() const
 {
 	return realModule() ? realModule()->useRootOnlyMsg() : true;
 }
 
-KInstance * KCModuleProxy::instance() const
+TDEInstance * TDECModuleProxy::instance() const
 {
 	return realModule() ? realModule()->instance() : 0;
 }
 
-bool KCModuleProxy::changed() const
+bool TDECModuleProxy::changed() const
 {
 	return d->changed;
 }
 
-const KCModuleInfo& KCModuleProxy::moduleInfo() const
+const TDECModuleInfo& TDECModuleProxy::moduleInfo() const
 {
 	return d->modInfo;
 }
 
-bool KCModuleProxy::rootMode() const
+bool TDECModuleProxy::rootMode() const
 {
 	return d->rootMode;
 }
 
-TQCString KCModuleProxy::dcopName() const
+TQCString TDECModuleProxy::dcopName() const
 {
 	return d->dcopName;
 }
 
-void KCModuleProxy::emitQuickHelpChanged()
+void TDECModuleProxy::emitQuickHelpChanged()
 {
 	emit quickHelpChanged();
 }
 
 /***************************************************************/
-#include "kcmoduleproxy.moc"
+#include "tdecmoduleproxy.moc"
 
 // vim: sw=4 ts=4 noet
diff --git a/kutils/kcmoduleproxy.h b/tdeutils/tdecmoduleproxy.h
index 11ae06dbb..9fc559d97 100644
--- a/kutils/kcmoduleproxy.h
+++ b/tdeutils/tdecmoduleproxy.h
@@ -27,57 +27,57 @@
 #include <kservice.h>
 #include <tdelibs_export.h>
 
-class KAboutData;
-class KCModule;
-class KCModuleInfo;
-class KInstance;
-class KProcess;
+class TDEAboutData;
+class TDECModule;
+class TDECModuleInfo;
+class TDEInstance;
+class TDEProcess;
 
 /**
- * @ingroup kcmodule
+ * @ingroup tdecmodule
  *
- * @brief Encapsulates a KCModule for embedding.
+ * @brief Encapsulates a TDECModule for embedding.
  *
- * KCModuleProxy is a wrapper for KCModule intended for cases where
+ * TDECModuleProxy is a wrapper for TDECModule intended for cases where
  * modules are to be displayed. It ensures layout is consistent, handles
  * root/administrator modules and in general takes care of the details
- * needed for making a module available in an interface. A KCModuleProxy
+ * needed for making a module available in an interface. A TDECModuleProxy
  * can be treated as a TQWidget, without worrying about the details specific
- * for modules such as library loading. KCModuleProxy is not a sub class of KCModule
- * but its API closely resembles KCModule's.\n
+ * for modules such as library loading. TDECModuleProxy is not a sub class of TDECModule
+ * but its API closely resembles TDECModule's.\n
  * Usually, an instance is created by passing one of the constructors a KService::Ptr,
- * KCModuleInfo or simply the name of the module and then added to the layout as any
+ * TDECModuleInfo or simply the name of the module and then added to the layout as any
  * other widget. \n
- * When the user have changed the module, changed( bool ) as well as changed ( KCModuleProxy * )
- * is emitted. KCModuleProxy does not take care of prompting for saving - if the object is deleted while
+ * When the user have changed the module, changed( bool ) as well as changed ( TDECModuleProxy * )
+ * is emitted. TDECModuleProxy does not take care of prompting for saving - if the object is deleted while
  * changes is not saved the changes will be lost. changed() returns true if changes are unsaved. \n
  * \n
- * KCModuleProxy does not take care of authorization of KCModules. \n
- * KCModuleProxy do lazy loading, meaning the library will not be loaded or
+ * TDECModuleProxy does not take care of authorization of TDECModules. \n
+ * TDECModuleProxy do lazy loading, meaning the library will not be loaded or
  * any other initialization done before its show() function is called. This means
  * modules will only be loaded when they are actually needed as well as it is possible to
- * load many KCModuleProxy without any speed penalty.
+ * load many TDECModuleProxy without any speed penalty.
  *
- * KCModuleProxy should be used in all cases where modules are embedded in order to
+ * TDECModuleProxy should be used in all cases where modules are embedded in order to
  * promote code efficiency and usability consistency.
  *
  * @author Frans Englich <frans.englich@telia.com>
  * @author Matthias Kretz <kretz@kde.org>
  *
  */
-class KUTILS_EXPORT KCModuleProxy : public TQWidget
+class KUTILS_EXPORT TDECModuleProxy : public TQWidget
 {
 Q_OBJECT
 
 
-	friend class KCModuleProxyRootCommunicatorImpl;
+	friend class TDECModuleProxyRootCommunicatorImpl;
 
 public:
 
 	/**
-	 * Constructs a KCModuleProxy from a KCModuleInfo class.
+	 * Constructs a TDECModuleProxy from a TDECModuleInfo class.
 	 *
-	 * @param info The KCModuleInfo to construct the module from.
+	 * @param info The TDECModuleInfo to construct the module from.
 	 * @param withFallback If set to true and loading of the module fails,
 	 * a alternative will be tried, resulting in the module appearing in its
 	 * own window, if at all.
@@ -87,12 +87,12 @@ public:
 	 * @param args This is used in the implementation and is internal.
 	 * Use the default.
 	 */
-	KCModuleProxy( const KCModuleInfo & info, bool withFallback = true,
+	TDECModuleProxy( const TDECModuleInfo & info, bool withFallback = true,
 			TQWidget * parent = 0, const char * name = 0,
 			const TQStringList & args = TQStringList() );
 
 	/**
-	 * Constructs a KCModuleProxy from a module's service name, which is
+	 * Constructs a TDECModuleProxy from a module's service name, which is
 	 * equivalent to the desktop file for the kcm without the ".desktop" part.
 	 * Otherwise equal to the one above.
 	 *
@@ -106,12 +106,12 @@ public:
 	 * @param args This is used in the implementation and is internal.
 	 * Use the default.
 	 */
-	KCModuleProxy( const TQString& serviceName, bool withFallback = true,
+	TDECModuleProxy( const TQString& serviceName, bool withFallback = true,
 			TQWidget * parent = 0, const char * name = 0,
 			const TQStringList & args = TQStringList() );
 
 	/**
-	 * Constructs a KCModuleProxy from KService. Otherwise equal to the one above.
+	 * Constructs a TDECModuleProxy from KService. Otherwise equal to the one above.
 	 *
 	 * @param service The KService to construct from.
 	 * @param withFallback If set to true and loading of the module fails,
@@ -123,14 +123,14 @@ public:
 	 * @param args This is used in the implementation and is internal.
 	 * Use the default.
 	 */
-	KCModuleProxy( const KService::Ptr& service, bool withFallback = true,
+	TDECModuleProxy( const KService::Ptr& service, bool withFallback = true,
 			TQWidget  * parent = 0, const char * name = 0,
 			const TQStringList & args = TQStringList() );
 
 	/**
 	 * Default destructor
 	 */
-	~KCModuleProxy();
+	~TDECModuleProxy();
 
 	/**
 	 * Calling it will cause the contained module to
@@ -155,7 +155,7 @@ public:
 	/**
 	 * @return the module's aboutData()
 	 */
-	const KAboutData * aboutData() const;
+	const TDEAboutData * aboutData() const;
 
 	/**
 	 * @return what buttons the module
@@ -181,11 +181,11 @@ public:
 	// this one's available via moduleInfo()-> and realModule()->
 
 	/**
-	 * Returns the embedded KCModule's KInstance.
-	 * @return The module's KInstance.
+	 * Returns the embedded TDECModule's TDEInstance.
+	 * @return The module's TDEInstance.
 	 * @deprecated
 	 */
-	KInstance * instance() const;
+	TDEInstance * instance() const;
 	//KDE4 remove. There's a limit for convenience functions,
 	// this one's available via realModule()
 
@@ -215,13 +215,13 @@ public:
 	 *
 	 * @return the encapsulated module.
 	 */
-	KCModule* realModule() const;
+	TDECModule* realModule() const;
 
 	/**
-	 * @return a KCModuleInfo for the encapsulated
+	 * @return a TDECModuleInfo for the encapsulated
 	 * module
 	 */
-	const KCModuleInfo& moduleInfo() const;
+	const TDECModuleInfo& moduleInfo() const;
 
 	/**
 	 * Returns the DCOP the module's DCOPClient
@@ -250,7 +250,7 @@ public slots:
 	/**
 	 * Calling this, results in deleting the contained
 	 * module, and unregistering from DCOP. A similar result is achieved
-	 * by deleting the KCModuleProxy itself.
+	 * by deleting the TDECModuleProxy itself.
 	 *
 	 * @since 3.4
 	 */
@@ -265,11 +265,11 @@ signals:
 
 	/**
 	 * This is emitted in the same situations as in the one above. Practical
-	 * when several KCModuleProxys are loaded.
+	 * when several TDECModuleProxys are loaded.
 	 *
 	 * @since 3.4
 	 */
-	void changed( KCModuleProxy* mod );
+	void changed( TDECModuleProxy* mod );
 
 	/**
 	 * When a module running with root privileges and exits, returns to normal mode, the
@@ -301,7 +301,7 @@ protected:
 	 * @internal
 	 * @since 3.4
 	 */
-	void init( const KCModuleInfo& info );
+	void init( const TDECModuleInfo& info );
 
 
 	/**
@@ -313,7 +313,7 @@ protected:
 private slots:
 
    /**
-	* Calls the function @p function of the root module's KCModuleProxy
+	* Calls the function @p function of the root module's TDECModuleProxy
 	* DCOP interface.
 	*
 	* @param function the function signature of the function to call.
@@ -350,8 +350,8 @@ private slots:
 
 private:
 
-	class KCModuleProxyPrivate;
-	KCModuleProxyPrivate * d;
+	class TDECModuleProxyPrivate;
+	TDECModuleProxyPrivate * d;
 };
 
 #endif // KCMODULEPROXY_H
diff --git a/kutils/kcmoduleproxyIface.h b/tdeutils/tdecmoduleproxyIface.h
index ff597b5c6..79d7a68ac 100644
--- a/kutils/kcmoduleproxyIface.h
+++ b/tdeutils/tdecmoduleproxyIface.h
@@ -23,17 +23,17 @@
 #include <dcopobject.h>
 
 /**
- * @ingroup kcmodule
- * @brief DCOP Interface for KCModule.
+ * @ingroup tdecmodule
+ * @brief DCOP Interface for TDECModule.
  * 
- * A module (which is loaded via KCModuleProxy) does always have 
+ * A module (which is loaded via TDECModuleProxy) does always have 
  * this DCOP interface, whether it's in root mode or not.
  *
  * @since 3.4
  * @internal
  * @author Frans Englich <frans.englich@telia.com>
  */
-class KCModuleProxyIface : virtual public DCOPObject
+class TDECModuleProxyIface : virtual public DCOPObject
 {
 	K_DCOP
 
@@ -81,7 +81,7 @@ k_dcop_signals:
 	 *
 	 * @param c true if the module is modified, false if its not.
 	 * @param module a string identifying the module which was changed. This 
-	 * is typically "KCModuleProx-X" where X is the module's name.
+	 * is typically "TDECModuleProx-X" where X is the module's name.
 	 */
 	virtual void changed( bool c );
 
@@ -90,28 +90,28 @@ k_dcop_signals:
 };
 
 /**
- * @ingroup kcmodule
+ * @ingroup tdecmodule
  * @brief DCOP interface for communicating with the real module running in root mode.
  * 
- * When a KCModuleProxy tells kcmshell to load "itself" and embed into the 
- * KCModuleProxy, this DCOP interface is used to communicate to the real KCModuleProxy, since 
- * the KCModuleProxy which told kcmshell to load itself, is nothing but a shell.
+ * When a TDECModuleProxy tells tdecmshell to load "itself" and embed into the 
+ * TDECModuleProxy, this DCOP interface is used to communicate to the real TDECModuleProxy, since 
+ * the TDECModuleProxy which told tdecmshell to load itself, is nothing but a shell.
  *
  * Currently is only the changed signal routed, but it's possible to proxy
- * the rest of the KCModuleProxy API, if it turns out necessary.
+ * the rest of the TDECModuleProxy API, if it turns out necessary.
  *
  * @since 3.4
  * @internal
  * @author Frans Englich <frans.englich@telia.com>
  */
-class KCModuleProxyRootDispatcher : virtual public DCOPObject
+class TDECModuleProxyRootDispatcher : virtual public DCOPObject
 {
 	K_DCOP
 
 k_dcop:
 
 	/**
-	 * KCModuleProxyIface::changed() gets connected to this.
+	 * TDECModuleProxyIface::changed() gets connected to this.
 	 */
 	virtual void changed( bool c ) = 0;
 
diff --git a/kutils/kcmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
index c9de5ba7a..5b1bcc339 100644
--- a/kutils/kcmoduleproxyIfaceImpl.cpp
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
@@ -21,19 +21,19 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
-#include <kcmoduleproxy.h>
+#include <tdeapplication.h>
+#include <tdecmoduleproxy.h>
 #include <kdebug.h>
 
-#include "kcmoduleproxyIfaceImpl.h"
+#include "tdecmoduleproxyIfaceImpl.h"
 
 
 #include <tqmessagebox.h>
 
-KCModuleProxyIfaceImpl::KCModuleProxyIfaceImpl( const TQCString& name, 
-		KCModuleProxy* const client )
+TDECModuleProxyIfaceImpl::TDECModuleProxyIfaceImpl( const TQCString& name, 
+		TDECModuleProxy* const client )
 	: DCOPObject( name ), TQObject( 0, name ),
-		p( const_cast<KCModuleProxy *>( client ))
+		p( const_cast<TDECModuleProxy *>( client ))
 { 
 	connect( p, TQT_SIGNAL( changed(bool)), 
 			TQT_SLOT( changedRelay(bool)));
@@ -41,40 +41,40 @@ KCModuleProxyIfaceImpl::KCModuleProxyIfaceImpl( const TQCString& name,
 			TQT_SLOT( quickHelpRelay()));
 }
 
-void KCModuleProxyIfaceImpl::save()
+void TDECModuleProxyIfaceImpl::save()
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->save();
 }
 
-void KCModuleProxyIfaceImpl::load()
+void TDECModuleProxyIfaceImpl::load()
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->load();
 }
 
-void KCModuleProxyIfaceImpl::defaults()
+void TDECModuleProxyIfaceImpl::defaults()
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->defaults();
 }
 
-TQString KCModuleProxyIfaceImpl::applicationName()
+TQString TDECModuleProxyIfaceImpl::applicationName()
 {
 	return kapp->caption();
 }
 
-TQString KCModuleProxyIfaceImpl::quickHelp()
+TQString TDECModuleProxyIfaceImpl::quickHelp()
 {
 	return p->quickHelp();
 }
 
-bool KCModuleProxyIfaceImpl::changed()
+bool TDECModuleProxyIfaceImpl::changed()
 {
 	return p->changed();
 }
 
-void KCModuleProxyIfaceImpl::changedRelay( bool c )
+void TDECModuleProxyIfaceImpl::changedRelay( bool c )
 {
 	TQByteArray data;
 	TQDataStream stream(data, IO_WriteOnly);
@@ -82,7 +82,7 @@ void KCModuleProxyIfaceImpl::changedRelay( bool c )
 	emitDCOPSignal( "changed(bool)", data );
 }
 
-void KCModuleProxyIfaceImpl::quickHelpRelay()
+void TDECModuleProxyIfaceImpl::quickHelpRelay()
 {
 	TQByteArray data;
 	emitDCOPSignal( "quickHelpChanged()", data );
@@ -94,18 +94,18 @@ void KCModuleProxyIfaceImpl::quickHelpRelay()
 
 
 /***************************************************************/
-KCModuleProxyRootCommunicatorImpl::KCModuleProxyRootCommunicatorImpl
-		( const TQCString& name, KCModuleProxy* const client )
+TDECModuleProxyRootCommunicatorImpl::TDECModuleProxyRootCommunicatorImpl
+		( const TQCString& name, TDECModuleProxy* const client )
 	: DCOPObject( name ), TQObject( 0, name ), 
-		p( const_cast<KCModuleProxy *>( client ))
+		p( const_cast<TDECModuleProxy *>( client ))
 { 
 	/*
-	 * Connect kcmshell's KCModuleProxy's change signal 
+	 * Connect tdecmshell's TDECModuleProxy's change signal 
 	 * to us, such that we act as a proxy for 
-	 * KCModuleProxy's API.
+	 * TDECModuleProxy's API.
 	 */
 
-	/* Note, we don't use KCModuleProxy::d->dcopClient */
+	/* Note, we don't use TDECModuleProxy::d->dcopClient */
 	kapp->dcopClient()->connectDCOPSignal( 0, p->dcopName(), 
 			"changed(bool)", objId(), "changed(bool)", false );
 
@@ -114,16 +114,16 @@ KCModuleProxyRootCommunicatorImpl::KCModuleProxyRootCommunicatorImpl
 }
 
 /* Reimplementations of DCOP members */
-void KCModuleProxyRootCommunicatorImpl::changed( bool c )
+void TDECModuleProxyRootCommunicatorImpl::changed( bool c )
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->moduleChanged( c );
 }
 
-void KCModuleProxyRootCommunicatorImpl::quickHelpChanged()
+void TDECModuleProxyRootCommunicatorImpl::quickHelpChanged()
 {
 	kdDebug(711) << k_funcinfo << endl;
 	p->emitQuickHelpChanged();
 }
 
-#include "kcmoduleproxyIfaceImpl.moc"
+#include "tdecmoduleproxyIfaceImpl.moc"
diff --git a/kutils/kcmoduleproxyIfaceImpl.h b/tdeutils/tdecmoduleproxyIfaceImpl.h
index bbfe51a28..fec8c6e5c 100644
--- a/kutils/kcmoduleproxyIfaceImpl.h
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.h
@@ -19,16 +19,16 @@
 #ifndef __KCMODULEPROXYIFACEIMPL_H__
 #define __KCMODULEPROXYIFACEIMPL_H__
 
-#include "kcmoduleproxyIface.h"
+#include "tdecmoduleproxyIface.h"
 
-class KCModuleProxy;
+class TDECModuleProxy;
 
 /***************************************************************/
 /** @internal
     @ingroup internal */
-class KCModuleProxyIfaceImpl: public TQObject, virtual public KCModuleProxyIface
+class TDECModuleProxyIfaceImpl: public TQObject, virtual public TDECModuleProxyIface
 {
-	/* KDE4 Merge KCModuleProxyIfaceImpl with KCModuleProxy(MI)
+	/* KDE4 Merge TDECModuleProxyIfaceImpl with TDECModuleProxy(MI)
 	 * if it doesn't break what DCOPClient it binds to.
 	 * Update: This is probably not possible, since we don't want the DCOPObject when 
 	 * we're running in root mode. */
@@ -38,7 +38,7 @@ class KCModuleProxyIfaceImpl: public TQObject, virtual public KCModuleProxyIface
 public:
 
 	/* Reimplementations of DCOP members */
-	KCModuleProxyIfaceImpl( const TQCString& name, KCModuleProxy* const client );
+	TDECModuleProxyIfaceImpl( const TQCString& name, TDECModuleProxy* const client );
 
 	virtual void save();
 
@@ -59,14 +59,14 @@ public slots:
 	void changedRelay( bool c );
 
 	/**
-	 * Simply relays KCModuleProxy's signal with the same name.
+	 * Simply relays TDECModuleProxy's signal with the same name.
 	 */
 	void quickHelpRelay();
 	
 
 private:
 
-	KCModuleProxy* p;
+	TDECModuleProxy* p;
 };
 /***************************************************************/
 
@@ -76,20 +76,20 @@ private:
 /***************************************************************/
 /** @internal
     @ingroup internal */
-class KCModuleProxyRootCommunicatorImpl: public TQObject, 
-	virtual public KCModuleProxyRootDispatcher
+class TDECModuleProxyRootCommunicatorImpl: public TQObject, 
+	virtual public TDECModuleProxyRootDispatcher
 {
 	Q_OBJECT
 
 public:
-	KCModuleProxyRootCommunicatorImpl( const TQCString& name, KCModuleProxy* const client );
+	TDECModuleProxyRootCommunicatorImpl( const TQCString& name, TDECModuleProxy* const client );
 
 	/* Reimplementations of DCOP members */
 	virtual void changed( bool c );
 
 	virtual void quickHelpChanged();
 
-KCModuleProxy* p;
+TDECModuleProxy* p;
 };
 /***************************************************************/
 
diff --git a/kutils/kmultitabbar.cpp b/tdeutils/tdemultitabbar.cpp
index 082470538..da2f3b23e 100644
--- a/kutils/kmultitabbar.cpp
+++ b/tdeutils/tdemultitabbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar.cpp -  description
+                          tdemultitabbar.cpp -  description
                              -------------------
     begin                :  2001
     copyright            : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>
@@ -22,10 +22,10 @@
     Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
-#include "kmultitabbar.h"
-#include "kmultitabbar.moc"
-#include "kmultitabbar_p.h"
-#include "kmultitabbar_p.moc"
+#include "tdemultitabbar.h"
+#include "tdemultitabbar.moc"
+#include "tdemultitabbar_p.h"
+#include "tdemultitabbar_p.moc"
 #include <tqbutton.h>
 #include <tqpopupmenu.h>
 #include <tqlayout.h>
@@ -870,7 +870,7 @@ KMultiTabBar::~KMultiTabBar() {
 
 /*int KMultiTabBar::insertButton(TQPixmap pic,int id ,const TQString&)
 {
-  (new KToolbarButton(pic,id,m_internal))->show();
+  (new TDEToolbarButton(pic,id,m_internal))->show();
   return 0;
 }*/
 
diff --git a/kutils/kmultitabbar.h b/tdeutils/tdemultitabbar.h
index ffc3fca5f..b14d9518b 100644
--- a/kutils/kmultitabbar.h
+++ b/tdeutils/tdemultitabbar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar.h -  description
+                          tdemultitabbar.h -  description
                              -------------------
     begin                :  2001
     copyright            : (C) 2001,2002,2003 by Joseph Wenninger <jowenn@kde.org>
diff --git a/kutils/kmultitabbar_p.h b/tdeutils/tdemultitabbar_p.h
index f8d552b40..53b43a861 100644
--- a/kutils/kmultitabbar_p.h
+++ b/tdeutils/tdemultitabbar_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kmultitabbar_p.h -  description
+                          tdemultitabbar_p.h -  description
                              -------------------
     begin                :  2003
     copyright            : (C) 2003 by Joseph Wenninger <jowenn@kde.org>
@@ -25,7 +25,7 @@
 #ifndef K_MULTI_TAB_BAR_P_H
 #define K_MULTI_TAB_BAR_P_H
 #include <tqscrollview.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 class KMultiTabBarInternal: public TQScrollView
 {
diff --git a/kutils/tests/Makefile.am b/tdeutils/tests/Makefile.am
index 3bde7a9a2..f669e7914 100644
--- a/kutils/tests/Makefile.am
+++ b/tdeutils/tests/Makefile.am
@@ -5,11 +5,11 @@ check_PROGRAMS = kfindtest kreplacetest
 TESTS = kfindtest kreplacetest
 
 kfindtest_SOURCES = kfindtest.cpp
-kfindtest_LDADD = ../libkutils.la
+kfindtest_LDADD = ../libtdeutils.la
 kfindtest_LDFLAGS = $(all_libraries)
 
 kreplacetest_SOURCES = kreplacetest.cpp
-kreplacetest_LDADD = ../libkutils.la
+kreplacetest_LDADD = ../libtdeutils.la
 kreplacetest_LDFLAGS = $(all_libraries)
 
 METASOURCES = AUTO
diff --git a/kutils/tests/kfindtest.cpp b/tdeutils/tests/kfindtest.cpp
index 1652eb625..c913e5ec6 100644
--- a/kutils/tests/kfindtest.cpp
+++ b/tdeutils/tests/kfindtest.cpp
@@ -21,8 +21,8 @@
 #include "../kfinddialog.h"
 #include "kfindtest.h"
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include <stdlib.h>
@@ -123,8 +123,8 @@ void KFindTest::slotHighlight(int id, int index, int matchedLength)
 
 int main(int argc, char **argv)
 {
-	KCmdLineArgs::init(argc, argv, "kfindtest", "KFindTest", 0, 0, false);
-	KApplication app;
+	TDECmdLineArgs::init(argc, argv, "kfindtest", "KFindTest", 0, 0, false);
+	TDEApplication app;
 
 	TQString text = "This file is part of the KDE project.\n"
 	               "This library is free software; you can redistribute it and/or\n"
diff --git a/kutils/tests/kfindtest.h b/tdeutils/tests/kfindtest.h
index 847d9579c..847d9579c 100644
--- a/kutils/tests/kfindtest.h
+++ b/tdeutils/tests/kfindtest.h
diff --git a/kutils/tests/kreplacetest.cpp b/tdeutils/tests/kreplacetest.cpp
index 0a33be94b..19ead8e77 100644
--- a/kutils/tests/kreplacetest.cpp
+++ b/tdeutils/tests/kreplacetest.cpp
@@ -19,8 +19,8 @@
 
 #include <assert.h>
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <tqeventloop.h>
 #include <kpushbutton.h>
 #include "../kreplace.h"
@@ -252,8 +252,8 @@ static void testReplacementHistory()
 
 int main( int argc, char **argv )
 {
-    KCmdLineArgs::init(argc, argv, "kreplacetest", 0, 0);
-    KApplication app;
+    TDECmdLineArgs::init(argc, argv, "kreplacetest", 0, 0);
+    TDEApplication app;
 
     testReplacementHistory(); // #130831
 
diff --git a/kutils/tests/kreplacetest.h b/tdeutils/tests/kreplacetest.h
index b8fb8120b..b8fb8120b 100644
--- a/kutils/tests/kreplacetest.h
+++ b/tdeutils/tests/kreplacetest.h
diff --git a/kwallet/CMakeLists.txt b/tdewallet/CMakeLists.txt
index fcc0f90d5..fcc0f90d5 100644
--- a/kwallet/CMakeLists.txt
+++ b/tdewallet/CMakeLists.txt
diff --git a/kwallet/Makefile.am b/tdewallet/Makefile.am
index 18a2cc6e7..18a2cc6e7 100644
--- a/kwallet/Makefile.am
+++ b/tdewallet/Makefile.am
diff --git a/kwallet/README b/tdewallet/README
index 9d662c0a9..661729a2f 100644
--- a/kwallet/README
+++ b/tdewallet/README
@@ -4,7 +4,7 @@ It has been updated to 10/22/2003.
 
 -----------
 
-This directory consists of two libraries: kwalletbackend and kwalletclient
+This directory consists of two libraries: tdewalletbackend and tdewalletclient
 
 KWallet::Backend is used inside kded to manage the actual files and
 encryption.  On the other hand, KWallet::Wallet is used to represent
diff --git a/kwallet/backend/CMakeLists.txt b/tdewallet/backend/CMakeLists.txt
index d8888afce..59c0bf942 100644
--- a/kwallet/backend/CMakeLists.txt
+++ b/tdewallet/backend/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/tdecore
-  ${CMAKE_SOURCE_DIR}/kwallet/client
+  ${CMAKE_SOURCE_DIR}/tdewallet/client
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
 )
@@ -23,14 +23,14 @@ link_directories(
 )
 
 
-##### libkwalletbackend #########################
+##### libtdewalletbackend #########################
 
-set( target kwalletbackend )
+set( target tdewalletbackend )
 
 set( ${target}_SRCS
   blockcipher.cc blowfish.cc
-  cbc.cc sha1.cc kwalletentry.cc
-  kwalletbackend.cc
+  cbc.cc sha1.cc tdewalletentry.cc
+  tdewalletbackend.cc
 )
 
 tde_add_library( ${target} SHARED
diff --git a/tdewallet/backend/Makefile.am b/tdewallet/backend/Makefile.am
new file mode 100644
index 000000000..79bfc0820
--- /dev/null
+++ b/tdewallet/backend/Makefile.am
@@ -0,0 +1,25 @@
+
+INCLUDES = -I$(srcdir)/../client $(all_includes)
+
+lib_LTLIBRARIES = libtdewalletbackend.la
+
+libtdewalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
+libtdewalletbackend_la_LIBADD = $(LIB_QT) ../../tdecore/libtdecore.la
+libtdewalletbackend_la_SOURCES = blockcipher.cc		\
+			       blowfish.cc		\
+			       cbc.cc			\
+			       sha1.cc			\
+			       tdewalletentry.cc		\
+			       tdewalletbackend.cc
+
+
+libtdewalletbackend_la_METASOURCES = AUTO
+
+noinst_HEADERS = blowfishtables.h	\
+		 cbc.h			\
+		 sha1.h			\
+		 blockcipher.h		\
+		 tdewalletentry.h		\
+		 tdewalletbackend.h	\
+		 blowfish.h
+
diff --git a/kwallet/backend/blockcipher.cc b/tdewallet/backend/blockcipher.cc
index 9d770098e..9d770098e 100644
--- a/kwallet/backend/blockcipher.cc
+++ b/tdewallet/backend/blockcipher.cc
diff --git a/kwallet/backend/blockcipher.h b/tdewallet/backend/blockcipher.h
index aadff6e70..aadff6e70 100644
--- a/kwallet/backend/blockcipher.h
+++ b/tdewallet/backend/blockcipher.h
diff --git a/kwallet/backend/blowfish.cc b/tdewallet/backend/blowfish.cc
index c708935de..c708935de 100644
--- a/kwallet/backend/blowfish.cc
+++ b/tdewallet/backend/blowfish.cc
diff --git a/kwallet/backend/blowfish.h b/tdewallet/backend/blowfish.h
index 581ac31c0..581ac31c0 100644
--- a/kwallet/backend/blowfish.h
+++ b/tdewallet/backend/blowfish.h
diff --git a/kwallet/backend/blowfishtables.h b/tdewallet/backend/blowfishtables.h
index dae448f96..dae448f96 100644
--- a/kwallet/backend/blowfishtables.h
+++ b/tdewallet/backend/blowfishtables.h
diff --git a/kwallet/backend/cbc.cc b/tdewallet/backend/cbc.cc
index 7bc5f3891..7bc5f3891 100644
--- a/kwallet/backend/cbc.cc
+++ b/tdewallet/backend/cbc.cc
diff --git a/kwallet/backend/cbc.h b/tdewallet/backend/cbc.h
index 1ce971ab3..1ce971ab3 100644
--- a/kwallet/backend/cbc.h
+++ b/tdewallet/backend/cbc.h
diff --git a/kwallet/backend/sha1.cc b/tdewallet/backend/sha1.cc
index 7420b5f16..7420b5f16 100644
--- a/kwallet/backend/sha1.cc
+++ b/tdewallet/backend/sha1.cc
diff --git a/kwallet/backend/sha1.h b/tdewallet/backend/sha1.h
index de40cc692..de40cc692 100644
--- a/kwallet/backend/sha1.h
+++ b/tdewallet/backend/sha1.h
diff --git a/kwallet/backend/kwalletbackend.cc b/tdewallet/backend/tdewalletbackend.cc
index 59b7dda2e..17fecae0c 100644
--- a/kwallet/backend/kwalletbackend.cc
+++ b/tdewallet/backend/tdewalletbackend.cc
@@ -18,13 +18,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "kwalletbackend.h"
+#include "tdewalletbackend.h"
 
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
@@ -56,7 +56,7 @@ using namespace KWallet;
 
 static void initKWalletDir()
 {
-    KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+    TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 }
 
 Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) {
@@ -64,7 +64,7 @@ Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) {
 	if (isPath) {
 		_path = name;
 	} else {
-		_path = KGlobal::dirs()->saveLocation("kwallet") + "/" + _name + ".kwl";
+		_path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + _name + ".kwl";
 	}
 
 	_open = false;
@@ -245,7 +245,7 @@ static int password2hash(const TQByteArray& password, TQByteArray& hash) {
 
 bool Backend::exists(const TQString& wallet) {
 	initKWalletDir();
-	TQString path = KGlobal::dirs()->saveLocation("kwallet") + "/" + wallet + ".kwl";
+	TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + wallet + ".kwl";
 	// Note: 60 bytes is presently the minimum size of a wallet file.
 	//       Anything smaller is junk.
 return TQFile::exists(path) && TQFileInfo(path).size() >= 60;
diff --git a/kwallet/backend/kwalletbackend.h b/tdewallet/backend/tdewalletbackend.h
index f43f56ec8..105d421db 100644
--- a/kwallet/backend/kwalletbackend.h
+++ b/tdewallet/backend/tdewalletbackend.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
-#include "kwalletentry.h"
+#include "tdewalletentry.h"
 
 
 namespace KWallet {
diff --git a/kwallet/backend/kwalletentry.cc b/tdewallet/backend/tdewalletentry.cc
index 4e74c03e3..a7e8a0425 100644
--- a/kwallet/backend/kwalletentry.cc
+++ b/tdewallet/backend/tdewalletentry.cc
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */ 
 
-#include "kwalletentry.h"
+#include "tdewalletentry.h"
 
 
 using namespace KWallet;
diff --git a/kwallet/backend/kwalletentry.h b/tdewallet/backend/tdewalletentry.h
index 530e1a828..bd39e97d1 100644
--- a/kwallet/backend/kwalletentry.h
+++ b/tdewallet/backend/tdewalletentry.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqdatastream.h>
 
-#include "kwallet.h"
+#include "tdewallet.h"
 
 namespace KWallet {
 
diff --git a/kwallet/backend/tests/Makefile.am b/tdewallet/backend/tests/Makefile.am
index 3191b06a8..5f5da74d9 100644
--- a/kwallet/backend/tests/Makefile.am
+++ b/tdewallet/backend/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kwallet/backend -I$(top_srcdir)/kwallet/client $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdewallet/backend -I$(top_srcdir)/tdewallet/client $(all_includes)
 
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
 
@@ -6,7 +6,7 @@ check_PROGRAMS = backendtest testbf testsha
 
 METASOURCES = AUTO
 
-LDADD = ../libkwalletbackend.la ../../client/libkwalletclient.la
+LDADD = ../libtdewalletbackend.la ../../client/libtdewalletclient.la
 backendtest_SOURCES = backendtest.cpp
 
 testbf_SOURCES = testbf.cpp
diff --git a/kwallet/backend/tests/backendtest.cpp b/tdewallet/backend/tests/backendtest.cpp
index e7599b3a2..76d59b153 100644
--- a/kwallet/backend/tests/backendtest.cpp
+++ b/tdewallet/backend/tests/backendtest.cpp
@@ -1,13 +1,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 
-#include "kwalletbackend.h"
+#include "tdewalletbackend.h"
 
 int main(int argc, char **argv) {
-   KApplication a(argc, argv, "kwalletbackendtest");
+   TDEApplication a(argc, argv, "tdewalletbackendtest");
 
    KWallet::Backend be("ktestwallet");
    printf("KWalletBackend constructed\n");
diff --git a/kwallet/backend/tests/testbf.cpp b/tdewallet/backend/tests/testbf.cpp
index 12dc74630..12dc74630 100644
--- a/kwallet/backend/tests/testbf.cpp
+++ b/tdewallet/backend/tests/testbf.cpp
diff --git a/kwallet/backend/tests/testsha.cpp b/tdewallet/backend/tests/testsha.cpp
index 70879f015..70879f015 100644
--- a/kwallet/backend/tests/testsha.cpp
+++ b/tdewallet/backend/tests/testsha.cpp
diff --git a/kwallet/client/CMakeLists.txt b/tdewallet/client/CMakeLists.txt
index 13056ccc2..f222f8bde 100644
--- a/kwallet/client/CMakeLists.txt
+++ b/tdewallet/client/CMakeLists.txt
@@ -25,16 +25,16 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    kwallet.h kwallettypes.h
+    tdewallet.h tdewallettypes.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### libkwalletclient ##############################
+##### libtdewalletclient ##############################
 
-set( target kwalletclient )
+set( target tdewalletclient )
 
 set( ${target}_SRCS
-  kwallet.skel kwallet.cc
+  tdewallet.skel tdewallet.cc
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tdewallet/client/Makefile.am b/tdewallet/client/Makefile.am
new file mode 100644
index 000000000..d10938a4f
--- /dev/null
+++ b/tdewallet/client/Makefile.am
@@ -0,0 +1,14 @@
+
+INCLUDES= -I$(srcdir) $(all_includes)
+
+lib_LTLIBRARIES = libtdewalletclient.la
+
+libtdewalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
+libtdewalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
+libtdewalletclient_la_SOURCES =   tdewallet.skel \
+				tdewallet.cc
+
+libtdewalletclient_la_METASOURCES = AUTO
+
+include_HEADERS = tdewallet.h tdewallettypes.h
+
diff --git a/kwallet/client/kwallet.cc b/tdewallet/client/tdewallet.cc
index a823a06dd..add75c93d 100644
--- a/kwallet/client/kwallet.cc
+++ b/tdewallet/client/tdewallet.cc
@@ -18,9 +18,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "kwallettypes.h"
-#include "kwallet.h"
-#include <kconfig.h>
+#include "tdewallettypes.h"
+#include "tdewallet.h"
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <dcopclient.h>
@@ -34,7 +34,7 @@ using namespace KWallet;
 
 
 const TQString Wallet::LocalWallet() {
-	KConfig cfg("kwalletrc", true);
+	TDEConfig cfg("tdewalletrc", true);
 	cfg.setGroup("Wallet");
 	if (!cfg.readBoolEntry("Use One Wallet", true)) {
 		TQString tmp = cfg.readEntry("Local Wallet", "localwallet");
@@ -52,7 +52,7 @@ const TQString Wallet::LocalWallet() {
 }
 
 const TQString Wallet::NetworkWallet() {
-	KConfig cfg("kwalletrc", true);
+	TDEConfig cfg("tdewalletrc", true);
 	cfg.setGroup("Wallet");
 
 	TQString tmp = cfg.readEntry("Default Wallet", "kdewallet");
@@ -75,7 +75,7 @@ const TQString Wallet::FormDataFolder() {
 Wallet::Wallet(int handle, const TQString& name)
 : TQObject(0L), DCOPObject(), d(0L), _name(name), _handle(handle) {
 
-	_dcopRef = new DCOPRef("kded", "kwalletd");
+	_dcopRef = new DCOPRef("kded", "tdewalletd");
 
 	_dcopRef->dcopClient()->setNotifications(true);
 	connect(_dcopRef->dcopClient(),
@@ -117,7 +117,7 @@ Wallet::~Wallet() {
 
 
 TQStringList Wallet::walletList() {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("wallets");
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("wallets");
 	TQStringList rc;
 	if (r.isValid()) {
 		r.get(rc);
@@ -127,12 +127,12 @@ TQStringList Wallet::walletList() {
 
 
 void Wallet::changePassword(const TQString& name, WId w) {
-	DCOPRef("kded", "kwalletd").send("changePassword", name, uint(w));
+	DCOPRef("kded", "tdewalletd").send("changePassword", name, uint(w));
 }
 
 
 bool Wallet::isEnabled() {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("isEnabled");
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("isEnabled");
 	bool rc = false;
 	if (r.isValid()) {
 		r.get(rc);
@@ -142,7 +142,7 @@ bool Wallet::isEnabled() {
 
 
 bool Wallet::isOpen(const TQString& name) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("isOpen", name);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("isOpen", name);
 	bool rc = false;
 	if (r.isValid()) {
 		r.get(rc);
@@ -152,7 +152,7 @@ bool Wallet::isOpen(const TQString& name) {
 
 
 int Wallet::closeWallet(const TQString& name, bool force) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("close", name, force);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("close", name, force);
 	int rc = -1;
 	if (r.isValid()) {
 		r.get(rc);
@@ -162,7 +162,7 @@ int Wallet::closeWallet(const TQString& name, bool force) {
 
 
 int Wallet::deleteWallet(const TQString& name) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("deleteWallet", name);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("deleteWallet", name);
 	int rc = -1;
 	if (r.isValid()) {
 		r.get(rc);
@@ -174,7 +174,7 @@ int Wallet::deleteWallet(const TQString& name) {
 Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
 	if (ot == Asynchronous) {
 		Wallet *wallet = new Wallet(-1, name);
-		DCOPRef("kded", "kwalletd").send("openAsynchronous", name, wallet->objId(), uint(w));
+		DCOPRef("kded", "tdewalletd").send("openAsynchronous", name, wallet->objId(), uint(w));
 		return wallet;
 	}
 
@@ -186,9 +186,9 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
 	DCOPReply r;
 
 	if (isPath) {
-		r = DCOPRef("kded", "kwalletd").call("openPath", name, uint(w));
+		r = DCOPRef("kded", "tdewalletd").call("openPath", name, uint(w));
 	} else {
-		r = DCOPRef("kded", "kwalletd").call("open", name, uint(w));
+		r = DCOPRef("kded", "tdewalletd").call("open", name, uint(w));
 	}
 
 	if (r.isValid()) {
@@ -204,7 +204,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
 
 
 bool Wallet::disconnectApplication(const TQString& wallet, const TQCString& app) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("disconnectApplication", wallet, app);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("disconnectApplication", wallet, app);
 	bool rc = false;
 	if (r.isValid()) {
 		r.get(rc);
@@ -214,7 +214,7 @@ bool Wallet::disconnectApplication(const TQString& wallet, const TQCString& app)
 
 
 TQStringList Wallet::users(const TQString& name) {
-	DCOPReply r = DCOPRef("kded", "kwalletd").call("users", name);
+	DCOPReply r = DCOPRef("kded", "tdewalletd").call("users", name);
 	TQStringList drc;
 	if (r.isValid()) {
 		r.get(drc);
@@ -687,7 +687,7 @@ void Wallet::walletOpenResult(int id) {
 
 
 bool Wallet::folderDoesNotExist(const TQString& wallet, const TQString& folder) {
-DCOPReply r = DCOPRef("kded", "kwalletd").call("folderDoesNotExist", wallet, folder);
+DCOPReply r = DCOPRef("kded", "tdewalletd").call("folderDoesNotExist", wallet, folder);
 bool rc = true;
 	if (r.isValid()) {
 		r.get(rc);
@@ -697,7 +697,7 @@ return rc;
 
 
 bool Wallet::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) {
-DCOPReply r = DCOPRef("kded", "kwalletd").call("keyDoesNotExist", wallet, folder, key);
+DCOPReply r = DCOPRef("kded", "tdewalletd").call("keyDoesNotExist", wallet, folder, key);
 bool rc = true;
 	if (r.isValid()) {
 		r.get(rc);
@@ -710,4 +710,4 @@ void Wallet::virtual_hook(int, void*) {
 	//BASE::virtual_hook( id, data );
 }
 
-#include "kwallet.moc"
+#include "tdewallet.moc"
diff --git a/kwallet/client/kwallet.h b/tdewallet/client/tdewallet.h
index cbe8188a5..fa5dbcbb2 100644
--- a/kwallet/client/kwallet.h
+++ b/tdewallet/client/tdewallet.h
@@ -50,7 +50,7 @@ namespace KWallet {
  * @author George Staikos <staikos@kde.org>
  * @short KDE Wallet Class
  */
-class KIO_EXPORT Wallet : public TQObject, public DCOPObject {
+class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
 	K_DCOP
 	Q_OBJECT
 	protected:
@@ -491,7 +491,7 @@ class KIO_EXPORT Wallet : public TQObject, public DCOPObject {
 
 		/**
 		 *  @internal
-		 *  Callback for kwalletd
+		 *  Callback for tdewalletd
 		 */
 		ASYNC walletOpenResult(int rc);
 
diff --git a/kwallet/client/kwallettypes.h b/tdewallet/client/tdewallettypes.h
index 918dc0a3f..918dc0a3f 100644
--- a/kwallet/client/kwallettypes.h
+++ b/tdewallet/client/tdewallettypes.h
diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am
new file mode 100644
index 000000000..83aa39dc0
--- /dev/null
+++ b/tdewallet/tests/Makefile.am
@@ -0,0 +1,20 @@
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
+
+METASOURCES = AUTO
+check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth
+
+tdewalletasync_SOURCES = tdewalletasync.cpp tdewallettest.cpp
+tdewalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletasync_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+
+tdewalletsync_SOURCES = tdewalletsync.cpp
+tdewalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletsync_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+
+tdewalletboth_SOURCES = tdewalletboth.cpp tdewallettest.cpp
+tdewalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletboth_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+INCLUDES = -I$(top_srcdir)/tdewallet/client
diff --git a/tdewallet/tests/README b/tdewallet/tests/README
new file mode 100644
index 000000000..0996c216d
--- /dev/null
+++ b/tdewallet/tests/README
@@ -0,0 +1,5 @@
+Tests for opening the wallet synchronously and asynchronously
+
+tdewalletsync - open synchronously
+tdewalletasync - open asynchronously
+tdewalletboth - start opening asynchronously, then, during the async call, open synchronously
diff --git a/kwallet/tests/kwalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
index 072fb55f8..75d475b97 100644
--- a/kwallet/tests/kwalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -1,16 +1,16 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
-#include "kwallettest.h"
+#include "tdewallettest.h"
 
 static TQTextStream _out( stdout, IO_WriteOnly );
 
@@ -43,9 +43,9 @@ void WalletReceiver::walletOpened( bool got )
 
 int main( int argc, char *argv[] )
 {
-	KAboutData aboutData( "kwalletasync", "kwalletasync", "version" );
-	KCmdLineArgs::init( argc, argv, &aboutData );
-	KApplication app( "kwalletasync" );
+	TDEAboutData aboutData( "tdewalletasync", "tdewalletasync", "version" );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
+	TDEApplication app( "tdewalletasync" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/kwallet/tests/kwalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
index 75d303419..efeeebc98 100644
--- a/kwallet/tests/kwalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -1,16 +1,16 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
-#include "kwallettest.h"
+#include "tdewallettest.h"
 
 static TQTextStream _out( stdout, IO_WriteOnly );
 
@@ -65,9 +65,9 @@ void WalletReceiver::walletOpened( bool got )
 
 int main( int argc, char *argv[] )
 {
-	KAboutData aboutData( "kwalletboth", "kwalletboth", "version" );
-	KCmdLineArgs::init( argc, argv, &aboutData );
-	KApplication app( "kwalletboth" );
+	TDEAboutData aboutData( "tdewalletboth", "tdewalletboth", "version" );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
+	TDEApplication app( "tdewalletboth" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/kwallet/tests/kwalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp
index 3625a5cb6..9ee39e4d4 100644
--- a/kwallet/tests/kwalletsync.cpp
+++ b/tdewallet/tests/tdewalletsync.cpp
@@ -1,14 +1,14 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 static TQTextStream _out( stdout, IO_WriteOnly );
 
@@ -23,9 +23,9 @@ void openWallet()
 
 int main( int argc, char *argv[] )
 {
-	KAboutData aboutData( "kwalletsync", "kwalletsync", "version" );
-	KCmdLineArgs::init( argc, argv, &aboutData );
-	KApplication app( "kwalletsync" );
+	TDEAboutData aboutData( "tdewalletsync", "tdewalletsync", "version" );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
+	TDEApplication app( "tdewalletsync" );
 
 	// register with DCOP
 	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
diff --git a/tdewallet/tests/tdewallettest.cpp b/tdewallet/tests/tdewallettest.cpp
new file mode 100644
index 000000000..c0acac812
--- /dev/null
+++ b/tdewallet/tests/tdewallettest.cpp
@@ -0,0 +1,2 @@
+#include "tdewallettest.h"
+#include "tdewallettest.moc"
diff --git a/kwallet/tests/kwallettest.h b/tdewallet/tests/tdewallettest.h
index c062760a4..c062760a4 100644
--- a/kwallet/tests/kwallettest.h
+++ b/tdewallet/tests/tdewallettest.h
diff --git a/win/pro_files/interfaces/interfaces.pro b/win/pro_files/interfaces/interfaces.pro
index b766eec14..bffab613b 100644
--- a/win/pro_files/interfaces/interfaces.pro
+++ b/win/pro_files/interfaces/interfaces.pro
@@ -1,4 +1,4 @@
 TEMPLATE	= subdirs
 
 SUBDIRS += \
-ktexteditor
+tdetexteditor
diff --git a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
index 192530e70..0661d166c 100644
--- a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro
+++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
@@ -5,20 +5,20 @@ include( $(KDELIBS)/win/common.pro )
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
     $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \
-    $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX \
+    $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX \
     $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kabc$$KDELIB_SUFFIX \
     $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
 
-INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/ktexteditor \
- $(KDELIBS)/kabc
+INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/tdetexteditor \
+ $(KDELIBS)/tdeabc
 
-TARGET		= ktexteditor$$KDEBUG
+TARGET		= tdetexteditor$$KDEBUG
 
 system( bash kmoc )
 system( bash kdcopidl )
 
 SOURCES = \
-    ktexteditor.cpp \
+    tdetexteditor.cpp \
     editinterface.cpp editinterfaceext.cpp \
     clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp \
     codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro
index 95f08b747..b3eae05b4 100644
--- a/win/pro_files/kabc/kabc.pro
+++ b/win/pro_files/kabc/kabc.pro
@@ -5,11 +5,11 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_KABC_LIB
 LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR\kresources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR\tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX
 
-INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
-	$(KDELIBS)/kabc/vcardparser
+INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \
+	$(KDELIBS)/tdeabc/vcardparser
 
 system( bash kmoc )
 system( bash kdcopidl )
diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro
index 8dedc015e..e2de8e6d7 100644
--- a/win/pro_files/kabc/vcard/vcard.pro
+++ b/win/pro_files/kabc/vcard/vcard.pro
@@ -7,8 +7,8 @@ DEFINES += MAKE_KVCARD_LIB
 
 LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX 
 
-INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
-	$(KDELIBS)/kabc/vcardparser
+INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \
+	$(KDELIBS)/tdeabc/vcardparser
 
 system( bash kmoc )
 system( bash kdcopidl )
diff --git a/win/pro_files/kate/interfaces/interfaces.pro b/win/pro_files/kate/interfaces/interfaces.pro
index 22a1527fe..bfcfef97e 100644
--- a/win/pro_files/kate/interfaces/interfaces.pro
+++ b/win/pro_files/kate/interfaces/interfaces.pro
@@ -8,8 +8,8 @@ DEFINES += MAKE_KATEPARTINTERFACES_LIB
 TARGET		= katepartinterfaces$$KDEBUG
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX 
+	$$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX 
 
 INCLUDEPATH += $(KDELIBS)/interfaces
 
diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro
index 69bfed0be..65d87e323 100644
--- a/win/pro_files/kate/part/part.pro
+++ b/win/pro_files/kate/part/part.pro
@@ -9,13 +9,13 @@ DEFINES += MAKE_KATEPART_LIB
 TARGET		= katepart$$KDELIBDEBUG
 
 LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+	$$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX
 
 INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \
-	$(KDELIBS)/kutils $(KDELIBS)/tdeprint
+	$(KDELIBS)/tdeutils $(KDELIBS)/tdeprint
 
 system( bash kmoc )
 system( bash kdcopidl )
diff --git a/win/pro_files/kded/kded.pro b/win/pro_files/kded/kded.pro
index 05f2455cc..ee8de94d2 100644
--- a/win/pro_files/kded/kded.pro
+++ b/win/pro_files/kded/kded.pro
@@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro )
 LIBS += $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX
 
 # icon
-LIBS+=$(KDELIBS)/win/resources/kbuildsycoca.res
+LIBS+=$(KDELIBS)/win/resources/tdebuildsycoca.res
 
 INCLUDEPATH += $(KDELIBS)/kded
 
@@ -13,15 +13,15 @@ system( bash kmoc )
 
 !contains(CONFIG,GUI) {
 	!contains(KW_CONFIG,release) {
-		TARGET = kbuildsycoca_d
+		TARGET = tdebuildsycoca_d
 	}
 	contains(KW_CONFIG,release) {
-		TARGET = kbuildsycoca
+		TARGET = tdebuildsycoca
 	}
 }
 
 SOURCES = \
-kbuildsycoca.cpp \
+tdebuildsycoca.cpp \
 kbuildimageiofactory.cpp \
 kbuildprotocolinfofactory.cpp \
 kbuildservicefactory.cpp \
@@ -32,5 +32,5 @@ vfolder_menu.cpp
 
 HEADERS		=
 
-TRANSLATIONS    = kbuildsycoca_pl.ts
+TRANSLATIONS    = tdebuildsycoca_pl.ts
 
diff --git a/win/pro_files/kded/kded_rel.pro b/win/pro_files/kded/kded_rel.pro
index a878305ba..b17e1f3c7 100644
--- a/win/pro_files/kded/kded_rel.pro
+++ b/win/pro_files/kded/kded_rel.pro
@@ -9,4 +9,4 @@ QMAKE_CXXFLAGS += -DKBUILDSYCOCA_GUI
 
 include( "kded.pro" )
 
-TARGET		= kbuildsycocaw #gui version
+TARGET		= tdebuildsycocaw #gui version
diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro
index f3c5cd1f8..1da63e6ec 100644
--- a/win/pro_files/kdewidgets/kdewidgets.pro
+++ b/win/pro_files/kdewidgets/kdewidgets.pro
@@ -3,7 +3,7 @@ CONFIG += trinitylib #this is a dynamic kde library
 
 include( $(KDELIBS)/win/common.pro )
 
-system( makekdewidgets -o kdewidgets.cpp kde.widgets )
+system( maketdewidgets -o kdewidgets.cpp kde.widgets )
 
 #no _d because it's a special case
 
@@ -11,10 +11,10 @@ TARGET = kdewidgets
 
 DESTDIR		= $$KDELIBDESTDIR/trinity/plugins/designer
 
-LIBS +=  $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
+LIBS +=  $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kresources$$KDELIB_SUFFIX 
+	$$KDELIBDESTDIR/tdeabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX 
 
 SOURCES += classpreviews.cpp kdewidgets.cpp
 
diff --git a/win/pro_files/kdewidgets/makekdewidgets.pro b/win/pro_files/kdewidgets/maketdewidgets.pro
index cc9c0786b..bf0aabf05 100644
--- a/win/pro_files/kdewidgets/makekdewidgets.pro
+++ b/win/pro_files/kdewidgets/maketdewidgets.pro
@@ -3,7 +3,7 @@ TEMPLATE	= app
 include( $(KDELIBS)/win/common.pro )
 
 
-TARGET = makekdewidgets
+TARGET = maketdewidgets
 DESTDIR = .
 
 win32 {
@@ -11,7 +11,7 @@ win32 {
 #CONFIG += windows
 }
 
-SOURCES = makekdewidgets.cpp
+SOURCES = maketdewidgets.cpp
 
 HEADERS = 
 
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index a6b567661..dc16d76b8 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -9,17 +9,17 @@ DEFINES += MAKE_KIO_LIB
 LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
 
-system( bash kmoc kio kfile misc bookmarks kssl )
+system( bash kmoc kio tdefile misc bookmarks kssl )
 
 TARGET = kio$$KDEBUG
 
-INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc $(KDELIBS)/kio/bookmarks \
-  $(KDELIBS)/kio/kssl \
+INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/tdeio/tdeio $(KDELIBS)/tdeio/misc $(KDELIBS)/tdeio/bookmarks \
+  $(KDELIBS)/tdeio/kssl \
   $(KDELIBS)/libltdl $(KDELIBS)/interfaces \
-  $(KDELIBS)/kio/kio/moc $(KDELIBS)/kio/misc/moc $(KDELIBS)/kio/kfile/moc \
-  $(KDELIBS)/kio/misc/moc \
-  $(KDELIBS)/kio/bookmarks/moc \
-  $(KDELIBS)/kio/kssl/moc $(KDELIBS)/kwallet/client 
+  $(KDELIBS)/tdeio/tdeio/moc $(KDELIBS)/tdeio/misc/moc $(KDELIBS)/tdeio/tdefile/moc \
+  $(KDELIBS)/tdeio/misc/moc \
+  $(KDELIBS)/tdeio/bookmarks/moc \
+  $(KDELIBS)/tdeio/kssl/moc $(KDELIBS)/tdewallet/client 
 
 system( cd kio && dcopidl kdirnotify.h > kdirnotify.kidl && dcopidl2cpp --no-stub kdirnotify.kidl )
 system( cd kio && dcopidl observer.h > observer.kidl && dcopidl2cpp observer.kidl )
@@ -29,78 +29,78 @@ system( cd misc && dcopidl uiserver.h > uiserver.kidl && dcopidl2cpp uiserver.ki
 
 
 SOURCES = \
-kio/authinfo.cpp \
-kio/chmodjob.cpp \
-kio/connection.cpp \
-kio/dataprotocol.cpp \
-kio/dataslave.cpp \
-kio/davjob.cpp \
-kio/defaultprogress.cpp \
-kio/global.cpp \
-kio/job.cpp \
-kio/kacl.cpp \
-kio/kar.cpp \
-kio/karchive.cpp \
-kio/kdatatool.cpp \
-kio/kdcopservicestarter.cpp \
-kio/kdirlister.cpp \
-kio/kdirnotify.cpp \
-kio/kdirwatch.cpp \
-kio/kemailsettings.cpp \
-kio/kfilefilter.cpp \
-kio/kfileitem.cpp \
-kio/kfilemetainfo.cpp \
-kio/kfileshare.cpp \
-kio/kfilterbase.cpp \
-kio/kfilterdev.cpp \
-kio/kimageio.cpp \
-kio/kmimemagic.cpp \
-kio/kmimetype.cpp \
-kio/kmimetypechooser.cpp \
-kio/knfsshare.cpp \
-kio/kprotocolinfo.cpp \
-kio/kprotocolmanager.cpp \
-kio/kremoteencoding.cpp \
-kio/krun.cpp \
-kio/ksambashare.cpp \
-kio/kscan.cpp \
-kio/kservice.cpp \
-kio/kservicefactory.cpp \
-kio/kservicegroup.cpp \
-kio/kservicegroupfactory.cpp \
-kio/kservicetype.cpp \
-kio/kservicetypefactory.cpp \
-kio/kshellcompletion.cpp \
-kio/kshred.cpp \
-kio/ktar.cpp \
-kio/ktrader.cpp \
-kio/ktraderparse.cpp \
-kio/ktraderparsetree.cpp \
-kio/kurifilter.cpp \
-kio/kurlcompletion.cpp \
-kio/kurlpixmapprovider.cpp \
-kio/kuserprofile.cpp \
-kio/kzip.cpp \
-kio/lex.c \
-kio/metainfojob.cpp \
-kio/netaccess.cpp \
-kio/observer.cpp \
-kio/passdlg.cpp \
-kio/paste.cpp \
-kio/pastedialog.cpp \
-kio/previewjob.cpp \
-kio/progressbase.cpp \
-kio/renamedlg.cpp \
-kio/scheduler.cpp \
-kio/sessiondata.cpp \
-kio/skipdlg.cpp \
-kio/slave.cpp \
-kio/slavebase.cpp \
-kio/slaveconfig.cpp \
-kio/slaveinterface.cpp \
-kio/statusbarprogress.cpp \
-kio/tcpslavebase.cpp \
-kio/yacc.c \
+tdeio/authinfo.cpp \
+tdeio/chmodjob.cpp \
+tdeio/connection.cpp \
+tdeio/dataprotocol.cpp \
+tdeio/dataslave.cpp \
+tdeio/davjob.cpp \
+tdeio/defaultprogress.cpp \
+tdeio/global.cpp \
+tdeio/job.cpp \
+tdeio/kacl.cpp \
+tdeio/kar.cpp \
+tdeio/karchive.cpp \
+tdeio/kdatatool.cpp \
+tdeio/kdcopservicestarter.cpp \
+tdeio/kdirlister.cpp \
+tdeio/kdirnotify.cpp \
+tdeio/kdirwatch.cpp \
+tdeio/tdeemailsettings.cpp \
+tdeio/tdefilefilter.cpp \
+tdeio/tdefileitem.cpp \
+tdeio/tdefilemetainfo.cpp \
+tdeio/tdefileshare.cpp \
+tdeio/kfilterbase.cpp \
+tdeio/kfilterdev.cpp \
+tdeio/kimageio.cpp \
+tdeio/kmimemagic.cpp \
+tdeio/kmimetype.cpp \
+tdeio/kmimetypechooser.cpp \
+tdeio/knfsshare.cpp \
+tdeio/kprotocolinfo.cpp \
+tdeio/tdeprotocolmanager.cpp \
+tdeio/kremoteencoding.cpp \
+tdeio/krun.cpp \
+tdeio/ksambashare.cpp \
+tdeio/kscan.cpp \
+tdeio/kservice.cpp \
+tdeio/kservicefactory.cpp \
+tdeio/kservicegroup.cpp \
+tdeio/kservicegroupfactory.cpp \
+tdeio/kservicetype.cpp \
+tdeio/kservicetypefactory.cpp \
+tdeio/kshellcompletion.cpp \
+tdeio/kshred.cpp \
+tdeio/ktar.cpp \
+tdeio/ktrader.cpp \
+tdeio/ktraderparse.cpp \
+tdeio/ktraderparsetree.cpp \
+tdeio/kurifilter.cpp \
+tdeio/kurlcompletion.cpp \
+tdeio/kurlpixmapprovider.cpp \
+tdeio/kuserprofile.cpp \
+tdeio/kzip.cpp \
+tdeio/lex.c \
+tdeio/metainfojob.cpp \
+tdeio/netaccess.cpp \
+tdeio/observer.cpp \
+tdeio/passdlg.cpp \
+tdeio/paste.cpp \
+tdeio/pastedialog.cpp \
+tdeio/previewjob.cpp \
+tdeio/progressbase.cpp \
+tdeio/renamedlg.cpp \
+tdeio/scheduler.cpp \
+tdeio/sessiondata.cpp \
+tdeio/skipdlg.cpp \
+tdeio/slave.cpp \
+tdeio/slavebase.cpp \
+tdeio/slaveconfig.cpp \
+tdeio/slaveinterface.cpp \
+tdeio/statusbarprogress.cpp \
+tdeio/tcpslavebase.cpp \
+tdeio/yacc.c \
 \
 bookmarks/kbookmark.cc \
 bookmarks/kbookmarkbar.cc \
@@ -116,41 +116,41 @@ bookmarks/kbookmarkimporter_opera.cc \
 bookmarks/kbookmarkmanager.cc \
 bookmarks/kbookmarkmenu.cc \
 \
-kfile/kcombiview.cpp \
-kfile/kcustommenueditor.cpp \
-kfile/kdiroperator.cpp \
-kfile/kdirselectdialog.cpp \
-kfile/kdirsize.cpp \
-kfile/kdiskfreesp.cpp \
-kfile/kencodingfiledialog.cpp \
-kfile/kfilebookmarkhandler.cpp \
-kfile/kfiledetailview.cpp \
-kfile/kfiledialog.cpp \
-kfile/kfilefiltercombo.cpp \
-kfile/kfileiconview.cpp \
-kfile/kfilemetainfowidget.cpp \
-kfile/kfilemetapreview.cpp \
-kfile/kfilepreview.cpp \
-kfile/kfilesharedlg.cpp \
-kfile/kfilespeedbar.cpp \
-kfile/kfiletreebranch.cpp \
-kfile/kfiletreeview.cpp \
-kfile/kfiletreeviewitem.cpp \
-kfile/kfileview.cpp \
-kfile/kicondialog.cpp \
-kfile/kimagefilepreview.cpp \
-kfile/kmetaprops.cpp \
-kfile/knotifydialog.cpp \
-kfile/kopenwith.cpp \
-kfile/kpreviewprops.cpp \
-kfile/kpreviewwidgetbase.cpp \
-kfile/kpropertiesdialog.cpp \
-kfile/krecentdirs.cpp \
-kfile/krecentdocument.cpp \
-kfile/kurlbar.cpp \
-kfile/kurlcombobox.cpp \
-kfile/kurlrequester.cpp \
-kfile/kurlrequesterdlg.cpp \
+tdefile/kcombiview.cpp \
+tdefile/kcustommenueditor.cpp \
+tdefile/tdediroperator.cpp \
+tdefile/kdirselectdialog.cpp \
+tdefile/kdirsize.cpp \
+tdefile/kdiskfreesp.cpp \
+tdefile/kencodingfiledialog.cpp \
+tdefile/tdefilebookmarkhandler.cpp \
+tdefile/tdefiledetailview.cpp \
+tdefile/tdefiledialog.cpp \
+tdefile/tdefilefiltercombo.cpp \
+tdefile/tdefileiconview.cpp \
+tdefile/tdefilemetainfowidget.cpp \
+tdefile/tdefilemetapreview.cpp \
+tdefile/tdefilepreview.cpp \
+tdefile/tdefilesharedlg.cpp \
+tdefile/tdefilespeedbar.cpp \
+tdefile/tdefiletreebranch.cpp \
+tdefile/tdefiletreeview.cpp \
+tdefile/tdefiletreeviewitem.cpp \
+tdefile/tdefileview.cpp \
+tdefile/kicondialog.cpp \
+tdefile/kimagefilepreview.cpp \
+tdefile/kmetaprops.cpp \
+tdefile/knotifydialog.cpp \
+tdefile/kopenwith.cpp \
+tdefile/kpreviewprops.cpp \
+tdefile/kpreviewwidgetbase.cpp \
+tdefile/kpropertiesdialog.cpp \
+tdefile/tderecentdirs.cpp \
+tdefile/tderecentdocument.cpp \
+tdefile/kurlbar.cpp \
+tdefile/kurlcombobox.cpp \
+tdefile/kurlrequester.cpp \
+tdefile/kurlrequesterdlg.cpp \
 \
 misc/uiserver.cpp \
 \
@@ -176,7 +176,7 @@ kssl/ksslpeerinfo.cc \
 kssl/kopenssl.cc \
 kssl/ksmimecrypto.cc
 
-#removed kio/kautomount.cpp \
+#removed tdeio/kautomount.cpp \
 
 SOURCES += \
 ../tdecore/kprotocolinfo_tdecore.cpp
@@ -189,10 +189,10 @@ SOURCES += \
 
 # generated:
 SOURCES += \
-kio/kdirnotify_stub.cpp \
-kio/kdirnotify_skel.cpp \
-kio/observer_stub.cpp \
-kio/observer_skel.cpp \
+tdeio/kdirnotify_stub.cpp \
+tdeio/kdirnotify_skel.cpp \
+tdeio/observer_stub.cpp \
+tdeio/observer_skel.cpp \
 \
 bookmarks/kbookmarknotifier_stub.cpp \
 bookmarks/kbookmarknotifier_skel.cpp \
@@ -206,7 +206,7 @@ misc/uiserver_skel.cpp
 FORMS = \
 kssl/keygenwizard.ui \
 kssl/keygenwizard2.ui \
-kfile/knotifywidgetbase.ui \
-kfile/kpropertiesdesktopadvbase.ui \
-kfile/kpropertiesdesktopbase.ui \
-kfile/kpropertiesmimetypebase.ui
+tdefile/knotifywidgetbase.ui \
+tdefile/kpropertiesdesktopadvbase.ui \
+tdefile/kpropertiesdesktopbase.ui \
+tdefile/kpropertiesmimetypebase.ui
diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro
index 4e09b8bb9..58f334806 100644
--- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
+++ b/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro
@@ -9,12 +9,12 @@ tdebase_release:CONFIG += windows
 tdebase_release:QMAKE_MAKEFILE = Makefile.release
 
 
-TARGET		= kfiletreeviewtest
+TARGET		= tdefiletreeviewtest
 
 LIBS +=  $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+  $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX \
+  $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \
+  $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX
 
 # icon
 LIBS+=$(KDELIBS)/win/resources/kfind.res
@@ -22,7 +22,7 @@ LIBS+=$(KDELIBS)/win/resources/kfind.res
 system( bash kmoc )
 
 SOURCES = \
-kfiletreeviewtest.cpp
+tdefiletreeviewtest.cpp
 
 HEADERS		= 
 
diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro
deleted file mode 100644
index 2bcc97053..000000000
--- a/win/pro_files/kmdi/kmdi.pro
+++ /dev/null
@@ -1,31 +0,0 @@
-TEMPLATE	= lib
-
-include( $(KDELIBS)/win/common.pro )
-
-
-# needed to export library classes:
-DEFINES += MAKE_KMDI_LIB
-
-TARGET		= kmdi$$KDEBUG
-
-LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX
-
-INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/tdeui
-
-system( bash kmoc )
-
-SOURCES = \
-kmdichildarea.cpp \
-kmdichildfrm.cpp \
-kmdichildfrmcaption.cpp \
-kmdichildview.cpp \
-kmdidockcontainer.cpp \
-kmdidocumentviewtabwidget.cpp \
-kmdifocuslist.cpp \
-kmdiguiclient.cpp \
-kmdimainfrm.cpp \
-kmditaskbar.cpp \
-kmditoolviewaccessor.cpp
-
-HEADERS		=
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
index 7a81aa820..62b5d6b39 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -37,13 +37,13 @@ pixmaploader.cpp
 
 #compile in tdefx
 SOURCES += \
-../../../tdefx/kstyle.cpp \
+../../../tdefx/tdestyle.cpp \
 ../../../tdefx/kimageeffect.cpp \
 ../../../tdefx/kpixmapeffect.cpp \
 ../../../tdefx/kpixmap.cpp
 
 system( moc thinkeramik.h -o moc/thinkeramik.moc )
-system( moc ../../../tdefx/kstyle.h -o moc/kstyle.moc )
+system( moc ../../../tdefx/tdestyle.h -o moc/tdestyle.moc )
 
 
 system( bash ./genemb.sh )
diff --git a/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro b/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro
index 5b8272185..b8f175369 100644
--- a/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro
+++ b/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro
@@ -2,7 +2,7 @@ TEMPLATE	= app
 
 include( $(KDELIBS)/win/common.pro )
 
-TARGET = kconfig_compiler
+TARGET = tdeconfig_compiler
 
 win32 {
 #CONFIG -= console
@@ -11,7 +11,7 @@ win32 {
 
 #system( bash kmoc )
 
-SOURCES = kconfig_compiler.cpp
+SOURCES = tdeconfig_compiler.cpp
 
 HEADERS = 
 
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 21426a32e..fbc415726 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -38,52 +38,52 @@ kcalendarsystemgregorian.cpp \
 kcalendarsystemhebrew.cpp \
 kcalendarsystemhijri.cpp \
 kcalendarsystemjalali.cpp \
-kaboutdata.cpp \
+tdeaboutdata.cpp \
 kstringhandler.cpp \
-kcmdlineargs.cpp \
+tdecmdlineargs.cpp \
 kurldrag.cpp \
 kurl.cpp \
 kidna.cpp \
 kstaticdeleter.cpp \
 kstandarddirs.cpp \
-kconfig.cpp \
-kconfigdialogmanager.cpp \
+tdeconfig.cpp \
+tdeconfigdialogmanager.cpp \
 kcharsets.cpp \
-kglobal.cpp \
+tdeglobal.cpp \
 kdebug.cpp \
-ktempfile.cpp \
+tdetempfile.cpp \
 ktempdir.cpp \
 ksavefile.cpp \
-kconfigbackend.cpp \
-kconfigbase.cpp \
-kconfigskeleton.cpp \
+tdeconfigbackend.cpp \
+tdeconfigbase.cpp \
+tdeconfigskeleton.cpp \
 klockfile.cpp \
-kstdaccel.cpp \
+tdestdaccel.cpp \
 kcheckaccelerators.cpp \
 kkeyserver_x11.cpp \
 kkeynative_x11.cpp \
-kaccelbase.cpp \
-kaccel.cpp \
-kaccelmanager.cpp \
-kshortcut.cpp \
-kshortcutmenu.cpp \
-kshortcutlist.cpp \
+tdeaccelbase.cpp \
+tdeaccel.cpp \
+tdeaccelmanager.cpp \
+tdeshortcut.cpp \
+tdeshortcutmenu.cpp \
+tdeshortcutlist.cpp \
 kinstance.cpp \
 tdeversion.cpp \
-klocale.cpp \
+tdelocale.cpp \
 kicontheme.cpp \
 kiconloader.cpp \
 kiconeffect.cpp \
-kglobalsettings.cpp \
+tdeglobalsettings.cpp \
 kckey.cpp \
 kglobalaccel.cpp \
 kglobalaccel_win.cpp \
-kaccelaction.cpp \
+tdeaccelaction.cpp \
 kuniqueapplication.cpp \
-ksycoca.cpp \
-ksycocadict.cpp \
-ksycocafactory.cpp \
-kapplication.cpp \
+tdesycoca.cpp \
+tdesycocadict.cpp \
+tdesycocafactory.cpp \
+tdeapplication.cpp \
 kapplication_win.cpp \
 kappdcopiface.cpp \
 kprocctrl.cpp \
@@ -96,7 +96,7 @@ kmdcodec.cpp \
 kdcoppropertyproxy.cpp \
 klibloader.cpp \
 kprotocolinfo_tdecore.cpp \
-../kio/kio/kprotocolinfo.cpp \
+../tdeio/tdeio/kprotocolinfo.cpp \
 kprotocolinfofactory.cpp \
 kmountpoint.cpp \
 kmacroexpander.cpp \
@@ -105,7 +105,7 @@ kclipboard.cpp \
 kdebugdcopiface.cpp \
 krandomsequence.cpp \
 krfcdate.cpp \
-kmultipledrag.cpp \
+tdemultipledrag.cpp \
 kipc.cpp \
 kuser.cpp \
 kaudioplayer.cpp \
@@ -120,7 +120,7 @@ kqiodevicegzip_p.cpp
 #network/tdesocketdevice.cpp \
 #network/ksockssocketdevice.cpp
 
-#kstartupinfo.cpp \
+#tdestartupinfo.cpp \
 #todo: kextsock.cpp \
 #todo: ksock.cpp \
 #todo: ksocks.cpp \
@@ -130,8 +130,8 @@ kqiodevicegzip_p.cpp
 SOURCES += \
 kappdcopiface_stub.cpp \
 kappdcopiface_skel.cpp \
-ksycoca_stub.cpp \
-ksycoca_skel.cpp \
+tdesycoca_stub.cpp \
+tdesycoca_skel.cpp \
 kdebugdcopiface_stub.cpp \
 kdebugdcopiface_skel.cpp
 
diff --git a/win/pro_files/tdefx/tdefx.pro b/win/pro_files/tdefx/tdefx.pro
index f37639f92..f88c90381 100644
--- a/win/pro_files/tdefx/tdefx.pro
+++ b/win/pro_files/tdefx/tdefx.pro
@@ -15,7 +15,7 @@ kimageeffect.cpp \
 kpixmapeffect.cpp \
 kpixmapsplitter.cpp \
 kpixmap.cpp \
-kstyle.cpp \
+tdestyle.cpp \
 kdrawutil.cpp \
 kcpuinfo.cpp
 
diff --git a/win/pro_files/tdefx/tdefx_rel.pro b/win/pro_files/tdefx/tdefx_rel.pro
index 0f013895c..358f60dc4 100644
--- a/win/pro_files/tdefx/tdefx_rel.pro
+++ b/win/pro_files/tdefx/tdefx_rel.pro
@@ -10,7 +10,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_TDEFX_LIB
 
-system( moc kstyle.h -o moc/kstyle.moc )
+system( moc tdestyle.h -o moc/tdestyle.moc )
 
 LIBS -= "$(TDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(TDEDIR)\lib\ltdl_$(KDE_VER).lib"
 
@@ -18,7 +18,7 @@ SOURCES = \
 kimageeffect.cpp \
 kpixmapeffect.cpp \
 kpixmap.cpp \
-kstyle.cpp \
+tdestyle.cpp \
 kdrawutil.cpp \
 kcpuinfo.cpp
 
diff --git a/win/pro_files/kioslave/bzip2/bzip2.pro b/win/pro_files/tdeioslave/bzip2/bzip2.pro
index ba76a95a4..ba76a95a4 100644
--- a/win/pro_files/kioslave/bzip2/bzip2.pro
+++ b/win/pro_files/tdeioslave/bzip2/bzip2.pro
diff --git a/win/pro_files/kioslave/common.pro b/win/pro_files/tdeioslave/common.pro
index e1a63c761..6b6ee9d54 100644
--- a/win/pro_files/kioslave/common.pro
+++ b/win/pro_files/tdeioslave/common.pro
@@ -4,5 +4,5 @@ CONFIG += trinitylib #this is a dynamic kde library
 
 include( $(KDELIBS)/win/common.pro )
 
-LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/kioslave/gzip/gzip.pro b/win/pro_files/tdeioslave/gzip/gzip.pro
index fb09f18c3..fb09f18c3 100644
--- a/win/pro_files/kioslave/gzip/gzip.pro
+++ b/win/pro_files/tdeioslave/gzip/gzip.pro
diff --git a/win/pro_files/kioslave/kioslave.pro b/win/pro_files/tdeioslave/tdeioslave.pro
index a28199480..a28199480 100644
--- a/win/pro_files/kioslave/kioslave.pro
+++ b/win/pro_files/tdeioslave/tdeioslave.pro
diff --git a/win/pro_files/tdemdi/tdemdi.pro b/win/pro_files/tdemdi/tdemdi.pro
new file mode 100644
index 000000000..7fee597d0
--- /dev/null
+++ b/win/pro_files/tdemdi/tdemdi.pro
@@ -0,0 +1,31 @@
+TEMPLATE	= lib
+
+include( $(KDELIBS)/win/common.pro )
+
+
+# needed to export library classes:
+DEFINES += MAKE_KMDI_LIB
+
+TARGET		= tdemdi$$KDEBUG
+
+LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
+	$$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX
+
+INCLUDEPATH += res $(KDELIBS)/tdeutils $(KDELIBS)/tdeui
+
+system( bash kmoc )
+
+SOURCES = \
+tdemdichildarea.cpp \
+tdemdichildfrm.cpp \
+tdemdichildfrmcaption.cpp \
+tdemdichildview.cpp \
+tdemdidockcontainer.cpp \
+tdemdidocumentviewtabwidget.cpp \
+tdemdifocuslist.cpp \
+tdemdiguiclient.cpp \
+tdemdimainfrm.cpp \
+tdemditaskbar.cpp \
+tdemditoolviewaccessor.cpp
+
+HEADERS		=
diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/tdemdi/test/test.pro
index e9536cf43..4a60cd714 100644
--- a/win/pro_files/kmdi/test/test.pro
+++ b/win/pro_files/tdemdi/test/test.pro
@@ -10,10 +10,10 @@ CONFIG += debug
 CONFIG += console
 
 unix:DEFINES   = NO_INCLUDE_MOCFILES QT_NO_COMPAT
-unix:LIBS       += -lkmdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts
+unix:LIBS       += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts
 unix:INCLUDEPATH     += . .. $(TDEDIR)/include
 
-LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX
+LIBS += $$KDELIBDESTDIR\tdemdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX
 
 HEADERS = hello.h \
           mainwidget.h
diff --git a/win/pro_files/kparts/kparts.pro b/win/pro_files/tdeparts/tdeparts.pro
index aabdc4d37..e26516544 100644
--- a/win/pro_files/kparts/kparts.pro
+++ b/win/pro_files/tdeparts/tdeparts.pro
@@ -6,12 +6,12 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_KPARTS_LIB
 
-TARGET		= kparts$$KDEBUG
+TARGET		= tdeparts$$KDEBUG
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
- $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX
 
-INCLUDEPATH += $(KDELIBS)/kio/kfile
+INCLUDEPATH += $(KDELIBS)/tdeio/tdefile
 
 system( bash kmoc )
 
diff --git a/win/pro_files/kresources/kresources.pro b/win/pro_files/tderesources/tderesources.pro
index a485b2fba..6c64332c6 100644
--- a/win/pro_files/kresources/kresources.pro
+++ b/win/pro_files/tderesources/tderesources.pro
@@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro )
 
 
 # needed to export library classes:
-DEFINES += MAKE_KRESOURCES_LIB
+DEFINES += MAKE_TDERESOURCES_LIB
 
 INCLUDEPATH	+= $(KDELIBS)/ab
 
@@ -14,14 +14,14 @@ LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUF
 system( bash kmoc )
 system( bash kdcopidl )
 
-TARGET = kresources$$KDEBUG
+TARGET = tderesources$$KDEBUG
 
 SOURCES = \
 configdialog.cpp \
 configpage.cpp \
 configwidget.cpp \
 factory.cpp \
-kcmkresources.cpp \
+kcmtderesources.cpp \
 managerimpl.cpp \
 resource.cpp \
 selectdialog.cpp \
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index 5c438b6cf..aa1065c7d 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -15,13 +15,13 @@ system( bash kdcopidl )
 TARGET		= tdeui$$KDEBUG
 
 SOURCES = \
-kaboutapplication.cpp \
-kaboutdialog.cpp \
-kaboutkde.cpp \
-kactionclasses.cpp \
-kactioncollection.cpp \
-kaction.cpp \
-kactionselector.cpp \
+tdeaboutapplication.cpp \
+tdeaboutdialog.cpp \
+tdeabouttde.cpp \
+tdeactionclasses.cpp \
+tdeactioncollection.cpp \
+tdeaction.cpp \
+tdeactionselector.cpp \
 kactivelabel.cpp \
 kanimwidget.cpp \
 karrowbutton.cpp \
@@ -30,15 +30,15 @@ kbugreport.cpp \
 kbuttonbox.cpp \
 kcharselect.cpp \
 kcmenumngr.cpp \
-kcmodule.cpp \
+tdecmodule.cpp \
 kcolorbutton.cpp \
 kcolorcombo.cpp \
 kcolordialog.cpp \
 kcolordrag.cpp \
 kcombobox.cpp \
 kcommand.cpp \
-kcompletionbox.cpp \
-kconfigdialog.cpp \
+tdecompletionbox.cpp \
+tdeconfigdialog.cpp \
 kcursor.cpp \
 kdatepicker.cpp \
 kdatetbl.cpp \
@@ -52,9 +52,9 @@ keditcl1.cpp \
 keditcl2.cpp \
 keditlistbox.cpp \
 kedittoolbar.cpp \
-kfontcombo.cpp \
-kfontdialog.cpp \
-kfontrequester.cpp \
+tdefontcombo.cpp \
+tdefontdialog.cpp \
+tdefontrequester.cpp \
 kguiitem.cpp \
 khelpmenu.cpp \
 kiconview.cpp \
@@ -66,12 +66,12 @@ klanguagebutton.cpp \
 kled.cpp \
 klineedit.cpp \
 klineeditdlg.cpp \
-klistbox.cpp \
-klistview.cpp \
-klistviewsearchline.cpp \
-kmainwindowiface.cpp \
-kmainwindow.cpp \
-kmenubar.cpp \
+tdelistbox.cpp \
+tdelistview.cpp \
+tdelistviewsearchline.cpp \
+tdemainwindowiface.cpp \
+tdemainwindow.cpp \
+tdemenubar.cpp \
 knuminput.cpp \
 knumvalidator.cpp \
 kpanelapplet.cpp \
@@ -83,18 +83,18 @@ kpassivepopup.cpp \
 kpixmapio.cpp \
 kpixmapregionselectordialog.cpp \
 kpixmapregionselectorwidget.cpp \
-kpopupmenu.cpp \
+tdepopupmenu.cpp \
 kprogress.cpp \
 kpushbutton.cpp \
 krestrictedline.cpp \
 krootpixmap.cpp \
 kruler.cpp \
 ksconfig.cpp \
-kselect.cpp \
+tdeselect.cpp \
 kseparator.cpp \
-kshortcutdialog.cpp \
-kspell.cpp \
-kspelldlg.cpp \
+tdeshortcutdialog.cpp \
+tdespell.cpp \
+tdespelldlg.cpp \
 ksplashscreen.cpp \
 ksqueezedtextlabel.cpp \
 kstatusbar.cpp \
@@ -107,10 +107,10 @@ ktabctl.cpp \
 ktextbrowser.cpp \
 ktextedit.cpp \
 ktip.cpp \
-ktoolbar.cpp \
-ktoolbarbutton.cpp \
-ktoolbarhandler.cpp \
-ktoolbarradiogroup.cpp \
+tdetoolbar.cpp \
+tdetoolbarbutton.cpp \
+tdetoolbarhandler.cpp \
+tdetoolbarradiogroup.cpp \
 kurllabel.cpp \
 kwhatsthismanager.cpp \
 twindowinfo.cpp \
@@ -132,17 +132,17 @@ exists( kmessagebox_win.cpp ) {
  SOURCES += kmessagebox_win.cpp
 }
 !exists( kmessagebox_win.cpp ) {
- SOURCES += kmessagebox.cpp
+ SOURCES += tdemessagebox.cpp
 }
 
 # generated:
 SOURCES += \
-kmainwindowiface_stub.cpp \
-kmainwindowiface_skel.cpp
+tdemainwindowiface_stub.cpp \
+tdemainwindowiface_skel.cpp
 
 FORMS = \
-kshortcutdialog_advanced.ui \
-kshortcutdialog_simple.ui \
-kspellui.ui
+tdeshortcutdialog_advanced.ui \
+tdeshortcutdialog_simple.ui \
+tdespellui.ui
 
 HEADERS =
diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/tdeutils/tdeutils.pro
index ce4d7fe79..6507132ee 100644
--- a/win/pro_files/kutils/kutils.pro
+++ b/win/pro_files/tdeutils/tdeutils.pro
@@ -6,10 +6,10 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_KUTILS_LIB
 
-TARGET		= kutils$$KDEBUG
+TARGET		= tdeutils$$KDEBUG
 
 LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR/kio$$KDELIB_SUFFIX 
+	$$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX 
 
 INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor
 
@@ -18,7 +18,7 @@ system( bash kmoc )
 SOURCES = \
 kfind.cpp \
 kfinddialog.cpp \
-kmultitabbar.cpp \
+tdemultitabbar.cpp \
 kplugininfo.cpp \
 kreplace.cpp \
 kreplacedialog.cpp
diff --git a/win/resources/kbuildsycoca.res b/win/resources/tdebuildsycoca.res
index b26e2349c..b26e2349c 100644
--- a/win/resources/kbuildsycoca.res
+++ b/win/resources/tdebuildsycoca.res
diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h
index 17663a5fa..b9c42bde4 100644
--- a/win/tdelibs_export_win.h
+++ b/win/tdelibs_export_win.h
@@ -63,11 +63,11 @@
 # define TDEPRINT_EXPORT KDE_IMPORT
 #endif
 
-#ifndef KIO_EXPORT
+#ifndef TDEIO_EXPORT
 # ifdef MAKE_KIO_LIB
-#  define KIO_EXPORT KDE_EXPORT
+#  define TDEIO_EXPORT KDE_EXPORT
 # else
-#  define KIO_EXPORT KDE_IMPORT
+#  define TDEIO_EXPORT KDE_IMPORT
 # endif
 #endif
 
@@ -102,10 +102,10 @@
 # define KVCARD_EXPORT KDE_IMPORT
 #endif
 
-#ifdef MAKE_KRESOURCES_LIB
-# define KRESOURCES_EXPORT KDE_EXPORT
+#ifdef MAKE_TDERESOURCES_LIB
+# define TDERESOURCES_EXPORT KDE_EXPORT
 #else
-# define KRESOURCES_EXPORT KDE_IMPORT
+# define TDERESOURCES_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_TDESU_LIB
@@ -114,7 +114,7 @@
 # define TDESU_EXPORT KDE_IMPORT
 #endif
 
-// all KStyle libs
+// all TDEStyle libs
 #ifdef MAKE_KSTYLE_LIB
 # define KSTYLE_EXPORT KDE_EXPORT
 #else
@@ -145,8 +145,8 @@
 # define KATEPART_EXPORT KDE_IMPORT
 #endif
 
-#ifdef MAKE_KHTML_LIB
-# define KHTML_EXPORT KDE_EXPORT
+#ifdef MAKE_TDEHTML_LIB
+# define TDEHTML_EXPORT KDE_EXPORT
 #else
-# define KHTML_EXPORT KDE_IMPORT
+# define TDEHTML_EXPORT KDE_IMPORT
 #endif
diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h
index d8b4da08a..8e7d39d99 100644
--- a/win/tdelibs_global_win.h
+++ b/win/tdelibs_global_win.h
@@ -162,7 +162,7 @@ declared but not defined. The compiler was unable to find any destructors for th
 # pragma warning(disable: 4250)
 
 # pragma warning(disable: 4006) /*libxxx : warning LNK4006: 
-         ".... already defined in kaction.obj; second definition ignored" */
+         ".... already defined in tdeaction.obj; second definition ignored" */
 
 /* disable C4100: unreferenced formal parameter */
 # pragma warning(disable: 4100)
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index b252b10ac..b3dcd7695 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -47,15 +47,15 @@ $additional \
 tdecore \
 tdeui \
 kio \
-kresources \
-kabc/vcard \
+tderesources \
+tdeabc/vcard \
 kabc \
-kutils \
-kparts \
-kmdi \
-kioslave/gzip \
-kioslave/bzip2 \
-interfaces/ktexteditor \
+tdeutils \
+tdeparts \
+tdemdi \
+tdeioslave/gzip \
+tdeioslave/bzip2 \
+interfaces/tdetexteditor \
 kate/interfaces \
 kate/part \
  ; do 
@@ -69,7 +69,7 @@ kate/part \
 done
 
 cd kdewidgets
-qmake makekdewidgets.pro && $make clean && $make || exit 1
+qmake maketdewidgets.pro && $make clean && $make || exit 1
 qmake && $make clean && $make || exit 1
 
 # copy kdewidgets plugin for Qt Designer
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 2a9cabbd6..2fe77ef36 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -47,15 +47,15 @@ tdecore \
 tdeui \
 kstyles/thinkeramik/widget-engine \
 kio \
-kresources \
-kabc/vcard \
+tderesources \
+tdeabc/vcard \
 kabc \
-kutils \
-kparts \
-kmdi \
-kioslave/gzip \
-kioslave/bzip2 \
-interfaces/ktexteditor \
+tdeutils \
+tdeparts \
+tdemdi \
+tdeioslave/gzip \
+tdeioslave/bzip2 \
+interfaces/tdetexteditor \
 kate/interfaces \
 kate/part \
  ; do 
diff --git a/win/tools/kde_env b/win/tools/kde_env
index a8c721a5d..c8e630de3 100755
--- a/win/tools/kde_env
+++ b/win/tools/kde_env
@@ -14,7 +14,7 @@ fi
 
 # Generic settings
 export KDELIBS=$KDEWIN\\tdelibs  # KDElibs/win32 source directory
-export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE"
+export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\tdemdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\tdefile;$INCLUDE"
 
 # Version information for binaries
 # We're changing this from time to time
diff --git a/win/win32_utils.h b/win/win32_utils.h
index a0702c84c..1f18264cc 100644
--- a/win/win32_utils.h
+++ b/win/win32_utils.h
@@ -81,7 +81,7 @@ bool showWin32FilePropertyDialog(const TQString& fileName);
 /**
  \return two-letter locale name (like "en" or "pl") taken from MS Windows native registry.
  Useful when we don't want to rely on KSyCoCa.
- Used e.g. by kbuildsycoca application.
+ Used e.g. by tdebuildsycoca application.
 */
 KDEWIN32_EXPORT
 TQCString getWin32LocaleName();